Browse Source

修改打印和其他问题

csx 4 years ago
parent
commit
f8436c3e0f

+ 11 - 1
src/store/modules/xt_user.js View File

357
         commit('SET_FILEDS_LIST', infoJSON)
357
         commit('SET_FILEDS_LIST', infoJSON)
358
         resolve()
358
         resolve()
359
       })
359
       })
360
-    },
360
+    },updateAllFiledConfigList({ commit }, object) {
361
+      var oldFiledList = getFiledConfigList()
362
+      var infoJSON = JSON.parse(oldFiledList)
363
+
364
+      return new Promise((resolve, reject) =>{
365
+        infoJSON = object
366
+        setFiledConfigList(JSON.stringify(infoJSON))
367
+        commit('SET_FILEDS_LIST', infoJSON)
368
+        resolve()
369
+      })
370
+    }
361
   }
371
   }
362
 }
372
 }
363
 
373
 

+ 14 - 1
src/xt_pages/data/printTemplate.vue View File

3
     <div class="position">
3
     <div class="position">
4
       <bread-crumb :crumbs='crumbs'></bread-crumb>
4
       <bread-crumb :crumbs='crumbs'></bread-crumb>
5
     </div>
5
     </div>
6
+    <div v-loading="loading"
7
+         element-loading-text="服务器处理数据中,请稍候......."
8
+         element-loading-spinner="el-icon-loading"
9
+         element-loading-background="rgba(0, 0, 0, 0.8)">
10
+
6
     <div class="app-container" style="text-align: center">
11
     <div class="app-container" style="text-align: center">
7
       <p style="margin-top: 10px;margin-bottom: 30px">请选择你需要打印的血液透析护理记录单样式</p>
12
       <p style="margin-top: 10px;margin-bottom: 30px">请选择你需要打印的血液透析护理记录单样式</p>
8
       <el-row :gutter="20" type="flex" justify="center">
13
       <el-row :gutter="20" type="flex" justify="center">
49
         </el-col>
54
         </el-col>
50
       </el-row>
55
       </el-row>
51
     </div>
56
     </div>
57
+    </div>
52
   </div>
58
   </div>
53
 </template>
59
 </template>
54
 
60
 
55
 <script>
61
 <script>
56
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
62
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
57
   import { getPrintTemplate, postPrintTemplate } from '@/api/data'
63
   import { getPrintTemplate, postPrintTemplate } from '@/api/data'
64
+  import store from "@/store";
58
 
65
 
59
   export default {
66
   export default {
60
     name: 'printTemplate',
67
     name: 'printTemplate',
84
         ],
91
         ],
85
         delay:500,
92
         delay:500,
86
         radio: 0,
93
         radio: 0,
87
-        tempRadio: 0
94
+        tempRadio: 0,
95
+        loading:false,
96
+
88
       }
97
       }
