See999 4 years ago
parent
commit
9bc87e0aa4

+ 12 - 0
src/styles/index.scss View File

@@ -547,3 +547,15 @@ code {
547 547
   background-color: #409eff !important;
548 548
   color: #fff !important;
549 549
 }
550
+.el-table__body td > div:hover{
551
+  background-color: #409eff !important;
552
+  color: #fff !important;
553
+}
554
+.el-table__body div > span:hover{
555
+  background-color: #409eff !important;
556
+  color: #fff !important;
557
+}
558
+.el-table__body div > a:hover{
559
+  background-color: #409eff !important;
560
+  color: #fff !important;
561
+}

+ 10 - 9
src/xt_pages/dialysis/batch_print/batch_print_order_nine.vue View File

@@ -891,7 +891,7 @@
891 891
                               <div class="under-line">
892 892
                                 &nbsp;
893 893
                                 <span
894
-                                  v-if="record.prescription.anticoagulant == 3"
894
+                                  v-if="record.prescription.anticoagulant == 3 || record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7"
895 895
                                   >{{
896 896
                                     record.prescription.anticoagulant_zongliang
897 897
                                   }}</span
@@ -940,7 +940,7 @@
940 940
                             <td width="40">
941 941
                               <div class="under-line">
942 942
                                 &nbsp;
943
-                                <span>{{
943
+                                <span v-if="record.prescription.anticoagulant == 2">{{
944 944
                                   record.prescription.anticoagulant_shouji
945 945
                                 }}</span>
946 946
                               </div>
@@ -976,11 +976,12 @@
976 976
                             <td width="40">
977 977
                               <div class="under-line">
978 978
                                 &nbsp;
979
+                                <span v-if="record.prescription.anticoagulant == 2">
979 980
                                 {{
980 981
                                   record.prescription.anticoagulant_weichi
981 982
                                     ? record.prescription.anticoagulant_weichi
982 983
                                     : "/"
983
-                                }}
984
+                                }}</span>
984 985
                               </div>
985 986
                             </td>
986 987
                             <td width="40">
@@ -1017,12 +1018,12 @@
1017 1018
                             <td width="35">总量:</td>
1018 1019
                             <td width="40">
1019 1020
                               <div class="under-line">
1020
-                                &nbsp;{{
1021
+                                &nbsp;<span v-if="record.prescription.anticoagulant == 2">{{
1021 1022
                                   record.prescription.anticoagulant_zongliang
1022 1023
                                     ? record.prescription
1023 1024
                                         .anticoagulant_zongliang
1024 1025
                                     : "/"
1025
-                                }}
1026
+                                }}</span>
1026 1027
                               </div>
1027 1028
                             </td>
1028 1029
                             <td width="20">
@@ -1354,7 +1355,7 @@
1354 1355
                         alt=""
1355 1356
                         srcset=""
1356 1357
                         v-else
1357
-                        style="height: 20px;"
1358
+                        style="height: 30px;"
1358 1359
                       />
1359 1360
                     </td>
1360 1361
                     <!-- <td height="35px">
@@ -1374,7 +1375,7 @@
1374 1375
                         alt=""
1375 1376
                         srcset=""
1376 1377
                         v-else
1377
-                        style="height: 20px;"
1378
+                        style="height: 30px;"
1378 1379
                       />
1379 1380
                     </td>
1380 1381
                     <td height="32px">
@@ -1983,7 +1984,7 @@
1983 1984
                         }}</span>
1984 1985
                         <span v-if="record.advices[0][0] !== ''">
1985 1986
                           <img
1986
-                            style="height:20px"
1987
+                            style="height:30px"
1987 1988
                             :src="
1988 1989
                               setAdminUserES(
1989 1990
                                 record.advices[0][0],
@@ -2023,7 +2024,7 @@
2023 2024
                           alt=""
2024 2025
                           srcset=""
2025 2026
                           v-else
2026
-                          style="height: 20px;"
2027
+                          style="height: 30px;"
2027 2028
                         />
2028 2029
                       </div>
2029 2030
                     </td>

+ 1 - 1
src/xt_pages/dialysis/bloodPresssWatch.vue View File

@@ -272,7 +272,7 @@
272 272
         ></el-table-column>
273 273
         <el-table-column prop="name" label="姓名" align="center">
274 274
           <template slot-scope="scope">
275
-            <span style="color: #579ef8">{{ scope.row.name }}</span>
275
+            <span style="color: #579ef8;width:100%;display:block;">{{ scope.row.name }}</span>
276 276
           </template>
277 277
         </el-table-column>
278 278
 

+ 32 - 7
src/xt_pages/dialysis/dialysisPrintOrder.vue View File

@@ -1199,7 +1199,7 @@ export default {
1199 1199
       );
1200 1200
     },
1201 1201
     //日期
