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

src/xt_pages/hospitalStation/template/printOne.vue

@@ -114,16 +114,38 @@
         <div class="doctorBox">
           <p>
             医师：
-            <span
+            <!-- <span
               style="width: 100px; display: inline-block"
+              v-if="item.creator == ''"
             >
               {{ item.doctor }}
             </span>
             <img
               style="height: 30px"
-              :src="setAdminUserES(item.creator)"
+              :src="setAdminUserES(item.creator,item.doctor)"
               alt=""
               srcset=""
+              v-else
+            /> -->
+
+            <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>
@@ -172,6 +194,7 @@ export default {
   },
   data() {
     return {
+      doc_name:'',
       doctorList: [],
       advicePrint: {},
       patient: {},
@@ -189,14 +212,30 @@ export default {
   },
   methods: {
     // 电子签名
-    setAdminUserES(id) {
+    // setAdminUserES(id,name) {
+    //   console.log(id)
+    //   if (id == 0) {
+    //     return "";
+    //   }
+    //   if (id in this.operatorMaps) {
+    //     return this.operatorMaps[id].url;
+    //   } else {
+    //     return "";
+    //   }
+    // },
+    setAdminUserES(id,name) {
       console.log(id)
+      console.log(name)
+      console.log(this.operatorMaps)
+
+
       if (id == 0) {
         return "";
       }
       if (id in this.operatorMaps) {
         return this.operatorMaps[id].url;
       } else {
+        this.doc_name = name
         return "";
       }
     },

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -349,7 +349,7 @@
               :src="setAdminUserES(item.creator,item.doctor)"
               alt=""
               srcset=""
-
+              v-else
             />
           </p>
           <p v-if="org_id == 10510">
@@ -371,7 +371,7 @@
               :src="setAdminUserES(item.creator,item.doctor)"
               alt=""
               srcset=""
-
+              v-else
             />
           </p>
           <p v-if="org_id!=10217 && org_id!=10510">

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -508,7 +508,7 @@ export default {
              }
 
           }
-           console.log("toal_p3232332332233232",total_price)
+          
            if(this.org_id!=0&&this.org_id!=10480){
               order.push({
               warehouse_out_order_number: "合计",