소스 검색

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

csx 3 년 전
부모
커밋
383a96ca09
27개의 변경된 파일16240개의 추가작업 그리고 14541개의 파일을 삭제
  1. 1 1
      src/xt_pages/data/prescription.vue
  2. 34 0
      src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue
  3. 4 4
      src/xt_pages/dialysis/details/dialog/monitor_dialog.vue
  4. 2 2
      src/xt_pages/dialysis/details/dialysisMonitoring.vue
  5. 1100 968
      src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue
  6. 1006 875
      src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue
  7. 10 4
      src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue
  8. 1507 1419
      src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue
  9. 1111 1009
      src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue
  10. 578 492
      src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue
  11. 1109 970
      src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue
  12. 1046 936
      src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue
  13. 1040 897
      src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue
  14. 628 538
      src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue
  15. 1062 934
      src/xt_pages/dialysis/template/DialysisPrintOrderTwenty.vue
  16. 885 879
      src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue
  17. 1568 1457
      src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue
  18. 1187 1041
      src/xt_pages/dialysis/template/DialysisPrintOrderTwentyTwo.vue
  19. 1129 1033
      src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue
  20. 1187 1045
      src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue
  21. 3 2
      src/xt_pages/hospitalStation/components/deskPrescription.vue
  22. 1 1
      src/xt_pages/outpatientCharges/statementPrint.vue
  23. 3 3
      src/xt_pages/workforce/components/nextTableWeeks.vue
  24. 9 10
      src/xt_pages/workforce/components/tableWeeks.vue
  25. 5 6
      src/xt_pages/workforce/next_remind_print.vue
  26. 7 5
      src/xt_pages/workforce/remind_print.vue
  27. 18 10
      src/xt_pages/workforce/remind_print_setting.vue

+ 1 - 1
src/xt_pages/data/prescription.vue 파일 보기

