护士端相关开关接口调用

components/seiminModel/seiminModel.vue

@@ -8,7 +8,13 @@
 <template>
   <view class="seiminModel seiminModel_mask" v-if="opts.isVisible">
     <view class="seiminModel_container animate__animated animate__fadeIn animate__faster">
-      <view class="seiminModel_header">{{ opts.title }}</view>
+      <!-- 标题 -->
+      <view class="seiminModel_header">
+        <text>{{ opts.title }}</text>
+        <text class="seiminModel_countDown" v-if="nurseDeptSwitchTip < 0 || (nurseDeptSwitchTip > 0 && closeTime > 0)">
+          <text v-if="nurseDeptSwitchTip < 0">关闭</text>倒计时<text>{{ closeTime }}s</text>
+        </text>
+      </view>
       <!-- 动态二维码 -->
       <view class="seiminModel_content qrcode" v-if="opts.skin === 'qrcode'">
         <image class="w100" :src="nurseCodeImg" mode="widthFix"></image>
@@ -21,7 +27,8 @@
       </view>
       <!-- 正常弹窗 -->
       <view class="seiminModel_content" v-html="opts.content" v-else></view>
-      <view class="seiminModel_footer">
+      <!-- 底部 -->
+      <view class="seiminModel_footer" v-if="nurseDeptSwitchTip <= 0 || (nurseDeptSwitchTip > 0 && closeTime === 0)">
         <view class="seiminModel_footer__btn" v-for="(btn, i) in opts.btns" :style="{
             flex: btn.flex,
             color: btn.textColor,
@@ -50,9 +57,14 @@
         nurseCodeImg: '',
         // 动态二维码刷新间隔时长
         refreshQRCodeTime: 30,
+        // 护士科室切换提示自动关闭设置(时长，单位秒)
+        closeTime: 0,
+        // 护士科室切换提示自动关闭设置(定时器，单位秒)
+        timerCloseTime: null,
       };
     },
     computed: {
+      ...mapState(['nurseDeptSwitchTip']),
       ...mapState('user', ['loginInfo']),
     },
     methods: {
@@ -132,7 +144,28 @@
           }
         })
       },
-    },
+      // 切换科室弹窗
+      showChangeDept(options = {}) {
+        this.show(options);
+        // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
+        // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
+        // (3)	如果用户填写0则为无自动关闭和强制查看时间。
+        if (this.nurseDeptSwitchTip === 0) {
+          return;
+        }
+        this.closeTime = Math.abs(this.nurseDeptSwitchTip);
+        clearInterval(this.timerCloseTime);
+        this.timerCloseTime = setInterval(() => {
+          this.closeTime = Math.max(--this.closeTime, 0);
+          if (this.closeTime === 0) {
+            if (this.nurseDeptSwitchTip < 0) {
+              this.close();
+            }
+            clearInterval(this.timerCloseTime);
+          }
+        }, 1000);
+      }
+    }
   };
 </script>
 
