Procházet zdrojové kódy

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

csx před 3 roky
rodič
revize
fd34a3d19e

+ 1 - 1
src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue Zobrazit soubor

@@ -107,7 +107,7 @@
107 107
         <div style="position: absolute;top:280px;left:460px">现金:{{ list.psn_cash_money }}</div>
108 108
         <div>
109 109
             <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div>
110
-            <div v-if="org_id == 10106" style="position: absolute;top:320px;left:460px">林美华</div>
110
+            <div style="position: absolute;top:320px;left:460px">{{ paramsObj.chargeName }}</div>
111 111
         </div>
112 112
     </div>
113 113
 </template>

+ 2 - 1
src/xt_pages/outpatientCharges/summary.vue Zobrazit soubor

@@ -770,7 +770,8 @@
770 770
           name: obj.patient.name,
771 771
           age: obj.age,
772 772
           gend: obj.gend,
773
-          setl_time: obj.setl_time
773
+          setl_time: obj.setl_time,
774
+          chargeName: this.getName(obj.creator)
774 775
         }
775 776
         this.invoiceParams = paramsObj
776 777
         this.invoiceVisible = true