seimin преди 1 ден
родител
ревизия
4277414d1f
променени са 2 файла, в които са добавени 46 реда и са изтрити 14 реда
  1. 11 11
      pages/patientInformationList/patientInformationList.vue
  2. 35 3
      pages/patientInspectLog/patientInspectLogList.vue

+ 11 - 11
pages/patientInformationList/patientInformationList.vue

@@ -21,7 +21,7 @@
21 21
           <view class="page_item">
22 22
             <view class="page_item_top">
23 23
               <view class="page_item_top_L">
24
-                <text class="circleRed" v-if="item.tripTypeDTO"></text>{{ item.patientName }}({{ item.residenceNo }})({{ item.bedNum }})
24
+                <text class="circleRed" v-if="!item.tripTypeDTO"></text>{{ item.patientName }}({{ item.residenceNo }})({{ item.bedNum }})
25 25
               </view>
26 26
               <view class="send_wrap">
27 27
                 <template v-if="item.gender || item.age !== undefined">
@@ -44,14 +44,14 @@
44 44
                     <text class="p_info">{{ item.watingCount }}</text>
45 45
                   </view>
46 46
                 </view>
47
-                
47
+
48 48
                 <view class="page_item_conts_item">
49 49
                   <view class="column">
50 50
                     <text class="p_title">陪检方式:</text>
51 51
                     <text class="p_info">{{ item.tripTypeDTO ? item.tripTypeDTO.inspectMode : '' }}</text>
52 52
                   </view>
53 53
                 </view>
54
-                
54
+
55 55
                 <view class="page_item_conts_item">
56 56
                   <view class="column">
57 57
                     <text class="p_title">注意事项:</text>
@@ -566,13 +566,13 @@
566 566
     box-sizing: border-box;
567 567
     border-radius: 4rpx;
568 568
     background-color: #E5E8ED;
569
-  
569
+
570 570
     .toolbar-icon {
571 571
       font-size: 52rpx;
572 572
       margin-right: 16rpx;
573 573
       color: #49B856;
574 574
     }
575
-  
575
+
576 576
     .toolbar-sao {
577 577
       font-size: 36rpx;
578 578
       color: #333;
@@ -745,7 +745,7 @@
745 745
                 line-height: 88rpx;
746 746
                 font-size: 30rpx;
747 747
                 font-weight: bold;
748
-                
748
+
749 749
                 .circleRed{
750 750
                   position: relative;
751 751
                   margin-right: 8rpx;
@@ -789,22 +789,22 @@
789 789
                     margin-top: 16rpx;
790 790
                   }
791 791
                 }
792
-                
792
+
793 793
                 .p_info {
794 794
                   flex: 1;
795
-                
795
+
796 796
                   &.red {
797 797
                     color: red;
798 798
                   }
799
-                
799
+
800 800
                 }
801
-                
801
+
802 802
                 .num {
803 803
                   float: right;
804 804
                 }
805 805
               }
806 806
             }
807
-            
807
+
808 808
             .page_item_btns{
809 809
               display: flex;
810 810
               justify-content: space-between;

+ 35 - 3
pages/patientInspectLog/patientInspectLogList.vue

@@ -12,7 +12,7 @@
12 12
       <view class="body_item" v-for="data in dataInfo.list" :key="data.id" @click="toDetail(data)">
13 13
         <view class="body_item_head" @click.stop="changeCheckbox(data)">
14 14
           <view class="patientName">
15
-            <checkbox-group v-if="data.state.value === '4'">
15
+            <checkbox-group v-if="config.batchPatientBackDept == 1 && data.state.value === '4'">
16 16
               <label>
17 17
                 <checkbox class="checkbox" :checked="data.checked" />
18 18
               </label>
@@ -50,7 +50,7 @@
50 50
       <text class="newicon newicon-zanwu"></text>
51 51
     </view>
52 52
     <view class="toolbar">
53
-      <button @click="tagClickList()" type="default" class="primaryButton btn">批量回科</button>
53
+      <button @click="tagClickList()" type="default" class="primaryButton btn" v-if="config.batchPatientBackDept == 1">批量回科</button>
54 54
       <view class="toolbar-btn btn" @click="scan()">
55 55
         <text class="toolbar-icon newicon newicon-saoma"></text>
56 56
         <text class="toolbar-sao">扫一扫</text>
@@ -76,6 +76,7 @@
76 76
     },
77 77
     data(){
78 78
       return {
79
+        config: {},
79 80
         selectData: {},
80 81
         SMFlag: true,
81 82
         loginUser: uni.getStorageSync('userData').user,
@@ -107,7 +108,7 @@
107 108
     methods: {
108 109
       // 多选框
109 110
       changeCheckbox(data){
110
-        if(data.state.value === '4'){
111
+        if(this.config.batchPatientBackDept == 1 && data.state.value === '4'){
111 112
           this.$set(data, 'checked', !data.checked);
112 113
         }
113 114
       },
@@ -299,6 +300,36 @@
299 300
           });
300 301
         }
301 302
       },
303
+      getConfig1(){
304
+        const postData = {
305
+          "idx":0,
306
+          "sum":1,
307
+          "taskTypeConfig":{
308
+            "taskTypeDTO":{
309
+              "hosId": {"id": this.hosId},
310
+              "associationType": {
311
+                "key": "association_types",
312
+                "value":"inspect",
313
+              },
314
+            },
315
+          },
316
+        };
317
+        post("/simple/data/fetchDataList/taskTypeConfig", postData).then((res) => {
318
+          if (res.status == 200) {
319
+            let list = res.list || [];
320
+            if(list.length){
321
+              this.config = res.list[0];
322
+            }else{
323
+              this.config = {};
324
+            }
325
+          } else {
326
+            uni.showToast({
327
+              icon: "none",
328
+              title: res.msg || "接口获取数据失败!",
329
+            });
330
+          }
331
+        })
332
+      },
302 333
       // 标记回科
303 334
       tagClick(data){
304 335
         this.selectData = data;
@@ -379,6 +410,7 @@
379 410
       },
380 411
     },
381 412
     onLoad(options){
413
+      this.getConfig1();
382 414
       this.onLoadFn(uni.getStorageSync('patientInspectLogEvtFilter') && uni.getStorageSync('patientInspectLogTabActiveId'));
383 415
     },
384 416
     onTabItemTap(){