Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -18,8 +18,8 @@
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
-          <!-- <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive> -->
-          <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen>
+          <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
+          <!-- <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen> -->
 <!--         <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>

src/xt_pages/outpatientDoctorStation/print.vue

@@ -3,7 +3,7 @@
     <div class="dialysisPage" style="padding-top: 40px">
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243">
 
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188" v-bind:childResponse="childResponse"
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 0" 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"></printOne>
@@ -28,7 +28,7 @@
         </prinSeven>
 
         <printFour
-          v-if="org_id == 10088"
+          v-if="org_id == 10088 || org_id == 0"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -52,7 +52,28 @@
 
           </div>
           <div class="doctorBox">
-              <p>医师：{{item.doctor?item.doctor:""}}</p>
+            <p>
+            医师：
+            <span
+              style="width: 100px; display: inline-block"
+              v-if="item.creator == ''"
+            >
+                {{ item.doctor }}
+              </span>
+            <span
+              style="width: 100px; display: inline-block"
+              v-else-if="doc_name != ''"
+            >
+                {{ doc_name }}
+              </span>
+            <img
+              style="height: 50px;"
+              :src="setAdminUserES(item.creator,item.doctor)"
+              alt=""
+              srcset=""
+              v-else
+            />
+          </p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
           </div>
           <div class="actionBar">