7月20日杨青

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

           if(name == "穿刺处血肿" || name == '拔针后穿刺点渗血' || name == '透析期间进食' ){
             return [
               { required: true, message: `请选择${name}`,trigger: ['blur','change'] },
-              {
-                required: true,
-                pattern: /^[1-9]\d*$/,
-                message: `请选择${name}`,
-                trigger: ['change']
-              },
+              // {
+              //   required: true,
+              //   pattern: /^[1-9]\d*$/,
+              //   message: `请选择${name}`,
+              //   trigger: ['change']
+              // },
             ];
           }
             

src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue

           if (name == "风险程度"||name == "病人情况"||name == '心理评估') {
             return [
               { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
-              {
-                required: true,
-                pattern: /^[1-9]\d*$/,
-                message: `请输入${name}`,
-                trigger: ['blur','change']
-              },
+              // {
+              //   required: true,
+              //   pattern: /^[1-9]\d*$/,
+              //   message: `请输入${name}`,
+              //   trigger: ['blur','change']
+              // },
             ];
           }
           else if(name == "跌倒风险预防措施"){

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

             ) {
             return [
               { required: true, message: `请输入${name}` },
-              {
-                required: true,
-                pattern: /^[1-9]\d*$/,
-                message: `请输入${name}`,
-              },
+              // {
+              //   required: true,
+              //   pattern: /^[1-9]\d*$/,
+              //   message: `请输入${name}`,
+              // },
             ];
           }
             return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];

src/xt_pages/dialysis/details/dialog/computer_dialog.vue

           
           return [
             { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
-            { required: true, pattern: /^[1-9]\d*$/, message: `请输入${name}`,trigger: ['blur','change'] },
+            // { required: true, pattern: /^[1-9]\d*$/, message: `请输入${name}`,trigger: ['blur','change'] },
           ];
         }
           return [{ required: true, message: `请输入${name}` }];

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

           if (name == "透析模式" || name == "透析时长") {
             return [
               { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
-              {
-                required: true,
-                pattern: /^[1-9]\d*$/,
-                message: `请输入${name}`,
-                trigger: ['blur','change']
-              },
+              // {
+              //   required: true,
+              //   pattern: /^[1-9]\d*$/,
+              //   message: `请输入${name}`,
+              //   trigger: ['blur','change']
+              // },
             ];
           }
           return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
             if(name == '置换速度'){
               return [
                 { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
-                {
-                  required: true,
-                  pattern: /^[1-9]\d*$/,
-                  message: `请输入${name}`,
-                  trigger: ['blur','change']
-                },
+                // {
+                //   required: true,
+                //   pattern: /^[1-9]\d*$/,
+                //   message: `请输入${name}`,
+                //   trigger: ['blur','change']
+                // },
               ];
             }
             return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];

src/xt_pages/dialysis/dialysisPrintOrder.vue

           <!-- || $store.getters.xt_user.org.id == 0  -->
         </div>
       </template>
-      <template v-if="org_template_info.template_id == 66 || $store.getters.xt_user.org.id == 0">
+      <template v-if="org_template_info.template_id == 66 ">
         <div>
           <el-button
           :loading="loading"
         >
         </div>
       </template>
-
+      <template v-if="org_template_info.template_id == 67 ">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印67</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
           >
           </DialysisPrintOrderFiftyThree>
 
-         
-        
            <DialysisPrintOrderFiftyFour
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 54"
             v-if="org_template_info.template_id == 66">
 
           </DialysisPrintOrderSixtysix>
+          <DialysisPrintOrdersixtySeven
+          v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 67">
+
+          </DialysisPrintOrdersixtySeven>
         </div>
       </el-container>
     </div>
 import DialysisPrintOrderSixtyfour from './template/DialysisPrintOrderSixtyfour'
 import DialysisPrintOrderSixtyFive from "./template/DialysisPrintOrderSixtyFive.vue"
 import DialysisPrintOrderSixtysix from './template/DialysisPrintOrderSixtysix.vue'
+import DialysisPrintOrdersixtySeven from './template/DialysisPrintOrdersixtySeven.vue'
 export default {
   name: "dialysisPrintOrder",
   components: {
     DialysisPrintOrderSixtyTwo,
     DialysisPrintOrderSixtyOne,
     DialysisPrintOrderSixty,
+    DialysisPrintOrdersixtySeven,
     DialysisPrintOrderFiftyNine,
     DialysisPrintOrderFiftyEight,
     DialysisPrintOrderFiftySeven,
           style: style2,
           scanStyles: false,
         });
-        
       }
