bug修复

pages/scanning_result_seimin/scanning_result_seimin.vue

@@ -19,21 +19,44 @@
     </view>
 
     <view class="Scanning_cont" v-if="queryObj.status == 200">
-      <view> 药包编码 : #{{ queryObj.packid }} </view>
-      <view v-if="queryObj.account"> 交接人账号 : {{ queryObj.account }} </view>
-      <view v-if="queryObj.accountName">
+      <view class="Scanning_cont_block"> 药包编码 : #{{ queryObj.packid }} </view>
+      <view class="Scanning_cont_block" v-if="queryObj.account"> 交接人账号 : {{ queryObj.account }} </view>
+      <view class="Scanning_cont_block" v-if="queryObj.accountName">
         交接人姓名 : {{ queryObj.accountName }}
       </view>
-      <view> 所属科室 : {{ queryObj.targetDept || "-" }} </view>
+      <view class="Scanning_cont_block"> 所属科室 : {{ queryObj.targetDept || "-" }} </view>
+      <!-- 药品批次列表 -->
+      <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="Scanning_cont" v-if="queryObj.status != 200">
-      <view class="Scanning_cont_center">
+      <view class="Scanning_cont_center Scanning_cont_block">
         {{ queryObj.msg }}
       </view>
     </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>
@@ -45,16 +68,11 @@ export default {
       hosId: null,
       options: {},
       queryObj: {},
+      batchNoList: [],
       taskTypeConfig: {},
     };
   },
   methods: {
-    // 跳转到药品批次页面
-    toDrugBatches(batchNo){
-      uni.navigateTo({
-        url: `../drugBatches/drugBatches?batchNo=${batchNo}`,
-      });
-    },
     // 知道了
     showAlert() {
       uni.navigateTo({
@@ -100,7 +118,11 @@ export default {
               if (res.status == 200) {
                 res.list = res.list || [];
                 this.taskTypeConfig = res.list[0] || {};
-                uni.hideLoading();
+                if(this.taskTypeConfig.drugsBatchInfo == 1){
+                  this.queryDrugsBagForBatchNo(this.queryObj.batchNo);
+                }else{
+                  uni.hideLoading();
+                }
               } else {
                 uni.hideLoading();
                 uni.showToast({
@@ -125,7 +147,27 @@ export default {
         }
       });
     },
-    
+    //获取药包信息及其关联的工单信息
+    queryDrugsBagForBatchNo(batchNo) {
+      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;
@@ -145,7 +187,161 @@ export default {
 <style lang="less">
 .Scanning_Result_seimin {
   padding: 0 20rpx;
-
+  .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;
+    }
+  }
   .Scanning_top {
     .Scanning_top_icon {
       width: 140rpx;
@@ -184,7 +380,7 @@ export default {
     font-size: 32rpx;
     text-align: center;
 
-    view {
+    .Scanning_cont_block {
       margin-bottom: 16rpx;
     }
 
@@ -204,17 +400,22 @@ export default {
   }
 
   .foot_btn {
-    line-height: 88rpx;
+    position: fixed;
+    bottom: 0;
+    right: 20rpx;
+    left: 20rpx;
+    line-height: 66rpx;
     height: 100rpx;
-    margin-top: 40rpx;
+    border-top: 2rpx solid #e5e9ed;
+    background: #f9fafb;
     display: flex;
-    justify-content: center;
+    justify-content: space-between;
 
     .btn1,
     .btn2,
     .btn3 {
-      height: 88rpx;
-      flex: 1;
+      height: 66rpx;
+      width: 100%;
       margin: 0 1%;
       background-image: linear-gradient(to right, #72c172, #3bb197);
       color: #fff;

pages/search/search.vue

@@ -243,7 +243,7 @@
           if (res.status == 200 || res.state == 200) {
             if(this.type == "settingCode"){
               let deptList = res.deptList.map(v => ({...v, sign: 'dept'}));
-              let qrList = res.qrList.map(v => ({...v.deptDTO, sign: 'qr', qrId: v.id}));
+              let qrList = res.qrList.map(v => ({...v.deptDTO, sign: 'qr', qrId: v.id, name: v.name}));
               this.searchData.push({
                 name: keyword,
                 list: deptList.concat(qrList)
@@ -277,7 +277,7 @@
           //定义高亮#9f9f9f
           var html = row.dept.replace(
             keyword,
-            "<span style='color: #9f9f9f;'>" + keyword + "</span>" + (row.sign == 'qr' ? '<span class="red">（配置）</span>' : '')
+            "<span style='color: #9f9f9f;'>" + keyword + (row.sign == 'qr' ? '（'+ row.name +'）' : '') + "</span>" + (row.sign == 'qr' ? '<span class="red">（配置）</span>' : '')
           );
           html = "<div>" + html + "</div>";
           var tmpObj = {
@@ -414,7 +414,7 @@
             if (this.queryDept) { //替换
               console.log(arr);
               uni.navigateTo({
-                url: `../settingCode/settingCode?destQr=${arr[0].qrId || ''}&targetId=${arr[0].id}&targetDept=${arr[0].dept}&uniName=${this.uniName}&queryDept=${this.queryDept}&queryDeptId=${this.queryDeptId}&sourceQr=${this.sourceQr || ''}&qrCode=${this.qrCode}`,
+                url: `../settingCode/settingCode?destQr=${arr[0].qrId || ''}&name=${arr[0].name || ''}&targetId=${arr[0].id}&targetDept=${arr[0].dept}&uniName=${this.uniName}&queryDept=${this.queryDept}&queryDeptId=${this.queryDeptId}&sourceQr=${this.sourceQr || ''}&qrCode=${this.qrCode}`,
               });
             } else { //设置
               uni.navigateTo({

pages/searchMuti/searchMuti.vue

@@ -91,7 +91,7 @@
             "idx": 0,
             "sum": 1000,
             department: {
-              hospital: {id: this.hosId},
+              // hospital: {id: this.hosId},
               type: {id: this.sysDeptType},
               buildIds: dataList.map(v => v.id).toString()
             }

pages/settingCode/settingCode.vue

@@ -5,7 +5,7 @@
     </view>
     <view class="scanFont">可通过扫一扫功能设置科室，扫描二维码后设置或替换科室</view>
     <view class="scanFont nr">
-      <text v-if="queryDept">查询科室结果：{{queryDept.dept}}<text v-if="queryDept.sourceQr" class="red">（配置）</text></text>
+      <text v-if="queryDept">查询科室结果：{{queryDept.dept}}<text v-if="queryDept.name">（{{queryDept.name}}）</text><text v-if="queryDept.sourceQr" class="red">（配置）</text></text>
       <text v-else>查询科室结果：无</text>
     </view>
     <view class="scanFont nr red">{{msg}}</view>
@@ -184,6 +184,7 @@
                     dept: res.data.deptDTO.dept,
                     id: res.data.deptDTO.id,
                     sourceQr: res.data.id,
+                    name: res.data.name,
                   };
                 }else{
                   this.queryDept = {
@@ -226,6 +227,7 @@
           dept: options.queryDept,
           id: options.queryDeptId,
           sourceQr: options.sourceQr,
+          name: options.name,
         };
         this.msg = `此二维码绑定${options.targetDept}成功，${this.queryDept.dept}的二维码被清空`;
         this.settings = [{