Browse Source

红外线扫码

seimin 2 years ago
parent
commit
1310da3562

+ 2 - 1
components/seiminFooterNav/seiminFooterNav.vue

@@ -121,7 +121,8 @@
121 121
     @include flex(space-between, center);
122 122
 
123 123
     .seiminFooterNav_item {
124
-      color: #dde1e5;
124
+      color: #333;
125
+      font-weight: bold;
125 126
       @include flex(center, center, column);
126 127
 
127 128
       &.otherStyle {

+ 4 - 4
components/seiminModel/seiminModel.vue

@@ -2,7 +2,7 @@
2 2
  * @Author: 廖明明
3 3
  * @Date: 2022-04-01 17:11:19
4 4
  * @LastEditors: 廖明明
5
- * @LastEditTime: 2022-04-21 13:16:48
5
+ * @LastEditTime: 2022-06-15 09:26:03
6 6
  * @Description: 自定义弹窗组件
7 7
 -->
8 8
 <template>
@@ -28,7 +28,7 @@
28 28
       <!-- 加急 -->
29 29
       <view class="seiminModel_content urgent" v-else-if="opts.skin === 'urgent'">
30 30
         <view class="urgent_txt" v-html="opts.content"></view>
31
-        <textarea :focus="true" class="urgent_textarea" auto-height :maxlength="100"
31
+        <textarea :focus="false" class="urgent_textarea" auto-height :maxlength="100"
32 32
           :placeholder-style="placeholderStyle" placeholder="请填写加急原因" v-model="urgentTextArea" :adjust-position="false" />
33 33
       </view>
34 34
       <!-- 评价 -->
@@ -43,7 +43,7 @@
43 43
           </view>
44 44
           <view class="evaluate_item">
45 45
             <text class="evaluate_label">评级:</text>
46
-            <textarea :focus="true" class="evaluate_textarea" auto-height :maxlength="100"
46
+            <textarea :focus="false" class="evaluate_textarea" auto-height :maxlength="100"
47 47
               :placeholder-style="placeholderStyle" placeholder="请输入..." v-model="evaluateTextArea" :adjust-position="false" />
48 48
           </view>
49 49
         </view>
@@ -75,7 +75,7 @@
75 75
       <view class="seiminModel_content changePwd" v-else-if="opts.skin === 'changePwd'">
76 76
         <view class="changePwd_item">
77 77
           <view class="title">原始密码</view>
78
-          <uni-easyinput type="password" focus v-model="pwdOld" placeholder="请输入原始密码"></uni-easyinput>
78
+          <uni-easyinput type="password" :focus="false" v-model="pwdOld" placeholder="请输入原始密码"></uni-easyinput>
79 79
         </view>
80 80
         <view class="changePwd_item">
81 81
           <view class="title">新密码</view>

+ 70 - 0
components/seiminScan/seiminScan.vue

@@ -0,0 +1,70 @@
1
+<template>
2
+  <view class="content"></view>
3
+</template>
4
+
5
+<script>
6
+  var main, receiver, filter;
7
+  var _codeQueryTag = false;
8
+  export default {
9
+    name: 'seiminScan',
10
+    data() {
11
+      return {
12
+        scanCode: ''
13
+      }
14
+    },
15
+    created: function(option) {
16
+      this.initScan()
17
+      this.startScan();
18
+    },
19
+    onHide: function() {
20
+      this.stopScan();
21
+    },
22
+    destroyed: function() {
23
+      /*页面退出时一定要卸载监听,否则下次进来时会重复,造成扫一次出2个以上的结果*/
24
+      this.stopScan();
25
+    },
26
+    methods: {
27
+      initScan() {
28
+        main = plus.android.runtimeMainActivity();
29
+        let IntentFilter = plus.android.importClass('android.content.IntentFilter');
30
+        filter = new IntentFilter();
31
+        filter.addAction("ds");
32
+        receiver = plus.android.implements('io.dcloud.feature.internal.reflect.BroadcastReceiver', {
33
+          onReceive: (context, intent) => {
34
+            plus.android.importClass(intent);
35
+            let code = intent.getStringExtra("data");
36
+            this.queryCode(code);
37
+          }
38
+        });
39
+      },
40
+      startScan() {
41
+        main.registerReceiver(receiver, filter);
42
+      },
43
+      stopScan() {
44
+        main.unregisterReceiver(receiver);
45
+      },
46
+      queryCode: function(code) {
47
+        //防重复  
48
+        if (_codeQueryTag) return false;
49
+        _codeQueryTag = true;
50
+        setTimeout(function() {
51
+          _codeQueryTag = false;
52
+        }, 150);
53
+        let id = code
54
+        uni.$emit('scancodedate', {
55
+          code: id
56
+        })
57
+      }
58
+    }
59
+  }
60
+</script>
61
+
62
+<style lang="scss" scoped>
63
+  page {
64
+    background-color: #efeff4;
65
+  }
66
+
67
+  .content {
68
+    text-align: center;
69
+  }
70
+</style>

+ 1 - 1
components/seiminSearch/seiminSearch.vue

@@ -57,7 +57,7 @@
57 57
         inputVal: '',
58 58
         searchName: '取消',
59 59
         isDelShow: false,
60
-        isFocus: true
60
+        isFocus: false
61 61
       };
62 62
     },
