Explorar el Código

Merge branch 'lmm' into develop

seimin hace 3 años
padre
commit
f8d92594fe
Se han modificado 3 ficheros con 47 adiciones y 15 borrados
  1. 4 1
      http/http.js
  2. 29 14
      pages/scanning_djEnd/scanning_djEnd.vue
  3. 14 0
      pages/scanning_djInfo/scanning_djInfo.vue

+ 4 - 1
http/http.js

@@ -91,7 +91,7 @@ export function SM() {
91 91
         resolve(str);
92 92
       },
93 93
       fail(err) {
94
-        reject(err)
94
+        reject(err);
95 95
       }
96 96
     });
97 97
   });
@@ -121,6 +121,9 @@ export function SM() {
121 121
               let str = res.resultStr.replace(/[\s\/]/g, '') || 'none';
122 122
               str = str.replace(/CODABAR,/i, '');
123 123
               resolve(str);
124
+            },
125
+            cancel(err){
126
+              reject(err);
124 127
             }
125 128
           });
126 129
         });

+ 29 - 14
pages/scanning_djEnd/scanning_djEnd.vue

@@ -114,8 +114,11 @@
114 114
           type == 'specimen' &&
115 115
           infoDATA.type == 'spe-ddd-1')
116 116
       "
117
-      >已到达目标科室,请取标本后送达目标科室.</view
118 117
     >
118
+      <view v-if="accountObj"> 交接人账号 : {{ accountObj.account }} </view>
119
+      <view v-if="accountObj"> 交接人姓名 : {{ accountObj.accountName }} </view>
120
+      <view>已到达目标科室,请取标本后送达目标科室.</view>
121
+    </view>
119 122
     <view
120 123
       class="Scanning_cont"
121 124
       v-if="
@@ -127,7 +130,11 @@
127 130
           type == 'specimen' &&
128 131
           infoDATA.type == 'spe-dsd-1')
129 132
       "
130
-      >已到达目标科室,请放置标本完成该工单.</view
133
+      >
134
+      <view v-if="accountObj"> 交接人账号 : {{ accountObj.account }} </view>
135
+      <view v-if="accountObj"> 交接人姓名 : {{ accountObj.accountName }} </view>
136
+      <view>已到达目标科室,请放置标本完成该工单.</view>
137
+      </view
131 138
     >
132 139
     <view class="Scanning_cont" v-if="infoDATA.status != 200">
133 140
       <view>{{ infoDATA.msg }}</view>
@@ -300,7 +307,9 @@ export default {
300 307
       this.gotoFlag = false;
301 308
       let ids = JSON.parse(this.queryObj.ids);
302 309
       uni.navigateTo({
303
-        url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(JSON.stringify(ids))}&deptCode=${this.queryObj.deptCode}`,
310
+        url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(
311
+          JSON.stringify(ids)
312
+        )}&deptCode=${this.queryObj.code}`,
304 313
       });
305 314
     },
306 315
     // 正常完成扫描
@@ -352,11 +361,11 @@ export default {
352 361
           title: "加载中",
353 362
           mask: true,
354 363
         });
355
-        let id = JSON.parse(this.queryObj.ids)[0];
364
+        let ids = JSON.parse(this.queryObj.ids);
356 365
         let postData = {
357
-          ids: [id],
366
+          ids,
358 367
           sign: true,
359
-          deptQrCode: this.queryObj.deptCode,
368
+          deptQrCode: this.queryObj.code,
360 369
         };
361 370
         post("/workerOrder/expectedAndActual", postData).then((ress) => {
362 371
           uni.hideLoading();
@@ -434,10 +443,10 @@ export default {
434 443
     // 确定
435 444
     ok2() {
436 445
       this.models2.disjunctor = false;
437
-      let id = JSON.parse(this.queryObj.ids)[0];
446
+      let ids = JSON.parse(this.queryObj.ids);
438 447
       let postData = {
439
-        ids: [id],
440
-        deptQrCode: this.queryObj.deptCode,
448
+        ids,
449
+        deptQrCode: this.queryObj.code,
441 450
       };
442 451
       uni.showLoading({
443 452
         title: "加载中",
@@ -567,7 +576,7 @@ export default {
567 576
               if (this.type == "jPBag" || this.type == "drugsBag") {
568 577
                 postType = "handleDrugsAndJp";
569 578
                 delete data.ids;
570
-                if(this.accountObj){
579
+                if (this.accountObj) {
571 580
                   data.handover = this.accountObj.accountId;
572 581
                 }
573 582
                 data.deptId = this.deptId;
@@ -576,7 +585,7 @@ export default {
576 585
                 postType = "handleSpes";
577 586
                 data["speCode"] = data.code;
578 587
                 delete data.code;
579
-                if(this.accountObj){
588
+                if (this.accountObj) {
580 589
                   data.handover = this.accountObj.accountId;
581 590
                 }
582 591
               }
@@ -584,7 +593,7 @@ export default {
584 593
                 postType = "handlePlanSpes";
585 594
                 data["speCode"] = data.code;
586 595
                 delete data.code;
587
-                if(this.accountObj){
596
+                if (this.accountObj) {
588 597
                   data.handover = this.accountObj.accountId;
589 598
                 }
590 599
               }
@@ -611,7 +620,9 @@ export default {
611 620
                       JSON.stringify(this.ids)
612 621
                     )}&model=${encodeURIComponent(
613 622
                       JSON.stringify(ress)
614
-                    )}&speNum=${this.speNum}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}`,
623
+                    )}&speNum=${this.speNum}&accountObj=${encodeURIComponent(
624
+                      JSON.stringify(this.accountObj)
625
+                    )}&deptId=${this.deptId}`,
615 626
                   });
616 627
                 } else {
617 628
                   uni.navigateTo({
@@ -625,7 +636,11 @@ export default {
625 636
                       JSON.stringify(this.ids)
626 637
                     )}&infoData=${encodeURIComponent(
627 638
                       JSON.stringify(ress.data)
628
-                    )}&model=${encodeURIComponent(JSON.stringify(ress))}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}`,
639
+                    )}&model=${encodeURIComponent(
640
+                      JSON.stringify(ress)
641
+                    )}&accountObj=${encodeURIComponent(
642
+                      JSON.stringify(this.accountObj)
643
+                    )}&deptId=${this.deptId}`,
629 644
                   });
630 645
                 }
631 646
               });

+ 14 - 0
pages/scanning_djInfo/scanning_djInfo.vue

@@ -42,6 +42,20 @@
42 42
       <view>标本类型 : {{ infoDATA.data.stype.name || "-" }}</view>
43 43
       <view>标本编号 : {{ infoDATA.data.scode || "-" }}</view>
44 44
       <view>患者姓名 : {{ infoDATA.data.patientName || "-" }}</view>
45
+      <view
46
+        v-if="
47
+          accountObj && infoType !== 'spe-ddd-1' && infoType !== 'spe-dsd-1'&& infoType !== 'plan-spe-ddd-1' && infoType !== 'plan-spe-dsd-1'
48
+        "
49
+      >
50
+        交接人账号 : {{ accountObj.account }}
51
+      </view>
52
+      <view
53
+        v-if="
54
+          accountObj && infoType !== 'spe-ddd-1' && infoType !== 'spe-dsd-1'&& infoType !== 'plan-spe-ddd-1' && infoType !== 'plan-spe-dsd-1'
55
+        "
56
+      >
57
+        交接人姓名 : {{ accountObj.accountName }}
58
+      </view>
45 59
       <view>已扫描 : {{ speNum }}</view>
46 60
     </view>
47 61
     <view