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

src/xt_pages/medicalScheduling/medical_print.vue

                         <table class="table">
                             <thead>
                                 <tr>
-                                    <td width="120">医护姓名</td>
+                                    <td width="120">医护<br/>姓名</td>
                                     <td width="120">周一<br />({{ weekArr[0] }})</td>
                                     <td width="120">周二<br />({{ weekArr[1] }})</td>
                                     <td width="120">周三<br />({{ weekArr[2] }})</td>
                                     <td width="120">周日<br />({{ weekArr[6] }})</td>
                                     <td width="120">调休<br /></td>
                                     <td width="120">加班<br /></td>
-                                    <td width="120">累计时数<br /></td>
+                                    <td width="120">累计<br/>时数<br /></td>
                                     <td width="120">公休<br /></td>
                                 </tr>
                             </thead>
     },
     methods:{
       printAction: function() {
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 0px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 0px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
 
           printJS({
           printable: 'print_content',

src/xt_pages/outpatientDoctorStation/template/printFour.vue

             <p>
             医师：
             <span
-              style="display: inline-block"
-              v-if="item.creator == ''"
-            >
-                {{ item.doctor }}
+                style="width: 100px; display: inline-block"
+                v-if="item.creator == ''"
+              >
+                {{ item.doctor ? item.doctor : "" }}
               </span>
-            <span
-              style="display: inline-block"
-              v-else-if="doc_name != ''"
-            >
+              <!-- <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>
+              </span> -->
+              <img
+                style="height: 30px"
+                :src="setAdminUserES(item.creator,item.doctor)"
+                alt=""
+                srcset=""
+                v-else
+              />
+            </p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
           </div>
           <div class="actionBar">
 import {getInitData} from "@/api/his/his"
 export default {
     props:{
-      patient_id:Number,
-      record_date:String,
-      prescription_id:Number,
-      ids:String
+      patient_id: Number,
+      record_date: String,
+      prescription_id: Number,
+      his_patient_id:Number,
+      ids: String,
+      newHisPatient:Object,
     },
     data(){
       return {
     },
    methods:{
    // 电子签名
-   setAdminUserES(id,name) {
-      console.log(id)
-      console.log(name)
-      console.log(this.operatorMaps)
-
-
+    setAdminUserES(id,name) {
       if (id == 0) {
         return "";
       }
       if (id in this.operatorMaps) {
         return this.operatorMaps[id].url;
       } else {
-        this.doc_name = name
+        this.doc_name = name;
         return "";
       }
     },