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

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -18,8 +18,8 @@
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
           </div>
           <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 || org_id == 0 ||org_id == 10217" :paramsObj="invoiceParams"></printFive>
+          <printFour v-if="org_id == 10215 || org_id == 4 || org_id == 0 " :paramsObj="invoiceParams"></printFour>
+          <printFive v-if="org_id == 10188 ||org_id == 10217" :paramsObj="invoiceParams"></printFive>
         </div>
     </div>
   </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

@@ -6,7 +6,7 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ list.department_name }}</div> -->
-            <div  style="position: absolute;top:50px;left:260px">{{ list.order.certno }}</div>
+            <div  style="position: absolute;top:50px;left:260px">{{ list.order.certno?list.order.certno:list.his.id_card_no?list.his.id_card_no:list.his_hospital_record.id_card_no}}</div>
             <div></div>
         </div>
         <div style="display:flex;justify-content: space-between;">

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -33,13 +33,13 @@
           "
         ></printThree>
         <printFour
-          v-if="org_id == 9504 || org_id == 10028"
+          v-if="org_id == 9504 || org_id == 10028  || org_id == 10088"
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
         ></printFour>
       </div>
-      <print-other :info="info" v-if="org_id == 9919"></print-other>
+<!--      <print-other :info="info" v-if="org_id == 9919"></print-other>-->
       <printOne :info="info" v-else></printOne>
       <!-- 测试医保环境下表格样式放开以下这条 -->
       <!-- <testVue :info="info" v-else></testVue> -->