408249787 2 years ago
parent
commit
a4da7adaab
2 changed files with 23 additions and 8 deletions
  1. 4 4
      src/views/fill/task/FillGatherTask.vue
  2. 19 4
      src/views/fill/task/modules/BaseForm.vue

+ 4 - 4
src/views/fill/task/FillGatherTask.vue

@@ -75,7 +75,7 @@
               v-show="record.status!== 2 && record.status!== 6"
               @click="handleEdit(record)"
             >填报</operation-button>
-            <operation-button
+            <!-- <operation-button
               v-show="record.status == 2 || record.status == 7"
               @click="handleVerify(record)"
             > 审核</operation-button>
@@ -83,8 +83,8 @@
               v-if="$auth('fill-tasks-dispatch')"
               v-show="record.status!== 2 && record.status!== 6"
               @click="handleDispatch(record)"
-            >转派</operation-button>
-            <operation-button
+            >转派</operation-button> -->
+            <!-- <operation-button
               v-if="$auth('fill-tasks-overtime')"
               v-show="record.status!== 2 && record.status!== 6"
               @click="handleOvertime(record)"
@@ -99,7 +99,7 @@
               v-if="$auth('fill-tasks-pause')"
               v-show="record.status!== 2 && record.status!==5 && record.status!== 6"
               @click="handlePause(record)"
-            >暂停</operation-button>
+            >暂停</operation-button> -->
             <!-- <operation-button
               v-if="$auth('fill-fills-del')"
               :type="2"

+ 19 - 4
src/views/fill/task/modules/BaseForm.vue

@@ -5,16 +5,22 @@
         <span>
           <a-button v-show="editor" :loading="confirmLoading" type="primary" @click="save()">保存</a-button>
           <a-button style="margin-left: 8px" type="default" @click="handleCancel()">返回</a-button>
+          <a-button
+            style="margin-left: 8px"
+            type="primary"
+            v-show="!editor&&(model.status == 2 || model.status == 7)"
+            @click="handleVerify(model)"
+          > 审核</a-button>
           <a-button
             v-if="$auth('fill-tasks-dispatch')"
-            v-show="!editor&&model.status!== 2"
+            v-show="!editor&&model.status!== 6&&model.status!== 2"
             style="margin-left: 8px"
             type="primary"
             @click="handleDispatch(model)"
           >转派</a-button>
           <a-button
             v-if="$auth('fill-tasks-overtime')"
-            v-show="!editor&&model.status!== 2"
+            v-show="!editor&&model.status!== 2&&model.status!== 6"
             style="margin-left: 8px"
             type="primary"
             @click="handleOvertime(model)"
@@ -22,14 +28,14 @@
 
           <a-button
             v-if="$auth('fill-tasks-pause')"
-            v-show="!editor && model.status===5&&model.status!== 2"
+            v-show="!editor && model.status===5&&model.status!== 2&&model.status!== 6"
             style="margin-left: 8px"
             type="primary"
             @click="handlePause(model)"
           >取消暂停</a-button>
           <a-button
             v-if="$auth('fill-tasks-pause')"
-            v-show="!editor&& model.status!==5&&model.status!== 2"
+            v-show="!editor&& model.status!==5&&model.status!== 2&&model.status!== 6"
             style="margin-left: 8px"
             type="primary"
             @click="handlePause(model)"
@@ -131,6 +137,8 @@
     <dispatch-form ref="dispatchModal" @ok="handleOk" />
     <overtime-form ref="overtimeModal" @ok="handleOk" />
     <pause-form ref="pauseModal" @ok="handleOk" />
+    <verify-form ref="verifyModal" @ok="handleOk" />
+
   </a-card>
 </template>
 
@@ -139,10 +147,13 @@ import { fillGatherTask, getFillGatherTask, getFillUpdates, pauseFillGatherTask
 import DispatchForm from './DispatchForm'
 import OvertimeForm from './OvertimeForm'
 import PauseForm from './PauseForm'
+import VerifyForm from './VerifyForm'
+
 export default {
   name: 'BaseFillGatherTask',
   components: {
     PauseForm,
+    VerifyForm,
     DispatchForm,
     OvertimeForm
   },
@@ -258,6 +269,10 @@ export default {
       const modal = this.$refs.dispatchModal
       modal.base(record)
     },
+    handleVerify (record) {
+      const modal = this.$refs.verifyModal
+      modal.base(record)
+    },
     handleOvertime (record) {
       this.visible = false
       const modal = this.$refs.overtimeModal