Browse Source

工单列表的患者其他服务增加预约时间,工单详情增加预约时间

seimin 2 years ago
parent
commit
90f5ca2d9f
3 changed files with 24 additions and 10 deletions
  1. 1 1
      main.js
  2. 5 0
      pages/receipt_infopage/receipt_infopage.vue
  3. 18 9
      pages/receiptpage/receiptpage.vue

+ 1 - 1
main.js

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

+ 5 - 0
pages/receipt_infopage/receipt_infopage.vue

@@ -127,6 +127,11 @@
127
           <text class="text1">创建时间</text>
127
           <text class="text1">创建时间</text>
128
           <text class="text2">{{ infoDATA.startTime }}</text>
128
           <text class="text2">{{ infoDATA.startTime }}</text>
129
         </view>
129
         </view>
130
+        <view class="page_item_foot_text">
131
+          <text class="text1">预约时间</text>
132
+          <text class="text2" v-if="infoDATA.taskType.associationType.value == 'inspect'">{{ infoDATA.yyTime }}</text>
133
+          <text class="text2" v-if="infoDATA.taskType.associationType.value == 'patientTransport'">{{ infoDATA.yyjdTime }}</text>
134
+        </view>
130
         <view class="page_item_foot_text" v-if="
135
         <view class="page_item_foot_text" v-if="
131
             infoDATA.taskType.associationType.value == 'inspect' ||
136
             infoDATA.taskType.associationType.value == 'inspect' ||
132
             infoDATA.taskType.associationType.value == 'patientTransport'
137
             infoDATA.taskType.associationType.value == 'patientTransport'

+ 18 - 9
pages/receiptpage/receiptpage.vue

@@ -121,6 +121,10 @@
121
               </view>
121
               </view>
122
               <view class="page_item_conts" v-if="item.taskType.associationType.value == 'patientTransport'">
122
               <view class="page_item_conts" v-if="item.taskType.associationType.value == 'patientTransport'">
123
                 <view>
123
                 <view>
124
+                  预约时间 : {{ item.yyjdTime | yyTimeFilter
125
+                  }}<text v-if="item.reservationNumber">({{ item.reservationNumber }})</text>
126
+                </view>
127
+                <view>
124
                   床号 : {{ item.patient ? item.patient.patientName : "-" }}({{
128
                   床号 : {{ item.patient ? item.patient.patientName : "-" }}({{
125
                     item.patient ? item.patient.bedNum : "-"
129
                     item.patient ? item.patient.bedNum : "-"
126
                   }})
130
                   }})
@@ -341,15 +345,20 @@
341
       // 自定义管道 yyTime
345
       // 自定义管道 yyTime
342
       yyTimeFilter: function(data) {
346
       yyTimeFilter: function(data) {
343
         if (data) {
347
         if (data) {
344
-          let arr = data.split(/[-:\s]/);
345
-          const nDate = new Date(
346
-            arr[0] - 0,
347
-            arr[1] - 1,
348
-            arr[2] - 0,
349
-            arr[3] - 0,
350
-            arr[4] - 0,
351
-            0
352
-          );
348
+          let nDate = null;
349
+          if(typeof data == 'string'){
350
+            let arr = data.split(/[-:\s]/);
351
+            nDate = new Date(
352
+              arr[0] - 0,
353
+              arr[1] - 1,
354
+              arr[2] - 0,
355
+              arr[3] - 0,
356
+              arr[4] - 0,
357
+              0
358
+            );
359
+          }else if(typeof data == 'number'){
360
+            nDate = new Date(data);
361
+          }
353
           const month = (nDate.getMonth() + 1).toString().padStart(2, 0);
362
           const month = (nDate.getMonth() + 1).toString().padStart(2, 0);
354
           const date = nDate.getDate().toString().padStart(2, 0);
363
           const date = nDate.getDate().toString().padStart(2, 0);
355
           const hour = nDate.getHours().toString().padStart(2, 0);
364
           const hour = nDate.getHours().toString().padStart(2, 0);