药房科室切换

pages/pharmacy/pharmacy.vue

@@ -1,6 +1,12 @@
 <template>
   <view class="pharmacy">
     <view class="pharmacy_header">
+      <view class="page_tab_bar pharmacy_changeDept active">
+        <view class="tab_dept">{{ currenDept.dept
+          }}<button type="default" size="mini" class="changeDept" @click="changeDept">
+            切换科室
+          </button></view>
+      </view>
       <view
         class="scanning_btn"
         hover-class="seimin-btn-hover"
@@ -9,9 +15,6 @@
         <text class="icon_transport transport-saoma"></text>
       </view>
       <view class="scanFont">扫一扫</view>
-      <picker v-if="depts[index]" @change="bindPickerChange" :value="index" range-key="dept" :range="depts" class="pharmacy_changeDept">
-          <view class="pharmacy_input">{{depts[index].dept}}</view>
-      </picker>
     </view>
     <view class="pharmacy-heng">
       <view
@@ -126,9 +129,9 @@ export default {
           label: "核对中",
         },
       ],
-      depts: [],//下拉框选项
-      index: 0,//下拉框索引
       hosId: uni.getStorageSync("userData").user.currentHospital.id,//当前院区
+      loginUser: uni.getStorageSync("userData").user,
+      currenDept: {},//当前登录人所属科室
     };
   },
   methods: {
@@ -156,7 +159,7 @@ export default {
         sum: 20,
         drugsBag: {
           searchType: type,
-          launch:{id:this.depts[this.index].id}
+          launch:{id:this.currenDept.id}
         },
       };
       uni.showLoading({
@@ -235,45 +238,36 @@ export default {
     stop(e) {
       e.preventDefault();
     },
-    //选择药房科室
-    bindPickerChange: function(e) {
-        console.log('picker发送选择改变，携带值为', e.target.value)
-        this.index = e.target.value;
-        // 待配药
-        this.getPharmacyListData(4, 0);
+    // 切换科室
+    changeDept() {
+      uni.navigateTo({
+        url: `../search/search?type=pharmacy`,
+      });
     },
-    // 获取药房类型的科室
-    getDeptByPharmacy(){
-      let postData = {
-          "idx": 0,
-          "sum": 10,
-          "department": {
-              "hospital": {
-                  "id": this.hosId
-              },
-              "type": {
-                  "id": "386"
-              },
-          }
+    // 更新用户所在科室
+    updateUser(dept){
+      let dataObj = {
+        user: {
+          dept: {
+            id: dept.id,
+          },
+          id: this.loginUser.id,
+        },
       };
-      uni.showLoading({
-        title: "加载中",
-        mask: true,
-      });
-      post("/data/fetchDataList/department", postData).then((res) => {
-        uni.hideLoading();
+      post("/data/updData/user", dataObj).then((res) => {
         if (res.status == 200) {
-          this.depts = res.list.map(v=>({id:v.id,dept:v.dept}));
-          if(this.depts.length){
-            this.getPharmacyListData(this.selectedLabelSlots, 0);
-          }
-        } else {
-          uni.showToast({
-            icon: "none",
-            title: "请求失败！",
-          });
+          this.getCurrentUserNow();
         }
-      });
+      })
+    },
+    // 重新获取用户信息
+    getCurrentUserNow(){
+      get("/user/data/getCurrentUser").then((res) => {
+        if (res.status == 200) {
+          this.loginUser.dept = this.currenDept;
+          uni.setStorageSync('userData', this.loginUser);
+        }
+      })
     }
   },
   onLoad(options) {
@@ -286,8 +280,19 @@ export default {
       });
     }
     //#endif
-    // 获取药房类型的科室
-    this.getDeptByPharmacy();
+    if (options.id && options.dept) {
+      let {
+        id,
+        dept
+      } = options;
+      this.currenDept.id = id;
+      this.currenDept.dept = dept;
+      this.updateUser(this.currenDept)
+    } else {
+      this.currenDept = uni.getStorageSync("userData").user.dept;
+    }
+    // 请求列表
+    this.getPharmacyListData(this.selectedLabelSlots, 0);
     // #ifdef APP-PLUS
     webHandle("no", "app");
     // #endif
@@ -321,27 +326,58 @@ export default {
 
 .pharmacy {
   background-color: rgb(249, 250, 251);
-  padding-top: 36rpx;
+  // padding-top: 36rpx;
   .pharmacy_header{
     position: relative;
     .pharmacy_changeDept{
-      position: absolute;
-      top: 50%;
-      right: 52rpx;
-      transform: translateY(-50%);
-      .pharmacy_input{
-        background-image: linear-gradient(to right, #72c172, #3bb197);
-        border-radius: 8rpx;
-        color: #fff;
+      padding: 16rpx 0;
+      &.page_tab_bar {
+        flex: 1;
         font-size: 36rpx;
-        font-weight: 700;
-        padding: 8rpx 16rpx;
+        background: #fff;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        position: relative;
+
+        &:after {
+          content: "";
+          position: absolute;
+          left: 0;
+          bottom: 0;
+          height: 2rpx;
+          width: 100%;
+          background-color: transparent;
+        }
+
+        .tab_dept {
+          position: relative;
+
+          .changeDept {
+            white-space: nowrap;
+            margin: 0;
+            position: absolute;
+            right: 0;
+            top: 50%;
+            transform: translate(105%, -50%);
+            padding: 0 0.5em;
+            line-height: 2;
+          }
+        }
+
+        &.active {
+          color: #49b856;
+
+          &:after {
+            background-color: #49b856;
+          }
+        }
       }
     }
   }
 
   .scanning_btn {
-    margin: 0 auto;
+    margin: 16rpx auto;
     width: 138rpx;
     height: 138rpx;
     background: #72c172;
@@ -580,7 +616,7 @@ export default {
     font-size: 36rpx;
     font-weight: 700;
     margin-top: 16rpx;
-    margin-bottom: 32rpx;
+    margin-bottom: 16rpx;
     text-align: center;
   }
 }

pages/pharmacyDetails/pharmacyDetails.vue

@@ -82,38 +82,50 @@ export default {
         post("/drugsBag/changeToIng", {
           id: this.infoDATA.id,
         }).then((result) => {
+          this.isLoading = false;
           if (result.state == 200) {
-            let data = {
-              launchId: this.infoDATA.launch.id,
-              drugsBagId: this.infoDATA.id,
-            };
-            post("/drugsBag/autoDrugsBags", data).then((result1) => {
-              this.isLoading = false;
-              if (result1.status == 200) {
-                uni.showToast({
-                  title: "操作成功！",
-                  success() {
-                    // setTimeout(() => {
-                    uni.navigateTo({
-                      url: "../pharmacy/pharmacy",
-                    });
-                    // }, 3000)
-                  },
-                });
-              }else if(result1.status == 501){
-                uni.showToast({
-                  icon: "none",
-                  title: result1.error,
-                });
-              }else {
-                uni.showToast({
-                  icon: "none",
-                  title: "请求失败！",
+            uni.showToast({
+              title: "开始配药成功！",
+              success() {
+                uni.navigateTo({
+                  url: "../pharmacy/pharmacy",
                 });
-              }
+              },
+            });
+            // let data = {
+            //   launchId: this.infoDATA.launch.id,
+            //   drugsBagId: this.infoDATA.id,
+            // };
+            // post("/drugsBag/autoDrugsBags", data).then((result1) => {
+            //   this.isLoading = false;
+            //   if (result1.status == 200) {
+            //     uni.showToast({
+            //       title: "操作成功！",
+            //       success() {
+            //         uni.navigateTo({
+            //           url: "../pharmacy/pharmacy",
+            //         });
+            //       },
+            //     });
+            //   }else if(result1.status == 501){
+            //     uni.showToast({
+            //       icon: "none",
+            //       title: result1.error,
+            //     });
+            //   }else {
+            //     uni.showToast({
+            //       icon: "none",
+            //       title: "请求失败！",
+            //     });
+            //   }
+            // });
+          } else if(result.state == 501){
+            uni.showToast({
+              icon: "none",
+              title: result.error,
             });
           } else {
-            this.isLoading = false;
+            // this.isLoading = false;
             uni.showToast({
               icon: "none",
               title: "请求失败！",
@@ -127,13 +139,11 @@ export default {
           this.isLoading = false;
           if (result.state == 200) {
             uni.showToast({
-              title: "操作成功！",
+              title: "完成配药成功！",
               success() {
-                // setTimeout(() => {
                 uni.navigateTo({
                   url: "../pharmacy/pharmacy",
                 });
-                // }, 3000)
               },
             });
           } else {

pages/search/search.vue

@@ -113,6 +113,8 @@
         this.queryDeptId = options.queryDeptId;
         this.qrCode = options.qrCode;
         this.sysDeptType = -1;
+      }  else if (this.type == "pharmacy") { //药房切换科室
+        this.sysDeptType = 386;
       } else {
         this.getSysDeptType();
       }
@@ -274,7 +276,7 @@
         let arr = this.deptList.filter((item) => item.dept === keyword);
         if (arr.length) {
           let msg = "";
-          if (this.type == "patientInformationList" || this.type == "inspectList") {
+          if (this.type == "patientInformationList" || this.type == "inspectList" || this.type == "pharmacy") {
             msg = "切换科室成功";
             uni.showToast({
               title: msg,
@@ -301,6 +303,11 @@
             uni.navigateTo({
               url: `../inspectList/inspectList?id=${arr[0].id}&dept=${arr[0].dept}`,
             });
+          } else if (this.type == "pharmacy") {
+            //药房进入
+            uni.navigateTo({
+              url: `../pharmacy/pharmacy?id=${arr[0].id}&dept=${arr[0].dept}`,
+            });
           } else if (this.type == "setDept") {
             //上班添加科室进入
             let obj = uni.getStorageSync("setDepts");