Explorar o código

增加药包编码

seimin %!s(int64=3) %!d(string=hai) anos
pai
achega
508b63fedc

+ 4 - 4
pages/receipt_infopage/receipt_infopage.vue

@@ -164,8 +164,8 @@
164
       </view>
164
       </view>
165
       <!-- 药包 -->
165
       <!-- 药包 -->
166
       <view class="page_item_info" v-if="infoDATA.taskType.associationType.value == 'drugsBag'">
166
       <view class="page_item_info" v-if="infoDATA.taskType.associationType.value == 'drugsBag'">
167
-        <text class="page_item_info_title">药包信息</text>
167
+        <text class="page_item_info_title">药包编码</text>
168
-        <text class="text">#{{ infoDATA.drugs && infoDATA.drugs.packid }}</text>
168
+        <text class="text">{{ infoDATA.drugs?infoDATA.drugs.packid:'无' }}</text>
169
       </view>
169
       </view>
170
       <!-- 标本 -->
170
       <!-- 标本 -->
171
       <view class="page_item_info" v-if="
171
       <view class="page_item_info" v-if="
@@ -206,8 +206,8 @@
206
       </view>
206
       </view>
207
       <!-- 静配 -->
207
       <!-- 静配 -->
208
       <view class="page_item_info" v-if="infoDATA.taskType.associationType.value == 'jPBag'">
208
       <view class="page_item_info" v-if="infoDATA.taskType.associationType.value == 'jPBag'">
209
-        <text class="page_item_info_title">静配信息</text>
209
+        <text class="page_item_info_title">药包编码</text>
210
-        <text class="text">#{{ infoDATA.staticDistri.packid }}</text>
210
+        <text class="text">{{ infoDATA.staticDistri?infoDATA.staticDistri.packid:'无' }}</text>
211
       </view>
211
       </view>
212
       <!-- 陪检 -->
212
       <!-- 陪检 -->
213
       <view v-if="infoDATA.taskType.associationType.value == 'inspect'">
213
       <view v-if="infoDATA.taskType.associationType.value == 'inspect'">

+ 10 - 12
pages/receiptpage/receiptpage.vue

@@ -50,18 +50,6 @@
50
               <view class="page_item_top_R type">
50
               <view class="page_item_top_R type">
51
                 {{item.taskType.taskName}}
51
                 {{item.taskType.taskName}}
52
               </view>
52
               </view>
53
-              <!-- <view
54
-                class="page_item_top_R type"
55
-                v-if="item.taskType.associationType.value == 'inspect'"
56
-              >
57
-                患者陪检
58
-              </view> -->
59
-              <!-- <view
60
-                class="page_item_top_R type"
61
-                v-if="item.taskType.associationType.value == 'patientTransport'"
62
-              >
63
-                转科
64
-              </view> -->
65
             </view>
53
             </view>
66
             <view class="page_item_cont" @click="itemInfo(item.id)">
54
             <view class="page_item_cont" @click="itemInfo(item.id)">
67
               <view class="page_item_cont_T">
55
               <view class="page_item_cont_T">
@@ -139,6 +127,16 @@
139
                   <text :class="{red:item.isAccompany===1}">{{ item.isAccompany===1?'需要医护陪同':'无需医护陪同'}}</text>
127
                   <text :class="{red:item.isAccompany===1}">{{ item.isAccompany===1?'需要医护陪同':'无需医护陪同'}}</text>
140
                 </view>
128
                 </view>
141
               </view>
129
               </view>
130
+              <view class="page_item_conts" v-if="item.taskType.associationType.value == 'drugsBag'">
131
+                <view>
132
+                  药包编码 : {{ item.drugs?item.drugs.packid:'无'}}
133
+                </view>
134
+              </view>
135
+              <view class="page_item_conts" v-if="item.taskType.associationType.value == 'jPBag'">
136
+                <view>
137
+                  药包编码 : {{ item.staticDistri?item.staticDistri.packid:'无'}}
138
+                </view>
139
+              </view>
142
               <view class="line"></view>
140
               <view class="line"></view>
143
               <view class="page_item_cont_B">
141
               <view class="page_item_cont_B">
144
                 <view class="page_item_cont_title" v-if="item.taskType.associationType.value != 'inspect'">
142
                 <view class="page_item_cont_title" v-if="item.taskType.associationType.value != 'inspect'">