@@ -1197,7 +1197,7 @@ export default {
1197 1197
     this.body_fluid_option = this.$store.getters.body_fluid;
1198 1198
     this.special_medicine_option = this.$store.getters.special_medicine;
1199 1199
     this.displace_liqui_part_option = this.$store.getters.displace_liqui;
1200
-    this.blood_access_option = this.$store.getters.vascular_access_desc;
1200
+    this.blood_access_option = getDataConfig('hemodialysis', 'vascular_access_desc')
1201 1201
     console.log("列表33333333血管通路",this.blood_access_option)
1202 1202
     this.addPlan.mode = 1;
1203 1203
     this.dialyzerPerfusionApparatus = getDataConfig(

+ 34 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_forty.vue 파일 보기

@@ -605,6 +605,7 @@
605 605
                     <td width="60" style="line-height:20px">血流量<br />ml/min</td>
606 606
                     <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
607 607
                     <td width="60" style="line-height:20px">超滤量<br />ml</td>
608
+                    <td width="40" style="line-height:20px">Kt/V</td>
608 609
                     <td width="" style="line-height:20px">病情变化及处理</td>
609 610
                     <td width="60" style="line-height:20px">护士签名</td>
610 611
                     </tr>
@@ -657,6 +658,9 @@
657 658
                     <td>
658 659
                         &nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
659 660
                     </td>
661
+                    <td>
662
+                      &nbsp;{{ monitor.ktv ? monitor.ktv : "" }}
663
+                    </td>
660 664
                     <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
661 665
                     <td>&nbsp;{{monitor.dialysate_temperature}}</td>
662 666
                     <td>&nbsp;{{monitor.replacement_rate}}</td> -->
@@ -776,6 +780,36 @@
776 780
                             </tr>
777 781
                             </tbody>
778 782
                         </table>
783
+                        <table class="table-box">
784
+                          <tbody>
785
+                          <tr>
786
+                              <td width="100">置管口及辅料:</td>
787
+                              <td width='140'>
788
+                                  <label-box :isChecked="record.assessment_after_dislysis.catheter.indexOf('干洁')>-1?true:false" showValue='干洁'></label-box>
789
+                                  <label-box :isChecked="record.assessment_after_dislysis.catheter.indexOf('更换敷料')>-1?true:false" showValue='更换敷料'></label-box>
790
+                              </td>
791
+                              <td width='50'>
792
+                                  <label-box :isChecked="record.assessment_after_dislysis.catheter.indexOf('干洁')==-1 && record.assessment_after_dislysis.catheter.indexOf('更换敷料')==-1?true:false" showValue='其他'></label-box>
793
+                              </td>
794
+                              <td width='100'>
795
+                                  <div class="under-line">&nbsp;
796
+                                      <span v-if="record.assessment_after_dislysis.catheter.indexOf('干洁')==-1 && record.assessment_after_dislysis.catheter.indexOf('更换敷料')==-1">{{ record.assessment_after_dislysis.catheter ? record.assessment_after_dislysis.catheter : '' }}</span>
797
+                                  </div>
798
+                              </td>
799
+                              <td width="90">透析期间进食:</td>
800
+                              <td width="70">
801
+                                  <label-box showValue="有" :isChecked="record.assessment_after_dislysis.is_eat == 1 ? true : false"></label-box>
802
+                                  <label-box showValue="无" :isChecked="record.assessment_after_dislysis.is_eat == 2 ? true : false"></label-box>
803
+                              </td>
804
+                              <td width="90">实际置换总量</td>
805
+                              <td width="50">
806
+                                  <div class="under-line">&nbsp;{{ record.assessment_after_dislysis.actual_displacement ? record.assessment_after_dislysis.actual_displacement : "" }}</div>
807
+                              </td>
808
+                              <td width="20">ml</td>
809
+                              <td></td>
810
+                          </tr>
811
+                          </tbody>
812
+                        </table>
779 813
 
780 814
                         <table class="table-box">
781 815
                             <tbody>

+ 4 - 4
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue 파일 보기

@@ -306,7 +306,7 @@
306 306
             align="center"
307 307
             label="置换量(ml)"
308 308
             width="100"
309
-            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" >
309
+            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" >
310 310
             <template slot-scope="scope">
311 311
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
312 312
             </template>
@@ -317,7 +317,7 @@
317 317
             align="center"
318 318
             label="置换量(L)"
319 319
             width="100"
320
-            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" >
320
+            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && template_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" >
321 321
             <template slot-scope="scope">
322 322
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
323 323
             </template>
@@ -694,12 +694,12 @@
694 694
               <el-input v-model="form.replacement_rate"></el-input>
695 695
             </el-form-item>
696 696
           </el-col>
697
-          <el-col :span="8" v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)">
697
+          <el-col :span="8" v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)">
698 698
             <el-form-item label="置换量(L):">
699 699
               <el-input v-model="form.displacement_quantity"></el-input>
700 700
             </el-form-item>
701 701
           </el-col>
702
-          <el-col :span="8" v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)">
702
+          <el-col :span="8" v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)">
703 703
             <el-form-item label="置换量(ml):">
704 704
               <el-input v-model="form.displacement_quantity"></el-input>
705 705
             </el-form-item>

+ 2 - 2
src/xt_pages/dialysis/details/dialysisMonitoring.vue 파일 보기

@@ -22,8 +22,8 @@
22 22
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
23 23
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>
24 24
           <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29" width="92px" > 置换率(L/h)  </th>
25
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919) || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" width="92px"  > 置换量(ml)  </th>
26
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919) && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" width="92px" > 置换量(L) </th>
25
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" width="92px"  > 置换量(ml)  </th>
26
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" width="92px" > 置换量(L) </th>
27 27
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
28 28
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
29 29
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1100 - 968
src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1006 - 875
src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue


+ 10 - 4
src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue 파일 보기

@@ -417,9 +417,9 @@
417 417
                   </div>
418 418
                 </div>
419 419
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
420
-                  <div class="inline_block" style="flex:1.4">
420
+                  <div class="inline_block" style="flex:1.5">
421 421
                     血管通路:
422
-                    <div class="under_line" style="width: 300px;text-align: center;">
422
+                    <div class="under_line" style="width: 260px;text-align: center;">
423 423
                       {{prescription.blood_access_part_opera_name}}
424 424
                     </div>
425 425
                   </div>
