no message

src/packageWorkorder/pages/orderDetail.vue

@@ -641,12 +641,10 @@
           <!-- 待抢单 -->
           <u-button
             v-if="
-              // ---------------
               (!detail.isImportExcel &&
                 detail.attr == 'SELF' &&
                 ['DQD'].includes(detail.orderStatus) &&
                 (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
-              // ---------------
               (!detail.isImportExcel && detail.attr != 'SELF' && ['DQD'].includes(detail.orderStatus))
             "
             type="primary"
@@ -658,17 +656,18 @@
           <u-button
             v-if="
               // ---------------
-              (detail.isImportExcel &&
+              ((detail.isImportExcel &&
                 detail.orderType != 'INSTALL' &&
                 (['DYY', 'FWZ'].includes(detail.orderStatus) ||
                   (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus) && !userInfo.workerNumber))) ||
-              // ---------------
-              (detail.isImportExcel &&
-                detail.orderType != 'INSTALL' &&
-                ['YWG'].includes(detail.orderStatus) &&
-                isTodayOrYesterday(detail.overTime)) ||
-              // ---------------
-              (!detail.isImportExcel && ['DYY', 'FWZ'].includes(detail.orderStatus))
+                // ---------------
+                (detail.isImportExcel &&
+                  detail.orderType != 'INSTALL' &&
+                  ['YWG'].includes(detail.orderStatus) &&
+                  isTodayOrYesterday(detail.overTime)) ||
+                // ---------------
+                (!detail.isImportExcel && ['DYY', 'FWZ'].includes(detail.orderStatus))) &&
+              (detail.isImportExcel ? detail.isMeet : true)
             "
             plain
             type="primary"
@@ -680,18 +679,19 @@
           <u-button
             v-if="
               // ---------------
-              (detail.isImportExcel &&
+              ((detail.isImportExcel &&
                 ['DYY', 'FWZ', 'YWG'].includes(detail.orderStatus) &&
                 (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
-              // ---------------
-              (detail.isImportExcel &&
-                ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus) &&
-                detail.orderType != 'INSTALL' &&
-                !userInfo.workerNumber) ||
-              // ---------------
-              (!detail.isImportExcel &&
-                ['DYY', 'FWZ', 'YWG'].includes(detail.orderStatus) &&
-                (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true))
+                // ---------------
+                (detail.isImportExcel &&
+                  ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus) &&
+                  detail.orderType != 'INSTALL' &&
+                  !userInfo.workerNumber) ||
+                // ---------------
+                (!detail.isImportExcel &&
+                  ['DYY', 'FWZ', 'YWG'].includes(detail.orderStatus) &&
+                  (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true))) &&
+              (detail.isImportExcel ? detail.isMeet : true)
             "
             plain
             type="primary"
@@ -706,22 +706,23 @@
             text="辅材收费"
             @tap="toCharge('M')"
             v-if="
-              (detail.isImportExcel &&
+              ((detail.isImportExcel &&
                 ['DYY', 'FWZ'].includes(detail.orderStatus) &&
                 (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
-              //----------
-              (detail.isImportExcel &&
-                ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus) &&
-                detail.orderType != 'INSTALL' &&
-                !userInfo.workerNumber) ||
-              //----------
-              (!detail.isImportExcel && ['DYY', 'FWZ'].includes(detail.orderStatus) && !!userInfo.workerNumber) ||
-              //----------
-              (((detail.isImportExcel &&
-                ['YWG'].includes(detail.orderStatus) &&
-                (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
-                (!detail.isImportExcel && ['YWG'].includes(detail.orderStatus) && !!userInfo.workerNumber)) &&
-                isTodayOrYesterday(detail.overTime))
+                //----------
+                (detail.isImportExcel &&
+                  ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus) &&
+                  detail.orderType != 'INSTALL' &&
+                  !userInfo.workerNumber) ||
+                //----------
+                (!detail.isImportExcel && ['DYY', 'FWZ'].includes(detail.orderStatus) && !!userInfo.workerNumber) ||
+                //----------
+                (((detail.isImportExcel &&
+                  ['YWG'].includes(detail.orderStatus) &&
+                  (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
+                  (!detail.isImportExcel && ['YWG'].includes(detail.orderStatus) && !!userInfo.workerNumber)) &&
+                  isTodayOrYesterday(detail.overTime))) &&
+              (detail.isImportExcel ? detail.isMeet : true)
             "
           ></u-button>
 
@@ -732,33 +733,35 @@
             text="配件收费"
             @tap="toCharge('P')"
             v-if="
-              (detail.isImportExcel &&
+              ((detail.isImportExcel &&
                 detail.orderType != 'INSTALL' &&
                 (['DYY', 'FWZ'].includes(detail.orderStatus) ||
                   (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus) && !userInfo.workerNumber))) ||
-              //----------
-              (!detail.isImportExcel &&
-                detail.orderType != 'INSTALL' &&
-                ['DYY', 'FWZ'].includes(detail.orderStatus) &&
-                !!userInfo.workerNumber) ||
-              //----------
-              (((detail.isImportExcel && detail.orderType != 'INSTALL' && ['YWG'].includes(detail.orderStatus)) ||
+                //----------
                 (!detail.isImportExcel &&
                   detail.orderType != 'INSTALL' &&
-                  ['YWG'].includes(detail.orderStatus) &&
-                  !!userInfo.workerNumber)) &&
-                isTodayOrYesterday(detail.overTime))
+                  ['DYY', 'FWZ'].includes(detail.orderStatus) &&
+                  !!userInfo.workerNumber) ||
+                //----------
+                (((detail.isImportExcel && detail.orderType != 'INSTALL' && ['YWG'].includes(detail.orderStatus)) ||
+                  (!detail.isImportExcel &&
+                    detail.orderType != 'INSTALL' &&
+                    ['YWG'].includes(detail.orderStatus) &&
+                    !!userInfo.workerNumber)) &&
+                  isTodayOrYesterday(detail.overTime))) &&
+              (detail.isImportExcel ? detail.isMeet : true)
             "
           ></u-button>
 
           <!-- 过程反馈 ok-->
           <u-button
             v-if="
-              ['DYY', 'FWZ'].includes(detail.orderStatus) ||
-              (detail.isImportExcel &&
-                detail.orderType != 'INSTALL' &&
-                !userInfo.workerNumber &&
-                ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus))
+              (['DYY', 'FWZ'].includes(detail.orderStatus) ||
+                (detail.isImportExcel &&
+                  detail.orderType != 'INSTALL' &&
+                  !userInfo.workerNumber &&
+                  ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(detail.orderStatus))) &&
+              (detail.isImportExcel ? detail.isMeet : true)
             "
             type="primary"
             text="过程反馈"

src/packageWorkorder/pages/orderList.vue

@@ -175,17 +175,18 @@
               <u-button
                 v-if="
                   // ---------------
-                  (item.isImportExcel &&
+                  ((item.isImportExcel &&
                     item.orderType != 'INSTALL' &&
                     (['DYY', 'FWZ'].includes(item.orderStatus) ||
                       (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus) && !userInfo.workerNumber))) ||
-                  // ---------------
-                  (item.isImportExcel &&
-                    item.orderType != 'INSTALL' &&
-                    ['YWG'].includes(item.orderStatus) &&
-                    isTodayOrYesterday(item.overTime)) ||
-                  // ---------------
-                  (!item.isImportExcel && ['DYY', 'FWZ'].includes(item.orderStatus))
+                    // ---------------
+                    (item.isImportExcel &&
+                      item.orderType != 'INSTALL' &&
+                      ['YWG'].includes(item.orderStatus) &&
+                      isTodayOrYesterday(item.overTime)) ||
+                    // ---------------
+                    (!item.isImportExcel && ['DYY', 'FWZ'].includes(item.orderStatus))) &&
+                  (item.isImportExcel ? item.isMeet : true)
                 "
                 plain
                 type="primary"
@@ -197,18 +198,19 @@
               <u-button
                 v-if="
                   // ---------------
-                  (item.isImportExcel &&
+                  ((item.isImportExcel &&
                     ['DYY', 'FWZ', 'YWG'].includes(item.orderStatus) &&
                     (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
-                  // ---------------
-                  (item.isImportExcel &&
-                    ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus) &&
-                    item.orderType != 'INSTALL' &&
-                    !userInfo.workerNumber) ||
-                  // ---------------
-                  (!item.isImportExcel &&
-                    ['DYY', 'FWZ', 'YWG'].includes(item.orderStatus) &&
-                    (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true))
+                    // ---------------
+                    (item.isImportExcel &&
+                      ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus) &&
+                      item.orderType != 'INSTALL' &&
+                      !userInfo.workerNumber) ||
+                    // ---------------
+                    (!item.isImportExcel &&
+                      ['DYY', 'FWZ', 'YWG'].includes(item.orderStatus) &&
+                      (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true))) &&
+                  (item.isImportExcel ? item.isMeet : true)
                 "
                 plain
                 type="primary"
@@ -223,44 +225,46 @@
                 text="辅材收费"
                 @tap="toCharge(item.id, 'M')"
                 v-if="
-                  (item.isImportExcel &&
+                  ((item.isImportExcel &&
                     ['DYY', 'FWZ'].includes(item.orderStatus) &&
                     (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
-                  //----------
-                  (item.isImportExcel &&
-                    ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus) &&
-                    item.orderType != 'INSTALL' &&
-                    !userInfo.workerNumber) ||
-                  //----------
-                  (!item.isImportExcel && ['DYY', 'FWZ'].includes(item.orderStatus) && !!userInfo.workerNumber) ||
-                  //----------
-                  (((item.isImportExcel &&
-                    ['YWG'].includes(item.orderStatus) &&
-                    (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
-                    (!item.isImportExcel && ['YWG'].includes(item.orderStatus) && !!userInfo.workerNumber)) &&
-                    isTodayOrYesterday(item.overTime))
+                    //----------
+                    (item.isImportExcel &&
+                      ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus) &&
+                      item.orderType != 'INSTALL' &&
+                      !userInfo.workerNumber) ||
+                    //----------
+                    (!item.isImportExcel && ['DYY', 'FWZ'].includes(item.orderStatus) && !!userInfo.workerNumber) ||
+                    //----------
+                    (((item.isImportExcel &&
+                      ['YWG'].includes(item.orderStatus) &&
+                      (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
+                      (!item.isImportExcel && ['YWG'].includes(item.orderStatus) && !!userInfo.workerNumber)) &&
+                      isTodayOrYesterday(item.overTime))) &&
+                  (item.isImportExcel ? item.isMeet : true)
                 "
               ></u-button>
 
               <!-- 配件收费 -->
               <u-button
                 v-if="
-                  (item.isImportExcel &&
+                  ((item.isImportExcel &&
                     item.orderType != 'INSTALL' &&
                     (['DYY', 'FWZ'].includes(item.orderStatus) ||
                       (['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus) && !userInfo.workerNumber))) ||
-                  //----------
-                  (!item.isImportExcel &&
-                    item.orderType != 'INSTALL' &&
-                    ['DYY', 'FWZ'].includes(item.orderStatus) &&
-                    !!userInfo.workerNumber) ||
-                  //----------
-                  (((item.isImportExcel && item.orderType != 'INSTALL' && ['YWG'].includes(item.orderStatus)) ||
+                    //----------
                     (!item.isImportExcel &&
                       item.orderType != 'INSTALL' &&
-                      ['YWG'].includes(item.orderStatus) &&
-                      !!userInfo.workerNumber)) &&
-                    isTodayOrYesterday(item.overTime))
+                      ['DYY', 'FWZ'].includes(item.orderStatus) &&
+                      !!userInfo.workerNumber) ||
+                    //----------
+                    (((item.isImportExcel && item.orderType != 'INSTALL' && ['YWG'].includes(item.orderStatus)) ||
+                      (!item.isImportExcel &&
+                        item.orderType != 'INSTALL' &&
+                        ['YWG'].includes(item.orderStatus) &&
+                        !!userInfo.workerNumber)) &&
+                      isTodayOrYesterday(item.overTime))) &&
+                  (item.isImportExcel ? item.isMeet : true)
                 "
                 plain
                 type="primary"
@@ -271,11 +275,12 @@
               <!-- 过程反馈 -->
               <u-button
                 v-if="
-                  ['DYY', 'FWZ'].includes(item.orderStatus) ||
-                  (item.isImportExcel &&
-                    item.orderType != 'INSTALL' &&
-                    !userInfo.workerNumber &&
-                    ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus))
+                  (['DYY', 'FWZ'].includes(item.orderStatus) ||
+                    (item.isImportExcel &&
+                      item.orderType != 'INSTALL' &&
+                      !userInfo.workerNumber &&
+                      ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus))) &&
+                  (item.isImportExcel ? item.isMeet : true)
                 "
                 type="primary"
                 text="过程反馈"