no message

src/packageWorkorder/pages/orderDetail.vue

@@ -608,28 +608,164 @@
 
       <template slot="footer">
         <view class="bottom-container" v-if="detail">
-          <!-- 待抢单 -->
-          <block v-if="orderStatus_v == 'DQD' && (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)">
-            <u-button type="primary" text="抢单" @tap="qdOrder(detail)"></u-button>
-          </block>
+          <!-- 接单 -->
           <u-button
             v-if="
-              ((orderStatus_v == 'DJD' && !detail.isImportExcel) || (detail.isImportExcel && !detail.isMeet)) &&
-              (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)
+              // ---------------
+              (detail.isImportExcel &&
+                !detail.isMeet &&
+                detail.attr == 'SELF' &&
+                (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
+              // ---------------
+              (detail.isImportExcel && !detail.isMeet && detail.attr != 'SELF') ||
+              // ---------------
+              (!detail.isImportExcel &&
+                detail.attr == 'SELF' &&
+                ['DYY', 'DJD'].includes(detail.orderStatus) &&
+                (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
+              // ---------------
+              (!detail.isImportExcel &&
+                detail.attr != 'SELF' &&
+                (['DYY'].includes(detail.orderStatus) ||
+                  (['DJD'].includes(detail.orderStatus)
+                    ? detail.orderType == 'INSTALL'
+                      ? !!userInfo.workerNumber
+                      : true
+                    : false)))
             "
             type="primary"
             text="接单"
             @tap="actionReceive()"
           ></u-button>
-          <!-- 待接单 -->
-          <block v-if="orderStatus_v == 'DJD'">
-            <u-button
-              plain
-              type="primary"
-              text="配件申请"
-              v-if="detail.orderType != 'INSTALL'"
-              @tap="toPartsApply()"
-            ></u-button>
+
+          <!-- 待抢单 -->
+          <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"
+            text="抢单"
+            @tap="qdOrder(detail)"
+          ></u-button>
+
+          <!-- 配件申请 -->
+          <u-button
+            v-if="
+              // ---------------
+              (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))
+            "
+            plain
+            type="primary"
+            text="配件申请"
+            @tap="toPartsApply()"
+          ></u-button>
+
+          <!-- 变更小工 -->
+          <u-button
+            v-if="
+              // ---------------
+              (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))
+            "
+            plain
+            type="primary"
+            text="变更小工"
+            @tap="biangengxiaogong()"
+          ></u-button>
+
+          <!-- 辅材收费 ok-->
+          <u-button
+            plain
+            type="primary"
+            text="辅材收费"
+            @tap="toCharge('M')"
+            v-if="
+              (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))
+            "
+          ></u-button>
+
+          <!-- 配件收费 ok-->
+          <u-button
+            plain
+            type="primary"
+            text="配件收费"
+            @tap="toCharge('P')"
+            v-if="
+              (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))
+            "
+          ></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))
+            "
+            type="primary"
+            text="过程反馈"
+            @tap="toFeedback()"
+          ></u-button>
+
+          <!-- <block v-if="orderStatus_v == 'DJD'">
             <u-button
               plain
               type="primary"
@@ -638,33 +774,7 @@
               v-if="detail.pgOrderFlags && detail.pgOrderFlags.some(o => o.tag == 'JIA_JI')"
             ></u-button>
             <u-button plain type="primary" text="加急" @tap="actionUrgent(true)" v-else></u-button>
-          </block>
-          <!-- 服务中 -->
-          <block v-if="orderStatus_v == 'FWZ' || orderStatus_v == 'YCD'">
-            <u-button
-              v-if="userInfo.workerNumber == detail.workerNumber"
-              plain
-              type="primary"
-              text="变更小工"
-              @tap="biangengxiaogong()"
-            ></u-button>
-            <u-button
-              plain
-              type="primary"
-              text="配件申请"
-              v-if="detail.orderType != 'INSTALL'"
-              @tap="toPartsApply()"
-            ></u-button>
-            <u-button
-              plain
-              type="primary"
-              text="辅材收费"
-              @tap="toCharge('M')"
-              v-if="detail.orderType == 'INSTALL'"
-            ></u-button>
-            <u-button plain type="primary" text="配件收费" @tap="toCharge('P')" v-else></u-button>
-            <u-button type="primary" text="过程反馈" @tap="toFeedback()"></u-button>
-          </block>
+          </block> -->
         </view>
       </template>
     </zj-page-layout>
@@ -1280,6 +1390,19 @@ export default {
       this.$navToPage({
         url: `/packageWorkorder/pages/overDetail?id=${this.id}`
       })
+    },
+
+    isTodayOrYesterday(timeString) {
+      const date = new Date(timeString)
+      const now = new Date()
+
+      // 获取今天和昨天的日期
+      const today = new Date(now.getFullYear(), now.getMonth(), now.getDate())
+      const yesterday = new Date(today)
+      yesterday.setDate(today.getDate() - 1)
+
+      // 判断给定时间是否在今天或昨天
+      return date >= yesterday && date < today
     }
   }
 }

src/packageWorkorder/pages/orderList.vue

@@ -125,26 +125,166 @@
               </view>
             </view>
             <view class="item-btn" @tap.stop>
+              <!-- 接单 ok-->
               <u-button
                 v-if="
