优化vuex

components/seiminModel/seiminModel.vue

@@ -74,7 +74,7 @@
       };
     },
     computed: {
-      ...mapState(["nurseDeptSwitchTip"]),
+      ...mapState('other', ["nurseDeptSwitchTip"]),
       ...mapState("user", ["loginInfo"]),
     },
     methods: {

components/seiminPicker/seiminPicker.vue

@@ -26,7 +26,7 @@
   export default {
     name: 'seiminPicker',
     computed: {
-      ...mapState(["deptDisplay"]),
+      ...mapState('other', ["deptDisplay"]),
     },
     props: {
       title: { //标题文字

filters/index.js

@@ -1,6 +1,14 @@
-import Vue from 'vue'
+import Vue from 'vue';
+import {
+  format
+} from 'date-fns'
 // 首页标本数量过滤
 // 数量大于999则显示999+
 Vue.filter('specimenNum', function(value) {
   return value > 999 ? '999+' : value;
 })
+// 格式化日期
+// YYYY-MM-DD HH:mm:ss
+Vue.filter('formatDate', function(value, ruleText) {
+  return format(new Date(value), ruleText);
+})

package-lock.json

@@ -11,7 +11,8 @@
       "dependencies": {
         "animate.css": "^4.1.1",
         "crypto-js": "^4.1.1",
-        "date-fns": "^2.28.0"
+        "date-fns": "^2.28.0",
+        "lodash": "^4.17.21"
       }
     },
     "node_modules/animate.css": {
@@ -31,6 +32,11 @@
       "engines": {
         "node": ">=0.11"
       }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     }
   },
   "dependencies": {
@@ -48,6 +54,11 @@
       "version": "2.28.0",
       "resolved": "https://registry.npmmirror.com/date-fns/-/date-fns-2.28.0.tgz",
       "integrity": "sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw=="
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     }
   }
 }

package.json

@@ -16,6 +16,7 @@
   "dependencies": {
     "animate.css": "^4.1.1",
     "crypto-js": "^4.1.1",
-    "date-fns": "^2.28.0"
+    "date-fns": "^2.28.0",
+    "lodash": "^4.17.21"
   }
 }

pages/index/index.vue

@@ -39,10 +39,13 @@
       <view class="newOrders">
         <view class="newOrders_header">
           <text class="newOrders_header_title">最新工单</text>
-          <text class="newOrders_header_more">更多&gt;&gt;</text>
+          <text class="newOrders_header_more" @click="goToMore">更多&gt;&gt;</text>
         </view>
         <view class="newOrders_item" v-for="newOrder in newOrderList" :key="newOrder.id">
