浏览代码

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

csx 3 年前
父节点
当前提交
a397ee5517

+ 3 - 1
src/xt_pages/outpatientCharges/invoiceTemplate/printOne.vue 查看文件

141
         let params = {
141
         let params = {
142
             order_id: this.paramsObj.order_id,
142
             order_id: this.paramsObj.order_id,
143
             patient_id: this.paramsObj.patient_id,
143
             patient_id: this.paramsObj.patient_id,
144
+            number: this.paramsObj.number,
144
         }
145
         }
145
         this.getInvoice(params)
146
         this.getInvoice(params)
146
         // var data = new Date();
147
         // var data = new Date();
192
             }
193
             }
193
 
194
 
194
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
195
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
195
-            n += "00";  
196
+            n += "00";
196
 
197
 
197
             var indexpoint = n.indexOf('.');  // 如果是小数,截取小数点前面的位数
198
             var indexpoint = n.indexOf('.');  // 如果是小数,截取小数点前面的位数
198
 
199
 
217
                 let params = {
218
                 let params = {
218
                     order_id: val.order_id,
219
                     order_id: val.order_id,
219
                     patient_id: val.patient_id,
220
                     patient_id: val.patient_id,
221
+                    number: val.number,
220
                 }
222
                 }
221
                 this.getInvoice(params)
223
                 this.getInvoice(params)
222
 
224
 

+ 1 - 0
src/xt_pages/outpatientCharges/summary.vue 查看文件

809
         let paramsObj = {
809
         let paramsObj = {
810
           order_id: obj.id,
810
           order_id: obj.id,
811
           patient_id: obj.patient_id,
811
           patient_id: obj.patient_id,
812
+          number:obj.mdtrt_id,
812
           name: obj.patient.name,
813
           name: obj.patient.name,
813
           age: obj.age,
814
           age: obj.age,
814
           gend: obj.gend,
815
           gend: obj.gend,