seimin 1 年之前
父節點
當前提交
fc154a3139
共有 4 個文件被更改,包括 17 次插入2 次删除
  1. 3 1
      main.js
  2. 11 0
      package-lock.json
  3. 1 0
      package.json
  4. 2 1
      pages/receiptpage/receiptpage.vue

+ 3 - 1
main.js

@@ -4,7 +4,9 @@ import App from './App'
4
 import wx from 'weixin-jsapi'
4
 import wx from 'weixin-jsapi'
5
 // import VConsole from 'vconsole';
5
 // import VConsole from 'vconsole';
6
 // new VConsole();
6
 // new VConsole();
7
-console.info('v2.4.33');
7
+// import eruda from 'eruda';
8
+// eruda.init();
9
+console.info('v2.4.34');
8
 Vue.prototype.wx = wx //声明扫码
10
 Vue.prototype.wx = wx //声明扫码
9
 Vue.prototype.audios = [] //待播放的语音集合
11
 Vue.prototype.audios = [] //待播放的语音集合
10
 // #endif
12
 // #endif

+ 11 - 0
package-lock.json

@@ -10,6 +10,7 @@
10
       "license": "ISC",
10
       "license": "ISC",
11
       "dependencies": {
11
       "dependencies": {
12
         "crypto-js": "^4.1.1",
12
         "crypto-js": "^4.1.1",
13
+        "eruda": "^3.0.1",
13
         "spinkit": "^2.0.1",
14
         "spinkit": "^2.0.1",
14
         "vconsole": "^3.14.7",
15
         "vconsole": "^3.14.7",
15
         "weixin-jsapi": "^1.1.0"
16
         "weixin-jsapi": "^1.1.0"
@@ -131,6 +132,11 @@
131
       "integrity": "sha1-I8Lzt1b/38YI0w4nyalBAkgH5/k=",
132
       "integrity": "sha1-I8Lzt1b/38YI0w4nyalBAkgH5/k=",
132
       "dev": true
133
       "dev": true
133
     },
134
     },
135
+    "node_modules/eruda": {
136
+      "version": "3.0.1",
137
+      "resolved": "https://registry.npmmirror.com/eruda/-/eruda-3.0.1.tgz",
138
+      "integrity": "sha512-6q1Xdwga4JTr1mKSW4mzuWSSbmXgqpm/8Wa1QGFGfCWRjC0bCQjbS4u06M1te1moucIS3hBLlbSTPWYH2W0qbQ=="
139
+    },
134
     "node_modules/fs.realpath": {
140
     "node_modules/fs.realpath": {
135
       "version": "1.0.0",
141
       "version": "1.0.0",
136
       "resolved": "https://registry.npmmirror.com/fs.realpath/download/fs.realpath-1.0.0.tgz",
142
       "resolved": "https://registry.npmmirror.com/fs.realpath/download/fs.realpath-1.0.0.tgz",
@@ -544,6 +550,11 @@
544
       "integrity": "sha1-I8Lzt1b/38YI0w4nyalBAkgH5/k=",
550
       "integrity": "sha1-I8Lzt1b/38YI0w4nyalBAkgH5/k=",
545
       "dev": true
551
       "dev": true
546
     },
552
     },
553
+    "eruda": {
554
+      "version": "3.0.1",
555
+      "resolved": "https://registry.npmmirror.com/eruda/-/eruda-3.0.1.tgz",
556
+      "integrity": "sha512-6q1Xdwga4JTr1mKSW4mzuWSSbmXgqpm/8Wa1QGFGfCWRjC0bCQjbS4u06M1te1moucIS3hBLlbSTPWYH2W0qbQ=="
557
+    },
547
     "fs.realpath": {
558
     "fs.realpath": {
548
       "version": "1.0.0",
559
       "version": "1.0.0",
549
       "resolved": "https://registry.npmmirror.com/fs.realpath/download/fs.realpath-1.0.0.tgz",
560
       "resolved": "https://registry.npmmirror.com/fs.realpath/download/fs.realpath-1.0.0.tgz",

+ 1 - 0
package.json

@@ -15,6 +15,7 @@
15
   "license": "ISC",
15
   "license": "ISC",
16
   "dependencies": {
16
   "dependencies": {
17
     "crypto-js": "^4.1.1",
17
     "crypto-js": "^4.1.1",
18
+    "eruda": "^3.0.1",
18
     "spinkit": "^2.0.1",
19
     "spinkit": "^2.0.1",
19
     "vconsole": "^3.14.7",
20
     "vconsole": "^3.14.7",
20
     "weixin-jsapi": "^1.1.0"
21
     "weixin-jsapi": "^1.1.0"

+ 2 - 1
pages/receiptpage/receiptpage.vue

@@ -242,7 +242,8 @@
242
             </view>
242
             </view>
243
             <view v-else-if="item.taskType.associationType.value == 'other'">
243
             <view v-else-if="item.taskType.associationType.value == 'other'">
244
               <!-- 待到达 -->
244
               <!-- 待到达 -->
245
-              <text class="red" v-if="item.gdState.value == 4">可通过扫描科室码或者拍照进行签到</text>
245
+              <text class="red" v-if="item.gdState.value == 4 && item.taskType.carryingCourses[0].checkoutMethod.value == 1">可通过扫描科室码或者拍照进行签到</text>
246
+              <text class="red" v-if="item.gdState.value == 4 && item.taskType.carryingCourses[0].checkoutMethod.value == 2">扫描交接人员二维码进行交接</text>
246
             </view>
247
             </view>
247
             <!-- 如果不是患者陪检或患者转运或其他,万能交接 -->
248
             <!-- 如果不是患者陪检或患者转运或其他,万能交接 -->
248
             <view class="page_item_btn" v-if="
249
             <view class="page_item_btn" v-if="