seimin hace 2 años
padre
commit
2fdd726787
Se han modificado 2 ficheros con 51 adiciones y 14 borrados
  1. 10 2
      pages/index/index.vue
  2. 41 12
      pages/orderDetail/orderDetail.vue

+ 10 - 2
pages/index/index.vue

@@ -41,7 +41,7 @@
41 41
           <text class="newOrders_header_title">最新工单</text>
42 42
           <text class="newOrders_header_more" @click="goToMore">更多&gt;&gt;</text>
43 43
         </view>
44
-        <view class="newOrders_item" v-for="newOrder in newOrderList" :key="newOrder.id">
44
+        <view class="newOrders_item" v-for="newOrder in newOrderList" :key="newOrder.id" @click="toDetail(newOrder.id)">
45 45
           <image class="ji" src="../../static/imgs/icon_ji.png" mode="widthFix"
46 46
             v-if="newOrder.emergencyType && newOrder.emergencyType.value == 2"></image>
47 47
           <image class="jiaji" src="../../static/imgs/icon_jiaji.png" mode="widthFix"
@@ -135,6 +135,12 @@
135 135
         "changeSearchDeptParams",
136 136
       ]),
137 137
       ...mapActions('system', ["vxSystem"]),
138
+      // 前往工单详情
139
+      toDetail(id) {
140
+        uni.navigateTo({
141
+          url: `/pages/orderDetail/orderDetail?id=${id}`
142
+        })
143
+      },
138 144
       // 跳转到工单列表页面
139 145
       goToMore() {
140 146
         uni.navigateTo({
@@ -691,7 +697,9 @@
691 697
             @include clamp(1);
692 698
           }
693 699
 
694
-          .newOrders_item_status {}
700
+          .newOrders_item_status {
701
+            width: 4em;
702
+          }
695 703
         }
696 704
       }
697 705
 

+ 41 - 12
pages/orderDetail/orderDetail.vue

@@ -10,7 +10,7 @@
10 10
     <!-- tab -->
11 11
     <!-- 工单信息 -->
12 12
     <view class="orderDetail_info" v-show="selectedTab === 1">
13
-      <view class="orderDetail_infoItem" v-if="orderInfo.id">
13
+      <scroll-view scroll-y class="orderDetail_infoItem" v-if="orderInfo.id">
14 14
         <view class="orderDetail_infoItem_header">
15 15
           <view class="orderDetail_infoItem_header_title">
16 16
             <view class="icon"></view>
@@ -69,8 +69,9 @@
69 69
           <view class="orderDetail_infoItem_item_content"
70 70
             v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']||orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者其他服务业务']">
71 71
             <text class="orderDetail_infoItem_item_name">预约时间</text>
72
-            <text
73
-              class="orderDetail_infoItem_item_value">{{orderInfo.yyjdTime?(orderInfo.yyjdTime|formatDate('MM-dd HH:mm')):'暂无'}}</text>
72
+            <text class="orderDetail_infoItem_item_value"
73
+              v-if="orderInfo.yyjdTime">{{orderInfo.yyjdTime|formatDate('MM-dd HH:mm')}}</text>
74
+            <text class="orderDetail_infoItem_item_value" v-else>暂无</text>
74 75
           </view>
75 76
           <view class="orderDetail_infoItem_item_content"
76 77
             v-if="orderInfo.taskType.associationType.value === ASSOCIATION_TYPES['患者陪检业务']">
@@ -113,11 +114,11 @@
113 114
             <text class="orderDetail_infoItem_item_value">{{orderInfo.specialCloseReason||'暂无'}}</text>
114 115
           </view>
115 116
         </view>
116
-      </view>
117
+      </scroll-view>
117 118
     </view>
118 119
     <!-- 流程信息 -->
119 120
     <view class="orderDetail_info" v-show="selectedTab === 2">
120
-      <view class="orderDetail_infoItem" v-if="logList.length">
121
+      <scroll-view scroll-y class="orderDetail_infoItem" v-if="logList.length">
121 122
         <view class="orderDetail_infoItem_header">
122 123
           <view class="orderDetail_infoItem_header_title">
123 124
             <view class="icon"></view>
@@ -147,13 +148,40 @@
147 148
             </view>
148 149
           </view>
149 150
         </view>
150
-      </view>
151
+      </scroll-view>
151 152
     </view>
152 153
     <!-- 业务信息 -->
153 154
     <view class="orderDetail_info" v-show="selectedTab === 3">
154
-      <view class="orderDetail_infoItem">
155
-        业务信息
156
-      </view>
155
+      <scroll-view scroll-y class="orderDetail_infoItem">
156
+        <view class="orderDetail_infoItem_header">
157
+          <view class="orderDetail_infoItem_header_title">
158
+            <view class="icon"></view>
159
+            <view class="taskNameAndWorkerName">
160
+              <text class="taskName">业务信息</text>
161
+            </view>
162
+          </view>
163
+        </view>
164
+        <view class="orderDetail_infoItem_item business business-inspect">
165
+          <view class="inspect_info">
166
+            <view class="inspect_info_block">
167
+              <view class="inspect_info_left">
168
+                张三
169
+              </view>
170
+              <view class="inspect_info_right">
171
+                14床
172
+              </view>
173
+            </view>
174
+            <view class="inspect_info_block">
175
+              <view class="inspect_info_left">
176
+                10086
177
+              </view>
178
+              <view class="inspect_info_right">
179
+                待检6
180
+              </view>
181
+            </view>
182
+          </view>
183
+        </view>
184
+      </scroll-view>
157 185
     </view>
158 186
     <!-- 底部 -->
159 187
     <seiminFooterBtn :btns="btns"></seiminFooterBtn>
@@ -453,13 +481,13 @@
453 481
     }
454 482
 
455 483
     // tab
456
-    // 工单信息
484
+    // 工单详情
457 485
     .orderDetail_info {
458 486
       padding: 108rpx 24rpx 0;
459 487
 
460 488
       .orderDetail_infoItem {
461 489
         width: 702rpx;
462
-        min-height: 320rpx;
490
+        height: calc(100vh - 340rpx);
463 491
         background-color: #fff;
464 492
         margin-top: 8rpx;
465 493
         border-radius: 8rpx;
@@ -526,7 +554,8 @@
526 554
           flex: 1;
527 555
           @include border(bottom);
528 556
           @include flex(flex-start, stretch, column);
529
-          &.process{
557
+
558
+          &.process {
530 559
             padding-top: 90rpx;
531 560
             padding-bottom: 90rpx;
532 561
           }