瀏覽代碼

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

csx 3 年之前
父節點
當前提交
ca44b6b627
共有 1 個文件被更改,包括 14 次插入12 次删除
  1. 14 12
      src/xt_pages/outpatientCharges/statementPrint.vue

+ 14 - 12
src/xt_pages/outpatientCharges/statementPrint.vue 查看文件

350
                   }
350
                   }
351
                 }
351
                 }
352
               })
352
               })
353
-              this.balanceAccounts.new_order_info.map(item => {
354
-                    obj4.total = item.Total
355
-                     obj4.details.push(item)
356
-                     num++
357
-
353
+              if(this.balanceAccounts.new_order_info != null) {
354
+                this.balanceAccounts.new_order_info.map(item => {
355
+                  obj4.total = obj4.total + item.Total
356
+                  obj4.details.push(item)
357
+                  num++
358
 
358
 
359
-              })
359
+                })
360
+              }
360
 
361
 
361
               this.balanceAccounts.new_detail_list = []
362
               this.balanceAccounts.new_detail_list = []
362
               this.balanceAccounts.new_detail_list.push(obj)
363
               this.balanceAccounts.new_detail_list.push(obj)
540
                 }
541
                 }
541
               })
542
               })
542
 
543
 
543
-              this.info.order_infos.map(item => {
544
-                obj4.total = item.Total
545
-                obj4.details.push(item)
546
-                num++
547
 
544
 
548
-              })
545
+              // this.info.order_infos.map(item => {
546
+              //   obj4.total = item.Total
547
+              //   obj4.details.push(item)
548
+              //   num++
549
+              //
550
+              // })
549
 
551
 
550
               that.info.new_detail_list = []
552
               that.info.new_detail_list = []
551
               that.info.new_detail_list.push(obj)
553
               that.info.new_detail_list.push(obj)
552
               that.info.new_detail_list.push(obj2)
554
               that.info.new_detail_list.push(obj2)
553
               that.info.new_detail_list.push(obj3)
555
               that.info.new_detail_list.push(obj3)
554
-              that.info.new_detail_list.push(obj4)
556
+              // that.info.new_detail_list.push(obj4)
555
 
557
 
556
               that.num = num
558
               that.num = num
557
 
559