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/invoiceTemplate/printTwo.vue

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

src/xt_pages/outpatientCharges/summary.vue

@@ -770,7 +770,8 @@
           name: obj.patient.name,
           age: obj.age,
           gend: obj.gend,
-          setl_time: obj.setl_time
+          setl_time: obj.setl_time,
+          chargeName: this.getName(obj.creator)
         }
         this.invoiceParams = paramsObj
         this.invoiceVisible = true