药房优化

pages/homePage/homePage.vue

@@ -47,6 +47,9 @@
       <input class="login_input" password v-model="password" placeholder="请输入密码" />
       <input class="login_input" v-show="!isH5AndPwd" v-model="ip" placeholder="请输入域名或IP地址,如:http(s)://192.168.3.108" />
       <view class="page_item_btn" @click="login()"> 登录 </view>
+      <view class="tips">
+        (此系统为药房使用，其他科室人员请勿进行操作)
+      </view>
     </view>
     <!-- APP或H5账号密码登录页面 end -->
     <view class="botImg" v-if="online || (!online && online !== undefined && workSchemeType == 1)">
@@ -897,6 +900,11 @@
         color: #42b983;
         text-align: center;
       }
+      .tips {
+        font-size: 28rpx;
+        color: #68686b;
+        margin-top: 16rpx;
+      }
 
       .page_item_btn {
         height: 88rpx;

pages/pharmacyDetails/pharmacyDetails.vue

@@ -46,12 +46,12 @@
       <view class="R-l"></view>
     </view>
     <button class="cube-toolbar-item" :loading="isLoading" :disabled="isLoading" @click="dispensing(1)"
-      v-if="infoDATA.drugsState && infoDATA.drugsState.name == '待配药'">
+      v-if="infoDATA.drugsState && infoDATA.drugsState.name == '待配药'&&infoDATA.launch.id==loginUser.dept.id">
       开始配药
     </button>
-    <view v-if="infoDATA.drugsState && infoDATA.drugsState.name == '配药中'" class="btn-wrap">
+    <view v-if="infoDATA.drugsState && infoDATA.drugsState.name == '配药中'&&infoDATA.launch.id==loginUser.dept.id" class="btn-wrap">
       <button class="cube-toolbar-item1" :loading="isLoading" :disabled="isLoading" @click="dispensing(2)">
-        完成配药
+        进行核对
       </button>
       <button class="cube-toolbar-item1" :loading="isTLoading" :disabled="isTLoading" @click="replaceOperator()">
         替换配药人
@@ -72,11 +72,12 @@
         infoDATA: [],
         isLoading: false,
         isTLoading: false,
+        loginUser: {} //当前登录用户
       };
     },
     methods: {
       // 替换配药人
-      replaceOperator(){
+      replaceOperator() {
         this.isTLoading = true;
         uni.showLoading({
           title: "加载中",
@@ -87,7 +88,7 @@
         }).then((result) => {
           this.isTLoading = false;
           uni.hideLoading();
-          if(result.state == 200){
+          if (result.state == 200) {
             uni.showModal({
               title: '提示',
               content: result.info,
@@ -100,7 +101,7 @@
                 }
               }
             });
-          }else{
+          } else {
             uni.showModal({
               title: '提示',
               content: "请求失败！",
@@ -116,7 +117,7 @@
           }
         })
       },
-      // 开始配药,完成配药,,,1是待配药,2是配药中
+      // 开始配药,进行核对,,,1是待配药,2是配药中
       dispensing(type) {
         this.isLoading = true;
         uni.showLoading({
@@ -201,7 +202,7 @@
             if (result.state == 200) {
               uni.showModal({
                 title: '提示',
-                content: result.info || "完成配药成功！",
+                content: result.info || "进行核对成功！",
                 showCancel: false,
                 success: function(res) {
                   if (res.confirm) {
@@ -232,6 +233,8 @@
       },
     },
     onLoad(options) {
+      this.loginUser = uni.getStorageSync("userData").user;
+      console.log(this.loginUser,'loginUserloginUser')
       // #ifdef APP-PLUS
       webHandle("no", "app");
       // #endif
@@ -251,6 +254,20 @@
           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",
@@ -270,6 +287,20 @@
           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",
@@ -459,13 +490,15 @@
       color: #fff;
       text-align: center;
     }
-    .btn-wrap{
+
+    .btn-wrap {
       display: flex;
       justify-content: space-between;
       position: fixed;
       left: 20rpx;
       bottom: 160rpx;
     }
+
     .cube-toolbar-item1 {
       width: 350rpx;
       height: 68rpx;