12月13

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -10,12 +10,12 @@
         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 0"><!--&& org_id != 10188 && org_id != 0-->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 "><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 && org_id != 0 " >
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
             <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams"></printThree>
-            <printfifteen v-if="org_id == 10510 " :paramsObj="invoiceParams"></printfifteen>
+            <printfifteen v-if="org_id == 10510 || org_id==0 " :paramsObj="invoiceParams"></printfifteen>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
@@ -46,13 +46,13 @@
       </div>
     </div>
 
-    <div class="app-container" v-if="org_id == 10567 || org_id == 0">
+    <div class="app-container" v-if="org_id == 10567 ">
       <div class='dialysisPage'>
         <printfourteen :paramsObj="invoiceParams"></printfourteen>
       </div>
     </div>
 
-    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id == 0 ">
+    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188  ">
       <div class='dialysisPage'>
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
       </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printfifteen.vue

@@ -5,10 +5,10 @@
             <!-- <div>{{ list.id_card_no }}</div> -->
         </div>
         <div style="display:flex;justify-content: space-between;">
-            <div  style="position: absolute;top:80px;left:250px;">{{ list.department_name }}</div>
+            <div  style="position: absolute;top:80px;left:300px;">{{ list.department_name }}</div>
             <div></div>
             <div>
-                <span style="position: absolute;top:60px;left:120px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
+                <span style="position: absolute;top:50px;left:120px;">{{ paramsObj.setl_time.split(' ')[0].slice(0,10) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">

src/xt_pages/user/dialysisRecord.vue

@@ -686,8 +686,12 @@ export default {
     },
     rowclick(val){
       // console.log('kkkkkkk',val.dialysis_date);
+      // this.$router.push({
+      //   path: "/dialysis/details/indexs",
+      //   query: { patient_id: val.patient_id, date: val.dialysis_date }
+      // });
       this.$router.push({
-        path: "/dialysis/details/indexs",
+        path: "/dialysis/details",
         query: { patient_id: val.patient_id, date: val.dialysis_date }
       });
       // console.log('kkkkkkk',event);