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

src/xt_pages/hospitalStation/listPrint.vue

@@ -13,8 +13,8 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <!-- <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne> -->
-      <printTwo :list="list" :patient="patient" :order="order" :admin="admin"></printTwo>
+       <printOne :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+<!--      <printTwo :list="list" :patient="patient" :order="order" :admin="admin"></printTwo>-->
     </div>
   </div>
 </template>
@@ -177,7 +177,7 @@
           type: 'html',
           style: style,
           scanStyles: false,
-          // documentTitle:"EFFORT", 
+          // documentTitle:"EFFORT",
           // repeatTableHeader:true,  //重复表头
         })
 

src/xt_pages/hospitalStation/summary.vue

@@ -844,7 +844,7 @@
         return uParseTime(time, '{y}-{m}-{d}')
       },
       toDetail(row) {
-        this.$router.push('/hospitalCharges/summaryDetail?patient_id=' + row.patient.id + '&number=' + row.number + '&id=' + row.id)
+        this.$router.push('/outpatientCharges/summaryDetail?patient_id=' + row.patient.id + '&number=' + row.number + '&id=' + row.id)
       }, getTime(value, temp) {
         if (value != undefined) {
           return uParseTime(value, temp)

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,11 +14,11 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 10106 && org_id != 10215  && org_id != 10265" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <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>
       <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>
       <list-print-two v-if="org_id == 10215" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
-      <print-two10265  v-if="org_id == 10265" :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>
@@ -93,7 +93,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            if(this.org_id == 10265  ){
+            if(this.org_id == 10265){
               this.order = response.data.data.order
               this.patient = response.data.data.patient
               this.admin = response.data.data.admin_info