Browse Source

半程陪检

seimin 3 years ago
parent
commit
e99058887c

+ 10 - 5
.hbuilderx/launch.json

@@ -2,10 +2,15 @@
2
   // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
2
   // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
3
     "version": "0.0",
3
     "version": "0.0",
4
     "configurations": [{
4
     "configurations": [{
5
-            "type": "uniCloud",
6
-            "default": {
7
-                "launchtype": "remote"
8
-            }
9
-        }
5
+     	"app-plus" : 
6
+     	{
7
+     		"launchtype" : "remote"
8
+     	},
9
+     	"default" : 
10
+     	{
11
+     		"launchtype" : "remote"
12
+     	},
13
+     	"type" : "uniCloud"
14
+     }
10
     ]
15
     ]
11
 }
16
 }

+ 22 - 8
pages/receipt_infopage/receipt_infopage.vue

@@ -25,14 +25,16 @@
25
           </view>
25
           </view>
26
         </view>
26
         </view>
27
         <view class="page_item_top_R">
27
         <view class="page_item_top_R">
28
-          <!-- <text class="L_iocn">{{infoDATA.taskType.associationType.name}}</text> -->
29
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'specimen'">标本</text>
30
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'specimenPlan'">标本</text>
31
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'drugsBag'">药品</text>
32
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'jPBag'">静配</text>
33
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'inspect'">患者陪检</text>
34
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'patientTransport'">患者转运</text>
35
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'other'">其他</text>
28
+          <text class="L_iocn" v-if="
29
+              !(
30
+                infoDATA.gdState.value == 5 &&
31
+                infoDATA.taskType.associationType.value == 'inspect'
32
+              )
33
+            ">{{ infoDATA.gdState.name }}</text>
34
+          <text class="L_iocn" v-if="
35
+              infoDATA.gdState.value == 5 &&
36
+              infoDATA.taskType.associationType.value == 'inspect'
37
+            ">待送回</text>
36
         </view>
38
         </view>
37
 
39
 
38
         <view class="L"></view>
40
         <view class="L"></view>
@@ -92,6 +94,18 @@
92
             ">待送回</text>
94
             ">待送回</text>
93
         </view>
95
         </view>
94
         <view class="page_item_foot_text">
96
         <view class="page_item_foot_text">
97
+          <text class="text1">关联类型</text>
98
+          <text class="text2">{{ infoDATA.taskType.associationType.name }}</text>
99
+        </view>
100
+        <view class="page_item_foot_text">
101
+          <text class="text1">任务类型</text>
102
+          <text class="text2">{{ infoDATA.taskType.taskName }}</text>
103
+        </view>
104
+        <view class="page_item_foot_text">
105
+          <text class="text1">是否半程陪检</text>
106
+          <text class="text2">{{ infoDATA.taskType.isHalfInspect===1?'是':'否' }}</text>
107
+        </view>
108
+        <view class="page_item_foot_text">
95
           <text class="text1">执行人员</text>
109
           <text class="text1">执行人员</text>
96
           <text class="text2">{{ infoDATA.worker?infoDATA.worker.name:'-' }}</text>
110
           <text class="text2">{{ infoDATA.worker?infoDATA.worker.name:'-' }}</text>
97
         </view>
111
         </view>

+ 1 - 1
pages/receiptpage/receiptpage.vue

@@ -48,7 +48,7 @@
48
                 <!-- 待取货 -->
48
                 <!-- 待取货 -->
49
               </view>
49
               </view>
50
               <view class="page_item_top_R type">
50
               <view class="page_item_top_R type">
51
-                {{item.taskType.taskName}}
51
+                {{item.taskType.isHalfInspect===1?'半程陪检':item.taskType.taskName}}
52
               </view>
52
               </view>
53
             </view>
53
             </view>
54
             <view class="page_item_cont" @click="itemInfo(item.id)">
54
             <view class="page_item_cont" @click="itemInfo(item.id)">

+ 16 - 7
pages/scanning_code/scanning_code.vue

@@ -88,13 +88,10 @@
88
           </view>
88
           </view>
89
         </view>
89
         </view>
90
         <view class="page_item_top_R">
90
         <view class="page_item_top_R">
91
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'specimen'">标本</text>
92
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'specimenPlan'">标本</text>
93
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'drugsBag'">药品</text>
94
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'jPBag'">静配</text>
95
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'inspect'">患者陪检</text>
96
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'patientTransport'">患者转运</text>
97
-          <text class="L_iocn" v-if="infoDATA.taskType.associationType.value == 'other'">其他配送</text>
91
+          <text class="L_iocn"
92
+            v-if="!(infoDATA.gdState.value == '5'&&infoDATA.taskType.associationType.value == 'inspect')">{{ infoDATA.gdState.name }}</text>
93
+          <text class="L_iocn"
94
+            v-if="infoDATA.gdState.value == '5'&&infoDATA.taskType.associationType.value == 'inspect'">待送回</text>
98
         </view>
95
         </view>
99
 
96
 
100
         <view class="L"></view>
97
         <view class="L"></view>
@@ -131,6 +128,18 @@
131
           <text class="text2"
128
           <text class="text2"
132
             v-if="infoDATA.gdState.value == '5'&&infoDATA.taskType.associationType.value == 'inspect'">待送回</text>
129
             v-if="infoDATA.gdState.value == '5'&&infoDATA.taskType.associationType.value == 'inspect'">待送回</text>
133
         </view>
130
         </view>
131
+        <view class="page_item_foot_text">
132
+          <text class="text1">关联类型</text>
133
+          <text class="text2">{{ infoDATA.taskType.associationType.name }}</text>
134
+        </view>
135
+        <view class="page_item_foot_text">
136
+          <text class="text1">任务类型</text>
137
+          <text class="text2">{{ infoDATA.taskType.taskName }}</text>
138
+        </view>
139
+        <view class="page_item_foot_text">
140
+          <text class="text1">是否半程陪检</text>
141
+          <text class="text2">{{ infoDATA.taskType.isHalfInspect===1?'是':'否' }}</text>
142
+        </view>
134
         <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '2'">
143
         <view class="page_item_foot_text" v-if="infoDATA.gdState.value == '2'">
135
           <text class="text1">预计响应时间</text>
144
           <text class="text1">预计响应时间</text>
136
           <text class="text2">{{ infoDATA.estimeResponseTime || 0 }}</text>
145
           <text class="text2">{{ infoDATA.estimeResponseTime || 0 }}</text>