no message

src/packageWorkorder/pages/orderDetail.vue

@@ -614,7 +614,7 @@
           </block>
           <u-button
             v-if="
-              (orderStatus_v == 'DJD' || (detail.isImportExcel && !detail.isMeet)) &&
+              ((orderStatus_v == 'DJD' && !detail.isImportExcel) || (detail.isImportExcel && !detail.isMeet)) &&
               (detail.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)
             "
             type="primary"

src/packageWorkorder/pages/orderList.vue

@@ -125,6 +125,17 @@
               </view>
             </view>
             <view class="item-btn" @tap.stop>
+              <u-button
+                v-if="
+                  ((orderStatus_v(item.orderStatus) == 'DJD' && !item.isImportExcel) ||
+                    (item.isImportExcel && !item.isMeet)) &&
+                  (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)
+                "
+                type="primary"
+                text="接单"
+                @tap="actionReceive(item)"
+              ></u-button>
+
               <!-- 待接单 -->
               <block v-if="orderStatus_v(item.orderStatus) == 'DJD'">
                 <u-button
@@ -143,15 +154,7 @@
                 ></u-button>
                 <u-button plain type="primary" text="加急" @tap="actionUrgent(item.id, true)" v-else></u-button>
               </block>
-              <u-button
-                v-if="
-                  (orderStatus_v(item.orderStatus) == 'DJD' || (item.isImportExcel && !item.isMeet)) &&
-                  (item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true)
-                "
-                type="primary"
-                text="接单"
-                @tap="actionReceive(item)"
-              ></u-button>
+
               <!-- 服务中 -->
               <block v-if="orderStatus_v(item.orderStatus) == 'FWZ' || orderStatus_v(item.orderStatus) == 'YCD'">
                 <u-button