药包流程查询

pages/pharmacyDetails/pharmacyDetails.vue

@@ -1,10 +1,17 @@
 <template>
   <view class="pharmacyDetails">
-    <view class="pharmacyDetails_title">请领信息</view>
+    <view class="pharmacyDetails_title">
+      <view class="pharmacyDetails_tab" :class="{ 'active': selectedLabelSlots === item.id }" v-for="item in tabs"
+        :key="item.id" @click="clickHandler(item.id)">
+        <view class="pharmacyDetails_label">
+          {{ item.label }}
+        </view>
+      </view>
+    </view>
     <view class="page_item_wrap">
       <view class="page_item">
         <view class="page_item_top">
-          <view class="page_item_top-inner">
+          <view class="page_item_top-inner" v-show="selectedLabelSlots == 1">
             <view class="page_item_top_L">
               <text class="L_text">请领单：{{ infoDATA.packid }}</text>
             </view>
@@ -15,13 +22,7 @@
             </view>
           </view>
         </view>
-        <view class="page_item_cont">
-          <!-- <view class="page_item_cont_T">
-            <view class="page_item_cont_title">
-              <text>批次号</text>
-              <text class="text_big">{{ infoDATA.batchNo }}</text>
-            </view>
-          </view> -->
+        <view class="page_item_cont" v-show="selectedLabelSlots == 1">
           <view class="page_item_cont_B">
             <view class="page_item_cont_title">
               <text>记账时间</text>
@@ -39,6 +40,16 @@
             </view>
           </view>
         </view>
+        <view class="page_item_cont" v-show="selectedLabelSlots == 2">
+          <view class="page_item_cont_C" v-for="(item,i) in queryProcessList" :key="i">
+            <view class="page_item_cont_title_C">
+              <text>{{item.operationType?item.operationType.name:''}}</text>
+              <text class="text_big">
+                <text>{{ item.username || '暂无' }}</text>
+              </text>
+            </view>
+          </view>
+        </view>
         <view class="L"></view>
         <view class="R"></view>
       </view>
@@ -89,6 +100,16 @@
   export default {
     data() {
       return {
+        selectedLabelSlots: 1,
+        tabs: [{
+            id: 1,
+            label: "基础信息",
+          },
+          {
+            id: 2,
+            label: "流程信息",
+          }
+        ],
         infoDATA: [],
         isLoading: false,
         isTLoading: false,
@@ -98,12 +119,22 @@
         hosModels: {
           disjunctor: false,
         },
+        queryProcessList: [],
       };
     },
     components: {
       selectAccount
     },
     methods: {
+      // tab切换
+      clickHandler(id) {
+        this.selectedLabelSlots = id;
+        if (id == 1) {
+          this.queryBase(this.queryObj);
+        } else if (id == 2) {
+          this.queryProcess(this.queryObj);
+        }
+      },
       // 确认
       hosOk(data) {
         console.log(data);
@@ -153,7 +184,7 @@
           id: this.infoDATA.id,
           packId: this.infoDATA.packid,
           recipient: accountId,
-          recipientName:accountName
+          recipientName: accountName
         };
         if (this.infoDATA.gdId) {
           postData.gdId = this.infoDATA.gdId;
@@ -413,6 +444,136 @@
           }
         });
       },
