Merge branch 'lmm' into develop

pages/scanning_B/scanning_B.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="Scanning_B">
-    <view class="Scanning_top" v-if="res.status==200">
+    <view class="Scanning_top" v-if="res.status == 200">
       <view class="Scanning_top_icon">
         <text class="cubeic-ok icon_transport transport-duigou"></text>
       </view>
@@ -8,7 +8,7 @@
         <view class="text1">扫描成功</view>
       </view>
     </view>
-    <view class="Scanning_top" v-if="res.status!=200">
+    <view class="Scanning_top" v-if="res.status != 200">
       <view class="Scanning_top_icon">
         <text class="cubeic-close icon_transport transport-shibai"></text>
       </view>
@@ -17,19 +17,19 @@
       </view>
     </view>
 
-    <view class="Scanning_cont" v-if="res.status==200">
-      <view>标本类型 : {{infoDATA.stype.name||'-'}}</view>
-      <view>标本编码 : {{infoDATA.scode||'-'}}</view>
-      <view>患者床号 : {{infoDATA.bedNum||'-'}}</view>
-      <view>申请科室 : {{infoDATA.sickRoom||'-'}}</view>
-      <view>检查科室 : {{infoDATA.checkDept||'-'}}</view>
+    <view class="Scanning_cont" v-if="res.status == 200">
+      <view>标本类型 : {{ infoDATA.stype.name || "-" }}</view>
+      <view>标本编码 : {{ infoDATA.scode || "-" }}</view>
+      <view>患者床号 : {{ infoDATA.bedNum || "-" }}</view>
+      <view>申请科室 : {{ infoDATA.sickRoom || "-" }}</view>
+      <view>检查科室 : {{ infoDATA.checkDept || "-" }}</view>
     </view>
-    <view class="Scanning_cont" v-if="res.status!=200">
-      <view>{{res.msg}}</view>
+    <view class="Scanning_cont" v-if="res.status != 200">
+      <view>{{ res.msg }}</view>
     </view>
     <view class="foot_btn">
       <view class="btn3" @click="showAlert()">知道了</view>
-      <block v-if="res.scanCodeSpecimenOrderSign==1">
+      <block v-if="res.scanCodeSpecimenOrderSign == 1">
         <view class="btn3" @click="orderSign(res.workOrder)" v-if="res.workOrder">执行工单</view>
         <view class="btn3" @click="buildAndOrderSign(res.data.id)" v-if="!res.workOrder && res.data">建单并签到</view>
       </block>
