Przeglądaj źródła

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

csx 3 lat temu
rodzic
commit
d885449851

+ 2 - 2
src/xt_pages/outpatientCharges/invoicePrint.vue Wyświetl plik

18
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
18
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
19
           </div>
19
           </div>
20
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
20
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
21
-          <printFour v-if="org_id == 10215 || org_id == 4" :paramsObj="invoiceParams"></printFour>
22
-          <printFive v-if="org_id == 10188 || org_id == 0 ||org_id == 10217" :paramsObj="invoiceParams"></printFive>
21
+          <printFour v-if="org_id == 10215 || org_id == 4 || org_id == 0 " :paramsObj="invoiceParams"></printFour>
22
+          <printFive v-if="org_id == 10188 ||org_id == 10217" :paramsObj="invoiceParams"></printFive>
23
         </div>
23
         </div>
24
     </div>
24
     </div>
25
   </div>
25
   </div>

+ 1 - 1
src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue Wyświetl plik

6
         </div>
6
         </div>
7
         <div style="display:flex;justify-content: space-between;">
7
         <div style="display:flex;justify-content: space-between;">
8
             <!-- <div>{{ list.department_name }}</div> -->
8
             <!-- <div>{{ list.department_name }}</div> -->
9
-            <div  style="position: absolute;top:50px;left:260px">{{ list.order.certno }}</div>
9
+            <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>
10
             <div></div>
10
             <div></div>
11
         </div>
11
         </div>
12
         <div style="display:flex;justify-content: space-between;">
12
         <div style="display:flex;justify-content: space-between;">

+ 2 - 2
src/xt_pages/outpatientCharges/statementPrint.vue Wyświetl plik

33
           "
33
           "
34
         ></printThree>
34
         ></printThree>
35
         <printFour
35
         <printFour
36
-          v-if="org_id == 9504 || org_id == 10028"
36
+          v-if="org_id == 9504 || org_id == 10028  || org_id == 10088"
37
           :info="info"
37
           :info="info"
38
           :paramsObj="paramsObj"
38
           :paramsObj="paramsObj"
39
           :balanceAccounts="balanceAccounts"
39
           :balanceAccounts="balanceAccounts"
40
         ></printFour>
40
         ></printFour>
41
       </div>
41
       </div>
42
-      <print-other :info="info" v-if="org_id == 9919"></print-other>
42
+<!--      <print-other :info="info" v-if="org_id == 9919"></print-other>-->
43
       <printOne :info="info" v-else></printOne>
43
       <printOne :info="info" v-else></printOne>
44
       <!-- 测试医保环境下表格样式放开以下这条 -->
44
       <!-- 测试医保环境下表格样式放开以下这条 -->
45
       <!-- <testVue :info="info" v-else></testVue> -->
45
       <!-- <testVue :info="info" v-else></testVue> -->