@@ -429,12 +429,18 @@
429 429
                       {{ predialysis.machine_type ? predialysis.machine_type : '' }}
430 430
                     </div>
431 431
                   </div>
432
-                  <div class="inline_block" style="flex:1">
432
+                  <div class="inline_block">
433 433
                     机号:
434 434
                     <div class="under_line" style="width: 60px;text-align: center;">
435 435
                       {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
436 436
                     </div>
437 437
                   </div>
438
+                  <div v-if="org_id == 10233" class="inline_block" style="flex:1;margin-left:10px;">
439
+                    透析器/灌流器:
440
+                    <div class="under_line" style="width: 120px;text-align: center;">
441
+                      {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
442
+                    </div>
443
+                  </div>
438 444
                 </div>
439 445
                 <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
440 446
                   <div class="inline_block" style="flex:1;">
@@ -1507,7 +1513,7 @@ export default {
1507 1513
     this.precaution_arr = getDataConfig('hemodialysis', 'precaution')
1508 1514
     this.intake_arr = getDataConfig('hemodialysis', 'intake')
1509 1515
     this.nutrition_arr = getDataConfig('hemodialysis', 'nutrition')
1510
-
1516
+    this.org_id = this.$store.getters.xt_user.org.id
1511 1517
     var xtuser = this.$store.getters.xt_user
1512 1518
     this.orgname = xtuser.org.org_name
1513 1519
     // this.orgname = "遂溪方济医院";

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1507 - 1419
src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1111 - 1009
src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 578 - 492
src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1109 - 970
src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1046 - 936
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1040 - 897
src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 628 - 538
src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1062 - 934
src/xt_pages/dialysis/template/DialysisPrintOrderTwenty.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 885 - 879
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1568 - 1457
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1187 - 1041
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyTwo.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1129 - 1033
src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1187 - 1045
src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue


+ 3 - 2
src/xt_pages/hospitalStation/components/deskPrescription.vue 파일 보기

@@ -1607,12 +1607,13 @@
1607 1607
               }
1608 1608
             }
1609 1609
 
1610
-            total = Math.floor(total * 100) / 100
1610
+            total =total.toFixed(2)
1611 1611
           }
1612 1612
         }
1613 1613
         return total
1614 1614
 
