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/checkTemplate/printThree.vue

@@ -88,7 +88,7 @@
             padding: 0 10px;
           "
         >
-          <div>开单医生：{{ doctor ? doctor : "" }}</div>
+          <div>开单医生: {{ getAdminUser(item.creator) }}</div>
           <div>
             开单日期：
             {{ getTime(pre_time) ? getTime(pre_time).split(" ")[0] : "" }}
@@ -145,6 +145,7 @@ export default {
       org_id: "",
       singleProjectPrint: [],
       operatorMaps: {},
+      adminUser:[],
     };
   },
   methods: {
@@ -198,7 +199,7 @@ export default {
       }
       return "";
     },
-
+    // 数据源
     getPrescriptionPrint() {
       var params = {
         // patient_id:this.patient_id,
@@ -217,8 +218,9 @@ export default {
           console.log("adviceprint9999", advicePrint);
           this.advicePrint = advicePrint;
           this.prescriptions = advicePrint;
-          // console.log("处方222222", this.prescriptions);
+          console.log("处方222222", response.data.data);
           var hisPatient = response.data.data.hisPatient;
+          this.adminUser = response.data.data.roles
           // console.log("hisPatient", hisPatient);
           this.hisPatient = hisPatient;
           let projectPrint = [];
@@ -292,6 +294,19 @@ export default {
         return "";
       }
     },
+    getAdminUser(id) {
+      if (id == 0) {
+        return "";
+      }
+      if (id == undefined) {
+        return "";
+      }
+      for (let i = 0; i < this.adminUser.length; i++) {
+        if (this.adminUser[i].admin_user_id == id) {
+          return this.adminUser[i].user_name;
+        }
+      }
+    },
     getHisPatientDetail() {
       const params = {
         patient_id: this.patient_id,

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

@@ -289,7 +289,9 @@
               <template v-if="index==yi&&item.advices.length>5">
                 <div style="margin: 20px 0px;">
                   <div  style="border-bottom: 2px solid #000; width: 100%;margin-right: 30px;padding: 0 10px;line-height: 24px;" >
-                    <p style="text-align: right;">医师：{{ item.doctor ? item.doctor : "" }}</p>
+                    <p style="text-align: right;">医师：{{ getAdminUser(item.creator)}}</p>
+                    <!-- <span v-if="setAdminUserES(item.creator)==''" ></span>{{ item.doctor ? item.doctor : "" }} -->
+                    <!-- <img style="height:30px;" :src="setAdminUserES(item.creator)" alt srcset /> -->
                   </div>
 
                   <div class="actionBar" >
@@ -404,7 +406,10 @@
             <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
           </div> -->
           <div  style="border-bottom: 2px solid #000; width: 100%;margin-right: 30px;padding: 0 10px;line-height: 24px;" >
-            <p style="text-align: right;">医师：{{ item.doctor ? item.doctor : "" }}</p>
+            <!-- <p style="text-align: right;">医师：{{ item.doctor ? item.doctor : "" }}</p> -->
+            <p style="text-align: right;">医师：{{ getAdminUser(item.creator)}}</p>
+            <!-- <span ></span>  -->
+            <!-- <img style="height:30px;" :src="setAdminUserES(item.creator)" alt srcset /> -->
           </div>
           <!-- <div style="display: flex;justify-content: space-around;border-bottom: 2px solid #000;">
             <p style="width:300px;">大额处方患者意见：
@@ -488,26 +493,49 @@ export default{
       operatorMaps: {},
       operators: [],
       doctorList_1: [],
+      adminUser:[],
     };
   },
   methods: {
     // 电子签名
-    setAdminUserES(id,name) {
-      console.log(id)
-      console.log(name)
-      console.log(this.operatorMaps)
-
-
+    // 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 "";
+    //   }
+    // },
+    setAdminUserES(id) {
+      console.log('5555555555',this.operatorMaps);
       if (id == 0) {
         return "";
       }
       if (id in this.operatorMaps) {
         return this.operatorMaps[id].url;
       } else {
-        this.doc_name = name
         return "";
       }
     },
+    getAdminUser(id) {
+      if (id == 0) {
+        return "";
+      }
+      if (id == undefined) {
+        return "";
+      }
+      for (let i = 0; i < this.adminUser.length; i++) {
+        if (this.adminUser[i].admin_user_id == id) {
+          return this.adminUser[i].user_name;
+        }
+      }
+    },
     getAge(patient) {
       if(patient.id_card_no == "TWN001836483"){
         return patient.age
@@ -556,6 +584,7 @@ export default{
       }
       return "";
     },
+    //数据源
     getPrescriptionPrint() {
       var params = {
         patient_id: this.patient_id,
@@ -571,7 +600,7 @@ export default{
           console.log("response.data.data", response.data.data);
           this.advicePrint = advicePrint;
           this.prescriptions = advicePrint;
-
+          this.adminUser = response.data.data.roles
           this.doctorList_1 = response.data.data.eles;
          for(let i=0;i<this.advicePrint.length;i++){
           const arr = new Array()
@@ -586,10 +615,6 @@ export default{
             }
           }
 
-        //   this.advicePrint[i]['advices'][0]['arr'] = arr
-        //  this.advicePrint[i]["arr"]    = arr
-        //  console.log('55555',arr);
-        //   console.log('ttttt',arr);
           for(let x in arr){
             for(let j in this.advicePrint[i].advices){
               if(arr[x][0].groupno==this.advicePrint[i].advices[j].groupno){

src/xt_pages/outpatientDoctorStation/treatTemplate/printThree.vue

@@ -77,7 +77,7 @@
           </div>
 
           <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
-              <div style="width: 300px;">开单医生：{{item.doctor?item.doctor:''}}</div>
+              <div style="width: 300px;">开单医生：{{getAdminUser(item.creator)}}</div>
               <div style="width: 300px;">签章：</div>
               <div style="width: 300px;">费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
           </div>
@@ -250,7 +250,8 @@ export default {
 
         ],
       hisPatient: {},
-      diagnoses: []
+      diagnoses: [],
+      adminUser:[]
     }
   },
   methods: {
@@ -293,7 +294,20 @@ export default {
         }
       })
     },
-
+    // 医生签名
+    getAdminUser(id) {
+      if (id == 0) {
+        return "";
+      }
+      if (id == undefined) {
+        return "";
+      }
+      for (let i = 0; i < this.adminUser.length; i++) {
+        if (this.adminUser[i].admin_user_id == id) {
+          return this.adminUser[i].user_name;
+        }
+      }
+    },
     getDoctor(id) {
       var name = ''
       for (let i = 0; i < this.doctorList.length; i++) {
@@ -309,6 +323,7 @@ export default {
       }
       return ''
     },
+    // 数据源
     getPrescriptionPrint() {
       var params = {
         patient_id: this.patient_id,
@@ -317,14 +332,15 @@ export default {
         ids: this.ids,
         p_type:2,
       }
-      console.log('999999', params)
       getPrescriptionPrint(params).then(response => {
         if (response.data.state == 1) {
           var advicePrint = response.data.data.advicePrint
+          console.log('ttttttt',response.data.data);
           console.log('adviceprint', advicePrint)
           this.advicePrint = advicePrint
           this.prescriptions = advicePrint
           var projectlist = response.data.data.projectlist
+          this.adminUser = response.data.data.roles
           console.log('所有项目列表', projectlist)
           this.projectList = projectlist
           this.hisPatient = response.data.data.hisPatient