63 63
     methods: {

+ 1 - 1
main.js

@@ -12,7 +12,7 @@ import {
12 12
 Vue.prototype.$request = request
13 13
 
14 14
 Vue.config.productionTip = false
15
-console.info('v1.0.0')
15
+console.info('v1.0.1')
16 16
 
17 17
 App.mpType = 'app'
18 18
 

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
2 2
     "name" : "医疗服务中心转运系统",
3 3
     "appid" : "__UNI__FEB1B1E",
4 4
     "description" : "医疗服务中心转运系统",
5
-    "versionName" : "1.0.0",
6
-    "versionCode" : 100,
5
+    "versionName" : "1.0.1",
6
+    "versionCode" : 101,
7 7
     "transformPx" : false,
8 8
     "app-plus" : {
9 9
         /* 5+App特有相关 */

+ 2 - 2
pages/appointmentInspect/appointmentInspect.vue

@@ -225,7 +225,7 @@
225 225
       padding: 32rpx 32rpx 0;
226 226
       color: #999;
227 227
       line-height: 40rpx;
228
-      font-size: 28rpx;
228
+      font-size: 32rpx;
229 229
       text-align: center;
230 230
     }
231 231
 
@@ -236,7 +236,7 @@
236 236
     .qco_msg2 {
237 237
       padding: 16rpx 0;
238 238
       line-height: 40rpx;
239
-      font-size: 28rpx;
239
+      font-size: 32rpx;
240 240
       text-align: center;
241 241
       @include border(top);
242 242
     }

+ 9 - 8
pages/index/index.vue

@@ -83,13 +83,13 @@
83 83
       confirmFontSize="38rpx" confirmFontWeight="500" itemFontSize="32rpx" @onClose="closePicker"
84 84
       @onConfirm="confirmPicker" :pickerList="hospitalList">
85 85
     </seiminPicker>
86
+    <seiminScan></seiminScan>
86 87
   </view>
87 88
 </template>
88 89
 
89 90
 <script>
90 91
   import {
91 92
     backPress,
92
-    getCurrentPagesSeiminAll
93 93
   } from '../../utils/index.js';
94 94
   import {
95 95
     mapState,
@@ -113,6 +113,13 @@
113 113
     },
114 114
     onShow() {
115 115
       this.flag = true;
116
+      this.searchText = '';
117
+      uni.$off('scancodedate'); 
118
+      uni.$on('scancodedate', data => {
119
+        uni.navigateTo({
120
+          url: `/pages/search/search?txt=${data.code}`,
121
+        })
122
+      })
116 123
     },
117 124
     watch: {
118 125
       // 首页搜索内容
@@ -124,15 +131,10 @@
124 131
           })
125 132
         }
126 133
       },
127
-      reFresh() {
128
-        uni.redirectTo({
129
-          url: `${getCurrentPagesSeiminAll()}`,
130
-        })
131
-      }
132 134
     },
