Browse Source

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

28169 1 year ago
parent
commit
28c9a57a9f

+ 3 - 3
src/xt_pages/outpatientCharges/invoicePrint.vue View File

18
           </div>
18
           </div>
19
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
19
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
20
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
20
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
21
-          <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
22
-          <!-- <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen> -->
23
-<!--          <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
21
+          <!-- <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive> -->
22
+          <printthirteen v-if="org_id == 10188 || org_id == 0 " :paramsObj="invoiceParams"></printthirteen>
23
+<!--         <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
24
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
24
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
25
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>
25
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>
26
           <!-- <PrintTen v-if="org_id == 10375 ||org_id == 0 " :paramsObj="invoiceParams"></PrintTen> -->
26
           <!-- <PrintTen v-if="org_id == 10375 ||org_id == 0 " :paramsObj="invoiceParams"></PrintTen> -->

+ 1 - 1
src/xt_pages/outpatientCharges/statementTemplate/printFive.vue View File

23
       </tr>
23
       </tr>
24
 
24
 
25
         <!-- 帐单列表分为左右两列,需要对数据进行x/2分别放进list_L,list_R两个数组进行循环 -->
25
         <!-- 帐单列表分为左右两列,需要对数据进行x/2分别放进list_L,list_R两个数组进行循环 -->
26
-        <tr>
26
+        <tr></tr>
27
 <!--          <td colspan="24">-->
27
 <!--          <td colspan="24">-->
28
 <!--            <template v-for="(v, i) in info.list" >-->
28
 <!--            <template v-for="(v, i) in info.list" >-->
29
 <!--              <el-row gutter="24" >-->
29
 <!--              <el-row gutter="24" >-->