扫码错误页面展示扫描内容

App.vue

@@ -90,8 +90,8 @@
     width: 100%;
     height: 100%;
     background: #f9fafb;
-    --sk-size: 20rpx!important;
-    --sk-color: #49b856!important;
+    --sk-size: 20rpx !important;
+    --sk-color: #49b856 !important;
   }
 
   body {
@@ -117,16 +117,24 @@
   .seimin-btn-hover {
     box-shadow: 0px 0px 8px rgba(0, 0, 0, .1) inset !important;
   }
-  .uni-picker-action-confirm{
-    color: #49b856!important;
+
+  .uni-picker-action-confirm {
+    color: #49b856 !important;
+  }
+
+  .footerPadding {
+    padding-bottom: 50rpx !important;
   }
-  .footerPadding{
-    padding-bottom: 50rpx!important;
+
+  .footerOtherMargin {
+    margin-bottom: 174rpx !important;
   }
-  .footerOtherMargin{
-    margin-bottom: 174rpx!important;
+
+  .red {
+    color: red !important;
   }
-  .red{
-    color: red!important;
+
+  .f30 {
+    font-size: 30rpx !important;
   }
 </style>

components/bigScreen/bigScreen.vue

@@ -13,6 +13,7 @@
   export default {
     data() {
       return {
+        currentCode: '', //当前小扫描的科室二维码
         SMFlag: true,
       }
     },
@@ -33,6 +34,7 @@
               content,
             })
             .then((result) => {
+              this.currentCode = result.code;
               this.SMFlag = true;
               // 200检测通过，201没有有效期也通过。
               if (result.state == 200 || result.state == 201) {
@@ -102,7 +104,7 @@
                       }
                     } else {
                       uni.navigateTo({
-                        url: `../scanning_Result/scanning_Result?status=${res.status}&msg=${res.msg}`,
+                        url: `../scanning_Result/scanning_Result?status=${res.status}&msg=${res.msg}&qrcode=${this.currentCode}`,
                       });
                     }
                   });

components/smallScreen/smallScreen.vue

@@ -25,7 +25,7 @@
         hosModels: {
           disjunctor: false,
         },
-        // SMFlag:true,
+        SMFlag:true,
       }
     },
     props: {
@@ -40,6 +40,7 @@
       // 如果不是静配，药配，标本配送,标本轮巡
       // 科室签到（小扫描）
       nextDeptOrder_ss(data, accountObj) {
+        console.log(this.currentCode);
         let isKs = 0;
         let ids = [];
         let id = data.id;
@@ -158,7 +159,7 @@
                 if (res.type == "trans-ddd-1") {
                   //起点科室扫描腕带码失败
                   uni.navigateTo({
-                    url: `../../pages/scanning_Result/scanning_Result?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}`,
+                    url: `../../pages/scanning_Result/scanning_Result?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}&qrcode=${this.currentCode}`,
                   });
                 } else {
                   uni.navigateTo({
@@ -168,13 +169,13 @@
                     res.msg
                   }&isKs=${isKs}&model=${encodeURIComponent(
                     JSON.stringify(res)
-                  )}`,
+                  )}&qrcode=${this.currentCode}`,
                   });
                 }
               }
             } else {
               uni.navigateTo({
-                url: `../../pages/scanning_Result/scanning_Result?id=${data.id}&status=600&msg=扫码失败！请扫描正确的二维码！&isKs=${isKs}`,
+                url: `../../pages/scanning_Result/scanning_Result?id=${data.id}&status=600&msg=扫码失败！请扫描正确的二维码！&isKs=${isKs}&qrcode=${this.currentCode}`,
               });
             }
           });
