药品批次页面

components/bigScreen/bigScreen.vue

@@ -274,7 +274,7 @@
                       } else if (res.type == 'drugsBag') {
                         //扫药包码
                         uni.navigateTo({
-                          url: `/pages/scanning_drug/scanning_drug?drugsBagId=${res.drugsBagId}`,
+                          url: `/pages/scanning_drug/scanning_drug?drugsBagId=${res.drugsBagId}&drugsBagBatchNo=${res.drugsBagBatchNo}`,
                         });
                       } else if (res.type == 'nucleicAcid') {
                         //扫核酸码

pages.json

@@ -420,6 +420,14 @@
           "titleNView": false
         }
       }
+    }, {
+      "path": "pages/drugBatches/drugBatches",
+      "style": {
+        "h5": {
+          "titleNView": false
+        }
+      }
+
     }
   ],
   "globalStyle": {

pages/drugBatches/drugBatches.vue

@@ -0,0 +1,334 @@
+<template>
+  <view class="pharmacyDetails">
+    <view class="pharmacyDetails_title">药品批次</view>
+    <view class="page_item footerOtherMargin">
+      <view class="page_item_wrap" v-for="item in batchNoList" :key="item.id">
+        <view class="page_item">
+          <view class="page_item_top">
+            <view class="page_item_top-inner">
+              <view class="page_item_top_L">
+                <view class="L_text">{{item.packid || "无"}}</view>
+              </view>
+              <view class="page_item_top_R">
+                <text>{{item.drugsState ? item.drugsState.name : "无"}}</text>
+              </view>
+            </view>
+          </view>
+          <view class="page_item_cont">
+            <view class="page_item_cont_T">
+              
+            </view>
+          </view>
+          <view class="L"></view>
+          <view class="R"></view>
+        </view>
+        <view class="L-l"></view>
+        <view class="R-l"></view>
+      </view>
+    </view>
+    <view class="foot_btn2 footerPadding">
+      <view class="btn2" @click="goBack">返回</view>
+    </view>
+  </view>
+</template>
+<script>
+  import {
+    post,
+    webHandle
+  } from "../../http/http.js";
+  export default {
+    data() {
+      return {
+        hosId: null,
+        options: {}, //路由传递过来的数据
+        batchNoList: [],
+      };
+    },
+    methods: {
+      // 返回
+      goBack() {
+        uni.navigateBack();
+      },
+      //获取药包信息及其关联的工单信息
+      queryDrugsBagForBatchNo(batchNo) {
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/drugsBag/fetchDataList/drugsBag", {
+          "idx": 0,
+          "sum": 10,
+          "drugsBag": {
+              "hosId": this.hosId,
+              "batchNo": batchNo,
+          }
+        }).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            this.batchNoList = res.list || [];
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败",
+            });
+          }
+        });
+      },
+    },
+    onLoad(options) {
+      this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
+      console.log(options);
+      this.options = options;
+      if (options.batchNo) {
+        this.queryDrugsBagForBatchNo(options.batchNo);
+      }
+      // #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: 50rpx;
+    height: 100%;
+    box-sizing: border-box;
+
+    .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: 90rpx;
+          padding: 0 16rpx;
+          text-align: left;
+          position: relative;
+
+          .text_big {
+            font-size: 32rpx;
+            font-weight: 700;
+            // margin-top: 10rpx;
+          
+            p {
+              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;
+            padding-bottom: 28rpx;
+            font-size: 28rpx;
+
+            .page_item_cont_title {
+              height: 100%;
+              font-size: 32rpx;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+            }
+          }
+
+          .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;
+    }
+
+    .foot_btn2 {
+      position: fixed;
+      bottom: 0;
+      right: 20rpx;
+      left: 20rpx;
+      line-height: 66rpx;
+      height: 100rpx;
+      border-top: 2rpx solid #e5e9ed;
+      background: #f9fafb;
+      display: flex;
+      justify-content: space-between;
+
+      .btn2 {
+        height: 66rpx;
+        width: 100%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+        text-align: center;
+      }
+
+      .btn3 {
+        height: 66rpx;
+        width: 48%;
+        margin: 0 1%;
+        background-image: linear-gradient(to right, #72c172, #3bb197);
+        color: #fff;
+        border-radius: 8rpx;
+        font-size: 32rpx;
+        margin-top: 16rpx;
+        text-align: center;
+      }
+    }
+  }
+</style>

pages/receipt_infopage/receipt_infopage.vue

@@ -394,6 +394,7 @@
           infoDATA.taskType.associationType.value == 'specimenPlan'
         " hover-class="seimin-btn-hover">查看标本</view>
       <view class="btn3" @click="viewDrugsBag(infoDATA)" v-if="infoDATA.taskType.associationType.value == 'drugsBag'" hover-class="seimin-btn-hover">查看业务流程</view>
+      <view class="btn3" @click="toDrugBatches(infoDATA.drugs.batchNo)" v-if="infoDATA.taskType.associationType.value == 'drugsBag' && taskTypeConfig.drugsBatchInfo == 1" hover-class="seimin-btn-hover">药品批次</view>
       <view class="btn3" @click="viewBlood(infoDATA)" v-if="infoDATA.taskType.associationType.value == 'ordinary' && infoDATA.taskType.ordinaryField.value == 'blood'" hover-class="seimin-btn-hover">查看血制品</view>
       <view class="btn3" @click="additionalUser(infoDATA)" v-if="(infoDATA.taskType.associationType.value == 'inspect' || infoDATA.taskType.associationType.value == 'patientTransport') && infoDATA.worker && infoDATA.worker.id && multiplayerMode === 1" hover-class="seimin-btn-hover">追加陪检人员</view>
     </view>
@@ -430,6 +431,7 @@
     },
     data() {
       return {
+        taskTypeConfig: {},
         // 填写交接人账号弹窗model
         hosModels: {
           disjunctor: false,
@@ -488,6 +490,68 @@
       },
     },
     methods: {
+      // 判断药品页面控制-是否显示关联批次药品
+      isShowDrugsBatchInfo(){
+        post("/simple/data/fetchDataList/taskType", {
+          "idx": 0,
+          "sum": 10,
+          "taskType": {
+            "simpleQuery": true,
+            "hosId": {
+              "id": this.hosId
+            },
+            "associationType": {
+              "key": "association_types",
+              "value": "drugsBag"
+            }
+          }
+        }).then((res) => {
+          if (res.status == 200) {
+            res.list = res.list || [];
+            let taskType = res.list[0] || {};
+            if(taskType.id){
+              post("/simple/data/fetchDataList/taskTypeConfig", {
+                "idx": 0,
+                "sum": 10,
+                "taskTypeConfig": {
+                  "taskTypeDTO": {
+                    "hosId": {
+                      "id": this.hosId
+                    },
+                    "associationType": taskType.associationType
+                  }
+                }
+              }).then((res) => {
+                if (res.status == 200) {
+                  res.list = res.list || [];
+                  this.taskTypeConfig = res.list[0] || {};
+                } else {
+                  uni.showToast({
+                    icon: "none",
+                    title: "请求失败！",
+                  });
+                }
+              });
+            }else{
+              uni.showToast({
+                icon: "none",
+                title: "请配置药品业务类型！",
+              });
+            }
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: "请求失败！",
+            });
+          }
+        });
+      },
+      // 跳转到药品批次页面
+      toDrugBatches(batchNo){
+        uni.navigateTo({
+          url: `../drugBatches/drugBatches?batchNo=${batchNo}`,
+        });
+      },
       // 前往其他临床服务完成工单确认页面
       otherCompleteOrder(data){
         console.log(data);
@@ -1282,6 +1346,7 @@
       }
     },
     onLoad(options) {
+      this.isShowDrugsBatchInfo();
       console.log(options, 'options');
       this.currentUserId = uni.getStorageSync('userData').user.id;
       let id = options.id;

pages/scanning_drug/scanning_drug.vue

@@ -107,6 +107,7 @@
   export default {
     data() {
       return {
+        hosId: null,
         DRUGSBAG_TYPE,
         // 弹窗model
         models: {
@@ -308,6 +309,7 @@
             let info = {
               targetDept: ress.data.target.dept, //所属科室
               packid: ress.data.packid, //药包编码
+              batchNo: ress.data.batchNo, //药包批次
               status: ress.status,
               msg: ress.msg,
             };
@@ -392,6 +394,7 @@
                   let info = {
                     targetDept: ress.data.target.dept, //所属科室
                     packid: ress.data.packid, //药包编码
+                    batchNo: ress.data.batchNo, //药包批次
                     status: ress.status,
                     msg: ress.msg,
                   };
@@ -440,9 +443,11 @@
       this.gotoFlag = true;
     },
     onLoad(options) {
+      this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
       console.log(options);
       let {
-        drugsBagId
+        drugsBagId,
+        drugsBagBatchNo,
       } = options;
       if (drugsBagId) {
         this.queryDrugsBagForId(drugsBagId);

pages/scanning_result_seimin/scanning_result_seimin.vue

@@ -33,28 +33,106 @@
     </view>
     <view class="foot_btn">
       <view class="btn3" @click="showAlert()"> 知道了 </view>
+      <view class="btn3" @click="toDrugBatches(queryObj.batchNo)" v-if="taskTypeConfig.drugsBatchInfo == 1"> 药品批次 </view>
     </view>
   </view>
 </template>
 <script>
-import { webHandle } from "../../http/http.js";
+import { post, webHandle } from "../../http/http.js";
 export default {
   data() {
     return {
+      hosId: null,
+      options: {},
       queryObj: {},
+      taskTypeConfig: {},
     };
   },
   methods: {
+    // 跳转到药品批次页面
+    toDrugBatches(batchNo){
+      uni.navigateTo({
+        url: `../drugBatches/drugBatches?batchNo=${batchNo}`,
+      });
+    },
     // 知道了
     showAlert() {
       uni.navigateTo({
         url: "../receiptpage/receiptpage",
       });
     },
+    // 判断药品页面控制-是否显示关联批次药品
+    isShowDrugsBatchInfo(){
+      uni.showLoading({
+        title: "加载中",
+        mask: true,
+      });
+      post("/simple/data/fetchDataList/taskType", {
+        "idx": 0,
+        "sum": 10,
+        "taskType": {
+          "simpleQuery": true,
+          "hosId": {
+            "id": this.hosId
+          },
+          "associationType": {
+            "key": "association_types",
+            "value": "drugsBag"
+          }
+        }
+      }).then((res) => {
+        if (res.status == 200) {
+          res.list = res.list || [];
+          let taskType = res.list[0] || {};
+          if(taskType.id){
+            post("/simple/data/fetchDataList/taskTypeConfig", {
+              "idx": 0,
+              "sum": 10,
+              "taskTypeConfig": {
+                "taskTypeDTO": {
+                  "hosId": {
+                    "id": this.hosId
+                  },
+                  "associationType": taskType.associationType
+                }
+              }
+            }).then((res) => {
+              if (res.status == 200) {
+                res.list = res.list || [];
+                this.taskTypeConfig = res.list[0] || {};
+                uni.hideLoading();
+              } else {
+                uni.hideLoading();
+                uni.showToast({
+                  icon: "none",
+                  title: "请求失败！",
+                });
+              }
+            });
+          }else{
+            uni.hideLoading();
+            uni.showToast({
+              icon: "none",
+              title: "请配置药品业务类型！",
+            });
+          }
+        } else {
+          uni.hideLoading();
+          uni.showToast({
+            icon: "none",
+            title: "请求失败！",
+          });
+        }
+      });
+    },
+    
   },
   onLoad(options) {
+    this.hosId = uni.getStorageSync('userData').user.currentHospital.id;
     console.log(options, "result");
-    this.queryObj = JSON.parse(options.info);
+    this.options = options;
+    this.isShowDrugsBatchInfo();
+    this.queryObj = JSON.parse(this.options.info);
     // #ifdef APP-PLUS
     webHandle("no", "app");
     // #endif