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

src/xt_pages/outpatientCharges/allListTemplate/printFour.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="allList-print" class="allList-print">
-    <div v-for='(i,index) in pageArr.length' :key="index">
+    <div v-for='(i,index) in pageArr.length' :key="index" style="page-break-after: always;">
       <div class="allListTitle">{{ $store.getters.xt_user.org.org_name }}费用汇总</div>
       <div class="allListInfo">
         <div>患者姓名：{{ patient.name }}</div>

src/xt_pages/outpatientDoctorStation/template/prineight.vue

@@ -70,12 +70,15 @@
           <!-- 精二 -->
           <div style="border-bottom: 1px solid black;border-top: 1px solid black;width: 100%;"
             v-if="prescriptions[index].med_type == '1112'">
-            <div style="display: flex;">
-              <div style="flex: 1;">处方编号:</div>
+            <div style="display: flex;margin: 10px 0;">
+              <div style="flex: 1;">处方编号:
+                {{ item.prescription_number.substring(
+                  item.prescription_number.length - 6
+                ) }}</div>
               <div style="flex: 1;">日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</div>
             </div>
             
-            <div  style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
+            <div  style="display: flex;padding: 0 10px;">
               <p style="width: 200px;">姓名:{{ item.patient.name ? item.patient.name : "" }}</p>
               <p style="width: 200px;">
                 性别:
@@ -98,7 +101,7 @@
             </div>
             <div style="display: flex;">
               <div style="flex: 1;">临床诊断:{{ getDiagnosis(item.info.diagnosis) }}</div>
-              <div style="flex: 1;">身份证号:</div>
+              <div style="flex: 1;">身份证号:{{item.patient.id_card_no}}</div>
             </div>
             <div style="flex: 2;margin: 10px 0;">住址/电话:{{ item.patient.home_address }}&nbsp;<span>{{ item.patient.phone }}</span></div>
             <div style="display: flex;">