@@ -183,7 +184,7 @@
       // 如果不是患者陪检或患者转运或其他
       // 科室签到
       nextDeptOrder_s(data, accountObj) {
-        console.log(data, accountObj)
+        console.log(this.currentCode);
         let ids = [];
         let id = data.id;
         ids.push(id);
@@ -210,7 +211,7 @@
               });
             } else {
               uni.navigateTo({
-                url: `../../pages/scanning_Result/scanning_Result?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}&isKs=1`,
+                url: `../../pages/scanning_Result/scanning_Result?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}&isKs=1&qrcode=${this.currentCode}`,
               });
             }
           });
@@ -220,10 +221,10 @@
       // type==2  如果不是患者陪检，患者转运，其他
       // 扫码（小扫描）
       Scan_ss(data, type) {
-        // if (!this.SMFlag) {
-        //   return;
-        // }
-        // this.SMFlag = false;
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
         this.currentData = data;
         console.log(data, 'data');
         SM().then((ress1) => {
@@ -237,7 +238,7 @@
             taskTypeId: data.taskType.id,
             gdState: data.gdState.id,
           }).then((result) => {
-            // this.SMFlag = true;
+            this.SMFlag = true;
             this.currentCode = result.code;
             if (result.state == 200 || result.state == 201) {
               if (result.account) {
@@ -273,7 +274,7 @@
             }
           });
         }).catch(err=>{
-          // this.SMFlag = true;
+          this.SMFlag = true;
         });
       },
       // 填写交接人账号-确认
@@ -350,7 +351,7 @@
       selectAccount
     },
     onShow(){
-      // this.SMFlag = true;
+      this.SMFlag = true;
     }
   };
 </script>

pages/patientInformationList/patientInformationList.vue

@@ -87,7 +87,7 @@
   export default {
     data() {
       return {
-        // SMFlag:true,
+        SMFlag:true,
         hosId: uni.getStorageSync("userData").user.currentHospital.id,
         // 选中的患者项
         currentItem: {},
@@ -228,10 +228,10 @@
       },
       // 送回病房-扫描科室
       scanDept(item) {
-        // if (!this.SMFlag) {
-        //   return;
-        // }
-        // this.SMFlag = false;
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
         this.currentItem = item;
         let code = "";
         SM().then((ress1) => {
@@ -243,7 +243,7 @@
           post("/dept/scanning", {
             content: ress1,
           }).then((result) => {
-            // this.SMFlag = true;
+            this.SMFlag = true;
             if (result.state == 200 || result.state == 201) {
               let ress = result.code;
               if (ress) {
@@ -299,7 +299,7 @@
             }
           });
         }).catch(err=>{
-          // this.SMFlag = true;
+          this.SMFlag = true;
         });
       },
       // 送回病房-选择起点科室
@@ -485,7 +485,7 @@
       // #endif
     },
     onShow() {
-      // this.SMFlag = true;
+      this.SMFlag = true;
       // #ifdef H5
       document.body.addEventListener("touchmove", this.stop, {
         passive: false,

pages/pharmacy/pharmacy.vue

@@ -94,7 +94,7 @@
         drugModels: {
           disjunctor: false,
         },
-        // SMFlag:true,
+        SMFlag:true,
         triggered: false, //下拉刷新状态
         freshing: false, //上拉加载开关
         scroll_top: 0, //距离顶部的距离
@@ -210,16 +210,16 @@
       },
       // 扫一扫
       drugsScanning() {
-        // if (!this.SMFlag) {
-        //   return;
-        // }
-        // this.SMFlag = false;
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
         SM().then((ress) => {
           uni.navigateTo({
             url: "../pharmacyDetails/pharmacyDetails?qrcode=" + ress,
           });
         }).catch(err => {
-          // this.SMFlag = true;
+          this.SMFlag = true;
         });
       },
       //刷新
@@ -331,7 +331,7 @@
       // #endif
     },
     onShow() {
-      // this.SMFlag = true;
+      this.SMFlag = true;
       // #ifdef H5
       document.body.addEventListener("touchmove", this.stop, {
         passive: false

pages/scanning_B/scanning_B.vue

@@ -102,7 +102,7 @@
               });
             } else {
               uni.navigateTo({
-                url: `/pages/scanning_Result/scanning_Result?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}&isKs=1`,
+                url: `/pages/scanning_Result/scanning_Result?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}&isKs=1&qrcode=${this.currentCode}`,
               });
             }
           });

pages/scanning_Result/scanning_Result.vue

@@ -18,6 +18,7 @@
       </view>
       <view class="Scanning_top_text">
         <view class="text1"> 操作失败 </view>
+        <view class="text1 f30" v-if="queryObj.qrcode !== undefined"> 扫描内容：{{queryObj.qrcode}} </view>
       </view>
     </view>
 
@@ -239,6 +240,7 @@
   export default {
     data() {
       return {
+        currentCode: '', //当前小扫描的科室二维码
         // 手动查询标本弹窗model
         speModels: {
           disjunctor: false,
@@ -330,6 +332,7 @@
           content: ress1,
         }).then((result) => {
           this.SMFlag = true;
+          this.currentCode = result.code;
           if (result.state == 200 || result.state == 201) {
             let codes = result.code;
             if (codes) {
@@ -431,7 +434,7 @@
                     this.queryObj.dept
                   }&id=${this.dataId}&model=${encodeURIComponent(
                     JSON.stringify(this.infoDATA)
-                  )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}&scanOrHand=${type}`,
+                  )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}&scanOrHand=${type}&qrcode=${this.currentCode}`,
                   });
                 }
               });
@@ -464,14 +467,14 @@
       },
       // 继续扫描
       Scanning_again() {
-        // if (!this.SMFlag) {
-        //   return;
-        // }
-        // this.SMFlag = false;
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
         SM().then((ress1) => {
           this.hand_scanning_common(ress1, 'scan');
         }).catch(err => {
-          // this.SMFlag = true;
+          this.SMFlag = true;
         });
       },
       // 正常完成扫描
