优化

components/showModel/showModel.vue

@@ -5,7 +5,7 @@
         {{ title }}
         <text v-if="operate.know == '知道了' && timerFlag">({{ time }})</text>
       </view>
-      <view class="showModel__article" :class="{ p0: textareaFlag, p1: radioInspectionDistanceItem.length, p2: childrenDeptList.length }">
+      <view class="showModel__article" :class="{ p0: textareaFlag, p1: radioInspectionDistanceItem.length, p2: childrenDeptList.length || busyContentList.length }">
         <text
           v-if="icon"
           class="showModel__icon icon_transport"
@@ -49,6 +49,9 @@
         <view class="childrenDeptList" v-if="childrenDeptList.length">
           <view @click="clickHandler(item)" v-for="(item, index) in childrenDeptList" :key="item.id" class="childrenDeptItem">{{ item.dept }}</view>
         </view>
+        <view class="busyContentList" v-if="busyContentList.length">
+          <view @click="clickHandler(item)" v-for="(item, index) in busyContentList" :key="index" class="childrenDeptItem">{{ item.busyContent }}</view>
+        </view>
       </view>
       <view class="showModel__footer">
         <view
@@ -172,6 +175,13 @@ export default {
         return [];
       },
     },
+    // 示忙原因
+    busyContentList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
     // 操作按钮文字
     operate: {
       type: Object,
@@ -184,7 +194,6 @@ export default {
   },
   methods: {
     clickHandler(item){
-      console.log(item);
       this.$emit('ok', item)
     },
     // 单选框选中
@@ -280,10 +289,10 @@ export default {
       }
       
       &.p2 {
-        text-indent: 2em;
+        text-align: center;
       }
       
-      .childrenDeptList{
+      .childrenDeptList, .busyContentList{
         width: 100%;
         max-height: 50vh;
         overflow-y: auto;

main.js

@@ -7,7 +7,7 @@ import './mixins/mixin'
 // new VConsole();
 // import eruda from 'eruda';
 // eruda.init();
-console.info('v2.4.48');
+console.info('v2.4.49');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/receiptpage/receiptpage.vue

@@ -388,6 +388,12 @@
       
     <!-- 父级科室弹窗 -->
     <showModel :title="models2.title" icon="" :disjunctor="models2.disjunctor" :content="models2.content" @ok="ok2" @cancel="cancel2" :operate="models2.operate" :childrenDeptList="models2.list"></showModel>
+    
+    <!-- 父级科室弹窗 -->
+    <showModel :title="models3.title" icon="" :disjunctor="models3.disjunctor" :content="models3.content" @know="know3" @ok="ok3" @cancel="cancel3" :operate="models3.operate" :busyContentList="models3.list"></showModel>
+    
+    <!-- 示闲弹窗 -->
+    <showModel :title="models4.title" icon="models4.icon" :disjunctor="models4.disjunctor" :content="models4.content" @know="know4" @ok="ok4" @cancel="cancel4" :operate="models4.operate"></showModel>
   </view>
 </template>
 <script>
@@ -411,12 +417,14 @@
   export default {
     data() {
       return {
+        workStateList: [],
         clothingType: '',//被服回收扫码的类型，dept|user
         isShowExecFilter: false,
         deptName: '',
         currentId: 0,
         otherAssociationTypeId: null,
         hosId: uni.getStorageSync('userData').user.currentHospital.id,
+        workState: '1',
         clinicalMultiplayerMode: 0,
         showAppendUser: 0,
         signType4: false,
@@ -500,6 +508,14 @@
         models2: {
           disjunctor: false,
         },
+        // 弹窗model
+        models3: {
+          disjunctor: false,
+        },
+        // 弹窗model
+        models4: {
+          disjunctor: false,
+        },
         // 悬浮按钮样式
         pattern: {
           buttonColor: "#6cc076",
@@ -617,6 +633,15 @@
         this.getBloodPageConfig()
         this.waitingOrdersGetNum();
         this.executingOrders(0);
+        this.getWorkStateList();
+      },
+      getWorkStateList(){
+        post('/common/common/getDictionary', {
+          "type": "list",
+          "key": "user_work_state"
+        }).then(res => {
+          this.workStateList = res;
+        });
       },
       // 获取血制品页面控制开关
       async getBloodPageConfig(){
@@ -754,7 +779,6 @@
               }else if(Object.prototype.toString.call(user).slice(8, -1).toLowerCase() === 'string'){
                 let identityCardNumber = user;
                 // 根据身份证获取name
-                // todo
                 post("/data/fetchDataList/user", {idx: 0, sum: 1, user: { identityCardNumber }}).then((result) => {
                   uni.hideLoading();
                   if(result.status == 200){
@@ -880,6 +904,95 @@
           disjunctor: true,
         }
       },
+      //确定
+      ok4() {
+        this.models4.disjunctor = false;
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/user/data/changeWorkState", {
+          workState: this.workStateList.find(v => v.value == 1).id,
+        }).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            this.getCurrentUserNow();
+            this.models4 = {
+              disjunctor: true,
+              title: "提示",
+              content: `示闲成功`,
+              icon: "warn",
+              operate: {
+                know: "知道了",
+              },
+            };
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      //取消
+      cancel4() {
+        this.models4.disjunctor = false;
+      },
+      //取消
+      know4() {
+        this.models4.disjunctor = false;
+      },
+      // 示闲
+      showLeisure(){
+        this.models4 = {
+          disjunctor: true,
+          title: "提示",
+          content: "您确认要示闲吗？",
+          icon: "warn",
+          operate: {
+            ok: "确定",
+            cancel: "取消",
+          },
+        };
+      },
+      // 示忙
+      showBusy(){
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        let postData = {"idx":0,"workScheme":{"status":1,"hosId":this.hosId},"sum":1};
+        post("/simple/data/fetchDataList/workScheme", postData).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            let config = res.list.length ? res.list[0] : {};
+            let list = [];
+            for (let key in config) {
+              if(key.includes('busyContent') && config[key]){
+                list.push({
+                  busyContent: config[key],
+                  busyMinute: config['busyMinute' + key.replace('busyContent', '')],
+                });
+              }
+            }
+            this.models3 = {
+              disjunctor: true,
+              title: "提示",
+              content: "请选择暂停工作的原因。",
+              icon: "warn",
+              list,
+              operate: {
+                cancel: "取消",
+              },
+            };
+          } else {
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
       // 手动查询标本-确认
       speOk(data) {
         console.log(data);
@@ -1012,6 +1125,14 @@
             this.content.push({
               text: "药品录入",
             });
+          } else if (item.link === "workState" && this.workState == 1) {
+            this.content.push({
+              text: "示闲",
+            });
+          } else if (item.link === "workState" && this.workState == 2) {
+            this.content.push({
+              text: "示忙",
+            });
           } else if (item.link === "wxTakeMedicine") {
             this.content.push({
               text: "摆药取药",
@@ -1494,6 +1615,10 @@
           this.showHandViewSpecimen();
         } else if (e.item.text === "药品录入") {
           this.showHandViewDrugsbag();
+        } else if (e.item.text === "示忙") {
+          this.showLeisure();
+        } else if (e.item.text === "示闲") {
+          this.showBusy();
         } else if (e.item.text === "摆药取药") {
           this.handleTakeMedicine()
         } else if (e.item.text === "我的二维码") {
@@ -1675,6 +1800,47 @@
           }
         });
       },
+      //确定
+      ok3(busyContent) {
+        console.log(busyContent);
+        this.models3.disjunctor = false;
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
+        post("/user/data/changeWorkState", {
+          workState: this.workStateList.find(v => v.value == 2).id,
+          minute: busyContent.busyMinute,
+          workStateRemark: busyContent.busyContent,
+        }).then((res) => {
+          uni.hideLoading();
+          if (res.status == 200) {
+            this.getCurrentUserNow();
+            this.models3 = {
+              disjunctor: true,
+              title: "提示",
+              content: `您上班状态修改为<strong class="red">${busyContent.busyContent}</strong>，<strong class="red">${busyContent.busyMinute}</strong>分钟后自动恢复`,
+              icon: "warn",
+              operate: {
+                know: "知道了",
+              },
+            };
+          }else{
+            uni.showToast({
+              icon: "none",
+              title: res.msg || "接口获取数据失败！",
+            });
+          }
+        });
+      },
+      //取消
+      cancel3() {
+        this.models3.disjunctor = false;
+      },
+      //知道了
+      know3() {
+        this.models3.disjunctor = false;
+      },
       // 扫描工牌-被服洗涤
       quiltScan() {
         if (!this.SMFlag) {
@@ -2045,7 +2211,7 @@
       updateUser(dept) {
         post("/user/data/bindDutyDept", {dutyDept: +dept.id}).then((res) => {
           if (res.status == 200) {
-            this.getCurrentUserNow();
+            this.getCurrentUserNow(true);
           }else{
             uni.showToast({
               icon: "none",
@@ -2055,14 +2221,23 @@
         })
       },
       // 重新获取用户信息
-      getCurrentUserNow() {
+      getCurrentUserNow(updateDept = false) {
         get("/user/data/getCurrentUser").then((res) => {
           if (res.status == 200) {
             let userData = uni.getStorageSync('userData');
             userData.user = res.data;
             uni.setStorageSync('userData', userData);
             // 显示科室二维码
-            this.departmentQrcodeHandler()
+            if(updateDept){
+              this.departmentQrcodeHandler()
+            }else{
+              this.workState = uni.getStorageSync('userData').user.workState ? uni.getStorageSync('userData').user.workState.value : '1';
+              this.content.forEach(v => {
+                if(v.text == '示忙' || v.text == '示闲'){
+                  v.text = this.workState == 1 ? '示闲' : '示忙';
+                }
+              })
+            }
           }else{
             uni.showToast({
               icon: "none",
@@ -2073,7 +2248,9 @@
       },
     },
     onLoad(options) {
+      console.log(uni.getStorageSync('userData').user);
       console.log(options, 'options');
+      this.workState = uni.getStorageSync('userData').user.workState ? uni.getStorageSync('userData').user.workState.value : '1';
       // 获取菜单权限
       this.getMenu();
       post("/auth/getUserWorkDept", {}).then((ress) => {