患者陪检和患者其他服务增加备注信息

main.js

@@ -4,7 +4,7 @@ import App from './App'
 import wx from 'weixin-jsapi'
 // import VConsole from 'vconsole';
 // new VConsole();
-console.info('v2.4.25');
+console.info('v2.4.26');
 Vue.prototype.wx = wx //声明扫码
 Vue.prototype.audios = [] //待播放的语音集合
 // #endif

pages/receipt_infopage/receipt_infopage.vue

@@ -142,12 +142,6 @@
             infoDATA.patient ? infoDATA.patient.bedNum : "-"
           }}</text>
         </view>
-        <view class="page_item_info" style="padding: 0;" v-if="infoDATA.workOrderRemark !== undefined">
-          <view class="page_item_foot_text">
-            <view class="text1">工单备注</view>
-            <view class="text2" style="float: none;word-break: break-all;">{{ infoDATA.workOrderRemark }}</view>
-          </view>
-        </view>
         <view class="page_item_foot_text" v-if="
             infoDATA.taskType.associationType.value == 'inspect' ||
             infoDATA.taskType.associationType.value == 'patientTransport'
@@ -155,6 +149,13 @@
           <text class="text1">携带设备</text>
           <text class="text2">{{ infoDATA.goods || "暂无" }}</text>
         </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-else>工单备注</view>
+            <view class="text2" style="float: none;word-break: break-all;">{{ infoDATA.workOrderRemark }}</view>
+          </view>
+        </view>
         <view class="page_item_foot_text" v-if="
             infoDATA.taskType.associationType.value == 'inspect' ||
             infoDATA.taskType.associationType.value == 'patientTransport'

pages/receiptpage/receiptpage.vue

@@ -120,10 +120,14 @@
                     item.patient ? item.patient.bedNum : "-"
                   }})
                 </view>
-                <view>
+                <view v-if="item.goods">
                   携带设备 :
                   <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">
                   护理等级 :
                   <text :class="[
@@ -160,10 +164,14 @@
                     item.patient ? item.patient.bedNum : "-"
                   }})
                 </view>
-                <view>
+                <view v-if="item.goods">
                   携带设备 :
                   <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">
                   护理等级 :
                   <text :class="[