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/recordPrint.vue

@@ -18,7 +18,7 @@
           org_id != 9675 &&
           org_id != 9671 &&
           org_id != 0 &&
-          org_id != 10164
+          org_id != 10164 && org_id != 10341 && org_id != 10342
         "
         ref="printOne"
         v-bind:childResponse="childResponse"
@@ -46,7 +46,7 @@
       ></printTwo>
       
       <printThree
-        v-if="org_id == 10318 || org_id == 0"
+        v-if="org_id == 10318 || org_id == 0 "
         ref="printThree"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -54,10 +54,10 @@
         :history="history"
         :patientid="patientid"
       >
-      <!--  -->
+      <!-- || org_id == 0-->
       </printThree>
-      <!-- <printFour
-        v-if="org_id == 10138 || org_id == 10278 || org_id == 0"
+      <printFour
+        v-if="org_id == 10138 || org_id == 10278 || org_id == 10341 || org_id == 10342 || org_id == 0"
         ref="printFour"
         v-bind:childResponse="childResponse"
         :patient="patient"
@@ -65,7 +65,7 @@
         :history="history"
         :patientid="patientid"
       >
-      </printFour> -->
+      </printFour>
     </div>
   </div>
 </template>
@@ -117,7 +117,11 @@ export default {
       this.org_id = id;
       if (id == 10217 || id == 9675 || id == 9671|| id == 10188 ) {
         this.$refs.printTwo.show(val);
-      } else if (id == 10318|| id == 0) {
+      } else if (id == 10138 || id == 10278 || id == 10341 || id == 10342 || id == 0) {
+        this.$refs.printFour.show(val);
+      }
+      else if (id == 10318 || id == 0) {
+        // || id == 0
         this.$refs.printThree.show(val);
       } else {
         this.$refs.printOne.show(val);
@@ -158,7 +162,11 @@ export default {
       const style2 =
         "@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;padding-bottom: 10px;border-bottom: 1px solid;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;} .infoTitle div{width: 200px;} .infoTitle .address_slot{width: 400px;} .infoTitle .name_slot {width: 300px;display: flex;}.name_slot span {display: inline-block;min-width: 70px;border-bottom: 1px solid;} .infoTitle .name_slot_2 {width: 250px;display: flex;} .name_slot_2 .name_slot_1{  display: inline-block;min-width: 70px;border-bottom: 1px solid;} .infoTitle .full_slot {width: 100%;}.infoTitle .full_slot .id_card{border: 1px solid;display: inline-block;width: 18px;height: 18px;text-align: center;margin-right: 6px;} .address_slot_1 span {display: inline-block;min-width: 60px;border-bottom: 1px solid;} .otherInfo{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;justify-content: center;flex-direction: column;margin-top:10px;line-height: 24px;padding:0 10px;border-top: 1px solid;}.recordTitle div{width: 100%;text-align: center;} .recordTitle .recordContent{width: 100%;height: fit-content;min-height: 150px;text-align: left;} .endInfo{display: flex;flex-direction: column;justify-content: end;margin-top: 10px;line-height: 24px;} .endInfo div{width: 300px;} .record_Title{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;} .record_Title div{width: 200px;}}";
 
-      if (this.org_id != 10217 && this.org_id != 0 && this.org_id != 9675 && this.org_id != 10318 &&this.org_id != 10188) {
+      if (this.org_id != 10217 && this.org_id != 0 && 
+          this.org_id != 9675 && this.org_id != 10318 && 
+          this.org_id != 10188 && this.org_id != 10138 && 
+          this.org_id != 10278 && this.org_id != 10341 && 
+          this.org_id != 10342) {
         printJS({
           printable: "prescription-print",
           type: "html",
@@ -176,7 +184,8 @@ export default {
           style: style1,
           scanStyles: false,
         });
-      }else if(this.org_id == 10318||this.org_id == 0 )
+      }else if(this.org_id == 10318 ||this.org_id == 0 )
+      // ||this.org_id == 0
       {
         printJS({
           printable: "prescription-print",
@@ -185,7 +194,7 @@ export default {
           scanStyles: false,
         });
       }
-      else if(this.org_id == 10138 || this.org_id == 10278 || this.org_id == 0){
+      else if(this.org_id == 10138 || this.org_id == 10278 || this.org_id == 10341 || this.org_id == 10342 || this.org_id == 0){
         printJS({
           printable: "prescription-print",
           type: "html",
@@ -194,7 +203,36 @@ export default {
         });
       
       }
-      // if(this.org_id == 10138 || this.org_id == 10278 || this.org_id == 0){
+
+      // if(this.org_id == 10138 || this.org_id == 10278 || this.org_id == 10341 || this.org_id == 10342 || this.org_id == 0){
+      //   printJS({
+      //     printable: "prescription-print",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false,
+      //   });
+      // }else if (
+      //   this.org_id == 10217 ||
+      //   this.org_id == 9675 ||
+      //   this.org_id == 10188
+      // ) {
+      //   printJS({
+      //     printable: "prescription-print",
+      //     type: "html",
+      //     style: style1,
+      //     scanStyles: false,
+      //   });
+      // }else if(this.org_id == 10318 ||this.org_id == 0 )
+      // // ||this.org_id == 0
+      // {
+      //   printJS({
+      //     printable: "prescription-print",
+      //     type: "html",
+      //     style: style2,
+      //     scanStyles: false,
+      //   });
+      // }
+      // else{
       //   printJS({
       //     printable: "prescription-print",
       //     type: "html",

src/xt_pages/outpatientDoctorStation/recordTemplate/printFour.vue

@@ -1,6 +1,6 @@
 <template>
     <div id='prescription-print'>
-        <div class="prescription-print" style="box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;">
+        <div class="prescription-print" style="box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; padding: 10px;">
             <div class="printTitle" style="border: none;">{{orgname}} &nbsp;&nbsp; 门诊病历</div>
             <div class="infoTitle">
                 <div>姓名：{{patient.name?patient.name:''}}</div>