优化

components/seiminFooterNav/seiminFooterNav.vue

@@ -84,7 +84,7 @@
             }, ]
           });
         } else {
-          uni.navigateTo({
+          uni.reLaunch({
             url: menu.link,
           });
         }

main.js

@@ -12,7 +12,7 @@ import {
 Vue.prototype.$request = request
 
 Vue.config.productionTip = false
-console.info('v1.0.4')
+console.info('v1.0.6')
 
 App.mpType = 'app'
 

manifest.json

@@ -2,8 +2,8 @@
     "name" : "医疗服务中心转运系统",
     "appid" : "__UNI__FEB1B1E",
     "description" : "医疗服务中心转运系统",
-    "versionName" : "1.0.4",
-    "versionCode" : 104,
+    "versionName" : "1.0.6",
+    "versionCode" : 106,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */
@@ -26,20 +26,21 @@
             "android" : {
                 /* android打包配置 */
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_TASKS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },

package-lock.json

@@ -13,7 +13,8 @@
         "crypto-js": "^4.1.1",
         "date-fns": "^2.28.0",
         "lodash": "^4.17.21",
-        "moment": "^2.29.3"
+        "moment": "^2.29.3",
+        "uuid": "^8.3.2"
       }
     },
     "node_modules/animate.css": {
@@ -46,6 +47,14 @@
       "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": {
@@ -73,6 +82,11 @@
       "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,6 +18,7 @@
     "crypto-js": "^4.1.1",
     "date-fns": "^2.28.0",
     "lodash": "^4.17.21",
-    "moment": "^2.29.3"
+    "moment": "^2.29.3",
+    "uuid": "^8.3.2"
   }
 }

pages/index/index.vue

@@ -5,8 +5,8 @@
       <!-- 头部搜索 -->
       <view class="search">
         <view class="search_wrap">
-          <input focus placeholder="请输入标本编码/检查单号/患…" :placeholder-style="placeholderStyle" confirm-type="search"
-            v-model="searchText" />
+          <input :key="time" focus placeholder="请输入标本编码/检查单号/患…" :placeholder-style="placeholderStyle"
+            confirm-type="search" v-model="searchText" />
           <view class="searchBtn"> 搜索 </view>
         </view>
         <view class="icon-saoma">
@@ -88,6 +88,9 @@
 
 <script>
   import {
+    v4 as uuidv4
+  } from 'uuid';
+  import {
     mapState,
     mapMutations,
     mapActions
@@ -104,22 +107,25 @@
     ASSOCIATION_TYPES
   } from "../../utils/enum.association_types.js";
   export default {
+    onShow() {
+      this.flag = true;
+      this.searchText = '';
+      this.time = uuidv4();
+    },
     watch: {
       // 首页搜索内容
       searchText(newVal) {
-        if (newVal) {
-          const _newVal = newVal;
-          clearTimeout(this.timer);
-          this.timer = setTimeout(()=>{
-            uni.navigateTo({
-              url: `/pages/search/search?txt=${_newVal}`
-            })
-          },500)
+        if (newVal && this.flag) {
+          this.flag = false;
+          uni.reLaunch({
+            url: `/pages/search/search?txt=${newVal}`,
+          })
         }
       }
     },
     data() {
       return {
+        time: uuidv4(),
         openSpecimen: false, //标本的开通权限
         searchText: '', //首页搜索内容
         placeholderStyle: "color:#999;font-size:30rpx;line-height:66rpx;",
@@ -130,7 +136,7 @@
         hospitalList: [], //当前用户权限中的院区列表
         pickerTitle: "", //选择院区picker的title
         specimenTaskTypeId: undefined, //标本任务类型id
-        timer:null,
+        flag: true, //是否可以跳转
       };
     },
     computed: {
@@ -175,7 +181,6 @@
       init() {
         uni.showLoading({
           title: "加载中",
-          mask: true,
         });
         Promise.all([
           this.querySpecimenNumRequest(), //查询急标和普标数量
@@ -480,6 +485,10 @@
               name: "知道了",
               textColor: "#49B856",
               flex: 2,
+              click: () => {
+                this.$refs.seiminModel.close();
+                this.time = uuidv4();
+              }
             },
             {
               name: "前往切换科室",

pages/login/login.vue

@@ -121,7 +121,7 @@
 						}
 						// 跳转到首页(isShowSeiminModel,是否显示切换科室弹窗)
             this.changeSeiminModel(true);
-						uni.redirectTo({
+						uni.reLaunch({
 							url: "/pages/index/index",
 						});
 					} else {

pages/patientBuildConfirm/patientBuildConfirm.vue

@@ -138,7 +138,7 @@
                       content: "您申请的工单已建单成功，工作人员会尽快处理！",
                       btns:[{
                         click:()=>{
-                          uni.navigateTo({
+                          uni.reLaunch({
                             url: '/pages/patientList/patientList'
                           })
                         }
@@ -246,7 +246,7 @@
                 content: "您申请的工单已建单成功，工作人员会尽快处理！",
                 btns:[{
                   click:()=>{
-                    uni.navigateTo({
+                    uni.reLaunch({
                       url: '/pages/patientList/patientList'
                     })
                   }

pages/patientDetail/patientDetail.vue

@@ -190,7 +190,7 @@
           name: "回到列表",
           type: "default",
           click: () => {
-            uni.navigateTo({
+            uni.reLaunch({
               url: "/pages/patientList/patientList",
             });
           },

pages/patientList/patientList.vue

@@ -250,7 +250,6 @@
         };
         uni.showLoading({
           title: "加载中",
-          mask: true,
         });
         reqFetchDataList("nurse", "patient", postData).then((res) => {
           uni.hideLoading();

pages/quickCreateOrder/quickCreateOrder.vue

@@ -148,7 +148,7 @@
               name: "返回列表",
               type: "default",
               click: () => {
-                uni.navigateTo({
+                uni.reLaunch({
                   url: '/pages/patientList/patientList'
                 })
               },
@@ -175,7 +175,7 @@
             name: "返回列表",
             type: "default",
             click: () => {
-              uni.navigateTo({
+              uni.reLaunch({
                 url: '/pages/patientList/patientList'
               })
             },
@@ -393,7 +393,7 @@
                 textColor: "#49B856",
                 flex: 1,
                 click() {
-                  uni.navigateTo({
+                  uni.reLaunch({
                     url: "/pages/index/index",
                   });
                 },
@@ -490,7 +490,7 @@
           name: "返回列表",
           type: "default",
           click: () => {
-            uni.navigateTo({
+            uni.reLaunch({
               url: '/pages/patientList/patientList'
             })
           },
@@ -500,7 +500,7 @@
             name: "回到首页",
             type: "default",
             click: () => {
-              uni.navigateTo({
+              uni.reLaunch({
                 url: "/pages/index/index",
               });
             },

pages/search/search.vue

@@ -153,7 +153,7 @@
         // 长度小于等于4,只搜索床号
         // 长度大于4,搜索患者住院号，患者二维码，标本码，检查单号
         if (!keyWord.length) {
-          uni.navigateTo({
+          uni.reLaunch({
             url: '/pages/index/index'
           })
           return;
@@ -164,7 +164,6 @@
         };
         uni.showLoading({
           title: "加载中",
-          mask: true,
         });
         reqSmartScan(postData).then((res) => {
           uni.hideLoading();

pages/searchDept/searchDept.vue

@@ -371,7 +371,7 @@
                     click: (e) => {
                       this.changeLoginInfo(res.data);
                       this.changeSeiminModel(true);
-                      uni.navigateTo({
+                      uni.reLaunch({
                         url: this.searchDeptParams.backUrl,
                       });
                     },
@@ -399,7 +399,7 @@
       },
       // 快捷建单选择起点科室或选择终点科室
       selectDept_startOrEnd_qucikCreateOrder() {
-        uni.navigateTo({
+        uni.reLaunch({
           url: this.searchDeptParams.backUrl,
         });
       },