药品配送增加交接人

components/selectAccount/selectAccount.vue

@@ -0,0 +1,293 @@
+<template>
+  <view class="changeHospital" v-show="disjunctor">
+    <view class="changeHospital__wrap">
+      <view class="changeHospital__header" v-if="title">
+        {{ title }}
+      </view>
+      <view class="changeHospital__article">
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-left">
+            交接人账号：
+          </view>
+          <view class="uni-list-cell-db">
+            <input class="uni-input" auto-focus="true" placeholder="请填写交接人信息" v-model="account" @input="bindPickerChange($event)" />
+          </view>
+        </view>
+        <view class="uni-list-cell">
+          <view class="uni-list-cell-left">
+            交接人姓名：
+          </view>
+          <view class="uni-list-cell-db-text">
+            <text>{{accountName}}</text>
+          </view>
+        </view>
+      </view>
+      <view class="changeHospital__footer">
+        <view v-if="operate.ok" class="changeHospital__ok" @click="ok" hover-class="seimin-btn-hover">
+          {{ operate.ok || "" }}
+        </view>
+        <view v-if="operate.cancel" class="changeHospital__cancel" @click="cancel" hover-class="seimin-btn-hover">
+          {{ operate.cancel || "" }}
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import {
+    post
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        userData: null,
+        hosId:null,
+        timer:null,
+        account:'',//交接人账号
+        accountName:'',//交接人姓名
+        accountId:''//交接人ID
+      };
+    },
+    watch: {
+      disjunctor(newValue) {
+        if (newValue && this.operate.know == "知道了") {
+          this.time = 5;
+          this.timer = setInterval(() => {
+            this.time--;
+            if (this.time <= 0) {
+              clearInterval(this.timer);
+              this.know();
+            }
+          }, 1000);
+        }
+      },
+    },
+    props: {
+      // 显示隐藏
+      disjunctor: {
+        type: Boolean,
+        default: false,
+      },
+      // 标题
+      title: {
+        type: String,
+        default: "提示",
+      },
+      // 操作按钮文字
+      operate: {
+        type: Object,
+        default: () => {
+          return {
+            ok: "确认",
+            cancel: "取消",
+          };
+        },
+      },
+    },
+    methods: {
+      //修改picker的值
+      bindPickerChange(e) {
+        console.log(e.target.value);
+        clearTimeout(this.timer);
+        let cValue = e.target.value;
+        this.timer = setTimeout(()=>{
+          let account = e.target.value;
+          post("/data/isRepeat", {
+            hospital: {id: this.hosId},
+            account
+          }).then(result => {
+            if(cValue === account && result.status == 200){
+              this.accountName = result.userName;
+              this.account = account;
+              this.accountId = result.userId;
+            }
+          })
+        },500)
+      },
+      // 确定
+      ok() {
+        let e = {};
+        if(this.accountName){
+          e.accountName = this.accountName;
+        }
+        if(this.account){
+          e.account = this.account;
+        }
+        if(this.accountId){
+          e.accountId = this.accountId;
+        }
+        this.$emit("ok", e);
+      },
+      // 取消
+      cancel() {
+        this.$emit("cancel");
+      },
+    },
+    created() {
+      this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
+    }
+  };
+</script>
+
+<style lang="less" scoped>
+  .changeHospital {
+    position: fixed;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.2);
+    z-index: 999;
+
+    .uni-list-cell {
+      width: 90%;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-evenly;
+      align-items: center;
+      text-align: center;
+      margin-top: 32rpx;
+
+      .uni-list-cell-left {
+        flex: 3;
+        font-size: 32rpx;
+        color: #666;
+      }
+
+      .uni-list-cell-db {
+        border: 1px solid #e5e9ed;
+        background-color: #fff;
+        padding: 16rpx 0;
+        flex: 5;
+      }
+      .uni-list-cell-db-text {
+        flex: 5;
+        text-align: left;
+      }
+    }
+
+    .changeHospital__wrap {
+      width: 90vw;
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+      background-color: #fff;
+      border-radius: 12rpx;
+      color: #666;
+
+      .changeHospital__header {
+        font-size: 36rpx;
+        color: #000;
+        height: 84rpx;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
+      .changeHospital__article {
+        width: 90%;
+        margin: 0 auto 25rpx;
+        padding: 48rpx 0;
+        background-color: rgb(249, 250, 251);
+        border: 2rpx solid rgb(229, 233, 237);
+        border-radius: 12rpx;
+        box-sizing: border-box;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        &.p0 {
+          padding: 0;
+        }
+
+        .changeHospital__icon {
+          font-size: 138rpx;
+          margin-bottom: 32rpx;
+
+          &.changeHospital__icon--success {
+            color: rgb(52, 179, 73);
+          }
+
+          &.changeHospital__icon--warn {
+            color: rgb(245, 165, 35);
+          }
+
+          &.changeHospital__icon--error {
+            color: rgb(255, 58, 82);
+          }
+        }
+
+        .changeHospital__content {
+          font-size: 36rpx;
+        }
+
+        .changeHospital__info {
+          font-size: 32rpx;
+          color: rgb(102, 102, 102);
+        }
+
+        .specialCloseFlag {
+          width: 90%;
+          height: 100%;
+          padding: 16rpx;
+        }
+
+        .radio-wrap {
+          .radio-item {
+            margin-top: 16rpx;
+
+            /deep/ .uni-radio-input-checked {
+              background-color: #49b856 !important;
+              border-color: #49b856 !important;
+            }
+          }
+        }
+      }
+
+      .changeHospital__footer {
+        box-sizing: border-box;
+        height: 100rpx;
+        border-top: 2rpx solid rgb(229, 233, 237);
+        display: flex;
+        align-items: center;
+
+        view {
+          height: 100%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 36rpx;
+          color: rgb(102, 102, 102);
+          position: relative;
+
+          &:nth-of-type(2)::before {
+            content: "";
+            position: absolute;
+            left: 0;
+            bottom: 0;
+            width: 2rpx;
+            height: 87rpx;
+            background-color: rgb(229, 233, 237);
+          }
+        }
+
+        .changeHospital__ok {
+          flex: 1;
+          color: rgb(73, 184, 86);
+        }
+
+        .changeHospital__cancel {
+          flex: 1;
+        }
+
+        .changeHospital__know {
+          flex: 1;
+          color: rgb(73, 184, 86);
+        }
+      }
+    }
+  }
+</style>

