Browse Source

Merge branch 'master' of http://git.dashitech.com/seimin/zy-wechat

maotao 3 months ago
parent
commit
ec277beffa

+ 1 - 1
pages/receipt_infopage/receipt_infopage.vue

@@ -155,7 +155,7 @@
155 155
         </view>
156 156
         <view class="page_item_info" style="padding: 0;" v-if="infoDATA.workOrderRemark !== undefined">
157 157
           <view class="page_item_foot_text">
158
-            <view class="text1" v-if="infoDATA.taskType.associationType.value == 'inspect' || infoDATA.taskType.associationType.value == 'patientTransport'">备注信息</view>
158
+            <view class="text1" v-if="infoDATA.taskType.associationType.value == 'inspect' || infoDATA.taskType.associationType.value == 'patientTransport'">注意事项</view>
159 159
             <view class="text1" v-else>工单备注</view>
160 160
             <view class="text2" style="float: none;word-break: break-all;">{{ infoDATA.workOrderRemark }}</view>
161 161
           </view>

+ 3 - 3
pages/receiptpage/receiptpage.vue

@@ -129,8 +129,8 @@
129 129
                   <text>{{ item.goods || "暂无" }}</text>
130 130
                 </view>
131 131
                 <view style="word-break: break-all;" v-if="item.workOrderRemark">
132
-                  备注信息 :
133
-                  <text>{{ item.workOrderRemark || "s" }}</text>
132
+                  注意事项 :
133
+                  <text>{{ item.workOrderRemark || "" }}</text>
134 134
                 </view>
135 135
                 <view v-if="item.patient.careLevel">
136 136
                   护理等级 :
@@ -173,7 +173,7 @@
173 173
                   <text>{{ item.goods || "暂无" }}</text>
174 174
                 </view>
175 175
                 <view style="word-break: break-all;" v-if="item.workOrderRemark">
176
-                  备注信息 :
176
+                  注意事项 :
177 177
                   <text>{{ item.workOrderRemark || "暂无" }}</text>
178 178
                 </view>
179 179
                 <view v-if="item.patient.careLevel">

+ 2 - 3
pages/scanning_ins/scanning_ins.vue

@@ -29,9 +29,8 @@
29 29
           </view>
30 30
           <view v-if="infoDATA.residenceNo">住院号 : {{ infoDATA.residenceNo || "-" }}</view>
31 31
 					<view v-if="!infoDATA.residenceNo">身份证号 : {{ infoDATA.identityCardNo || "-" }}</view>
32
-          <view v-if="infoDATA.residenceNo">住院科室 :
33
-            {{ infoDATA.department ? infoDATA.department.dept : "-" }}
34
-          </view>
32
+          <view v-if="infoDATA.residenceNo">住院科室 : {{ infoDATA.department ? infoDATA.department.dept : "-" }}</view>
33
+          <view>注意事项 : {{ infoDATA.remark || "-" }}</view>
35 34
         </view>
36 35
       </view>
37 36
       <!-- ------------------未完成工单 start----------------- -->