Browse Source

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

csx 3 years ago
parent
commit
76478e4070

+ 0 - 3
src/xt_pages/outpatientTool/components/detail.vue View File

473
             colspan: _col
473
             colspan: _col
474
           }
474
           }
475
         }
475
         }
476
-<<<<<<< HEAD
477
       }, export_detail() {
476
       }, export_detail() {
478
 
477
 
479
         let list = []
478
         let list = []
511
 
510
 
512
       }, formatJson(filterVal, jsonData) {
511
       }, formatJson(filterVal, jsonData) {
513
         return jsonData.map(v => filterVal.map(j => v[j]))
512
         return jsonData.map(v => filterVal.map(j => v[j]))
514
-=======
515
       }, getTotal(param) {
513
       }, getTotal(param) {
516
         const { columns, data } = param
514
         const { columns, data } = param
517
         const sums = []
515
         const sums = []
538
         })
536
         })
539
 
537
 
540
         return sums
538
         return sums
541
->>>>>>> 217aeb893378e63b858282bbb055562ea21ad31b
542
       }
539
       }
543
     },
540
     },
544
     created() {
541
     created() {

+ 11 - 10
src/xt_pages/workforce/remind_print.vue View File

1
+
1
 <template>
2
 <template>
2
   <div class="main-contain">
3
   <div class="main-contain">
3
     <div class="position">
4
     <div class="position">
62
 
63
 
63
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
64
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
64
                   <span v-if="org_id!=9987">
65
                   <span v-if="org_id!=9987">
65
-                     <span > 
66
-                       <span v-if="org_id!=10131 && org_id!=10215 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
67
-                     
66
+                     <span >
67
+                       <span v-if="org_id!=10131 && org_id!=10215 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
68
+
68
                        <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
69
                        <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
69
                       </span>
70
                       </span>
70
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
71
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span>
71
                   </span>
72
                   </span>
72
                     {{main_collection.prescription.dialysis_dialyszers}}
73
                     {{main_collection.prescription.dialysis_dialyszers}}
73
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
74
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
164
               list[i].sort = list[i].number.sort
165
               list[i].sort = list[i].number.sort
165
            }
166
            }
166
            var arr = list.sort(this.compare('sort'))
167
            var arr = list.sort(this.compare('sort'))
167
-            
168
+
168
              this.scheduleData = arr
169
              this.scheduleData = arr
169
-            
170
+
170
              let a = response.data.data.day
171
              let a = response.data.data.day
171
               console.log("a",a)
172
               console.log("a",a)
172
               var myDate = new Date(a);
173
               var myDate = new Date(a);
201
           this.currentDate = str
202
           this.currentDate = str
202
           }
203
           }
203
        })
204
        })
204
-       
205
-      
205
+
206
+
206
     },
207
     },
207
     methods: {
208
     methods: {
208
       getAdvice:function(doctor_advice) {
209
       getAdvice:function(doctor_advice) {
282
 
283
 
283
           name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
284
           name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
284
 
285
 
285
-        
286
+
286
         }
287
         }
287
           return name
288
           return name
288
 
289
 
290
         }
291
         }
291
 
292
 
292
       },
293
       },
293
-     
294
+
294
       printAction: function() {
295
       printAction: function() {
295
         const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
296
         const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
296
 
297