xiongchao 3 years ago
parent
commit
1e8ba07638

+ 5 - 8
src/utils/dict.js

@@ -768,15 +768,12 @@ DictCache.VALUE = {
    * 报修状态
    */
   REPAIR_APPLICATION_FORM_STATUS: {
-    NOT_ALLOCATED: 1, // 待分配
-    ALLOCATED: 2, // 已分配
-    PROCESSING: 3, // 处理中
-    WAIT_SUBMIT: 31, // 等待审核
-    NOT_ACCEPTANCE: 4, // 待验收
+    NOT_ALLOCATED: 1, // 待接收
+    PROCESSING: 2, // 维修中
+    WAIT_SUBMIT: 3, // 待审核
+    NOT_ACCEPTANCE: 4, // 审核中
     REBACK: 5, // 已驳回
-    FINISHED: 6, // 已完成
-    EXAMINING: 7, //
-    EXAMINED: 8 //
+    FINISHED: 6// 已完成
   },
   /**
    * 维修状态

+ 2 - 2
src/views/repair/application-form/modules/DetailRepair.vue

@@ -7,11 +7,11 @@
             <a-button v-if="showSbFlag" style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewBom()">备件BOM</a-button>
             <a-button v-if="showSbFlag" style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewCheck()">保养项目</a-button>
             <a-button v-if="$auth('repair-application-forms-assign') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status" type="primary" @click="handleAssign">派工</a-button>
-            <a-popconfirm v-if="$auth('repair-application-forms-deal') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" title="是否要接收?" @confirm="receive">
+            <a-popconfirm v-if="$auth('repair-application-forms-deal') &&  DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status" title="是否要接收?" @confirm="receive">
               <a-button style="margin-left: 8px">接收</a-button>
             </a-popconfirm>
             <a-button v-if="$auth('repair-application-forms-out') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING >= model.status) && model.type != 2" style="margin-left: 8px" type="primary" @click="handleOut">委外</a-button>
-            <a-button v-if="$auth('repair-application-forms-dispatch') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" style="margin-left: 8px" type="primary" @click="handleDispatch">转派</a-button>
+            <a-button v-if="$auth('repair-application-forms-dispatch') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status" style="margin-left: 8px" type="primary" @click="handleDispatch">转派</a-button>
             <a-button v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status" style="margin-left: 8px" type="primary" @click="handleFinish()">维修完成</a-button>
             <a-popconfirm v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.WAIT_SUBMIT === model.status" title="是否要提交审核该条数据?" @confirm="handleExamine">
               <a-button style="margin-left: 8px" type="primary">提交审核</a-button>

+ 1 - 1
src/views/repair/application-form/modules/DetailRepairOut.vue

@@ -4,7 +4,7 @@
       <a-row :gutter="48" slot="extra">
         <a-col :md="48" :sm="48">
           <span class="table-page-search-submitButtons" style="float: right">
-            <a-popconfirm v-if="$auth('repair-application-forms-deal') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" title="是否要接收?" @confirm="receive">
+            <a-popconfirm v-if="$auth('repair-application-forms-deal') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status" title="是否要接收?" @confirm="receive">
               <a-button>接收</a-button>
             </a-popconfirm>
             <!--            <a-button v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status" style="margin-left: 8px" type="primary" @click="handleEdit()">编辑</a-button>-->