任务审核修改

src/views/dashboard/index.vue

@@ -29,7 +29,7 @@
         </div>
       </el-card>
       <el-card class="card" v-hasPermi="['task:task:audit']">
-        <div class="card-text" @click="auditTaskOpen=!auditTaskOpen">
+        <div class="card-text" @click="handleAudit">
           <div class="card-left"><i class="el-icon-s-order"></i></div>
           <div class="card-right">
             <div class="card-text-title">待审核任务</div>
@@ -79,60 +79,43 @@
       </el-table>
     </el-dialog>
 
-    <el-dialog title="待审核任务" :visible.sync="auditTaskOpen" append-to-body :close-on-click-modal="false">
-      <el-table :data="auditTasks" size="mini">
-        <el-table-column label="任务名称" prop="taskName" min-width="150" :show-overflow-tooltip="true"/>
-        <el-table-column label="执行(负责)人" prop="executorName"/>
-        <el-table-column label="任务起止时间" width="170">
-          <template slot-scope="scope">
-            <span>{{ scope.row.beginDate + ' 至 ' + scope.row.endDate }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="80">
-          <template slot-scope="scope">
-            <el-button size="mini"
-                       type="text"
-                       icon="el-icon-coordinate"
-                       @click="handleAudit(scope.row)"
-            >审核
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-
-    <!-- 详情/审核任务对话框 -->
-    <el-dialog title="审核任务" :visible.sync="auditOpen" width="800px" class="add-dialog" append-to-body
+    <!-- 审核任务对话框--->
+    <el-dialog :title="detailForm.taskName" :visible.sync="auditOpen" width="900px" class="i-audit-dialog"
+               append-to-body
                :close-on-click-modal="false">
-      <task-detail :detail-form="detailForm"></task-detail>
-      <div style="margin-top: 10px">
-        <el-form ref="auditForm" :model="auditForm" :rules="auditRules" size="mini" label-width="100px">
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="审核意见" prop="auditResult">
-                <el-radio-group v-model="auditForm.auditResult">
-                  <el-radio label="1">确认完成</el-radio>
-                  <el-radio label="0">驳回</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item v-if="auditForm.auditResult==='0'" label="进度（%）" prop="value">
-                <el-input-number v-model="auditForm.value" :min="1" :max="99"></el-input-number>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="审核备注" prop="auditOpinion">
-            <el-input v-model="auditForm.auditOpinion" type="textarea"/>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" size="mini" @click="submitAudit">确 定</el-button>
-        <el-button size="mini" @click="auditCancel">取 消</el-button>
-      </div>
+      <el-carousel trigger="click" height="640px" indicator-position="outside" :autoplay="false"
+                   @change="auditTaskChange">
+        <el-carousel-item v-for="item in carouselNum" :key="item">
+          <task-detail :detail-form="detailForm"></task-detail>
+          <el-form ref="auditForm" :model="auditForm" :rules="auditRules" size="mini" label-width="100px">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="审核意见" prop="auditResult">
+                  <el-radio-group v-model="auditForm.auditResult">
+                    <el-radio label="1">确认完成</el-radio>
+                    <el-radio label="0">驳回</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item v-if="auditForm.auditResult==='0'" label="进度（%）" prop="value">
+                  <el-input-number v-model="auditForm.value" :min="1" :max="99"></el-input-number>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-form-item label="审核备注" prop="auditOpinion">
+              <el-input v-model="auditForm.auditOpinion" type="textarea"/>
+            </el-form-item>
+          </el-form>
+          <div class="footer-btn">
+            <el-button type="primary" size="mini" @click="submitAudit(item)">确 定</el-button>
+            <el-button size="mini" @click="auditCancel">取 消</el-button>
+          </div>
+        </el-carousel-item>
+      </el-carousel>
     </el-dialog>
 
+
   </div>
 </template>
 
@@ -144,11 +127,12 @@ import {personReceive} from "@/api/material/transfer";
 import {getPersonalTaskList} from '@/api/meeting/enforce'
 import {getTodoMeetinStatistics} from '@/api/meeting/meeting'
 import {getEnforceRemindCount} from '@/api/meeting/enforceRemind'
-import TaskDetail from "../task/components/taskDetail"
+import TaskAudit from "../task/components/taskAudit"
+import TaskDetail from "@/views/task/components/taskDetail";
 
 export default {
   name: 'Dashboard',
-  components: {TaskDetail},
+  components: {TaskDetail, TaskAudit},
   computed: {
     ...mapGetters([
       'name'
@@ -165,14 +149,14 @@ export default {
       newTasks: [],
       auditTasks: [],
       newTaskOpen: false,
-      auditTaskOpen: false,
       toBeConfirmReceiveNum: 0,
       enforceTasks: 0,
       todoMeetingCount: 0,
       todoMeetingConfirmCount: 0,
       enforceRemindCount: 0,
 
-      detailForm: false,
+      carouselNum: 0,
+      detailForm: {},
       auditForm: {},
       auditOpen: false,
       auditRules: {
@@ -205,6 +189,9 @@ export default {
       this.getEnforceRemindCounts()
     },
     getTodoTask() {
+      if (this.auditOpen) {
+        return
+      }
       toDoTaskList().then(res => {
         this.newTasks = res.data.newTasks
         this.auditTasks = res.data.auditTasks
@@ -269,28 +256,58 @@ export default {
       this.$router.push('/enforceflow/enforceflow')
     },
 
-    /** 审核按钮操作 */
-    handleAudit(row) {
-      getTask(row.id).then(res => {
+    handleAudit() {
+      if (this.auditTasks.length === 0) {
+        this.auditCancel();
+        return
+      }
+      this.carouselNum = this.auditTasks.length
+      let auditTask = this.auditTasks[0];
+      getTask(auditTask.id).then(res => {
         this.detailForm = res.data;
         this.auditForm = {
-          taskId: row.id,
+          taskId: auditTask.id,
           auditResult: undefined,
+          value: undefined,
           auditOpinion: undefined
         }
+        if(this.auditOpen){
+          let refs = this.$refs.auditForm
+          for (let key in refs) {
+            refs[key].resetFields()
+            refs[key].clearValidate()
+          }
+        }
         this.auditOpen = true;
       })
     },
 
+    auditTaskChange(currIndex, oldIndex) {
+      for (let key in refs) {
+        refs[key].resetFields()
+        refs[key].clearValidate()
+      }
+      let auditTask = this.auditTasks[currIndex - 1];
+      getTask(auditTask.id).then(res => {
+        this.detailForm = res.data;
+        this.auditForm = {
+          taskId: auditTask.id,
+          auditResult: undefined,
+          value: undefined,
+          auditOpinion: undefined
+        }
+      })
+    },
+
     /** 审核提交按钮 */
-    submitAudit() {
-      this.$refs["auditForm"].validate(valid => {
+    submitAudit(index) {
+      let currAuditForm = this.$refs.auditForm[index - 1]
+      currAuditForm.validate(valid => {
         if (valid) {
           auditTask(this.auditForm).then(res => {
-            this.resetForm("auditForm");
-            this.getTaskList();
-            this.auditOpen = false
             this.$message.success("操作成功");
+            this.auditTasks.splice(index, 1)
+            this.handleAudit();
           })
         }
       });
@@ -298,10 +315,19 @@ export default {
 
     // 取消按钮（详情/审核）
     auditCancel() {
+      // this.detailForm = {};
+      this.auditForm = {
+        taskId: undefined,
+        auditResult: undefined,
+        value: undefined,
+        auditOpinion: undefined
+      }
+      let refs = this.$refs.auditForm
+      for (let key in refs) {
+        refs[key].resetFields()
+        refs[key].clearValidate()
+      }
       this.auditOpen = false;
-      this.detailForm = {};
-      this.auditForm = {}
-      this.resetForm("auditForm");
     },
 
   }
@@ -363,4 +389,12 @@ export default {
 .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
   margin-bottom: 10px;
 }
+
+.i-audit-dialog ::v-deep .el-dialog__body {
+  padding: 0 20px 0px 20px;
+}
+
+.footer-btn {
+  margin-left: 720px;
+}
 </style>

src/views/task/components/taskAudit.vue

@@ -1,6 +1,9 @@
 <template>
   <div>
     <task-detail :detail-form="detailForm"></task-detail>
+    <div>
+
+    </div>
     <el-form ref="form" :model="form" :rules="auditRules" size="mini" label-width="100px">
       <el-row>
         <el-col :span="12">
@@ -21,7 +24,6 @@
         <el-input v-model="form.auditOpinion" type="textarea"/>
       </el-form-item>
     </el-form>
-
     <div class="footer-btn">
       <el-button type="primary" size="mini" @click="submitAudit">确 定</el-button>
       <el-button size="mini" @click="auditCancel">取 消</el-button>

src/views/task/components/taskDetail.vue

@@ -1,9 +1,5 @@
 <template>
-  <div style="height: 560px">
-    <div class="header">
-      <!--      <el-button plain icon="el-icon-back">返回</el-button>-->
-      <div class="task-name">{{ form.taskName }}</div>
-    </div>
+  <div class="task-detail">
     <el-descriptions class="margin-top" :column="5" direction="vertical">
       <el-descriptions-item label="负责人">
         <div class="desc-item-content">{{ form.executorName }}</div>
@@ -25,170 +21,166 @@
         <div class="desc-item-content">{{ form.endDate }}</div>
       </el-descriptions-item>
     </el-descriptions>
-    <template>
-      <el-tabs v-model="activeName">
-        <el-tab-pane name="first">
-          <span slot="label"><i class="el-icon-info"></i><span style="margin-left: 5px">任务信息</span></span>
+    <el-tabs v-model="activeName">
+      <el-tab-pane name="first">
+        <span slot="label"><i class="el-icon-info"></i><span style="margin-left: 5px">任务信息</span></span>
 
-          <el-form :model="form" size="mini" label-width="100px">
-            <el-form-item label="所属项目：">
-              <div>{{ form.projectName }}</div>
-            </el-form-item>
-            <el-form-item label="父任务：" v-if="form.parentTaskId">
-              <div class="p-task" @click="getParentTask(form.parentTaskId)">{{ form.parentTaskName }}</div>
-            </el-form-item>
-            <el-form-item label="附件：">
-              <div v-if="form.fileList.length>0">
-                <div v-for="(file,index) in form.fileList">
-                  <a :href="file.url">
-                    <span class="file">{{ file.name }}</span>
-                  </a>
-                </div>
+        <el-form :model="form" size="mini" label-width="100px">
+          <el-form-item label="所属项目：">
+            <div>{{ form.projectName }}</div>
+          </el-form-item>
+          <el-form-item label="父任务：" v-if="form.parentTaskId">
+            <div class="p-task" @click="getParentTask(form.parentTaskId)">{{ form.parentTaskName }}</div>
+          </el-form-item>
+          <el-form-item label="附件：">
+            <div v-if="form.fileList.length>0">
+              <div v-for="(file,index) in form.fileList">
+                <a :href="file.url">
+                  <span class="file">{{ file.name }}</span>
+                </a>
               </div>
-              <div v-else>无</div>
-            </el-form-item>
-            <el-form-item label="任务描述：">
-              <div v-if="form.description" v-html="form.description" class="description"></div>
-              <div v-else>无</div>
-            </el-form-item>
-          </el-form>
-
-          <div class="footer">
-            <div>
-              <span>{{ form.createUserName }}</span>
-              <span style="margin-left: 5px;margin-right: 5px">创建于</span>
-              <span>{{ form.createTime }}</span>
-            </div>
-            <el-divider direction="vertical" v-if="form.updateUserName"></el-divider>
-            <div v-if="form.updateUserName">
-              <span>{{ form.updateUserName }}</span>
-              <span style="margin-left: 5px;margin-right: 5px">更新于</span>
-              <span>{{ form.updateTime }}</span>
             </div>
+            <div v-else>无</div>
+          </el-form-item>
+          <el-form-item label="任务描述：">
+            <div v-if="form.description" v-html="form.description" class="description"></div>
+            <div v-else>无</div>
+          </el-form-item>
+        </el-form>
+
+        <div class="footer">
+          <div>
+            <span>{{ form.createUserName }}</span>
+            <span style="margin-left: 5px;margin-right: 5px">创建于</span>
+            <span>{{ form.createTime }}</span>
+          </div>
+          <el-divider direction="vertical" v-if="form.updateUserName"></el-divider>
+          <div v-if="form.updateUserName">
+            <span>{{ form.updateUserName }}</span>
+            <span style="margin-left: 5px;margin-right: 5px">更新于</span>
+            <span>{{ form.updateTime }}</span>
           </div>
-        </el-tab-pane>
-        <el-tab-pane name="second">
-          <span slot="label"><i class="el-icon-document"></i><span style="margin-left: 5px">反馈信息</span></span>
-          <el-table :data="form.feedbacks" size="mini" max-height="300" border>
-            <el-table-column width="75" label="反馈状态">
-              <template slot-scope="scope">
-                <div>{{ getFeedbackTypeName(scope.row.feedbackType) }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column width="60" property="userName" label="反馈人"></el-table-column>
-            <el-table-column width="60" label="完成度">
-              <template slot-scope="scope">
-                <div v-if="scope.row.value!==undefined">{{ scope.row.value + '%' }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column width="120" property="createTime" label="反馈时间">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column width="70" property="hours" label="工时(h)"></el-table-column>
-            <el-table-column label="反馈备注">
-              <template slot-scope="scope">
-                <span>{{ scope.row.description }}</span>
-                <span v-for="(file,index) in scope.row.fileList">
+        </div>
+      </el-tab-pane>
+      <el-tab-pane name="second">
+        <span slot="label"><i class="el-icon-document"></i><span style="margin-left: 5px">反馈信息</span></span>
+        <el-table :data="form.feedbacks" size="mini" max-height="400" border>
+          <el-table-column width="75" label="反馈状态">
+            <template slot-scope="scope">
+              <div>{{ getFeedbackTypeName(scope.row.feedbackType) }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column width="60" property="userName" label="反馈人"></el-table-column>
+          <el-table-column width="60" label="完成度">
+            <template slot-scope="scope">
+              <div v-if="scope.row.value!==undefined">{{ scope.row.value + '%' }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column width="120" property="createTime" label="反馈时间">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column width="70" property="hours" label="工时(h)"></el-table-column>
+          <el-table-column label="反馈备注">
+            <template slot-scope="scope">
+              <span>{{ scope.row.description }}</span>
+              <span v-for="(file,index) in scope.row.fileList">
               <a :href="file.url" style="color: darkgreen">
                 <span style="margin-left: 5px">{{ file.name }}</span>
               </a>
           </span>
-              </template>
-            </el-table-column>
-            <el-table-column label="当前达成进度" width="100px">
-              <template slot-scope="scope">
-                <el-popover
-                  v-if="scope.row.descriptionDetail&&scope.row.descriptionDetail.length>0"
-                  placement="top"
-                  width="600"
-                  trigger="hover">
-                  <div v-html="scope.row.descriptionDetail"></div>
-                  <el-button slot="reference" type="text">详情</el-button>
-                </el-popover>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="子任务" name="third">
+            </template>
+          </el-table-column>
+          <el-table-column label="当前达成进度" width="100px">
+            <template slot-scope="scope">
+              <el-popover
+                v-if="scope.row.descriptionDetail&&scope.row.descriptionDetail.length>0"
+                placement="top"
+                width="600"
+                trigger="hover">
+                <div v-html="scope.row.descriptionDetail"></div>
+                <el-button slot="reference" type="text">详情</el-button>
+              </el-popover>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="子任务" name="third">
           <span slot="label"><i class="el-icon-more"></i><span
             style="margin-left: 5px">子任务({{ form.children.length }})</span></span>
-          <el-table :data="form.children"
-                    max-height="400"
-                    size="mini"
-                    @cell-mouse-enter="cellMouseEnter"
-                    @cell-mouse-leave="cellMouseLeave"
-                    @cell-click="cellClick">
-            <el-table-column width="70" prop="id" label="编号"></el-table-column>
-            <el-table-column label="任务名称" prop="taskName" min-width="150" :show-overflow-tooltip="true"/>
-            <el-table-column label="执行(负责)人" prop="executorName" width="100"/>
-            <el-table-column label="进度" prop="progressValue" width="70">
-              <template slot-scope="scope">
-                <span>{{ (scope.row.progressValue ? scope.row.progressValue : 0) + '%' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="状态" align="center" width="80">
-              <template slot-scope="scope">
-                <el-tag size="mini" :type="statusMap[scope.row.status].type">{{
-                    statusMap[scope.row.status].name
-                  }}
-                </el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column label="优先级" prop="priority" align="center" width="80">
-              <template slot-scope="scope">
-                <el-tag v-if="scope.row.priority==='1'" color="#fa8888" effect="dark" :hit="false">
-                  {{ getTaskPriority(scope.row.priority) }}
-                </el-tag>
-                <el-tag v-else-if="scope.row.priority==='2'" color="#fb7fb7" effect="dark" :hit="false">
-                  {{ getTaskPriority(scope.row.priority) }}
-                </el-tag>
-                <el-tag v-else-if="scope.row.priority==='3'" color="#40e0c3" effect="dark" :hit="false">
-                  {{ getTaskPriority(scope.row.priority) }}
-                </el-tag>
-                <el-tag v-else color="#5dcfff" effect="dark" :hit="false">{{
-                    getTaskPriority(scope.row.priority)
-                  }}
-                </el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column label="开始时间" prop="beginDate" width="100"/>
-            <el-table-column label="结束时间" prop="endDate" width="100"/>
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="修改日志" name="four">
-          <span slot="label"><i class="el-icon-edit"></i><span style="margin-left: 5px">修改日志</span></span>
-          <el-table :data="form.updateLogs"
-                    max-height="400"
-                    size="mini">
-            <el-table-column label="修改项" prop="fieldName" width="90">
-              <template slot-scope="scope">
-                <span>{{ getFieldName(scope.row.field) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="旧值" prop="oldValue" min-width="150" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                <div v-html="scope.row.oldValue"></div>
-              </template>
-            </el-table-column>
-            <el-table-column label="新值" prop="newValue" min-width="150" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                <div v-html="scope.row.newValue"></div>
-              </template>
-            </el-table-column>
-            <el-table-column label="修改人" prop="operatorName" width="90"/>
-            <el-table-column label="修改时间" prop="createTime" width="120">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.createTime) }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-
-        </el-tab-pane>
-      </el-tabs>
-    </template>
-
+        <el-table :data="form.children"
+                  max-height="400"
+                  size="mini"
+                  @cell-mouse-enter="cellMouseEnter"
+                  @cell-mouse-leave="cellMouseLeave"
+                  @cell-click="cellClick">
+          <el-table-column width="70" prop="id" label="编号"></el-table-column>
+          <el-table-column label="任务名称" prop="taskName" min-width="150" :show-overflow-tooltip="true"/>
+          <el-table-column label="执行(负责)人" prop="executorName" width="100"/>
+          <el-table-column label="进度" prop="progressValue" width="70">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.progressValue ? scope.row.progressValue : 0) + '%' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" width="80">
+            <template slot-scope="scope">
+              <el-tag size="mini" :type="statusMap[scope.row.status].type">{{
+                  statusMap[scope.row.status].name
+                }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="优先级" prop="priority" align="center" width="80">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.priority==='1'" color="#fa8888" effect="dark" :hit="false">
+                {{ getTaskPriority(scope.row.priority) }}
+              </el-tag>
+              <el-tag v-else-if="scope.row.priority==='2'" color="#fb7fb7" effect="dark" :hit="false">
+                {{ getTaskPriority(scope.row.priority) }}
+              </el-tag>
+              <el-tag v-else-if="scope.row.priority==='3'" color="#40e0c3" effect="dark" :hit="false">
+                {{ getTaskPriority(scope.row.priority) }}
+              </el-tag>
+              <el-tag v-else color="#5dcfff" effect="dark" :hit="false">{{
+                  getTaskPriority(scope.row.priority)
+                }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="开始时间" prop="beginDate" width="100"/>
+          <el-table-column label="结束时间" prop="endDate" width="100"/>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="修改日志" name="four">
+        <span slot="label"><i class="el-icon-edit"></i><span style="margin-left: 5px">修改日志</span></span>
+        <el-table :data="form.updateLogs"
+                  max-height="400"
+                  size="mini">
+          <el-table-column label="修改项" prop="fieldName" width="90">
+            <template slot-scope="scope">
+              <span>{{ getFieldName(scope.row.field) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="旧值" prop="oldValue" min-width="150" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <div v-html="scope.row.oldValue"></div>
+            </template>
+          </el-table-column>
+          <el-table-column label="新值" prop="newValue" min-width="150" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <div v-html="scope.row.newValue"></div>
+            </template>
+          </el-table-column>
+          <el-table-column label="修改人" prop="operatorName" width="90"/>
+          <el-table-column label="修改时间" prop="createTime" width="120">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
@@ -209,7 +201,9 @@ export default {
   watch: {
     detailForm(val) {
       this.activeName = 'first'
-      this.form = val
+      if (val && JSON.stringify(val) != '{}') {
+        this.form = val
+      }
     }
   },
   data() {
@@ -254,16 +248,8 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.header {
-  display: flex;
-  justify-content: start;
-  margin-top: -10px;
-  margin-bottom: 15px
-}
-
-.task-name {
-  font-size: 16px;
-  width: 800px;
+.task-detail {
+  height: 500px;
 }
 
 .desc-item-content {
@@ -275,6 +261,10 @@ export default {
   margin-bottom: 10px;
 }
 
+.task-detail ::v-deep.el-tabs__header {
+  margin: 0 0 5px;
+}
+
 .p-task {
   color: #1c84c6;
   cursor: pointer;
@@ -303,7 +293,7 @@ export default {
 
 .footer {
   margin-top: 20px;
-  margin-left: 20px;
+  margin-left: 10px;
   display: flex;
   justify-content: start;
   color: #aaaaaa;

src/views/task/task.vue

@@ -266,13 +266,13 @@
     </el-dialog>
 
     <!-- 任务详情对话框 -->
-    <el-dialog :visible.sync="detailOpen" width="900px" class="add-dialog" append-to-body
+    <el-dialog :title="detailForm.taskName" :visible.sync="detailOpen" width="900px" class="add-dialog" append-to-body
                :close-on-click-modal="true">
       <task-detail :detail-form="detailForm"></task-detail>
     </el-dialog>
 
     <!-- 审核任务对话框 -->
-    <el-dialog :visible.sync="auditOpen" width="900px" class="add-dialog" append-to-body @close="auditCancel">
+    <el-dialog :title="detailForm.taskName" :visible.sync="auditOpen" width="900px" class="add-dialog" append-to-body @close="auditCancel">
       <task-audit :detail-form="detailForm" :audit-form="auditForm" @auditCancel="auditCancel"></task-audit>
     </el-dialog>
 
@@ -472,10 +472,15 @@ export default {
     },
     // 审核取消按钮
     auditCancel() {
-      this.auditOpen = false;
       this.detailForm = {};
-      this.auditForm = {}
-      this.resetForm("auditForm");
+      this.auditForm = {
+        taskId: undefined,
+        auditResult: undefined,
+        value: undefined,
+        auditOpinion: undefined
+      }
+      // this.resetForm("auditForm");
+      this.auditOpen = false;
     },
     // 取消按钮（分解任务）
     async splitCancel() {