1615
-      }, getTotalTwo() {
1615
+      },
1616
+       getTotalTwo() {
1616 1617
         var total = 0
1617 1618
         for (let i = 0; i < this.month_prescriptions.length; i++) {
1618 1619
 

+ 1 - 1
src/xt_pages/outpatientCharges/statementPrint.vue 파일 보기

@@ -193,7 +193,7 @@ export default {
193 193
 
194 194
 
195 195
         },500)
196
-      }else if(this.$store.getters.xt_user.org_id == 9504){
196
+      }else if(this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028){
197 197
         const style =
198 198
         '@media print {.printTitle{font-size: 20px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;font-size:12px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;font-size:12px;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none;font-size:12px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;font-size:12px;}.actionBar div{width:150px;}}';
199 199
         printJS({

+ 3 - 3
src/xt_pages/workforce/components/nextTableWeeks.vue 파일 보기

@@ -147,9 +147,9 @@
147 147
         <template slot-scope="scope">
148 148
           <span v-if="org_id!=9987" >
149 149
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus!=''">
150
-                <span v-if="org_id!=10131">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
151
-                <span v-if="org_id==10131">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
152
-                <!-- <span v-if="org_id ==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span> -->
150
+                <span v-if="org_id!=10131&& org_id !=10215">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
151
+                <span v-if="org_id==10131 || org_id == 10215">{{ scope.row.dialysissolution.dialyzer_perfusion_apparatus }}</span>
152
+              
153 153
               </span>
154 154
              <span v-if="scope.row.dialysissolution.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span>
155 155
           </span>

+ 9 - 10
src/xt_pages/workforce/components/tableWeeks.vue 파일 보기

@@ -219,13 +219,14 @@
219 219
             </el-table-column>
220 220
             <el-table-column label="透析器/灌流器" min-width="100" align="center">
221 221
                 <template slot-scope="scope">
222
-          <span v-if="org_id!=9987&&org_id!=10131">
222
+          <span v-if="org_id!=9987&&org_id!=10131&&org_id!=10215">
223 223
              <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
224 224
                 <span>{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
225 225
           </span>
226
-             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 ">{{getDialysisDialyszerPerfusion(scope.row.patient_id)}}</span>
226
+
227
+          <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 ">{{getDialysisDialyszerPerfusion(scope.row.patient_id)}}</span>
227 228
           </span>
228
-                    <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span>
229
+                    <span v-if="org_id==10131 || org_id == 10215">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span>
229 230
                     {{scope.row.prescription.dialysis_dialyszers}}
230 231
                     <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
231 232
                     <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
@@ -314,7 +315,7 @@
314 315
           <el-checkbox v-model="name">姓名</el-checkbox>
315 316
          </li>
316 317
          <li>
317
-          <el-checkbox v-model="zone">分区</el-checkbox>
318
+          <el-checkbox v-model="zone_name">分区</el-checkbox>
318 319
          </li>
319 320
          <li>
320 321
           <el-checkbox v-model="classes">班次</el-checkbox>
@@ -977,9 +978,9 @@
977 978
         getScheduleList(params).then(response => {
978 979
           if (response.data.state == 1) {
979 980
             this.isloading = false
980
-
981 981
             console.log('22333333333', this.pre_status)
982 982
             var list = response.data.data.list
983
+            console.log("list33333333333333333333",list)
983 984
             if (this.pre_status == 0) {
984 985
 
985 986
               for (let i = 0; i < list.length; i++) {
@@ -1295,7 +1296,7 @@
1295 1296
       }
1296 1297
       ,
1297 1298
       saveRemindPrint() {
1298
-        console.log('455555555', this.perfusion_apparatus)
1299
+        console.log('455555555', this.prescription_status)
1299 1300
 
1300 1301
         if (this.perfusion_apparatus == true) {
1301 1302
           console.log('3333')
@@ -1322,10 +1323,10 @@
1322 1323
         if (this.name == false) {
1323 1324
           this.form.name = 2
1324 1325
         }
1325
-        if (this.zone == true) {
1326
+        if (this.zone_name == true) {
1326 1327
           this.form.zone = 1
1327 1328
         }
1328
-        if (this.zone == false) {
1329
+        if (this.zone_name == false) {
1329 1330
           this.form.zone = 2
1330 1331
         }
1331 1332
         if (this.classes == true) {
@@ -1536,8 +1537,6 @@
1536 1537
         this.week_type = 7
1537 1538
       }
1538 1539
       this.org_id = this.$store.getters.xt_user.org.id
1539
-     
1540
-     
1541 1540
     }
1542 1541
   }
1543 1542
 </script>

+ 5 - 6
src/xt_pages/workforce/next_remind_print.vue 파일 보기

@@ -30,7 +30,7 @@
30 30
                   <td width="70" v-if="printObj.zone == 1">分区</td>
31 31
                   <td width="70" v-if="printObj.classes == 1">班次</td>
32 32
                   <td width="70" v-if="printObj.number == 1">机号</td>
33
-                  <td width="120" v-if="printObj.prescription_status == 1">透析模式</td>
33
+                  <td width="120" v-if="printObj.mode == 1">透析模式</td>
34 34
                   <td width="100" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器</td>
35 35
                   <td width="120" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
36 36
                   <td width="100" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
@@ -57,15 +57,14 @@
57 57
                   {{main_collection.number.number}}
58 58
 
59 59
                 </td>
60
-                <td :width="td_1_width"  v-if="printObj.prescription_status == 1">
60
+                <td :width="td_1_width"  v-if="printObj.mode == 1">
61 61
                   {{modeOptions[main_collection.mode_id].name}}
62 62
                 </td>
63 63
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">
64 64
                  <span v-if="org_id!=9987">
65 65
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''">
66
-                        <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
67
-                        <!-- <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
68
-                         <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
66
+                        <span v-if="org_id!=10131 && org_id!=10215">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
67
+                         <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
69 68
                      </span>
70 69
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span>
71 70
                   </span>
@@ -171,7 +170,7 @@
171 170
         // }
172 171
       // console.log("打印下周",params)
173 172
 
174
-      console.log("start",this.start_time)
173
+      // console.log("start",this.start_time)
175 174
       getNextScheduleWeekDay(params).then(rs => {
176 175
         var resp = rs.data
177 176
         console.log(resp)

+ 7 - 5
src/xt_pages/workforce/remind_print.vue 파일 보기

@@ -29,7 +29,7 @@
29 29
                   <td width="70" v-if="printObj.zone == 1">分区</td>
30 30
                   <td width="70" v-if="printObj.classes == 1">班次</td>
31 31
                   <td width="70" v-if="printObj.number == 1">机号</td>
32
-                  <td width="120" v-if="printObj.prescription_status == 1">透析模式</td>
32
+                  <td width="120" v-if="printObj.mode == 1">透析模式</td>
33 33
                   <td width="100" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器</td>
34 34
                   <td width="120" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
35 35
                   <td width="100" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
@@ -56,15 +56,16 @@
56 56
                   {{main_collection.number.number}}
57 57
 
58 58
                 </td>
59
-                <td :width="td_1_width" v-if="printObj.prescription_status == 1">
59
+                <td :width="td_1_width" v-if="printObj.mode == 1">
60 60
                   {{modeOptions[main_collection.mode_id].name}}
61 61
                 </td>
62
+
62 63
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
63 64
                   <span v-if="org_id!=9987">
64 65
                      <span > 
65
-                       <span v-if="org_id!=10131 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
66
-                       <!-- <span v-if="org_id==10131 || org_id==9671">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
67
-                       <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
66
+                       <span v-if="org_id!=10131 && org_id!=10215 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
67
+                     
68
+                       <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
68 69
                       </span>
69 70
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
70 71
                   </span>
@@ -373,6 +374,7 @@
373 374
       getPrintList().then(response=>{
374 375
          if(response.data.state == 1){
375 376
            var list = response.data.data.list
377
+           console.log("list22222",list)
376 378
            this.printObj = list
377 379
          }
378 380
       })

+ 18 - 10
src/xt_pages/workforce/remind_print_setting.vue 파일 보기

@@ -20,18 +20,26 @@
20 20
           <div class="table_panel">
21 21
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
22 22
               <div class="signPrint">
23
-                <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div>
23
+                <div>
24
+                 <span v-if="printObj.zone == 1">分区/</span>
25
+                 <span v-if="printObj.number == 1">床位号:</span>
26
+                 <span v-if="printObj.zone == 1">{{main_collection.zone.name}}/</span> 
27
+                 <span v-if="printObj.number == 1">{{main_collection.number.number}}</span>
28
+                </div>
24 29
                 <div>姓名:
25
-                  <span v-if="type ==1">{{main_collection.patient.name}} </span>
26
-                  <span v-if="type ==2">{{main_collection.patient}} </span>
30
+                  <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
31
+                  <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
27 32
                 </div>
28
-                <div>抗凝剂:
29
-                  <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
30
-                  <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
33
+                <div v-if="printObj.anticoagulant == 1">抗凝剂:
34
+                  <span v-if="org_id == 10138 ">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
35
+                  <span v-else >
36
+                   <span>{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span> 
37
+                  </span>
31 38
                 </div>
32 39
                <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
33 40
                 <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
34
-                <div>用量:
41
+                <div v-if="printObj.anticoagulant_zongliang == 1">
42
+                  用量:
35 43
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
36 44
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
37 45
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
@@ -104,8 +112,8 @@
104 112
      console.log("机构ID",this.org_id)
105 113
      this.currentDate = this.getCurrentDate()
106 114
 
107
-     this.modeOptions = this.$store.getters.treatment_mode
108
-     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
115
+    this.modeOptions = this.$store.getters.treatment_mode
116
+    this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
109 117
     this.week_type = this.$route.query.week_type
110 118
     this.week_time  = this.$route.query.week_time
111 119
     this.zone = this.$route.query.zone
@@ -321,7 +329,7 @@
321 329
       getPrintList().then(response=>{
322 330
          if(response.data.state == 1){
323 331
            var list = response.data.data.list
324
-           console.log("list222222222",list)
332
+           console.log("打印设置",list)
325 333
            this.printObj = list
326 334
          }
327 335
       })