no message

src/packageWorkorder/pages/orderDetail.vue

@@ -621,13 +621,13 @@
               // ---------------
               (!detail.isImportExcel &&
                 detail.attr == 'SELF' &&
-                ['DYY', 'DJD'].includes(detail.orderStatus) &&
+                ['DYY', 'DJD'].includes(orderStatus_v) &&
                 (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
               // ---------------
               (!detail.isImportExcel &&
                 detail.attr != 'SELF' &&
-                (['DYY'].includes(detail.orderStatus) ||
-                  (['DJD'].includes(detail.orderStatus)
+                (['DYY'].includes(orderStatus_v) ||
+                  (['DJD'].includes(orderStatus_v)
                     ? detail.orderType == 'INSTALL'
                       ? !!userInfo.workerNumber
                       : true
@@ -643,9 +643,9 @@
             v-if="
               (!detail.isImportExcel &&
                 detail.attr == 'SELF' &&
-                ['DQD'].includes(detail.orderStatus) &&
+                ['DQD'].includes(orderStatus_v) &&
                 (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
-              (!detail.isImportExcel && detail.attr != 'SELF' && ['DQD'].includes(detail.orderStatus))
+              (!detail.isImportExcel && detail.attr != 'SELF' && ['DQD'].includes(orderStatus_v))
             "
             type="primary"
             text="抢单"
@@ -658,15 +658,15 @@
               // ---------------
               ((detail.isImportExcel &&
                 detail.orderType != 'INSTALL' &&
-                (['DYY', 'FWZ'].includes(detail.orderStatus) ||
-                  (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus) && !userInfo.workerNumber))) ||
+                (['DYY', 'FWZ'].includes(orderStatus_v) ||
+                  (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(orderStatus_v) && !userInfo.workerNumber))) ||
                 // ---------------
                 (detail.isImportExcel &&
                   detail.orderType != 'INSTALL' &&
-                  ['YWG'].includes(detail.orderStatus) &&
+                  ['YWG'].includes(orderStatus_v) &&
                   isTodayOrYesterday(detail.overTime)) ||
                 // ---------------
-                (!detail.isImportExcel && ['DYY', 'FWZ'].includes(detail.orderStatus))) &&
+                (!detail.isImportExcel && ['DYY', 'FWZ'].includes(orderStatus_v))) &&
               (detail.isImportExcel ? detail.isMeet : true)
             "
             plain
@@ -680,16 +680,16 @@
             v-if="
               // ---------------
               ((detail.isImportExcel &&
-                ['DYY', 'FWZ', 'YWG'].includes(detail.orderStatus) &&
+                ['DYY', 'FWZ', 'YWG'].includes(orderStatus_v) &&
                 (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
                 // ---------------
                 (detail.isImportExcel &&
-                  ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus) &&
+                  ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(orderStatus_v) &&
                   detail.orderType != 'INSTALL' &&
                   !userInfo.workerNumber) ||
                 // ---------------
                 (!detail.isImportExcel &&
-                  ['DYY', 'FWZ', 'YWG'].includes(detail.orderStatus) &&
+                  ['DYY', 'FWZ', 'YWG'].includes(orderStatus_v) &&
                   (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true))) &&
               (detail.isImportExcel ? detail.isMeet : true)
             "
@@ -707,20 +707,20 @@
             @tap="toCharge('M')"
             v-if="
               ((detail.isImportExcel &&
-                ['DYY', 'FWZ'].includes(detail.orderStatus) &&
+                ['DYY', 'FWZ'].includes(orderStatus_v) &&
                 (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
                 //----------
                 (detail.isImportExcel &&
-                  ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus) &&
+                  ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(orderStatus_v) &&
                   detail.orderType != 'INSTALL' &&
                   !userInfo.workerNumber) ||
                 //----------
-                (!detail.isImportExcel && ['DYY', 'FWZ'].includes(detail.orderStatus) && !!userInfo.workerNumber) ||
+                (!detail.isImportExcel && ['DYY', 'FWZ'].includes(orderStatus_v) && !!userInfo.workerNumber) ||
                 //----------
                 (((detail.isImportExcel &&
-                  ['YWG'].includes(detail.orderStatus) &&
+                  ['YWG'].includes(orderStatus_v) &&
                   (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
-                  (!detail.isImportExcel && ['YWG'].includes(detail.orderStatus) && !!userInfo.workerNumber)) &&
+                  (!detail.isImportExcel && ['YWG'].includes(orderStatus_v) && !!userInfo.workerNumber)) &&
                   isTodayOrYesterday(detail.overTime))) &&
               (detail.isImportExcel ? detail.isMeet : true)
             "
@@ -735,18 +735,18 @@
             v-if="
               ((detail.isImportExcel &&
                 detail.orderType != 'INSTALL' &&
-                (['DYY', 'FWZ'].includes(detail.orderStatus) ||
-                  (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus) && !userInfo.workerNumber))) ||
+                (['DYY', 'FWZ'].includes(orderStatus_v) ||
+                  (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(orderStatus_v) && !userInfo.workerNumber))) ||
                 //----------
                 (!detail.isImportExcel &&
                   detail.orderType != 'INSTALL' &&
-                  ['DYY', 'FWZ'].includes(detail.orderStatus) &&
+                  ['DYY', 'FWZ'].includes(orderStatus_v) &&
                   !!userInfo.workerNumber) ||
                 //----------
-                (((detail.isImportExcel && detail.orderType != 'INSTALL' && ['YWG'].includes(detail.orderStatus)) ||
+                (((detail.isImportExcel && detail.orderType != 'INSTALL' && ['YWG'].includes(orderStatus_v)) ||
                   (!detail.isImportExcel &&
                     detail.orderType != 'INSTALL' &&
-                    ['YWG'].includes(detail.orderStatus) &&
+                    ['YWG'].includes(orderStatus_v) &&
                     !!userInfo.workerNumber)) &&
                   isTodayOrYesterday(detail.overTime))) &&
               (detail.isImportExcel ? detail.isMeet : true)
@@ -756,11 +756,11 @@
           <!-- 过程反馈 ok-->
           <u-button
             v-if="
-              (['DYY', 'FWZ'].includes(detail.orderStatus) ||
+              (['DYY', 'FWZ'].includes(orderStatus_v) ||
                 (detail.isImportExcel &&
                   detail.orderType != 'INSTALL' &&
                   !userInfo.workerNumber &&
-                  ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus))) &&
+                  ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(orderStatus_v))) &&
               (detail.isImportExcel ? detail.isMeet : true)
             "
             type="primary"

src/packageWorkorder/pages/orderList.vue

@@ -138,13 +138,13 @@
                   // ---------------
                   (!item.isImportExcel &&
                     item.attr == 'SELF' &&
-                    ['DYY', 'DJD'].includes(item.orderStatus) &&
+                    ['DYY', 'DJD'].includes(orderStatus_v(item.orderStatus)) &&
                     (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
                   // ---------------
                   (!item.isImportExcel &&
                     item.attr != 'SELF' &&
-                    (['DYY'].includes(item.orderStatus) ||
-                      (['DJD'].includes(item.orderStatus)
+                    (['DYY'].includes(orderStatus_v(item.orderStatus)) ||
+                      (['DJD'].includes(orderStatus_v(item.orderStatus))
                         ? item.orderType == 'INSTALL'
                           ? !!userInfo.workerNumber
                           : true
@@ -161,10 +161,10 @@
                   // ---------------
                   (!item.isImportExcel &&
                     item.attr == 'SELF' &&
-                    ['DQD'].includes(item.orderStatus) &&
+                    ['DQD'].includes(orderStatus_v(item.orderStatus)) &&
                     (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
                   // ---------------
-                  (!item.isImportExcel && item.attr != 'SELF' && ['DQD'].includes(item.orderStatus))
+                  (!item.isImportExcel && item.attr != 'SELF' && ['DQD'].includes(orderStatus_v(item.orderStatus)))
                 "
                 type="primary"
                 text="抢单"
@@ -177,15 +177,16 @@
                   // ---------------
                   ((item.isImportExcel &&
                     item.orderType != 'INSTALL' &&
-                    (['DYY', 'FWZ'].includes(item.orderStatus) ||
-                      (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus) && !userInfo.workerNumber))) ||
+                    (['DYY', 'FWZ'].includes(orderStatus_v(item.orderStatus)) ||
+                      (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(orderStatus_v(item.orderStatus)) &&
+                        !userInfo.workerNumber))) ||
                     // ---------------
                     (item.isImportExcel &&
                       item.orderType != 'INSTALL' &&
-                      ['YWG'].includes(item.orderStatus) &&
+                      ['YWG'].includes(orderStatus_v(item.orderStatus)) &&
                       isTodayOrYesterday(item.overTime)) ||
                     // ---------------
-                    (!item.isImportExcel && ['DYY', 'FWZ'].includes(item.orderStatus))) &&
+                    (!item.isImportExcel && ['DYY', 'FWZ'].includes(orderStatus_v(item.orderStatus)))) &&
                   (item.isImportExcel ? item.isMeet : true)
                 "
                 plain
@@ -199,16 +200,16 @@
                 v-if="
                   // ---------------
                   ((item.isImportExcel &&
-                    ['DYY', 'FWZ', 'YWG'].includes(item.orderStatus) &&
+                    ['DYY', 'FWZ', 'YWG'].includes(orderStatus_v(item.orderStatus)) &&
                     (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
                     // ---------------
                     (item.isImportExcel &&
-                      ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus) &&
+                      ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(orderStatus_v(item.orderStatus)) &&
                       item.orderType != 'INSTALL' &&
                       !userInfo.workerNumber) ||
                     // ---------------
                     (!item.isImportExcel &&
-                      ['DYY', 'FWZ', 'YWG'].includes(item.orderStatus) &&
+                      ['DYY', 'FWZ', 'YWG'].includes(orderStatus_v(item.orderStatus)) &&
                       (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true))) &&
                   (item.isImportExcel ? item.isMeet : true)
                 "
@@ -226,20 +227,24 @@
                 @tap="toCharge(item.id, 'M')"
                 v-if="
                   ((item.isImportExcel &&
-                    ['DYY', 'FWZ'].includes(item.orderStatus) &&
+                    ['DYY', 'FWZ'].includes(orderStatus_v(item.orderStatus)) &&
                     (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
                     //----------
                     (item.isImportExcel &&
-                      ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus) &&
+                      ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(orderStatus_v(item.orderStatus)) &&
                       item.orderType != 'INSTALL' &&
                       !userInfo.workerNumber) ||
                     //----------
-                    (!item.isImportExcel && ['DYY', 'FWZ'].includes(item.orderStatus) && !!userInfo.workerNumber) ||
+                    (!item.isImportExcel &&
+                      ['DYY', 'FWZ'].includes(orderStatus_v(item.orderStatus)) &&
+                      !!userInfo.workerNumber) ||
                     //----------
                     (((item.isImportExcel &&
-                      ['YWG'].includes(item.orderStatus) &&
+                      ['YWG'].includes(orderStatus_v(item.orderStatus)) &&
                       (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
-                      (!item.isImportExcel && ['YWG'].includes(item.orderStatus) && !!userInfo.workerNumber)) &&
+                      (!item.isImportExcel &&
+                        ['YWG'].includes(orderStatus_v(item.orderStatus)) &&
+                        !!userInfo.workerNumber)) &&
                       isTodayOrYesterday(item.overTime))) &&
                   (item.isImportExcel ? item.isMeet : true)
                 "
@@ -250,18 +255,21 @@
                 v-if="
                   ((item.isImportExcel &&
                     item.orderType != 'INSTALL' &&
-                    (['DYY', 'FWZ'].includes(item.orderStatus) ||
-                      (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus) && !userInfo.workerNumber))) ||
+                    (['DYY', 'FWZ'].includes(orderStatus_v(item.orderStatus)) ||
+                      (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(orderStatus_v(item.orderStatus)) &&
+                        !userInfo.workerNumber))) ||
                     //----------
                     (!item.isImportExcel &&
                       item.orderType != 'INSTALL' &&
-                      ['DYY', 'FWZ'].includes(item.orderStatus) &&
+                      ['DYY', 'FWZ'].includes(orderStatus_v(item.orderStatus)) &&
                       !!userInfo.workerNumber) ||
                     //----------
-                    (((item.isImportExcel && item.orderType != 'INSTALL' && ['YWG'].includes(item.orderStatus)) ||
+                    (((item.isImportExcel &&
+                      item.orderType != 'INSTALL' &&
+                      ['YWG'].includes(orderStatus_v(item.orderStatus))) ||
                       (!item.isImportExcel &&
                         item.orderType != 'INSTALL' &&
-                        ['YWG'].includes(item.orderStatus) &&
+                        ['YWG'].includes(orderStatus_v(item.orderStatus)) &&
                         !!userInfo.workerNumber)) &&
                       isTodayOrYesterday(item.overTime))) &&
                   (item.isImportExcel ? item.isMeet : true)
@@ -275,11 +283,11 @@
               <!-- 过程反馈 -->
               <u-button
                 v-if="
-                  (['DYY', 'FWZ'].includes(item.orderStatus) ||
+                  (['DYY', 'FWZ'].includes(orderStatus_v(item.orderStatus)) ||
                     (item.isImportExcel &&
                       item.orderType != 'INSTALL' &&
                       !userInfo.workerNumber &&
-                      ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus))) &&
+                      ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(orderStatus_v(item.orderStatus)))) &&
                   (item.isImportExcel ? item.isMeet : true)
                 "
                 type="primary"