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

src/xt_pages/outpatientTool/components/detail.vue

@@ -473,7 +473,6 @@
             colspan: _col
           }
         }
-<<<<<<< HEAD
       }, export_detail() {
 
         let list = []
@@ -511,7 +510,6 @@
 
       }, formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
-=======
       }, getTotal(param) {
         const { columns, data } = param
         const sums = []
@@ -538,7 +536,6 @@
         })
 
         return sums
->>>>>>> 217aeb893378e63b858282bbb055562ea21ad31b
       }
     },
     created() {

src/xt_pages/workforce/remind_print.vue

@@ -1,3 +1,4 @@
+
 <template>
   <div class="main-contain">
     <div class="position">
@@ -62,12 +63,12 @@
 
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
                   <span v-if="org_id!=9987">
-                     <span > 
-                       <span v-if="org_id!=10131 && org_id!=10215 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
-                     
+                     <span >
+                       <span v-if="org_id!=10131 && org_id!=10215 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
+
                        <span v-if="org_id==10131 || org_id==9671 || org_id == 10215">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                       </span>
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span>
                   </span>
                     {{main_collection.prescription.dialysis_dialyszers}}
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
@@ -164,9 +165,9 @@
               list[i].sort = list[i].number.sort
            }
            var arr = list.sort(this.compare('sort'))
-            
+
              this.scheduleData = arr
-            
+
              let a = response.data.data.day
               console.log("a",a)
               var myDate = new Date(a);
@@ -201,8 +202,8 @@
           this.currentDate = str
           }
        })
-       
-      
+
+
     },
     methods: {
       getAdvice:function(doctor_advice) {
@@ -282,7 +283,7 @@
 
           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"
 
-        
+
         }
           return name
 
@@ -290,7 +291,7 @@
         }
 
       },
-     
+
       printAction: function() {
         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; } }'