Ver Fonte

no message

linwenxin há 5 meses atrás
pai
commit
931c2a2ac8
2 ficheiros alterados com 14 adições e 9 exclusões
  1. 11 6
      src/packageWorkorder/pages/orderList.vue
  2. 3 3
      src/pages/workorder/index.vue

+ 11 - 6
src/packageWorkorder/pages/orderList.vue

@@ -142,13 +142,18 @@
                   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>
-                <u-button
-                  v-if="item.orderType == 'INSTALL' ? !!userInfo.workerNumber : true"
-                  type="primary"
-                  text="接单"
-                  @tap="actionReceive(item)"
-                ></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

+ 3 - 3
src/pages/workorder/index.vue

@@ -14,7 +14,7 @@
     </template>
 
     <view class="all-container">
-      <view class="order-container card">
+      <!-- <view class="order-container card">
         <view class="home-title">
           <view class="left">我的服务单</view>
           <view class="right" @tap="navToPage('/packageWorkorder/pages/userWorkorderList?tab=', 1)">
@@ -36,9 +36,9 @@
             <view class="title">{{ item.title }}</view>
           </view>
         </view>
-      </view>
+      </view> -->
 
-      <block v-if="isWorkerUser">
+      <block>
         <view class="data-container">
           <view class="common-title">我的工单</view>
           <view class="list">