浏览代码

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

陈少旭 1年前
父节点
当前提交
daf02fb7a6
共有 49 个文件被更改,包括 4012 次插入1084 次删除
  1. 9 0
      src/api/role/admin.js
  2. 9 2
      src/api/schedule.js
  3. 2 0
      src/router/index.js
  4. 12 0
      src/router/modules/dialysis.js
  5. 1 1
      src/views/layout/Layout.vue
  6. 1 1
      src/views/layout/components/Sidebar/index.vue
  7. 3 2
      src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue
  8. 1 1
      src/xt_pages/dialysis/batch_print/batch_print_order_sixty.vue
  9. 19 3
      src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue
  10. 1 1
      src/xt_pages/dialysis/batch_print/batch_print_order_sixtyOne.vue
  11. 1085 0
      src/xt_pages/dialysis/batch_print/batch_print_order_sixtyseven.vue
  12. 30 19
      src/xt_pages/dialysis/bloodPresssWatch.vue
  13. 2 1
      src/xt_pages/dialysis/details/BasicInfor.vue
  14. 6 6
      src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue
  15. 6 6
      src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue
  16. 5 5
      src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue
  17. 1 1
      src/xt_pages/dialysis/details/dialog/computer_dialog.vue
  18. 13 13
      src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue
  19. 12 8
      src/xt_pages/dialysis/details/dialog/monitor_dialog.vue
  20. 19 5
      src/xt_pages/dialysis/details/dialog/treatmentSummaryDialog.vue
  21. 4 4
      src/xt_pages/dialysis/details/dialysisMonitoring.vue
  22. 39 24
      src/xt_pages/dialysis/dialysisPrintOrder.vue
  23. 1 1
      src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue
  24. 15 37
      src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue
  25. 2 2
      src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue
  26. 1412 0
      src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue
  27. 8 0
      src/xt_pages/medicalScheduling/medical_print.vue
  28. 11 13
      src/xt_pages/outpatientCharges/invoicePrint.vue
  29. 54 53
      src/xt_pages/outpatientCharges/invoiceTemplate/printEleven.vue
  30. 279 25
      src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue
  31. 119 120
      src/xt_pages/outpatientCharges/invoiceTemplate/printTen.vue
  32. 3 3
      src/xt_pages/outpatientCharges/listPrint.vue
  33. 600 600
      src/xt_pages/outpatientCharges/statementTemplate/printThree.vue
  34. 11 9
      src/xt_pages/outpatientDoctorStation/doctorDesk.vue
  35. 1 1
      src/xt_pages/outpatientDoctorStation/print.vue
  36. 50 59
      src/xt_pages/outpatientDoctorStation/template/prinSeven.vue
  37. 2 1
      src/xt_pages/outpatientDoctorStation/template/printFive.vue
  38. 12 3
      src/xt_pages/outpatientDoctorStation/template/printFour.vue
  39. 2 1
      src/xt_pages/outpatientDoctorStation/template/printSix.vue
  40. 2 1
      src/xt_pages/outpatientDoctorStation/template/printThree.vue
  41. 2 2
      src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue
  42. 3 3
      src/xt_pages/role/admin.vue
  43. 2 2
      src/xt_pages/sign/Contextowner.vue
  44. 2 2
      src/xt_pages/stock/detail/print.vue
  45. 10 4
      src/xt_pages/stock/detail/stockOutDetail.vue
  46. 12 7
      src/xt_pages/user/inspection.vue
  47. 91 7
      src/xt_pages/workforce/components/editTableData.vue
  48. 7 3
      src/xt_pages/workforce/components/tableData.vue
  49. 19 22
      src/xt_pages/workforce/scheduleTablePrint.vue

+ 9 - 0
src/api/role/admin.js 查看文件

@@ -135,6 +135,15 @@ export function toTestFive(params){
135 135
   })
136 136
 }
137 137
 