components/smallScreen/smallScreen.vue

@@ -0,0 +1,352 @@
+<template>
+  <view class="smallScreen">
+    <view class="smallScreen_scan" @click="Scan_ss(sData,sType)">
+      <slot></slot>
+    </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 {
+    post,
+    SM
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        currentCode: '', //当前小扫描的科室二维码
+        currentData: {}, //当前小扫描的工单对象
+        // 填写交接人账号弹窗model
+        hosModels: {
+          disjunctor: false,
+        },
+      }
+    },
+    props:{
+      sData:{
+        type:Object
+      },
+      sType:{
+        type:Number
+      }
+    },
+    methods: {
+      // 如果不是静配，药配，标本配送,标本轮巡
+      // 科室签到（小扫描）
+      nextDeptOrder_ss(data, accountObj) {
+        let isKs = 0;
+        let ids = [];
+        let id = data.id;
+        ids.push(id);
+        let list = {
+          code: "",
+          ids: ids,
+        };
+        let code = "";
+        let type = "";
+        if (this.currentCode) {
+          let gdStateValue = data.gdState.value; //工单状态value
+          let associationTypeValue = data.taskType.associationType.value; //关联类型value
+          // 患者陪检，并且工单状态是待到达
+          if (
+            gdStateValue == "4" &&
+            associationTypeValue == "inspect"
+          ) {
+            list.code = this.currentCode; //其他
+            type = "handleIns";
+          }
+          // 其他临床服务，并且工单状态是待到达||工单状态待送达
+          if (
+            (associationTypeValue == "other" &&
+              gdStateValue == "4") ||
+            gdStateValue == "5"
+          ) {
+            code = this.currentCode;
+            type = "orderSign/" + code;
+            list = {
+              ids
+            };
+            if (accountObj) {
+              list.handover = [accountObj.accountId];
+            }
+            isKs = 1;
+          }
+          if (
+            (gdStateValue == "5" &&
+              associationTypeValue == "inspect") ||
+            associationTypeValue == "patientTransport"
+          ) {
+            code = this.currentCode;
+            type = "orderSign/" + code;
+            list = {
+              ids
+            };
+            if (accountObj) {
+              list.handover = [accountObj.accountId];
+            }
+            isKs = 1;
+          }
+          if (gdStateValue == "8") {
+            code = this.currentCode; //患者陪检--检查
+            type = "orderSign/" + code;
+            list = {
+              ids
+            };
+            if (accountObj) {
+              list.handover = [accountObj.accountId];
+            }
+            isKs = 1;
+          }
+          if (
+            gdStateValue == "4" &&
+            associationTypeValue == "patientTransport"
+          ) {
+            list = {
+              code: this.currentCode, //患者转运--检查
+              ids: ids,
+            };
+            type = "handleTrans";
+          }
+          post("/workerOrder/" + type, list).then((res) => {
+            uni.hideLoading();
+            if (res) {
+              if (res.status == 200) {
+                if (
+                  gdStateValue == "4" &&
+                  associationTypeValue == "other"
+                ) {
+                  uni.navigateTo({
+                    url: `../../pages/scanning_code/scanning_code?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
+                  });
+                }
+                if (
+                  gdStateValue == "4" &&
+                  associationTypeValue != "other"
+                ) {
+                  uni.navigateTo({
+                    url: `../../pages/scanning_Result/scanning_Result?type=${
+                    associationTypeValue
+                  }&type1=${res.type}&id=${data.id}&deptCode=${
+                    list.code
+                  }&patient=${res.patient}&patientCode=${
+                    res.patientCode
+                  }&deptName=${res.deptName}&bedNum=${
+                    res.bedNum
+                  }&status=${res.status}&msg=${
+                    res.msg
+                  }&model=${encodeURIComponent(JSON.stringify(res))}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
+                  });
+                }
+                if (gdStateValue == "8") {
+                  uni.navigateTo({
+                    url: `../../pages/scanning_code/scanning_code?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
+                  });
+                }
+                if (gdStateValue == "5") {
+                  uni.navigateTo({
+                    url: `../../pages/scanning_code/scanning_code?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}&accountObj=${encodeURIComponent(JSON.stringify(accountObj))}`,
+                  });
+                }
+              } else {
+                console.log(res, "扫描失败");
+                if (res.type == "trans-ddd-1") {
+                  //起点科室扫描腕带码失败
+                  uni.navigateTo({
+                    url: `../../pages/scanning_Result/scanning_Result?type=${associationTypeValue}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}`,
+                  });
+                } else {
+                  uni.navigateTo({
+                    url: `../../pages/scanning_Result/scanning_Result?type=${
+                    associationTypeValue
+                  }&type1=${res.type}&id=${data.id}&status=600&msg=${
+                    res.msg
+                  }&isKs=${isKs}&model=${encodeURIComponent(
+                    JSON.stringify(res)
+                  )}`,
+                  });
+                }
+              }
+            } else {
+              uni.navigateTo({
+                url: `../../pages/scanning_Result/scanning_Result?id=${data.id}&status=600&msg=扫码失败！请扫描正确的二维码！&isKs=${isKs}`,
+              });
+            }
+          });
+        }
+      },
+      // 如果不是患者陪检或患者转运或其他
+      // 科室签到
+      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.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 //科室名称
+              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))}`,
+              });
+            } 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`,
+              });
+            }
+          });
+        }
+      },
+      // type==1  如果不是静配，药配，标本配送,标本轮巡
+      // type==2  如果不是患者陪检，患者转运，其他
+      // 扫码（小扫描）
+      Scan_ss(data, type) {
+        this.currentData = data;
+        console.log(data, 'data');
+        SM().then((ress1) => {
+          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 == 1) {
+                  this.nextDeptOrder_ss(this.currentData, {
+                    account: result.account,
+                    accountName: result.name,
+                    accountId: result.id,
+                  });
+                } else if (type == 2) {
+                  this.nextDeptOrder_s(this.currentData, {
+                    account: result.account,
+                    accountName: result.name,
+                    accountId: result.id,
+                  });
+                }
+              } else {
+                this.nextDeptOrder_ss(this.currentData);
+              }
+            } else if (result.state == '0000') {
+              uni.hideLoading();
+              this.showSelectAccount(); //yeye
+            } 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);
+        }
+        if (
+          associationTypeValue !== "jPBag" &&
+          associationTypeValue !== "drugsBag" &&
+          associationTypeValue !== "specimen" &&
+          associationTypeValue !== "specimenPlan"
+        ) {
+          this.nextDeptOrder_ss(this.currentData, data);
+        }
+      },
+      // 填写交接人账号-取消
+      hosCancel() {
+        this.hosModels.disjunctor = false;
+      },
+      // 填写交接人账号弹窗
+      showSelectAccount() {
+        this.hosModels = {
+          title: '填写交接人账号',
+          disjunctor: true,
+        }
+      },
+    },
+    components: {
+      selectAccount
+    }
+  };
+</script>
+
+<style lang="less">
+.smallScreen{
+  width: 100%;
+  height: 100%;
+  .smallScreen_scan{
+    width: 100%;
+    height: 100%;
+  }
+}
+</style>

pages/receipt_infopage/receipt_infopage.vue

@@ -275,13 +275,13 @@
       <!-- 如果不是静配，药配，标本配送,标本轮巡 -->
       <template
         v-if="((!infoDATA.worker)||(infoDATA.worker&&infoDATA.worker.id == currentUserId))&&infoDATA.gdState.value != 6&&infoDATA.gdState.value != 7&&infoDATA.gdState.value != 11">
-        <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" @click="Scan_ss(infoDATA)" v-if="
+        <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" v-if="
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'jPBag' &&
           infoDATA.taskType.associationType.value != 'drugsBag' &&
           infoDATA.taskType.associationType.value != 'specimen' &&
           infoDATA.taskType.associationType.value != 'specimenPlan'
-        " hover-class="seimin-btn-hover">扫一扫</view>
+        " hover-class="seimin-btn-hover"><smallScreen :sData="infoDATA" :sType="1">扫码</smallScreen></view>
         <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" @click="photograph(infoDATA)" v-if="
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'jPBag' &&
@@ -301,12 +301,12 @@
         " hover-class="seimin-btn-hover">特殊情况关闭</view>
       </template>
       <!-- 如果不是患者陪检或患者转运或其他 -->
-      <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" @click="Scan_s(infoDATA)" v-if="
+      <view :class="[infoDATA.taskType.specialCloseButton == 1 ? 'btn3' : 'btn2']" v-if="
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'patientTransport' &&
           infoDATA.taskType.associationType.value != 'inspect' &&
           infoDATA.taskType.associationType.value != 'other'
-        " hover-class="seimin-btn-hover">扫一扫</view>
+        " hover-class="seimin-btn-hover"><smallScreen :sData="infoDATA" :sType="2">扫码</smallScreen></view>
       <view class="btn3" @click="specialCloseClick()" v-if="
           infoDATA.gdState.value != 2 &&
           infoDATA.taskType.associationType.value != 'patientTransport' &&
@@ -325,6 +325,7 @@
   </view>
 </template>
 <script>
+  import smallScreen from "../../components/smallScreen/smallScreen.vue";
   import showModel from "../../components/showModel/showModel.vue";
   import {
     get,
@@ -507,198 +508,6 @@
           this.animationData = this.animation.export();
         }
       },
-      // 如果不是静配，药配，标本配送,标本轮巡
-      // 扫码
-      Scan_ss(data) {
-        let isKs = 0;
-        let ids = [];
-        let id = data.id;
-        ids.push(id);
-        let list = {
-          code: "",
-          ids: ids,
-        };
-        let code = "";
-        let type = "";
-        SM().then((ress1) => {
-          uni.showLoading({
-            title: "加载中",
-            mask: true,
-          });
-          //检验二维码的有效性
-          post("/dept/scanning", {
-            content: ress1,
-          }).then((result) => {
-            if (result.state == 200 || result.state == 201) {
-              let ress = result.code;
-              if (ress) {
-                if (
-                  data.gdState.value == "4" &&
-                  data.taskType.associationType.value == "inspect"
-                ) {
-                  list.code = ress; //其他
-                  type = "handleIns";
-                }
-                if (
-                  (data.taskType.associationType.value == "other" &&
-                    data.gdState.value == "4") ||
-                  data.gdState.value == "5"
-                ) {
-                  code = ress; //其他=终点
-                  type = "orderSign/" + code;
-                  list = ids;
-                  isKs = 1;
-                }
-                if (
-                  (data.gdState.value == "5" &&
-                    data.taskType.associationType.value == "inspect") ||
-                  data.taskType.associationType.value == "patientTransport"
-                ) {
-                  code = ress; //患者转运--起点
-                  type = "orderSign/" + code;
-                  list = ids;
-                  isKs = 1;
-                }
-                if (data.gdState.value == "8") {
-                  code = ress; //患者陪检--检查
-                  type = "orderSign/" + code;
-                  list = ids;
-                  isKs = 1;
-                }
-                if (
-                  data.gdState.value == "4" &&
-                  data.taskType.associationType.value == "patientTransport"
-                ) {
-                  list = {
-                    code: ress, //患者转运--检查
-                    ids: ids,
-                  };
-                  type = "handleTrans";
-                }
-                post("/workerOrder/" + type, list).then((res) => {
-                  uni.hideLoading();
-                  if (res) {
-                    if (res.status == 200) {
-                      if (
-                        data.gdState.value == "4" &&
-                        data.taskType.associationType.value == "other"
-                      ) {
-                        uni.navigateTo({
-                          url: `../scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}`,
-                        });
-                      }
-                      if (
-                        data.gdState.value == "4" &&
-                        data.taskType.associationType.value != "other"
-                      ) {
-                        uni.navigateTo({
-                          url: `../scanning_Result/scanning_Result?type=${
-                          data.taskType.associationType.value
-                        }&type1=${res.type}&id=${data.id}&deptCode=${
-                          list.code
-                        }&patient=${res.patient}&patientCode=${
-                          res.patientCode
-                        }&deptName=${res.deptName}&bedNum=${
-                          res.bedNum
-                        }&status=${res.status}&msg=${
-                          res.msg
-                        }&model=${encodeURIComponent(JSON.stringify(res))}`,
-                        });
-                      }
-                      if (data.gdState.value == "8") {
-                        uni.navigateTo({
-                          url: `../scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}`,
-                        });
-                      }
-                      if (data.gdState.value == "5") {
-                        uni.navigateTo({
-                          url: `../scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}`,
-                        });
-                      }
-                    } else {
-                      if (res.type == "trans-ddd-1") {
-                        //起点科室扫描腕带码失败
-                        uni.navigateTo({
-                          url: `../scanning_Result/scanning_Result?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}`,
-                        });
-                      } else {
-                        uni.navigateTo({
-                          url: `../scanning_Result/scanning_Result?type=${
-                          data.taskType.associationType.value
-                        }&type1=${res.type}&id=${data.id}&status=600&msg=${
-                          res.msg
-                        }&isKs=${isKs}&model=${encodeURIComponent(
-                          JSON.stringify(res)
-                        )}`,
-                        });
-                      }
-                    }
-                  } else {
-                    uni.navigateTo({
-                      url: `../scanning_Result/scanning_Result?id=${data.id}&status=600&msg=扫码失败！请扫描正确的二维码！&isKs=${isKs}`,
-                    });
-                  }
-                });
-              }
-            } else {
-              uni.hideLoading();
-              uni.showToast({
-                icon: "none",
-                title: "请求失败！",
-              });
-            }
-          });
-        });
-      },
-      // 如果不是患者陪检或患者转运或其他
-      // 扫码
-      Scan_s(data) {
-        let ids = [];
-        let id = data.id;
-        ids.push(id);
-        let code = "";
-        SM().then((ress1) => {
-          uni.showLoading({
-            title: "加载中",
-            mask: true,
-          });
-          //检验二维码的有效性
-          post("/dept/scanning", {
-            content: ress1,
-          }).then((result) => {
-            if (result.state == 200 || result.state == 201) {
-              let ress = result.code;
-              if (ress) {
-                code = ress;
-                // 科室签到
-                post("/workerOrder/orderSign/" + code, ids).then((res) => {
-                  uni.hideLoading();
-                  if (res.status == 200) {
-                    // 跳转到扫描科室
-                    // type1: res.type, //type类型
-                    // id: data.id, //工单ID
-                    // deptCode: code, //二维码
-                    // dept: res.dept //科室名称
-                    uni.navigateTo({
-                      url: `../scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}`,
-                    });
-                  } else {
-                    uni.navigateTo({
-                      url: `../scanning_Result/scanning_Result?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}&isKs=1`,
-                    });
-                  }
-                });
-              }
-            } else {
-              uni.hideLoading();
-              uni.showToast({
-                icon: "none",
-                title: "请求失败！",
-              });
-            }
-          });
-        });
-      },
       // 抢单->知道了
       know() {
         this.models.disjunctor = false;

pages/receiptpage/receiptpage.vue

@@ -175,7 +175,7 @@
                 item.taskType.associationType.value != 'patientTransport' &&
                 item.taskType.associationType.value != 'inspect' &&
                 item.taskType.associationType.value != 'other'
-              " @click="Scan_s(item)" hover-class="seimin-btn-hover">扫码</view>
+              " hover-class="seimin-btn-hover"><smallScreen :sData="item" :sType="2">扫码</smallScreen></view>
             <!-- 如果不是静配，药配，标本配送,标本轮巡 -->
             <view class="page_item_btn_wrap" v-if="
                 selectedLabelSlots == '执行中' &&
@@ -190,7 +190,7 @@
                     item.gdState.value == 4
                       ? '50%'
                       : '100%',
-                }" @click="Scan_ss(item)" hover-class="seimin-btn-hover">扫码</view>
+                }" hover-class="seimin-btn-hover"><smallScreen :sData="item" :sType="1">扫码</smallScreen></view>
               <view v-if="
                   item.taskType.associationType.value != 'other' &&
                   item.gdState.value == 4
@@ -214,6 +214,7 @@
   </view>
 </template>
 <script>
+  import smallScreen from "../../components/smallScreen/smallScreen.vue";
   import showModel from "../../components/showModel/showModel.vue";
   import bigScreen from "../../components/bigScreen/bigScreen.vue";
   // https://ext.dcloud.net.cn/plugin?id=144
@@ -507,202 +508,9 @@
           },
         };
       },
-      // 如果不是静配，药配，标本配送,标本轮巡
-      // 扫码（小扫描）
-      Scan_ss(data) {
-        let isKs = 0;
-        let ids = [];
-        let id = data.id;
-        ids.push(id);
-        let list = {
-          code: "",
-          ids: ids,
-        };
-        let code = "";
-        let type = "";
-        SM().then((ress1) => {
-          uni.showLoading({
-            title: "加载中",
-            mask: true,
-          });
-          //检验二维码的有效性
-          post("/dept/scanning", {
-            content: ress1,
-          }).then((result) => {
-            if (result.state == 200 || result.state == 201) {
-              let ress = result.code;
-              if (ress) {
-                if (
-                  data.gdState.value == "4" &&
-                  data.taskType.associationType.value == "inspect"
-                ) {
-                  list.code = ress; //其他
-                  type = "handleIns";
-                }
-                if (
-                  (data.taskType.associationType.value == "other" &&
-                    data.gdState.value == "4") ||
-                  data.gdState.value == "5"
-                ) {
-                  code = ress; //其他=终点
-                  type = "orderSign/" + code;
-                  list = ids;
-                  isKs = 1;
-                }
-                if (
-                  (data.gdState.value == "5" &&
-                    data.taskType.associationType.value == "inspect") ||
-                  data.taskType.associationType.value == "patientTransport"
-                ) {
-                  code = ress; //患者转运--起点
-                  type = "orderSign/" + code;
-                  list = ids;
-                  isKs = 1;
-                }
-                if (data.gdState.value == "8") {
-                  code = ress; //患者陪检--检查
-                  type = "orderSign/" + code;
-                  list = ids;
-                  isKs = 1;
-                }
-                if (
-                  data.gdState.value == "4" &&
-                  data.taskType.associationType.value == "patientTransport"
-                ) {
-                  list = {
-                    code: ress, //患者转运--检查
-                    ids: ids,
-                  };
-                  type = "handleTrans";
-                }
-                post("/workerOrder/" + type, list).then((res) => {
-                  uni.hideLoading();
-                  if (res) {
-                    if (res.status == 200) {
-                      if (
-                        data.gdState.value == "4" &&
-                        data.taskType.associationType.value == "other"
-                      ) {
-                        uni.navigateTo({
-                          url: `../scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}`,
-                        });
-                      }
-                      if (
-                        data.gdState.value == "4" &&
-                        data.taskType.associationType.value != "other"
-                      ) {
-                        uni.navigateTo({
-                          url: `../scanning_Result/scanning_Result?type=${
-                          data.taskType.associationType.value
-                        }&type1=${res.type}&id=${data.id}&deptCode=${
-                          list.code
-                        }&patient=${res.patient}&patientCode=${
-                          res.patientCode
-                        }&deptName=${res.deptName}&bedNum=${
-                          res.bedNum
-                        }&status=${res.status}&msg=${
-                          res.msg
-                        }&model=${encodeURIComponent(JSON.stringify(res))}`,
-                        });
-                      }
-                      if (data.gdState.value == "8") {
-                        uni.navigateTo({
-                          url: `../scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}`,
-                        });
-                      }
-                      if (data.gdState.value == "5") {
-                        uni.navigateTo({
-                          url: `../scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}`,
-                        });
-                      }
-                    } else {
-                      console.log(res, "扫描失败");
-                      if (res.type == "trans-ddd-1") {
-                        //起点科室扫描腕带码失败
-                        uni.navigateTo({
-                          url: `../scanning_Result/scanning_Result?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}`,
-                        });
-                      } else {
-                        uni.navigateTo({
-                          url: `../scanning_Result/scanning_Result?type=${
-                          data.taskType.associationType.value
-                        }&type1=${res.type}&id=${data.id}&status=600&msg=${
-                          res.msg
-                        }&isKs=${isKs}&model=${encodeURIComponent(
-                          JSON.stringify(res)
-                        )}`,
-                        });
-                      }
-                    }
-                  } else {
-                    uni.navigateTo({
-                      url: `../scanning_Result/scanning_Result?id=${data.id}&status=600&msg=扫码失败！请扫描正确的二维码！&isKs=${isKs}`,
-                    });
-                  }
-                });
-              }
-            } else {
-              uni.hideLoading();
-              uni.showToast({
-                icon: "none",
-                title: "请求失败！",
-              });
-            }
-          });
-        });
-      },
-      // 如果不是患者陪检或患者转运或其他
-      // 扫码
-      Scan_s(data) {
-        let ids = [];
-        let id = data.id;
-        ids.push(id);
-        let code = "";
-        SM().then((ress1) => {
-          uni.showLoading({
-            title: "加载中",
-            mask: true,
-          });
-          //检验二维码的有效性
-          post("/dept/scanning", {
-            content: ress1,
-          }).then((result) => {
-            if (result.state == 200 || result.state == 201) {
-              let ress = result.code;
-              if (ress) {
-                code = ress;
-                // 科室签到
-                post("/workerOrder/orderSign/" + code, ids).then((res) => {
-                  uni.hideLoading();
-                  if (res.status == 200) {
-                    // 跳转到扫描科室
-                    // type1: res.type, //type类型
-                    // id: data.id, //工单ID
-                    // deptCode: code, //二维码
-                    // dept: res.dept //科室名称
-                    uni.navigateTo({
-                      url: `../scanning_code/scanning_code?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&deptCode=${code}&dept=${res.dept}`,
-                    });
-                  } else {
-                    uni.navigateTo({
-                      url: `../scanning_Result/scanning_Result?type=${data.taskType.associationType.value}&type1=${res.type}&id=${data.id}&status=600&msg=${res.msg}&isKs=1`,
-                    });
-                  }
-                });
-              }
-            } else {
-              uni.hideLoading();
-              uni.showToast({
-                icon: "none",
-                title: "请求失败！",
-              });
-            }
-          });
-        });
-      },
       //执行中列表数据获取
       executingOrders(idx) {
-        console.log(this.zxzData.length,this.totalNum)
+        console.log(this.zxzData.length, this.totalNum)
         if (this.zxzData.length == this.totalNum) {
           uni.showToast({
             icon: "none",

pages/scanning_Result/scanning_Result.vue

@@ -73,6 +73,8 @@
     </view>
     <view class="Scanning_cont" v-if="res.status == 200 && (type == 'drugsBag' || type == 'jPBag')">
       <view v-if="type == 'drugsBag'"> 药包编码 : #{{ infoDATA.packid }} </view>
+      <view v-if="type == 'drugsBag' && accountObj && (queryObj.type1 === 'drug-ddd-2' || queryObj.type1 === 'drug-dsd-2')"> 交接人账号 : {{ accountObj.account }} </view>
+      <view v-if="type == 'drugsBag' && accountObj && (queryObj.type1 === 'drug-ddd-2' || queryObj.type1 === 'drug-dsd-2')"> 交接人姓名 : {{ accountObj.accountName }} </view>
       <view v-if="type == 'jPBag'">
         静配药包编码 : #{{ infoDATA.packid }}
       </view>
@@ -220,6 +222,8 @@
   export default {
     data() {
       return {
+        // 交接人信息
+        accountObj:undefined,
         // 完成扫描的id
         wcId: "",
         // 弹窗model
@@ -558,6 +562,9 @@
       } else if (options.model) {
         this.infoDATA = JSON.parse(options.model);
       }
+      if(options.accountObj && options.accountObj != "undefined"){
+        this.accountObj = JSON.parse(options.accountObj);
+      }
 
       this.dataId = options.id;
       this.RESData = options.resData;

pages/scanning_all/scanning_all.vue

@@ -306,7 +306,7 @@ export default {
       clearTimeout(this.flagTimer);
       this.flagTimer = setTimeout(() => {
         this.flag = false;
-        let list = [];
+        let list = {};
         let type = "";
 
         if (this.userId.ids.length > 0) {
@@ -318,7 +318,7 @@ export default {
             this.tabType == "specimenPlan"
           ) {
             type = "orderSign/" + this.code;
-            list = this.userId.ids;
+            list = {ids:this.userId.ids};
             uni.showLoading({
               title: "加载中",
               mask: true,

pages/scanning_code/scanning_code.vue

@@ -121,6 +121,14 @@
         </view>
       </view>
       <view class="page_item_foot">
+        <view class="page_item_foot_text" v-if="accountObj && (infoType === 'drug-ddd-1' || infoType === 'drug-dsd-1')">
+          <text class="text1">交接人账号</text>
+          <text class="text2">{{ accountObj.account }}</text>
+        </view>
+        <view class="page_item_foot_text" v-if="accountObj && (infoType === 'drug-ddd-1' || infoType === 'drug-dsd-1')">
+          <text class="text1">交接人姓名</text>
+          <text class="text2">{{ accountObj.accountName }}</text>
+        </view>
         <view class="page_item_foot_text">
           <text class="text1">状态</text>
           <text class="text2"
@@ -357,6 +365,8 @@
   export default {
     data() {
       return {
+        // 交接人信息
+        accountObj:undefined,
         // 完成工单的id
         wcId: "",
         // 弹窗model
@@ -408,6 +418,9 @@
                   this.infoDATA.taskType.associationType.value == "drugsBag"
                 ) {
                   postType = "handleDrugsAndJp";
+                  if(this.accountObj){
+                    data.handover = this.accountObj.accountId;
+                  }
                 }
                 if (this.infoDATA.taskType.associationType.value == "specimen") {
                   data["speCode"] = data.code;
@@ -463,7 +476,7 @@
                               this.queryObj.dept
                             }&id=${id}&model=${encodeURIComponent(
                               JSON.stringify(ress)
-                            )}`,
+                            )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}`,
                             });
                             // ------------end------------
                           } else {
@@ -490,7 +503,7 @@
                           this.queryObj.dept
                         }&id=${id}&model=${encodeURIComponent(
                           JSON.stringify(ress)
-                        )}`,
+                        )}&accountObj=${encodeURIComponent(JSON.stringify(this.accountObj))}`,
                         });
                         // ------------end------------
                       }
@@ -704,6 +717,9 @@
     },
     onLoad(options) {
       console.log(options);
+      if(options.accountObj && options.accountObj != "undefined"){
+        this.accountObj = JSON.parse(options.accountObj);
+      }
       this.queryObj = options;
       let id = options.id;
       this.dataId = id; //工单ID
@@ -972,13 +988,15 @@
         .page_item_foot_text {
           font-size: 32rpx;
           margin-bottom: 20rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
 
           .text1 {
             color: rgb(102, 102, 102);
           }
 
           .text2 {
-            float: right;
             font-weight: 700;
           }
         }

pages/scanning_ins/scanning_ins.vue

@@ -575,7 +575,7 @@
                     var ids = [];
                     ids.push(data.id);
                     type = "orderSign/" + ress;
-                    list = ids;
+                    list = {ids};
                     // 科室签到
                     post("/workerOrder/" + type, list).then((res) => {
                       uni.hideLoading();