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

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

@@ -1,7 +1,7 @@
 <template>
     <div id="list-print" class="list-print">
         <div v-for='(i,index) in pageArr.length' :key="index" style="page-break-after: always;">
-        <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单33</div>
+        <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
         <div class="listInfo">
 
             <div>患者姓名：{{patient.name}}</div>
@@ -12,8 +12,6 @@
             <div>年龄：{{patient.age}}  岁</div>
             <div v-if="order.settle_type == 1">收费日期：{{getTimes(order.settle_accounts_date)}}</div>
             <div v-if="order.settle_type == 2">收费日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
-
-
         </div>
         <table class="listTable" border="1">
             <tr>

src/xt_pages/outpatientDoctorStation/checkPrint.vue

@@ -13,10 +13,10 @@
       </template> -->
 <!--  && this.$store.getters.xt_user.org_id != 0  -->
       <div class='dialysisPage' style="padding-top:40px;">
-        <printOne v-if="this.$store.getters.xt_user.org_id != 10402 && this.$store.getters.xt_user.org_id != 10375 && org_id != 10598 && org_id!=0" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
+        <printOne v-if="this.$store.getters.xt_user.org_id != 10402 && this.$store.getters.xt_user.org_id != 10375 && org_id != 10598 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
         <printTwo v-if="this.$store.getters.xt_user.org_id == 10402 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
         <printThree v-if="this.$store.getters.xt_user.org_id == 10375 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printThree>
-        <printfour v-if="org_id == 10598 || org_id==0 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printfour>
+        <printfour v-if="org_id == 10598 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printfour>
         <!--      <print-two></print-two>-->
       </div>
 

src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+
     <div id="prescription-print3" class="prescription-print">
       <img
         style="width: 100%; height: 80px"
@@ -9,11 +10,17 @@
       />
       <img
         style="width: 100%; height: 80px"
-        v-if="org_id == 10278 || org_id == 0"
+        v-if="org_id == 10278 "
         src="https://kuyi.shengws.com/beierlog.png"
         alt=""
       />
-      <div class="printTitle" v-if="org_id ==10598">孝感源生堂血液透析中心</div>
+      <img
+        style="width: 100%; height: 80px"
+        v-if="org_id == 10610 || org_id == 0"
+        src="@/assets/img/penggang_top.jpg"
+        alt=""
+      />
+      <div class="printTitle" v-if="org_id ==10598||org_id==0">孝感源生堂血液透析中心</div>
       <div class="printTitle">检验申请单</div>
 
       <div style="border: 1px solid #000;margin-bottom: 10px;">
@@ -153,13 +160,19 @@
       v-if="org_id == 10138 "
       src="https://kuyi.shengws.com/bailin/blend.jpg"
       alt=""
-    />
+      />
       <img
         style="width: 100%"
-        v-if="org_id == 10278 || org_id == 0"
+        v-if="org_id == 10278"
         src="https://kuyi.shengws.com/bailinbeier.png"
         alt=""
       />
+      <img
+        style="width: 100%"
+        v-if="org_id == 10610 || org_id == 0"
+        src="@/assets/img/penggang_bottom.jpg"
+        alt=""
+      />
     </div>
   </div>
 </template>
@@ -272,7 +285,7 @@ export default {
       getPrescriptionPrint(params).then((response) => {
         if (response.data.state == 1) {
           var advicePrint = response.data.data.advicePrint;
-          // console.log("adviceprint9999", advicePrint);
+          console.log("adviceprint999933333", response.data.data);
           this.advicePrint = advicePrint;
           this.prescriptions = advicePrint;
           // console.log("处方222222", this.prescriptions);

src/xt_pages/outpatientDoctorStation/print.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="dialysisPage" style="padding-top: 40px">
-      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 10537 ">
+      <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 10537 && org_id != 10610 && org_id != 0 ">
 
         <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 10644 && org_id != 0" v-bind:childResponse="childResponse"
         :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
@@ -9,13 +9,13 @@
         :prescription_id="prescription_id"></printOne>
 
         <print-ten-one
-          v-if="org_id == 10188 || org_id == 10217  " v-bind:childResponse="childResponse"
+          v-if="org_id == 10188 || org_id == 10217 " v-bind:childResponse="childResponse"
           :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient"
           :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date"
           :prescription_id="prescription_id"
         ></print-ten-one>
 
-        <prinSeven v-if="org_id == 10375"
+        <prinSeven v-if="org_id == 10375 "
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"
@@ -27,7 +27,7 @@
           :prescription_id="prescription_id">
         </prinSeven>
 
-        <prineight v-if="org_id == 10644 || org_id ==0"
+        <prineight v-if="org_id == 10644 "
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"
@@ -40,7 +40,7 @@
         </prineight>
 
         <printFour
-          v-if="org_id == 10088 || org_id == 10510 || org_id == 10598 "
+          v-if="org_id == 10088 || org_id == 10510 || org_id == 10598 || org_id ==0 "
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -22,6 +22,12 @@
               style="width: 100%"
               alt=""
           /></span>
+          <span v-if="org_id == 10610 || org_id == 0">
+            <img
+              src="@/assets/img/penggang_top.jpg"
+              style="width: 100%"
+              alt=""
+          /></span>
 
           <span v-if="org_id == 10537">
             <img
@@ -29,6 +35,7 @@
               style="width: 100%"
               alt=""
             /></span>
+          
 
           <div class="printTitle">
             处方笺
@@ -255,6 +262,12 @@
               style="width: 100%"
               alt=""
           /></span>
+          <span v-if="org_id == 10610 || org_id == 0">
+            <img
+              src="@/assets/img/penggang_bottom.jpg"
+              style="width: 100%"
+              alt=""
+          /></span>
 
           <span v-if="org_id == 10537">
             <img

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -17,8 +17,8 @@
         <!-- <printTwo v-if="org_id == 4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printTwo> -->
         <!-- org_id != 10138 && org_id != 10278 && org_id !=4&& org_id !=0 -->
         <printOne v-if="org_id != 10138 && org_id != 10278 && org_id !=4 && org_id != 10375 && org_id != 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
-        <printThree v-if=" org_id == 10375 ||  org_id == 0 " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
-        <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==4" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
+        <printThree v-if=" org_id == 10375  " v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printThree>
+        <printTwo v-if="org_id == 10138 || org_id == 10278 || org_id ==4 || org_id == 0" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
       </div>
   </div>
 </template>

src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue

@@ -19,6 +19,12 @@
           style="width: 100%"
           alt=""
       /></span>
+      <span v-if="org_id == 10610 ||org_id ==0">
+        <img
+          src="@/assets/img/penggang_top.jpg"
+          style="width: 100%"
+          alt=""
+      /></span>
       <div class="printTitle">
         治疗单
         <span
@@ -212,6 +218,12 @@
           style="width: 100%"
           alt=""
       /></span>
+      <span v-if="org_id == 10610 ||org_id ==0">
+        <img
+          src="@/assets/img/penggang_bottom.jpg"
+          style="width: 100%"
+          alt=""
+      /></span>
       <div style="page-break-after: always"></div>
     </div>