+      //基础信息查询
+      queryBase(options) {
+        //扫码进入详情
+        let qrcode = options.qrcode;
+        if (qrcode) {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          post("/drugsBag/getDrugsBagByQr", {
+            qrcode,
+          }).then((result) => {
+            uni.hideLoading();
+            if (result.state == 200) {
+              this.infoDATA = result.result;
+              if (this.loginUser.dept.id != this.infoDATA.launch.id) {
+                uni.showModal({
+                  title: '提示',
+                  content: "您现在所在的科室是【" + this.loginUser.dept.dept + "】,药包所在的科室是【" + this.infoDATA.launch.dept +
+                    "】,您不能进行操作",
+                  showCancel: false,
+                  success: function(res) {
+                    if (res.confirm) {
+                      console.log('用户点击确定');
+                    } else if (res.cancel) {
+                      console.log('用户点击取消');
+                    }
+                  }
+                });
+              }
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "请求失败！",
+              });
+            }
+          });
+        }
+        // 点击列表进入详情
+        let id = options.id;
+        if (id) {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          get("/api/fetchData/drugsBag/" + id).then((res) => {
+            uni.hideLoading();
+            if (res.status == 200) {
+              this.infoDATA = res.data;
+              if (this.loginUser.dept.id != this.infoDATA.launch.id) {
+                uni.showModal({
+                  title: '提示',
+                  content: "您现在所在的科室是【" + this.loginUser.dept.dept + "】,药包所在的科室是【" + this.infoDATA.launch.dept +
+                    "】,您不能进行操作",
+                  showCancel: false,
+                  success: function(res) {
+                    if (res.confirm) {
+                      console.log('用户点击确定');
+                    } else if (res.cancel) {
+                      console.log('用户点击取消');
+                    }
+                  }
+                });
+              }
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "请求失败！",
+              });
+            }
+          });
+        }
+      },
+      // 流程信息查询
+      queryProcess(options) {
+        //扫码进入详情
+        let qrcode = options.qrcode;
+        if (qrcode) {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          let postData = {
+            idx: 0,
+            sum: 9999,
+            drugsBagOperationLog: {
+              qrcode,
+              hosId: this.loginUser.currentHospital.id
+            }
+          }
+          post("/simple/data/fetchDataList/drugsBagOperationLog", postData).then((result) => {
+            uni.hideLoading();
+            if (result.status == 200) {
+              this.queryProcessList = res.list;
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "请求失败！",
+              });
+            }
+          });
+        }
+        // 点击列表进入详情
+        let id = options.id;
+        if (id) {
+          uni.showLoading({
+            title: "加载中",
+            mask: true,
+          });
+          let postData = {
+            idx: 0,
+            sum: 9999,
+            drugsBagOperationLog: {
+              packid: options.packid,
+              hosId: this.loginUser.currentHospital.id
+            }
+          }
+          post("/simple/data/fetchDataList/drugsBagOperationLog", postData).then((res) => {
+            uni.hideLoading();
+            if (res.status == 200) {
+              this.queryProcessList = res.list;
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "请求失败！",
+              });
+            }
+          });
+        }
+      }
     },
     onLoad(options) {
       this.loginUser = uni.getStorageSync("userData").user;
@@ -423,88 +584,45 @@
       // #ifdef H5
       webHandle("no", "wx");
       // #endif
-      //扫码进入详情
-      let qrcode = options.qrcode;
-      if (qrcode) {
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
-        post("/drugsBag/getDrugsBagByQr", {
-          qrcode,
-        }).then((result) => {
-          uni.hideLoading();
-          if (result.state == 200) {
-            this.infoDATA = result.result;
-            if (this.loginUser.dept.id != this.infoDATA.launch.id) {
-              uni.showModal({
-                title: '提示',
-                content: "您现在所在的科室是【" + this.loginUser.dept.dept + "】,药包所在的科室是【" + this.infoDATA.launch.dept +
-                  "】,您不能进行操作",
-                showCancel: false,
-                success: function(res) {
-                  if (res.confirm) {
-                    console.log('用户点击确定');
-                  } else if (res.cancel) {
-                    console.log('用户点击取消');
-                  }
-                }
-              });
-            }
-          } else {
-            uni.showToast({
-              icon: "none",
-              title: "请求失败！",
-            });
-          }
-        });
-      }
-      // 点击列表进入详情
-      let id = options.id;
-      if (id) {
-        uni.showLoading({
-          title: "加载中",
-          mask: true,
-        });
-        get("/api/fetchData/drugsBag/" + id).then((res) => {
-          uni.hideLoading();
-          if (res.status == 200) {
-            this.infoDATA = res.data;
-            if (this.loginUser.dept.id != this.infoDATA.launch.id) {
-              uni.showModal({
-                title: '提示',
-                content: "您现在所在的科室是【" + this.loginUser.dept.dept + "】,药包所在的科室是【" + this.infoDATA.launch.dept +
-                  "】,您不能进行操作",
-                showCancel: false,
-                success: function(res) {
-                  if (res.confirm) {
-                    console.log('用户点击确定');
-                  } else if (res.cancel) {
-                    console.log('用户点击取消');
-                  }
-                }
-              });
-            }
-          } else {
-            uni.showToast({
-              icon: "none",
-              title: "请求失败！",
-            });
-          }
-        });
-      }
+      this.queryObj = options;
+      this.queryBase(this.queryObj);
     },
   };
 </script>
 <style lang="less">
   .pharmacyDetails {
     background-color: rgb(249, 250, 251);
-    padding-top: 10%;
+    padding-top: 32rpx;
 
     .pharmacyDetails_title {
-      font-size: 46rpx;
-      font-weight: 550;
-      text-align: center;
+      height: 100rpx;
+      display: flex;
+      align-items: center;
+      background-color: #fff;
+
+      .pharmacyDetails_tab {
+        flex: 1;
+        display: flex;
+        align-items: center;
+
+        .pharmacyDetails_label {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          font-size: 40rpx;
+          width: 100%;
+          height: 66rpx;
+          border-radius: 32rpx;
+          color: #666;
+        }
+
+        &.active {
+          .pharmacyDetails_label {
+            color: #333;
+            background-color: #e5e9ed;
+          }
+        }
+      }
     }
 
     .page_item_wrap {
@@ -577,7 +695,8 @@
 
         .page_item_cont {
           min-height: 180rpx;
-          max-height: 424rpx;
+          max-height: calc(100vh - 534rpx);
+          overflow-y: auto;
           padding: 0 16rpx;
           text-align: left;
           position: relative;
@@ -626,7 +745,7 @@
           }
 
           .page_item_cont_C {
-            margin-bottom: 28rpx;
+            margin-top: 28rpx;
 
             .page_item_cont_title_C {
               font-size: 32rpx;

pages/scanning_B/scanning_B.vue

@@ -21,9 +21,11 @@
     <view class="Scanning_cont" v-if="res.status == 200 || res.status == 666">
       <view>标本类型 : {{ infoDATA.stype.name || "-" }}</view>
       <view>标本编码 : {{ infoDATA.scode || "-" }}</view>
+      <view>标本状态 : {{ res.data.speState ? res.data.speState.name : "-" }}</view>
       <view>患者床号 : {{ infoDATA.bedNum || "-" }}</view>
       <view>申请科室 : {{ infoDATA.sickRoom || "-" }}</view>
       <view>检查科室 : {{ infoDATA.checkDept || "-" }}</view>
+      <view>检验项目 : {{ res.data.specimenDesc || "-" }}</view>
     </view>
     <view class="Scanning_cont" v-else>
       <view>{{ res.msg }}</view>