-          <view class="newOrders_item_time">{{ newOrder.showCreateTime }}</view>
+          <view class="newOrders_item_time" v-if="newOrder.showCreateTime">{{ newOrder.showCreateTime }}</view>
+          <view class="newOrders_item_time" v-else-if="newOrder.yyjdTime && newOrder.gdState.value == 11">
+            {{newOrder.yyjdTime | formatDate('MM-dd HH:mm')}}
+          </view>
           <text class="newOrders_item_taskType">{{
             newOrder.isHalfInspect === 1
               ? "半程陪检"
@@ -81,7 +84,8 @@
 <script>
   import {
     mapState,
-    mapMutations
+    mapMutations,
+    mapActions
   } from "vuex";
   import {
     reqSpecimenWorkOrderMsg,
@@ -103,30 +107,13 @@
         newOrderList: [], //最新工单列表
         quickOtherList: [], //快捷工单列表
         hospitalList: [], //当前用户权限中的院区列表
-        // list: [{
-        //     value: '1',
-        //     label: '身份证'
-        //   },
-        //   {
-        //     value: '2',
-        //     label: '驾驶证'
-        //   },
-        //   {
-        //     value: '3',
-        //     label: '护照'
-        //   },
-        //   {
-        //     value: '4',
-        //     label: '其他证件'
-        //   },
-        // ],
         pickerTitle: "", //选择院区picker的title
         specimenTaskTypeId: undefined, //标本任务类型id
       };
     },
     computed: {
       ...mapState("user", ["loginInfo"]),
-      ...mapState([
+      ...mapState('other', [
         "isShowSeiminModel",
         "deptDisplay",
         "specimenButton",
@@ -134,7 +121,7 @@
       ]),
     },
     methods: {
-      ...mapMutations([
+      ...mapMutations('other', [
         "changeSeiminModel",
         "changeQucikCreateOrderType",
         "changeDeptDisplay",
@@ -143,8 +130,19 @@
         "changeNurseDeptSwitchTip",
         "changeSearchDeptParams",
       ]),
+      ...mapActions('system', ["vxSystem"]),
+      // 跳转到工单列表页面
+      goToMore() {
+        uni.navigateTo({
+          url: '/pages/orderList/orderList'
+        })
+      },
       // 获取页面数据
       init() {
+        uni.showLoading({
+          title: "加载中",
+          mask: true,
+        });
         Promise.all([
           this.querySpecimenNumRequest(), //查询急标和普标数量
           this.queryWorkOrdersRequest(), //查询最新工单列表
@@ -265,7 +263,7 @@
       },
       // 护士端科室显示选择(名称还是别名)
       queryDeptDisplayRequest() {
-        return reqFetchDataList("simple/data", "systemConfiguration", {
+        return this.vxSystem({
           idx: 0,
           sum: 1,
           systemConfiguration: {
@@ -298,7 +296,7 @@
       },
       // 护士端更新提示
       queryUpdateTipsForNursesRequest() {
-        return reqFetchDataList("simple/data", "systemConfiguration", {
+        return this.vxSystem({
           idx: 0,
           sum: 1,
           systemConfiguration: {
@@ -331,7 +329,7 @@
       },
       // 标本按钮文字
       querySpecimenButtonRequest() {
-        return reqFetchDataList("simple/data", "systemConfiguration", {
+        return this.vxSystem({
           idx: 0,
           sum: 1,
           systemConfiguration: {
@@ -364,7 +362,7 @@
       },
       // 护士科室切换提示自动关闭设置
       queryNurseDeptSwitchTipRequest() {
-        return reqFetchDataList("simple/data", "systemConfiguration", {
+        return this.vxSystem({
           idx: 0,
           sum: 1,
           systemConfiguration: {
@@ -481,10 +479,6 @@
         value: v.id,
         label: v.hosName,
       }));
-      uni.showLoading({
-        title: "加载中",
-        mask: true,
-      });
       this.init();
     },
     onPullDownRefresh() {
@@ -661,7 +655,8 @@
           }
 
           .newOrders_item_time {
-            width: 140rpx;
+            width: 88rpx;
+            text-align: center;
           }
 
           .newOrders_item_taskType {

pages/login/login.vue

@@ -46,7 +46,17 @@
     },
     methods: {
       ...mapActions("user", ["vxLogin"]),
-      ...mapMutations(["changeSeiminModel"]),
+      ...mapMutations('other', ["changeSeiminModel", 'resetVxOther']),
+      ...mapMutations('dictionary', ["resetVxDictionary"]),
+      ...mapMutations('user', ["resetVxLogin"]),
+      ...mapMutations('system', ["resetVxSystem"]),
+      // 重置vuex数据
+      resetVuex() {
+        this.resetVxOther();
+        this.resetVxDictionary();
+        this.resetVxLogin();
+        this.resetVxSystem();
+      },
       // 登录
       login(e) {
         let {
@@ -96,6 +106,7 @@
               });
               return;
             }
+
             // 如果记住密码,则缓存到本地
             if (savePassword) {
               //记住密码
@@ -108,7 +119,7 @@
               uni.removeStorageSync("savePasswordObj");
             }
             // 跳转到首页(isShowSeiminModel,是否显示切换科室弹窗)
-            uni.navigateTo({
+            uni.redirectTo({
               url: "/pages/index/index",
             });
             this.changeSeiminModel(true);
@@ -124,6 +135,8 @@
       },
     },
     onLoad() {
+      // 清除缓存vuexStorage
+      uni.removeStorageSync('vuexStorage');
       // 是否记住密码
       let savePasswordObj = uni.getStorageSync("savePasswordObj");
       if (savePasswordObj) {

pages/orderList/orderList.vue

@@ -2,12 +2,12 @@
   <view class="orderList">
     <!-- 头部筛选 -->
     <view class="orderList_header">
-      <view class="orderList_header_item">
+      <view class="orderList_header_item" @click="openPicker('gdState')">
         <text class="orderList_header_itemText">全部</text>
         <text class="pda pda-xiala"></text>
       </view>
       <view class="orderList_header_item">
-        <text class="orderList_header_itemText">全部</text>
+        <text class="orderList_header_itemText" @click="openPicker('associationType')">全部</text>
         <text class="pda pda-xiala"></text>
       </view>
     </view>
@@ -16,15 +16,38 @@
       <view class="orderList_listItem" v-for="newOrder in newOrderList" :key="newOrder.id">
         <view class="orderList_listItem_header">
           <view class="orderList_listItem_header_title">
-            <view class="associationType_icon"> 标 </view>
-            半程陪检-张三
+            <view class="associationType_icon" v-if="newOrder.isHalfInspect === 1"> 半 </view>
+            <view class="associationType_icon" v-else-if="newOrder.taskType.associationType.value == 'specimen'">标
+            </view>
+            <view class="associationType_icon" v-else-if="newOrder.taskType.associationType.value == 'drugsBag'"> 药
+            </view>
+            <view class="associationType_icon" v-else-if="newOrder.taskType.associationType.value == 'specimenPlan'"> 巡
+            </view>
+            <view class="associationType_icon" v-else-if="newOrder.taskType.associationType.value == 'jPBag'"> 静 </view>
+            <view class="associationType_icon" v-else-if="newOrder.taskType.associationType.value == 'inspect'"> 病
+            </view>
+            <view class="associationType_icon"
+              v-else-if="newOrder.taskType.associationType.value == 'patientTransport'"> 病
+            </view>
+            <view class="associationType_icon" v-else-if="newOrder.taskType.associationType.value == 'other'"> 其
+            </view>
+            <view class="taskNameAndWorkerName">
+              <text class="taskName">{{newOrder.isHalfInspect === 1? "半程陪检": newOrder.taskType.taskName}}</text>
+              <text class="workerName"
+                v-if="newOrder.patient &&(newOrder.taskType.associationType.value =='patientTransport' ||newOrder.taskType.associationType.value =='inspect')">-{{newOrder.patient.patientName}}</text>
+            </view>
           </view>
-          <text class="orderList_listItem_header_more">待接单</text>
+          <text class="orderList_listItem_header_more"
+            :class="newOrder.stateTextClass">{{newOrder.gdState.name }}</text>
         </view>
         <view class="orderList_listItem_item">
           <view class="orderList_listItem_item_content">
-            <text class="orderList_listItem_item_name">李四-6322285</text>
-            <text class="orderList_listItem_item_time">10:20</text>
+            <text class="orderList_listItem_item_name"
+              v-if="newOrder.worker">{{newOrder.worker.name}}{{newOrder.worker.phone? "-" + newOrder.worker.phone: ""}}</text>
+            <text class="orderList_listItem_item_name" v-else>暂未接单</text>
+            <text class="orderList_listItem_item_time" v-if="newOrder.showCreateTime">{{newOrder.showCreateTime}}</text>
+            <text class="orderList_listItem_item_time"
+              v-else-if="newOrder.yyjdTime && newOrder.gdState.value == 11">{{newOrder.yyjdTime | formatDate('MM-dd HH:mm')}}</text>
           </view>
           <view class="orderList_listItem_item_btns">
             <button type="primary" class="btn">撤销</button>
@@ -35,12 +58,17 @@
     </view>
     <seiminFooterNav></seiminFooterNav>
     <seiminModel ref="seiminModel"></seiminModel>
+    <seiminPicker ref="sPicker" titleColor="#808080" titleFontSize="28rpx" confirmColor="#333" confirmFontSize="38rpx"
+      confirmFontWeight="500" itemFontSize="28rpx" @onClose="closePicker" @onConfirm="confirmPicker"
+      :pickerList="pickerList">
+    </seiminPicker>
   </view>
 </template>
 
 <script>
   import {
-    mapState
+    mapState,
+    mapActions
   } from "vuex";
   import {
     reqFetchDataList
@@ -52,14 +80,61 @@
     name: 'orderList',
     data() {
       return {
+        gdStates: [{
+            value: -1,
+            label: '全部'
+          },
+          {
+            value: 1,
+            label: '执行中'
+          },
+          {
+            value: 2,
+            label: '待评价'
+          },
+        ], //工单状态筛选列表
+        associationTypes: [], //关联类型筛选列表
         newOrderList: [], //工单列表
+        totalNum: 0, //工单总数量
         idx: 0, //页码
+        pageNum: 20, //每页的工单数量
+        pickerList: [], //picker列表
       };
     },
     computed: {
       ...mapState("user", ["loginInfo"]),
     },
     methods: {
+      ...mapActions("dictionary", ["vxDictionary"]),
+      // 获取数据字典
+      getDictionary(key) {
+        let postData = {
+          "type": "list",
+          key
+        };
+        this.vxDictionary(postData).then(res => {
+          console.log(res);
+        })
+      },
+      //关闭
+      closePicker() {
+        this.$refs.sPicker._close();
+      },
+      //打开
+      openPicker() {
+        this.$refs.sPicker._open();
+      },
+      //确定：接收子组件传来的参数
+      confirmPicker(checkedObj) {
+        // this.changeSearchDeptParams({
+        //   backUrl: "/pages/index/index", //返回的url
+        //   type: "changeDept_index", //首页切换科室
+        //   hospital: checkedObj, //先选择院区
+        // });
+        // uni.navigateTo({
+        //   url: "/pages/searchDept/searchDept",
+        // });
+      },
       // 获取页面数据
       init() {
         uni.showLoading({
@@ -76,6 +151,14 @@
       },
       // 查询最新工单列表（上拉）
       reachBottom() {
+        //没有更多
+        if (this.newOrderList.length == this.totalNum) {
+          uni.showToast({
+            icon: 'none',
+            title: '没有更多工单了'
+          })
+          return;
+        }
         uni.showLoading({
           title: "加载中",
           mask: true,
@@ -84,7 +167,6 @@
           this.queryWorkOrdersRequest(true), //查询最新工单列表
         ]).then((values) => {
           uni.hideLoading();
-          uni.stopPullDownRefresh();
           this.queryWorkOrdersResponse(values[0], true);
         });
       },
@@ -103,13 +185,14 @@
             searchDays: 2,
           },
           idx: this.idx,
-          sum: 10,
+          sum: this.pageNum,
         });
       },
       // 查询最新工单列表
       queryWorkOrdersResponse(res, idxPlus = false) {
         if (res.status == 200) {
           res.list = res.list || [];
+          this.totalNum = res.totalNum || 0;
           let newOrderList = res.list.map((v) => {
             if (v.gdState) {
               if (
@@ -130,7 +213,7 @@
           });
           if (idxPlus) {
             //累加
-            this.newOrderList.push(newOrderList)
+            this.newOrderList = this.newOrderList.concat(newOrderList);
           } else {
             this.newOrderList = newOrderList;
           }
@@ -145,6 +228,7 @@
       },
     },
     mounted() {
+      this.getDictionary('association_types');
       this.init();
     },
     onPullDownRefresh() {
@@ -219,19 +303,35 @@
 
           .orderList_listItem_header_title {
             color: #333;
+            flex: 1;
             @include flex(flex-start, center);
 
             .associationType_icon {
               width: 48rpx;
               height: 48rpx;
               border-radius: 50%;
-              background-color: rgba(57, 177, 153, 0.3);
+              background-color: #F0F6ED;
               border: 1px solid #39b199;
               font-size: 24rpx;
               color: #39b199;
               margin-right: 8rpx;
               @include flex(center, center);
             }
+
+            .taskNameAndWorkerName {
+              flex: 1;
+              @include flex;
+
+              .taskName {
+                max-width: 10em;
+                @include clamp;
+              }
+
+              .workerName {
+                flex: 1;
+                @include clamp;
+              }
+            }
           }
 
           .orderList_listItem_header_more {

pages/quickCreateOrder/quickCreateOrder.vue

@@ -134,7 +134,7 @@
     },
     computed: {
       ...mapState('user', ['loginInfo']),
-      ...mapState([
+      ...mapState('other', [
         "qucikCreateOrderType",
         "qucikCreateOrderTypeId",
         "deptDisplay",
@@ -143,7 +143,7 @@
       ]),
     },
     methods: {
-      ...mapMutations(['changeSearchDeptParams', 'changeSearchDeptResultList']),
+      ...mapMutations('other', ['changeSearchDeptParams', 'changeSearchDeptResultList']),
       // 添加备注
       addRemarks(customRemark) {
         this.remarksFocus = false;

pages/searchDept/searchDept.vue

@@ -62,7 +62,7 @@
     },
     computed: {
       ...mapState("user", ["loginInfo"]),
-      ...mapState([
+      ...mapState('other', [
         "deptDisplay",
         "searchDeptParams",
         "searchDeptResult",
@@ -79,7 +79,7 @@
       this.init();
     },
     methods: {
-      ...mapMutations([
+      ...mapMutations('other', [
         "changeSearchDeptResult",
         "changeSeiminModel",
         "changeSearchDeptResultList",

request/api.js

@@ -3,12 +3,12 @@ import {
 } from "./index.js";
 
 // 数据字典查询
-// export const reqDictionary = (postData) =>
-//   request({
-//     url: "/common/common/getDictionary",
-//     data: postData,
-//     method: 'POST'
-//   });
+export const reqDictionary = (postData) =>
+  request({
+    url: "/common/common/getDictionary",
+    data: postData,
+    method: 'POST'
+  });
 
 // 用户登录接口
 export const reqLogin = (postData) =>

store/index.js

@@ -2,21 +2,29 @@
  * @Author: 廖明明
  * @Date: 2022-03-31 16:36:19
  * @LastEditors: 廖明明
- * @LastEditTime: 2022-04-01 17:45:03
+ * @LastEditTime: 2022-04-22 10:16:40
  * @Description:vuex入口文件
  */
 import Vue from "vue";
 import Vuex from "vuex";
 
-import user from "@/store/modules/user";
+import other from "./modules/other";
+import user from "./modules/user";
+import dictionary from "./modules/dictionary";
+import system from "./modules/system";
 
 Vue.use(Vuex);
 
 const myPlugin = (store) => {
   // 当 store 初始化后调用
   let vuexStorage = uni.getStorageSync("vuexStorage");
-  if (vuexStorage) {
-    console.log(vuexStorage)
+  if (
+    vuexStorage &&
+    vuexStorage.user &&
+    vuexStorage.dictionary &&
+    vuexStorage.system &&
+    vuexStorage.other
+  ) {
     store.replaceState(vuexStorage);
   }
   store.subscribe((mutation, state) => {
@@ -25,66 +33,11 @@ const myPlugin = (store) => {
 };
 
 export default new Vuex.Store({
-  state: {
-    isShowSeiminModel: false, //是否显示切换科室弹窗
-    qucikCreateOrderType: '', //快捷建单类型
-    qucikCreateOrderTypeId: '', //快捷建单类型id
-    deptDisplay: 1, //护士端科室显示选择(名称还是别名)1是名称，2是别名
-    updateTipsForNurses: '', //护士端更新提示
-    specimenButton: '', //标本按钮文字
-    //护士科室切换提示自动关闭设置
-    // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
-    // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
-    // (3)	如果用户填写0则为无自动关闭和强制查看时间。
-    nurseDeptSwitchTip: 0,
-    // 搜索到的科室-searchDept
-    searchDeptResult: {},
-    // 搜索到的科室集合-searchDept-选起点科室并且需要选终点科室
-    searchDeptResultList: {},
-    // 搜索科室需要传递的参数
-    searchDeptParams: {},
-  },
-  mutations: {
-    //是否显示切换科室弹窗
-    changeSeiminModel(state, args) {
-      state.isShowSeiminModel = args;
-    },
-    //快捷建单类型
-    changeQucikCreateOrderType(state, args) {
-      state.qucikCreateOrderType = args.type;
-      state.qucikCreateOrderTypeId = args.taskTypeId;
-    },
-    //护士端科室显示选择(名称还是别名)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;
-    },
-    //搜索到的科室-searchDept
-    changeSearchDeptResult(state, args) {
-      state.searchDeptResult = args || {};
-    },
-    //搜索到的科室集合-searchDept-选起点科室并且需要选终点科室
-    changeSearchDeptResultList(state, args) {
-      state.searchDeptResultList = args || {};
-    },
-    //搜索科室需要传递的参数
-    changeSearchDeptParams(state, args) {
-      state.searchDeptParams = args;
-    },
-  },
   modules: {
     user,
+    dictionary,
+    system,
+    other,
   },
   plugins: [myPlugin],
 });

store/modules/dictionary.js

@@ -1,27 +1,45 @@
-// import {
-//   reqDictionary
-// } from "@/request/api.js";
-// const state = {
-//   dictionary: {},
-// };
-// const getters = {};
-// const mutations = {
-//   vxDictionary(state, args) {
-//     state.dictionary = args;
-//   },
-// };
-// const actions = {
-//   async vxDictionary({
-//     commit
-//   }, args) {
-//     let result = await reqDictionary(args);
-//     commit("vxDictionary", result.user);
-//   },
-// };
-// export default {
-//   namespaced: true,
-//   state,
-//   getters,
-//   mutations,
-//   actions,
-// };
+import {
+  reqDictionary
+} from "@/request/api.js";
+import cloneDeep from 'lodash/cloneDeep'
+const stateReset = {
+  dictionaryInfo: {},
+};
+const state = cloneDeep(stateReset);
+const getters = {};
+const mutations = {
+  // 重置字典数据
+  resetVxDictionary(state) {
+    Object.assign(state, cloneDeep(stateReset))
+  },
+  // 获取数据
+  vxDictionary(state, args) {
+    state.dictionaryInfo[args.key] = args.data;
+  },
+};
+const actions = {
+  // 获取字典数据
+  async vxDictionary({
+    commit,
+    state
+  }, args) {
+    if (state.dictionaryInfo[args.key]) {
+      //如果存在
+      return await Promise.resolve(state.dictionaryInfo[args.key]);
+    } else {
+      let result = await reqDictionary(args);
+      commit("vxDictionary", {
+        key: args.key,
+        data: result
+      });
+      return result;
+    }
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  getters,
+  mutations,
+  actions,
+};

store/modules/other.js

@@ -0,0 +1,75 @@
+import cloneDeep from 'lodash/cloneDeep'
+const stateReset = {
+  isShowSeiminModel: false, //是否显示切换科室弹窗
+  qucikCreateOrderType: "", //快捷建单类型
+  qucikCreateOrderTypeId: "", //快捷建单类型id
+  deptDisplay: 1, //护士端科室显示选择(名称还是别名)1是名称，2是别名
+  updateTipsForNurses: "", //护士端更新提示
+  specimenButton: "", //标本按钮文字
+  //护士科室切换提示自动关闭设置
+  // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
+  // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
+  // (3)	如果用户填写0则为无自动关闭和强制查看时间。
+  nurseDeptSwitchTip: 0,
+  // 搜索到的科室-searchDept
+  searchDeptResult: {},
+  // 搜索到的科室集合-searchDept-选起点科室并且需要选终点科室
+  searchDeptResultList: {},
+  // 搜索科室需要传递的参数
+  searchDeptParams: {},
+};
+const state = cloneDeep(stateReset);
+const getters = {};
+const mutations = {
+  // 重置数据
+  resetVxOther(state) {
+    Object.assign(state, cloneDeep(stateReset));
+  },
+  //是否显示切换科室弹窗
+  changeSeiminModel(state, args) {
+    state.isShowSeiminModel = args;
+  },
+  //快捷建单类型
+  changeQucikCreateOrderType(state, args) {
+    state.qucikCreateOrderType = args.type;
+    state.qucikCreateOrderTypeId = args.taskTypeId;
+  },
+  //护士端科室显示选择(名称还是别名)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;
+  },
+  //搜索到的科室-searchDept
+  changeSearchDeptResult(state, args) {
+    state.searchDeptResult = args || {};
+  },
+  //搜索到的科室集合-searchDept-选起点科室并且需要选终点科室
+  changeSearchDeptResultList(state, args) {
+    state.searchDeptResultList = args || {};
+  },
+  //搜索科室需要传递的参数
+  changeSearchDeptParams(state, args) {
+    state.searchDeptParams = args;
+  },
+};
+const actions = {
+
+};
+export default {
+  namespaced: true,
+  state,
+  getters,
+  mutations,
+  actions,
+};

store/modules/system.js

@@ -0,0 +1,47 @@
+import {
+  reqFetchDataList
+} from "@/request/api.js";
+import cloneDeep from 'lodash/cloneDeep'
+const stateReset = {
+  systemInfo: {},
+};
+const state = cloneDeep(stateReset);
+const getters = {};
+const mutations = {
+  // 重置字典数据
+  resetVxSystem(state) {
+    Object.assign(state, cloneDeep(stateReset))
+  },
+  // 获取数据
+  vxSystem(state, args) {
+    state.systemInfo[args.key] = args.data;
+  },
+};
+const actions = {
+  // 获取字典数据
+  async vxSystem({
+    commit,
+    state
+  }, args) {
+    if (state.systemInfo[args.systemConfiguration.keyconfig]) {
+      //如果存在
+      return await Promise.resolve(state.systemInfo[args.systemConfiguration.keyconfig]);
+    } else {
+      let result = await reqFetchDataList('simple/data', 'systemConfiguration', args);
+      if (result.status == 200) {
+        commit("vxSystem", {
+          key: args.systemConfiguration.keyconfig,
+          data: result
+        });
+      }
+      return result;
+    }
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  getters,
+  mutations,
+  actions,
+};

store/modules/user.js

@@ -1,11 +1,17 @@
 import {
   reqLogin
 } from "@/request/api.js";
-const state = {
+import cloneDeep from 'lodash/cloneDeep'
+const stateReset = {
   loginInfo: {}, //当前登录用户信息
 };
+const state = cloneDeep(stateReset);
 const getters = {};
 const mutations = {
+  // 重置数据
+  resetVxLogin(state) {
+    Object.assign(state, cloneDeep(stateReset))
+  },
   // 登录
   vxLogin(state, args) {
     state.loginInfo = args || {};

uni.scss

@@ -89,16 +89,16 @@ $textColorYellow: #F5A623;
 // --------------------------华丽的分割线---------------------------------------
 // 全局样式
 .w100{
-  width: 100%;
+  width: 100%!important;
 }
 .red {
-  color: $textColorRed;
+  color: $textColorRed!important;
 }
 .yellow {
-  color: $textColorYellow;
+  color: $textColorYellow!important;
 }
 .green {
-  color: $defaultColor;
+  color: $defaultColor!important;
 }
 // 内置复选框 start
 .uni-label-pointer{