任务审核修改

src/views/dashboard/index.vue

@@ -127,12 +127,11 @@ 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 TaskAudit from "../task/components/taskAudit"
 import TaskDetail from "@/views/task/components/taskDetail";
 
 export default {
   name: 'Dashboard',
-  components: {TaskDetail, TaskAudit},
+  components: {TaskDetail},
   computed: {
     ...mapGetters([
       'name'

src/views/task/components/taskAudit.vue

@@ -1,97 +0,0 @@
-<template>
-  <div>
-    <task-detail :detail-form="detailForm"></task-detail>
-    <el-form ref="form" :model="form" :rules="auditRules" size="mini" label-width="100px">
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="审核意见" prop="auditResult">
-            <el-radio-group v-model="form.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="form.auditResult==='0'" label="进度（%）" prop="value">
-            <el-input-number v-model="form.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="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>
-    </div>
-
-  </div>
-</template>
-
-<script>
-import TaskDetail from './taskDetail'
-import {auditTask} from "@/api/task/task";
-
-export default {
-  name: "taskAudit",
-  components: {TaskDetail},
-  props: {
-    detailForm: {
-      type: Object,
-      default: {}
-    },
-    auditForm: {
-      type: Object,
-      default: {}
-    }
-  },
-  watch: {
-    auditForm(val) {
-      this.form = val
-    }
-  },
-  data() {
-    return {
-      form: {},
-      auditRules: {
-        auditResult: [
-          {required: true, message: "审核意见不能为空", trigger: "change"}
-        ],
-        value: [
-          {required: true, message: "进度不能为空", trigger: "blur"}
-        ]
-      },
-    }
-  },
-  methods: {
-    /** 审核提交按钮 */
-    submitAudit() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          auditTask(this.form).then(res => {
-            this.resetForm("form");
-            this.auditCancel()
-            this.$message.success("操作成功");
-          })
-        }
-      });
-    },
-    auditCancel() {
-      this.form = {}
-      this.resetForm('form')
-      this.$emit('auditCancel')
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
-  margin-bottom: 10px;
-}
-
-.footer-btn {
-  margin-left: 720px;
-}
-</style>

src/views/task/task.vue

@@ -277,7 +277,31 @@
     <!-- 审核任务对话框 -->
     <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>
+      <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 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-dialog>
 
     <!-- 分解任务对话框 -->
@@ -327,7 +351,6 @@ import FileUpload from "@/components/FileUpload"
 import Project from "@/views/task/components/project";
 import TaskDetail from "@/views/task/components/taskDetail"
 import TaskSplit from "@/views/task/components/taskSplit"
-import TaskAudit from "@/views/task/components/taskAudit"
 
 import RichTextEditor from '@/components/RichTextEditor'
 import {mapGetters} from "vuex";
@@ -336,7 +359,7 @@ import DateUtil from "@/utils/date";
 
 export default {
   name: "Task",
-  components: {Project, TaskDetail, DeptUserTree, FileUpload, Treeselect, RichTextEditor, TaskSplit, TaskAudit},
+  components: {Project, TaskDetail, DeptUserTree, FileUpload, Treeselect, RichTextEditor, TaskSplit},
   dicts: ['task_status', 'task_priority'],
   mixins: [task],
   computed: {
@@ -398,7 +421,14 @@ export default {
           {required: true, message: "执行人不能为空", trigger: 'change'}
         ]
       },
-
+      auditRules: {
+        auditResult: [
+          {required: true, message: "审核意见不能为空", trigger: "change"}
+        ],
+        value: [
+          {required: true, message: "进度不能为空", trigger: "blur"}
+        ]
+      },
       confirmOpen: false,
       conflictTasks: []
     };
@@ -483,7 +513,7 @@ export default {
         value: undefined,
         auditOpinion: undefined
       }
-      // this.resetForm("auditForm");
+      this.resetForm("auditForm");
       this.auditOpen = false;
     },
     // 取消按钮（分解任务）
@@ -710,7 +740,18 @@ export default {
       // this.resetForm("splitForm");
     },
 
-
+    /** 审核任务提交按钮 */
+    submitAudit() {
+      this.$refs["auditForm"].validate(valid => {
+        if (valid) {
+          auditTask(this.auditForm).then(res => {
+            this.$message.success("操作成功");
+            this.getList()
+            this.auditCancel()
+          })
+        }
+      });
+    },
     /** 分解任务提交按钮 */
     submitSplit() {
       let data = this.$refs.split.submit();