138
+export function toTestSeven(params){
139
+ 
140
+  return request({
141
+    url:"api/sign/addcontractsignatory",
142
+    method:"Get",
143
+    params:params
144
+  })
145
+}
146
+
138 147
 export function toTestEight(params){
139 148
   
140 149
   return request({

+ 9 - 2
src/api/schedule.js 查看文件

@@ -305,5 +305,12 @@ export function CreateScheduleTwo(id, schedule,id_two) {
305 305
 }
306 306
 
307 307
 
308
-
309
-
308
+export function ChangeScheduleTen(id,schedule){
309
+  
310
+  console.log('schedule', schedule)
311
+  return request({
312
+    url: '/api/schedule/changeschedule?id=' + id+"&bed_id="+schedule.bed_id+"&mode_id="+schedule.mode_id+"&schedule_type="+schedule.schedule_type,
313
+    method: 'Put',
314
+    data: schedule
315
+  })
316
+}

+ 2 - 0
src/router/index.js 查看文件

@@ -9,6 +9,7 @@ import dialysis from './modules/dialysis'
9 9
 import patient from './modules/patient'
10 10
 import qcd from './modules/qcd'
11 11
 import Dialysisanalysis from './modules/Dialysisanalysis'
12
+import DialysisIndex from './modules/dialysisIndex'
12 13
 import stock from './modules/stock'
13 14
 import weight_sign from './modules/weight_sign'
14 15
 import workforce from './modules/workforce'
@@ -204,6 +205,7 @@ var _asy_router_map = [
204 205
   basicConfig,
205 206
   supply,
206 207
   Dialysisanalysis,// 新菜单6.1
208
+  DialysisIndex,
207 209
 ]
208 210
 
209 211
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

+ 12 - 0
src/router/modules/dialysis.js 查看文件

@@ -497,6 +497,18 @@ export default {
497 497
         noCache: true
498 498
       }
499 499
     },
500
+    {
501
+      path: '/dialysis/print/batch/sixtyseven',
502
+      component: () =>
503
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_sixtyseven'),
504
+      hidden: true,
505
+      is_menu: false,
506
+      name: 'dialysis_batch_sixtyseven',
507
+      meta: {
508
+        title: '批量打印',
509
+        noCache: true
510
+      }
511
+    },
500 512
     {
501 513
       path: '/dialysis/print/batch/seven',
502 514
       component: () =>

+ 1 - 1
src/views/layout/Layout.vue 查看文件

@@ -134,7 +134,7 @@ export default {
134 134
   created(){
135 135
     let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","DepositManagement","hisTool",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
136 136
     let bingli = ['User','createPatient'];
137
-    let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control'];
137
+    let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index'];
138 138
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','inventoryTransfer','wareHouseManage','otherManagement'];
139 139
     let caigou = ['supplyManage','supplyList'];
140 140
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];

+ 1 - 1
src/views/layout/components/Sidebar/index.vue 查看文件

@@ -120,7 +120,7 @@ export default {
120 120
             this.$emit('func',a)
121 121
           }
122 122
         }else if(newVal == '透析管理'){
123
-          let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','Dialysisanalysis'];
123
+          let nameArr = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control','dialysis_index','Dialysisanalysis'];
124 124
           // console.log('permission_routers',this.permission_routers)
125 125
           let routerArr = [];
126 126
           this.permission_routers.map(item => {

+ 3 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue 查看文件

@@ -78,13 +78,14 @@
78 78
               <div class="inline_block">
79 79
                 病区:
80 80
                 <div class="under_line" style="width: 50px; text-align: center">
81
-                  {{ "/" }}
81
+                  {{ record.device_zone.name? record.device_zone.name:"/" }}
82 82
                 </div>
83 83
               </div>
84 84
               <div class="inline_block">
85 85
                 床号:
86 86
                 <div class="under_line" style="width: 50px; text-align: center">
87
-                  {{ "/" }}
87
+                 
88
+                  {{ record.device_number.number? record.device_number.number:"/" }}
88 89
                 </div>
89 90
               </div>
90 91
               <div class="inline_block">

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_sixty.vue 查看文件

@@ -890,7 +890,7 @@
890 890
                           class="under_line"
891 891
                           style="width: 100px; text-align: center"
892 892
                         >
893
-                          <span v-if="org_id == 10290">{{
893
+                          <span v-if="org_id == 10290 || org_id == 10138 || org_id == 10278">{{
894 894
                             record.lastafterweight.weight_after
895 895
                           }}</span>
896 896
                           <span v-else>{{

+ 19 - 3
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue 查看文件

@@ -740,7 +740,9 @@
740 740
                             class="under_line"
741 741
                             style="width: 100px; text-align: center"
742 742
                           >
743
-                            /
743
+                          {{
744
+                          getDisplaceLiquiPart(record.prescription.displace_liqui_part)
745
+                        }}
744 746
                           </div>
745 747
                         </div>
746 748
                         <div
@@ -1887,13 +1889,13 @@
1887 1889
                 <div class="inline_block">
1888 1890
                   病区:
1889 1891
                   <div class="under_line" style="width: 50px; text-align: center">
1890
-                    {{ "/" }}
1892
+                    {{ record.device_zone.name? record.device_zone.name:"/" }}
1891 1893
                   </div>
1892 1894
                 </div>
1893 1895
                 <div class="inline_block">
1894 1896
                   床号:
1895 1897
                   <div class="under_line" style="width: 50px; text-align: center">
1896
-                    {{ "/" }}
1898
+                    {{ record.device_number.number? record.device_number.number:"/" }}
1897 1899
                   </div>
1898 1900
                 </div>
1899 1901
                 <div class="inline_block">
@@ -2909,9 +2911,11 @@
2909 2911
           "腹痛",
2910 2912
         ],
2911 2913
         org_id: "",
2914
+        displaceLiquiPartOptions:[],
2912 2915
       };
2913 2916
     },
2914 2917
     created() {
2918
+      this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
2915 2919
       var bloodAccessParOpera = getDataConfig(
2916 2920
         "hemodialysis",
2917 2921
         "vascular_access_desc"
@@ -3139,6 +3143,18 @@
3139 3143
         });
3140 3144
     },
3141 3145
     methods: {
3146
+      getDisplaceLiquiPart: function(val) {
3147
+       
3148
+        let displace_liqui_part_name = "/";
3149
+        const displace_liqui_part = this.displaceLiquiPartOptions;
3150
+      
3151
+        for (let i = 0; i < displace_liqui_part.length; i++) {
3152
+           if (displace_liqui_part[i].id == val) {
3153
+           displace_liqui_part_name = displace_liqui_part[i].name;
3154
+        }
3155
+      }
3156
+      return displace_liqui_part_name;
3157
+     },
3142 3158
       getUnit: function (val) {
3143 3159
         if (val.assessment_after_dislysis == null) {
3144 3160
           return "";

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyOne.vue 查看文件

@@ -10,7 +10,7 @@
10 10
         type="primary"
11 11
         >批量打印
12 12
       </el-button>
13
-    </div>
13
+    </div> 
14 14
     <div class="app-container">
15 15
       <div id="print_content">
16 16
         <div

文件差异内容过多而无法显示
+ 1085 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyseven.vue


+ 30 - 19
src/xt_pages/dialysis/bloodPresssWatch.vue 查看文件

@@ -2,7 +2,7 @@
2 2
   <div class="main-contain">
3 3
     <div class="position">
4 4
       <bread-crumb :crumbs="crumbs"></bread-crumb>
5
-    
5
+
6 6
       <template v-if="this.template_id == 1">
7 7
         <el-button
8 8
           size="small"
@@ -11,7 +11,7 @@
11 11
           @click="batchPrintAction"
12 12
           type="primary"
13 13
           >打印</el-button
14
-        > 
14
+        >
15 15
       </template>
16 16
       <template v-if="this.template_id == 2 || this.template_id == 0 || this.template_id == 33">
17 17
         <div>
@@ -410,6 +410,15 @@
410 410
           type="primary"
411 411
           >批量打印</el-button>
412 412
       </template>
413
+      <template v-if="this.template_id == 67">
414
+        <el-button
415
+          size="small"
416
+          icon="el-icon-printer"
417
+          :disabled="selecting_schs.length == 0"
418
+          @click="batchPrintAction"
419
+          type="primary"
420
+          >批量打印</el-button>
421
+      </template>
413 422
     </div>
414 423
     <div class="app-container">
415 424
       <!-- <div class="filter-container">
@@ -586,7 +595,7 @@
586 595
         ></el-table-column>
587 596
 
588 597
         <el-table-column label="透前血压(kg)" align="center" width="120" prop="pressure_name">
589
-          
598
+
590 599
         </el-table-column>
591 600
 
592 601
         <el-table-column
@@ -1441,7 +1450,7 @@ export default {
1441 1450
       if(search_value != ''){
1442 1451
         this.patient_search_keyword = search_value
1443 1452
         this.listQuery.keywords = search_value
1444
-       
1453
+
1445 1454
         this.getSchedualPatientList();
1446 1455
         var date = new Date();
1447 1456
         this.time = date;
@@ -1462,13 +1471,13 @@ export default {
1462 1471
         this.getTemplateInfo();
1463 1472
       }else {
1464 1473
         var start_month = moment().startOf('month').format('YYYY-MM-DD')
1465
-        var start_time = this.getTimestamp(start_month) 
1474
+        var start_time = this.getTimestamp(start_month)
1466 1475
         this.listQuery.start_time = start_time
1467 1476
         var end_month = moment(new Date()).add('year',0).format("YYYY-MM-DD")
1468 1477
         var end_time = this.getTimestamp(end_month)
1469
-        this.listQuery.end_time = end_time 
1478
+        this.listQuery.end_time = end_time
1470 1479
         this.getSchedualPatientList()
1471
-      
1480
+
1472 1481
         this.getAllZone();
1473 1482
         this.getTemplateInfo();
1474 1483
 
@@ -1489,13 +1498,13 @@ export default {
1489 1498
       var date = new Date(nowDate + " 00:00:00");
1490 1499
       this.listQuery.schedul_time = date.getTime();
1491 1500
       var start_month = moment().startOf('month').format('YYYY-MM-DD')
1492
-      var start_time = this.getTimestamp(start_month) 
1493
-     
1501
+      var start_time = this.getTimestamp(start_month)
1502
+
1494 1503
       this.listQuery.start_time = start_time
1495 1504
       var end_month = moment(new Date()).add('year',0).format("YYYY-MM-DD")
1496 1505
       var end_time = this.getTimestamp(end_month)
1497 1506
       this.listQuery.end_time = end_time
1498
-     
1507
+
1499 1508
       this.getAllZone();
1500 1509
       this.getSchedualPatientList();
1501 1510
       this.getTemplateInfo();
@@ -1548,7 +1557,7 @@ export default {
1548 1557
       this.getSchedualPatientList();
1549 1558
     },
1550 1559
     changeStartTime(){
1551
-     
1560
+
1552 1561
       this.getSchedualPatientList()
1553 1562
     },
1554 1563
     changeEndTime(){
@@ -1572,7 +1581,7 @@ export default {
1572 1581
     },
1573 1582
     getTimestampOne(time) { //把时间日期转成时间戳
1574 1583
 
1575
-    return (new Date(time)).getTime() 
1584
+    return (new Date(time)).getTime()
1576 1585
     },
1577 1586
     getSchedualPatientList: function() {
1578 1587
       this.loading = true;
@@ -1584,8 +1593,8 @@ export default {
1584 1593
         this.listQuery.schedul_time = "";
1585 1594
 
1586 1595
       }
1587
-    
1588
-      
1596
+
1597
+
1589 1598
       console.log("params332322332323232",this.listQuery.start_time)
1590 1599
       this.SchedualPatientsTableData = [];
1591 1600
       getSchedualPatient(this.listQuery).then(response => {
@@ -1649,7 +1658,7 @@ export default {
1649 1658
               if (response.data.data.schedule[i].assessment_before_dislysis != null) {
1650 1659
                 SchedualPatientsTable["pressure_name"] =response.data.data.schedule[i].assessment_before_dislysis.systolic_blood_pressure+"/"+ response.data.data.schedule[i].assessment_before_dislysis.diastolic_blood_pressure;
1651 1660
               }
1652
-           
1661
+
1653 1662
 
1654 1663
 
1655 1664
 
@@ -2022,7 +2031,7 @@ export default {
2022 2031
     changeSearchMode: function() {
2023 2032
       if (this.search_mode == 1) {
2024 2033
         this.search_mode = 2;
2025
-        
2034
+
2026 2035
       } else {
2027 2036
         this.search_mode = 1;
2028 2037
         var date = new Date();
@@ -2039,7 +2048,7 @@ export default {
2039 2048
         var nowDate = year + "-" + month + "-" + day;
2040 2049
         var date = new Date(nowDate + " 00:00:00");
2041 2050
         this.listQuery.schedul_time = date.getTime();
2042
-       
2051
+
2043 2052
         this.getAllZone();
2044 2053
         this.getSchedualPatientList();
2045 2054
         this.getTemplateInfo();
@@ -2149,7 +2158,9 @@ export default {
2149 2158
       }else if (this.template_id == 66) {
2150 2159
         this.$router.push({ path: "/dialysis/print/batch/sixtysix" });
2151 2160
       }
2152
-
2161
+      else if (this.template_id == 67) {
2162
+        this.$router.push({ path: "/dialysis/print/batch/sixtyseven" });
2163
+      }
2153 2164
     },
2154 2165
     batchPrintActionOne: function() {
2155 2166
       if (this.selecting_schs.length === 0) {
@@ -2312,4 +2323,4 @@ export default {
2312 2323
 .spanClass .cell tr:last-of-type td {
2313 2324
   border-bottom: none;
2314 2325
 }
2315
-</style>
2326
+</style>

+ 2 - 1
src/xt_pages/dialysis/details/BasicInfor.vue 查看文件

@@ -29,7 +29,8 @@
29 29
       </li>
30 30
       <li>
31 31
         <label>年龄:</label>
32
-        <span>{{ getNewAge(patient)}}</span>
32
+        <span v-if="getNewAge(patient)>150">{{patient.age}}</span>
33
+        <span v-if="getNewAge(patient)<150">{{ getNewAge(patient)}}</span>
33 34
       </li>
34 35
       <li>
35 36
         <label>透析号 : </label>

+ 6 - 6
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue 查看文件

@@ -1008,12 +1008,12 @@ export default {
1008 1008
           if(name == "穿刺处血肿" || name == '拔针后穿刺点渗血' || name == '透析期间进食' ){
1009 1009
             return [
1010 1010
               { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
1011
-              {
1012
-                required: true,
1013
-                pattern: /^[1-9]\d*$/,
1014
-                message: `请选择${name}`,
1015
-                trigger: ['change']
1016
-              },
1011
+              // {
1012
+              //   required: true,
1013
+              //   pattern: /^[1-9]\d*$/,
1014
+              //   message: `请选择${name}`,
1015
+              //   trigger: ['change']
1016
+              // },
1017 1017
             ];
1018 1018
           }
1019 1019
             

+ 6 - 6
src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue 查看文件

@@ -613,12 +613,12 @@ export default {
613 613
           if (name == "风险程度"||name == "病人情况"||name == '心理评估') {
614 614
             return [
615 615
               { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
616
-              {
617
-                required: true,
618
-                pattern: /^[1-9]\d*$/,
619
-                message: `请输入${name}`,
620
-                trigger: ['blur','change']
621
-              },
616
+              // {
617
+              //   required: true,
618
+              //   pattern: /^[1-9]\d*$/,
619
+              //   message: `请输入${name}`,
620
+              //   trigger: ['blur','change']
621
+              // },
622 622
             ];
623 623
           }
624 624
           else if(name == "跌倒风险预防措施"){

+ 5 - 5
src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue 查看文件

@@ -1061,11 +1061,11 @@
1061 1061
             ) {
1062 1062
             return [
1063 1063
               { required: true, message: `请输入${name}` },
1064
-              {
1065
-                required: true,
1066
-                pattern: /^[1-9]\d*$/,
1067
-                message: `请输入${name}`,
1068
-              },
1064
+              // {
1065
+              //   required: true,
1066
+              //   pattern: /^[1-9]\d*$/,
1067
+              //   message: `请输入${name}`,
1068
+              // },
1069 1069
             ];
1070 1070
           }
1071 1071
             return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];

+ 1 - 1
src/xt_pages/dialysis/details/dialog/computer_dialog.vue 查看文件

@@ -691,7 +691,7 @@ export default {
691 691
           
692 692
           return [
693 693
             { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
694
-            { required: true, pattern: /^[1-9]\d*$/, message: `请输入${name}`,trigger: ['blur','change'] },
694
+            // { required: true, pattern: /^[1-9]\d*$/, message: `请输入${name}`,trigger: ['blur','change'] },
695 695
           ];
696 696
         }
697 697
           return [{ required: true, message: `请输入${name}` }];

+ 13 - 13
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue 查看文件

@@ -1284,7 +1284,7 @@
1284 1284
             </span>
1285 1285
           </el-row>
1286 1286
         </el-form>
1287
-      
1287
+
1288 1288
       </span>
1289 1289
       <span slot="footer" class="dialog-footer">
1290 1290
         <el-button @click="infoDialogVisible = false">取 消</el-button>
@@ -3923,12 +3923,12 @@ mu
3923 3923
           if (name == "透析模式" || name == "透析时长") {
3924 3924
             return [
3925 3925
               { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
3926
-              {
3927
-                required: true,
3928
-                pattern: /^[1-9]\d*$/,
3929
-                message: `请输入${name}`,
3930
-                trigger: ['blur','change']
3931
-              },
3926
+              // {
3927
+              //   required: true,
3928
+              //   pattern: /^[1-9]\d*$/,
3929
+              //   message: `请输入${name}`,
3930
+              //   trigger: ['blur','change']
3931
+              // },
3932 3932
             ];
3933 3933
           }
3934 3934
           return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
@@ -3964,12 +3964,12 @@ mu
3964 3964
             if(name == '置换速度'){
3965 3965
               return [
3966 3966
                 { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
3967
-                {
3968
-                  required: true,
3969
-                  pattern: /^[1-9]\d*$/,
3970
-                  message: `请输入${name}`,
3971
-                  trigger: ['blur','change']
3972
-                },
3967
+                // {
3968
+                //   required: true,
3969
+                //   pattern: /^[1-9]\d*$/,
3970
+                //   message: `请输入${name}`,
3971
+                //   trigger: ['blur','change']
3972
+                // },
3973 3973
               ];
3974 3974
             }
3975 3975
             return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];

+ 12 - 8
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue 查看文件

@@ -243,7 +243,8 @@
243 243
                 || org_id == 10410 ||
244 244
                 org_id == 10495 ||
245 245
                 org_id == 10375 ||
246
-                org_id == 10485) &&
246
+                org_id == 10485 ||
247
+                org_id == 10375) &&
247 248
                 org_id!=10387
248 249
             "
249 250
           >
@@ -313,7 +314,7 @@
313 314
               org_id != 9555
314 315
               && org_id!=10432 && org_id!=10445
315 316
               && org_id!=10410 && org_id!=10495 &&
316
-               org_id!=10485 && org_id!=10395 )
317
+               org_id!=10485 && org_id!=10395 && org_id!=10375 )
317 318
               || org_id == 10387
318 319
             "
319 320
           >
@@ -369,7 +370,7 @@
369 370
                 org_id == 10410 ||
370 371
                 org_id == 10495  ||
371 372
                 org_id == 10395
372
-                || org_id == 10485)
373
+                || org_id == 10485 || org_id == 10375)
373 374
                 && org_id!=10387
374 375
             "
375 376
           >
@@ -422,7 +423,7 @@
422 423
               org_id!=10432 &&
423 424
               org_id!=10445 &&
424 425
               org_id!=10410 && org_id!=10495
425
-              && org_id!=10485 && org_id!=10395) ||
426
+              && org_id!=10485 && org_id!=10395 && org_id!=10375) ||
426 427
               org_id == 10387
427 428
             "
428 429
           >
@@ -1147,7 +1148,7 @@
1147 1148
                 org_id== 10432 ||
1148 1149
                 org_id== 10445 ||
1149 1150
                 org_id== 10410 ||
1150
-                org_id == 10485) &&
1151
+                org_id == 10485 || org_id == 10375) &&
1151 1152
                 org_id!=10387
1152 1153
             "
1153 1154
           >
@@ -1194,7 +1195,8 @@
1194 1195
               org_id!=10432 &&
1195 1196
               org_id!=10445 &&
1196 1197
               org_id!=10410 &&
1197
-              org_id!=10485)
1198
+              org_id!=10485 &&
1199
+              org_id!=10375)
1198 1200
               || org_id == 10387
1199 1201
             "
1200 1202
           >
@@ -1252,7 +1254,8 @@
1252 1254
                 org_id == 10410 ||
1253 1255
                 org_id == 10495 ||
1254 1256
                 org_id == 10485 ||
1255
-                org_id == 10395)
1257
+                org_id == 10395 ||
1258
+                org_id == 10375)
1256 1259
                 && org_id!=10387
1257 1260
             "
1258 1261
           >
@@ -1310,7 +1313,8 @@
1310 1313
               org_id!=10410 &&
1311 1314
               org_id!=10495 &&
1312 1315
               org_id!=10485 &&
1313
-              org_id!=10395
1316
+              org_id!=10395 &&
1317
+              org_id!=10375
1314 1318
               )
1315 1319
               || org_id == 10387
1316 1320
             "

+ 19 - 5
src/xt_pages/dialysis/details/dialog/treatmentSummaryDialog.vue 查看文件

@@ -584,16 +584,30 @@ export default {
584 584
         this.predialysis_evaluation.blood_access_part_id = ""
585 585
       }
586 586
      
587
-       var str = " 患者今日来我科行血液透析治疗,血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
588
-       ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus + ",抗凝剂:"+this.GetAnticoagulant(this.prescription.anticoagulant) +",总量:"+this.prescription.anticoagulant_zongliang+"iu"+
589
-      ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"ml" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +",透析过程中血压波动,"+"最大收缩压:"+monitor_one[0].systolic_blood_pressure+"mmHg"+",最小收缩压:"+monitor_one[monitor_one.length-1].systolic_blood_pressure
587
+
588
+       if(this.org_id ==10090){
589
+          var str = " 患者今日来我科行血液透析治疗,血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
590
+        ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus + ",抗凝剂:"+this.GetAnticoagulant(this.prescription.anticoagulant) +",总量:"+this.prescription.anticoagulant_zongliang+"iu"+
591
+        ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"ml" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +","+"透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
592
+        ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"ml"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利,安全下机" + " "
593
+        +",今日使用药品:"+doc_str +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"
594
+
595
+        console.log("str000000000000000000222o2o2",str)
596
+        this.treatmentSummary.dialysis_summary = ""
597
+        this.treatmentSummary.dialysis_summary = str
598
+       }else{
599
+        var str = " 患者今日来我科行血液透析治疗,血管通路选择:"+this.predialysis_evaluation.blood_access_part_id+ " "+this.QueryOperaById(this.predialysis_evaluation.blood_access_part_opera_id) +",透析模式:"+this.getModeId(this.prescription.mode_id)+
600
+       ",透前检查:"+this.predialysis_evaluation.internal_fistula +this.predialysis_evaluation.catheter + str_one +" "+ ",透析器:"+this.prescription.dialyzer_perfusion_apparatus + ",抗凝剂:"+this.GetAnticoagulant(this.prescription.anticoagulant) +
601
+      ",透前体重:"+this.predialysis_evaluation.weight_before+"kg"+",间期体重增长:"+total +"kg"+",目标脱水量:"+this.prescription.target_ultrafiltration +"L" +",血流量:"+this.prescription.blood_flow_volume+"ml/min" + ",透析开始时间:"+this.getTime(this.dialysis_order.start_time) +",透析过程中血压波动,"+"最大收缩压:"+monitor_one[0].systolic_blood_pressure+"mmHg"+",最小收缩压:"+monitor_one[monitor_one.length-1].systolic_blood_pressure
590 602
       +"mmHg" +",最小舒张压:" +monitor_two[0].diastolic_blood_pressure+"mmHg" + ",最大舒张压:" + monitor_two[monitor_two.length-1].diastolic_blood_pressure +"mmHg" + ",最大脉搏:"+monitor_three[0].pulse_frequency+"次/分"+",最小脉搏:"+monitor_three[monitor_three.length-1].pulse_frequency+"次/分"+",透析结束时间:"+this.getTime(this.dialysis_order.end_time) +
591
-      ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"ml"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利,安全下机" + " "
592
-      +",今日使用药品:"+doc_str +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"
603
+      ",实际治疗时长:"+ this.assessment_after_dislysis.actual_treatment_hour +"时"+this.assessment_after_dislysis.actual_treatment_minute+"分" +",实际超滤量:"+this.assessment_after_dislysis.actual_ultrafiltration+"L"+",透后体重:"+this.assessment_after_dislysis.weight_after+"kg"+",透析过程顺利,安全下机" + " "
604
+       +",患者下机后测血压,"+"收缩压:"+this.assessment_after_dislysis.systolic_blood_pressure+"mmHg"+",舒张压:"+this.assessment_after_dislysis.diastolic_blood_pressure+"mmHg"+",脉搏:"+this.assessment_after_dislysis.pulse_frequency +"次/分"
593 605
 
594 606
        console.log("str000000000000000000222o2o2",str)
595 607
        this.treatmentSummary.dialysis_summary = ""
596 608
        this.treatmentSummary.dialysis_summary = str
609
+       }
610
+      
597 611
     },
598 612
     QueryOperaById(val){
599 613
        var blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')

+ 4 - 4
src/xt_pages/dialysis/details/dialysisMonitoring.vue 查看文件

@@ -14,10 +14,10 @@
14 14
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
15 15
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
16 16
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
17
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
18
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
19
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
20
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
17
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
18
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
19
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
20
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
21 21
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
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 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) " width="92px" > 置换率(ml/min) </th>

+ 39 - 24
src/xt_pages/dialysis/dialysisPrintOrder.vue 查看文件

@@ -15,7 +15,7 @@
15 15
       <template
16 16
         v-if="
17 17
           org_template_info.template_id == 2
18
-       
18
+
19 19
         "
20 20
       >
21 21
         <div>
@@ -116,7 +116,7 @@
116 116
       >
117 117
       <div>
118 118
         <el-button
119
-          
119
+
120 120
           :loading="loading"
121 121
           size="small"
122 122
           icon="el-icon-printer"
@@ -199,7 +199,7 @@
199 199
       <template
200 200
         v-if="
201 201
           org_template_info.template_id == 14
202
-         
202
+
203 203
         "
204 204
       >
205 205
         <div>
@@ -301,8 +301,8 @@
301 301
       </template> -->
302 302
       <template
303 303
         v-if="
304
-          org_template_info.template_id == 21 
305
-         
304
+          org_template_info.template_id == 21
305
+
306 306
         "
307 307
       >
308 308
         <div>
@@ -809,7 +809,7 @@
809 809
           <!-- || $store.getters.xt_user.org.id == 0  -->
810 810
         </div>
811 811
       </template>
812
-      <template v-if="org_template_info.template_id == 66 || $store.getters.xt_user.org.id == 0">
812
+      <template v-if="org_template_info.template_id == 66 ">
813 813
         <div>
814 814
           <el-button
815 815
           :loading="loading"
@@ -821,7 +821,18 @@
821 821
         >
822 822
         </div>
823 823
       </template>
824
-
824
+      <!-- <template v-if="org_template_info.template_id == 67 ">
825
+        <div>
826
+          <el-button
827
+          :loading="loading"
828
+          size="small"
829
+          icon="el-icon-printer"
830
+          @click="printThisPage"
831
+          type="primary"
832
+          >打印</el-button
833
+        >
834
+        </div>
835
+      </template> -->
825 836
     </div>
826 837
     <div class="app-container" style="min-height: 0">
827 838
       <!--<div class="order-print-btn"-->
@@ -979,7 +990,7 @@
979 990
             v-if="org_template_info.template_id == 5"
980 991
           >
981 992
           </DialysisPrintOrderFive>
982
-                                  
993
+
983 994
           <DialysisPrintOrderSix
984 995
             v-bind:childResponse="childResponse"
985 996
             v-if="org_template_info.template_id == 6"
@@ -1218,8 +1229,6 @@
1218 1229
           >
1219 1230
           </DialysisPrintOrderFiftyThree>
1220 1231
 
1221
-         
1222
-        
1223 1232
            <DialysisPrintOrderFiftyFour
1224 1233
             v-bind:childResponse="childResponse"
1225 1234
             v-if="org_template_info.template_id == 54"
@@ -1274,11 +1283,16 @@
1274 1283
             v-if="org_template_info.template_id == 65">
1275 1284
 
1276 1285
           </DialysisPrintOrderSixtyFive>
1277
-          <DialysisPrintOrderSixtysix 
1286
+          <DialysisPrintOrderSixtysix
1278 1287
             v-bind:childResponse="childResponse"
1279 1288
             v-if="org_template_info.template_id == 66">
1280 1289
 
1281 1290
           </DialysisPrintOrderSixtysix>
1291
+          <DialysisPrintOrdersixtySeven
1292
+          v-bind:childResponse="childResponse"
1293
+            v-if="org_template_info.template_id == 67">
1294
+
1295
+          </DialysisPrintOrdersixtySeven>
1282 1296
         </div>
1283 1297
       </el-container>
1284 1298
     </div>
@@ -1363,6 +1377,7 @@ import DialysisPrintOrderSixtyTwo from "./template/DialysisPrintOrderSixtyTwo"
1363 1377
 import DialysisPrintOrderSixtyfour from './template/DialysisPrintOrderSixtyfour'
1364 1378
 import DialysisPrintOrderSixtyFive from "./template/DialysisPrintOrderSixtyFive.vue"
1365 1379
 import DialysisPrintOrderSixtysix from './template/DialysisPrintOrderSixtysix.vue'
1380
+import DialysisPrintOrdersixtySeven from './template/DialysisPrintOrdersixtySeven.vue'
1366 1381
 export default {
1367 1382
   name: "dialysisPrintOrder",
1368 1383
   components: {
@@ -1370,6 +1385,7 @@ export default {
1370 1385
     DialysisPrintOrderSixtyTwo,
1371 1386
     DialysisPrintOrderSixtyOne,
1372 1387
     DialysisPrintOrderSixty,
1388
+    DialysisPrintOrdersixtySeven,
1373 1389
     DialysisPrintOrderFiftyNine,
1374 1390
     DialysisPrintOrderFiftyEight,
1375 1391
     DialysisPrintOrderFiftySeven,
@@ -1589,7 +1605,7 @@ export default {
1589 1605
       // if(this.$store.getters.xt_user.org.id == 0){
1590 1606
       //   this.org_template_info.template_id = 65
1591 1607
       // }
1592
-       
1608
+
1593 1609
       var ptime = Math.round(new Date().getTime() / 1000);
1594 1610
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
1595 1611
 
@@ -1617,7 +1633,7 @@ export default {
1617 1633
         '@media print {#dialysis-print-box-1{margin:0 auto;}.dialysis-print-order{width:920px;margin:0 10px;font-size:10px;}.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 940px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}@page {margin-top:5px;}.table-box1 tr {border-bottom: 1px solid #000;}';
1618 1634
       const style10 =
1619 1635
         '@media print {.dialysis-print-order{width:960px;margin:0 auto} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px}   .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
1620
-      
1636
+
1621 1637
       // 三明曙光样式
1622 1638
       const style11 =
1623 1639
         '@media print {.dialysis-print-order{width:960px;margin:100px auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:30px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:15px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
@@ -1631,7 +1647,7 @@ export default {
1631 1647
       // 营口北方医院
1632 1648
       const style15 =
1633 1649
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:35px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
1634
-      
1650
+
1635 1651
       if (this.org_template_info.template_id == 1) {
1636 1652
         printJS({
1637 1653
           printable: "dialysis-print-box",
@@ -1640,7 +1656,7 @@ export default {
1640 1656
           scanStyles: false,
1641 1657
         });
1642 1658
       } else if (
1643
-        this.org_template_info.template_id == 2     
1659
+        this.org_template_info.template_id == 2
1644 1660
       ) {
1645 1661
         printJS({
1646 1662
           printable: "dialysis-print-box-1",
@@ -1680,7 +1696,7 @@ export default {
1680 1696
         this.org_template_info.template_id == 60 ||
1681 1697
         this.org_template_info.template_id == 61 ||
1682 1698
         this.org_template_info.template_id == 66
1683
-       
1699
+
1684 1700
       ) {
1685 1701
         printJS({
1686 1702
           printable: "dialysis-print-box-1",
@@ -1973,7 +1989,7 @@ export default {
1973 1989
           style: style14,
1974 1990
           scanStyles: false,
1975 1991
         });
1976
-        
1992
+
1977 1993
       }else if (
1978 1994
         this.org_template_info.template_id == 52
1979 1995
       ) {
@@ -1992,7 +2008,7 @@ export default {
1992 2008
           style: style12,
1993 2009
           scanStyles: false,
1994 2010
         });
1995
-        
2011
+
1996 2012
       }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
1997 2013
         printJS({
1998 2014
           printable: "dialysis-print-box-1",
@@ -2000,9 +2016,8 @@ export default {
2000 2016
           style: style2,
2001 2017
           scanStyles: false,
2002 2018
         });
2003
-        
2004 2019
       }
2005
-      // else if (this.org_template_info.template_id == 66 ) {
2020
+      // else if (this.org_template_info.template_id == 67 ) {
2006 2021
       //   printJS({
2007 2022
       //     printable: "dialysis-print-box-1",
2008 2023
       //     type: "html",
@@ -2019,7 +2034,7 @@ export default {
2019 2034
           style: style12,
2020 2035
           scanStyles: false,
2021 2036
         });
2022
-        
2037
+
2023 2038
       }
2024 2039
       else if (
2025 2040
         this.org_template_info.template_id == 54 || this.org_template_info.template_id == 57
@@ -2106,7 +2121,7 @@ export default {
2106 2121
           style: style,
2107 2122
           scanStyles: false,
2108 2123
         });
2109
-      } 
2124
+      }
2110 2125
     },
2111 2126
     printThisTwoPage() {
2112 2127
       var ptime = Math.round(new Date().getTime() / 1000);
@@ -2116,7 +2131,7 @@ export default {
2116 2131
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
2117 2132
       const style2 =
2118 2133
         '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
2119
-     
2134
+
2120 2135
       // 雷州惠爱样式
2121 2136
       const style93 ='@page {margin-top:10px;}@media print {.dialysis-print-order{width:960px;margin:0 auto;margin-top:30px;} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px} .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .print-table tbody tr td{border-collapse:collapse;} .dialysis-print-order .print-table .short_tr th p{height:20px !important; line-height:20px !important;} .list_table{border-collapse:collapse;height:40px;display: flex;justify-content: flex-start;} .list_table div{text-align: left;flex: 1;}  .list_table_1{height:40px;line-height:40px;text-align:left;border-collapse:collapse;} .list_table_1 div{height:40px;line-height:40px;white-space:normal;height: fit-content;} .dialysis-print-order .td_div1{display:flex;white-space: normal;} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-table tr th p{height: 20px; line-height: 20px}  .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}  .dialysis-print-order tbody .print-table tr{page-break-inside:avoid;} .dialysis-print-order tbody .print-table tr td{border: 1px solid #000;} ';
2122 2137
       if (this.org_template_info.template_id == 1) {
@@ -2176,7 +2191,7 @@ export default {
2176 2191
         });
2177 2192
       }
2178 2193
     },
2179
-   
2194
+
2180 2195
     getNumber() {
2181 2196
       if (this.dialysisOrder != null) {
2182 2197
         return (

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue 查看文件

@@ -777,7 +777,7 @@
777 777
             <td>{{ monitor.blood_flow_volume }}</td>
778 778
             <td>{{ monitor.venous_pressure }}</td>
779 779
             <td>{{ monitor.transmembrane_pressure }}</td>
780
-            <td>{{ monitor.ultrafiltration_rate }}</td>//
780
+            <td>{{ monitor.ultrafiltration_rate }}</td>
781 781
             <td>{{ monitor.ultrafiltration_volume }}</td>
782 782
             <td>{{ monitor.sodium_concentration }}</td>
783 783
             <td>

+ 15 - 37
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue 查看文件

@@ -80,11 +80,11 @@
80 80
                       class="under_line"
81 81
                       style="width: 50px; text-align: center"
82 82
                     >
83
-                      <span>{{
84
-                        patientInfo.DialysisSchedule.device_zone.name
85
-                          ? patientInfo.DialysisSchedule.device_zone.name
86
-                          : ""
87
-                      }}</span>
83
+                    <span>{{
84
+                      patientInfo.DialysisSchedule.device_zone.name
85
+                        ? patientInfo.DialysisSchedule.device_zone.name
86
+                        : "/"
87
+                    }}</span>
88 88
                     </div>
89 89
                   </div>
90 90
                   <div
@@ -100,38 +100,16 @@
100 100
                       class="under_line"
101 101
                       style="width: 50px; text-align: center"
102 102
                     >
103
-                      <!-- <span>{{
104
-                        (dialysisOrder &&
105
-                          dialysisOrder != null &&
106
-                          dialysisOrder.DeviceNumber &&
107
-                          dialysisOrder.DeviceNumber.number.length > 0) ||
108
-                        (dialysisOrder &&
109
-                          dialysisOrder != null &&
110
-                          receiverTreatmentAccess.condition &&
111
-                          receiverTreatmentAccess.condition != 1)
112
-                          ? patientInfo.DialysisSchedule.device_number.number
113
-                          : dialysisOrder.DeviceNumber.number
114
-                      }}</span> -->
115
-
116
-                      <span
117
-                        v-if="
118
-                          dialysisOrder == null ||
119
-                          receiverTreatmentAccess.condition != 1
120
-                        "
121
-                      >
122
-                        {{ patientInfo.DialysisSchedule.device_number.number }}
123
-                      </span>
124
-                      <span
125
-                        v-else-if="
126
-                          dialysisOrder &&
127
-                          dialysisOrder != null &&
128
-                          dialysisOrder.DeviceNumber &&
129
-                          receiverTreatmentAccess.condition == 1
130
-                        "
131
-                      >
132
-                        {{ dialysisOrder.DeviceNumber.number }}
133
-                      </span>
134
-                      <span v-else>/</span>
103
+                    <span>{{
104
+                      dialysisOrder &&
105
+                      dialysisOrder.DeviceNumber &&
106
+                      dialysisOrder.DeviceNumber.number.length > 0
107
+                        ? dialysisOrder.DeviceNumber.number
108
+                        : patientInfo.DialysisSchedule.device_number.number
109
+                    }}</span>
110
+              
111
+
112
+                     
135 113
                     </div>
136 114
                   </div>
137 115
                   <div

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue 查看文件

@@ -820,10 +820,10 @@
820 820
                         class="under_line"
821 821
                         style="width: 100px; text-align: center"
822 822
                       >
823
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956">{{
823
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10138 || org_id == 10278">{{
824 824
                           lastafterdialysis.weight_after
825 825
                         }}</span>
826
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956">{{
826
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id!=10138&&org_id!=10278">{{
827 827
                           predialysis.weight_after_last_transparency
828 828
                             ? predialysis.weight_after_last_transparency
829 829
                             : "未称重"

文件差异内容过多而无法显示
+ 1412 - 0
src/xt_pages/dialysis/template/DialysisPrintOrdersixtySeven.vue


+ 8 - 0
src/xt_pages/medicalScheduling/medical_print.vue 查看文件

@@ -29,6 +29,10 @@
29 29
                                     <td width="120">周五<br />({{ weekArr[4] }})</td>
30 30
                                     <td width="120">周六<br />({{ weekArr[5] }})</td>
31 31
                                     <td width="120">周日<br />({{ weekArr[6] }})</td>
32
+                                    <td width="120">调休<br /></td>
33
+                                    <td width="120">加班<br /></td>
34
+                                    <td width="120">累计时数<br /></td>
35
+                                    <td width="120">公休<br /></td>
32 36
                                 </tr>
33 37
                             </thead>
34 38
                             <tbody>
@@ -41,6 +45,10 @@
41 45
                                     <td>{{ getClass(item.user_name,5) }}</td>
42 46
                                     <td>{{ getClass(item.user_name,6) }}</td>
43 47
                                     <td>{{ getClass(item.user_name,0) }}</td>
48
+                                    <td></td>
49
+                                    <td></td>
50
+                                    <td></td>
51
+                                    <td></td>
44 52
                                 </tr>
45 53
                             </tbody>
46 54
                         </table>

+ 11 - 13
src/xt_pages/outpatientCharges/invoicePrint.vue 查看文件

@@ -10,9 +10,9 @@
10 10
         type="primary"
11 11
       >打印</el-button>
12 12
     </template>
13
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 0 && org_id != 10485 && org_id != 10375">
13
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 0 && org_id != 10485">
14 14
         <div class='dialysisPage'>
15
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 0 && org_id != 10387&& org_id != 10210" >
15
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 0 && org_id != 10387&& org_id != 10210 && org_id != 10387" >
16 16
             <printOne v-if="org_id != 10088 " :paramsObj="invoiceParams"></printOne>
17 17
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
18 18
           </div>
@@ -23,28 +23,26 @@
23 23
 <!--          <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
24 24
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
25 25
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>
26
+          <!-- <PrintTen v-if="org_id == 10375 ||org_id == 0 " :paramsObj="invoiceParams"></PrintTen> -->
26 27
         </div>
27 28
     </div>
28 29
 
29
-    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10485  ">
30
+    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10485 ">
30 31
       <div class='dialysisPage'>
31
-      <print-eleven :paramsObj="invoiceParams"></print-eleven>
32
+        <print-eleven :paramsObj="invoiceParams"></print-eleven>
32 33
       </div>
33 34
     </div>
34 35
 
35
-    <div class="app-container" style="" v-if="org_id == 10217 || org_id == 0">
36
+    <div class="app-container" style="" v-if="org_id == 10217">
36 37
       <div class='dialysisPage'>
37
-        <printSix  :paramsObj="invoiceParams"></printSix>
38
+        <printSix v-if="org_id == 10217  " :paramsObj="invoiceParams"></printSix>
38 39
       </div>
39 40
     </div>
40
-
41
-    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10375">
41
+    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10375 ||org_id == 0">
42 42
       <div class='dialysisPage'>
43 43
         <print-ten :paramsObj="invoiceParams"></print-ten>
44 44
       </div>
45 45
     </div>
46
-
47
-
48 46
   </div>
49 47
 </template>
50 48
 
@@ -59,12 +57,11 @@
59 57
   import printEight from './invoiceTemplate/printEight'
60 58
   import PrintEight from "./invoiceTemplate/printEight";
61 59
   import PrintNight from "./invoiceTemplate/PrintNight";
62
-  import PrintEleven from './invoiceTemplate/printEleven.vue'
63 60
   import PrintTen from './invoiceTemplate/printTen.vue'
61
+  import PrintEleven from './invoiceTemplate/printEleven.vue'
64 62
   export default {
65 63
     name: "invoicePrint",
66 64
     components: {
67
-      PrintTen,
68 65
       PrintEleven,
69 66
       PrintNight,
70 67
       PrintEight,
@@ -74,7 +71,8 @@
74 71
       printFour,
75 72
       printFive,
76 73
       printSix,
77
-      printSeven
74
+      printSeven,
75
+      PrintTen,
78 76
     },
79 77
     props:{
80 78
       invoiceParams:Object

+ 54 - 53
src/xt_pages/outpatientCharges/invoiceTemplate/printEleven.vue 查看文件

@@ -1,123 +1,124 @@
1 1
 <template>
2 2
   <div id='invoice-print' style="position: relative;">
3 3
     <div>
4
-      <div style="display: inline-block; position: absolute;top: 100px;left: 100px;">{{list.order.mdtrt_id}}</div>
5
-      <div style="display: inline-block; position: absolute;top: 100px;left: 300px;">{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</div>
6
-      <div style="display: inline-block; position: absolute;top: 100px;left: 350px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</div>
7
-      <div style="display: inline-block; position: absolute;top: 100px;left: 400px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</div>
4
+      <div style="display: inline-block; position: absolute;top: 30px;left: 30px;">{{list.order.mdtrt_id}}</div>
5
+      <div style="display: inline-block; position: absolute;top: 30px;left: 230px;">{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</div>
6
+      <div style="display: inline-block; position: absolute;top: 30px;left: 280px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</div>
7
+      <div style="display: inline-block; position: absolute;top: 30px;left: 330px;">{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</div>
8 8
     </div>
9 9
     <div>
10
-      <div style="position: absolute;top: 120px;left: 115px;">{{ paramsObj.name }}</div>
10
+      <div style="position: absolute;top: 50px;left: 60px;">{{ paramsObj.name }}</div>
11 11
       <div style="display:flex;justify-content: space-between;">
12
-          <div  style="position: absolute;top:120px;left:308px;">√</div>
13
-          <div  style="position: absolute;top:120px;left:366px;"></div>
14
-          <div  style="position: absolute;top:120px;left:425px;"></div>
12
+          <div  style="position: absolute;top:50px;left:260px;">√</div>
13
+          <div  style="position: absolute;top:50px;left:220px;"></div>
14
+          <div  style="position: absolute;top:50px;left:250px;"></div>
15 15
       </div>
16 16
       <div style="display:flex;justify-content: space-between;">
17
-          <div  style="position: absolute;top:120px;left:555px;" v-if="list.gender == 1">√</div>
18
-          <div  style="position: absolute;top:120px;left:599px;" v-else-if="list.gender == 2">√</div>
17
+          <div  style="position: absolute;top:50px;left:480px;" v-if="list.gender == 1">√</div>
18
+          <div  style="position: absolute;top:50px;left:540px;" v-else-if="list.gender == 2">√</div>
19 19
       </div>
20 20
     </div>
21 21
     <div style="display:flex;justify-content: space-between;">
22
-      <div  style="position: absolute;top:146px;left:180px;">医保</div>
23
-      <div  style="position: absolute;top:146px;left:360px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (list.psn_cash_money).toFixed(2) }}</div>
24
-      <div  style="position: absolute;top:146px;left:540px;">现金</div>
22
+      <div  style="position: absolute;top:68px;left:120px;">医保</div>
23
+      <div  style="position: absolute;top:68px;left:300px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (list.psn_cash_money).toFixed(2) }}</div>
24
+      <div  style="position: absolute;top:68px;left:480px;">现金</div>
25 25
     </div>
26 26
     <div style="display:flex;justify-content: space-between;">
27
-      <div  style="position: absolute;top:172px;left:100px;">西药</div>
28
-      <div  style="position: absolute;top:172px;left:160px;">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
29
-      <div  style="position: absolute;top:172px;left:220px;">检查费</div>
30
-      <div  style="position: absolute;top:172px;left:280px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
31
-      <div  style="position: absolute;top:172px;left:340px;">治疗费</div>
32
-      <div  style="position: absolute;top:172px;left:400px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
33
-      <div  style="position: absolute;top:172px;left:518px;">床位费</div>
34
-      <div  style="position: absolute;top:172px;left:578px;">{{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : '' }}</div>
27
+      <div  style="position: absolute;top:124px;left:0px;">西药</div>
28
+      <div  style="position: absolute;top:124px;left:60px;">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
29
+      <div  style="position: absolute;top:124px;left:120px;">检查费</div>
30
+      <div  style="position: absolute;top:124px;left:180px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
31
+      <div  style="position: absolute;top:124px;left:240px;">治疗费</div>
32
+      <div  style="position: absolute;top:124px;left:320px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
33
+      <div  style="position: absolute;top:124px;left:410px;">床位费</div>
34
+      <div  style="position: absolute;top:124px;left:480px;">{{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : '' }}</div>
35 35
     </div>
36 36
     <div style="display:flex;justify-content: space-between;">
37
-      <div  style="position: absolute;top:198px;left:100px;">中成药</div>
38
-      <div  style="position: absolute;top:198px;left:160px;">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
39
-      <div  style="position: absolute;top:198px;left:220px;">化验费</div>
40
-      <div  style="position: absolute;top:198px;left:280px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
41
-      <div  style="position: absolute;top:198px;left:340px;">手术费</div>
42
-      <div  style="position: absolute;top:198px;left:400px;">{{ list.operationCostTotal ? list.operationCostTotal.toFixed(2) : '' }}</div>
43
-      <div  style="position: absolute;top:198px;left:518px;">其他费</div>
44
-      <div  style="position: absolute;top:198px;left:578px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
37
+      <div  style="position: absolute;top:150px;left:0px;">中成药</div>
38
+      <div  style="position: absolute;top:150px;left:60px;">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
39
+      <div  style="position: absolute;top:150px;left:120px;">化验费</div>
40
+      <div  style="position: absolute;top:150px;left:180px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
41
+      <div  style="position: absolute;top:150px;left:240px;">手术费</div>
42
+      <div  style="position: absolute;top:150px;left:320px;">{{ list.operationCostTotal ? list.operationCostTotal.toFixed(2) : '' }}</div>
43
+      <div  style="position: absolute;top:150px;left:410px;">其他费</div>
44
+      <div  style="position: absolute;top:150px;left:480px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
45 45
     </div>
46 46
     <div style="display:flex;justify-content: space-between;">
47
-      <div  style="position: absolute;top:224px;left:100px;">诊察费</div>
48
-      <div  style="position: absolute;top:224px;left:160px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
49
-      <div  style="position: absolute;top:224px;left:220px;">材料费</div>
50
-      <div  style="position: absolute;top:224px;left:280px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
51
-      <div  style="position: absolute;top:224px;left:340px;"></div>
52
-      <div  style="position: absolute;top:224px;left:400px;"></div>
53
-      <div  style="position: absolute;top:224px;left:518px;"></div>
54
-      <div  style="position: absolute;top:224px;left:578px;"></div>
47
+      <div  style="position: absolute;top:176px;left:0px;">诊察费</div>
48
+      <div  style="position: absolute;top:176px;left:60px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
49
+      <div  style="position: absolute;top:176px;left:120px;">材料费</div>
50
+      <div  style="position: absolute;top:176px;left:180px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
51
+      <div  style="position: absolute;top:176px;left:240px;"></div>
52
+      <div  style="position: absolute;top:176px;left:320px;"></div>
53
+      <div  style="position: absolute;top:176px;left:410px;"></div>
54
+      <div  style="position: absolute;top:176px;left:480px;"></div>
55 55
     </div>
56 56
     <div style="display:flex;justify-content: space-between;">
57
-      <div  style="position: absolute;top:250px;left:160px;"></div>
58
-      <div  style="position: absolute;top:250px;left:280px;"></div>
59
-      <div  style="position: absolute;top:250px;left:400px;"></div>
60
-      <div  style="position: absolute;top:250px;left:578px;"></div>
57
+      <div  style="position: absolute;top:202px;left:60px;"></div>
58
+      <div  style="position: absolute;top:202px;left:180px;"></div>
59
+      <div  style="position: absolute;top:202px;left:320px;"></div>
60
+      <div  style="position: absolute;top:202px;left:480px;"></div>
61 61
     </div>
62 62
     <div>
63 63
       <span>
64
-        <span  style="position: absolute;top:276px;left:210px">
64
+        <span  style="position: absolute;top:230px;left:120px">
65 65
           <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
66 66
                     {{ zhongwen.substring(0,1) }}
67 67
                 </span>
68 68
                 <span v-else>零</span>
69 69
         </span>
70
-        <span  style="position: absolute;top:276px;left:260px">
70
+        <span  style="position: absolute;top:230px;left:160px">
71 71
             <span v-if="zhongwen.indexOf('万') > -1">
72 72
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
73 73
                 </span>
74 74
                 <span v-else>零</span>
75 75
         </span>
76
-        <span  style="position: absolute;top:276px;left:310px">
76
+        <span  style="position: absolute;top:230px;left:210px">
77 77
             <span v-if="zhongwen.indexOf('仟') > -1">
78 78
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
79 79
                 </span>
80 80
                 <span v-else>零</span>
81 81
         </span>
82
-        <span  style="position: absolute;top:276px;left:360px">
82
+        <span  style="position: absolute;top:230px;left:260px">
83 83
             <span v-if="zhongwen.indexOf('佰') > -1">
84 84
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
85 85
                 </span>
86 86
                 <span v-else>零</span>
87 87
         </span>
88
-        <span style="position: absolute;top:276px;left:410px">
88
+        <span style="position: absolute;top:230px;left:310px">
89 89
             <span v-if="zhongwen.indexOf('拾') > -1">
90 90
                     {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
91 91
                 </span>
92 92
                 <span v-else>零</span>
93 93
         </span>
94
-        <span  style="position: absolute;top:276px;left:460px">
94
+        <span  style="position: absolute;top:230px;left:360px">
95 95
            <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
96 96
                     {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
97 97
                 </span>
98 98
                 <span v-else>零</span>
99 99
         </span>
100
-        <span  style="position: absolute;top:276px;left:510px">
100
+        <span  style="position: absolute;top:230px;left:420px">
101 101
              <span v-if="zhongwen.indexOf('角') > -1">
102 102
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
103 103
                 </span>
104 104
                 <span v-else>零</span>
105 105
         </span>
106 106
 
107
-        <span  style="position: absolute;top:276px;left:560px">
107
+        <span  style="position: absolute;top:230px;left:480px">
108 108
              <span v-if="zhongwen.indexOf('分') > -1">
109 109
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
110 110
                 </span>
111 111
                 <span v-else>零</span>
112 112
         </span>
113 113
       </span>
114
-      <span style="position: absolute;top:276px;left:580px">{{ totalPrice.toFixed(2) }}</span>
114
+      <span style="position: absolute;top:230px;left:530px">{{ totalPrice.toFixed(2) }}</span>
115 115
     </div>
116 116
 
117
+
117 118
     <div style="display:flex;justify-content: space-between;">
118
-      <div style="position: absolute;top:365px;left:180px;">{{ org_name}}</div>
119
-      <div style="position: absolute;top:365px;left:340px;"></div>
120
-      <div style="position: absolute;top:365px;left:490px;">{{list.admin_user_name}}</div>
119
+      <div style="position: absolute;top:283px;left:100px;">阳春{{ org_name}}</div>
120
+      <div style="position: absolute;top:283px;left:240px;"></div>
121
+      <div style="position: absolute;top:283px;left:410px;">{{list.admin_user_name}}</div>
121 122
     </div>
122 123
   </div>
123 124
 </template>

+ 279 - 25
src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue 查看文件

@@ -1,12 +1,12 @@
1 1
 <template>
2 2
   <div id='invoice-print'>
3 3
     <div v-for='(i,index) in pageArr.length' :key="index" >
4
-      <div :style="{position: 'absolute',top:(20 + (index * 520))  + 'px',left:200+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
5
-      <div :style="{position: 'absolute',top:(70 + (index * 520))  + 'px',left:150+ 'px',}">{{ list.order_number }}</div>
4
+      <div :style="{position: 'absolute',top:(30 + (index * 415))  + 'px',left:200+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
5
+      <div :style="{position: 'absolute',top:(70 + (index * 415))  + 'px',left:150+ 'px',}">{{ list.order_number }}</div>
6 6
       <div style="display:flex;justify-content: space-between;">
7
-        <div :style="{position: 'absolute',top:(100 + (index * 520))  + 'px',left:100+ 'px',}">{{ paramsObj.name }}</div>
7
+        <div :style="{position: 'absolute',top:(100 + (index * 415))  + 'px',left:100+ 'px',}">{{ paramsObj.name }}</div>
8 8
       </div>
9
-      <div :style="{position: 'absolute',top:(190 + (index * 520))  + 'px',left:120+ 'px',}">
9
+      <div :style="{position: 'absolute',top:(190 + (index * 415))  + 'px',left:120+ 'px',}">
10 10
         <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
11 11
         <div v-if="list.treatCostTotal">治疗费 {{ list.treatCostTotal }}</div>
12 12
         <div v-if="list.bedCostTotal">床位费 {{ list.bedCostTotal }}</div>
@@ -16,9 +16,9 @@
16 16
         <div v-if="list.otherCostTotal">其他费 {{ list.otherCostTotal }}</div>
17 17
         <div v-if="list.materialCostTotal">材料费 {{ list.materialCostTotal }}</div>
18 18
       </div>
19
-      <div :style="{position: 'absolute',top:(190 + (index * 520))  + 'px',left:300+ 'px'}">
19
+      <div :style="{position: 'absolute',top:(190 + (index * 420))  + 'px',left:300+ 'px'}">
20 20
         <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])">
21
-                    <span style="display:inline-block;width:200px;">
21
+                    <span style="display:inline-block;width:300px;">
22 22
                         <span v-if="item.advice.id == 0">
23 23
                             <span v-if="item.project.type == 2"> {{ item.project.project.project_name }}</span>
24 24
                             <span v-if="item.project.type == 3">{{ item.project.good_info.good_name }}</span>
@@ -41,47 +41,301 @@
41 41
                     </span>
42 42
         </div>
43 43
       </div>
44
-      <div :style="{position: 'absolute',top:(390 + (index * 520))  + 'px',left:130+ 'px'}">{{ zhongwen }}</div>
45
-      <div :style="{position: 'absolute',top:(390 + (index * 520))  + 'px',left:480+ 'px'}">{{ list.medfee_sumamt }}</div>
46
-      <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(410 + (index * 520))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
44
+      <div :style="{position: 'absolute',top:(350 + (index * 415))  + 'px',left:130+ 'px'}">{{ zhongwen }}</div>
45
+      <div :style="{position: 'absolute',top:(350 + (index * 415))  + 'px',left:480+ 'px'}">{{ list.medfee_sumamt }}</div>
46
+      <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(370 + (index * 415))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
47 47
         <div style="display:flex;">
48 48
           <div style="width:140px">医疗总费用:{{ list.order.medfee_sumamt }}</div>
49 49
           <div style="width:140px">基金支付总额:{{ list.order.fund_pay_sumamt }}</div>
50 50
           <div style="width:140px">统筹支出:{{ list.order.hifp_pay }}</div>
51 51
           <div style="width:140px">大病支出:{{list.order.hifmi_pay}}</div>
52
+          <div style="width:140px">个人账户支付:{{ list.order.acct_pay }}</div>
53
+          <div style="width:140px">现金支出:{{ list.order.psn_cash_pay }}</div>
54
+          <div style="width:220px">医疗救助基金支出:{{ list.order.maf_pay }}</div>
52 55
 
53 56
         </div>
54 57
         <div style="display:flex;">
55
-          <div style="width:140px">个人账户支付:{{ list.order.acct_pay }}</div>
56
-          <div style="width:140px">现金支出:{{ list.order.psn_cash_pay }}</div>
57 58
           <div style="width:140px">本次账户:0</div>
58 59
           <div style="width:140px">上次账户:0</div>
59
-        </div>
60
-        <div style="display:flex;">
61 60
           <div style="width:140px">账户余额:{{ list.order.balc }}</div>
62 61
           <div style="width:140px">其他支出:{{ list.order.oth_pay }}</div>
63 62
           <div style="width:140px">大病补充保险支出:0</div>
64 63
           <div style="width:140px">民政支出:0</div>
64
+          <div style="width:280px">企业补充医疗保险基金支出:{{ list.order.hifes_pay }}</div>
65 65
         </div>
66
+
67
+      </div>
68
+      <div v-if="index != pageArr.length - 1">
69
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
70
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:410+ 'px'}">{{ paramsObj.chargeName }}</div>
71
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:550+ 'px'}">
72
+          <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
73
+        </div>
74
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:610+ 'px'}">
75
+          <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
76
+        </div>
77
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:650+ 'px'}">
78
+          <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
79
+        </div>
80
+      </div>
81
+
82
+      <div v-if="index == pageArr.length - 1">
83
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
84
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:410+ 'px'}">{{ paramsObj.chargeName }}</div>
85
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:550+ 'px'}">
86
+          <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
87
+        </div>
88
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:610+ 'px'}">
89
+          <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
90
+        </div>
91
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:650+ 'px'}">
92
+          <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
93
+        </div>
94
+      </div>
95
+
96
+    </div>
97
+  </div>
98
+</template>
99
+
100
+
101
+<script>
102
+import { getInvoice } from '@/api/project/project'
103
+import { uParseTime } from '@/utils/tools'
104
+export default {
105
+  props:{
106
+    paramsObj:Object
107
+  },
108
+  data(){
109
+    return{
110
+      list:{},
111
+      printDate:'',
112
+      zhongwen:'',
113
+      totalPrice:0.0,
114
+      org_id:'',
115
+      org_name:'',
116
+      page:1,
117
+      pageArr:[],
118
+    }
119
+  },
120
+  created(){
121
+    console.log('paramsObj',this.paramsObj)
122
+    let params = {
123
+      order_id: this.paramsObj.order_id,
124
+      patient_id: this.paramsObj.patient_id,
125
+    }
126
+    this.getInvoice(params)
127
+    // var data = new Date();
128
+    // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
129
+    // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
130
+    // this.printDate = data.getFullYear() + "-" + month + "-" + date;
131
+    // this.smalltoBIG(982732.21)
132
+    this.org_id = this.$store.getters.xt_user.org_id
133
+    this.org_name = this.$store.getters.xt_user.org.org_name
134
+  },
135
+  methods:{
136
+    getInvoice(params){
137
+      getInvoice(params).then((res) => {
138
+        // console.log('res',res)
139
+        this.list = res.data.data
140
+        // console.log(this.list,'表单内容打印记得注释')
141
+        this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
142
+          this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
143
+        this.smalltoBIG(this.list.medfee_sumamt)
144
+        var data = new Date(res.data.data.date * 1000);
145
+        var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
146
+        var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
147
+        this.printDate = data.getFullYear() + "-" + month + "-" + date;
148
+        this.pageArr = []
149
+        this.getPage()
150
+        this.pageArr.push(9)
151
+        console.log('pageArr',this.pageArr.length)
152
+      })
153
+    },
154
+    smalltoBIG(n) {
155
+      // let fraction = ['角', '分'];
156
+      // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
157
+      // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
158
+      // let head = price < 0 ? '欠' : '';
159
+      // price = Math.abs(price);
160
+      // let upper = '';
161
+      // for (let i = 0; i < fraction.length; i++) {
162
+      // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
163
+      // }
164
+      // upper = upper || '整';
165
+      // price = Math.floor(price);
166
+      // for (let i = 0; i < unit[0].length && price > 0; i++) {
167
+      // let p = '';
168
+      // for (let j = 0; j < unit[1].length && price > 0; j++) {
169
+      //     p = digit[price % 10] + unit[1][j] + p;
170
+      //     price = Math.floor(price / 10);
171
+      // }
172
+      // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
173
+      // }
174
+      // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
175
+      // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
176
+      if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
177
+        return "数据非法";  //判断数据是否大于0
178
+      }
179
+
180
+      var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
181
+      n += "00";
182
+
183
+      var indexpoint = n.indexOf('.');  // 如果是小数,截取小数点前面的位数
184
+
185
+      if (indexpoint >= 0){
186
+
187
+        n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数,截取需要使用的unit单位
188
+      }
189
+
190
+      unit = unit.substr(unit.length - n.length);  // 若为整数,截取需要使用的unit单位
191
+      for (var i=0; i < n.length; i++){
192
+        str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
193
+      }
194
+      console.log("str",str)
195
+      if(str == '零元零角零分'){
196
+        this.zhongwen = '零'
197
+      }else{
198
+        this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
199
+      }
200
+
201
+      console.log(this.zhongwen)
202
+    },
203
+    getTime(value, temp) {
204
+      if (value == 0) {
205
+        return ''
206
+      }
207
+      if (value != undefined) {
208
+        return uParseTime(value, temp)
209
+      }
210
+      return ''
211
+    },
212
+    getPage(){
213
+      if(this.list.order_info.length <= 9){
214
+        this.page = 1
215
+        this.pageArr.push(this.list.order_info.length)
216
+      }else if(this.list.order_info.length > 9){
217
+        this.page = parseInt(this.list.order_info.length / 9)
218
+        let num = this.list.order_info.length % 9
219
+        for (var i=0;i<this.page;i++){
220
+          this.pageArr.push(9)
221
+        }
222
+        if(num != 0){
223
+          this.pageArr.push(num)
224
+        }
225
+      }
226
+    }
227
+
228
+  },
229
+  watch:{
230
+    paramsObj:{//深度监听,可监听到对象、数组的变化
231
+      handler(val, oldVal){
232
+        let params = {
233
+          order_id: val.order_id,
234
+          patient_id: val.patient_id,
235
+        }
236
+        this.getInvoice(params)
237
+
238
+      },
239
+      deep:true
240
+    }
241
+  }
242
+}
243
+</script>
244
+<template>
245
+  <div id='invoice-print'>
246
+    <div v-for='(i,index) in pageArr.length' :key="index" >
247
+      <div :style="{position: 'absolute',top:(30 + (index * 415))  + 'px',left:200+ 'px',}">盐城大丰悦达金骆驼血液透析中心</div>
248
+      <div :style="{position: 'absolute',top:(70 + (index * 415))  + 'px',left:150+ 'px',}">{{ list.order_number }}</div>
249
+      <div style="display:flex;justify-content: space-between;">
250
+        <div :style="{position: 'absolute',top:(100 + (index * 415))  + 'px',left:100+ 'px',}">{{ paramsObj.name }}</div>
251
+      </div>
252
+      <div :style="{position: 'absolute',top:(190 + (index * 415))  + 'px',left:120+ 'px',}">
253
+        <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
254
+        <div v-if="list.treatCostTotal">治疗费 {{ list.treatCostTotal }}</div>
255
+        <div v-if="list.bedCostTotal">床位费 {{ list.bedCostTotal }}</div>
256
+        <div v-if="list.chineseTraditionalMedicineCostTotal">中成药 {{ list.chineseTraditionalMedicineCostTotal }}</div>
257
+        <div v-if="list.laboratoryCostTotal">化验费 {{ list.laboratoryCostTotal }}</div>
258
+        <div v-if="list.operationCostTotal">手术费 {{ list.operationCostTotal }}</div>
259
+        <div v-if="list.otherCostTotal">其他费 {{ list.otherCostTotal }}</div>
260
+        <div v-if="list.materialCostTotal">材料费 {{ list.materialCostTotal }}</div>
261
+      </div>
262
+      <div :style="{position: 'absolute',top:(190 + (index * 420))  + 'px',left:300+ 'px'}">
263
+        <div v-for="item in list.order_info.slice(index * 10,(index * 10) + pageArr[index])">
264
+                    <span style="display:inline-block;width:300px;">
265
+                        <span v-if="item.advice.id == 0">
266
+                            <span v-if="item.project.type == 2"> {{ item.project.project.project_name }}</span>
267
+                            <span v-if="item.project.type == 3">{{ item.project.good_info.good_name }}</span>
268
+                        </span>
269
+                        <span v-else>{{ item.advice.advice_name }}</span>
270
+                    </span>
271
+          <span style="display:inline-block;width:50px;">
272
+                        <span v-if="item.advice.id == 0">
273
+                            <span v-if="item.project.type == 2">{{ item.project.count }}{{ item.project.unit }}</span>
274
+                            <span v-if="item.project.type == 3">{{ item.project.count }}{{ item.project.unit }}</span>
275
+                        </span>
276
+                        <span v-else>{{ item.advice.prescribing_number }}{{ item.advice.prescribing_number_unit }}</span>
277
+                    </span>
278
+          <span>
279
+                        <span v-if="item.advice.id == 0">
280
+                            <span v-if="item.project.type == 2">{{ (item.project.count * item.pric).toFixed(2) }}</span>
281
+                            <span v-if="item.project.type == 3">{{ (item.project.count * item.pric).toFixed(2) }}</span>
282
+                        </span>
283
+                        <span v-else>{{ (item.advice.prescribing_number * item.pric).toFixed(2) }}</span>
284
+                    </span>
285
+        </div>
286
+      </div>
287
+      <div :style="{position: 'absolute',top:(350 + (index * 415))  + 'px',left:130+ 'px'}">{{ zhongwen }}</div>
288
+      <div :style="{position: 'absolute',top:(350 + (index * 415))  + 'px',left:480+ 'px'}">{{ list.medfee_sumamt }}</div>
289
+      <div v-if="index == pageArr.length - 1" :style="{position: 'absolute',top:(370 + (index * 415))  + 'px',left:110+ 'px',width:100 + '%',fontSize:12+'px'}">
66 290
         <div style="display:flex;">
291
+          <div style="width:140px">医疗总费用:{{ list.order.medfee_sumamt }}</div>
292
+          <div style="width:140px">基金支付总额:{{ list.order.fund_pay_sumamt }}</div>
293
+          <div style="width:140px">统筹支出:{{ list.order.hifp_pay }}</div>
294
+          <div style="width:140px">大病支出:{{list.order.hifmi_pay}}</div>
295
+          <div style="width:140px">个人账户支付:{{ list.order.acct_pay }}</div>
296
+          <div style="width:140px">现金支出:{{ list.order.psn_cash_pay }}</div>
67 297
           <div style="width:220px">医疗救助基金支出:{{ list.order.maf_pay }}</div>
298
+
299
+        </div>
300
+        <div style="display:flex;">
301
+          <div style="width:140px">本次账户:0</div>
302
+          <div style="width:140px">上次账户:0</div>
303
+          <div style="width:140px">账户余额:{{ list.order.balc }}</div>
304
+          <div style="width:140px">其他支出:{{ list.order.oth_pay }}</div>
305
+          <div style="width:140px">大病补充保险支出:0</div>
306
+          <div style="width:140px">民政支出:0</div>
68 307
           <div style="width:280px">企业补充医疗保险基金支出:{{ list.order.hifes_pay }}</div>
69 308
         </div>
70 309
 
71 310
       </div>
72
-      <div>
73
-        <div :style="{position: 'absolute',top:(480 + (index * 520))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
74
-        <div :style="{position: 'absolute',top:(480 + (index * 520))  + 'px',left:410+ 'px'}">{{ paramsObj.chargeName }}</div>
75
-        <div :style="{position: 'absolute',top:(480 + (index * 520))  + 'px',left:550+ 'px'}">
311
+      <div v-if="index != pageArr.length - 1">
312
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
313
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:410+ 'px'}">{{ paramsObj.chargeName }}</div>
314
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:550+ 'px'}">
315
+          <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
316
+        </div>
317
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:610+ 'px'}">
318
+          <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
319
+        </div>
320
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:650+ 'px'}">
321
+          <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
322
+        </div>
323
+      </div>
324
+
325
+      <div v-if="index == pageArr.length - 1">
326
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:140+ 'px'}">盐城大丰悦达金骆驼血液透析中心</div>
327
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:410+ 'px'}">{{ paramsObj.chargeName }}</div>
328
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:550+ 'px'}">
76 329
           <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
77 330
         </div>
78
-        <div :style="{position: 'absolute',top:(480 + (index * 520))  + 'px',left:610+ 'px'}">
331
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:610+ 'px'}">
79 332
           <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
80 333
         </div>
81
-        <div :style="{position: 'absolute',top:(480 + (index * 520))  + 'px',left:650+ 'px'}">
334
+        <div :style="{position: 'absolute',top:(400 + (index * 415))  + 'px',left:650+ 'px'}">
82 335
           <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
83 336
         </div>
84 337
       </div>
338
+
85 339
     </div>
86 340
   </div>
87 341
 </template>
@@ -136,7 +390,7 @@ export default {
136 390
         this.printDate = data.getFullYear() + "-" + month + "-" + date;
137 391
         this.pageArr = []
138 392
         this.getPage()
139
-        this.pageArr.push(10)
393
+        this.pageArr.push(9)
140 394
         console.log('pageArr',this.pageArr.length)
141 395
       })
142 396
     },
@@ -199,14 +453,14 @@ export default {
199 453
       return ''
200 454
     },
201 455
     getPage(){
202
-      if(this.list.order_info.length <= 10){
456
+      if(this.list.order_info.length <= 9){
203 457
         this.page = 1
204 458
         this.pageArr.push(this.list.order_info.length)
205
-      }else if(this.list.order_info.length > 10){
206
-        this.page = parseInt(this.list.order_info.length / 10)
207
-        let num = this.list.order_info.length % 10
459
+      }else if(this.list.order_info.length > 9){
460
+        this.page = parseInt(this.list.order_info.length / 9)
461
+        let num = this.list.order_info.length % 9
208 462
         for (var i=0;i<this.page;i++){
209
-          this.pageArr.push(10)
463
+          this.pageArr.push(9)
210 464
         }
211 465
         if(num != 0){
212 466
           this.pageArr.push(num)

+ 119 - 120
src/xt_pages/outpatientCharges/invoiceTemplate/printTen.vue 查看文件

@@ -1,141 +1,140 @@
1 1
 <template>
2 2
   <div id='invoice-print' style="position: relative;">
3
-    <div style="display: flex;width: 575px;margin-bottom: 5px; position: absolute; top: 70px;right: 1px;">
4
-      {{printDate}}
5
-    </div>
6
-    <div style="display: flex; justify-content: space-between;width: 573px;">
7
-      <div style="position: absolute;top: 85px;">
8
-        <span>{{paramsObj.name}}</span>
9
-        <span></span>
10
-        <span style="margin-left: 60px;" v-if="list.gender == 1">女</span>
11
-        <span style="margin-left: 60px;" v-else-if="list.gender == 2">男</span>
3
+    <div style="border: 1px solid black;padding: 5px;width:600px;min-height:390px;">
4
+      <div style="display: flex;width: 575px;margin-bottom: 5px; position: absolute; top: 70px;left: 522px;">
5
+        {{printDate}}
6
+      </div>
7
+      <div style="display: flex; justify-content: space-between;width: 573px;">
8
+        <div style="position: absolute;top: 85px;">
9
+          <span>{{paramsObj.name}}</span>
10
+          <span></span>
11
+          <span style="margin-left: 60px;" v-if="list.gender == 1">女</span>
12
+          <span style="margin-left: 60px;" v-else-if="list.gender == 2">男</span>
12 13
 
13
-        <span></span>
14
+          <span></span>
15
+        </div>
16
+        <div style="position: absolute;top: 85px;left: 351px;">
17
+          <span style="margin-right: 60px;"></span>
18
+        </div>
14 19
       </div>
15
-      <div style="position: absolute;top: 85px;left: 351px;">
16
-        <span style="margin-right: 60px;"></span>
20
+      <div style="display:flex;justify-content: space-between;">
21
+        <div style="position: absolute;top:120px;left:80px">西药费</div>
22
+        <div style="position: absolute;top:120px;left:171px">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
23
+        <div style="position: absolute;top:120px;left:262px">检查费</div>
24
+        <div style="position: absolute;top:120px;left:353px">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
25
+        <div style="position: absolute;top:120px;left:444px">治疗费</div>
26
+        <div style="position: absolute;top:120px;left:535px">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
17 27
       </div>
18
-    </div>
19
-    <div style="display:flex;justify-content: space-between;">
20
-      <div style="position: absolute;top:120px;left:80px">西药费</div>
21
-      <div style="position: absolute;top:120px;left:171px">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
22
-      <div style="position: absolute;top:120px;left:262px">检查费</div>
23
-      <div style="position: absolute;top:120px;left:353px">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
24
-      <div style="position: absolute;top:120px;left:444px">治疗费</div>
25
-      <div style="position: absolute;top:120px;left:535px">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
26
-    </div>
27
-
28
-    <div style="display:flex;justify-content: space-between;">
29
-      <div style="position: absolute;top:140px;left:80px">床位费</div>
30
-      <div style="position: absolute;top:140px;left:171px">{{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : '' }}</div>
31
-      <div style="position: absolute;top:140px;left:262px">中成药</div>
32
-      <div style="position: absolute;top:140px;left:353px">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
33
-      <div style="position: absolute;top:140px;left:444px">化验费</div>
34
-      <div style="position: absolute;top:140px;left:535px">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
35
-    </div>
36
-
37
-    <div style="display:flex;justify-content: space-between;">
38
-      <div style="position: absolute;top:160px;left:80px">手术费</div>
39
-      <div style="position: absolute;top:160px;left:171px">{{ list.operationCostTotal ? list.operationCostTotal.toFixed(2) : '' }}</div>
40
-      <div style="position: absolute;top:160px;left:262px">中成药</div>
41
-      <div style="position: absolute;top:160px;left:353px">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
42
-      <div style="position: absolute;top:160px;left:444px">其他费</div>
43
-      <div style="position: absolute;top:160px;left:535px">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
44
-    </div>
45
-
46
-    <div style="display:flex;justify-content: space-between;">
47
-      <div style="position: absolute;top:180px;left:80px">诊察费</div>
48
-      <div style="position: absolute;top:180px;left:171px">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
49
-      <div style="position: absolute;top:180px;left:262px">材料费</div>
50
-      <div style="position: absolute;top:180px;left:353px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
51
-    </div>
52 28
 
29
+      <div style="display:flex;justify-content: space-between;">
30
+        <div style="position: absolute;top:140px;left:80px">床位费</div>
31
+        <div style="position: absolute;top:140px;left:171px">{{ list.bedCostTotal ? list.bedCostTotal.toFixed(2) : '' }}</div>
32
+        <div style="position: absolute;top:140px;left:262px">中成药</div>
33
+        <div style="position: absolute;top:140px;left:353px">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
34
+        <div style="position: absolute;top:140px;left:444px">化验费</div>
35
+        <div style="position: absolute;top:140px;left:535px">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
36
+      </div>
53 37
 
38
+      <div style="display:flex;justify-content: space-between;">
39
+        <div style="position: absolute;top:160px;left:80px">手术费</div>
40
+        <div style="position: absolute;top:160px;left:171px">{{ list.operationCostTotal ? list.operationCostTotal.toFixed(2) : '' }}</div>
41
+        <div style="position: absolute;top:160px;left:262px">中成药</div>
42
+        <div style="position: absolute;top:160px;left:353px">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
43
+        <div style="position: absolute;top:160px;left:444px">其他费</div>
44
+        <div style="position: absolute;top:160px;left:535px">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
45
+      </div>
54 46
 
55
-    <div>
56
-      <span>
57
-      <span  style="position: absolute;top:230px;left:120px">
58
-         <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
59
-                    {{ zhongwen.substring(0,1) }}
60
-                </span>
61
-                <span v-else>零</span>
47
+      <div style="display:flex;justify-content: space-between;">
48
+        <div style="position: absolute;top:180px;left:80px">诊察费</div>
49
+        <div style="position: absolute;top:180px;left:171px">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
50
+        <div style="position: absolute;top:180px;left:262px">材料费</div>
51
+        <div style="position: absolute;top:180px;left:353px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
52
+      </div>
62 53
 
63
-      </span>
64
-      <span  style="position: absolute;top:230px;left:140px">
65
-           <span v-if="zhongwen.indexOf('万') > -1">
66
-                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
67
-                </span>
68
-                <span v-else>零</span>
54
+      <div>
55
+        <span>
56
+        <span  style="position: absolute;top:230px;left:120px">
57
+          <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
58
+                      {{ zhongwen.substring(0,1) }}
59
+                  </span>
60
+                  <span v-else>零</span>
69 61
 
70
-      </span>
71
-      <span  style="position: absolute;top:230px;left:160px">
72
-        <span v-if="zhongwen.indexOf('仟') > -1">
73
-                    {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
74
-                </span>
75
-                <span v-else>零</span>
62
+        </span>
63
+        <span  style="position: absolute;top:230px;left:140px">
64
+            <span v-if="zhongwen.indexOf('万') > -1">
65
+                      {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
66
+                  </span>
67
+                  <span v-else>零</span>
76 68
 
77
-      </span>
78
-      <span  style="position: absolute;top:230px;left:180px">
79
-          <span v-if="zhongwen.indexOf('') > -1">
80
-                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
81
-                </span>
82
-                <span v-else>零</span>
69
+        </span>
70
+        <span  style="position: absolute;top:230px;left:160px">
71
+          <span v-if="zhongwen.indexOf('') > -1">
72
+                      {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
73
+                  </span>
74
+                  <span v-else>零</span>
83 75
 
84
-      </span>
85
-      <span style="position: absolute;top:230px;left:200px">
86
-          <span v-if="zhongwen.indexOf('拾') > -1">
87
-                    {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
88
-                </span>
89
-                <span v-else>零</span>
76
+        </span>
77
+        <span  style="position: absolute;top:230px;left:180px">
78
+            <span v-if="zhongwen.indexOf('佰') > -1">
79
+                      {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
80
+                  </span>
81
+                  <span v-else>零</span>
90 82
 
91
-      </span>
92
-      <span  style="position: absolute;top:230px;left:220px">
93
-          <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
94
-                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
95
-                </span>
96
-                <span v-else>零</span>
97
-      </span>
98
-      <span  style="position: absolute;top:230px;left:240px">
99
-           <span v-if="zhongwen.indexOf('角') > -1">
100
-                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
101
-                </span>
102
-                <span v-else>零</span>
103
-      </span>
104
-      <span  style="position: absolute;top:230px;left:260px">
105
-         <span v-if="zhongwen.indexOf('分') > -1">
106
-                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
107
-                </span>
108
-                <span v-else>零</span>
109
-      </span>
110
-      </span>
111
-      <span style="position: absolute;top:230px;left:450px">¥:{{totalPrice.toFixed(2)}}</span>
112
-    </div>
83
+        </span>
84
+        <span style="position: absolute;top:230px;left:200px">
85
+            <span v-if="zhongwen.indexOf('拾') > -1">
86
+                      {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
87
+                  </span>
88
+                  <span v-else>零</span>
113 89
 
114
-    <div style="border-bottom: 1px solid black;position: absolute;top:250px;left:110;width:573px;font-Size:12px">
115
-      <div  style="display:flex;margin: 3px 0px;">
116
-        <div style="width:140px">医保:门慢统筹:{{list.order.hifp_pay}}</div>
117
-        <div style="width:140px">大病保险:{{list.order.hifmi_pay}}</div>
118
-        <div style="width:140px">民政救助: </div>
119
-        <div style="width:140px">兜底支付:</div>
90
+        </span>
91
+        <span  style="position: absolute;top:230px;left:220px">
92
+            <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
93
+                      {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
94
+                  </span>
95
+                  <span v-else>零</span>
96
+        </span>
97
+        <span  style="position: absolute;top:230px;left:240px">
98
+            <span v-if="zhongwen.indexOf('角') > -1">
99
+                      {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
100
+                  </span>
101
+                  <span v-else>零</span>
102
+        </span>
103
+        <span  style="position: absolute;top:230px;left:260px">
104
+          <span v-if="zhongwen.indexOf('分') > -1">
105
+                      {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
106
+                  </span>
107
+                  <span v-else>零</span>
108
+        </span>
109
+        </span>
110
+        <span style="position: absolute;top:230px;left:450px">¥:{{totalPrice.toFixed(2)}}</span>
120 111
       </div>
121
-      <div style="display:flex;margin-bottom: 3px;">
122
-        <div style="width:140px">个人自付:{{list.order.psn_part_amt}}</div>
123
-        <div style="width:140px">个账支付:{{list.order.acct_pay}}</div>
124
-        <div style="width:140px">个账余额:{{list.order.balc}}</div>
125
-      </div>
126
-    </div>
127
-    <div style="position: absolute;top:290px;left:110;width:573px;font-Size:12px">
128
-      <div style="display:flex;margin: 3px 0px;">
129
-        <div style="width:140px">现金支付:{{list.order.psn_cash_pay}}</div>
130
-        <div style="width:140px">预存扣减:</div>
131
-        <div style="width:140px">预存余额:</div>
112
+
113
+      <div style="border-bottom: 1px solid black;position: absolute;top:250px;left:110;width:573px;font-Size:12px">
114
+        <div  style="display:flex;margin: 3px 0px;">
115
+          <div style="width:140px">医保:门慢统筹:{{list.order.hifp_pay}}</div>
116
+          <div style="width:140px">大病保险:{{list.order.hifmi_pay}}</div>
117
+          <div style="width:140px">民政救助: </div>
118
+          <div style="width:140px">兜底支付:</div>
119
+        </div>
120
+        <div style="display:flex;margin-bottom: 3px;">
121
+          <div style="width:140px">个人自付:{{list.order.psn_part_amt}}</div>
122
+          <div style="width:140px">个账支付:{{list.order.acct_pay}}</div>
123
+          <div style="width:140px">个账余额:{{list.order.balc}}</div>
124
+        </div>
132 125
       </div>
133
-      <div style="display:flex;justify-content: space-between; margin: 3px 0px;">
134
-        <div style="width:140px">收款单位(盖章)</div>
135
-        <div style="width:140px">收款人:{{list.admin_user_name}}</div>
126
+      <div style="position: absolute;top:290px;left:110;width:573px;font-Size:12px">
127
+        <div style="display:flex;margin: 3px 0px;">
128
+          <div style="width:140px">现金支付:{{list.order.psn_cash_pay}}</div>
129
+          <div style="width:140px">预存扣减:</div>
130
+          <div style="width:140px">预存余额:</div>
131
+        </div>
132
+        <div style="display:flex;justify-content: space-between; margin: 3px 0px;">
133
+          <div style="width:140px">收款单位(盖章)</div>
134
+          <div style="width:140px">收款人:{{list.admin_user_name}}</div>
135
+        </div>
136 136
       </div>
137 137
     </div>
138
-
139 138
   </div>
140 139
 </template>
141 140
 <script>

+ 3 - 3
src/xt_pages/outpatientCharges/listPrint.vue 查看文件

@@ -14,11 +14,11 @@
14 14
     </template>
15 15
 
16 16
     <div class='dialysisPage' style="padding-top:40px;">
17
-      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
17
+      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id!=0 " :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
18 18
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
19 19
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
20 20
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
21
-     <list-print-three v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
21
+     <list-print-three v-if="org_id == 10215 || org_id==9675 || org_id == 0 || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
22 22
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
23 23
     </div>
24 24
   </div>
@@ -576,7 +576,7 @@
576 576
 
577 577
       printThisPage() {
578 578
         if(this.org_id != 10106){
579
-          if(this.org_id == 10215 || this.org_id == 9675){
579
+          if(this.org_id == 10215 || this.org_id == 9675 || this.org_id == 0 || this.org_id == 10485){
580 580
             const style =
581 581
               '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
582 582
             printJS({

文件差异内容过多而无法显示
+ 600 - 600
src/xt_pages/outpatientCharges/statementTemplate/printThree.vue


+ 11 - 9
src/xt_pages/outpatientDoctorStation/doctorDesk.vue 查看文件

@@ -535,6 +535,7 @@ export default {
535 535
 
536 536
       tableHeight: '',
537 537
       saveloading: false,
538
+      
538 539
       fullHeight: document.documentElement.clientHeight,
539 540
       month_prescriptions: [],
540 541
       isloading: false,
@@ -677,9 +678,10 @@ export default {
677 678
           style: style,
678 679
           scanStyles: false
679 680
         })
681
+        
680 682
       }
681
-
682 683
       this.innerVisible = false
684
+      
683 685
       // this.$nextTick(() => {
684 686
       //   this.$refs.print.printThisPage()
685 687
       //   this.$refs.treatPrint.printThisPage()
@@ -1765,7 +1767,7 @@ export default {
1765 1767
               // }
1766 1768
 
1767 1769
               var preTime = nowTime
1768
-              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485){
1770
+              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191){
1769 1771
                 if (prescription.pre_time == 0) {
1770 1772
                   if (this.schedule.schedule_type == 1) {
1771 1773
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -1922,7 +1924,7 @@ export default {
1922 1924
                   tempProject.push(obj)
1923 1925
                 }
1924 1926
                 var preTime = nowTime
1925
-                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485) {
1927
+                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191) {
1926 1928
                   if (this.schedule.schedule_type == 1) {
1927 1929
                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1928 1930
                   } else if (this.schedule.schedule_type == 2) {
@@ -2232,7 +2234,7 @@ export default {
2232 2234
                     // }
2233 2235
 
2234 2236
                     var preTime = nowTime
2235
-                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 ) {
2237
+                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 ) {
2236 2238
                       if (prescription.pre_time == 0) {
2237 2239
                         if (this.schedule.schedule_type == 1) {
2238 2240
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -2390,7 +2392,7 @@ export default {
2390 2392
 
2391 2393
                       var preTime = nowTime
2392 2394
                       // var preTime = ''
2393
-                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485) {
2395
+                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485 && this.org_id !=  10191) {
2394 2396
                         if (this.schedule.schedule_type == 1) {
2395 2397
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2396 2398
                         } else if (this.schedule.schedule_type == 2) {
@@ -3896,7 +3898,7 @@ export default {
3896 3898
 
3897 3899
                     var preTime = nowTime
3898 3900
 
3899
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 ) {
3901
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 && this.org_id  != 10191 ) {
3900 3902
                       if (prescription.pre_time == 0) {
3901 3903
                         if (this.schedule.schedule_type == 1) {
3902 3904
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -4050,7 +4052,7 @@ export default {
4050 4052
 
4051 4053
                       // var preTime = nowTime
4052 4054
                       var preTime = nowTime
4053
-                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485) {
4055
+                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485 &&  this.org_id != 10191) {
4054 4056
                         if (this.schedule.schedule_type == 1) {
4055 4057
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4056 4058
                         } else if (this.schedule.schedule_type == 2) {
@@ -4533,7 +4535,7 @@ export default {
4533 4535
 
4534 4536
                     var preTime = nowTime
4535 4537
 
4536
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485) {
4538
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191) {
4537 4539
                       if (prescription.pre_time == 0) {
4538 4540
                         // preTime = nowTime
4539 4541
                         if (this.schedule.schedule_type == 1) {
@@ -4690,7 +4692,7 @@ export default {
4690 4692
 
4691 4693
                       var preTime = nowTime
4692 4694
                       // var preTime = ''
4693
-                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485) {
4695
+                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485 && this.org_id != 10191 ) {
4694 4696
                         if (this.schedule.schedule_type == 1) {
4695 4697
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4696 4698
                         } else if (this.schedule.schedule_type == 2) {

+ 1 - 1
src/xt_pages/outpatientDoctorStation/print.vue 查看文件

@@ -3,7 +3,7 @@
3 3
     <div class="dialysisPage" style="padding-top: 40px">
4 4
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243">
5 5
 
6
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id !=0" v-bind:childResponse="childResponse" 
6
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id !=0 " v-bind:childResponse="childResponse" 
7 7
         :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" 
8 8
         :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" 
9 9
         :prescription_id="prescription_id"></printOne>

+ 50 - 59
src/xt_pages/outpatientDoctorStation/template/prinSeven.vue 查看文件

@@ -6,12 +6,12 @@
6 6
         class="prescription-print"
7 7
         style="page-break-after: always;"
8 8
       >
9
-        <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">
9
+        <!-- <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">
10 10
           {{ orgname }}第一类精神处方笺
11 11
         </div>
12 12
         <div class="printTitle" v-if="prescriptions[index].med_type == '1112'">
13 13
           {{ orgname }}第二类精神处方笺
14
-        </div>
14
+        </div> -->
15 15
         <div
16 16
           class="printTitle"
17 17
           v-if="
@@ -40,7 +40,7 @@
40 40
             </div>
41 41
             <div style="margin-bottom: 10px">
42 42
               <!-- 医保卡号:{{ item.hisPatient.number ? item.hisPatient.number : "" }} -->
43
-              费别:{{getExpenseKindName(item.patient.expense_kind)}}
43
+              费别:居民医保/职工医保/自费
44 44
             </div>
45 45
             <div style="margin-bottom: 10px" v-if="org_id != 10188">
46 46
               <!-- 电话:{{ item.patient.phone }} -->
@@ -59,7 +59,7 @@
59 59
             <div class="Rp">Rp:</div>
60 60
             <div
61 61
               class="drugsBox"
62
-              v-for="(it, index) in advicess" :key="index"
62
+              v-for="(it, index) in item.advices" :key="index" 
63 63
               :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
64 64
             >
65 65
             <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  :style="{'page-break-after':index==yi&&item.advices.length>3? 'always':'auto'}"-->
@@ -84,7 +84,7 @@
84 84
                     </div>
85 85
                     <div style="margin-bottom: 10px">
86 86
                       <!-- 医保卡号:{{ item.hisPatient.number ? item.hisPatient.number : "" }} -->
87
-                      费别:{{getExpenseKindName()}}
87
+                      费别:居民医保/职工医保/自费
88 88
                     </div>
89 89
                     <div style="margin-bottom: 10px" v-if="org_id != 10188">
90 90
                       <!-- 电话:{{ item.patient.phone }} -->
@@ -101,7 +101,7 @@
101 101
                 </div>
102 102
               </template>
103 103
               <div style="position: relative;">
104
-                <div class="drugsOne" :style="{'border-right':arr.length>0 && arr[0][0].groupno==it.groupno ? '1px solid black' :'none','width':'80%'}">
104
+                <div class="drugsOne" :style="{'border-right':item.arr.length>0 && item.arr[0][0].groupno==it.groupno ? '1px solid black': 'none','width':'80%'}">
105 105
                   <span style="font-weight: bold" >
106 106
                     {{ index + 1 + "." }}
107 107
                   </span>
@@ -110,36 +110,37 @@
110 110
                     {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/
111 111
                     {{it.drug.max_unit}}
112 112
                   </span>&nbsp;
113
+
113 114
                   <div>
114
-                    <template v-if="arr.length>0 && arr[0][0].groupno==it.groupno">
115
+                    <template v-if="item.arr.length>0 && item.arr[0][0].groupno==it.groupno">
115 116
                       <div >
116
-                        <!--  v-for="(its,indexs) in arr" :key="indexs" -->
117
-                        <span style="margin-left: 38px;">{{arr[0][0].advice_name ? arr[0][0].advice_name : ""}}</span>&nbsp;&nbsp;
118
-                        <span v-if="arr[0][0].drug.min_unit != arr[0][0].drug.dose_unit">
119
-                          {{ arr[0][0].drug.dose }}{{ arr[0][0].drug.dose_unit }}&nbsp;* {{ arr[0][0].drug.min_number }}{{ arr[0][0].drug.min_unit }}/
120
-                          {{arr[0][0].drug.max_unit}}
117
+                        <!-- -->
118
+                        <span style="margin-left: 38px;">{{item.arr[0][0].advice_name ? item.arr[0][0].advice_name : ""}}</span>&nbsp;&nbsp;
119
+                        <span v-if="item.arr[0][0].drug.min_unit != item.arr[0][0].drug.dose_unit">
120
+                          {{ item.arr[0][0].drug.dose }}{{ item.arr[0][0].drug.dose_unit }}&nbsp;* {{ item.arr[0][0].drug.min_number }}{{ item.arr[0][0].drug.min_unit }}/
121
+                          {{item.arr[0][0].drug.max_unit}}
121 122
                         </span>&nbsp;
122 123
                       </div>
123
-                      <div style="display: inline-block;position: absolute;left:87%;top:20px;margin-left: 10px;">
124
-                        &nbsp;共{{ arr[0][0].single_dose }}{{ arr[0][0].single_dose_unit }}
124
+                      <div style="display: inline-block;position: absolute;left:85%;top:20px;margin-left: 10px;" >
125
+                        &nbsp;共{{ item.arr[0][0].single_dose }}{{ item.arr[0][0].single_dose_unit }}
125 126
                       </div>
126 127
                     </template>
127 128
                   </div>
128
-
129
+                  
129 130
                   <div style="margin-left: 70px">
130 131
                     用法:
131
-                    <span v-if="(arr.length>0 && arr[0][0].groupno!=it.groupno)||arr.length<0">{{ it.single_dose }}{{ it.single_dose_unit }}</span
132
+                    <span v-if="(item.arr.length>0 && item.arr[0][0].groupno!=it.groupno)||arr.length<0">{{ it.single_dose }}{{ it.single_dose_unit }}</span
132 133
                     >&nbsp;&nbsp;<span
133 134
                       >{{ it.execution_frequency }}&nbsp;{{
134 135
                         it.delivery_way
135 136
                       }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
136 137
                   </div>
137
-
138
+                  <!-- v-if="arr.length>0 && arr[0][0].groupno==it.groupno" 'border-right':arr.length>0 && arr[0][0].groupno==it.groupno ? '1px solid black' :'none',-->
138 139
                 </div>
139
-                <div style="display: inline-block;position: absolute;left:80%;bottom:0px;margin-left: 10px;" v-if="arr.length>0 && arr[0][0].groupno==it.groupno">
140
+                <div style="display: inline-block;position: absolute;left:80%;bottom:0px;margin-left: 10px;"  v-if="item.arr.length>0 && item.arr[0][0].groupno==it.groupno">
140 141
                   ×&nbsp;{{ it.prescribing_number}}
141 142
                 </div>
142
-                <div style="display: inline-block;position: absolute;left:87%;top:0px;margin-left: 10px;" v-if="arr.length>0 && arr[0][0].groupno==it.groupno">
143
+                <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 10px;" v-if="item.arr.length>0 && item.arr[0][0].groupno==it.groupno">
143 144
                   <!-- &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }} -->
144 145
                   &nbsp;共{{ it.single_dose }}{{ it.single_dose_unit }}
145 146
                 </div>
@@ -168,10 +169,10 @@
168 169
                           : 0
169 170
                       }}元
170 171
                     </p>
171
-
172
+                    
172 173
                   </div>
173 174
                   <div class="actionBar" style="margin-bottom: 10px;">
174
-                    <p style="width:300px;">大额处方患者意见:
175
+                    <p style="width:300px;">大额处方患者意见: 
175 176
                       <el-radio v-model="radio" label="1">同意</el-radio>
176 177
                       <el-radio v-model="radio" label="2">不同意</el-radio>
177 178
                     </p>
@@ -218,7 +219,7 @@
218 219
                 >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
219 220
               </div>
220 221
             </div>
221
-
222
+            
222 223
             <div
223 224
               class="drugsBox"
224 225
               v-for="(it, i) in item.additionalcharge"
@@ -232,7 +233,7 @@
232 233
             </div>
233 234
             <div style="text-align: center">(以下空白)</div>
234 235
           </div>
235
-
236
+        
236 237
           <!-- <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
237 238
             <p v-if="org_id == 10217 || org_id == 0">
238 239
               医师:
@@ -283,10 +284,10 @@
283 284
                   : 0
284 285
               }}元
285 286
             </p>
286
-
287
+            
287 288
           </div>
288 289
           <div class="actionBar" style="margin-bottom: 10px;">
289
-            <p style="width:300px;">大额处方患者意见:
290
+            <p style="width:300px;">大额处方患者意见: 
290 291
               <el-radio v-model="radio" label="1">同意</el-radio>
291 292
               <el-radio v-model="radio" label="2">不同意</el-radio>
292 293
             </p>
@@ -306,7 +307,7 @@
306 307
                   : 0
307 308
               }}元
308 309
             </p>
309
-
310
+           
310 311
           </div> -->
311 312
         <!-- </div> -->
312 313
       </div>
@@ -351,28 +352,9 @@ export default{
351 352
       operatorMaps: {},
352 353
       operators: [],
353 354
       doctorList_1: [],
354
-      expenseOptions: [
355
-        { id: 1, name: "基本医保" },
356
-        { id: 2, name: "新农合" },
357
-        { id: 3, name: "自费医疗" },
358
-        { id: 4, name: "公费医疗" },
359
-        { id: 5, name: "商业保险" },
360
-        { id: 6, name: "军队医疗" },
361
-        { id: 7, name: "其他" },
362
-      ],
363 355
     };
364 356
   },
365 357
   methods: {
366
-    getExpenseKindName(id){
367
-      for(let i = 0; i < this.expenseOptions.length; i++){
368
-        if(id == this.expenseOptions[i].id){
369
-          return this.expenseOptions[i].name
370
-        }
371
-      }
372
-
373
-
374
-
375
-    },
376 358
     // 电子签名
377 359
     setAdminUserES(id,name) {
378 360
       console.log(id)
@@ -459,20 +441,28 @@ export default{
459 441
 
460 442
           this.doctorList_1 = response.data.data.eles;
461 443
          for(let i=0;i<this.advicePrint.length;i++){
462
-          this.advicess=advicePrint[i].advices
463
-         }
464
-         for(let j=0;j<this.advicess.length;j++){
465
-            for(let x=j+1;x<this.advicess.length;x++){
466
-              if(this.advicess[j].groupno == this.advicess[x].groupno){
467
-                this.arr.push(this.advicess.splice(x,1))
468
-                // this.arrs=this.advicess.splice(x,1)
444
+          var arr = new Array()
445
+          var advicess = new Array()
446
+          var advicess=advicePrint[i].advices
447
+          
448
+         for(let j=0;j<advicess.length;j++){
449
+            for(let x=j+1;x<advicess.length;x++){
450
+              if(advicess[j].groupno == advicess[x].groupno){
451
+                arr.push(advicess.splice(x,1))
469 452
               }
470 453
             }
471 454
           }
472
-        // this.merge(this.advicess)
473
-          // console.log('4444444',this.arrs);
474
-         console.log('55555555',this.arr);
475
-         console.log('6666666',this.advicess);
455
+         
456
+         this.advicePrint[i]["arr"]    = arr
457
+        //  for(let y=0;y<this.advicePrint[i].arr.length;y++){
458
+        //   console.log('6666666',this.advicePrint[i].arr[y]);
459
+        //  }
460
+          
461
+         
462
+        }
463
+          console.log('4444444',this.advicePrint);
464
+        //  console.log('55555555',this.arr);
465
+         
476 466
           console.log(this.doctorList_1, "医生列表");
477 467
           if (this.doctorList_1.length > 0) {
478 468
             var operatorsLen = this.doctorList_1.length;
@@ -634,7 +624,7 @@ export default{
634 624
     var xtuser = this.$store.getters.xt_user;
635 625
     this.orgname = xtuser.org.org_name;
636 626
     this.org_id = xtuser.org.id;
637
-
627
+    
638 628
     // for(let j=0;j<this.advicess.length;j++){
639 629
     //   console.log('44444444');
640 630
     //   for(let x=j+1;x<this.advicess.length;x++){
@@ -645,9 +635,9 @@ export default{
645 635
     // }
646 636
     // console.log('777777777',this.arr[0].advice_name);
647 637
     // return this.arr
648
-
638
+    
649 639
   },
650
-
640
+  
651 641
   watch: {
652 642
     ids: function (val) {
653 643
       this.ids = val;
@@ -679,6 +669,7 @@ export default{
679 669
   margin-top: 10px;
680 670
   line-height: 24px;
681 671
   padding: 0 10px;
672
+  
682 673
 }
683 674
 .infoTitle p {
684 675
   width: 200px;

+ 2 - 1
src/xt_pages/outpatientDoctorStation/template/printFive.vue 查看文件

@@ -42,8 +42,9 @@
42 42
           <div class="prescriptionBox" style="border-top: 1px solid #000;border-bottom: 1px solid #000;">
43 43
               <div class="Rp">Rp:</div>
44 44
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index"
45
-                :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
45
+                
46 46
               >
47
+              <!-- :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}" -->
47 48
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
48 49
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
49 50
                   <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>

+ 12 - 3
src/xt_pages/outpatientDoctorStation/template/printFour.vue 查看文件

@@ -22,11 +22,20 @@
22 22
           <div class="prescriptionBox">
23 23
               <div class="Rp">Rp:</div>
24 24
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index"
25
-                :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
25
+                
26 26
               >
27
+              <!-- :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}" -->
27 28
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
28
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
29
-                  <div style="margin-left:100px;"><span>{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</span></div>
29
+                  <div class="drugsOne" >
30
+                    <span style="font-weight:bold;">{{ index+1 + '.' }}</span>
31
+                    {{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;
32
+                    <span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>
33
+                    &nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>
34
+                    &nbsp;&nbsp;<span>{{it.advice_desc}}</span>
35
+                  </div>
36
+                  <div style="margin-left:100px;">
37
+                    <span>{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</span>
38
+                  </div>
30 39
               </div>
31 40
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
32 41
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>

+ 2 - 1
src/xt_pages/outpatientDoctorStation/template/printSix.vue 查看文件

@@ -72,8 +72,9 @@
72 72
             class="drugsBox"
73 73
             v-for="(it, index) in item.advices"
74 74
             :key="index"
75
-            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
75
+            
76 76
           >
77
+          <!-- :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}" -->
77 78
             <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
78 79
             <div class="drugsOne">
79 80
               <!-- <span style="font-weight: bold">{{ index + 1 + "." }}</span> -->

+ 2 - 1
src/xt_pages/outpatientDoctorStation/template/printThree.vue 查看文件

@@ -147,8 +147,9 @@
147 147
                 pageIndex * 5 + item.pageArr[pageIndex]
148 148
               )"
149 149
               :key="index"
150
-              :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
150
+              
151 151
             >
152
+            <!-- :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}" -->
152 153
               <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
153 154
               <div class="drugsOne">
154 155
                 <span style="font-weight: bold">{{ index + 1 + "." }}</span

+ 2 - 2
src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue 查看文件

@@ -37,7 +37,7 @@
37 37
                 <div style="width:100%;">诊断:{{getDiagnosis(item.info.diagnosis)}}</div>
38 38
             </div>
39 39
 
40
-            <div class="prescriptionBox">
40
+            <div class="prescriptionBox" style="min-height: 425px;">
41 41
                 <table style="width:100%;text-align:center;line-height:25px;">
42 42
                     <tr>
43 43
                         <td>序号</td>
@@ -495,7 +495,7 @@
495 495
 
496 496
     .prescriptionBox {
497 497
         padding: 0 10px;
498
-        min-height: 600px;
498
+        
499 499
     }
500 500
 
501 501
     .Rp {

+ 3 - 3
src/xt_pages/role/admin.vue 查看文件

@@ -66,12 +66,12 @@
66 66
           style="float:left"
67 67
           @click="toTestSeven">添加合同签署人</el-button> -->
68 68
 
69
-          <el-button   type="primary"
69
+          <!-- <el-button   type="primary"
70 70
           size="small"
71 71
           icon="el-icon-circle-plus-outline"
72 72
           style="float:left"  @click="toTestEight">
73 73
             脚本
74
-          </el-button>
74
+          </el-button> -->
75 75
           
76 76
      </div>
77 77
     
@@ -227,7 +227,7 @@
227 227
 </template>
228 228
 
229 229
 <script>
230
-import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestEight } from "@/api/role/admin";
230
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight } from "@/api/role/admin";
231 231
 import { getRoles } from "@/api/role/role";
232 232
 
233 233
 import { parseTime } from "@/utils";

+ 2 - 2
src/xt_pages/sign/Contextowner.vue 查看文件

@@ -11,7 +11,7 @@
11 11
             >
12 12
         </div>
13 13
         <!-- 全屏状态 -->
14
-        <!-- <div id="fullscreenbroad" v-show="dialogTableVisible">
14
+        <div id="fullscreenbroad" v-show="dialogTableVisible">
15 15
             <el-row class="fullRow">
16 16
                 <el-button
17 17
                 @click="openSetting"
@@ -61,7 +61,7 @@
61 61
                 
62 62
              </div>
63 63
         
64
-        </div> -->
64
+        </div>
65 65
         <div class="app-container">
66 66
             <div class="page_lineUp">
67 67
                 <div class="lineUpTitle">

+ 2 - 2
src/xt_pages/stock/detail/print.vue 查看文件

@@ -56,8 +56,8 @@
56 56
                     {{getMySelfCount(item.good_id) }}
57 57
                   </span>
58 58
                    <span  v-if="org_id == 10265 || org_id == 10215">{{getMySelfCount(item.good_id) }}</span>
59
-                   <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{getWarehouseOut(item.good_id)}}</span>
60
-                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 &&org_id!=9679 &&org_id!=9675 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191 && org_id!=0 && org_id!=10402">{{getStockCount(item.good_id) }}</span>
59
+                   <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191  || org_id ==10485">{{getWarehouseOut(item.good_id)}}</span>
60
+                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 &&org_id!=9679 &&org_id!=9675 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191 && org_id!=0 && org_id!=10402 && org_id!=10485">{{getStockCount(item.good_id) }}</span>
61 61
                 </span>
62 62
 
63 63
                 <span v-if="type == 4"> {{ item.count }}</span>

+ 10 - 4
src/xt_pages/stock/detail/stockOutDetail.vue 查看文件

@@ -809,7 +809,7 @@ export default {
809 809
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
810 810
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
811 811
         this.tableOut[i].ctime = this.getTime(this.tableOut[i].ctime)
812
-        if(this.orgId == 9919 || this.orgId == 10402 || this.orgId == 0){
812
+        if(this.orgId == 9919 || this.orgId == 10402){
813 813
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
814 814
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
815 815
         }else if(this.orgId == 10265){
@@ -830,19 +830,25 @@ export default {
830 830
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
831 831
         }else if(this.orgId == 10188){
832 832
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
833
+        }else if(this.orgId == 10489){
834
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
835
+        }else if(this.orgId == 10375){
836
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
837
+        }else if(this.orgId == 10485){
838
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
833 839
         }else{
834 840
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
835 841
         }
836 842
 
837
-        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 0 || this.orgId == 10402){
843
+        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402){
838 844
 
839 845
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
840 846
         }
841
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
847
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485){
842 848
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
843 849
           console.log("out_count232233232332",this.tableOut[i].out_count)
844 850
         }
845
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402){
851
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485){
846 852
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
847 853
         }
848 854
        }

+ 12 - 7
src/xt_pages/user/inspection.vue 查看文件

@@ -552,7 +552,8 @@ export default {
552 552
         patient: 0,
553 553
         project_id: 0,
554 554
         page: 1
555
-      }
555
+      },
556
+      org_id:0,
556 557
     }
557 558
   },
558 559
   methods: {
@@ -1311,12 +1312,15 @@ export default {
1311 1312
                  
1312 1313
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
1313 1314
                   
1314
-                  // item.value = inspectionsMap[items[index].id].inspect_value
1315
-                  // item.item_name = inspectionsMap[items[index].id].item_name
1315
+                 
1316 1316
 
1317
-                  item.value = ""
1318
-                  item.item_name = ""
1319
-              
1317
+                  if(this.org_id == 10121 || this.org_id == 0 ){
1318
+                    item.value = inspectionsMap[items[index].id].inspect_value
1319
+                    item.item_name = inspectionsMap[items[index].id].item_name
1320
+                  }else{
1321
+                    item.value = ""
1322
+                    item.item_name = ""
1323
+                  }
1320 1324
 
1321 1325
                 } else {
1322 1326
                  
@@ -1348,7 +1352,7 @@ export default {
1348 1352
                 this.items.push(item)
1349 1353
               }
1350 1354
             
1351
-              // console.log("items232232332wo",this.items)
1355
+              console.log("items232232332wo",this.items)
1352 1356
 
1353 1357
               if(item.value.indexOf("http") >= 0){
1354 1358
                 this.isPic = true
@@ -1365,6 +1369,7 @@ export default {
1365 1369
   },
1366 1370
   created() {
1367 1371
     const id = this.$route.query && this.$route.query.id
1372
+    this.org_id = this.$store.getters.xt_user.org.id,
1368 1373
     this.patientID = parseInt(id)
1369 1374
     if (isNaN(this.patientID) || this.patientID <= 0) {
1370 1375
       this.$notify.error({

+ 91 - 7
src/xt_pages/workforce/components/editTableData.vue 查看文件

@@ -1339,6 +1339,8 @@
1339 1339
           >
1340 1340
           </el-option>
1341 1341
         </el-select>
1342
+
1343
+       
1342 1344
       </div>
1343 1345
       <span slot="footer" class="dialog-footer" style="text-align: center">
1344 1346
         <el-button
@@ -1376,12 +1378,13 @@
1376 1378
             :rules="changeRules"
1377 1379
         >
1378 1380
           <el-form-item label="" prop="mode_id">
1381
+            <span>透析模式:</span>
1379 1382
             <el-select
1383
+               filterable 
1380 1384
                 v-model="changeSchedule.mode_id"
1381 1385
                 placeholder="请选择"
1382 1386
                 style="width: 100%"
1383 1387
             >
1384
-            <!-- @change="changeSchedulemodeid" -->
1385 1388
               <el-option
1386 1389
                   :disabled="item.id == currentData.mode_id"
1387 1390
                   v-for="item in modeOptions"
@@ -1392,6 +1395,62 @@
1392 1395
               </el-option>
1393 1396
             </el-select>
1394 1397
           </el-form-item>
1398
+          
1399
+          <!-- <el-form-item>
1400
+            <span>透析班次:</span>
1401
+            <el-select
1402
+                filterable 
1403
+                v-model="changeSchedule.schedule_type"
1404
+                placeholder="请选择"
1405
+                style="width: 100%"
1406
+                @change="changeScheduleType"
1407
+            >
1408
+              <el-option
1409
+                  v-for="item in scheduleType"
1410
+                  :key="item.id"
1411
+                  :label="item.name"
1412
+                  :value="item.id"
1413
+              >
1414
+              </el-option>
1415
+            </el-select>
1416
+          </el-form-item> -->
1417
+        
1418
+          <!-- <el-form-item>
1419
+            <span>透析分区:</span>
1420
+            <el-select
1421
+            filterable 
1422
+              v-model="changeSchedule.partition_id"
1423
+              placeholder="请选择"
1424
+              style="width: 100%"
1425
+              @change="changePartition"
1426
+              >
1427
+              <el-option
1428
+                  v-for="(item, index) in zone_names"
1429
+                  :key="index"
1430
+                  :label="item"
1431
+                  :value="item"
1432
+              >
1433
+              </el-option>
1434
+              </el-select>
1435
+          </el-form-item> -->
1436
+
1437
+          <!-- <el-form-item>
1438
+            <span>透析床位:</span>
1439
+            <el-select
1440
+               filterable 
1441
+                v-model="changeSchedule.bed_id"
1442
+                placeholder="请选择"
1443
+                style="width: 100%"
1444
+            >
1445
+              <el-option
1446
+                  v-for="item in numberList"
1447
+                  :key="item.id"
1448
+                  :label="item.number"
1449
+                  :value="item.id"
1450
+              >
1451
+              </el-option>
1452
+            </el-select>
1453
+          </el-form-item> -->
1395 1454
         </el-form>
1396 1455
       </div>
1397 1456
       <span slot="footer" class="dialog-footer">
@@ -1719,6 +1778,7 @@ import {
1719 1778
   getUrgentScheduleInitData,
1720 1779
   getWeekPanelsOne,
1721 1780
   getAllZones,
1781
+  ChangeScheduleTen
1722 1782
 } from "@/api/schedule";
1723 1783
 import ScheduleItem from "./ScheduleItem";
1724 1784
 
@@ -2036,6 +2096,7 @@ export default {
2036 2096
       },
2037 2097
       cellflag: 0,
2038 2098
       schedulesGroup:[],
2099
+      numberList:[]
2039 2100
     };
2040 2101
   },
2041 2102
 
@@ -4951,6 +5012,22 @@ export default {
4951 5012
           this.tiaoZhengType = 1;
4952 5013
           this.msDialogVisible=true
4953 5014
         }
5015
+        console.log("ROW22O2O2OWOOW",row)
5016
+        console.log("CHANGESHCUEL2O2O2O",this.changeSchedule)
5017
+        console.log("WOOWOWOWOWOW",this.zones)
5018
+        console.log("numberowowow",this.numberList)
5019
+        this.changeSchedule.mode_id = row[column.property].mode_id
5020
+        var zone_names = ""
5021
+        for(let i=0;i<this.zones.length;i++){
5022
+          if(row.zone_id == this.zones[i].id){
5023
+           zone_names = this.zones[i].name
5024
+          }
5025
+        }
5026
+        this.changeSchedule.partition_id = zone_names
5027
+        this.changeSchedule.schedule_type = week[1];
5028
+        this.changeSchedule.bed_id = row.jihao_id;
5029
+        console.log("床位id",this.changeSchedule.bed_id)
5030
+        this.changeSchedule.schedule_week = week[0];
4954 5031
       }
4955 5032
 
4956 5033
     },
@@ -4995,10 +5072,11 @@ export default {
4995 5072
 
4996 5073
     //  双击弹窗确认按钮
4997 5074
     submitMode(formName) {
5075
+      console.log("wowowoowow",this.changeSchedule)
4998 5076
       this.changing_mode = true;
4999 5077
       this.changeSchedule.change_action = "change_mode";
5000
-      ChangeSchedule(this.currentData.id, this.changeSchedule)
5001
-          .then((response) => {
5078
+
5079
+      ChangeSchedule(this.currentData.id, this.changeSchedule).then((response) => {
5002 5080
             if (response.data.state == 0) {
5003 5081
               this.$message.error(response.data.msg);
5004 5082
             } else {
@@ -5008,6 +5086,7 @@ export default {
5008 5086
               });
5009 5087
               var that = this;
5010 5088
               var schedule = response.data.data.schedule;
5089
+              this.msDialogVisible = false
5011 5090
               this.scheduleZone.forEach(function (zone, index) {
5012 5091
                 if (
5013 5092
                     zone.zone_id == schedule.partition_id &&
@@ -5023,18 +5102,18 @@ export default {
5023 5102
                         schedule.dialysis_machine_name;
5024 5103
                     that.scheduleZone[index][weekPathKey].mode_id =
5025 5104
                         schedule.mode_id;
5026
-                    that.scheduleZone[index][weekPathKey].mode_name =
5027
-                        typeof that.modeOptions[schedule.mode_id] === "undefined"
5105
+                    that.scheduleZone[index][weekPathKey].mode_name = typeof that.modeOptions[schedule.mode_id] === "undefined"
5028 5106
                             ? ""
5029 5107
                             : that.modeOptions[schedule.mode_id].name;
5030 5108
                   }
5031 5109
                 }
5032 5110
               });
5033 5111
               this.msDialogVisible = false;
5112
+              this.getAllZones()
5113
+             
5034 5114
             }
5035 5115
             this.changing_mode = false;
5036
-          })
5037
-          .catch((err) => {
5116
+          }).catch((err) => {
5038 5117
             this.$message.error(err);
5039 5118
             this.changing_mode = false;
5040 5119
           });
@@ -5698,9 +5777,14 @@ export default {
5698 5777
             this.zoneIdList.push(zones[i].id);
5699 5778
           }
5700 5779
           this.zones.push(...zones);
5780
+          console.log("zoneswoowowow",this.zones)
5701 5781
           var strArr = this.zoneIdList.join(",");
5702 5782
 
5703 5783
           this.strArr = strArr;
5784
+          var device_number =  response.data.data.devicenumber
5785
+
5786
+          this.numberList = device_number
5787
+          console.log("所有床位",device_number)
5704 5788
           this.getWeekPanels();
5705 5789
         }
5706 5790
       });

+ 7 - 3
src/xt_pages/workforce/components/tableData.vue 查看文件

@@ -542,6 +542,11 @@
542 542
               >
543 543
               </el-option>
544 544
             </el-select>
545
+
546
+
547
+           
548
+
549
+
545 550
           </el-form-item>
546 551
         </el-form>
547 552
       </div>
@@ -1010,7 +1015,7 @@ export default {
1010 1015
     this.modeOptions = this.$store.getters.treatment_mode;
1011 1016
 
1012 1017
     this.partitions = this.partitionsProp;
1013
-
1018
+    console.log("分区oowowoow",this.partitions)
1014 1019
 
1015 1020
     var contagions = this.$store.getters.contagions;
1016 1021
     if (contagions.length > 0) {
@@ -2649,8 +2654,7 @@ export default {
2649 2654
     submitMode(formName) {
2650 2655
       this.changing_mode = true;
2651 2656
       this.changeSchedule.change_action = "change_mode";
2652
-      ChangeSchedule(this.currentData.id, this.changeSchedule)
2653
-        .then(response => {
2657
+      ChangeSchedule(this.currentData.id, this.changeSchedule).then(response => {
2654 2658
           if (response.data.state == 0) {
2655 2659
             this.$message.error(response.data.msg);
2656 2660
           } else {

+ 19 - 22
src/xt_pages/workforce/scheduleTablePrint.vue 查看文件

@@ -1,5 +1,5 @@
1 1
 <template>
2
-    <div>
2
+    <div >
3 3
       <el-button style="float:right;" type="primary" @click="printAction">打印</el-button>
4 4
 
5 5
 <!--      <el-button type="primary" @click="printAction">打印</el-button>-->
@@ -175,11 +175,11 @@
175 175
         </table>
176 176
 
177 177
          <!-- 选择天数打印 -->
178
-        <table 
179
-            v-if="$route.query.week_date !=''" 
180
-            id="scheduleTable" class="scheduleTable" 
178
+        <table
179
+            v-if="$route.query.week_date !=''"
180
+            id="scheduleTable" class="scheduleTable"
181 181
             border="1" cellspacing="0"
182
-            style="margin: auto;"
182
+            style="margin: auto; font-size: 18px;"
183 183
         >
184 184
             <tr>
185 185
                 <td rowspan="2">分区</td>
@@ -219,29 +219,26 @@
219 219
                         <span v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</span>
220 220
                     </span>
221 221
                 </td>
222
-                <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
223
-                    <p v-if="item.Tue_M.patient_id">
222
+                <td style="min-width:180px;padding: auto;" v-if="$route.query.week_date =='周二'">
223
+                    <p v-if="item.Tue_M.patient_id" style="padding: auto;margin: auto;">
224 224
                         <span>{{ item.Tue_M.patient }}</span>
225 225
                         <span v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</span>
226 226
                     </p>
227 227
                 </td>
228 228
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
229 229
                     <span v-if="item.Tue_A.patient_id ">
230
-                        
231 230
                         <span>{{ item.Tue_A.patient }}</span>
232 231
                         <span v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</span>
233 232
                     </span>
234 233
                 </td>
235 234
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
236 235
                     <span v-if="item.Tue_N.patient_id ">
237
-                        
238 236
                         <span>{{ item.Tue_N.patient }}</span>
239 237
                         <span v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</span>
240 238
                     </span>
241 239
                 </td>
242 240
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周三'">
243 241
                     <span v-if="item.Wed_M.patient_id ">
244
-                        
245 242
                         <span>{{ item.Wed_M.patient }}</span>
246 243
                         <span v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</span>
247 244
                     </span>
@@ -259,49 +256,49 @@
259 256
                     </span>
260 257
                 </td>
261 258
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周四'">
262
-                    <span v-if="item.Thurs_M.patient_id ">     
259
+                    <span v-if="item.Thurs_M.patient_id ">
263 260
                         <span>{{ item.Thurs_M.patient }}</span>
264 261
                         <span v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</span>
265 262
                     </span>
266 263
                 </td>
267 264
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周四'">
268
-                    <span v-if="item.Thurs_A.patient_id ">                   
265
+                    <span v-if="item.Thurs_A.patient_id ">
269 266
                         <span>{{ item.Thurs_A.patient }}</span>
270 267
                         <span v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</span>
271 268
                     </span>
272 269
                 </td>
273 270
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周四'">
274
-                    <span v-if="item.Thurs_N.patient_id ">           
271
+                    <span v-if="item.Thurs_N.patient_id ">
275 272
                         <span>{{ item.Thurs_N.patient }}</span>
276 273
                         <span v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</span>
277 274
                     </span>
278 275
                 </td>
279 276
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周五'">
280
-                    <span v-if="item.Fri_M.patient_id">                  
277
+                    <span v-if="item.Fri_M.patient_id">
281 278
                         <span>{{ item.Fri_M.patient }}</span>
282 279
                         <span v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</span>
283 280
                     </span>
284 281
                 </td>
285 282
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周五'">
286
-                    <span v-if="item.Fri_A.patient_id ">                     
283
+                    <span v-if="item.Fri_A.patient_id ">
287 284
                         <span>{{ item.Fri_A.patient }}</span>
288 285
                         <span v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</span>
289 286
                     </span>
290 287
                 </td>
291 288
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周五'">
292
-                    <span v-if="item.Fri_N.patient_id ">                      
289
+                    <span v-if="item.Fri_N.patient_id ">
293 290
                         <span>{{ item.Fri_N.patient }}</span>
294 291
                         <span v-if="item.Fri_N.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</span>
295 292
                     </span>
296 293
                 </td>
297 294
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周六'">
298
-                    <span v-if="item.Sat_M.patient_id ">                      
295
+                    <span v-if="item.Sat_M.patient_id ">
299 296
                         <span>{{ item.Sat_M.patient }}</span>
300 297
                         <span v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</span>
301 298
                     </span>
302 299
                 </td>
303 300
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周六'">
304
-                    <span v-if="item.Sat_A.patient_id ">                       
301
+                    <span v-if="item.Sat_A.patient_id ">
305 302
                         <span>{{ item.Sat_A.patient }}</span>
306 303
                         <span v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</span>
307 304
                     </span>
@@ -1011,8 +1008,8 @@ export default {
1011 1008
             return [weekArr[week], typeArr[schedule_type]];
1012 1009
         },
1013 1010
         printAction: function() {
1014
-            const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
1015
-
1011
+            // const style = '@media print {#scheduleTable{font-size:18px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
1012
+            const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable tr td{text-align: center;}}'
1016 1013
             printJS({
1017 1014
             printable: 'scheduleTable',
1018 1015
             type: 'html',
@@ -1074,9 +1071,9 @@ export default {
1074 1071
 </script>
1075 1072
 
1076 1073
 
1077
-<style lang="scss">
1074
+<style lang="scss" scoped>
1078 1075
 td{
1079 1076
     text-align: center;
1080
-    padding: 5px;
1077
+    // padding: 5px;
1081 1078
 }
1082 1079
 </style>