-      // else if (this.org_template_info.template_id == 66 ) {
-      //   printJS({
-      //     printable: "dialysis-print-box-1",
-      //     type: "html",
-      //     style: style2,
-      //     scanStyles: false,
-      //   });
-      // }
+      else if (this.org_template_info.template_id == 67 ) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style2,
+          scanStyles: false,
+        });
+      }
       else if (
         this.org_template_info.template_id == 53
       ) {

src/xt_pages/outpatientCharges/invoicePrint.vue

           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
           <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
-          <printSix v-if="org_id == 10217" :paramsObj="invoiceParams"></printSix>
+          <printSix v-if="org_id == 10217 ||org_id == 0 " :paramsObj="invoiceParams"></printSix>
 <!--          <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
-          <PrintNight v-if="org_id == 10210 || org_id == 0" :paramsObj="invoiceParams"></PrintNight>
+          <PrintNight v-if="org_id == 10210 " :paramsObj="invoiceParams"></PrintNight>
+          <PrintTen v-if="org_id == 10375 "></PrintTen>
         </div>
     </div>
   </div>
   import printEight from './invoiceTemplate/printEight'
   import PrintEight from "./invoiceTemplate/printEight";
   import PrintNight from "./invoiceTemplate/PrintNight";
+  import PrintTen from './invoiceTemplate/printTen.vue'
   export default {
     name: "invoicePrint",
     components: {
       printFour,
       printFive,
       printSix,
-      printSeven
+      printSeven,
+      PrintTen
     },
     props:{
       invoiceParams:Object

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

 
       tableHeight: '',
       saveloading: false,
+      
       fullHeight: document.documentElement.clientHeight,
       month_prescriptions: [],
       isloading: false,
           style: style,
           scanStyles: false
         })
+        
       }
-
       this.innerVisible = false
+      
       // this.$nextTick(() => {
       //   this.$refs.print.printThisPage()
       //   this.$refs.treatPrint.printThisPage()

src/xt_pages/outpatientDoctorStation/print.vue

     <div class="dialysisPage" style="padding-top: 40px">
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243">
 