1202
-        handleScheduleDateChange: function() {
1202
+        handleScheduleDateChange: function(index) {
1203 1203
             this.treatStateVal = 0
1204 1204
             this.patientStateVal = 0
1205 1205
             this.zoneVal = 0
@@ -1210,6 +1210,8 @@ export default {
1210 1210
             //   schedule_type: this.schedule_type_selected,
1211 1211
             //   schedule_date: this.selected_date,
1212 1212
             // })
1213
+            this.selected_date = index
1214
+            this.$store.dispatch('SetSelectedDate', { selected_date: index })
1213 1215
             this.requestDialysisSchedules()
1214 1216
         },
1215 1217
         //初始化数据
@@ -1225,9 +1227,10 @@ export default {
1225 1227
                     zone_options.push({ id: zone.id, text: zone.name })
1226 1228
                 }
1227 1229
                 this.zone_options = zone_options
1228
-                this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
1230
+                // this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
1229 1231
                 this.arr = this.processedDialysisSchedules(schedules, this.zone_options)
1230
-                this.getData()
1232
+                this.requestDialysisSchedules()
1233
+                // this.getData()
1231 1234
                 } else {
1232 1235
                 this.$message.error(resp.msg)
1233 1236
                 }
@@ -1236,27 +1239,27 @@ export default {
1236 1239
         // 班次
1237 1240
         handletimeType: function(index) {
1238 1241
             this.scheduleStateVal = index
1239
-            // this.$store.dispatch('SetScheduleTypeSelected', { schedule_type_selected: index })
1242
+            this.$store.dispatch('SetScheduleTypeSelected', { schedule_type_selected: index })
1240 1243
             this.search_keyword = this.search_input = ''
1241 1244
             this.getData()
1242 1245
         },
1243 1246
         //分区
1244 1247
         handleZoneChange: function(index) {
1245 1248
             this.zoneVal = index
1246
-            // this.$store.dispatch('SetZoneSelected', { zone_selected: index })
1249
+            this.$store.dispatch('SetZoneSelected', { zone_selected: index })
1247 1250
             this.search_keyword = this.search_input = ''
1248 1251
             this.getData()
1249 1252
         },
1250 1253
         //患者状态
1251 1254
         handleStateChange: function(index) {
1252 1255
             this.patientStateVal = index
1253
-            // this.$store.dispatch('SetPatientStateSelected', { patient_state_selected: index })
1256
+            this.$store.dispatch('SetPatientStateSelected', { patient_state_selected: index })
1254 1257
             this.search_keyword = this.search_input = ''
1255 1258
             this.getData()
1256 1259
         },
1257 1260
         handleTreatChange: function(index) {
1258 1261
             this.treatStateVal = index
1259
-            // this.$store.dispatch('SetTreatStateSelected', { treat_state_selected: index })
1262
+            this.$store.dispatch('SetTreatStateSelected', { treat_state_selected: index })
1260 1263
             this.search_keyword = this.search_input = ''
1261 1264
             this.getData()
1262 1265
         },
@@ -1309,11 +1312,13 @@ export default {
1309 1312
                 if (resp.state == 1) {
1310 1313
                 var schedules = resp.data.schedules
1311 1314
                 this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
1315
+                
1312 1316
                 let newArr = []
1313 1317
                 this.zone_schedules.map(item => {
1314 1318
                     newArr.push(...item.schedules)
1315 1319
                 })
1316 1320
                 this.tableData = newArr
1321
+                this.getData()
1317 1322
                 } else {
1318 1323
                 this.$message.error(resp.msg)
1319 1324
                 }
@@ -1502,6 +1507,26 @@ export default {
1502 1507
     }
1503 1508
   },
1504 1509
   created() {
1510
+    var schedule_type_selected = this.$store.getters.schedule_type_selected
1511
+    var zone_selected = this.$store.getters.zone_selected
1512
+    var patient_state_selected = this.$store.getters.patient_state_selected
1513
+    var treat_state_selected = this.$store.getters.treat_state_selected
1514
+    var selected_date = this.$store.getters.selected_date
1515
+    if (schedule_type_selected) {
1516
+      this.scheduleStateVal = schedule_type_selected.schedule_type_selected
1517
+    }
1518
+    if (zone_selected) {
1519
+      this.zoneVal = zone_selected.zone_selected
1520
+    }
1521
+    if (patient_state_selected) {
1522
+      this.patientStateVal = patient_state_selected.patient_state_selected
1523
+    }
1524
+    if (treat_state_selected) {
1525
+      this.treatStateVal = treat_state_selected.treat_state_selected
1526
+    }
1527
+    if (selected_date.selected_date) {
1528
+      this.selected_date = selected_date.selected_date
1529
+    }
1505 1530
     this.getInitData();
1506 1531
 
1507 1532
     var xtuser = this.$store.getters.xt_user;

+ 11 - 6
src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue View File

@@ -466,20 +466,23 @@
466 466
               <tr>
467 467
                 <td width="40">肝素:</td>
468 468
                 <td width="75">
469
-                  <label-box :isChecked="prescription.anticoagulant == 3 ? true : false" showValue="低分子:"></label-box>
469
+                  <label-box :isChecked="(prescription.anticoagulant == 3 || prescription.anticoagulant == 6 || prescription.anticoagulant == 7)  ? true : false" showValue="低分子:"></label-box>
470 470
                 </td>
471 471
 
472 472
                 <td width="60">
473 473
                   <div class="under-line">
474 474
                     &nbsp;
475
-                    <span v-if="prescription.anticoagulant == 3">{{ prescription.anticoagulant_zongliang }}</span>
475
+                    <span v-if="prescription.anticoagulant == 3 || prescription.anticoagulant == 6 || prescription.anticoagulant == 7">{{ prescription.anticoagulant_zongliang }}</span>
476 476
                   </div>
477 477
                 </td>
478 478
                 <td width="20">
479
+                  <span v-if="prescription.anticoagulant == 5">mg</span>
479 480
                   <span v-if="prescription.anticoagulant == 4">mg</span>
480 481
                   <span v-if="prescription.anticoagulant == 3">iu</span>
481
-                  <span v-if="prescription.anticoagulant == 2">iu</span>
482
+                  <span v-if="prescription.anticoagulant == 2">mg</span>
482 483
                   <span v-if="prescription.anticoagulant == 1">mg</span>
484
+                  <span v-if="prescription.anticoagulant == 6">iu</span>
485
+                  <span v-if="prescription.anticoagulant == 7">iu</span>
483 486
                 </td>
484 487
                 <td width="70">
485 488
                   <label-box :isChecked="prescription.anticoagulant == 1 ? true : false" showValue="无肝素"></label-box>
@@ -503,9 +506,10 @@
503 506
                 <td width="10"></td>
504 507
                 <td width="35">追加</td>
505 508
                 <td width="40">
506
-                  <div class="under-line">
509
+                  <div class="under-line" >
507 510
                     &nbsp;
508
-                    {{ prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "/" }}
511
+                    <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "/" }}</span>
512
+                    
509 513
                   </div>
510 514
                 </td>
511 515
                 <td width="40">
@@ -519,7 +523,8 @@
519 523
                 <td width="35">总量:</td>
520 524
                 <td width="40">
521 525
                   <div class="under-line">
522
-                    &nbsp;{{ prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "/" }}
526
+                    &nbsp;
527
+                    <span v-if="prescription.anticoagulant == 2">{{ prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "/" }}</span>
523 528
                   </div>
524 529
                 </td>
525 530
                 <td width="20">

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue View File

@@ -956,7 +956,7 @@
956 956
           </td>
957 957
         </tr>
958 958
         <tr>
959
-          <td style="text-align:left;" colspan="10">
959
+          <td style="text-align:left;" colspan="9">
960 960
             <span style="display:inline-block;margin-left:15px;">
961 961
               透析中进食:
962 962
               <label-box
@@ -975,7 +975,7 @@
975 975
               <label-box showValue="住院" :isChecked="afterdialysis.patient_gose == 3 ? true : false"></label-box>
976 976
             </span>
977 977
           </td>
978
-          <td style="text-align:left;" colspan="2">
978
+          <td style="text-align:left;" colspan="3">
979 979
             <span>
980 980
               <span
981 981
                 v-if="finshForm.url === ''"

+ 1 - 1
src/xt_pages/user/patient.vue View File

@@ -99,7 +99,7 @@
99 99
         <el-table-column  label="住院号" min-width="80"  property="admission_number" align="center"> </el-table-column>
100 100
         <el-table-column property="name" label="姓名" min-width="80" align="center">
101 101
           <template slot-scope="scope" >
102
-            <router-link :to="'/patients/edit/'+scope.row.id" style="color:#409eff" >{{scope.row.name}}</router-link>
102
+            <router-link :to="'/patients/edit/'+scope.row.id" style="color:#409eff;width:100%;display:block;" >{{scope.row.name}}</router-link>
103 103
           </template>
104 104
         </el-table-column>
105 105
         <el-table-column label="性别" min-width="80" align="center">

+ 1 - 1
src/xt_pages/user/patients.vue View File

@@ -365,7 +365,7 @@
365 365
           <template slot-scope="scope">
366 366
             <router-link
367 367
               :to="'/patients/patient/' + scope.row.id"
368
-              style="color:#409eff"
368
+              style="color:#409eff;width:100%;display:block;"
369 369
             >{{ scope.row.name }}
370 370
             </router-link
371 371
             >