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

         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 "><!--&& org_id != 10188 && org_id != 0-->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 0"><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
           <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 && org_id != 0 " >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
           <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> -->
-          <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen>
+          <!-- <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen> -->
 <!--         <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" :paramsObj="invoiceParams"></PrintNight>
       </div>
     </div> -->
 
-    <!-- <div class="app-container" style="padding-top:30px;" v-if="org_id == 10188 || org_id == 0 ">
+    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id == 0 ">
       <div class='dialysisPage'>
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
       </div>
-    </div> -->
+    </div>
     <!-- <div class="app-container" style="padding-top:40px;" v-if="org_id == 0">
       <div class='dialysisPage'>
         <printthirteen :paramsObj="invoiceParams"></printthirteen>

src/xt_pages/outpatientCharges/invoiceTemplate/printthirteen.vue

 
 <template>
   <div id='invoice-print'>
-    <div v-for='(i,index) in pageArr.length' :key="index" style="width: 80%;margin: 0 auto;font-size: 16px;">
+    <div v-for='(i,index) in pageArr.length' :key="index" style="width: 90%;margin: 0 auto;font-size: 17px;">
       <div style="text-align: center;width: 100%;font-size: 20px; font-weight: bolder;">盐城响水燕舞血液透析中心收据</div>
       <div style="display: flex; margin: 15px 0 5px 0;">
         <div style="flex: 1.1;">业务流水号:{{ list.order_number }}</div>
        
       </div>
       <div style="display: flex;">
-        <div style="flex:1;">医生：{{ doctor_info.user_name }}</div>
-        <div style="flex: 1;">医生编码：{{ doctor_info.doctor_number }}</div>
+        <!-- <div style="flex:1;">医生：{{ doctor_info.user_name }}</div>
+        <div style="flex: 1;">医生编码：{{ doctor_info.doctor_number }}</div> -->
         <div style="flex: 1;">No.{{list.order.fa_piao_number}}</div>
       </div>
       <div style="display: flex;border: 1px solid black;padding: 5px 0;">
         <div style="flex: 1;">姓名：{{ paramsObj.name }}</div>
-        <div style="flex: 1;">性别：</div>
+        <div style="flex: 1;">性别：
+          <span v-if="list.gender == 1">男</span>
+          <span v-if="list.gender == 2">女</span>
+        </div>
         <div style="flex: 1;">医保类型：</div>
         <div style="flex: 1;">社会保障号码：</div>
 
         </div>
       </div>
       <div style="display: flex;">
-        <div style="flex: 1;">收款单位（章）：{{ org_name }}</div>
-        <div style="flex: 1;">收费员：{{ paramsObj.chargeName }}</div>
+        <div style="flex:1;">医生：{{ doctor_info.user_name }}</div>
+        <div style="flex: 1;">医生编码：{{ doctor_info.doctor_number }}</div>
+        <!-- <div style="flex: 1;">No.{{list.order.fa_piao_number}}</div> -->
+      </div>
+      <div style="display: flex;">
+        <div style="flex: 1.5;">收款单位（章）：{{ org_name }}</div>
+        <div style="flex: 0.7;">收费员：{{ paramsObj.chargeName }}</div>
         <div style="flex: 1;">
           <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
           年

src/xt_pages/outpatientDoctorStation/print.vue

         :prescription_id="prescription_id"></printOne>
 
         <print-ten-one
-          v-if="org_id == 10188 || org_id == 10217 || org_id == 0" v-bind:childResponse="childResponse"
+          v-if="org_id == 10188 || org_id == 10217 " 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"
         ></print-ten-one>
 
-        <prinSeven v-if="org_id == 10375 "
+        <prinSeven v-if="org_id == 10375 || org_id == 0"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/outpatientDoctorStation/template/prinSeven.vue

                   </div>
                   <!-- v-if="arr.length>0 && arr[0][0].groupno==it.groupno" 'border-right':arr.length>0 && arr[0][0].groupno==it.groupno ? '1px solid black' :'none',-->
                 </div>
-                <div style="display: inline-block;position: absolute;left:80%;bottom:0px;margin-left: 10px;" >
+                <div style="display: inline-block;position: absolute;left:80%;margin-left: 10px;" >
                   ×&nbsp;{{ it.prescribing_number}}
                 </div>
+                <template v-if="item.arr.length>0&&item.arr[0][0].groupno==it.groupno">
+                  <div style="display: inline-block;position: absolute;left:80%;bottom:20px;margin-left: 10px;" >
+                    ×&nbsp;{{ item.arr[0][0].prescribing_number}}
+                  </div>
+                </template>
                 <div style="display: inline-block;position: absolute;left:85%;top:0px;margin-left: 10px;" v-if="(item.arr.length>0&&item.arr[0][0].groupno!=it.groupno) || item.arr.length==0">
                   &nbsp;共{{ it.prescribing_number}}{{ it.prescribing_number_unit }}
                 </div>