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

pages/receipt_infopage/receipt_infopage.vue

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

pages/receiptpage/receiptpage.vue

@@ -129,8 +129,8 @@
                   <text>{{ item.goods || "暂无" }}</text>
                 </view>
                 <view style="word-break: break-all;" v-if="item.workOrderRemark">
-                  备注信息 :
-                  <text>{{ item.workOrderRemark || "s" }}</text>
+                  注意事项 :
+                  <text>{{ item.workOrderRemark || "" }}</text>
                 </view>
                 <view v-if="item.patient.careLevel">
                   护理等级 :
@@ -173,7 +173,7 @@
                   <text>{{ item.goods || "暂无" }}</text>
                 </view>
                 <view style="word-break: break-all;" v-if="item.workOrderRemark">
-                  备注信息 :
+                  注意事项 :
                   <text>{{ item.workOrderRemark || "暂无" }}</text>
                 </view>
                 <view v-if="item.patient.careLevel">

pages/scanning_ins/scanning_ins.vue

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