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

src/xt_pages/outpatientDoctorStation/checkPrint.vue

@@ -15,7 +15,7 @@
       <div class='dialysisPage' style="padding-top:40px;">
         <printOne v-if="this.$store.getters.xt_user.org_id != 10402 && this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 0" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
         <printTwo v-if="this.$store.getters.xt_user.org_id == 10402 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
-        <printThree v-if="this.$store.getters.xt_user.org_id == 10375 || this.$store.getters.xt_user.org_id == 0" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printThree>
+        <printThree v-if="this.$store.getters.xt_user.org_id == 10375" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printThree>
         <!--      <print-two></print-two>-->
       </div>
 

src/xt_pages/outpatientDoctorStation/checkTemplate/printTwo.vue

@@ -1,18 +1,7 @@
 <template>
-  <div>
-    <div id="prescription-print3" class="prescription-print">
-      <img
-        style="width: 100%; height: 80px"
-        v-if="org_id == 10138"
-        src="https://kuyi.shengws.com/bailin/bltotle.jpg"
-        alt=""
-      />
-      <img
-        style="width: 100%; height: 80px"
-        v-if="org_id == 10278 || org_id == 0"
-        src="https://kuyi.shengws.com/beierlog.png"
-        alt=""
-      />
+  <div id="prescription-print">
+    <div v-for="(item, index) in advicePrint" :key="index">
+    <div      id="prescription-print"  class="prescription-print"     style="page-break-after: always">
       <div class="printTitle">检验申请单</div>
 
       <div style="border: 1px solid #000;margin-bottom: 10px;">
@@ -91,8 +80,8 @@
 <!--            <div v-for="item in projectPrint" style="margin-bottom: 10px">-->
 <!--              {{ item.team.project_team }}-->
 <!--            </div>-->
-            <div v-for="item in singleProjectPrint" style="margin-bottom: 10px">
-              {{ item.project.project_name }}
+            <div v-for="subitem in item.singleProjectPrint" style="margin-bottom: 10px">
+              {{ subitem.project.project_name }}
             </div>
           </div>
         </div>
@@ -140,11 +129,13 @@
       />
       <img
         style="width: 100%"
-        v-if="org_id == 10278 || org_id == 0"
+        v-if="org_id == 10278"
         src="https://kuyi.shengws.com/bailinbeier.png"
         alt=""
       />
     </div>
+    </div>
+
   </div>
 </template>
 <script>
@@ -266,17 +257,21 @@ export default {
           let projectPrint = [];
           let total = 0;
           this.advicePrint.map((item) => {
+            let singleProjectPrint = []
             // console.log("imte233232323232323223", item.project);
             if (item.project.length > 0) {
               item.project.map((it) => {
                 if (it.type == 2) {
                   if (it.project.cost_classify == 3) {
                     projectPrint.push(it);
+                    singleProjectPrint.push(it)
                     total += it.project.price * parseInt(it.count);
                   }
                 }
               });
             }
+            item["singleProjectPrint"] = singleProjectPrint
+
           });
           this.doctorList_1 = response.data.data.eles;
           // console.log(this.doctorList_1, "医生列表");

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -252,7 +252,6 @@
           :data="tableData3"
           tooltip-effect="dark"
           style="width: 600px"
-
           @selection-change="handleSelectionChange3">
         <el-table-column
             align='center'
@@ -668,7 +667,7 @@ export default {
           style: style,
           scanStyles: false
         })
-      } else if(this.org_id == 10188 || this.org_id == 0){
+      } else if(this.org_id == 10188){
         const style =
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;} .doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;} .doctorBox p {margin-left: auto} .actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 88%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.doctorBoxtwo{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}'
         printJS({
@@ -5020,8 +5019,11 @@ export default {
             this.tableData1 = arr1
             this.tableData2 = arr2
             this.tableData4 = arr4
-            this.tableData3 = [arr3[0]]
-
+            if(this.org_id == 10402 || this.org_id == 0){
+              this.tableData3 = arr3
+            }else{
+              this.tableData3 = [arr3[0]]
+            }
           } else {
             var list = response.data.data.list
             let arr = []
@@ -5049,10 +5051,17 @@ export default {
       this.selecting_schs2 = val
     },
     handleSelectionChange3(val) {
+      console.log(val)
       if (val.length == 0) {
         this.selecting_schs3 = []
       } else {
-        this.selecting_schs3 = this.tableData4
+        if(this.org_id == 10402 || this.org_id == 0){
+          this.selecting_schs3 = val
+
+        }else{
+          this.selecting_schs3 = this.tableData4
+
+        }
       }
     },
     handleClick() {
@@ -5121,7 +5130,9 @@ export default {
         for (let i = 0; i < this.selecting_schs3.length; i++) {
           arr3.push(this.selecting_schs3[i].id)
         }
+        console.log(arr3)
         var ids2 = arr3.join(',')
+        console.log(ids2)
         let obj3 = {
           record: this.record_date,
           prescription_id: this.prescription_id,