代码的优化与完善

App.vue

@@ -14,7 +14,7 @@
       console.log("App Hide");
     },
     onPageNotFound(res) {
-      wx.reLaunch({
+      uni.navigateTo({
         url: '/pages/login/login',
       })
     },

components/seiminFooterNav/seiminFooterNav.vue

@@ -76,7 +76,7 @@
       goto(menu) {
         if (menu.name === "二维码") {
           this.$refs.seiminModel.show({
-            title:'科室二维码',
+            title: '科室二维码',
             skin: 'qrcode',
             btns: [{
               name: "知道了",
@@ -84,9 +84,15 @@
             }, ]
           });
         } else {
-          uni.reLaunch({
-            url: menu.link,
-          });
+          if (this.curRoute === menu.link) {
+            uni.redirectTo({
+              url: menu.link,
+            });
+          } else {
+            uni.navigateTo({
+              url: menu.link,
+            });
+          }
         }
       },
       // 高亮当前菜单
@@ -111,7 +117,7 @@
     z-index: 9;
     background-color: #fff;
     padding: 0 60rpx;
-    @include border(top,rgba(0, 0, 0, 0.1));
+    @include border(top, rgba(0, 0, 0, 0.1));
     @include flex(space-between, center);
 
     .seiminFooterNav_item {

package-lock.json

@@ -13,8 +13,7 @@
         "crypto-js": "^4.1.1",
         "date-fns": "^2.28.0",
         "lodash": "^4.17.21",
-        "moment": "^2.29.3",
-        "uuid": "^8.3.2"
+        "moment": "^2.29.3"
       }
     },
     "node_modules/animate.css": {
@@ -47,14 +46,6 @@
       "engines": {
         "node": "*"
       }
-    },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
     }
   },
   "dependencies": {
@@ -82,11 +73,6 @@
       "version": "2.29.3",
       "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.3.tgz",
       "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="
-    },
-    "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     }
   }
 }

package.json

@@ -18,7 +18,6 @@
     "crypto-js": "^4.1.1",
     "date-fns": "^2.28.0",
     "lodash": "^4.17.21",
-    "moment": "^2.29.3",
-    "uuid": "^8.3.2"
+    "moment": "^2.29.3"
   }
 }

pages/appointmentInspect/appointmentInspect.vue

@@ -41,6 +41,9 @@
 </template>
 
 <script>