@@ -164,7 +197,14 @@
 
         .seiminModel_header {
           height: 100rpx;
+          position: relative;
           @include flex(center, center);
+          .seiminModel_countDown{
+            position: absolute;
+            right: 26rpx;
+            font-size: 28rpx;
+            color: $defaultColor;
+          }
         }
 
         .seiminModel_content {

pages/index/index.vue

@@ -14,6 +14,9 @@
           <text class="pda pda-saoma"></text>
         </view>
       </view>
+      <!-- 通告栏 -->
+      <uni-notice-bar :speed="50" scrollable single showIcon :text="updateTipsForNurses" background-color="#fff" color="#666">
+      </uni-notice-bar>
       <!-- 一键收标本 -->
       <view class="collect_specimens">
         <view class="collect_icon">
@@ -27,7 +30,7 @@
             普标数量<text class="collect_num">{{ordinaryNum | specimenNum}}</text>
           </view>
         </view>
-        <button class="collect_btn" type="default" @click="collectSpecimens">一键收标本</button>
+        <button class="collect_btn" type="default" @click="collectSpecimens">{{specimenButton}}</button>
       </view>
       <!-- 最新工单 -->
       <view class="newOrders">
@@ -70,8 +73,8 @@
   } from 'vuex';
   import {
     reqSpecimenWorkOrderMsg,
-    reqWorkOrders,
-    reqDeptTaskType
+    reqDeptTaskType,
+    reqFetchDataList
   } from '../../request/api.js';
   import {
     GDSTATE
@@ -90,40 +93,47 @@
       };
     },
     computed: {
-      ...mapState('user', ['loginInfo']),
-      ...mapState(['isShowSeiminModel']),
+      ...mapState('user', ['loginInfo', 'loginInfoUserDeptId']),
+      ...mapState(['isShowSeiminModel', 'deptDisplay', 'specimenButton', 'updateTipsForNurses']),
     },
     methods: {
-      ...mapMutations(['changeSeiminModel', 'changeQucikCreateOrderType']),
+      ...mapMutations(['changeSeiminModel', 'changeQucikCreateOrderType', 'changeDeptDisplay',
+        'changeUpdateTipsForNurses', 'changeSpecimenButton', 'changeNurseDeptSwitchTip'
+      ]),
       // 获取页面数据
       init() {
-        let deptId = this.loginInfo.user && this.loginInfo.user.dept.id;
         Promise.all([
-          reqSpecimenWorkOrderMsg({
-            deptId
-          }),
-          reqWorkOrders({
-            "workOrder": {
-              "createDept": deptId,
-              "platform": 2,
-              "searchDays": 2,
-            },
-            "idx": 0,
-            "sum": 5
-          }),
-          reqDeptTaskType({
-            deptId
-          })
+          this.querySpecimenNumRequest(), //查询急标和普标数量
+          this.queryWorkOrdersRequest(), //查询最新工单列表
+          this.queryDeptTaskTypeRequest(), //查询快捷工单（其他临床服务任务类型）
+          this.queryDeptDisplayRequest(), //护士端科室显示选择(名称还是别名)
+          this.queryUpdateTipsForNursesRequest(), //护士端更新提示
+          this.querySpecimenButtonRequest(), //标本按钮文字
+          this.queryNurseDeptSwitchTipRequest(), //护士科室切换提示自动关闭设置
         ]).then(values => {
           uni.hideLoading();
           uni.stopPullDownRefresh();
-          this.querySpecimenNum(values[0]);
-          this.queryWorkOrders(values[1]);
-          this.queryDeptTaskType(values[2]);
+          this.querySpecimenNumResponse(values[0]);
+          this.queryWorkOrdersResponse(values[1]);
+          this.queryDeptTaskTypeResponse(values[2]);
+          this.queryDeptDisplayResponse(values[3]);
+          this.queryUpdateTipsForNursesResponse(values[4]);
+          this.querySpecimenButtonResponse(values[5]);
+          this.queryNurseDeptSwitchTipResponse(values[6]);
+          if (this.isShowSeiminModel) {
+            this.showDeptModel();
+            this.changeSeiminModel(false);
+          }
         });
       },
       // 查询急标和普标数量
-      querySpecimenNum(res) {
+      querySpecimenNumRequest() {
+        return reqSpecimenWorkOrderMsg({
+          deptId: this.loginInfoUserDeptId
+        })
+      },
+      // 查询急标和普标数量
+      querySpecimenNumResponse(res) {
         if (res.status == 200) {
           if (res.specimenCount) {
             this.urgentNum = res.specimenCount.urgent;
@@ -134,7 +144,19 @@
         }
       },
       // 查询最新工单列表
-      queryWorkOrders(res) {
+      queryWorkOrdersRequest() {
+        return reqFetchDataList('nurse', 'workOrder', {
+          "workOrder": {
+            "createDept": this.loginInfoUserDeptId,
+            "platform": 2,
+            "searchDays": 2,
+          },
+          "idx": 0,
+          "sum": 5
+        })
+      },
+      // 查询最新工单列表
+      queryWorkOrdersResponse(res) {
         if (res.status == 200) {
           this.newOrderList = res.list.map(v => {
             if (v.gdState) {
@@ -151,12 +173,82 @@
         }
       },
       // 查询快捷工单（其他临床服务任务类型）
-      queryDeptTaskType(res) {
+      queryDeptTaskTypeRequest() {
+        return reqDeptTaskType({
+          deptId: this.loginInfoUserDeptId
+        })
+      },
+      // 查询快捷工单（其他临床服务任务类型）
+      queryDeptTaskTypeResponse(res) {
         if (res.status == 200) {
           this.quickOtherList = res.data.allTaskTypes.filter(v => v.associationType.value == ASSOCIATION_TYPES[
             '其他临床服务']);
         }
       },
+      // 护士端科室显示选择(名称还是别名)
+      queryDeptDisplayRequest() {
+        return reqFetchDataList('simple/data', 'systemConfiguration', {
+          "idx": 0,
+          "sum": 1,
+          "systemConfiguration": {
+            "keyconfig": "deptDisplay"
+          }
+        })
+      },
+      // 护士端科室显示选择(名称还是别名)
+      queryDeptDisplayResponse(res) {
+        if (res.status == 200) {
+          this.changeDeptDisplay(res.list[0].valueconfig);
+        }
+      },
+      // 护士端更新提示
+      queryUpdateTipsForNursesRequest() {
+        return reqFetchDataList('simple/data', 'systemConfiguration', {
+          "idx": 0,
+          "sum": 1,
+          "systemConfiguration": {
+            "keyconfig": "updateTipsForNurses"
+          }
+        })
+      },
+      // 护士端更新提示
+      queryUpdateTipsForNursesResponse(res) {
+        if (res.status == 200) {
+          this.changeUpdateTipsForNurses(res.list[0].valueconfig);
+        }
+      },
+      // 标本按钮文字
+      querySpecimenButtonRequest() {
+        return reqFetchDataList('simple/data', 'systemConfiguration', {
+          "idx": 0,
+          "sum": 1,
+          "systemConfiguration": {
+            "keyconfig": "specimenButton"
+          }
+        })
+      },
+      // 标本按钮文字
+      querySpecimenButtonResponse(res) {
+        if (res.status == 200) {
+          this.changeSpecimenButton(res.list[0].valueconfig);
+        }
+      },
+      // 护士科室切换提示自动关闭设置
+      queryNurseDeptSwitchTipRequest() {
+        return reqFetchDataList('simple/data', 'systemConfiguration', {
+          "idx": 0,
+          "sum": 1,
+          "systemConfiguration": {
+            "keyconfig": "nurseDeptSwitchTip"
+          }
+        })
+      },
+      // 护士科室切换提示自动关闭设置
+      queryNurseDeptSwitchTipResponse(res) {
+        if (res.status == 200) {
+          this.changeNurseDeptSwitchTip(res.list[0].valueconfig);
+        }
+      },
       // 一键收取标本
       collectSpecimens() {
         uni.navigateTo({
@@ -169,8 +261,8 @@
         const {
           user //当前登录用户
         } = this.loginInfo;
-        const userDept = (user && user.dept) ? user.dept.dept : '';
-        this.$refs.seiminModel.show({
+        const userDept = (user && user.dept) ? (this.deptDisplay == 1 ? user.dept.dept : user.dept.deptalias) : '';
+        this.$refs.seiminModel.showChangeDept({
           content: `您当前所属科室为<text class="green">${userDept}</text>，如与您实际科室不符点击<text class="red">切换科室</text>。`,
           btns: [{
               name: "知道了",
@@ -190,10 +282,6 @@
       },
     },
     mounted() {
-      if (this.isShowSeiminModel) {
-        this.showDeptModel();
-        this.changeSeiminModel(false);
-      }
       uni.showLoading({
         title: '加载中',
         mask: true
@@ -264,18 +352,26 @@
         }
       }
 
+      // 通告栏
+      .uni-noticebar {
+        height: 88rpx;
+        margin-top: 24rpx;
+        margin-bottom: 0;
+        border: 1px solid #E5E9ED;
+      }
+
       // 一键收标本
       .collect_specimens {
         width: 702rpx;
         height: 176rpx;
         background-color: #fff;
-        margin-top: 24rpx;
+        margin-top: 8rpx;
         border-radius: 8rpx;
         // box-shadow: 0 0 7rpx 0 rgba(73, 184, 86, 0.09);
         border: 1px solid #E5E9ED;
         position: relative;
         @include flex(center, center);
-        @include semicircle(#fff);
+        @include semicircle(#f9fafb);
 
         .collect_icon {
           width: 48rpx;
@@ -314,6 +410,7 @@
 
         .collect_btn {
           margin: 0;
+          width: 224rpx;
           height: 88rpx;
           background: linear-gradient(90deg, #74C271 0%, #39B199 100%);
           border-radius: 56rpx;

request/api.js

@@ -26,14 +26,6 @@ export const reqSpecimenWorkOrderMsg = (postData) =>
     method: 'POST'
   });
 
-// 首页最新工单列表
-export const reqWorkOrders = (postData) =>
-  request({
-    url: "/nurse/fetchDataList/workOrder",
-    data: postData,
-    method: 'POST'
-  });
-
 // 首页快捷工单（其他临床服务任务类型）
 export const reqDeptTaskType = (postData) =>
   request({
@@ -41,7 +33,7 @@ export const reqDeptTaskType = (postData) =>
     data: postData,
     method: 'POST'
   });
-  
+
 // 获取动态二维码
 export const reqDeptCodes = (postData) =>
   request({
@@ -49,3 +41,11 @@ export const reqDeptCodes = (postData) =>
     data: postData,
     method: 'POST'
   });
+
+// fetchDataList查询（通用）
+export const reqFetchDataList = (type, target, postData) =>
+  request({
+    url: `/${type}/fetchDataList/${target}`,
+    data: postData,
+    method: 'POST'
+  });

store/index.js

@@ -26,8 +26,16 @@ const myPlugin = (store) => {
 
 export default new Vuex.Store({
   state: {
-    isShowSeiminModel: false,//是否显示切换科室弹窗
-    qucikCreateOrderType: '',//快捷建单类型
+    isShowSeiminModel: false, //是否显示切换科室弹窗
+    qucikCreateOrderType: '', //快捷建单类型
+    deptDisplay: 1, //护士端科室显示选择(名称还是别名)1是名称，2是别名
+    updateTipsForNurses: '', //护士端更新提示
+    specimenButton: '', //标本按钮文字
+    //护士科室切换提示自动关闭设置
+    // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
+    // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
+    // (3)	如果用户填写0则为无自动关闭和强制查看时间。
+    nurseDeptSwitchTip: 0,
   },
   mutations: {
     //是否显示切换科室弹窗
@@ -38,6 +46,22 @@ export default new Vuex.Store({
     changeQucikCreateOrderType(state, args) {
       state.qucikCreateOrderType = args;
     },
+    //护士端科室显示选择(名称还是别名)1是名称，2是别名
+    changeDeptDisplay(state, args) {
+      state.deptDisplay = args;
+    },
+    //护士端更新提示
+    changeUpdateTipsForNurses(state, args) {
+      state.updateTipsForNurses = args;
+    },
+    //标本按钮文字
+    changeSpecimenButton(state, args) {
+      state.specimenButton = args;
+    },
+    //护士科室切换提示自动关闭设置
+    changeNurseDeptSwitchTip(state, args) {
+      state.nurseDeptSwitchTip = args;
+    },
   },
   modules: {
     user,

store/modules/user.js

@@ -2,12 +2,14 @@ import {
   reqLogin
 } from "@/request/api.js";
 const state = {
-  loginInfo: {},
+  loginInfo: {}, //当前登录用户信息
+  loginInfoUserDeptId: undefined, //当前登录用户所属科室id
 };
 const getters = {};
 const mutations = {
   vxLogin(state, args) {
     state.loginInfo = args;
+    state.loginInfoUserDeptId = args.user.dept.id;
   },
 };
 const actions = {