-                  ((orderStatus_v(item.orderStatus) == 'DJD' && !item.isImportExcel) ||
-                    (item.isImportExcel && !item.isMeet)) &&
-                  (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)
+                  // ---------------
+                  (item.isImportExcel &&
+                    !item.isMeet &&
+                    item.attr == 'SELF' &&
+                    (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
+                  // ---------------
+                  (item.isImportExcel && !item.isMeet && item.attr != 'SELF') ||
+                  // ---------------
+                  (!item.isImportExcel &&
+                    item.attr == 'SELF' &&
+                    ['DYY', 'DJD'].includes(item.orderStatus) &&
+                    (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
+                  // ---------------
+                  (!item.isImportExcel &&
+                    item.attr != 'SELF' &&
+                    (['DYY'].includes(item.orderStatus) ||
+                      (['DJD'].includes(item.orderStatus)
+                        ? item.orderType == 'INSTALL'
+                          ? !!userInfo.workerNumber
+                          : true
+                        : false)))
                 "
                 type="primary"
                 text="接单"
                 @tap="actionReceive(item)"
               ></u-button>
 
-              <!-- 待接单 -->
-              <block v-if="orderStatus_v(item.orderStatus) == 'DJD'">
-                <u-button
-                  plain
-                  type="primary"
-                  text="配件申请"
-                  v-if="item.orderType != 'INSTALL'"
-                  @tap="toPartsApply(item.id)"
-                ></u-button>
+              <!-- 待抢单 ok-->
+              <u-button
+                v-if="
+                  // ---------------
+                  (!item.isImportExcel &&
+                    item.attr == 'SELF' &&
+                    ['DQD'].includes(item.orderStatus) &&
+                    (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)) ||
+                  // ---------------
+                  (!item.isImportExcel && item.attr != 'SELF' && ['DQD'].includes(item.orderStatus))
+                "
+                type="primary"
+                text="抢单"
+                @tap="qdOrder(item)"
+              ></u-button>
+
+              <!-- 配件申请 -->
+              <u-button
+                v-if="
+                  // ---------------
+                  (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))
+                "
+                plain
+                type="primary"
+                text="配件申请"
+                @tap="toPartsApply(item.id)"
+              ></u-button>
+
+              <!-- 变更小工 -->
+              <u-button
+                v-if="
+                  // ---------------
+                  (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))
+                "
+                plain
+                type="primary"
+                text="变更小工"
+                @tap="biangengxiaogong(item)"
+              ></u-button>
+
+              <!-- 辅材收费 ok-->
+              <u-button
+                plain
+                type="primary"
+                text="辅材收费"
+                @tap="toCharge(item.id, 'M')"
+                v-if="
+                  (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))
+                "
+              ></u-button>
+
+              <!-- 配件收费 -->
+              <u-button
+                v-if="
+                  (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))
+                "
+                plain
+                type="primary"
+                text="配件收费"
+                @tap="toCharge(item.id, 'P')"
+              ></u-button>
+
+              <!-- 过程反馈 -->
+              <u-button
+                v-if="
+                  ['DYY', 'FWZ'].includes(item.orderStatus) ||
+                  (item.isImportExcel &&
+                    item.orderType != 'INSTALL' &&
+                    !userInfo.workerNumber &&
+                    ['DQD', 'DJD', 'DSHPG', 'DWDPG'].includes(item.orderStatus))
+                "
+                type="primary"
+                text="过程反馈"
+                @tap="toFeedback(item.id)"
+              ></u-button>
+
+              <!-- ------------------------------------ -->
+
+              <!-- <block v-if="orderStatus_v(item.orderStatus) == 'DJD'">
                 <u-button
                   plain
                   type="primary"
@@ -153,51 +293,7 @@
                   v-if="item.orderFlags && item.orderFlags.some(o => o.tag == 'JIA_JI')"
                 ></u-button>
                 <u-button plain type="primary" text="加急" @tap="actionUrgent(item.id, true)" v-else></u-button>
-              </block>
-
-              <!-- 服务中 -->
-              <block v-if="orderStatus_v(item.orderStatus) == 'FWZ' || orderStatus_v(item.orderStatus) == 'YCD'">
-                <u-button
-                  v-if="userInfo.workerNumber == item.workerNumber"
-                  plain
-                  type="primary"
-                  text="变更小工"
-                  @tap="biangengxiaogong(item)"
-                ></u-button>
-                <u-button
-                  plain
-                  type="primary"
-                  text="配件申请"
-                  v-if="item.orderType != 'INSTALL'"
-                  @tap="toPartsApply(item.id)"
-                ></u-button>
-                <u-button type="primary" text="过程反馈" @tap="toFeedback(item.id)"></u-button>
-              </block>
-              <block
-                v-if="
-                  orderStatus_v(item.orderStatus) == 'FWZ' ||
-                  orderStatus_v(item.orderStatus) == 'YCD' ||
-                  (item.orderStatus == 'YWG' && item.overDate && isToday(item.overDate))
-                "
-              >
-                <u-button
-                  plain
-                  type="primary"
-                  text="辅材收费"
-                  @tap="toCharge(item.id, 'M')"
-                  v-if="item.orderType == 'INSTALL'"
-                ></u-button>
-                <u-button plain type="primary" text="配件收费" @tap="toCharge(item.id, 'P')" v-else></u-button>
-              </block>
-              <!-- 待抢单 -->
-              <block
-                v-if="
-                  orderStatus_v(item.orderStatus) == 'DQD' &&
-                  (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)
-                "
-              >
-                <u-button type="primary" text="抢单" @tap="qdOrder(item)"></u-button>
-              </block>
+              </block> -->
             </view>
           </view>
         </view>