待重检、待复检

pages/index/Neworder.vue

@@ -84,7 +84,7 @@
           <view class="list-box">
             <view class="l-left">代办人手机号</view>
             <view class="l-right">
-              <input type="text" v-model="otherPhone" placeholder="请输入品牌型号">
+              <input type="text" v-model="otherPhone" placeholder="请输入代办人手机号">
             </view>
           </view>
           <view class="list-box">
@@ -129,7 +129,6 @@
             <view class="l-right">
               <input type="text" v-model="nickname" placeholder="请输入引车员">
             </view>
-
           </view>
 
 <!--          <view class="list-box">-->
@@ -543,7 +542,8 @@ export default {
         skuId: this.skuId,
         carNature: this.carNature,
         inspectionWorkNodes: this.inspectionWorkNodes,
-        leadManId: this.leadManId
+        leadManId: this.leadManId,
+        status: '2',
       }
 
       let res = await request({
@@ -597,6 +597,7 @@ export default {
         this.skuId = res.data.skuId
         this.carNature = res.data.carNature
         this.leadManId = res.data.leadManId
+        this.otherPhone = res.data.otherPhone
         setTimeout(() => {
           let result = this.leadManList
               .map((subArray, subArrayIndex) => {

pages/index/orderdetails.vue

@@ -167,7 +167,7 @@
       </view>
 
     </view>
-    <view class="annniu" v-if="detailData.status&&detailData.status == 0&&workNodeStatus == 1"
+    <view class="annniu" v-if="detailData.status&&(detailData.status == 0 || detailData.status == 2)&&workNodeStatus == 1"
           @click="hge = true;getProject()">
       <view class="">结束检测</view>
     </view>
@@ -559,7 +559,8 @@ export default {
         const workNodes = []
         this.csId.forEach(item => {
           let a = {
-            id: item
+            id: item,
+            status: "3"
           }
           workNodes.push(a)
         })

pages/staff/staff.vue

@@ -80,10 +80,10 @@
             </view>
             <view class="bottom-di">
               <view class="button-container">
-                <u-button class="button" v-if="item.workNodeStatus === '0'" @click="orderTakingBefore(item)" size="10">
+                <u-button class="button" v-if="beginButtonShow.includes(tapindex)" @click="orderTakingBefore(item)" size="10">
                   开始检测
                 </u-button>
-                <u-button class="button" v-if="item.workNodeStatus === '1'" @click="cancelAnOrder(item)" size="10">
+                <u-button class="button" v-if="cancelButtonShow.includes(tapindex)" @click="cancelAnOrder(item)" size="10">
                   取消接单
                 </u-button>
                 <u-button class="button" @click="godetails(item)" size="10">查看详情</u-button>
@@ -184,6 +184,8 @@ export default {
         workNodeId: null,
         id: null
       },
+      beginButtonShow: [1, 3, 4],
+      cancelButtonShow: [2],
     }
   },
   onLoad() {
@@ -232,7 +234,7 @@ export default {
         id: item.id
       }
       let res = await request({
-        url: `/system/info/getWorkNodeByIdAndNow?id=${item.id}&status=0`,
+        url: `/system/info/getWorkNodeByIdAndNow?id=${item.id}&status=${(this.tapindex === 4 ? "3" : "0")}${(this.tapindex === 3 ? "&flag=false" : "")}`,
         method: 'get',
       })
       if (res.data){
@@ -334,7 +336,7 @@ export default {
             icon: 'none'
           })
           // this.tapindex = 1
-          this.getList()
+          this.godetails({id: data.id, workNodeId: data.workNodeId, workNodeStatus: 1})
         }
       })
     },