标本，药品大扫描修改

components/smallScreen/smallScreen.vue

@@ -206,7 +206,7 @@
               // deptCode: code, //二维码
               // dept: res.dept //科室名称
               uni.navigateTo({
-                url: `../../pages/scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
+                url: `../../pages/scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
               });
             } else {
               uni.navigateTo({

pages/scanning_Result/scanning_Result.vue

@@ -117,6 +117,7 @@
         (queryObj.status == 200 && type == 'inspect') ||
         (queryObj.status == 200 && type == 'patientTransport')
       ">
+      <view class="btn3" @click="Scanning_again()" v-if="type == 'drugsBag'||type == 'jPBag'"> 继续扫描 </view>
       <view class="btn3" @click="showAlert(dataId)"> 知道了 </view>
     </view>
     <view class="foot_btn" v-if="
@@ -231,6 +232,8 @@
   export default {
     data() {
       return {
+        deptId:undefined,
+        handover:undefined,
         SMFlag: true,
         // 交接人信息
         accountObj: undefined,
@@ -312,6 +315,9 @@
                 let postType = "";
                 if (this.type == "jPBag" || this.type == "drugsBag") {
                   postType = "handleDrugsAndJp";
+                  delete data.ids;
+                  data.deptId = this.deptId;
+                  data.handover = this.handover;
                 }
                 if (this.type == "specimen") {
                   data["speCode"] = data.code;
@@ -350,7 +356,7 @@
                       this.type == "inspect" ||
                       this.type == "patientTransport"
                     ) {
-                      uni.navigateTo({
+                      uni.redirectTo({
                         url: `../scanning_Result/scanning_Result?type=${
                         this.queryObj.type //baba
                       }&type1=${
@@ -366,7 +372,7 @@
                       }&deptName=${ress.deptName}&bedNum=${ress.bedNum}`,
                       });
                     } else {
-                      uni.navigateTo({
+                      uni.redirectTo({
                         url: `../scanning_Result/scanning_Result?type=${
                         this.queryObj.type
                       }&type1=${
@@ -375,11 +381,11 @@
                         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))}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}`,
                       });
                     }
                   } else {
-                    uni.navigateTo({
+                    uni.redirectTo({
                       url: `../scanning_Result/scanning_Result?type=${
                       this.queryObj.type
                     }&type1=${this.queryObj.type1}&status=${ress.status}&msg=${
@@ -388,7 +394,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}`,
                     });
                   }
                 });
@@ -700,7 +706,12 @@
       if (options.accountObj && options.accountObj != "undefined") {
         this.accountObj = JSON.parse(options.accountObj);
       }
-
+      if (options.deptId && options.deptId != "undefined") {
+        this.deptId = options.deptId;
+      }
+      if (options.handover && options.handover != "undefined") {
+        this.handover = options.handover;
+      }
       this.dataId = options.id;
       this.RESData = options.resData;
       this.res["status"] = options.status;

pages/scanning_all/scanning_all.vue

@@ -74,7 +74,10 @@
           <view class="zwsj_txt">暂无工单</view>
         </view>
       </view>
-      <view class="page_items footerOtherMargin" v-if="workData && workData.length > 0">
+      <view
+        class="page_items footerOtherMargin"
+        v-if="workData && workData.length > 0"
+      >
         <view class="page_item" v-for="(infoDATA, i) of workData" :key="i">
           <view class="page_item_top">
             <view class="page_item_top_L">
@@ -208,8 +211,24 @@
           <view class="page_item_foot">
             <view class="page_item_foot_text">
               <text class="text1">状态</text>
-              <text class="text2" v-if="!(infoDATA.gdState.value == '5'&&infoDATA.taskType.associationType.value == 'inspect')">{{ infoDATA.gdState.name }}</text>
-              <text class="text2" v-if="infoDATA.gdState.value == '5'&&infoDATA.taskType.associationType.value == 'inspect'">待送回</text>
+              <text
+                class="text2"
+                v-if="
+                  !(
+                    infoDATA.gdState.value == '5' &&
+                    infoDATA.taskType.associationType.value == 'inspect'
+                  )
+                "
+                >{{ infoDATA.gdState.name }}</text
+              >
+              <text
+                class="text2"
+                v-if="
+                  infoDATA.gdState.value == '5' &&
+                  infoDATA.taskType.associationType.value == 'inspect'
+                "
+                >待送回</text
+              >
             </view>
             <view
               class="page_item_foot_text"
@@ -249,7 +268,10 @@
         </view>
       </view>
 
-      <view class="foot_btn2 footerPadding" v-if="workData && workData.length > 0">
+      <view
+        class="foot_btn2 footerPadding"
+        v-if="workData && workData.length > 0"
+      >
         <view class="btn1" @click="allStart()" v-if="flag">一键操作</view>
         <view class="btn1" v-if="!flag">一键操作</view>
         <view class="btn2" @click="showAlert">知道了</view>
@@ -267,6 +289,15 @@
       @know="know"
       :operate="models.operate"
     ></showModel>
+    <!-- 填写交接人账号弹窗 -->
+    <selectAccount
+      v-if="hosModels.disjunctor"
+      :title="hosModels.title"
+      :disjunctor="hosModels.disjunctor"
+      @ok="hosOk"
+      @cancel="hosCancel"
+    >
+    </selectAccount>
   </view>
 </template>
 <script>
@@ -275,7 +306,11 @@ import { post, SM, webHandle } from "../../http/http.js";
 export default {
   data() {
     return {
-      SMFlag:true,
+      SMFlag: true,
+      // 填写交接人账号弹窗model
+      hosModels: {
+        disjunctor: false,
+      },
       // 弹窗model
       models: {
         disjunctor: false,
@@ -296,12 +331,122 @@ export default {
     };
   },
   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;
+      this.orderDeptHandler(false,data);
+    },
+    // 填写交接人账号-取消
+    hosCancel() {
+      this.hosModels.disjunctor = false;
+    },
+    // 填写交接人账号弹窗
+    showSelectAccount() {
+      this.hosModels = {
+        title: "填写交接人账号",
+        disjunctor: true,
+      };
+    },
     // 知道了
     showAlert() {
       uni.navigateTo({
         url: "../receiptpage/receiptpage",
       });
     },
+    //科室签到
+    //bigScanner----判断是否需要交接人
+    //accountObj----弹窗填写的交接人信息
+    orderDeptHandler(bigScanner,accountObj) {
+      let type = "orderSign/" + this.code;
+      let list = { ids: this.userId.ids };
+      bigScanner && (list.bigScanner = ['666']);
+      if (accountObj) {
+        list.handover = [accountObj.accountId];
+      }
+      uni.showLoading({
+        title: "加载中",
+        mask: true,
+      });
+      post("/workerOrder/" + type, list).then((res) => {
+        uni.hideLoading();
+        if (res.status == 200) {
+          if (this.tabType == "inspect" || this.tabType == "patientTransport") {
+            if (res.ids) {
+              for (var i = 0; i < this.userId.ids.length; i++) {
+                if (this.userId.ids[i] == res.ids[0]) {
+                  this.userId.ids.splice(i, 1);
+                }
+              }
+            }
+            uni.navigateTo({
+              url: `../scanning_djInfo/scanning_djInfo?type=${
+                this.tabType
+              }&type1=${res.type}&infoData=${res.data}&status=${
+                res.status
+              }&msg=${res.msg}&deptCode=${this.code}&dept=${
+                res.dept
+              }&ids=${encodeURIComponent(
+                JSON.stringify(this.userId.ids)
+              )}&model=${encodeURIComponent(JSON.stringify(res))}`,
+            });
+          } else {
+            uni.navigateTo({
+              url: `../scanning_djEnd/scanning_djEnd?type=${
+                this.tabType
+              }&type1=${res.type}&code=${this.code}&dept=${
+                res.dept
+              }&ids=${encodeURIComponent(
+                JSON.stringify(this.userId.ids)
+              )}&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}&deptId=${res.deptId}`,
+            });
+          }
+        } else if (res.status == "0000") {
+          this.showSelectAccount(); //yeye
+        } else {
+          this.flag = true;
+          uni.navigateTo({
+            url: `../scanning_djEnd/scanning_djEnd?type=${this.tabType}&type1=${
+              res.type
+            }&code=${this.code}&dept=${res.dept}&ids=${encodeURIComponent(
+              JSON.stringify(this.userId.ids)
+            )}&model=${encodeURIComponent(JSON.stringify(res))}&deptId=${res.deptId}`,
+          });
+        }
+      });
+    },
     //一键操作
     allStart() {
       clearTimeout(this.flagTimer);
@@ -318,124 +463,84 @@ export default {
             this.tabType == "specimen" ||
             this.tabType == "specimenPlan"
           ) {
-            type = "orderSign/" + this.code;
-            list = {ids:this.userId.ids};
-            uni.showLoading({
-              title: "加载中",
-              mask: true,
-            });
-            post("/workerOrder/" + type, list).then((res) => {
-              uni.hideLoading();
-              if (res.status == 200) {
-                if (
-                  this.tabType == "inspect" ||
-                  this.tabType == "patientTransport"
-                ) {
-                  if (res.ids) {
-                    for (var i = 0; i < this.userId.ids.length; i++) {
-                      if (this.userId.ids[i] == res.ids[0]) {
-                        this.userId.ids.splice(i, 1);
-                      }
-                    }
-                  }
-                  uni.navigateTo({
-                    url: `../scanning_djInfo/scanning_djInfo?type=${
-                      this.tabType
-                    }&type1=${res.type}&infoData=${res.data}&status=${
-                      res.status
-                    }&msg=${res.msg}&deptCode=${this.code}&dept=${
-                      res.dept
-                    }&ids=${encodeURIComponent(
-                      JSON.stringify(this.userId.ids)
-                    )}&model=${encodeURIComponent(JSON.stringify(res))}`,
-                  });
-                } else {
-                  uni.navigateTo({
-                    url: `../scanning_djEnd/scanning_djEnd?type=${
-                      this.tabType
-                    }&type1=${res.type}&code=${this.code}&dept=${
-                      res.dept
-                    }&ids=${encodeURIComponent(
-                      JSON.stringify(this.userId.ids)
-                    )}&model=${encodeURIComponent(JSON.stringify(res))}`,
-                  });
-                }
-              } else {
-                this.flag = true;
-                uni.navigateTo({
-                  url: `../scanning_djEnd/scanning_djEnd?type=${
-                    this.tabType
-                  }&type1=${res.type}&code=${this.code}&dept=${
-                    res.dept
-                  }&ids=${encodeURIComponent(
-                    JSON.stringify(this.userId.ids)
-                  )}&model=${encodeURIComponent(JSON.stringify(res))}`,
-                });
-              }
-            });
+            this.orderDeptHandler(true);
           } else {
             if (!this.SMFlag) {
               return;
             }
             this.SMFlag = false;
-            SM().then((ress1) => {
-              uni.showLoading({
-                title: "加载中",
-                mask: true,
-              });
-              //检验二维码的有效性
-              post("/dept/scanning", {
-                content: ress1,
-              }).then((result) => {
-                this.SMFlag = true;
-                if (result.state == 200 || result.state == 201) {
-                  let ress = result.code;
-                  if (ress) {
-                    if (this.tabType == "patientTransport") {
-                      type = "handleTrans";
-                      let data = {
-                        ids: this.userId.ids,
-                        deptCode: this.code,
-                        code: ress,
-                      };
-                      list = data;
-                    }
-                    if (this.tabType == "inspect") {
-                      type = "handleIns";
-                      let data = {
-                        ids: this.userId.ids,
-                        deptCode: this.code,
-                        code: ress,
-                      };
-                      list = data;
-                    }
-                    post("/workerOrder/" + type, list).then((res) => {
-                      uni.hideLoading();
-                      if (res.status == 200) {
-                        if (
-                          this.tabType == "inspect" ||
-                          this.tabType == "patientTransport"
-                        ) {
-                          if (res.ids) {
-                            for (var i = 0; i < this.userId.ids.length; i++) {
-                              if (this.userId.ids[i] == res.ids[0]) {
-                                this.userId.ids.splice(i, 1);
+            SM()
+              .then((ress1) => {
+                uni.showLoading({
+                  title: "加载中",
+                  mask: true,
+                });
+                //检验二维码的有效性
+                post("/dept/scanning", {
+                  content: ress1,
+                }).then((result) => {
+                  this.SMFlag = true;
+                  if (result.state == 200 || result.state == 201) {
+                    let ress = result.code;
+                    if (ress) {
+                      if (this.tabType == "patientTransport") {
+                        type = "handleTrans";
+                        let data = {
+                          ids: this.userId.ids,
+                          deptCode: this.code,
+                          code: ress,
+                        };
+                        list = data;
+                      }
+                      if (this.tabType == "inspect") {
+                        type = "handleIns";
+                        let data = {
+                          ids: this.userId.ids,
+                          deptCode: this.code,
+                          code: ress,
+                        };
+                        list = data;
+                      }
+                      post("/workerOrder/" + type, list).then((res) => {
+                        uni.hideLoading();
+                        if (res.status == 200) {
+                          if (
+                            this.tabType == "inspect" ||
+                            this.tabType == "patientTransport"
+                          ) {
+                            if (res.ids) {
+                              for (var i = 0; i < this.userId.ids.length; i++) {
+                                if (this.userId.ids[i] == res.ids[0]) {
+                                  this.userId.ids.splice(i, 1);
+                                }
                               }
                             }
+                            uni.navigateTo({
+                              url: `../scanning_djInfo/scanning_djInfo?type=${
+                                this.tabType
+                              }&type1=${res.type}&infoData=${res.data}&status=${
+                                res.status
+                              }&msg=${res.msg}&deptCode=${this.code}&dept=${
+                                res.dept
+                              }&ids=${encodeURIComponent(
+                                JSON.stringify(this.userId.ids)
+                              )}&model=${encodeURIComponent(
+                                JSON.stringify(res)
+                              )}`,
+                            });
+                          } else {
+                            uni.navigateTo({
+                              url: `../scanning_djEnd/scanning_djEnd?type=${
+                                this.tabType
+                              }&type1=${res.type}&dept=${
+                                res.dept
+                              }&ids=${encodeURIComponent(
+                                JSON.stringify(this.userId.ids)
+                              )}&model=${encodeURIComponent(
+                                JSON.stringify(res)
+                              )}&code=${this.code}`,
+                            });
                           }
-                          uni.navigateTo({
-                            url: `../scanning_djInfo/scanning_djInfo?type=${
-                              this.tabType
-                            }&type1=${res.type}&infoData=${res.data}&status=${
-                              res.status
-                            }&msg=${res.msg}&deptCode=${this.code}&dept=${
-                              res.dept
-                            }&ids=${encodeURIComponent(
-                              JSON.stringify(this.userId.ids)
-                            )}&model=${encodeURIComponent(
-                              JSON.stringify(res)
-                            )}`,
-                          });
                         } else {
                           uni.navigateTo({
                             url: `../scanning_djEnd/scanning_djEnd?type=${
@@ -449,33 +554,21 @@ export default {
                             )}&code=${this.code}`,
                           });
                         }
-                      } else {
-                        uni.navigateTo({
-                          url: `../scanning_djEnd/scanning_djEnd?type=${
-                            this.tabType
-                          }&type1=${res.type}&dept=${
-                            res.dept
-                          }&ids=${encodeURIComponent(
-                            JSON.stringify(this.userId.ids)
-                          )}&model=${encodeURIComponent(
-                            JSON.stringify(res)
-                          )}&code=${this.code}`,
-                        });
-                      }
+                      });
+                    }
+                  } else {
+                    this.flag = true;
+                    uni.hideLoading();
+                    uni.showToast({
+                      icon: "none",
+                      title: "请求失败！",
                     });
                   }
-                } else {
-                  this.flag = true;
-                  uni.hideLoading();
-                  uni.showToast({
-                    icon: "none",
-                    title: "请求失败！",
-                  });
-                }
+                });
+              })
+              .catch((err) => {
+                this.SMFlag = true;
               });
-            }).catch(err=>{
-              this.SMFlag = true;
-            });
           }
         } else {
           this.flag = true;

pages/scanning_code/scanning_code.vue

@@ -368,6 +368,7 @@
         SMFlag:true,
         // 交接人信息
         accountObj:undefined,
+        deptId:undefined,
         // 完成工单的id
         wcId: "",
         // 弹窗model
@@ -424,12 +425,14 @@
                   this.infoDATA.taskType.associationType.value == "drugsBag"
                 ) {
                   postType = "handleDrugsAndJp";
+                  delete data.ids;
                   if(this.accountObj){
                     data.handover = this.accountObj.accountId;
                   }
                   if(this.queryObj.grabOrders){
                     data.grabOrders = '666';
                   }
+                  data.deptId = this.deptId;
                 }
                 if (this.infoDATA.taskType.associationType.value == "specimen") {
                   data["speCode"] = data.code;
@@ -457,45 +460,9 @@
                 post("/workerOrder/" + postType, data).then((ress) => {
                   console.log(ress,1111)
                   if (ress.status == 200) {
-                    // 药包核对中状态变为已完成
                     if (
                       this.infoDATA.taskType.associationType.value == "drugsBag"
                     ) {
-                      if (this.infoType === "drug-ddd-2") {
-                        //起点科室扫描药包的时候
-                        let userData = uni.getStorageSync("userData");
-                        // 药包核对中状态变为已完成
-                        post("/drugsBag/changeToFinish", {
-                          id: ress.data.id,
-                          recipient: userData.user.name,
-                        }).then((result) => {
-                          uni.hideLoading();
-                          if (result.state == 200) {
-                            // --------start----------
-                            uni.navigateTo({
-                              url: `../scanning_Result/scanning_Result?type=${
-                              this.queryObj.type
-                            }&type1=${
-                              this.queryObj.type1
-                            }&infoData=${encodeURIComponent(
-                              JSON.stringify(ress.data)
-                            )}&status=${ress.status}&msg=${ress.msg}&deptCode=${
-                              this.queryObj.deptCode
-                            }&dept=${
-                              this.queryObj.dept
-                            }&id=${id}&model=${encodeURIComponent(
-                              JSON.stringify(ress)
-                            )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}`,
-                            });
-                            // ------------end------------
-                          } else {
-                            uni.showToast({
-                              icon: "none",
-                              title: "系统内部错误！",
-                            });
-                          }
-                        });
-                      } else {
                         uni.hideLoading();
                         // --------start----------
                         uni.navigateTo({
@@ -511,10 +478,9 @@
                           this.queryObj.dept
                         }&id=${id}&model=${encodeURIComponent(
                           JSON.stringify(ress)
-                        )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}`,
+                        )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}&deptId=${this.deptId}&handover=${this.handover}`,
                         });
                         // ------------end------------
-                      }
                     } else {
                       uni.hideLoading();
                       // --------start----------
@@ -575,7 +541,7 @@
                       this.queryObj.dept
                     }&id=${id}&model=${encodeURIComponent(
                       JSON.stringify(ress)
-                    )}`,
+                    )}&deptId=${this.deptId}&handover=${this.handover}`,
                     });
                   }
                 });
@@ -732,6 +698,9 @@
       if(options.accountObj && options.accountObj != "undefined"){
         this.accountObj = JSON.parse(options.accountObj);
       }
+      if (options.deptId && options.deptId != "undefined") {
+        this.deptId = options.deptId;
+      }
       this.queryObj = options;
       let id = options.id;
       this.dataId = id; //工单ID