Эх сурвалжийг харах

Merge branch 'dev' of wugg/cxinv into master

wugg 2 жил өмнө
parent
commit
6ec5388c86

+ 2 - 2
app/admin/controller/Payment.php

@@ -1901,13 +1901,13 @@ class Payment extends BaseController
 		$cgdlist =Db::name("pay_info")->alias("a")
 		->leftJoin("cgd_info b","a.cgdNo=b.sequenceNo")
 		->where(["a.payNo"=>$param['payNo'],"a.status"=>1,"a.is_del"=>0])
-		->field("b.sequenceNo '采购单编号',b.qrdCode '销售单编号',b.supplierName '供货商',b.companyName '业务公司',
+		->field("a.payNo'对账单号',b.sequenceNo '采购单编号',b.qrdCode '销售单编号',b.supplierName '供货商',b.companyName '业务公司',
 		b.goodName '商品名称',b.goodUnit '单位',b.goodNum '商品数量',b.goodPrice'商品单价',b.totalPrice'总货款',b.tax '税率'")
 		->select()
 		->toArray();
 		if(empty($cgdlist))$cgdlist=["暂无数据"=>''];
 
-		excelExport("{$param['payNo']}对账采购单详情",array_keys($cgdlist),$cgdlist);
+		excelExport("{$param['payNo']}对账采购单详情",array_keys($cgdlist[0]),$cgdlist);
 	}
 
 }