+  import {
+    backPress
+  } from '../../utils/index.js';
   import cloneDeep from 'lodash/cloneDeep';
   import {
     mapState,
@@ -50,8 +53,12 @@
     ASSOCIATION_TYPES
   } from "../../utils/enum.association_types.js";
   export default {
+    onBackPress() {
+      backPress();
+    },
     data() {
       return {
+        reFresh: '',
         ASSOCIATION_TYPES,
         qcoHeight: 0,
         // 关联检查有多个科室，但是开关设置是不允许，是否展示提示文字

pages/detail/detail.vue

@@ -137,6 +137,9 @@
 
 <script>
   import {
+    backPress
+  } from '../../utils/index.js';
+  import {
     debounce
   } from 'lodash/function';
   import {
@@ -160,8 +163,12 @@
     showJiaji,
   } from "../../utils/index.js";
   export default {
+    onBackPress() {
+      backPress();
+    },
     data() {
       return {
+        reFresh: '',
         logList: [], //过程信息列表
         debouncedChangeTab: null,
         // 路由传参

pages/index/index.vue

@@ -5,7 +5,7 @@
       <!-- 头部搜索 -->
       <view class="search">
         <view class="search_wrap">
-          <input :key="time" focus placeholder="请输入标本编码/检查单号/患…" :placeholder-style="placeholderStyle"
+          <input :focus="isFocus" @blur="blur" placeholder="请输入标本编码/检查单号/患…" :placeholder-style="placeholderStyle"
             confirm-type="search" v-model="searchText" />
           <view class="searchBtn"> 搜索 </view>
         </view>
@@ -88,8 +88,9 @@
 
 <script>
   import {
-    v4 as uuidv4
-  } from 'uuid';
+    backPress,
+    getCurrentPagesSeiminAll
+  } from '../../utils/index.js';
   import {
     mapState,
     mapMutations,
@@ -107,25 +108,32 @@
     ASSOCIATION_TYPES
   } from "../../utils/enum.association_types.js";
   export default {
+    onBackPress() {
+      backPress();
+    },
     onShow() {
       this.flag = true;
-      this.searchText = '';
-      this.time = uuidv4();
     },
     watch: {
       // 首页搜索内容
       searchText(newVal) {
         if (newVal && this.flag) {
           this.flag = false;
-          uni.reLaunch({
+          uni.navigateTo({
             url: `/pages/search/search?txt=${newVal}`,
           })
         }
+      },
+      reFresh() {
+        uni.redirectTo({
+          url: `${getCurrentPagesSeiminAll()}`,
+        })
       }
     },
     data() {
       return {
-        time: uuidv4(),
+        isFocus: true,
+        reFresh: '',
         openSpecimen: false, //标本的开通权限
         searchText: '', //首页搜索内容
         placeholderStyle: "color:#999;font-size:30rpx;line-height:66rpx;",
@@ -137,6 +145,7 @@
         pickerTitle: "", //选择院区picker的title
         specimenTaskTypeId: undefined, //标本任务类型id
         flag: true, //是否可以跳转
+        updateTipsForNurses: '', //护士端更新提示
       };
     },
     computed: {
@@ -145,7 +154,6 @@
         "isShowSeiminModel",
         "deptDisplay",
         "specimenButton",
-        "updateTipsForNurses",
       ]),
     },
     methods: {
@@ -153,12 +161,14 @@
         "changeSeiminModel",
         "changeQucikCreateOrderType",
         "changeDeptDisplay",
-        "changeUpdateTipsForNurses",
         "changeSpecimenButton",
         "changeNurseDeptSwitchTip",
         "changeSearchDeptParams",
       ]),
       ...mapActions('system', ["vxSystem"]),
+      blur() {
+        this.isFocus = false;
+      },
       // 前往标本列表
       gotoSpecimenList(type) {
         uni.navigateTo({
@@ -364,7 +374,7 @@
             });
             throw new Error('无法获取到【护士端更新提示】配置,请前往配置');
           }
-          this.changeUpdateTipsForNurses(res.list[0].valueconfig);
+          this.updateTipsForNurses = res.list[0].valueconfig;
         } else {
           this.$refs.seiminModel.show({
             skin: "toast",
@@ -487,7 +497,7 @@
               flex: 2,
               click: () => {
                 this.$refs.seiminModel.close();
-                this.time = uuidv4();
+                this.isFocus = true;
               }
             },
             {

pages/login/login.vue

@@ -40,6 +40,7 @@
 	export default {
 		data() {
 			return {
+        reFresh: '',
 				username: "", //用户名
 				password: "", //密码
 				savePassword: false, //是否记住密码
@@ -121,7 +122,7 @@
 						}
 						// 跳转到首页(isShowSeiminModel,是否显示切换科室弹窗)
             this.changeSeiminModel(true);
-						uni.reLaunch({
+						uni.navigateTo({
 							url: "/pages/index/index",
 						});
 					} else {

pages/orderDetail/orderDetail.vue

@@ -317,6 +317,9 @@
 
 <script>
   import {
+    backPress
+  } from '../../utils/index.js';
+  import {
     debounce
   } from 'lodash/function';
   import {
@@ -339,8 +342,12 @@
     showJiaji,
   } from "../../utils/index.js";
   export default {
+    onBackPress() {
+      backPress();
+    },
     data() {
       return {
+        reFresh: '',
         debouncedChangeTab: null,
         // 路由传参
         queryParams: {},

pages/orderList/orderList.vue

@@ -92,6 +92,9 @@
 
 <script>
   import {
+    backPress
+  } from '../../utils/index.js';
+  import {
     mapState,
     mapActions
   } from "vuex";
@@ -112,8 +115,12 @@
   } from "../../utils/index.js";
   export default {
     name: 'orderList',
+    onBackPress() {
+      backPress();
+    },
     data() {
       return {
+        reFresh: '',
         // 工单状态
         GDSTATE: GDSTATE,
         // 当前筛选的工单状态

pages/patientBuild/patientBuild.vue

@@ -35,6 +35,9 @@
 </template>
 
 <script>
+  import {
+    backPress
+  } from '../../utils/index.js';
   import cloneDeep from 'lodash/cloneDeep';
   import {
     mapState,
@@ -44,8 +47,12 @@
     ASSOCIATION_TYPES
   } from "../../utils/enum.association_types.js";
   export default {
+    onBackPress() {
+      backPress();
+    },
     data() {
       return {
+        reFresh: '',
         ASSOCIATION_TYPES,
         // 时间戳
         timestamp: new Date().getTime(),
@@ -171,7 +178,7 @@
       },
       // 是否加急
       allowUrgentChange(isUrgent) {
-        console.log(isUrgent,this.isYYBuild)
+        console.log(isUrgent, this.isYYBuild)
         if (this.isYYBuild) {
           this.isYYBuild = !isUrgent;
           if (!this.isYYBuild) {
@@ -256,7 +263,7 @@
       },
       // 底部按钮展示
       showBtns(flag) {
-        console.log(flag,this.isYYBuild)
+        console.log(flag, this.isYYBuild)
         if (flag && this.isYYBuild) {
           //患者陪检业务或患者其他服务业务，并且预约建单开关打开的情况下
           this.btns = [{

pages/patientBuildConfirm/patientBuildConfirm.vue

@@ -68,6 +68,7 @@
   export default {
     data() {
       return {
+        reFresh: '',
         ASSOCIATION_TYPES,
         SOURCEID,
         // 中间科室名称
@@ -138,7 +139,7 @@
                       content: "您申请的工单已建单成功，工作人员会尽快处理！",
                       btns:[{
                         click:()=>{
-                          uni.reLaunch({
+                          uni.navigateTo({
                             url: '/pages/patientList/patientList'
                           })
                         }
@@ -246,7 +247,7 @@
                 content: "您申请的工单已建单成功，工作人员会尽快处理！",
                 btns:[{
                   click:()=>{
-                    uni.reLaunch({
+                    uni.navigateTo({
                       url: '/pages/patientList/patientList'
                     })
                   }

pages/patientDetail/patientDetail.vue

@@ -59,7 +59,8 @@
                 <uni-th align="center" width="71">科室</uni-th>
               </uni-tr>
               <!-- 表格数据行 -->
-              <uni-tr v-for="data in info.specimens" :key="data.id" @click.native="toDetail(data.id,'specimen',data.scode)">
+              <uni-tr v-for="data in info.specimens" :key="data.id"
+                @click.native="toDetail(data.id,'specimen',data.scode)">
                 <uni-td align="center">{{data.stype?data.stype.name:'暂无'}}</uni-td>
                 <uni-td align="center">{{data.scode || '暂无'}}</uni-td>
                 <uni-td align="center">{{data.speState?data.speState.name:'暂无'}}</uni-td>
@@ -130,6 +131,9 @@
 
 <script>
   import {
+    backPress
+  } from '../../utils/index.js';
+  import {
     debounce
   } from 'lodash/function';
   import {
@@ -154,8 +158,12 @@
     showJiaji,
   } from "../../utils/index.js";
   export default {
+    onBackPress() {
+      backPress();
+    },
     data() {
       return {
+        reFresh: '',
         checkedShowMsg: {}, //当前选中的任务类型的buildtrip信息
         pickerTitle: "", //一键建单picker的title
         taskTypeListResource: [], //任务类型列表(请求的原始数据)
@@ -190,7 +198,7 @@
           name: "回到列表",
           type: "default",
           click: () => {
-            uni.reLaunch({
+            uni.navigateTo({
               url: "/pages/patientList/patientList",
             });
           },
@@ -354,12 +362,12 @@
         this.changeTab(1);
       },
       // 跳转详情
-      toDetail(id, associationType,scode) {
-        if(scode){
+      toDetail(id, associationType, scode) {
+        if (scode) {
           uni.navigateTo({
             url: `/pages/detail/detail?id=${id}&associationType=${associationType}&scode=${scode}`
           })
-        }else{
+        } else {
           uni.navigateTo({
             url: `/pages/detail/detail?id=${id}&associationType=${associationType}`
           })

pages/patientList/patientList.vue

@@ -30,7 +30,8 @@
             <text class="orderList_listItem_item_time">待检{{patient.watingCount}}</text>
           </view>
           <view class="orderList_listItem_item_btns">
-            <button type="primary" class="btn" @click.stop="toDetail(patient.patientCode,patient.patientName)">患者详情</button>
+            <button type="primary" class="btn"
+              @click.stop="toDetail(patient.patientCode,patient.patientName)">患者详情</button>
             <button type="primary" class="btn" @click.stop="buildOrder(patient)">一键建单</button>
           </view>
         </view>
@@ -47,6 +48,10 @@
 
 <script>
   import {
+    backPress,
+    getCurrentPagesSeiminAll
+  } from '../../utils/index.js';
+  import {
     debounce
   } from 'lodash/function';
   import {
@@ -62,8 +67,12 @@
     ASSOCIATION_TYPES
   } from '../../utils/enum.association_types.js';
   export default {
+    onBackPress() {
+      backPress();
+    },
     data() {
       return {
+        reFresh: '',
         ASSOCIATION_TYPES,
         checkedShowMsg: {}, //当前选中的任务类型的buildtrip信息
         selectedPatient: {}, //当前选中的患者
@@ -77,6 +86,13 @@
         idx: 0, //页码
       };
     },
+    watch: {
+      reFresh() {
+        uni.redirectTo({
+          url: `${getCurrentPagesSeiminAll()}`,
+        })
+      }
+    },
     computed: {
       ...mapState("login", ["loginInfo"]),
       ...mapState('other', ["deptDisplay"]),
@@ -224,7 +240,7 @@
         })
       },
       // 跳转患者详情
-      toDetail(patientCode,patientName) {
+      toDetail(patientCode, patientName) {
         uni.navigateTo({
           url: `/pages/patientDetail/patientDetail?patientCode=${patientCode}&patientName=${patientName}`
         })

pages/personalCenter/personalCenter.vue

@@ -43,6 +43,9 @@
 </template>
 
 <script>
+  import {
+    backPress
+  } from '../../utils/index.js';
   import config from "../../request/config.js";
   import {
     mapState,
@@ -54,8 +57,12 @@
     reqFetchDataList,
   } from "../../request/api.js";
   export default {
+    onBackPress() {
+      backPress();
+    },
     data() {
       return {
+        reFresh: '',
         hospitalList: [], //当前用户权限中的院区列表
         pickerTitle: "", //选择院区picker的title
       };
@@ -303,7 +310,7 @@
                   plus.runtime.restart();
                 }
               );
-            }else{
+            } else {
               this.$refs.seiminModel.show({
                 skin: "toast",
                 icon: "error",

pages/quickCreateOrder/quickCreateOrder.vue

@@ -73,6 +73,9 @@
 </template>
 
 <script>
+  import {
+    backPress
+  } from '../../utils/index.js';
   import cloneDeep from 'lodash/cloneDeep';
   import {
     mapState,
@@ -90,8 +93,12 @@
     DEPARTMENT_STRATEGY
   } from "../../utils/enum.departmentStrategy.js";
   export default {
+    onBackPress() {
+      backPress();
+    },
     data() {
       return {
+        reFresh: '',
         DEPARTMENT_STRATEGY,
         //患者建单信息展示
         patientMsg: '',
@@ -148,7 +155,7 @@
               name: "返回列表",
               type: "default",
               click: () => {
-                uni.reLaunch({
+                uni.navigateTo({
                   url: '/pages/patientList/patientList'
                 })
               },
@@ -175,7 +182,7 @@
             name: "返回列表",
             type: "default",
             click: () => {
-              uni.reLaunch({
+              uni.navigateTo({
                 url: '/pages/patientList/patientList'
               })
             },
@@ -192,8 +199,8 @@
           this.remarksFocus = true;
         });
         this.workOrderRemark += customRemark;
-        console.log(this.workOrderRemark.replace(/\s/g,''))
-        this.workOrderRemark = this.workOrderRemark.replace(/\s/g,'').slice(0,100);
+        console.log(this.workOrderRemark.replace(/\s/g, ''))
+        this.workOrderRemark = this.workOrderRemark.replace(/\s/g, '').slice(0, 100);
       },
       //获取所有数据
       getData(qucikCreateOrderType, qucikCreateOrderTypeId) {
@@ -393,7 +400,7 @@
                 textColor: "#49B856",
                 flex: 1,
                 click() {
-                  uni.reLaunch({
+                  uni.navigateTo({
                     url: "/pages/index/index",
                   });
                 },
@@ -490,7 +497,7 @@
           name: "返回列表",
           type: "default",
           click: () => {
-            uni.reLaunch({
+            uni.navigateTo({
               url: '/pages/patientList/patientList'
             })
           },
@@ -500,7 +507,7 @@
             name: "回到首页",
             type: "default",
             click: () => {
-              uni.reLaunch({
+              uni.navigateTo({
                 url: "/pages/index/index",
               });
             },

pages/search/search.vue

@@ -83,12 +83,17 @@
         </view>
       </view>
     </view>
+    <seiminFooterBtn :btns="btns"></seiminFooterBtn>
     <seiminModel ref="seiminModel"></seiminModel>
   </view>
 </template>
 
 <script>
   import {
+    backPress,
+    getCurrentPagesSeiminAll
+  } from '../../utils/index.js';
+  import {
     debounce
   } from 'lodash/function';
   import {
@@ -102,8 +107,19 @@
     ASSOCIATION_TYPES
   } from '../../utils/enum.association_types.js';
   export default {
+    onBackPress() {
+      backPress();
+    },
+    watch: {
+      reFresh() {
+        uni.redirectTo({
+          url: `${getCurrentPagesSeiminAll()}`,
+        })
+      }
+    },
     data() {
       return {
+        reFresh: '',
         queryParams: {}, //路由参数
         ASSOCIATION_TYPES,
         checkedShowMsg: {}, //当前选中的任务类型的buildtrip信息
@@ -118,6 +134,16 @@
           specimenList: [],
           inspectList: [],
         },
+        //底部按钮
+        btns: [{
+          name: "返回首页",
+          type: "default",
+          click: () => {
+            uni.navigateTo({
+              url: '/pages/index/index'
+            })
+          },
+        }],
       };
     },
     computed: {
@@ -149,13 +175,15 @@
       //监听输入
       inputChange(event = '') {
         let keyWord = event.detail ? event.detail.value : event;
-        // 长度小于等于0,返回首页
+        // 长度小于等于0,返回空数组
         // 长度小于等于4,只搜索床号
         // 长度大于4,搜索患者住院号，患者二维码，标本码，检查单号
         if (!keyWord.length) {
-          uni.reLaunch({
-            url: '/pages/index/index'
-          })
+          this.searchList = {
+            patientList: [],
+            specimenList: [],
+            inspectList: [],
+          }
           return;
         }
         let postData = {

pages/searchDept/searchDept.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="content">
     <view class="search-box">
-      <seiminSearch class="mSearch-input-box" :mode="2" button="inside" placeholder="输入科室名称支持拼音检索" @search="doSearch(false)"
-        @input="changeInp" @confirm="doSearch(false)" v-model="keyword"></seiminSearch>
+      <seiminSearch class="mSearch-input-box" :mode="2" button="inside" placeholder="输入科室名称支持拼音检索"
+        @search="doSearch(false)" @input="changeInp" @confirm="doSearch(false)" v-model="keyword"></seiminSearch>
     </view>
     <view class="search-keyword">
       <scroll-view class="keyword-list-box" v-show="isShowKeywordList" scroll-y>
@@ -38,6 +38,9 @@
 
 <script>
   import {
+    backPress
+  } from '../../utils/index.js';
+  import {
     reqFetchDataList,
     reqChangeHospital,
     reqUpdData,
@@ -51,8 +54,12 @@
     DEPARTMENT_STRATEGY
   } from "../../utils/enum.departmentStrategy.js";
   export default {
+    onBackPress() {
+      backPress();
+    },
     data() {
       return {
+        reFresh: '',
         DEPARTMENT_STRATEGY,
         keyword: "",
         oldKeywordList: [],
@@ -371,7 +378,7 @@
                     click: (e) => {
                       this.changeLoginInfo(res.data);
                       this.changeSeiminModel(true);
-                      uni.reLaunch({
+                      uni.navigateTo({
                         url: this.searchDeptParams.backUrl,
                       });
                     },
@@ -399,7 +406,7 @@
       },
       // 快捷建单选择起点科室或选择终点科室
       selectDept_startOrEnd_qucikCreateOrder() {
-        uni.reLaunch({
+        uni.navigateTo({
           url: this.searchDeptParams.backUrl,
         });
       },

pages/specimenList/specimenList.vue

@@ -47,14 +47,21 @@
 
 <script>
   import {
+    backPress
+  } from '../../utils/index.js';
+  import {
     mapState,
   } from "vuex";
   import {
     reqGetSpecimenWorkOrderDetails,
   } from "../../request/api.js";
   export default {
+    onBackPress() {
+      backPress();
+    },
     data() {
       return {
+        reFresh: '',
         speList: [], //标本列表
         pickerList: [], //picker列表
         type: '', //打开picker的类型，急或普查

store/modules/other.js

@@ -9,7 +9,6 @@ const stateReset = {
   patientTaskType: '', //患者建单的任务类型
   selectedPatient: {}, //患者建单的选中的患者
   deptDisplay: 1, //护士端科室显示选择(名称还是别名)1是名称，2是别名
-  updateTipsForNurses: "", //护士端更新提示
   specimenButton: "", //标本按钮文字
   //护士科室切换提示自动关闭设置
   // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
@@ -54,10 +53,6 @@ const mutations = {
   changeDeptDisplay(state, args) {
     state.deptDisplay = args;
   },
-  //护士端更新提示
-  changeUpdateTipsForNurses(state, args) {
-    state.updateTipsForNurses = args;
-  },
   //标本按钮文字
   changeSpecimenButton(state, args) {
     state.specimenButton = args;

store/modules/system.js

@@ -25,17 +25,18 @@ const actions = {
   }, args) {
     const excludeArr = ['updateTipsForNurses']; //无需缓存的keyconfig
     const keyconfig = args.systemConfiguration.keyconfig;
-    if (state.systemInfo[keyconfig] && !excludeArr.includes(args.systemConfiguration
-        .keyconfig)) {
+    if (state.systemInfo[keyconfig]) {
       //如果存在
       return await Promise.resolve(state.systemInfo[keyconfig]);
     } else {
       let result = await reqFetchDataList('simple/data', 'systemConfiguration', args);
       if (result.status == 200) {
-        commit("vxSystem", {
-          key: keyconfig,
-          data: result
-        });
+        if (!excludeArr.includes(keyconfig)) {
+          commit("vxSystem", {
+            key: keyconfig,
+            data: result
+          });
+        }
       }
       return result;
     }

utils/index.js

@@ -285,3 +285,17 @@ export function showJiaji(id, callBack) {
     ]
   });
 };
+
+// 返回上一页
+export const backPress = function() {
+	let pages = getCurrentPages() //页面栈
+	let prePage = pages[pages.length - 2] //上一页
+	prePage.$vm.reFresh = Math.random() //触发上一页监听器
+}
+
+// 获取页面栈，默认0是当前页面栈,包含参数
+export function getCurrentPagesSeiminAll(num = 0) {
+  let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+  let curRoute = routes[routes.length - 1 - num].$page.fullPath // 获取当前页面路由，也就是最后一个打开的页面路由
+  return curRoute;
+};