@@ -752,7 +755,7 @@
       },
     },
     onShow() {
-      // this.SMFlag = true;
+      this.SMFlag = true;
       this.gotoFlag = true;
     },
     onLoad(options) {

pages/scanning_all/scanning_all.vue

@@ -306,7 +306,8 @@ import { post, SM, webHandle } from "../../http/http.js";
 export default {
   data() {
     return {
-      // SMFlag: true,
+      currentCode: '', //当前小扫描的科室二维码
+      SMFlag: true,
       // 填写交接人账号弹窗model
       hosModels: {
         disjunctor: false,
@@ -466,10 +467,10 @@ export default {
           ) {
             this.orderDeptHandler(true);
           } else {
-            // if (!this.SMFlag) {
-            //   return;
-            // }
-            // this.SMFlag = false;
+            if (!this.SMFlag) {
+              return;
+            }
+            this.SMFlag = false;
             SM()
               .then((ress1) => {
                 uni.showLoading({
@@ -480,7 +481,8 @@ export default {
                 post("/dept/scanning", {
                   content: ress1,
                 }).then((result) => {
-                  // this.SMFlag = true;
+                  this.SMFlag = true;
+                  this.currentCode = result.code;
                   if (result.state == 200 || result.state == 201) {
                     let ress = result.code;
                     if (ress) {
@@ -552,7 +554,7 @@ export default {
                               JSON.stringify(this.userId.ids)
                             )}&model=${encodeURIComponent(
                               JSON.stringify(res)
-                            )}&code=${this.code}`,
+                            )}&code=${this.code}&qrcode=${this.currentCode}`,
                           });
                         }
                       });
@@ -568,7 +570,7 @@ export default {
                 });
               })
               .catch((err) => {
-                // this.SMFlag = true;
+                this.SMFlag = true;
               });
           }
         } else {
@@ -712,7 +714,7 @@ export default {
     // #endif
   },
   onShow() {
-    // this.SMFlag = true;
+    this.SMFlag = true;
     this.flag = true;
     // 创建动画
     this.animation = uni.createAnimation({

pages/scanning_code/scanning_code.vue

@@ -370,6 +370,7 @@
   export default {
     data() {
       return {
+        currentCode: '', //当前小扫描的科室二维码
         // 手动查询标本弹窗model
         speModels: {
           disjunctor: false,
@@ -450,6 +451,7 @@
         }).then((result) => {
           this.SMFlag = true;
           if (result.state == 200 || result.state == 201) {
+            this.currentCode = result.code;
             let codes = result.code;
             if (codes) {
               let speCode = codes;
@@ -590,7 +592,7 @@
                     this.queryObj.dept
                   }&id=${this.dataId}&model=${encodeURIComponent(
                     JSON.stringify(ress)
-                  )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}&scanOrHand=${type}`,
+                  )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}&scanOrHand=${type}&qrcode=${this.currentCode}`,
                   });
                 }
               });

pages/scanning_djEnd/scanning_djEnd.vue

@@ -22,6 +22,7 @@
       </view>
       <view class="Scanning_top_text">
         <view class="text1">操作失败</view>
+        <view class="text1 f30" v-if="queryObj.qrcode !== undefined">扫描内容：{{queryObj.qrcode}}</view>
       </view>
     </view>
 
@@ -201,6 +202,7 @@
   export default {
     data() {
       return {
+        currentCode: '', //当前小扫描的科室二维码
         // 手动查询标本弹窗model
         speModels: {
           disjunctor: false,
@@ -281,6 +283,7 @@
           content: ress1,
         }).then((result) => {
           this.SMFlag = true;
+          this.currentCode = result.code;
           if (result.state == 200 || result.state == 201) {
             let ress = result.code;
             let speCode = ress;
@@ -366,7 +369,7 @@
                   JSON.stringify(ress)
                 )}&accountObj=${encodeURIComponent(
                   JSON.stringify(this.accountObj)
-                )}&deptId=${this.deptId}&scanOrHand=${type}`,
+                )}&deptId=${this.deptId}&scanOrHand=${type}&qrcode=${this.currentCode}`,
                 });
               }
             });

pages/scanning_djInfo/scanning_djInfo.vue

@@ -24,6 +24,7 @@
       </view>
       <view class="Scanning_top_text">
         <view class="text1">操作失败</view>
+        <view class="text1 f30" v-if="queryObj.qrcode !== undefined">扫描内容：{{queryObj.qrcode}}</view>
       </view>
     </view>
     <view class="Scanning_cont" v-if="res.status != 200 || res.msg != '成功！'">
@@ -152,6 +153,7 @@
   export default {
     data() {
       return {
+        currentCode: '', //当前小扫描的科室二维码
         // 手动查询标本弹窗model
         speModels: {
           disjunctor: false,
@@ -255,6 +257,7 @@
           content: ress1,
         }).then((result) => {
           this.SMFlag = true;
+          this.currentCode = result.code;
           if (result.state == 200 || result.state == 201) {
             let ress = result.code;
             if (ress) {
@@ -374,7 +377,7 @@
                     JSON.stringify(res)
                   )}&speNum=${this.speNum}&accountObj=${encodeURIComponent(
                     JSON.stringify(this.accountObj)
-                  )}&deptId=${this.deptId}&scanOrHand=${type}`,
+                  )}&deptId=${this.deptId}&scanOrHand=${type}&qrcode=${this.currentCode}`,
                   });
                 }
               });

pages/scanning_drug/scanning_drug.vue

@@ -181,7 +181,7 @@ export default {
             uni.navigateTo(urlObj);
           } else {
             uni.navigateTo({
-              url: `/pages/scanning_Result/scanning_Result?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}&isKs=1`,
+              url: `/pages/scanning_Result/scanning_Result?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}&isKs=1&qrcode=${this.currentCode}`,
             });
           }
         });

pages/scanning_ins/scanning_ins.vue

@@ -246,7 +246,8 @@
   export default {
     data() {
       return {
-        // SMFlag:true,
+        currentCode: '', //当前小扫描的科室二维码
+        SMFlag:true,
         options: {},
         // wechatFocusSwitch: 0,
         hosId: "",
@@ -384,10 +385,10 @@
       },
       // 送回病房-扫描科室
       scanDept() {
-        // if (!this.SMFlag) {
-        //   return;
-        // }
-        // this.SMFlag = false;
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
         let infoDATA = JSON.parse(this.options.infoDATA);
         let code = "";
         SM().then((ress1) => {
@@ -399,7 +400,7 @@
           post("/dept/scanning", {
             content: ress1,
           }).then((result) => {
-            // this.SMFlag = true;
+            this.SMFlag = true;
             if (result.state == 200 || result.state == 201) {
               let ress = result.code;
               if (ress) {
@@ -455,7 +456,7 @@
             }
           });
         }).catch(err=>{
-          // this.SMFlag = true;
+          this.SMFlag = true;
         });
       },
       // 送回病房-选择起点科室
@@ -567,10 +568,10 @@
         if (data) {
           let type = "";
           if (data.gdState.value == "8") {
-            // if (!this.SMFlag) {
-            //   return;
-            // }
-            // this.SMFlag = false;
+            if (!this.SMFlag) {
+              return;
+            }
+            this.SMFlag = false;
             SM().then((ress1) => {
               // ----------------
               uni.showLoading({
@@ -581,7 +582,8 @@
               post("/dept/scanning", {
                 content: ress1,
               }).then((result) => {
-                // this.SMFlag = true;
+                this.SMFlag = true;
+                this.currentCode = result.code;
                 if (result.state == 200 || result.state == 201) {
                   let ress = result.code;
                   if (ress) {
@@ -608,7 +610,7 @@
                         uni.navigateTo({
                           url: `../scanning_djEnd/scanning_djEnd?model=${encodeURIComponent(
                           JSON.stringify(res)
-                        )}`,
+                        )}&qrcode=${this.currentCode}`,
                         });
                       }
                     });
@@ -623,7 +625,7 @@
               });
               // ------------------------------
             }).catch(err=>{
-              // this.SMFlag = true;
+              this.SMFlag = true;
             });
           } else {
             if (data.taskType.associationType.value == "patientTransport") {
@@ -758,7 +760,7 @@
       // #endif
     },
     onShow() {
-      // this.SMFlag = true;
+      this.SMFlag = true;
       // 创建动画
       this.animation = uni.createAnimation({
         duration: 500,

pages/settingCode/settingCode.vue

@@ -26,7 +26,7 @@
   export default {
     data() {
       return {
-        // SMFlag:true,
+        SMFlag:true,
         queryDept: null, //根据二维码查询到的科室
         settings: [], //底部按钮设置
         msg: '', //提示信息
@@ -156,10 +156,10 @@
       },
       // 扫一扫
       drugsScanning() {
-        // if (!this.SMFlag) {
-        //   return;
-        // }
-        // this.SMFlag = false;
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
         SM().then((ress) => {
           this.qrCode = ress;
           let postData = {
@@ -171,7 +171,7 @@
             mask: true,
           });
           post("/dept/scanChangeDept", postData).then((res) => {
-            // this.SMFlag = true;
+            this.SMFlag = true;
             uni.hideLoading();
             if (res.status == 200) {
               if (res.data) { //替换
@@ -198,12 +198,12 @@
             }
           })
         }).catch(err=>{
-          // this.SMFlag = true;
+          this.SMFlag = true;
         });
       },
     },
     onShow(){
-      // this.SMFlag = true;
+      this.SMFlag = true;
     },
     onLoad(options) {
       console.log(options,'seimin')