@@ -44,7 +44,7 @@
   import {
     post,
     webHandle
-  } from '../../http/http.js'
+  } from "../../http/http.js";
   export default {
     data() {
       return {
@@ -54,20 +54,20 @@
         hosModels: {
           disjunctor: false,
         },
-        currentCode: ''
+        currentCode: "",
       };
     },
     methods: {
       // 如果不是患者陪检或患者转运或其他
       // 科室签到
       nextDeptOrder_s(data, accountObj) {
-        console.log(data, accountObj)
+        console.log(data, accountObj);
         let ids = [];
         let id = data.id;
         ids.push(id);
         let code = "";
         let postData = {
-          ids
+          ids,
         };
         if (accountObj) {
           postData.handover = [accountObj.accountId];
@@ -84,7 +84,13 @@
               // deptCode: code, //二维码
               // dept: res.dept //科室名称
               uni.navigateTo({
-                url: `/pages/scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
+                url: `/pages/scanning_code/scanning_code?type=${
+                data.taskType.associationType.value
+              }&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${
+                res.dept
+              }&accountObj=${encodeURIComponent(
+                JSON.stringify(accountObj)
+              )}&deptId=${res.deptId}`,
               });
             } else {
               uni.navigateTo({
@@ -118,7 +124,7 @@
             } else {
               this.nextDeptOrder_s(workOrder);
             }
-          } else if (result.state == '0000') {
+          } else if (result.state == "0000") {
             uni.hideLoading();
             this.showSelectAccount();
           } else {
@@ -137,7 +143,7 @@
           mask: true,
         });
         post("/workerOrder/specimenCreateAndSign", {
-          speId
+          speId,
         }).then((res) => {
           if (res.state == 200 || res.state == 201) {
             uni.hideLoading();
@@ -148,14 +154,20 @@
               // deptCode: code, //二维码
               // dept: res.dept //科室名称
               uni.navigateTo({
-                url: `/pages/scanning_code/scanning_code?type=${res.workOrder.taskType.associationType.value}&type1=${res.type}&id=${res.workOrder.id}&deptCode=${this.currentCode}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(undefined))}&deptId=${res.deptId}`,
+                url: `/pages/scanning_code/scanning_code?type=${
+                res.workOrder.taskType.associationType.value
+              }&type1=${res.type}&id=${res.workOrder.id}&deptCode=${
+                this.currentCode
+              }&dept=${res.dept}&accountObj=${encodeURIComponent(
+                JSON.stringify(undefined)
+              )}&deptId=${res.deptId}`,
               });
             } else {
               uni.navigateTo({
                 url: `/pages/scanning_Result/scanning_Result?type=${res.workOrder.taskType.associationType.value}&type1=${res.type}&id=${res.workOrder.id}&status=600&msg=${res.msg}&isKs=1`,
               });
             }
-          } else if (res.state == '0000') {
+          } else if (res.state == "0000") {
             uni.hideLoading();
             this.currentCode = res.code;
             this.res.workOrder = res.workOrder;
@@ -164,10 +176,10 @@
             uni.hideLoading();
             uni.showToast({
               icon: "none",
-              title: "请求失败！",
+              title: res.msg || "请求失败！",
             });
           }
-        })
+        });
       },
       // 填写交接人账号-确认
       hosOk(data) {
@@ -180,31 +192,31 @@
         if (!accountName && !account) {
           //没有填写交接人
           uni.showModal({
-            title: '提示',
+            title: "提示",
             content: "请填写交接人账号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
-                console.log('用户点击确定');
+                console.log("用户点击确定");
               } else if (res.cancel) {
-                console.log('用户点击取消');
+                console.log("用户点击取消");
               }
-            }
+            },
           });
           return;
-        } else if (!accountName && account || accountName && !account) {
+        } else if ((!accountName && account) || (accountName && !account)) {
           //没有填写交接人
           uni.showModal({
-            title: '提示',
+            title: "提示",
             content: "请填写正确的交接人账号！",
             showCancel: false,
             success: function(res) {
               if (res.confirm) {
-                console.log('用户点击确定');
+                console.log("用户点击确定");
               } else if (res.cancel) {
-                console.log('用户点击取消');
+                console.log("用户点击取消");
               }
-            }
+            },
           });
           return;
         }
@@ -222,28 +234,28 @@
       // 填写交接人账号弹窗
       showSelectAccount() {
         this.hosModels = {
-          title: '填写交接人账号',
+          title: "填写交接人账号",
           disjunctor: true,
-        }
+        };
       },
       // 知道了
       showAlert() {
         uni.navigateTo({
-          url: '../receiptpage/receiptpage'
+          url: "../receiptpage/receiptpage",
         });
-      }
+      },
     },
     onLoad(options) {
       this.res = JSON.parse(options.res);
       this.infoDATA = JSON.parse(options.infoDATA); //详细信息
-      console.log(this.infoDATA)
+      console.log(this.infoDATA);
       // #ifdef APP-PLUS
-      webHandle('no', 'app')
+      webHandle("no", "app");
       // #endif
       // #ifdef H5
-      webHandle('no', 'wx')
+      webHandle("no", "wx");
       // #endif
-    }
+    },
   };
 </script>
 <style lang="less">
@@ -264,7 +276,7 @@
 
         .cubeic-ok {
           font-size: 140rpx;
-          color: #35b34a
+          color: #35b34a;
         }
 
         .cubeic-close {