森语-事故处理单-状态更改

src/views/oa/IncidentTicketList.vue

@@ -17,7 +17,8 @@
                   <a-select-option value="2">已通知</a-select-option>
                   <a-select-option value="3">已反馈通知</a-select-option>
                   <a-select-option value="4">已推送</a-select-option>
-                  <a-select-option value="5">已完结</a-select-option>
+                  <a-select-option value="5">已提交</a-select-option>
+                  <a-select-option value="6">已完结</a-select-option>
                 </a-select>
               </a-form-item>
               
@@ -150,7 +151,8 @@
           </a-button>
         </template>
         <span slot="state" slot-scope="text, record">
-          <span v-if="record.state =='5'">已完结</span>
+          <span v-if="record.state =='6'">已完成</span>
+          <span v-if="record.state =='5'">已提交</span>
           <span v-if="record.state =='4'">已推送</span>
           <span v-if="record.state =='3'">已反馈通知</span>
           <span v-if="record.state =='2'">已通知</span>
@@ -158,8 +160,8 @@
         </span>
 
         <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record,'edit')">编辑</a>
-          <a-divider type="vertical" />
+          <a @click="handleEdit(record,'edit')"  v-if="record.state!=='6'">编辑</a>
+          <a-divider type="vertical" v-if="record.state!=='6'"/>
           <a @click="handleEdit(record,'detail')">详情</a>
 <!-- 
           <a-divider type="vertical" />

src/views/oa/modules/IncidentTicketModalDetail.vue

@@ -18,8 +18,11 @@
         <a-popconfirm title="确定推送吗?" ok-text="是" cancel-text="否" @confirm="push" @cancel="handleCancelPop('visibleTs')" :visible="visibleTs">
           <a-button  type="primary"   style="margin-left: 8px;" :disabled="!(formState.state=='3'&&!confirmLoading)" @click="()=>visibleTs = true">推送</a-button>
         </a-popconfirm>
-        <a-popconfirm title="确定完结吗?" ok-text="是" cancel-text="否" @confirm="end"   @cancel="handleCancelPop('visibleWj')" :visible="visibleWj">
-          <a-button  type="primary"   style="margin-left: 8px;" :disabled="!(formState.state=='3'|| formState.state=='4')" @click="()=>visibleWj = true">完结</a-button>
+        <a-popconfirm title="确定提交吗?" ok-text="是" cancel-text="否" @confirm="end"   @cancel="handleCancelPop('visibleTj')" :visible="visibleTj">
+          <a-button  type="primary"   style="margin-left: 8px;" :disabled="!(formState.state=='3'|| formState.state=='4')" @click="()=>visibleTj = true">提交</a-button>
+        </a-popconfirm>
+        <a-popconfirm title="确定完结吗?" ok-text="是" cancel-text="否" @confirm="finish"   @cancel="handleCancelPop('visibleWj')" :visible="visibleWj">
+          <a-button  type="primary"   style="margin-left: 8px;" :disabled="!(formState.state=='5')" @click="()=>visibleWj = true">完结</a-button>
         </a-popconfirm>
       </template>
       <a-spin :spinning="confirmLoading">
@@ -454,6 +457,7 @@
         confirmLoading:false,
         visibleFk:false,
         visibleTs:false,
+        visibleTj:false,
         visibleWj:false,
         accessory2:[],
         accessory:[],
@@ -694,7 +698,7 @@
         }
       },
       end(){
-        this.visibleWj = false
+        this.visibleTj = false
         getAction('/oa/incidentTicket/endOrder', {headId:this.formState.id}).then((res) => {
           if(res.success){
             this.$message.success(res.message)
@@ -704,6 +708,17 @@
           }
         })
       },
+      finish(){
+        this.visibleWj = false
+        getAction('/oa/incidentTicket/endOrderReal', {headId:this.formState.id}).then((res) => {
+          if(res.success){
+            this.$message.success(res.message)
+            this.handleCancel()
+          }else{
+            this.$message.warning(res.message)
+          }
+        })
+      },
       sendNotice(ids){
         getAction('/oa/incidentTicket/noticeUser', {ids:ids,headId:this.formState.id,code:this.formState.accidentNumber,title:this.formState.accidentTheme}).then((res) => {
           if(res.success){
@@ -792,7 +807,7 @@
         this.incidentTicketChildrenTable.dataSource =[]
         this.formState = {}
         this.visible = false
-        this.visibleWj = false
+        this.visibleTj = false
         this.visibleTs = false
         this.visibleFk = false
         this.$emit('close')
@@ -801,6 +816,7 @@
       handleCancelPop(data){
         if(data=='visibleFk') this.visibleFk = false
         if(data=='visibleTs') this.visibleTs = false
+        if(data=='visibleTj') this.visibleTj = false
         if(data=='visibleWj') this.visibleWj = false
       },
       handlePrint(){