-        <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+        <printOne v-if="org_id != 10088 && org_id != 10215" v-bind:childResponse="childResponse" 
+        :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" 
+        :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" 
+        :prescription_id="prescription_id"></printOne>
 
         <printFour
           v-if="org_id == 10088"
   },
   props: {
     paramsObj: Object,
-    newHisPatient:Object
+    newHisPatient:Object,
+   
   },
   data() {
     return {
         }, 500);
       } else {
         const style =
-          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.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{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}";
+          "@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.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{padding:0 10px;min-height:450px;}.Rp{font-size: 22px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;position: relative;}.drugsBox div{line-height: 20px;width:80%} .drugsOne{line-height: 1px;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}";
         printJS({
           printable: "prescriptionPrint",
           type: "html",

src/xt_pages/outpatientDoctorStation/template/printFive.vue

           <div class="prescriptionBox" style="border-top: 1px solid #000;border-bottom: 1px solid #000;">
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index"
-                :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
+                
               >
+              <!-- :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}" -->
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
                   <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>

src/xt_pages/outpatientDoctorStation/template/printFour.vue

           <div class="prescriptionBox">
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index"
-                :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
+                
               >
+              <!-- :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}" -->
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
-                  <div style="margin-left:100px;"><span>{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</span></div>
+                  <div class="drugsOne" >
+                    <span style="font-weight:bold;">{{ index+1 + '.' }}</span>
+                    {{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;
+                    <span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>
+                    &nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>
+                    &nbsp;&nbsp;<span>{{it.advice_desc}}</span>
+                  </div>
+                  <div style="margin-left:100px;">
+                    <span>{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</span>
+                  </div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

         >
           {{ orgname }}处方笺
         </div>
-        <!--<div class="printTitle">{{orgname}}处方笺</div>-->
-        <div class="infoTitle">
-          <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
-          <p>
-            性别：
-            <span v-if="item.patient.gender == 1">男</span>
-            <span v-if="item.patient.gender == 2">女</span>
-          </p>
-          <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
-        </div>
-        <div class="infoMain">
-          <div style="margin-bottom: 10px">
-            门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
-          </div>
-          <div style="margin-bottom: 10px">
-            科室：{{ item.info ? getDepart(item.info.departments) : "" }}
-          </div>
-          <div style="margin-bottom: 10px">
-            医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
-          </div>
-          <div style="margin-bottom: 10px" v-if="org_id != 10188">
-            电话：{{ item.patient.phone }}
-          </div>
-          <div style="margin-bottom: 10px" v-else>
-            日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+        <div >
+          <div class="infoTitle">
+            <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
+            <p>
+              性别：
+              <span v-if="item.patient.gender == 1">男</span>
+              <span v-if="item.patient.gender == 2">女</span>
+            </p>
+            <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
           </div>
-          <div>地址：{{ item.patient.home_address }}</div>
-          <div style="display: flex; width: 50%">
-            临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
-          </div>
-        </div>
-        <div class="prescriptionBox" >
-          <div class="Rp">Rp:</div>
-          <div
-            class="drugsBox"
-            v-for="(it, index) in item.advices"
-            :key="index"
-            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
-          >
-          <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  'page-break-after':item.advices.length>=3&& item.advices[2]?'always':'auto'-->
-            <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
-            <div class="drugsOne">
-              <span style="font-weight: bold">{{ index + 1 + "." }}</span
-              >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
-                v-if="it.drug.min_unit != it.drug.dose_unit"
-                >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
-              >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
-                it.drug.max_unit
-              }}&nbsp;×&nbsp; {{ it.prescribing_number
-              }}{{ it.prescribing_number_unit }}
+          <div class="infoMain">
+            <div style="margin-bottom: 10px">
+              门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
             </div>
-            <div style="margin-left: 100px">
-              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
-              >&nbsp;&nbsp;<span
-                >{{ it.execution_frequency }}&nbsp;{{
-                  it.delivery_way
-                }}&nbsp;</span
-              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            <div style="margin-bottom: 10px">
+              科室：{{ item.info ? getDepart(item.info.departments) : "" }}
             </div>
-          </div>
-
-          <div
-            class="drugsBox"
-            v-for="(it, i) in item.additionalcharge"
-            :key="i"
-          >
-            <div class="drugsOne">
-              {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{
-                it.count
-              }}次
+            <div style="margin-bottom: 10px">
+              医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
             </div>
-          </div>
-
-          <div
-            class="drugsBox"
-            v-for="(it, index) in item.project"
-            :key="index"
-          >
-            <div class="drugsOne">
-              <span style="font-weight: bold">{{ index + 1 + "." }}</span
-              >{{
-                it.type == 2
-                  ? getProjectName(it.project_id)
-                    ? getProjectName(it.project_id)
-                    : ""
-                  : it.good_info.good_name
-              }}&nbsp;&nbsp;{{ it.single_dose
-              }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count }}{{ unit }}
+            <div style="margin-bottom: 10px" v-if="org_id != 10188">
+              电话：{{ item.patient.phone }}
             </div>
-            <div style="margin-left: 100px">
-              <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
-              >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span
-              >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+            <div style="margin-bottom: 10px" v-else>
+              日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
             </div>
-          </div>
-          
-          <div
-            class="drugsBox"
-            v-for="(it, i) in item.additionalcharge"
-            :key="i"
-          >
-            <div class="drugsOne">
-              {{ it.project_id ? it.project_id : "" }}:&nbsp;{{
-                it.price.toFixed(2)
-              }}元/{{ it.count }}次
+            <div>地址：{{ item.patient.home_address }}</div>
+            <div style="display: flex; width: 50%">
+              临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
             </div>
           </div>
-          <div style="text-align: center">(以下空白)</div>
         </div>
-        <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
-          <p v-if="org_id == 10217 || org_id == 0">
-            医师：
-            <span
-              style="width: 100px; display: inline-block"
-              v-if="item.creator == ''"
+          <div class="prescriptionBox" >
+            <div class="Rp">Rp:</div>
+            <div
+              class="drugsBox"
+              v-for="(it, index) in advicess" :key="index" 
+              :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
             >
-              {{ item.doctor }}
-            </span>
-            <span
-              style="width: 100px; display: inline-block"
-              v-else-if="doc_name != ''"
+            <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  :style="{'page-break-after':index==yi&&item.advices.length>3? 'always':'auto'}"-->
+              <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+              <template v-if="index==yi+1&&item.advices.length>5">
+                <div style="margin: 20px 0px;">
+                  <div class="infoTitle">
+                    <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
+                    <p>
+                      性别：
+                      <span v-if="item.patient.gender == 1">男</span>
+                      <span v-if="item.patient.gender == 2">女</span>
+                    </p>
+                    <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+                  </div>
+                  <div class="infoMain">
+                    <div style="margin-bottom: 10px">
+                      门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
+                    </div>
+                    <div style="margin-bottom: 10px">
+                      科室：{{ item.info ? getDepart(item.info.departments) : "" }}
+                    </div>
+                    <div style="margin-bottom: 10px">
+                      医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
+                    </div>
+                    <div style="margin-bottom: 10px" v-if="org_id != 10188">
+                      电话：{{ item.patient.phone }}
+                    </div>
+                    <div style="margin-bottom: 10px" v-else>
+                      日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+                    </div>
+                    <div>地址：{{ item.patient.home_address }}</div>
+                    <div style="display: flex; width: 50%">
+                      临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
+                    </div>
+                  </div>
+                </div>
+              </template>
+              <div style="position: relative;">
+                <div class="drugsOne" style="border-right: 1px solid black; width: 80%;">
+                  <span style="font-weight: bold" >
+                    {{ index + 1 + "." }}
+                  </span>
+                  {{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;
+                  <span v-if="it.drug.min_unit != it.drug.dose_unit">
+                    {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/
+                    {{it.drug.max_unit}}
+                  </span>&nbsp;
+                  <div>
+                    <template v-if="arr[0][0].groupno==it.groupno">
+                      <div >
+                        <!--  v-for="(its,indexs) in arr" :key="indexs"-->
+                        <span style="margin-left: 38px;">{{arr[0][0].advice_name ? arr[0][0].advice_name : ""}}</span>&nbsp;&nbsp;
+                        <span v-if="arr[0][0].drug.min_unit != arr[0][0].drug.dose_unit">
+                          {{ arr[0][0].drug.dose }}{{ arr[0][0].drug.dose_unit }}&nbsp;* {{ arr[0][0].drug.min_number }}{{ arr[0][0].drug.min_unit }}/
+                          {{arr[0][0].drug.max_unit}}
+                        </span>&nbsp;
+                      </div>
+                    </template>
+                  </div>
+                  
+                  <div style="margin-left: 70px">
+                    <span >用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+                    >&nbsp;&nbsp;<span
+                      >{{ it.execution_frequency }}&nbsp;{{
+                        it.delivery_way
+                      }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+                  </div>
+                  
+                </div>
+                <div style="display: inline-block;position: absolute;left:85%;top:10px;margin-left: 10px;">
+                  ×&nbsp;{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
+                </div>
+              </div>
+              <template v-if="index==yi&&item.advices.length>5">
+                <div style="margin: 20px 0px;">
+                  <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
+                    <p v-if="org_id == 10217 || org_id == 0">
+                      医师：
+                      <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=""
+
+                      />
+                    </p>
+                    <p v-else>
+                      医师： {{ item.doctor ? item.doctor : "" }}
+                    </p>
+                    <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
+                  </div>
+
+                  <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">
+                    <p>医师：{{ item.doctor ? item.doctor : "" }}</p>
+                  </div>
+                  <div class="actionBar" v-if="org_id != 10188 && org_id != 0">
+                    
+                    <p>审核：</p>
+                    <p>配对：</p>
+                    <p>核对：</p>
+                    <p>发药：</p>
+                    <p>
+                      药费：{{
+                        getTotalOne(item.id).toFixed(2)
+                          ? getTotalOne(item.id).toFixed(2)
+                          : 0
+                      }}元
+                    </p>
+                    <!--            <p>药费：466.2元</p>-->
+                  </div>
+                  <div class="actionBar" v-else>
+                    <p >审核、调配：</p>
+                    <p >核对、发药：</p>
+                    <p >
+                      药费：{{
+                        getTotalOne(item.id).toFixed(2)
+                          ? getTotalOne(item.id).toFixed(2)
+                          : 0
+                      }}元
+                    </p>
+                    <!--            <p>药费：551.2元</p>-->
+                    <!--            <p>药费：466.2元</p>-->
+                  </div>
+                </div>
+              </template>
+            </div>
+
+            <div
+              class="drugsBox"
+              v-for="(it, i) in item.additionalcharge"
+              :key="i"
             >
-              {{ doc_name }}
-            </span>
-            <img
-              style="height: 50px;"
-              :src="setAdminUserES(item.creator,item.doctor)"
-              alt=""
-              srcset=""
+              <div class="drugsOne">
+                {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{
+                  it.count
+                }}次
+              </div>
+            </div>
 
-            />
-          </p>
-          <p v-else>
-            医师： {{ item.doctor ? item.doctor : "" }}
-          </p>
-          <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
-        </div>
+            <div
+              class="drugsBox"
+              v-for="(it, index) in item.project"
+              :key="index"
+            >
+              <div class="drugsOne">
+                <span style="font-weight: bold">{{ index + 1 + "." }}</span
+                >{{
+                  it.type == 2
+                    ? getProjectName(it.project_id)
+                      ? getProjectName(it.project_id)
+                      : ""
+                    : it.good_info.good_name
+                }}&nbsp;&nbsp;{{ it.single_dose
+                }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count }}{{ unit }}
+              </div>
+              <div style="margin-left: 100px">
+                <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span
+                >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span
+                >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
+              </div>
+            </div>
+            
+            <div
+              class="drugsBox"
+              v-for="(it, i) in item.additionalcharge"
+              :key="i"
+            >
+              <div class="drugsOne">
+                {{ it.project_id ? it.project_id : "" }}:&nbsp;{{
+                  it.price.toFixed(2)
+                }}元/{{ it.count }}次
+              </div>
+            </div>
+            <div style="text-align: center">(以下空白)</div>
+          </div>
+        
+          <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
+            <p v-if="org_id == 10217 || org_id == 0">
+              医师：
+              <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=""
 
-        <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">
-          <p>医师：{{ item.doctor ? item.doctor : "" }}</p>
-        </div>
-        <!-- <div class="doctorBoxtwo" v-if="org_id == 10188 || org_id == 0">
-          <p >审核、调配：</p>
-          <p >核对、发药：</p>
-          <p style="margin-right: 43px">药师：</p>
-        </div> -->
+              />
+            </p>
+            <p v-else>
+              医师： {{ item.doctor ? item.doctor : "" }}
+            </p>
+            <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
+          </div>
 
-        <div class="actionBar" v-if="org_id != 10188 && org_id != 0">
-          <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
-                 <p>配对：</p>
-                 <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
-                 <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
-                 <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
+          <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">
+            <p>医师：{{ item.doctor ? item.doctor : "" }}</p>
+          </div>
+          <!-- <div class="doctorBoxtwo" v-if="org_id == 10188 || org_id == 0">
+            <p >审核、调配：</p>
+            <p >核对、发药：</p>
+            <p style="margin-right: 43px">药师：</p>
+          </div> -->
 
-          <p>审核：</p>
-          <p>配对：</p>
-          <p>核对：</p>
-          <p>发药：</p>
-          <p>
-            药费：{{
-              getTotalOne(item.id).toFixed(2)
-                ? getTotalOne(item.id).toFixed(2)
-                : 0
-            }}元
-          </p>
-          <!--            <p>药费：466.2元</p>-->
-        </div>
-        <div class="actionBar" v-else>
-          <p >审核、调配：</p>
-          <p >核对、发药：</p>
-          <p >
-            药费：{{
-              getTotalOne(item.id).toFixed(2)
-                ? getTotalOne(item.id).toFixed(2)
-                : 0
-            }}元
-          </p>
-          <!--            <p>药费：551.2元</p>-->
-          <!--            <p>药费：466.2元</p>-->
-        </div>
-        <!-- <div style="page-break-after: always"></div> -->
+          <div class="actionBar" v-if="org_id != 10188 && org_id != 0">
+            <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+                  <p>配对：</p>
+                  <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+                  <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
+                  <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
+
+            <p>审核：</p>
+            <p>配对：</p>
+            <p>核对：</p>
+            <p>发药：</p>
+            <p>
+              药费：{{
+                getTotalOne(item.id).toFixed(2)
+                  ? getTotalOne(item.id).toFixed(2)
+                  : 0
+              }}元
+            </p>
+            <!--            <p>药费：466.2元</p>-->
+          </div>
+          <div class="actionBar" v-else>
+            <p >审核、调配：</p>
+            <p >核对、发药：</p>
+            <p >
+              药费：{{
+                getTotalOne(item.id).toFixed(2)
+                  ? getTotalOne(item.id).toFixed(2)
+                  : 0
+              }}元
+            </p>
+            <!--            <p>药费：551.2元</p>-->
+            <!--            <p>药费：466.2元</p>-->
+          </div>
+        <!-- </div> -->
       </div>
     </div>
   </div>
       doctorList: [],
       advicePrint: {},
       yi:4,
+      arr:[],
+      arrs:{},
+      advicess:[],
+      page:sessionStorage.getItem('dayin'),
       patient: {},
       tableData: [],
       prescriptionInfo: [],
           this.prescriptions = advicePrint;
 
           this.doctorList_1 = response.data.data.eles;
+         for(let i=0;i<this.advicePrint.length;i++){
+          this.advicess=advicePrint[i].advices
+         }
+         for(let j=0;j<this.advicess.length;j++){
+            for(let x=j+1;x<this.advicess.length;x++){
+              if(this.advicess[j].groupno == this.advicess[x].groupno){
+                this.arr.push(this.advicess.splice(x,1))
+                // this.arrs=this.advicess.splice(x,1)
+              }
+            }
+          }
+        // this.merge(this.advicess)
+          // console.log('4444444',this.arrs);
+         console.log('55555555',this.arr);
+         console.log('6666666',this.advicess);
           console.log(this.doctorList_1, "医生列表");
           if (this.doctorList_1.length > 0) {
             var operatorsLen = this.doctorList_1.length;
       }
       return name;
     },
+    merge(arrA){
+      var len=arrA.lenfth
+      // for(let j=0;j<this.advicess.length;j++){
+      //   for(let x=j+1;x<this.advicess.length;x++){
+      //     if(this.advicess[j].groupno == this.advicess[x].groupno){
+      //       // this.arr.push(this.advicess.splice(x,1))
+      //       this.arrs=this.advicess.splice(x,1)
+      //     }
+      //   }
+      // }
+      for(let j=0;j<len;j++){
+        for(let x=j+1;x<len;x++){
+          if(arrA[j].groupno == arrA[x].groupno){
+            this.arr.push(arrA.splice(x,1))
+          }
+        }
+      }
+      console.log('777777777',this.arr);
+      return this.arr
+    }
   },
   created() {
     this.getAllDoctorList();
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     this.org_id = xtuser.org.id;
+    
+    // for(let j=0;j<this.advicess.length;j++){
+    //   console.log('44444444');
+    //   for(let x=j+1;x<this.advicess.length;x++){
+    //     if(this.advicess[j].groupno == this.advicess[x].groupno){
+    //       this.arr.push(this.advicess.splice(x,1))
+    //     }
+    //   }
+    // }
+    // console.log('777777777',this.arr[0].advice_name);
+    // return this.arr
+    
   },
+  
   watch: {
     ids: function (val) {
       this.ids = val;
 .drugsBox {
   padding-left: 40px;
   margin-bottom: 10px;
+  position: relative;
 }
 .drugsBox div {
   line-height: 20px;
 }
 .drugsOne {
   line-height: 24px;
+  display: inline-block;
 }
 .drugsOne span {
   margin-right: 20px;

src/xt_pages/outpatientDoctorStation/template/printSix.vue

             class="drugsBox"
             v-for="(it, index) in item.advices"
             :key="index"
-            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
+            
           >
+          <!-- :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}" -->
             <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
             <div class="drugsOne">
               <!-- <span style="font-weight: bold">{{ index + 1 + "." }}</span> -->

src/xt_pages/outpatientDoctorStation/template/printThree.vue

                 pageIndex * 5 + item.pageArr[pageIndex]
               )"
               :key="index"
-              :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
+              
             >
+            <!-- :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}" -->
               <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
               <div class="drugsOne">
                 <span style="font-weight: bold">{{ index + 1 + "." }}</span

src/xt_pages/workforce/scheduleTablePrint.vue

 <template>
-    <div>
+    <div style="font-size: 18px;">
       <el-button style="float:right;" type="primary" @click="printAction">打印</el-button>
 
 <!--      <el-button type="primary" @click="printAction">打印</el-button>-->
             return [weekArr[week], typeArr[schedule_type]];
         },
         printAction: function() {
-            const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
+            const style = '@media print {#scheduleTable{font-size:18px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
 
             printJS({
             printable: 'scheduleTable',