回收流程

main.js

@@ -7,7 +7,7 @@ import './mixins/mixin'
 // new VConsole();
 // import eruda from 'eruda';
 // eruda.init();
-console.info('v2.4.49');
+console.info('v2.4.50');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/receiptpage/receiptpage.vue

@@ -1869,8 +1869,20 @@
                     uni.hideLoading();
                     if (res.state == 200) {
                       this.clothingType = res.type;
-                      this.showParentQuiltData(res.data);
-                      // this.showQuiltData(res.data)
+                      // 如果当前科室有回收单,并且配送人员是当前登陆人
+                      if(res.orderId){
+                        if(res.type == 'user'){
+                          uni.navigateTo({
+                            url: `../quiltWashing/quiltWashingGetSignIn/quiltWashingGetSignIn?quiltCode=${this.quiltCode}&startDeptId=${res.data.dept.id}&startDeptName=${res.data.dept.dept}&orderId=${res.orderId}&name=${res.data.name}`,
+                          });
+                        } else if(res.type == 'dept'){
+                          uni.navigateTo({
+                            url: `../quiltWashing/quiltWashingGetSignIn/quiltWashingGetSignIn?quiltCode=${this.quiltCode}&startDeptId=${res.data.id}&startDeptName=${res.data.dept}&orderId=${res.orderId}&name=`,
+                          });
+                        }
+                      }else{
+                        this.showParentQuiltData(res.data);
+                      }
                     } else {
                       uni.navigateTo({
                         url: `../scanning_Result/scanning_Result?status=${res.state}&msg=${res.msg}&qrcode=${this.quiltCode}`,