seimin il y a 1 an
Parent
commit
62a4cc16ad
2 fichiers modifiés avec 15 ajouts et 3 suppressions
  1. 1 1
      main.js
  2. 14 2
      pages/receiptpage/receiptpage.vue

+ 1 - 1
main.js

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

+ 14 - 2
pages/receiptpage/receiptpage.vue

@@ -1869,8 +1869,20 @@
1869 1869
                     uni.hideLoading();
1870 1870
                     if (res.state == 200) {
1871 1871
                       this.clothingType = res.type;
1872
-                      this.showParentQuiltData(res.data);
1873
-                      // this.showQuiltData(res.data)
1872
+                      // 如果当前科室有回收单,并且配送人员是当前登陆人
1873
+                      if(res.orderId){
1874
+                        if(res.type == 'user'){
1875
+                          uni.navigateTo({
1876
+                            url: `../quiltWashing/quiltWashingGetSignIn/quiltWashingGetSignIn?quiltCode=${this.quiltCode}&startDeptId=${res.data.dept.id}&startDeptName=${res.data.dept.dept}&orderId=${res.orderId}&name=${res.data.name}`,
1877
+                          });
1878
+                        } else if(res.type == 'dept'){
1879
+                          uni.navigateTo({
1880
+                            url: `../quiltWashing/quiltWashingGetSignIn/quiltWashingGetSignIn?quiltCode=${this.quiltCode}&startDeptId=${res.data.id}&startDeptName=${res.data.dept}&orderId=${res.orderId}&name=`,
1881
+                          });
1882
+                        }
1883
+                      }else{
1884
+                        this.showParentQuiltData(res.data);
1885
+                      }
1874 1886
                     } else {
1875 1887
                       uni.navigateTo({
1876 1888
                         url: `../scanning_Result/scanning_Result?status=${res.state}&msg=${res.msg}&qrcode=${this.quiltCode}`,