89
     }, methods: {
98
     }, methods: {
90
       change: function(val) {
99
       change: function(val) {
94
           cancelButtonText: '取消',
103
           cancelButtonText: '取消',
95
           type: 'info'
104
           type: 'info'
96
         }).then(() => {
105
         }).then(() => {
106
+          this.loading = true
97
           postPrintTemplate(val).then(response => {
107
           postPrintTemplate(val).then(response => {
98
             if (response.data.state == 1) {
108
             if (response.data.state == 1) {
99
               var template_id = response.data.data.template_id
109
               var template_id = response.data.data.template_id
100
               this.radio = template_id.toString()
110
               this.radio = template_id.toString()
101
               this.tempRadio = template_id.toString()
111
               this.tempRadio = template_id.toString()
102
               //同步
112
               //同步
113
+              this.loading = false
114
+
115
+              store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
103
               this.$message({
116
               this.$message({
104
                 type: 'success',
117
                 type: 'success',
105
                 message: '切换成功'
118
                 message: '切换成功'

+ 16 - 6
src/xt_pages/dialysis/batch_print/batch_print_order.vue View File

762
         ],
762
         ],
763
         loading: false,
763
         loading: false,
764
         orgname: '',
764
         orgname: '',
765
+        org_template_info: {},
766
+
765
         bloodAccessParOpera: {},
767
         bloodAccessParOpera: {},
766
         anticoagulantsConfit: {},
768
         anticoagulantsConfit: {},
767
         dialysateFormulationOptions: {},
769
         dialysateFormulationOptions: {},
812
         var resp = rs.data
814
         var resp = rs.data
813
         if (resp.state == 1) {
815
         if (resp.state == 1) {
814
 
816
 
817
+          this.org_template_info = resp.data.templateInfo
818
+
815
           this.records = this.records.concat(resp.data.schedules)
819
           this.records = this.records.concat(resp.data.schedules)
816
           for (const recordIndex in this.records) {
820
           for (const recordIndex in this.records) {
817
             var dlegh = 0
821
             var dlegh = 0
910
       })
914
       })
911
     },
915
     },
912
     methods: {
916
     methods: {
917
+      getAge: function(val) {
918
+        val.birth = uParseTime(val.birthday, '{y}-{m}-{d}')
919
+        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
920
+          if (val.age == 0) {
921
+            return jsGetAge(val.birth, '-')
922
+          } else {
923
+            return val.age
924
+          }
925
+        } else {
926
+          return jsGetAge(val.birth, '-')
927
+        }
928
+      },
913
       printAction: function() {
929
       printAction: function() {
914
         const style = '@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; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 14px; 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; 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 { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .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: 10px 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: 8px 5px; line-height: 25px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 2px;position: absolute;}'
930
         const style = '@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; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 14px; 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; 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 { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .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: 10px 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: 8px 5px; line-height: 25px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 2px;position: absolute;}'
915
 
931
 
1010
           }
1026
           }
1011
         }
1027
         }
1012
       },
1028
       },
1013
-      jsGetAge: function(agetime) {
1014
-        if (agetime == 0) {
1015
-          return ''
1016
-        }
1017
-        return jsGetAge(uParseTime(agetime, '{y}-{m}-{d}'), '-')
1018
-      },
1019
       getTime(value, temp) {
1029
       getTime(value, temp) {
1020
         if (value != undefined) {
1030
         if (value != undefined) {
1021
           return uParseTime(value, temp)
1031
           return uParseTime(value, temp)

+ 2 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue View File

337
                                     </div>
337
                                     </div>
338
                                     <div class="inline_block" style="margin-left:20px;">
338
                                     <div class="inline_block" style="margin-left:20px;">
339
                                     维持:
339
                                     维持:
340
-                                    <div v-if="record.prescription.anticoagulant == 1" class="under_line" style="width: 50px;text-align: center;">
340
+                                    <div v-if="record.prescription&&record.prescription.anticoagulant == 1" class="under_line" style="width: 50px;text-align: center;">
341
                                         {{record.prescription&&record.prescription.anticoagulant_weichi?record.prescription.anticoagulant_weichi:'/'}}
341
                                         {{record.prescription&&record.prescription.anticoagulant_weichi?record.prescription.anticoagulant_weichi:'/'}}
342
                                     </div>
342
                                     </div>
343
-                                    <div v-if="record.prescription.anticoagulant != 1" class="under_line" style="width: 50px;text-align: center;">
343
+                                    <div v-if="record.prescription&&record.prescription.anticoagulant != 1" class="under_line" style="width: 50px;text-align: center;">
344
                                         {{record.prescription&&record.prescription.anticoagulant_weichi?record.prescription.anticoagulant_weichi:0}}
344
                                         {{record.prescription&&record.prescription.anticoagulant_weichi?record.prescription.anticoagulant_weichi:0}}
345
                                     </div>
345
                                     </div>
346
                                     lu
346
                                     lu

+ 1 - 1
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File

544
           this.form.blood_flow_volume = monitor.blood_flow_volume ? monitor.blood_flow_volume : ''
544
           this.form.blood_flow_volume = monitor.blood_flow_volume ? monitor.blood_flow_volume : ''
545
           this.form.venous_pressure = monitor.venous_pressure ? monitor.venous_pressure : ''
545
           this.form.venous_pressure = monitor.venous_pressure ? monitor.venous_pressure : ''
546
           this.form.transmembrane_pressure = monitor.transmembrane_pressure ? monitor.transmembrane_pressure : ''
546
           this.form.transmembrane_pressure = monitor.transmembrane_pressure ? monitor.transmembrane_pressure : ''
547
-          this.form.ultrafiltration_volume = monitor.transmembrane_pressure ? monitor.transmembrane_pressure : ''
547
+          this.form.ultrafiltration_volume = monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : ''
548
           this.form.ultrafiltration_rate = monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : ''
548
           this.form.ultrafiltration_rate = monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : ''
549
           this.form.arterial_pressure = monitor.arterial_pressure ? monitor.arterial_pressure : ''
549
           this.form.arterial_pressure = monitor.arterial_pressure ? monitor.arterial_pressure : ''
550
           this.form.sodium_concentration = monitor.sodium_concentration ? monitor.sodium_concentration : ''
550
           this.form.sodium_concentration = monitor.sodium_concentration ? monitor.sodium_concentration : ''

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue View File

783
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
783
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
784
                 <div class="inline_block" style="flex:1; display:inline-block;">
784
                 <div class="inline_block" style="flex:1; display:inline-block;">
785
                   治疗小结:
785
                   治疗小结:
786
-                  <div class="under_line" style="width: 90%;line-height: 25px;text-align: left;margin-left: 2px; display:inline-block;"> {{summary.dialysis_summary?summary.dialysis_summary:'/'}}</div>
786
+                  <div class="under_line" style="width: 860px;line-height: 25px;text-align: left;margin-left: 2px;display: inline-block;white-space: normal;"> {{summary.dialysis_summary?summary.dialysis_summary:'/'}}</div>
787
                 </div>
787
                 </div>
788
               </div>
788
               </div>
789
 
789
 

+ 6 - 3
src/xt_pages/user/components/PatientDetail.vue View File

897
 
897
 
898
             var contagionsArr = response.data.data.contagions
898
             var contagionsArr = response.data.data.contagions
899
             var diseasesArr = response.data.data.diseases
899
             var diseasesArr = response.data.data.diseases
900
+
900
             this.patientPrint = patietInfo
901
             this.patientPrint = patietInfo
901
 
902
 
903
+
902
             var sourceLen = this.sourceOptions.length
904
             var sourceLen = this.sourceOptions.length
903
             for (let index = 0; index < sourceLen; index++) {
905
             for (let index = 0; index < sourceLen; index++) {
904
               if (this.sourceOptions[index].value === patietInfo.source) {
906
               if (this.sourceOptions[index].value === patietInfo.source) {
929
               this.patientPrint.gender = ''
931
               this.patientPrint.gender = ''
930
             }
932
             }
931
             var maritalLen = this.maritalOptions.length
933
             var maritalLen = this.maritalOptions.length
932
-            this.patientPrint.marital_status = ''
934
+            console.log(maritalLen)
933
             for (let index = 0; index < maritalLen; index++) {
935
             for (let index = 0; index < maritalLen; index++) {
934
-              if (this.maritalOptions[index].id === patietInfo.marital_status) {
936
+              if (this.maritalOptions[index].id ==  response.data.data.patient.marital_status) {
935
                 this.patientPrint.marital_status = this.maritalOptions[index].name
937
                 this.patientPrint.marital_status = this.maritalOptions[index].name
936
-                break
938
+
937
               }
939
               }
938
             }
940
             }
941
+
939
             this.patientPrint.birthday = uParseTime(patietInfo.birthday, '{y}-{m}-{d}')
942
             this.patientPrint.birthday = uParseTime(patietInfo.birthday, '{y}-{m}-{d}')
940
             this.patientPrint.age = jsGetAge(this.patientPrint.birthday, '-')
943
             this.patientPrint.age = jsGetAge(this.patientPrint.birthday, '-')
941
 
944