标本，药品修改

components/bigScreen/bigScreen.vue

@@ -8,9 +8,18 @@
 <script>
 import { post, SM } from "../../http/http.js";
 export default {
+  data(){
+    return {
+      SMFlag:true,
+    }
+  },
   methods: {
     // 底部扫描
     Scanning() {
+      if (!this.SMFlag) {
+        return;
+      }
+      this.SMFlag = false;
       SM().then((content) => {
         uni.showLoading({
           title: "加载中",
@@ -21,12 +30,13 @@ export default {
           content,
         })
           .then((result) => {
+            this.SMFlag = true;
             // 200检测通过，201没有有效期也通过。
             if (result.state == 200 || result.state == 201) {
               let data = {
                 code: result.code, //二维码
               };
-              //微信—大扫描（科室码，患者码，标本码，快捷建单码）
+              //微信—大扫描（科室码，患者码，标本码，快捷建单码，药包码）
               post("/workerOrder/scanCode", data)
                 .then((res) => {
                   uni.hideLoading();
@@ -83,6 +93,11 @@ export default {
                           JSON.stringify(infoDATA)
                         )}&code=${data.code}`,
                       });
+                    }else if(res.type == 'drugsBag'){
+                      //扫药包码
+                      uni.navigateTo({
+                        url: `/pages/scanning_drug/scanning_drug?drugsBagId=${res.drugsBagId}`,
+                      });
                     }
                   } else {
                     uni.navigateTo({
@@ -98,9 +113,14 @@ export default {
               });
             }
           })
+      }).catch(err=>{
+        this.SMFlag = true;
       });
     },
   },
+  onShow(){
+    this.SMFlag = true;
+  }
 };
 </script>
 

components/selectAccount/selectAccount.vue

@@ -7,15 +7,15 @@
       <view class="changeHospital__article">
         <view class="uni-list-cell">
           <view class="uni-list-cell-left">
-            交接人账号：
+            {{name}}账号：
           </view>
           <view class="uni-list-cell-db">
-            <input class="uni-input" auto-focus="true" placeholder="请填写交接人信息" v-model="account" @input="bindPickerChange($event)" />
+            <input class="uni-input" auto-focus="true" :placeholder="'请填写'+name+'账号'" v-model="account" @input="bindPickerChange($event)" />
           </view>
         </view>
         <view class="uni-list-cell">
           <view class="uni-list-cell-left">
-            交接人姓名：
+            {{name}}姓名：
           </view>
           <view class="uni-list-cell-db-text">
             <text>{{accountName}}</text>
@@ -84,6 +84,10 @@
           };
         },
       },
+      name:{
+        type:String,
+        default:'交接人'
+      }
     },
     methods: {
       //修改picker的值

components/smallScreen/smallScreen.vue

@@ -25,6 +25,7 @@
         hosModels: {
           disjunctor: false,
         },
+        SMFlag:true,
       }
     },
     props: {
@@ -219,6 +220,10 @@
       // type==2  如果不是患者陪检，患者转运，其他
       // 扫码（小扫描）
       Scan_ss(data, type) {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
         this.currentData = data;
         console.log(data, 'data');
         SM().then((ress1) => {
@@ -232,6 +237,7 @@
             taskTypeId: data.taskType.id,
             gdState: data.gdState.id,
           }).then((result) => {
+            this.SMFlag = true;
             this.currentCode = result.code;
             if (result.state == 200 || result.state == 201) {
               if (result.account) {
@@ -266,6 +272,8 @@
               });
             }
           });
+        }).catch(err=>{
+          this.SMFlag = true;
         });
       },
       // 填写交接人账号-确认
@@ -340,6 +348,9 @@
     },
     components: {
       selectAccount
+    },
+    onShow(){
+      this.SMFlag = true;
     }
   };
 </script>

http/http.js

@@ -91,7 +91,7 @@ export function SM() {
         resolve(str);
       },
       fail(err) {
-        console.error(err)
+        reject(err)
       }
     });
   });

main.js

@@ -2,7 +2,8 @@ import Vue from 'vue'
 import App from './App'
 // #ifdef H5
 import wx from 'weixin-jsapi'
-
+// import VConsole from 'vconsole';
+// new VConsole();
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

package-lock.json

@@ -10,6 +10,7 @@
       "license": "ISC",
       "dependencies": {
         "crypto-js": "^4.1.1",
+        "vconsole": "^3.12.1",
         "weixin-jsapi": "^1.1.0"
       },
       "devDependencies": {
@@ -79,6 +80,20 @@
         "typedarray": "^0.0.6"
       }
     },
+    "node_modules/copy-text-to-clipboard": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
+      "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.21.1",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz",
+      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
+      "hasInstallScript": true
+    },
     "node_modules/cpu-features": {
       "version": "0.0.2",
       "resolved": "https://registry.npmmirror.com/cpu-features/download/cpu-features-0.0.2.tgz",
@@ -191,6 +206,11 @@
         "node": "*"
       }
     },
+    "node_modules/mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
+    },
     "node_modules/nan": {
       "version": "2.15.0",
       "resolved": "https://registry.npmmirror.com/nan/download/nan-2.15.0.tgz",
@@ -381,6 +401,16 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
+    "node_modules/vconsole": {
+      "version": "3.12.1",
+      "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.12.1.tgz",
+      "integrity": "sha512-L4lN8rRBz8+O56k6FNE0qQ89fE3T3VwoehpcwpbQcmOKTqREJi+d8V6gfyes4TZS0K2dbCZsModcssriaL0ALQ==",
+      "dependencies": {
+        "copy-text-to-clipboard": "^3.0.1",
+        "core-js": "^3.11.0",
+        "mutation-observer": "^1.0.3"
+      }
+    },
     "node_modules/weixin-jsapi": {
       "version": "1.1.0",
       "resolved": "https://registry.npm.taobao.org/weixin-jsapi/download/weixin-jsapi-1.1.0.tgz",
@@ -452,6 +482,16 @@
         "typedarray": "^0.0.6"
       }
     },
+    "copy-text-to-clipboard": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz",
+      "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q=="
+    },
+    "core-js": {
+      "version": "3.21.1",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.21.1.tgz",
+      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="
+    },
     "cpu-features": {
       "version": "0.0.2",
       "resolved": "https://registry.npmmirror.com/cpu-features/download/cpu-features-0.0.2.tgz",
@@ -548,6 +588,11 @@
         "brace-expansion": "^1.1.7"
       }
     },
+    "mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
+    },
     "nan": {
       "version": "2.15.0",
       "resolved": "https://registry.npmmirror.com/nan/download/nan-2.15.0.tgz",
@@ -702,6 +747,16 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
+    "vconsole": {
+      "version": "3.12.1",
+      "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.12.1.tgz",
+      "integrity": "sha512-L4lN8rRBz8+O56k6FNE0qQ89fE3T3VwoehpcwpbQcmOKTqREJi+d8V6gfyes4TZS0K2dbCZsModcssriaL0ALQ==",
+      "requires": {
+        "copy-text-to-clipboard": "^3.0.1",
+        "core-js": "^3.11.0",
+        "mutation-observer": "^1.0.3"
+      }
+    },
     "weixin-jsapi": {
       "version": "1.1.0",
       "resolved": "https://registry.npm.taobao.org/weixin-jsapi/download/weixin-jsapi-1.1.0.tgz",

package.json

@@ -15,6 +15,7 @@
   "license": "ISC",
   "dependencies": {
     "crypto-js": "^4.1.1",
+    "vconsole": "^3.12.1",
     "weixin-jsapi": "^1.1.0"
   },
   "devDependencies": {

pages.json

@@ -7,7 +7,7 @@
           "titleNView": false
         }
       }
-    },{
+    }, {
       "path": "pages/bindUser/bindUser", //绑定账号页面
       "style": {
         "h5": {
@@ -176,14 +176,20 @@
         }
       }
 
-    },{
+    }, {
       "path": "pages/noScanSpecimen/noScanSpecimen",
       "style": {
         "h5": {
           "titleNView": false
         }
       }
-
+    }, {
+      "path": "pages/scanning_drug/scanning_drug",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
     }, {
       "path": "components/footTool/footTool",
       "style": {

pages/noScanSpecimen/noScanSpecimen.vue

@@ -61,6 +61,7 @@
     data() {
       return {
         workOrderId: -1,
+        deptCode: '',
         specimens: [],
       };
     },
@@ -75,6 +76,7 @@
           workOrderId: this.workOrderId,
           currentPage: 0,
           pageSize: 999,
+          deptQrCode:this.deptCode
         };
         uni.showLoading({
           title: "加载中",
@@ -90,6 +92,7 @@
     },
     onLoad(options) {
       this.workOrderId = options.workOrderId;
+      this.deptCode = options.deptCode;
       this.getNoScanSpecimen();
       // #ifdef APP-PLUS
       webHandle("no", "app");

pages/patientInformationList/patientInformationList.vue

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

pages/pharmacy/pharmacy.vue

@@ -107,6 +107,7 @@ import { get, post, SM, webHandle } from "../../http/http.js";
 export default {
   data() {
     return {
+      SMFlag:true,
       triggered: false, //下拉刷新状态
       freshing: false, //上拉加载开关
       scroll_top: 0, //距离顶部的距离
@@ -187,10 +188,16 @@ export default {
     },
     // 扫一扫
     drugsScanning() {
+      if (!this.SMFlag) {
+        return;
+      }
+      this.SMFlag = false;
       SM().then((ress) => {
         uni.navigateTo({
           url: "../pharmacyDetails/pharmacyDetails?qrcode=" + ress,
         });
+      }).catch(err=>{
+        this.SMFlag = true;
       });
     },
     //刷新
@@ -302,6 +309,7 @@ export default {
     // #endif
   },
   onShow() {
+    this.SMFlag = true;
     // #ifdef H5
     document.body.addEventListener("touchmove", this.stop, { passive: false });
     // #endif

pages/pharmacyDetails/pharmacyDetails.vue

@@ -45,11 +45,26 @@
       <view class="L-l"></view>
       <view class="R-l"></view>
     </view>
+    <view v-if="infoDATA.drugsState && infoDATA.drugsState.value == 4&&infoDATA.launch.id==loginUser.dept.id"
+      class="btn-wrap">
+      <button class="cube-toolbar-item1" :loading="isLoading" :disabled="isLoading" @click="dispensing(4)"
+        v-if="infoDATA.drugsState && infoDATA.drugsState.value == 4&&infoDATA.launch.id==loginUser.dept.id">
+        核对完成
+      </button>
+      <button class="cube-toolbar-item1" :loading="isOLoading" :disabled="isOLoading" @click="nursetake()">
+        护士自取
+      </button>
+    </view>
+    <button class="cube-toolbar-item" :loading="isOLoading" :disabled="isOLoading" @click="nursetake()"
+      v-if="infoDATA.drugsState && infoDATA.drugsState.value == 8&&infoDATA.launch.id==loginUser.dept.id">
+      护士自取
+    </button>
     <button class="cube-toolbar-item" :loading="isLoading" :disabled="isLoading" @click="dispensing(1)"
-      v-if="infoDATA.drugsState && infoDATA.drugsState.name == '待配药'&&infoDATA.launch.id==loginUser.dept.id">
+      v-if="infoDATA.drugsState && infoDATA.drugsState.value == 1&&infoDATA.launch.id==loginUser.dept.id">
       开始配药
     </button>
-    <view v-if="infoDATA.drugsState && infoDATA.drugsState.name == '配药中'&&infoDATA.launch.id==loginUser.dept.id" class="btn-wrap">
+    <view v-if="infoDATA.drugsState && infoDATA.drugsState.value == 2&&infoDATA.launch.id==loginUser.dept.id"
+      class="btn-wrap">
       <button class="cube-toolbar-item1" :loading="isLoading" :disabled="isLoading" @click="dispensing(2)">
         进行核对
       </button>
@@ -57,9 +72,14 @@
         替换配药人
       </button>
     </view>
+    <!-- 护士自取账号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+      @cancel="hosCancel">
+    </selectAccount>
   </view>
 </template>
 <script>
+  import selectAccount from "@/components/selectAccount/selectAccount.vue";
   import {
     get,
     post,
@@ -72,10 +92,116 @@
         infoDATA: [],
         isLoading: false,
         isTLoading: false,
-        loginUser: {} //当前登录用户
+        isOLoading: false,
+        loginUser: {}, //当前登录用户
+        // 护士自取弹窗model
+        hosModels: {
+          disjunctor: false,
+        },
       };
     },
+    components: {
+      selectAccount
+    },
     methods: {
+      // 确认
+      hosOk(data) {
+        console.log(data);
+        const {
+          accountName,
+          account,
+          accountId
+        } = data;
+        if (!accountName && !account) {
+          //没有填写交接人
+          uni.showModal({
+            title: '提示',
+            content: "请填写账号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+          return;
+        } else if (!accountName && account || accountName && !account) {
+          //没有填写
+          uni.showModal({
+            title: '提示',
+            content: "请填写正确的账号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log('用户点击确定');
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+          return;
+        }
+        this.hosModels.disjunctor = false;
+        //请求接口
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let postData = {
+          id: this.infoDATA.id,
+          packId: this.infoDATA.packid,
+          recipient: accountId,
+          recipientName:accountName
+        };
+        if (this.infoDATA.gdId) {
+          postData.gdId = this.infoDATA.gdId;
+        }
+        post('/drugsBag/nurseByHerself', postData).then(result => {
+          uni.hideLoading();
+          if (result.state == 200) {
+            uni.showModal({
+              title: '提示',
+              content: result.info || "护士自取成功！",
+              showCancel: false,
+              success: function(res) {
+                if (res.confirm) {
+                  uni.navigateTo({
+                    url: "../pharmacy/pharmacy",
+                  });
+                } else if (res.cancel) {
+                  console.log('用户点击取消');
+                }
+              }
+            });
+          } else {
+            uni.showModal({
+              title: '提示',
+              content: "请求失败！",
+              showCancel: false,
+              success: function(res) {
+                if (res.confirm) {
+                  console.log('用户点击确定');
+                } else if (res.cancel) {
+                  console.log('用户点击取消');
+                }
+              }
+            });
+          }
+        })
+      },
+      // 取消
+      hosCancel() {
+        this.hosModels.disjunctor = false;
+      },
+      // 护士自取
+      nursetake() {
+        this.hosModels = {
+          title: '填写账号',
+          disjunctor: true,
+        }
+      },
       // 替换配药人
       replaceOperator() {
         this.isTLoading = true;
@@ -117,124 +243,180 @@
           }
         })
       },
-      // 开始配药,进行核对,,,1是待配药,2是配药中
+      // 开始配药,进行核对,1是待配药,2是配药中,4是核对中
       dispensing(type) {
-        this.isLoading = true;
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
+        let msg = '';
         if (type == 1) {
-          post("/drugsBag/changeToIng", {
-            id: this.infoDATA.id,
-          }).then((result) => {
-            this.isLoading = false;
-            uni.hideLoading();
-            if (result.state == 200) {
-              uni.showModal({
-                title: '提示',
-                content: result.info || "开始配药成功！",
-                showCancel: false,
-                success: function(res) {
-                  if (res.confirm) {
-                    uni.navigateTo({
-                      url: "../pharmacy/pharmacy",
-                    });
-                  } else if (res.cancel) {
-                    console.log('用户点击取消');
-                  }
-                }
+          msg = '是否开始配药?'
+        } else if (type == 2) {
+          msg = '是否进行核对?'
+        } else if (type == 4) {
+          msg = '是否核对完成?'
+        }
+        uni.showModal({
+          title: '提示',
+          content: msg,
+          success: res => {
+            if (res.confirm) {
+              console.log('用户点击确定');
+              this.isLoading = true;
+              uni.showLoading({
+                title: "加载中",
+                mask: true,
               });
-              // let data = {
-              //   launchId: this.infoDATA.launch.id,
-              //   drugsBagId: this.infoDATA.id,
-              // };
-              // post("/drugsBag/autoDrugsBags", data).then((result1) => {
-              //   this.isLoading = false;
-              //   if (result1.status == 200) {
-              //     uni.showToast({
-              //       title: "操作成功！",
-              //       success() {
-              //         uni.navigateTo({
-              //           url: "../pharmacy/pharmacy",
-              //         });
-              //       },
-              //     });
-              //   }else if(result1.status == 501){
-              //     uni.showToast({
-              //       icon: "none",
-              //       title: result1.error,
-              //     });
-              //   }else {
-              //     uni.showToast({
-              //       icon: "none",
-              //       title: "请求失败！",
-              //     });
-              //   }
-              // });
-              // } else if(result.state == 503){//未建单
-              //   uni.showToast({
-              //     icon: "none",
-              //     title: result.error,
-              //   });
-            } else {
-              // this.isLoading = false;
-              uni.showModal({
-                title: '提示',
-                content: "请求失败！",
-                showCancel: false,
-                success: function(res) {
-                  if (res.confirm) {
-                    console.log('用户点击确定');
-                  } else if (res.cancel) {
-                    console.log('用户点击取消');
+              if (type == 1) {
+                post("/drugsBag/changeToIng", {
+                  id: this.infoDATA.id,
+                }).then((result) => {
+                  this.isLoading = false;
+                  uni.hideLoading();
+                  if (result.state == 200) {
+                    uni.showModal({
+                      title: '提示',
+                      content: result.info || "开始配药成功！",
+                      showCancel: false,
+                      success: function(res) {
+                        if (res.confirm) {
+                          uni.navigateTo({
+                            url: "../pharmacy/pharmacy",
+                          });
+                        } else if (res.cancel) {
+                          console.log('用户点击取消');
+                        }
+                      }
+                    });
+                    // let data = {
+                    //   launchId: this.infoDATA.launch.id,
+                    //   drugsBagId: this.infoDATA.id,
+                    // };
+                    // post("/drugsBag/autoDrugsBags", data).then((result1) => {
+                    //   this.isLoading = false;
+                    //   if (result1.status == 200) {
+                    //     uni.showToast({
+                    //       title: "操作成功！",
+                    //       success() {
+                    //         uni.navigateTo({
+                    //           url: "../pharmacy/pharmacy",
+                    //         });
+                    //       },
+                    //     });
+                    //   }else if(result1.status == 501){
+                    //     uni.showToast({
+                    //       icon: "none",
+                    //       title: result1.error,
+                    //     });
+                    //   }else {
+                    //     uni.showToast({
+                    //       icon: "none",
+                    //       title: "请求失败！",
+                    //     });
+                    //   }
+                    // });
+                    // } else if(result.state == 503){//未建单
+                    //   uni.showToast({
+                    //     icon: "none",
+                    //     title: result.error,
+                    //   });
+                  } else {
+                    // this.isLoading = false;
+                    uni.showModal({
+                      title: '提示',
+                      content: "请求失败！",
+                      showCancel: false,
+                      success: function(res) {
+                        if (res.confirm) {
+                          console.log('用户点击确定');
+                        } else if (res.cancel) {
+                          console.log('用户点击取消');
+                        }
+                      }
+                    });
                   }
-                }
-              });
-            }
-          });
-        } else if (type == 2) {
-          post("/drugsBag/changeToCheck", {
-            id: this.infoDATA.id,
-          }).then((result) => {
-            this.isLoading = false;
-            uni.hideLoading();
-            if (result.state == 200) {
-              uni.showModal({
-                title: '提示',
-                content: result.info || "进行核对成功！",
-                showCancel: false,
-                success: function(res) {
-                  if (res.confirm) {
-                    uni.navigateTo({
-                      url: "../pharmacy/pharmacy",
+                });
+              } else if (type == 2) {
+                post("/drugsBag/changeToCheck", {
+                  id: this.infoDATA.id,
+                }).then((result) => {
+                  this.isLoading = false;
+                  uni.hideLoading();
+                  if (result.state == 200) {
+                    uni.showModal({
+                      title: '提示',
+                      content: result.info || "进行核对成功！",
+                      showCancel: false,
+                      success: function(res) {
+                        if (res.confirm) {
+                          uni.navigateTo({
+                            url: "../pharmacy/pharmacy",
+                          });
+                        } else if (res.cancel) {
+                          console.log('用户点击取消');
+                        }
+                      }
+                    });
+                  } else {
+                    uni.showModal({
+                      title: '提示',
+                      content: "请求失败！",
+                      showCancel: false,
+                      success: function(res) {
+                        if (res.confirm) {
+                          console.log('用户点击确定');
+                        } else if (res.cancel) {
+                          console.log('用户点击取消');
+                        }
+                      }
                     });
-                  } else if (res.cancel) {
-                    console.log('用户点击取消');
                   }
-                }
-              });
-            } else {
-              uni.showModal({
-                title: '提示',
-                content: "请求失败！",
-                showCancel: false,
-                success: function(res) {
-                  if (res.confirm) {
-                    console.log('用户点击确定');
-                  } else if (res.cancel) {
-                    console.log('用户点击取消');
+                });
+              } else if (type == 4) {
+                post("/drugsBag/checkComplete", {
+                  id: this.infoDATA.id,
+                  packId: this.infoDATA.packid
+                }).then((result) => {
+                  this.isLoading = false;
+                  uni.hideLoading();
+                  if (result.state == 200) {
+                    uni.showModal({
+                      title: '提示',
+                      content: result.info || "核对完成成功！",
+                      showCancel: false,
+                      success: function(res) {
+                        if (res.confirm) {
+                          uni.navigateTo({
+                            url: "../pharmacy/pharmacy",
+                          });
+                        } else if (res.cancel) {
+                          console.log('用户点击取消');
+                        }
+                      }
+                    });
+                  } else {
+                    uni.showModal({
+                      title: '提示',
+                      content: "请求失败！",
+                      showCancel: false,
+                      success: function(res) {
+                        if (res.confirm) {
+                          console.log('用户点击确定');
+                        } else if (res.cancel) {
+                          console.log('用户点击取消');
+                        }
+                      }
+                    });
                   }
-                }
-              });
+                });
+              }
+            } else if (res.cancel) {
+              console.log('用户点击取消');
             }
-          });
-        }
+          }
+        });
       },
     },
     onLoad(options) {
       this.loginUser = uni.getStorageSync("userData").user;
-      console.log(this.loginUser,'loginUserloginUser')
+      console.log(this.loginUser, 'loginUserloginUser')
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif
@@ -254,10 +436,11 @@
           uni.hideLoading();
           if (result.state == 200) {
             this.infoDATA = result.result;
-            if(this.loginUser.dept.id != this.infoDATA.launch.id){
+            if (this.loginUser.dept.id != this.infoDATA.launch.id) {
               uni.showModal({
                 title: '提示',
-                content: "您现在所在的科室是【"+this.loginUser.dept.dept+"】,药包所在的科室是【"+this.infoDATA.launch.dept+"】,您不能进行操作",
+                content: "您现在所在的科室是【" + this.loginUser.dept.dept + "】,药包所在的科室是【" + this.infoDATA.launch.dept +
+                  "】,您不能进行操作",
                 showCancel: false,
                 success: function(res) {
                   if (res.confirm) {
@@ -287,10 +470,11 @@
           uni.hideLoading();
           if (res.status == 200) {
             this.infoDATA = res.data;
-            if(this.loginUser.dept.id != this.infoDATA.launch.id){
+            if (this.loginUser.dept.id != this.infoDATA.launch.id) {
               uni.showModal({
                 title: '提示',
-                content: "您现在所在的科室是【"+this.loginUser.dept.dept+"】,药包所在的科室是【"+this.infoDATA.launch.dept+"】,您不能进行操作",
+                content: "您现在所在的科室是【" + this.loginUser.dept.dept + "】,药包所在的科室是【" + this.infoDATA.launch.dept +
+                  "】,您不能进行操作",
                 showCancel: false,
                 success: function(res) {
                   if (res.confirm) {
@@ -492,19 +676,20 @@
     }
 
     .btn-wrap {
+      width: 100%;
       display: flex;
       justify-content: space-between;
       position: fixed;
-      left: 20rpx;
+      left: 0;
       bottom: 160rpx;
     }
 
     .cube-toolbar-item1 {
-      width: 350rpx;
+      flex: 1;
       height: 68rpx;
       line-height: 68rpx;
       border-radius: 8rpx;
-      margin: 0 5rpx;
+      margin: 0 1%;
       background: linear-gradient(to right, #72c172, #3bb197);
       font-size: 36rpx;
       color: #fff;

pages/scanning/scanning.vue

@@ -222,6 +222,7 @@ export default {
     },
   },
   onLoad(options) {
+    console.log(options,'options')
     this.queryObj = options;
     let id = JSON.parse(options.id);
     this.dataId = id;

pages/scanning_Result/scanning_Result.vue

@@ -213,7 +213,7 @@
     </showModel>
     <!-- 弹窗 -->
     <showModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content"
-      @ok="ok2" @cancel="cancel2" :operate="models2.operate">
+      @ok="ok2" @know="know2" @cancel="cancel2" :operate="models2.operate">
     </showModel>
   </view>
 </template>
@@ -231,10 +231,12 @@
   export default {
     data() {
       return {
+        SMFlag:true,
         // 交接人信息
         accountObj: undefined,
         // 完成扫描的id
         wcId: "",
+        wcFlag:false,
         // 弹窗model
         models: {
           disjunctor: false,
@@ -271,7 +273,7 @@
         }
         this.gotoFlag = false;
         uni.navigateTo({
-          url: `../noScanSpecimen/noScanSpecimen?workOrderId=${this.queryObj.id}`,
+          url: `../noScanSpecimen/noScanSpecimen?workOrderId=${this.queryObj.id}&deptCode=${this.queryObj.deptCode}`,
         });
       },
       // 拍照
@@ -280,6 +282,10 @@
       },
       // 继续扫描
       Scanning_again() {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
         SM().then((ress1) => {
           // ----------------
           uni.showLoading({
@@ -290,6 +296,7 @@
           post("/dept/scanning", {
             content: ress1,
           }).then((result) => {
+            this.SMFlag = true;
             if (result.state == 200 || result.state == 201) {
               let codes = result.code;
               if (codes) {
@@ -326,7 +333,8 @@
                   if (ress.status == 200) {
                     if (this.type == "specimenPlan" || this.type == "specimen") {
                       this.infoDATA = ress.data;
-                      uni.navigateTo({
+                      this.speNum = ress.specimenCount;
+                      uni.redirectTo({
                         url: `../scanning_Result/scanning_Result?type=${
                         this.queryObj.type
                       }&type1=${
@@ -335,7 +343,7 @@
                         JSON.stringify(ress.data)
                       )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
                         this.queryObj.deptCode
-                      }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}`,
+                      }&dept=${this.queryObj.dept}&id=${this.dataId}&model=${encodeURIComponent(JSON.stringify(ress))}&speNum=${this.speNum}`,
                       });
                     } else if (
                       this.type == "inspect" ||
@@ -395,15 +403,16 @@
             }
           });
           // ------------------------------
+        }).catch(err=>{
+          this.SMFlag = true;
         });
       },
       // 正常完成扫描
       overFinish() {
         let data = {
           type: this.queryObj.type1,
-          ids: [],
+          ids: [this.wcId],
         };
-        data.ids.push(this.wcId);
         //只要是标本轮巡1对多或者多对多
         // plan-spe-dsd-2  1对多
         // plan-spe-dsd-3  多对多
@@ -415,9 +424,15 @@
           post("/workerOrder/finishPlanSpes", data).then((res) => {
             // uni.hideLoading()
             if (res.status == 200) {
-              uni.navigateTo({
-                url: "../receiptpage/receiptpage",
-              });
+              this.models2 = {
+                disjunctor: true,
+                title: "提示",
+                content: `完成扫描成功`,
+                icon: "success",
+                operate: {
+                  know: "知道了",
+                },
+              };
             } else {
               uni.showToast({
                 icon: "none",
@@ -446,7 +461,8 @@
         this.models.disjunctor = false;
         let postData = {
           ids: [this.queryObj.id],
-          sign: true
+          sign: true,
+          deptQrCode:this.queryObj.deptCode
         };
         uni.showLoading({
           title: '加载中',
@@ -456,13 +472,25 @@
           uni.hideLoading();
           if (ress.status == 200) {
             if (ress.actualReceiveNum === undefined) {
-              //正常完成扫描
-              this.overFinish()
+              if(this.wcFlag){
+                //正常完成扫描
+                this.overFinish()
+              }else{
+                this.gotoOver();
+              }
             } else {
+              let content = '';
+              if(this.queryObj.type1 === 'spe-ddd-2'||this.queryObj.type1 === 'plan-spe-ddd-2'){
+                //待到达
+                content = `系统内预计标本<strong class="red">${ress.expectReceiveNum}</strong>只，您扫描收取标本<strong class="red">${ress.actualReceiveNum}</strong>只，其中<strong class="red">${ress.notReceiveNum}</strong>只未扫描；`;
+              }else{
+                //待送达
+                content = `本工单已签到${ress.scanSet?ress.scanSet.join('、'):''}，剩余需签到科室${ress.notScanSet?ress.notScanSet.join('、'):''}，总签收${ress.totalAcceptance}只，剩余${ress.notAcceptance}只未签收，您确定完成工单吗？`;
+              }
               this.models2 = {
                 disjunctor: true,
                 title: "提示",
-                content: `您扫描的标本<strong class="red">${ress.actualReceiveNum}</strong>个，与系统预计标本${ress.expectReceiveNum}个标本不一致，您确认要完成扫描码？`,
+                content,
                 icon: "warn",
                 operate: {
                   ok: "确定",
@@ -487,6 +515,7 @@
         this.models2.disjunctor = false;
         let postData = {
           ids: [this.queryObj.id],
+          deptQrCode:this.queryObj.deptCode
         };
         uni.showLoading({
           title: '加载中',
@@ -495,9 +524,11 @@
         post("/workerOrder/expectedAndActual", postData).then((ress) => {
           uni.hideLoading();
           if (ress.status == 200) {
-            uni.navigateTo({
-              url: "../receiptpage/receiptpage",
-            });
+            if(this.wcFlag){
+              this.overFinish()
+            }else{
+              this.gotoOver();
+            }
           } else {
             uni.showToast({
               icon: "none",
@@ -510,18 +541,37 @@
       cancel2() {
         this.models2.disjunctor = false;
       },
+      know2(){
+        this.models2.disjunctor = false;
+        uni.navigateTo({
+          url: "../receiptpage/receiptpage",
+        });
+      },
       // 完成扫描
       Scanning_complete(id) {
-        let data = {
-          type: this.queryObj.type1,
-          ids: [],
-        };
-        data.ids.push(id);
+        this.wcId = id;
         if (
           this.queryObj.type1 == "plan-spe-ddd-2" ||
           this.queryObj.type1 == "spe-ddd-2"
         ) {
-          this.wcId = id;
+          this.wcFlag = true;
+          this.models = {
+            disjunctor: true,
+            title: "提示",
+            content: "是否确定标本已扫描完成？",
+            icon: "warn",
+            operate: {
+              ok: "确定",
+              cancel: "取消",
+            },
+          };
+        }else if (
+          this.queryObj.type1 == "plan-spe-dsd-2" ||
+          this.queryObj.type1 == "plan-spe-dsd-3" ||
+          this.queryObj.type1 == "spe-dsd-2" ||
+          this.queryObj.type1 == "spe-dsd-3"
+        ) {
+          this.wcFlag = false;
           this.models = {
             disjunctor: true,
             title: "提示",
@@ -533,14 +583,18 @@
             },
           };
         } else {
-          uni.navigateTo({
+          this.gotoOver();
+        }
+      },
+      // 跳转完成工单页面
+      gotoOver(){
+        uni.navigateTo({
             url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
             this.queryObj.type1
-          }&id=${encodeURIComponent(JSON.stringify(data.ids))}&deptCode=${
+          }&id=${encodeURIComponent(JSON.stringify([this.wcId]))}&deptCode=${
             this.queryObj.deptCode
           }&dept=${this.queryObj.dept}&speNum=${this.speNum}`,
           });
-        }
       },
       // 继续执行工单,当扫错科室码的时候，直接跳过，默默执行正确的科室码
       goToRight(id) {
@@ -629,6 +683,7 @@
       },
     },
     onShow() {
+      this.SMFlag = true;
       this.gotoFlag = true;
     },
     onLoad(options) {

pages/scanning_all/scanning_all.vue

@@ -275,6 +275,7 @@ import { post, SM, webHandle } from "../../http/http.js";
 export default {
   data() {
     return {
+      SMFlag:true,
       // 弹窗model
       models: {
         disjunctor: false,
@@ -373,6 +374,10 @@ export default {
               }
             });
           } else {
+            if (!this.SMFlag) {
+              return;
+            }
+            this.SMFlag = false;
             SM().then((ress1) => {
               uni.showLoading({
                 title: "加载中",
@@ -382,6 +387,7 @@ export default {
               post("/dept/scanning", {
                 content: ress1,
               }).then((result) => {
+                this.SMFlag = true;
                 if (result.state == 200 || result.state == 201) {
                   let ress = result.code;
                   if (ress) {
@@ -467,6 +473,8 @@ export default {
                   });
                 }
               });
+            }).catch(err=>{
+              this.SMFlag = true;
             });
           }
         } else {
@@ -610,6 +618,7 @@ export default {
     // #endif
   },
   onShow() {
+    this.SMFlag = true;
     this.flag = true;
     // 创建动画
     this.animation = uni.createAnimation({

pages/scanning_code/scanning_code.vue

@@ -365,6 +365,7 @@
   export default {
     data() {
       return {
+        SMFlag:true,
         // 交接人信息
         accountObj:undefined,
         // 完成工单的id
@@ -391,6 +392,10 @@
       },
       // 扫描
       Scanning_again(id) {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
         SM().then((ress1) => {
           // ----------------
           uni.showLoading({
@@ -401,6 +406,7 @@
           post("/dept/scanning", {
             content: ress1,
           }).then((result) => {
+            this.SMFlag = true;
             if (result.state == 200 || result.state == 201) {
               let codes = result.code;
               if (codes) {
@@ -421,6 +427,9 @@
                   if(this.accountObj){
                     data.handover = this.accountObj.accountId;
                   }
+                  if(this.queryObj.grabOrders){
+                    data.grabOrders = '666';
+                  }
                 }
                 if (this.infoDATA.taskType.associationType.value == "specimen") {
                   data["speCode"] = data.code;
@@ -580,6 +589,8 @@
             }
           });
           // ------------------------------
+        }).catch(err=>{
+          this.SMFlag = true;
         });
       },
       show(type) {
@@ -713,6 +724,9 @@
         });
       },
     },
+    onShow(){
+      this.SMFlag = true;
+    },
     onLoad(options) {
       console.log(options);
       if(options.accountObj && options.accountObj != "undefined"){

pages/scanning_djEnd/scanning_djEnd.vue

@@ -170,9 +170,9 @@
           (type1 != 'spe-ddd-1') & (type1 != 'spe-ddd-2'))
       "
     >
-      <view class="btn1" @click="Scanning_again()">继续扫描标本</view>
-      <!-- <view class="btn3" @click="getNoScanSpecimen()">查看未扫描标本</view> -->
-      <!-- <view class="btn2" @click="Scanning_complete(ids)">完成扫描</view> -->
+      <view class="btn1" @click="Scanning_again()">扫描标本</view>
+      <view class="btn3" @click="getNoScanSpecimen()" v-show="this.queryObj.speNum">查看未扫描标本</view>
+      <view class="btn2" @click="Scanning_complete(ids)" v-show="this.queryObj.speNum">完成扫描</view>
     </view>
     <view
       class="foot_btn"
@@ -181,9 +181,9 @@
         (type == 'specimen' && type1 == 'spe-ddd-2')
       "
     >
-      <view class="btn1" @click="Scanning_again()">继续扫描标本</view>
-      <!-- <view class="btn3" @click="getNoScanSpecimen()">查看未扫描标本</view> -->
-      <!-- <view class="btn2" @click="Scanning_complete(ids)">完成扫描</view> -->
+      <view class="btn1" @click="Scanning_again()">扫描标本</view>
+      <view class="btn3" @click="getNoScanSpecimen()" v-show="this.queryObj.speNum">查看未扫描标本</view>
+      <view class="btn2" @click="Scanning_complete(ids)" v-show="this.queryObj.speNum">完成扫描</view>
     </view>
     <view
       class="foot_btn"
@@ -249,6 +249,7 @@
       :disjunctor="models2.disjunctor"
       :content="models2.content"
       @ok="ok2"
+      @know="know2"
       @cancel="cancel2"
       :operate="models2.operate"
     >
@@ -261,6 +262,7 @@ import { get, post, SM, webHandle } from "../../http/http.js";
 export default {
   data() {
     return {
+      SMFlag:true,
       // 弹窗model
       models: {
         disjunctor: false,
@@ -270,6 +272,7 @@ export default {
         disjunctor: false,
       },
       wcId: "", //工单完成ID
+      wcFlag:false,
       modelFlag: "", //工单完成类型
       infoDATA: [],
       ids: [],
@@ -277,6 +280,7 @@ export default {
       type1: "",
       queryObj: {}, //路由传递过来的参数
       gotoFlag: true,
+      speNum:0
     };
   },
   methods: {
@@ -288,7 +292,7 @@ export default {
       this.gotoFlag = false;
       let id = JSON.parse(this.queryObj.ids)[0];
       uni.navigateTo({
-        url: `../noScanSpecimen/noScanSpecimen?workOrderId=${id}`,
+        url: `../noScanSpecimen/noScanSpecimen?workOrderId=${id}&deptCode=${this.queryObj.deptCode}`,
       });
     },
     // 正常完成扫描
@@ -314,9 +318,15 @@ export default {
       });
       post("/workerOrder/" + postType, data).then((res) => {
         if (res.status == 200) {
-          uni.reLaunch({
-            url: "../receiptpage/receiptpage",
-          });
+          this.models2 = {
+            disjunctor: true,
+            title: "提示",
+            content: `完成扫描成功`,
+            icon: "success",
+            operate: {
+              know: "知道了",
+            },
+          };
         } else {
           uni.hideLoading();
           uni.showToast({
@@ -337,19 +347,32 @@ export default {
         let id = JSON.parse(this.queryObj.ids)[0];
         let postData = {
           ids: [id],
-          sign: true
+          sign: true,
+          deptQrCode:this.queryObj.deptCode
         };
         post("/workerOrder/expectedAndActual", postData).then((ress) => {
           uni.hideLoading();
           if (ress.status == 200) {
             if (ress.actualReceiveNum === undefined) {
-              //正常完成扫描
-              this.overFinish();
+              if(this.wcFlag){
+                //正常完成扫描
+                this.overFinish()
+              }else{
+                this.gotoOver();
+              }
             } else {
+              let content = '';
+              if(this.queryObj.type1 === 'spe-ddd-2'||this.queryObj.type1 === 'plan-spe-ddd-2'){
+                //待到达
+                content = `系统内预计标本<strong class="red">${ress.expectReceiveNum}</strong>只，您扫描收取标本<strong class="red">${ress.actualReceiveNum}</strong>只，其中<strong class="red">${ress.notReceiveNum}</strong>只未扫描；`;
+              }else{
+                //待送达
+                content = `本工单已签到${ress.scanSet?ress.scanSet.join('、'):''}，剩余需签到科室${ress.notScanSet?ress.notScanSet.join('、'):''}，总签收${ress.totalAcceptance}只，剩余${ress.notAcceptance}只未签收，您确定完成工单吗？`;
+              }
               this.models2 = {
                 disjunctor: true,
                 title: "提示",
-                content: `您扫描的标本<strong class="red">${ress.actualReceiveNum}</strong>个，与系统预计标本${ress.expectReceiveNum}个标本不一致，您确认要完成扫描码？`,
+                content,
                 icon: "warn",
                 operate: {
                   ok: "确定",
@@ -396,6 +419,7 @@ export default {
       let id = JSON.parse(this.queryObj.ids)[0];
       let postData = {
         ids: [id],
+        deptQrCode:this.queryObj.deptCode
       };
       uni.showLoading({
         title: "加载中",
@@ -404,9 +428,11 @@ export default {
       post("/workerOrder/expectedAndActual", postData).then((ress) => {
         uni.hideLoading();
         if (ress.status == 200) {
-          uni.navigateTo({
-            url: "../receiptpage/receiptpage",
-          });
+          if(this.wcFlag){
+            this.overFinish()
+          }else{
+            this.gotoOver();
+          }
         } else {
           uni.showToast({
             icon: "none",
@@ -419,14 +445,21 @@ export default {
     cancel2() {
       this.models2.disjunctor = false;
     },
+    know2(){
+      this.models2.disjunctor = false;
+      uni.reLaunch({
+        url: "../receiptpage/receiptpage",
+      });
+    },
     //完成扫描
     Scanning_complete(id) {
       this.modelFlag = "complete";
+      this.wcId = id;
       if (
         this.queryObj.type1 == "plan-spe-ddd-2" ||
         this.queryObj.type1 == "spe-ddd-2"
       ) {
-        this.wcId = id;
+        this.wcFlag = true;
         this.models = {
           disjunctor: true,
           title: "提示",
@@ -437,16 +470,37 @@ export default {
             cancel: "取消",
           },
         };
-      } else {
-        uni.navigateTo({
-          url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
-            this.queryObj.type1
-          }&deptCode=${this.queryObj.code}&dept=${
-            this.queryObj.dept
-          }&id=${encodeURIComponent(JSON.stringify(this.ids))}`,
-        });
+      }else if (
+          this.queryObj.type1 == "plan-spe-dsd-2" ||
+          this.queryObj.type1 == "plan-spe-dsd-3" ||
+          this.queryObj.type1 == "spe-dsd-2" ||
+          this.queryObj.type1 == "spe-dsd-3"
+        ) {
+          this.wcFlag = false;
+          this.models = {
+            disjunctor: true,
+            title: "提示",
+            content: "是否确定标本已扫描完成？",
+            icon: "warn",
+            operate: {
+              ok: "确定",
+              cancel: "取消",
+            },
+          };
+        } else {
+        this.gotoOver();
       }
     },
+    // 跳转完成工单页面
+    gotoOver(){
+      uni.navigateTo({
+        url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
+          this.queryObj.type1
+        }&deptCode=${this.queryObj.code}&dept=${
+          this.queryObj.dept
+        }&id=${encodeURIComponent(JSON.stringify(this.wcId))}`,
+      });
+    },
     //一对一完成工单
     Scanning_complete1(id) {
       this.modelFlag = "complete1";
@@ -464,12 +518,17 @@ export default {
     },
     //继续扫描
     Scanning_again() {
+      if (!this.SMFlag) {
+        return;
+      }
+      this.SMFlag = false;
       SM().then((ress1) => {
         // ----------------
         //检验二维码的有效性
         post("/dept/scanning", {
           content: ress1,
         }).then((result) => {
+          this.SMFlag = true;
           if (result.state == 200 || result.state == 201) {
             let ress = result.code;
             let speCode = ress;
@@ -501,6 +560,7 @@ export default {
             }
             post("/workerOrder/" + postType, data).then((ress) => {
               if (ress.status == 200) {
+                this.speNum = ress.specimenCount;
                 uni.navigateTo({
                   url: `../scanning_djInfo/scanning_djInfo?type=${
                     this.queryObj.type
@@ -510,7 +570,7 @@ export default {
                     this.queryObj.code
                   }&dept=${this.queryObj.dept}&ids=${encodeURIComponent(
                     JSON.stringify(this.ids)
-                  )}&model=${encodeURIComponent(JSON.stringify(ress))}`,
+                  )}&model=${encodeURIComponent(JSON.stringify(ress))}&speNum=${this.speNum}`,
                 });
               } else {
                 uni.navigateTo({
@@ -536,6 +596,8 @@ export default {
           }
         });
         // ------------------------------
+      }).catch(err=>{
+        this.SMFlag = true;
       });
     },
     // 知道了
@@ -546,10 +608,14 @@ export default {
     },
   },
   onShow() {
+    this.SMFlag = true;
     this.gotoFlag = true;
   },
   onLoad(options) {
     console.log(options, "djEnd");
+    if(options.speNum){
+      this.speNum = options.speNum;
+    }
     this.queryObj = options;
     let list = JSON.parse(options.model); //签到返回的信息
     this.code = options.code; //二维码code

pages/scanning_djInfo/scanning_djInfo.vue

@@ -111,7 +111,7 @@
       @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
     <!-- 弹窗 -->
     <showModel :title="models2.title" :icon="models2.icon" :disjunctor="models2.disjunctor" :content="models2.content"
-      @ok="ok2" @cancel="cancel2" :operate="models2.operate">
+      @ok="ok2" @know="know2" @cancel="cancel2" :operate="models2.operate">
     </showModel>
   </view>
 </template>
@@ -126,6 +126,7 @@
   export default {
     data() {
       return {
+        SMFlag:true,
         // 弹窗model
         models: {
           disjunctor: false,
@@ -135,6 +136,7 @@
           disjunctor: false,
         },
         wcId: "", //工单完成ID
+        wcFlag:false,
         infoDATA: [],
         res: {
           status: "",
@@ -162,7 +164,7 @@
         }
         this.gotoFlag = false;
         uni.navigateTo({
-          url: `../noScanSpecimen/noScanSpecimen?workOrderId=${this.queryObj.ids[0]}`,
+          url: `../noScanSpecimen/noScanSpecimen?workOrderId=${this.queryObj.ids[0]}&deptCode=${this.queryObj.deptCode}`,
         });
       },
       overFinish() {
@@ -182,9 +184,15 @@
         };
         post("/workerOrder/" + postType, data).then((res) => {
           if (res.status == 200) {
-            uni.navigateTo({
-              url: "../receiptpage/receiptpage",
-            });
+            this.models2 = {
+              disjunctor: true,
+              title: "提示",
+              content: `完成扫描成功`,
+              icon: "success",
+              operate: {
+                know: "知道了",
+              },
+            };
           } else {
             uni.showToast({
               icon: "none",
@@ -198,7 +206,8 @@
         this.models.disjunctor = false;
         let postData = {
           ids: this.queryObj.ids,
-          sign: true
+          sign: true,
+          deptQrCode:this.queryObj.deptCode
         };
         uni.showLoading({
           title: "加载中",
@@ -208,13 +217,25 @@
           uni.hideLoading();
           if (ress.status == 200) {
             if (ress.actualReceiveNum === undefined) {
-              //正常完成扫描
-              this.overFinish();
+              if(this.wcFlag){
+                //正常完成扫描
+                this.overFinish()
+              }else{
+                this.gotoOver();
+              }
             } else {
+              let content = '';
+              if(this.queryObj.type1 === 'spe-ddd-2'||this.queryObj.type1 === 'plan-spe-ddd-2'){
+                //待到达
+                content = `系统内预计标本<strong class="red">${ress.expectReceiveNum}</strong>只，您扫描收取标本<strong class="red">${ress.actualReceiveNum}</strong>只，其中<strong class="red">${ress.notReceiveNum}</strong>只未扫描；`;
+              }else{
+                //待送达
+                content = `本工单已签到${ress.scanSet?ress.scanSet.join('、'):''}，剩余需签到科室${ress.notScanSet?ress.notScanSet.join('、'):''}，总签收${ress.totalAcceptance}只，剩余${ress.notAcceptance}只未签收，您确定完成工单吗？`;
+              }
               this.models2 = {
                 disjunctor: true,
                 title: "提示",
-                content: `您扫描的标本<strong class="red">${ress.actualReceiveNum}</strong>个，与系统预计标本${ress.expectReceiveNum}个标本不一致，您确认要完成扫描码？`,
+                content,
                 icon: "warn",
                 operate: {
                   ok: "确定",
@@ -240,6 +261,7 @@
         this.models2.disjunctor = false;
         let postData = {
           ids: this.queryObj.ids,
+          deptQrCode:this.queryObj.deptCode
         };
         uni.showLoading({
           title: "加载中",
@@ -248,9 +270,11 @@
         post("/workerOrder/expectedAndActual", postData).then((ress) => {
           uni.hideLoading();
           if (ress.status == 200) {
-            uni.navigateTo({
-              url: "../receiptpage/receiptpage",
-            });
+            if(this.wcFlag){
+              this.overFinish()
+            }else{
+              this.gotoOver();
+            }
           } else {
             uni.showToast({
               icon: "none",
@@ -263,13 +287,20 @@
       cancel2() {
         this.models2.disjunctor = false;
       },
+      know2(){
+        this.models2.disjunctor = false;
+        uni.navigateTo({
+          url: "../receiptpage/receiptpage",
+        });
+      },
       //完成扫描
       Scanning_complete(id) {
+        this.wcId = id;
         if (
           this.queryObj.type1 == "plan-spe-ddd-2" ||
           this.queryObj.type1 == "spe-ddd-2"
         ) {
-          this.wcId = id;
+          this.wcFlag = true;
           this.models = {
             disjunctor: true,
             title: "提示",
@@ -280,18 +311,43 @@
               cancel: "取消",
             },
           };
+        }else if (
+          this.queryObj.type1 == "plan-spe-dsd-2" ||
+          this.queryObj.type1 == "plan-spe-dsd-3" ||
+          this.queryObj.type1 == "spe-dsd-2" ||
+          this.queryObj.type1 == "spe-dsd-3"
+        ) {
+          this.wcFlag = false;
+          this.models = {
+            disjunctor: true,
+            title: "提示",
+            content: "是否确定标本已扫描完成？",
+            icon: "warn",
+            operate: {
+              ok: "确定",
+              cancel: "取消",
+            },
+          };
         } else {
-          uni.navigateTo({
+          this.gotoOver();
+        }
+      },
+      // 跳转完成工单页面
+      gotoOver(){
+        uni.navigateTo({
             url: `../scanning/scanning?type=${this.queryObj.type}&type1=${
             this.queryObj.type1
-          }&id=${encodeURIComponent(JSON.stringify(id))}&deptCode=${
+          }&id=${encodeURIComponent(JSON.stringify(this.wcId))}&deptCode=${
             this.queryObj.deptCode
           }&dept=${this.queryObj.dept}`,
           });
-        }
       },
       // 继续扫描
       Scanning_again() {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
         let list = [];
         let postType = "";
         let ids = [];
@@ -312,6 +368,7 @@
           post("/dept/scanning", {
             content: ress1,
           }).then((result) => {
+            this.SMFlag = true;
             if (result.state == 200 || result.state == 201) {
               let ress = result.code;
               if (ress) {
@@ -407,7 +464,7 @@
                       JSON.stringify(this.ids)
                     )}&model=${encodeURIComponent(
                       JSON.stringify(res)
-                    )}`,
+                    )}&speNum=${this.speNum}`,
                     });
                   }
                 });
@@ -420,6 +477,8 @@
             }
           });
           // ------------------------------
+        }).catch(err=>{
+          this.SMFlag = true;
         });
       },
       // 知道了
@@ -429,8 +488,14 @@
         });
       },
     },
+    onShow(){
+      this.SMFlag = true;
+    },
     onLoad(options) {
       console.log(options,'options')
+      if(options.speNum){
+        this.speNum = options.speNum;
+      }
       this.queryObj = options;
       if (this.queryObj.model) {
         let list = JSON.parse(this.queryObj.model);

pages/scanning_drug/scanning_drug.vue

@@ -0,0 +1,581 @@
+<template>
+  <view class="pharmacyDetails" v-show="drugsBagDto.id">
+    <view class="pharmacyDetails_title">请领信息</view>
+    <view class="page_item_wrap">
+      <view class="page_item">
+        <view class="page_item_top">
+          <view class="page_item_top-inner">
+            <view class="page_item_top_L">
+              <text class="L_text">请领单：{{ drugsBagDto.packid }}</text>
+            </view>
+            <view class="page_item_top_R">
+              <text class="L_iocn">{{
+                drugsBagDto.drugsState ? drugsBagDto.drugsState.name : ""
+              }}</text>
+            </view>
+          </view>
+        </view>
+        <view class="page_item_cont">
+          <view class="page_item_cont_B">
+            <view class="page_item_cont_title">
+              <text>记账时间</text>
+              <text class="text_big">
+                <text>{{ drugsBagDto.creatTime }}</text>
+              </text>
+            </view>
+          </view>
+          <view class="page_item_cont_C">
+            <view class="page_item_cont_title_C">
+              <text>请领科室</text>
+              <text class="text_big">
+                <text>{{
+                  drugsBagDto.target ? drugsBagDto.target.dept : ""
+                }}</text>
+              </text>
+            </view>
+          </view>
+          <view class="page_item_cont_C" v-show="workOrder.id">
+            <view class="page_item_cont_title_C">
+              <text>单号</text>
+              <text class="text_big">
+                <text>{{ workOrder.gdcode }}</text>
+              </text>
+            </view>
+          </view>
+          <view class="page_item_cont_C" v-show="workOrder.id">
+            <view class="page_item_cont_title_C">
+              <text>状态</text>
+              <text class="text_big">
+                <text>{{
+                  workOrder.gdState ? workOrder.gdState.name : ""
+                }}</text>
+              </text>
+            </view>
+          </view>
+          <view class="page_item_cont_C" v-show="workOrder.id">
+            <view class="page_item_cont_title_C">
+              <text>服务人员</text>
+              <text class="text_big">
+                <text>{{ workOrder.worker ? workOrder.worker.name : "" }}</text>
+              </text>
+            </view>
+          </view>
+        </view>
+        <view class="L"></view>
+        <view class="R"></view>
+      </view>
+      <view class="L-l"></view>
+      <view class="R-l"></view>
+    </view>
+    <button class="cube-toolbar-item" v-show="isShowBtn" @click="buildOrderAndSign()">
+      接单并签到
+    </button>
+    <button class="cube-toolbar-item" v-show="!isShowBtn" @click="goBack()">
+      知道了
+    </button>
+    <!-- 弹窗 -->
+    <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
+      @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
+    <!-- 填写交接人账号弹窗 -->
+    <selectAccount v-if="hosModels.disjunctor" :title="hosModels.title" :disjunctor="hosModels.disjunctor" @ok="hosOk"
+      @cancel="hosCancel">
+    </selectAccount>
+  </view>
+</template>
+<script>
+  import selectAccount from "@/components/selectAccount/selectAccount";
+  import {
+    webHandle,
+    post
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        // 弹窗model
+        models: {
+          disjunctor: false,
+        },
+        drugsBagDto: {}, //药包信息
+        workOrder: {}, //药包关联的工单信息
+        currentCode: "", //当前小扫描的科室二维码
+        currentData: {}, //当前小扫描的工单对象
+        // 填写交接人账号弹窗model
+        hosModels: {
+          disjunctor: false,
+        },
+        grabOrders: null,
+        gotoFlag: true,
+      };
+    },
+    components: {
+      selectAccount,
+    },
+    computed: {
+      isShowBtn() {
+        if (this.workOrder.gdState) {
+          let state = this.workOrder.gdState.value;
+          // 待抢单，待接单,待到达,待送达
+          return state == 2 || state == 3 || state == 4 || state == 5;
+        } else {
+          return false;
+        }
+      },
+    },
+    methods: {
+      goBack(){
+        uni.navigateTo({
+          url: "../receiptpage/receiptpage",
+        });
+      },
+      // 如果不是患者陪检或患者转运或其他
+      // 科室签到
+      nextDeptOrder_s(data, accountObj) {
+        console.log(data, accountObj);
+        let ids = [];
+        let id = data.id;
+        ids.push(id);
+        let code = "";
+        let postData = {
+          ids,
+        };
+        if (accountObj) {
+          postData.handover = [accountObj.accountId];
+        }
+        if (this.grabOrders) {
+          postData.grabOrders = this.grabOrders;
+        }
+        if (this.currentCode) {
+          code = this.currentCode;
+          // 科室签到
+          post("/workerOrder/orderSign/" + code, postData).then((res) => {
+            uni.hideLoading();
+            if (res.status == 200) {
+              // 跳转到扫描科室
+              // type1: res.type, //type类型
+              // id: data.id, //工单ID
+              // deptCode: code, //二维码
+              // dept: res.dept //科室名称
+              let urlObj = {
+                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))}`,
+              };
+              if (this.grabOrders) {
+                urlObj.url += `&grabOrders=666`;
+              }
+              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`,
+              });
+            }
+          });
+        }
+      },
+      // 签到
+      orderSign(data, type, ress1) {
+        this.currentData = data;
+        console.log(data, "data");
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        //检验二维码的有效性
+        post("/dept/scanning", {
+          content: ress1,
+          taskTypeId: data.taskType.id,
+          gdState: data.gdState.id,
+        }).then((result) => {
+          this.currentCode = result.code;
+          if (result.state == 200 || result.state == 201) {
+            if (result.account) {
+              if (type == 2) {
+                this.nextDeptOrder_s(this.currentData, {
+                  account: result.account,
+                  accountName: result.name,
+                  accountId: result.id,
+                });
+              }
+            } else {
+              if (type == 2) {
+                this.nextDeptOrder_s(this.currentData);
+              }
+            }
+          } else if (result.state == "0000") {
+            uni.hideLoading();
+            this.showSelectAccount();
+          } else {
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
+      // 填写交接人账号-确认
+      hosOk(data) {
+        console.log(data);
+        const {
+          accountName,
+          account,
+          accountId
+        } = data;
+        if (!accountName && !account) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写交接人账号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        } else if ((!accountName && account) || (accountName && !account)) {
+          //没有填写交接人
+          uni.showModal({
+            title: "提示",
+            content: "请填写正确的交接人账号！",
+            showCancel: false,
+            success: function(res) {
+              if (res.confirm) {
+                console.log("用户点击确定");
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+          return;
+        }
+        this.hosModels.disjunctor = false;
+        let associationTypeValue =
+          this.currentData.taskType.associationType.value;
+        console.log(associationTypeValue);
+        if (
+          associationTypeValue !== "patientTransport" &&
+          associationTypeValue !== "inspect" &&
+          associationTypeValue !== "other"
+        ) {
+          this.nextDeptOrder_s(this.currentData, data);
+        }
+      },
+      // 填写交接人账号-取消
+      hosCancel() {
+        this.hosModels.disjunctor = false;
+      },
+      // 填写交接人账号弹窗
+      showSelectAccount() {
+        this.hosModels = {
+          title: "填写交接人账号",
+          disjunctor: true,
+        };
+      },
+      // 接单
+      commonBuild() {
+        let postData = {
+          orderId: this.workOrder.id,
+        };
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/workerOrder/drugBagReceiving", postData).then((ress) => {
+          uni.hideLoading();
+          if (ress.status == 200) {
+            this.grabOrders = ress.grabOrders ? ['666'] : null;
+            this.orderSign(ress.workOrder, 2, ress.content);
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
+      ok() {
+        this.models.disjunctor = false;
+        this.commonBuild();
+      },
+      // 取消
+      cancel() {
+        this.models.disjunctor = false;
+      },
+      // 接单并签到
+      buildOrderAndSign() {
+        if (!this.gotoFlag) {
+          return;
+        }
+        this.gotoFlag = false;
+        if (this.workOrder.gdState) {
+          let state = this.workOrder.gdState.value;
+          if (state == 4 || state == 5) {
+            //待到达，待送达
+            this.models = {
+              disjunctor: true,
+              title: "提示",
+              content: "您想接单的药品，工单正在执行中。请确认是否继续接单签到？",
+              icon: "warn",
+              operate: {
+                ok: "确定",
+                cancel: "取消",
+              },
+            };
+          } else {
+            // 待接单 待抢单
+            this.commonBuild();
+          }
+        }
+      },
+      //获取药包信息及其关联的工单信息
+      queryDrugsBagForId(drugsBagId) {
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/workerOrder/queryDrugsBagForId", {
+          drugsBagId,
+        }).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            this.drugsBagDto = res.drugsBagDto || {};
+            this.workOrder = res.workOrder || {};
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败",
+            });
+          }
+        });
+      },
+    },
+    onShow() {
+      this.gotoFlag = true;
+    },
+    onLoad(options) {
+      console.log(options);
+      let {
+        drugsBagId
+      } = options;
+      if (drugsBagId) {
+        this.queryDrugsBagForId(drugsBagId);
+      }
+      // this.infoDATA = JSON.parse(options.infoDATA); //详细信息
+      // console.log(this.infoDATA)
+      // this.res["status"] = options.status; //状态码
+      // this.res["msg"] = options.msg; //返回的信息
+      // #ifdef APP-PLUS
+      webHandle("no", "app");
+      // #endif
+      // #ifdef H5
+      webHandle("no", "wx");
+      // #endif
+    },
+  };
+</script>
+<style lang="less" scoped>
+  .pharmacyDetails {
+    background-color: rgb(249, 250, 251);
+    padding-top: 10%;
+
+    .pharmacyDetails_title {
+      font-size: 46rpx;
+      font-weight: 550;
+      text-align: center;
+    }
+
+    .page_item_wrap {
+      position: relative;
+      margin-top: 32rpx;
+
+      .page_item {
+        margin-top: 16rpx;
+        margin-bottom: 124rpx;
+        background: #fff;
+        border-radius: 8rpx;
+        margin: 0 20rpx;
+        border: 2rpx solid #e5e9ed;
+        position: relative;
+        overflow: hidden;
+        padding: 0 16rpx;
+
+        .L {
+          width: 40rpx;
+          height: 40rpx;
+          border-radius: 50%;
+          background: #f9fafb;
+          position: absolute;
+          left: -20rpx;
+          top: 68rpx;
+          border: 2rpx solid #e5e9ed;
+        }
+
+        .R {
+          width: 40rpx;
+          height: 40rpx;
+          border-radius: 50%;
+          background: #f9fafb;
+          position: absolute;
+          float: right;
+          right: -20rpx;
+          top: 68rpx;
+          border: 2rpx solid #e5e9ed;
+        }
+
+        .page_item_top {
+          height: 88rpx;
+          border-bottom: 2rpx dashed #e5e9ed;
+          padding: 0 16rpx;
+
+          .page_item_top-inner {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            height: 100%;
+
+            .page_item_top_L {
+              .L_text {
+                font-size: 32rpx;
+                font-weight: 700;
+              }
+            }
+
+            .page_item_top_R {
+              font-size: 32rpx;
+
+              .L_iocn {
+                color: rgb(7, 134, 60);
+                font-size: 36rpx;
+                font-weight: 700;
+              }
+            }
+          }
+        }
+
+        .page_item_cont {
+          min-height: 180rpx;
+          max-height: 424rpx;
+          padding: 0 16rpx;
+          text-align: left;
+          position: relative;
+
+          .text_big {
+            font-size: 32rpx;
+            font-weight: 700;
+
+            text {
+              font-weight: 700;
+              line-height: 1.5;
+            }
+          }
+
+          .line {
+            height: 20rpx;
+            width: 2rpx;
+            border-left: 2rpx solid #e5e9ed;
+            position: absolute;
+            top: 82rpx;
+            left: 40rpx;
+          }
+
+          .page_item_cont_T {
+            padding-top: 28rpx;
+            font-size: 28rpx;
+
+            .page_item_cont_title {
+              height: 100%;
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+            }
+          }
+
+          .page_item_cont_B {
+            padding-top: 28rpx;
+            margin-bottom: 28rpx;
+
+            .page_item_cont_title {
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+            }
+          }
+
+          .page_item_cont_C {
+            margin-bottom: 28rpx;
+
+            .page_item_cont_title_C {
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+            }
+          }
+
+          #infos {
+            display: none;
+          }
+        }
+      }
+
+      .L-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        left: 20rpx;
+        top: 72rpx;
+      }
+
+      .R-l {
+        width: 2rpx;
+        height: 40rpx;
+        background: #f9fafb;
+        position: absolute;
+        right: 20rpx;
+        top: 72rpx;
+      }
+    }
+
+    .cube-toolbar-item {
+      width: 710rpx;
+      height: 68rpx;
+      line-height: 68rpx;
+      position: fixed;
+      left: 20rpx;
+      bottom: 160rpx;
+      border-radius: 8rpx;
+      background: linear-gradient(to right, #72c172, #3bb197);
+      font-size: 36rpx;
+      color: #fff;
+      text-align: center;
+    }
+
+    .btn-wrap {
+      display: flex;
+      justify-content: space-between;
+      position: fixed;
+      left: 20rpx;
+      bottom: 160rpx;
+    }
+
+    .cube-toolbar-item1 {
+      width: 350rpx;
+      height: 68rpx;
+      line-height: 68rpx;
+      border-radius: 8rpx;
+      margin: 0 5rpx;
+      background: linear-gradient(to right, #72c172, #3bb197);
+      font-size: 36rpx;
+      color: #fff;
+      text-align: center;
+    }
+  }
+</style>

pages/scanning_ins/scanning_ins.vue

@@ -246,6 +246,7 @@
   export default {
     data() {
       return {
+        SMFlag:true,
         options: {},
         // wechatFocusSwitch: 0,
         hosId: "",
@@ -383,6 +384,10 @@
       },
       // 送回病房-扫描科室
       scanDept() {
+        if (!this.SMFlag) {
+          return;
+        }
+        this.SMFlag = false;
         let infoDATA = JSON.parse(this.options.infoDATA);
         let code = "";
         SM().then((ress1) => {
@@ -394,6 +399,7 @@
           post("/dept/scanning", {
             content: ress1,
           }).then((result) => {
+            this.SMFlag = true;
             if (result.state == 200 || result.state == 201) {
               let ress = result.code;
               if (ress) {
@@ -448,6 +454,8 @@
               });
             }
           });
+        }).catch(err=>{
+          this.SMFlag = true;
         });
       },
       // 送回病房-选择起点科室
@@ -559,6 +567,10 @@
         if (data) {
           let type = "";
           if (data.gdState.value == "8") {
+            if (!this.SMFlag) {
+              return;
+            }
+            this.SMFlag = false;
             SM().then((ress1) => {
               // ----------------
               uni.showLoading({
@@ -569,6 +581,7 @@
               post("/dept/scanning", {
                 content: ress1,
               }).then((result) => {
+                this.SMFlag = true;
                 if (result.state == 200 || result.state == 201) {
                   let ress = result.code;
                   if (ress) {
@@ -609,6 +622,8 @@
                 }
               });
               // ------------------------------
+            }).catch(err=>{
+              this.SMFlag = true;
             });
           } else {
             if (data.taskType.associationType.value == "patientTransport") {
@@ -743,6 +758,7 @@
       // #endif
     },
     onShow() {
+      this.SMFlag = true;
       // 创建动画
       this.animation = uni.createAnimation({
         duration: 500,

pages/settingCode/settingCode.vue

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