代码优化

main.js

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

manifest.json

@@ -2,8 +2,8 @@
     "name" : "医疗服务中心转运系统",
     "appid" : "__UNI__FEB1B1E",
     "description" : "医疗服务中心转运系统",
-    "versionName" : "1.0.6",
-    "versionCode" : 106,
+    "versionName" : "1.0.7",
+    "versionCode" : 107,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages/index/index.vue

@@ -119,7 +119,8 @@
       uni.$on('scancodedate', data => {
         let code = data.code || '';
         // 过滤
-        code = code.replace(/^2#/, '')
+        code = code.replace(/^2#/, '');
+        code = code.replace(/^r2#/, '');
         uni.navigateTo({
           url: `/pages/search/search?txt=${code}`,
         })
@@ -155,7 +156,9 @@
           return this.searchText1;
         },
         set: function(newVal) {
-          this.searchText1 = newVal.replace(/^2#/, '');
+          newVal = newVal.replace(/^2#/, '');
+          newVal = newVal.replace(/^r2#/, '');
+          this.searchText1 = newVal;
           if (this.searchText1 && this.flag) {
             this.flag = false;
             uni.navigateTo({

pages/patientBuildConfirm/patientBuildConfirm.vue

@@ -150,6 +150,13 @@
                       skin: "toast",
                       icon: "error",
                       content: data.msg || "创建失败",
+                      btns:[{
+                        click:()=>{
+                          uni.navigateTo({
+                            url: '/pages/patientList/patientList'
+                          })
+                        }
+                      }]
                     });
                   }
                 });
@@ -261,6 +268,13 @@
                 skin: "toast",
                 icon: "error",
                 content: data.msg || "创建失败",
+                btns:[{
+                  click:()=>{
+                    uni.navigateTo({
+                      url: '/pages/patientList/patientList'
+                    })
+                  }
+                }]
               });
             }
           });

pages/search/search.vue

@@ -146,7 +146,9 @@
           return this.keyword1;
         },
         set: function(newVal) {
-          this.keyword1 = newVal.replace(/^2#/, '');
+          newVal = newVal.replace(/^2#/, '');
+          newVal = newVal.replace(/^r2#/, '');
+          this.keyword1 = newVal;
         },
       },
     },
@@ -176,6 +178,7 @@
       inputChange(event = '') {
         let keyWord = event.detail ? event.detail.value : event;
         keyWord = keyWord.replace(/^2#/, '');
+        keyWord = keyWord.replace(/^r2#/, '');
         // 长度小于等于0,返回空数组
         // 长度小于等于4,只搜索床号
         // 长度大于4,搜索患者住院号，患者二维码，标本码，检查单号