133 135
     data() {
134 136
       return {
135
-        isFocus: true,
137
+        isFocus: false,
136 138
         reFresh: '',
137 139
         openSpecimen: false, //标本的开通权限
138 140
         searchText: '', //首页搜索内容
@@ -497,7 +499,6 @@
497 499
               flex: 2,
498 500
               click: () => {
499 501
                 this.$refs.seiminModel.close();
500
-                this.isFocus = true;
501 502
               }
502 503
             },
503 504
             {

+ 1 - 1
pages/patientBuild/patientBuild.vue

@@ -350,7 +350,7 @@
350 350
       padding: 32rpx;
351 351
       color: #999;
352 352
       line-height: 40rpx;
353
-      font-size: 28rpx;
353
+      font-size: 32rpx;
354 354
       text-align: center;
355 355
     }
356 356
 

+ 1 - 1
pages/patientBuildConfirm/patientBuildConfirm.vue

@@ -392,7 +392,7 @@
392 392
       padding: 32rpx;
393 393
       color: #999;
394 394
       line-height: 40rpx;
395
-      font-size: 28rpx;
395
+      font-size: 32rpx;
396 396
       text-align: center;
397 397
     }
398 398
 

+ 0 - 8
pages/patientList/patientList.vue

@@ -49,7 +49,6 @@
49 49
 <script>
50 50
   import {
51 51
     backPress,
52
-    getCurrentPagesSeiminAll
53 52
   } from '../../utils/index.js';
54 53
   import {
55 54
     debounce
@@ -86,13 +85,6 @@
86 85
         idx: 0, //页码
87 86
       };
88 87
     },
89
-    watch: {
90
-      reFresh() {
91
-        uni.redirectTo({
92
-          url: `${getCurrentPagesSeiminAll()}`,
93
-        })
94
-      }
95
-    },
96 88
     computed: {
97 89
       ...mapState("login", ["loginInfo"]),
98 90
       ...mapState('other', ["deptDisplay"]),

+ 1 - 1
pages/personalCenter/personalCenter.vue

@@ -161,7 +161,7 @@
161 161
                       content: "退出成功",
162 162
                       btns: [{
163 163
                         click: () => {
164
-                          uni.navigateTo({
164
+                          uni.reLaunch({
165 165
                             url: '/pages/login/login'
166 166
                           })
167 167
                         }

+ 2 - 2
pages/quickCreateOrder/quickCreateOrder.vue

@@ -115,7 +115,7 @@
115 115
         //选择院区picker的title
116 116
         pickerTitle: '',
117 117
         // 工单备注是否获取焦点
118
-        remarksFocus: true,
118
+        remarksFocus: false,
119 119
         // 工单备注
120 120
         workOrderRemark: "",
121 121
         // 获取到的数据集合对象(历史输入除外)
@@ -535,7 +535,7 @@
535 535
       padding: 32rpx;
536 536
       color: #999;
537 537
       line-height: 40rpx;
538
-      font-size: 28rpx;
538
+      font-size: 32rpx;
539 539
       text-align: center;
540 540
     }
541 541
 

+ 0 - 8
pages/search/search.vue

@@ -91,7 +91,6 @@
91 91
 <script>
92 92
   import {
93 93
     backPress,
94
-    getCurrentPagesSeiminAll
95 94
   } from '../../utils/index.js';
96 95
   import {
97 96
     debounce
@@ -110,13 +109,6 @@
110 109
     onBackPress() {
111 110
       backPress();
112 111
     },
113
-    watch: {
114
-      reFresh() {
115
-        uni.redirectTo({
116
-          url: `${getCurrentPagesSeiminAll()}`,
117
-        })
118
-      }
119
-    },
120 112
     data() {
121 113
       return {
122 114
         reFresh: '',

+ 1 - 0
request/config.js

@@ -23,4 +23,5 @@ export function changeIP(ip) {
23 23
   baseUrls.development = `${ip}/service`; //开发环境
24 24
   baseUrls.production = `${ip}/service`; //生产环境
25 25
   config.baseUrl = baseUrls[process.env.NODE_ENV];
26
+  config.pdaDownloadUrl = `${ip}/getapk`; // PDA下载地址
26 27
 }