Merge branch 'lmm' into develop

http/http.js

@@ -91,7 +91,7 @@ export function SM() {
         resolve(str);
       },
       fail(err) {
-        reject(err)
+        reject(err);
       }
     });
   });
@@ -121,6 +121,9 @@ export function SM() {
               let str = res.resultStr.replace(/[\s\/]/g, '') || 'none';
               str = str.replace(/CODABAR,/i, '');
               resolve(str);
+            },
+            cancel(err){
+              reject(err);
             }
           });
         });

pages/scanning_djEnd/scanning_djEnd.vue

@@ -114,8 +114,11 @@
           type == 'specimen' &&
           infoDATA.type == 'spe-ddd-1')
       "
-      >已到达目标科室,请取标本后送达目标科室.</view
     >
+      <view v-if="accountObj"> 交接人账号 : {{ accountObj.account }} </view>
+      <view v-if="accountObj"> 交接人姓名 : {{ accountObj.accountName }} </view>
+      <view>已到达目标科室,请取标本后送达目标科室.</view>
+    </view>
     <view
       class="Scanning_cont"
       v-if="
@@ -127,7 +130,11 @@
           type == 'specimen' &&
           infoDATA.type == 'spe-dsd-1')
       "
-      >已到达目标科室,请放置标本完成该工单.</view
+      >
+      <view v-if="accountObj"> 交接人账号 : {{ accountObj.account }} </view>
+      <view v-if="accountObj"> 交接人姓名 : {{ accountObj.accountName }} </view>
+      <view>已到达目标科室,请放置标本完成该工单.</view>
+      </view
     >
     <view class="Scanning_cont" v-if="infoDATA.status != 200">
       <view>{{ infoDATA.msg }}</view>
@@ -300,7 +307,9 @@ export default {
       this.gotoFlag = false;
       let ids = JSON.parse(this.queryObj.ids);
       uni.navigateTo({
-        url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(JSON.stringify(ids))}&deptCode=${this.queryObj.deptCode}`,
+        url: `../noScanSpecimen/noScanSpecimen?workOrderId=${encodeURIComponent(
+          JSON.stringify(ids)
+        )}&deptCode=${this.queryObj.code}`,
       });
     },
     // 正常完成扫描
@@ -352,11 +361,11 @@ export default {
           title: "加载中",
           mask: true,
         });
-        let id = JSON.parse(this.queryObj.ids)[0];
+        let ids = JSON.parse(this.queryObj.ids);
         let postData = {
-          ids: [id],
+          ids,
           sign: true,
-          deptQrCode: this.queryObj.deptCode,
+          deptQrCode: this.queryObj.code,
         };
         post("/workerOrder/expectedAndActual", postData).then((ress) => {
           uni.hideLoading();
@@ -434,10 +443,10 @@ export default {
     // 确定
     ok2() {
       this.models2.disjunctor = false;
-      let id = JSON.parse(this.queryObj.ids)[0];
+      let ids = JSON.parse(this.queryObj.ids);
       let postData = {
-        ids: [id],
-        deptQrCode: this.queryObj.deptCode,
+        ids,
+        deptQrCode: this.queryObj.code,
       };
       uni.showLoading({
         title: "加载中",
@@ -567,7 +576,7 @@ export default {
               if (this.type == "jPBag" || this.type == "drugsBag") {
                 postType = "handleDrugsAndJp";
                 delete data.ids;
-                if(this.accountObj){
+                if (this.accountObj) {
                   data.handover = this.accountObj.accountId;
                 }
                 data.deptId = this.deptId;
@@ -576,7 +585,7 @@ export default {
                 postType = "handleSpes";
                 data["speCode"] = data.code;
                 delete data.code;
-                if(this.accountObj){
+                if (this.accountObj) {
                   data.handover = this.accountObj.accountId;
                 }
               }
@@ -584,7 +593,7 @@ export default {
                 postType = "handlePlanSpes";
                 data["speCode"] = data.code;
                 delete data.code;
-                if(this.accountObj){
+                if (this.accountObj) {
                   data.handover = this.accountObj.accountId;
                 }
               }
@@ -611,7 +620,9 @@ export default {
                       JSON.stringify(this.ids)
                     )}&model=${encodeURIComponent(
                       JSON.stringify(ress)
-                    )}&speNum=${this.speNum}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}`,
+                    )}&speNum=${this.speNum}&accountObj=${encodeURIComponent(
+                      JSON.stringify(this.accountObj)
+                    )}&deptId=${this.deptId}`,
                   });
                 } else {
                   uni.navigateTo({
@@ -625,7 +636,11 @@ export default {
                       JSON.stringify(this.ids)
                     )}&infoData=${encodeURIComponent(
                       JSON.stringify(ress.data)
-                    )}&model=${encodeURIComponent(JSON.stringify(ress))}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}`,
+                    )}&model=${encodeURIComponent(
+                      JSON.stringify(ress)
+                    )}&accountObj=${encodeURIComponent(
+                      JSON.stringify(this.accountObj)
+                    )}&deptId=${this.deptId}`,
                   });
                 }
               });

pages/scanning_djInfo/scanning_djInfo.vue

@@ -42,6 +42,20 @@
       <view>标本类型 : {{ infoDATA.data.stype.name || "-" }}</view>
       <view>标本编号 : {{ infoDATA.data.scode || "-" }}</view>
       <view>患者姓名 : {{ infoDATA.data.patientName || "-" }}</view>
+      <view
+        v-if="
+          accountObj && infoType !== 'spe-ddd-1' && infoType !== 'spe-dsd-1'&& infoType !== 'plan-spe-ddd-1' && infoType !== 'plan-spe-dsd-1'
+        "
+      >
+        交接人账号 : {{ accountObj.account }}
+      </view>
+      <view
+        v-if="
+          accountObj && infoType !== 'spe-ddd-1' && infoType !== 'spe-dsd-1'&& infoType !== 'plan-spe-ddd-1' && infoType !== 'plan-spe-dsd-1'
+        "
+      >
+        交接人姓名 : {{ accountObj.accountName }}
+      </view>
       <view>已扫描 : {{ speNum }}</view>
     </view>
     <view