Explorar el Código

fix(交付工单): 自测bug修复

lk hace 2 años
padre
commit
407c4902c7
Se han modificado 2 ficheros con 8 adiciones y 9 borrados
  1. 6 9
      src/views/work/deliver/plan.vue
  2. 2 0
      src/views/work/deliver/progress.vue

+ 6 - 9
src/views/work/deliver/plan.vue

@@ -193,7 +193,7 @@
                   workOrderStatus != 20 &&
                   curPlanStatus != 30 &&
                   row.progressType == '30' &&
-                  userId == 1037
+                  userId == saleId
                 "
                 type="text"
                 @click="handleStartInstallWork(row)">
@@ -201,12 +201,7 @@
               </el-button>
               <!-- 安装人员确认安装时间 -->
               <el-button
-                v-if="
-                  row.progressStatus == 20 &&
-                  row.deliverStatus == '15' &&
-                  row.progressType == '30' &&
-                  userId == row.principalPersonId
-                "
+                v-if="row.progressStatus == 15 && row.progressType == '30' && userId == row.principalPersonId"
                 type="text"
                 @click="confirmInstallInfo(row)">
                 确认安装时间
@@ -256,7 +251,7 @@
               <el-button
                 v-if="
                   row.progressStatus == 20 &&
-                  row.deliverStatus == '50' &&
+                  row.deliverStatus == '60' &&
                   row.progressType == '10' &&
                   userId == row.principalPersonId
                 "
@@ -283,7 +278,7 @@
               </el-button>
               <!-- 部署安装任务审核 -->
               <el-button
-                v-show="row.progressStatus == 30 && row.progressType == '30' && row.deliverStatus == '60'"
+                v-show="row.progressStatus == 30 && row.progressType == '30'"
                 v-permissions="['order:delivery:work:auditinstall']"
                 type="text"
                 @click="auditInstall(row)">
@@ -373,8 +368,10 @@
         },
         progressStatusObj: {
           10: '未开始',
+          15: '待确认',
           20: '进行中',
           30: '已完成',
+          40: '安装审批通过',
         },
         progressLevelOptions: {
           10: '最高',

+ 2 - 0
src/views/work/deliver/progress.vue

@@ -211,8 +211,10 @@
       return {
         progressStatusObj: {
           10: '未开始',
+          15: '待确认',
           20: '进行中',
           30: '已完成',
+          40: '安装审批通过',
         },
         layout: 'total, sizes, prev, pager, next, jumper',
         queryForm: {