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

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 && org_id != 10537 ">
 
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 0" v-bind:childResponse="childResponse"
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && 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>
@@ -15,7 +15,7 @@
           :prescription_id="prescription_id"
         ></print-ten-one>
 
-        <prinSeven v-if="org_id == 10375 || org_id == 0"
+        <prinSeven v-if="org_id == 10375"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"
@@ -28,7 +28,7 @@
         </prinSeven>
 
         <printFour
-          v-if="org_id == 10088 || org_id == 10510"
+          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/printFour.vue

@@ -52,7 +52,7 @@
 
           </div>
           <div class="doctorBox">
-            <p>
+            <p v-if="org_id!=10598 && org_id!=0 ">
             医师：
             <span
                 style="width: 100px; display: inline-block"
@@ -73,6 +73,28 @@
                 srcset=""
                 v-else
               />
+            </p>
+            <p v-if="org_id==10598 || org_id==0">
+            医师：
+            <!-- <span
+                style="width: 100px; display: inline-block"
+                v-if="item.creator == ''"
+              >
+                {{ item.doctor ? item.doctor : "" }}
+              </span> -->
+              <!-- <span
+                style="width: 100px; display: inline-block"
+                v-else-if="doc_name != ''"
+              >
+                {{ doc_name }}
+              </span> v-else -->
+              <img
+                style="height: 30px"
+                :src="setAdminUserES(item.creator,item.doctor)"
+                alt=""
+                srcset=""
+                
+              />
             </p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
           </div>
@@ -130,6 +152,7 @@ export default {
         operatorMaps: {},
         operators: [],
         doctorList_1: [],
+        org_id:''
       }
     },
    methods:{
@@ -330,7 +353,7 @@ export default {
       this.getHisPatientDetail()
       var xtuser = this.$store.getters.xt_user;
       this.orgname = xtuser.org.org_name;
-
+      this.org_id = this.$store.getters.xt_user.org.id
    },
    watch:{
      ids:function(val){

src/xt_pages/workforce/scheduleTablePrintTwo.vue

@@ -502,9 +502,6 @@
                       </span>
                   </td>
                 </template>
-                
-                
-                
                 <!-- <td>{{item.total}}</td> -->
             </tr>
         </table>