seimin 1 kuukausi sitten
vanhempi
commit
5951e0ac6e

+ 5 - 1
pages/patientInformationInfo/patientInformationInfo.vue

@@ -33,7 +33,7 @@
33 33
           </view>
34 34
         </view>
35 35
         <view class="page_item_info" :class="{mt0: i === 0}" v-for="(item, i) in inspects" :key="item.id">
36
-          <view class="page_item_info_title">检查项目:<text>{{ item.inspectName }}</text></view>
36
+          <view class="page_item_info_title">检查项目:<text class="bold">{{ item.inspectName }}</text></view>
37 37
           <view class="page_item_info_title">检查科室:<text>{{ item.execDept ? item.execDept.dept : "" }}</text></view>
38 38
           <view class="page_item_info_title btn row">
39 39
             <view>预约时间:<text>{{ item.yyTime | filterSecondDate }}</text><text v-if="item.reservationNumber">({{ item.reservationNumber }})</text></view>
@@ -496,6 +496,10 @@
496 496
 						&.red {
497 497
 							color: red;
498 498
 						}
499
+            
500
+            &.bold{
501
+              font-weight: 700;
502
+            }
499 503
 					}
500 504
 				}
501 505
 			}

+ 2 - 2
pages/receiptpage/receiptpage.vue

@@ -294,7 +294,7 @@
294 294
                 item.taskType.associationType.value != 'specimenPlan' &&
295 295
                 item.taskType.associationType.value != 'ordinary'
296 296
               ">
297
-              <view v-if="(hideInspectScan != 1 || (hideInspectScan == 1 && item.gdState.value == 4)) && !(item.taskType.associationType.value == 'other' && (item.gdState.value == 4 && item.taskType.carryingCourses[0].actionsSwitch || item.gdState.value == 5 && item.taskType.carryingCourses[1].actionsSwitch))" class="page_item_btn" hover-class="seimin-btn-hover">
297
+              <view v-if="(hideInspectScan != 1 || !(hideInspectScan == 1 && item.gdState.value != 4 && (item.taskType.associationType.value == 'patientTransport' || item.taskType.associationType.value == 'inspect'))) && !(item.taskType.associationType.value == 'other' && (item.gdState.value == 4 && item.taskType.carryingCourses[0].actionsSwitch || item.gdState.value == 5 && item.taskType.carryingCourses[1].actionsSwitch))" class="page_item_btn" hover-class="seimin-btn-hover">
298 298
                 <smallScreen :sData="item" :sType="1">扫码</smallScreen>
299 299
               </view>
300 300
               <!-- 其他临床服务-完成工单-待到达 -->
@@ -303,7 +303,7 @@
303 303
               <view v-if="item.taskType.associationType.value == 'other' && item.gdState.value == 5 && item.taskType.carryingCourses[1].actionsSwitch" class="page_item_btn" @click="otherCompleteOrder(item)" hover-class="seimin-btn-hover">完成工单</view>
304 304
               <!-- 其他临床服务-拍照 -->
305 305
               <view v-if="item.taskType.associationType.value == 'other' && item.gdState.value == 4 && item.taskType.carryingCourses[0].photoSwitch" class="page_item_btn" @click="photographToOther(item, 'start')" hover-class="seimin-btn-hover">拍照</view>
306
-              <view v-if="item.taskType.associationType.value != 'other' && item.gdState.value == 4" class="page_item_btn" @click="photograph(item)" hover-class="seimin-btn-hover">拍照</view>
306
+              <view v-if="(hideInspectScan != 1 || !(hideInspectScan == 1 && item.gdState.value != 4 && (item.taskType.associationType.value == 'patientTransport' || item.taskType.associationType.value == 'inspect'))) && item.taskType.associationType.value != 'other' && item.gdState.value == 4" class="page_item_btn" @click="photograph(item)" hover-class="seimin-btn-hover">拍照</view>
307 307
               <!-- 其他临床服务-追加 -->
308 308
               <view v-if="item.taskType.associationType.value == 'other' && item.worker && item.worker.id && clinicalMultiplayerMode === 1 && showAppendUser === 1 && item.clinicalTaskIdsFlag && !item.copyBy" class="page_item_btn" @click="additionalUser(item)" hover-class="seimin-btn-hover">追加</view>
309 309
             </view>