Browse Source

标本退回BUG修复

seimin 2 years ago
parent
commit
082353e836
1 changed files with 6 additions and 6 deletions
  1. 6 6
      pages/scanning_B/scanning_B.vue

+ 6 - 6
pages/scanning_B/scanning_B.vue

@@ -40,7 +40,7 @@
40 40
           v-else-if="res.workOrder&&res.workOrder.gdState.value != 2&&res.workOrder.gdState.value != 4">执行工单</view>
41 41
         <view class="btn3" @click="buildAndOrderSign(res.data.id)" v-if="!res.workOrder && res.data">建单并签到</view>
42 42
       </block>
43
-      <view class="btn3" @click="back(res.data,res.workOrder)"
43
+      <view class="btn3" @click="back(res.data,res.data.gdid)"
44 44
         v-if="res.data.speState&&(res.data.speState.value == 2||res.data.speState.value == 3||res.data.speState.value == 4||res.data.speState.value == 5)">
45 45
         退回</view>
46 46
     </view>
@@ -124,7 +124,7 @@
124 124
         }
125 125
       },
126 126
       // 退回
127
-      back(specimen, workOrder) {
127
+      back(specimen, workOrderId) {
128 128
         this.backSpecimen = specimen;
129 129
         this.backStatus = 'back';
130 130
         uni.showModal({
@@ -151,7 +151,7 @@
151 151
                   if (result.list[0].value == 1) {
152 152
                     this.showSelectAccount();
153 153
                   } else {
154
-                    this.backHandler(this.backSpecimen, workOrder);
154
+                    this.backHandler(this.backSpecimen, workOrderId);
155 155
                   }
156 156
                 } else {
157 157
                   uni.showToast({
@@ -292,7 +292,7 @@
292 292
         }
293 293
       },
294 294
       // 退回
295
-      backHandler(specimen, workorder, data) {
295
+      backHandler(specimen, workorderId, data) {
296 296
         console.log(specimen);
297 297
         uni.showLoading({
298 298
           title: '加载中',
@@ -304,7 +304,7 @@
304 304
           speState: specimen.speState ? specimen.speState.id : undefined,
305 305
           handoverId: data ? data.accountId : undefined,
306 306
           handoverName: data ? data.accountName : undefined,
307
-          gdId: workorder ? workorder.id : undefined,
307
+          gdId: workorderId || undefined,
308 308
         }
309 309
         post('/workerOrder/returnSpecimen', postData).then(res => {
310 310
           uni.hideLoading();
@@ -371,7 +371,7 @@
371 371
         });
372 372
         if (this.backStatus = 'back') {
373 373
           // 退回
374
-          this.backHandler(this.backSpecimen, this.res.workOrder, data);
374
+          this.backHandler(this.backSpecimen, this.res.data.gdid, data);
375 375
         } else {
376 376
           this.nextDeptOrder_s(this.res.workOrder, data);
377 377
         }