|
|
@@ -138,7 +138,7 @@ class Good extends Base
|
|
|
$param['spuCode']==''?: $where[]=['spuCode','like',"%{$param['spuCode']}%"];
|
|
|
$param['good_name']==''?: $where[]=['good_name','like',"%{$param['good_name']}%"];
|
|
|
$param['companyNo']==''?: $where[]=['companyNo','like',"%{$param['companyNo']}%"];
|
|
|
- $param['supplierNo']==''?: $where[]=['supplierNo','like',"%{$param['supplierNo']}%"];
|
|
|
+ $param['supplierNo']==''?: $where[]=['supplierNo|cgd_supplierNo','like',"%{$param['supplierNo']}%"];
|
|
|
$param['creater']==''?: $where[]=['creater','like',"%{$param['creater']}%"];
|
|
|
$param['status']===''?: $where[]=['status','=',$param['status']];
|
|
|
$param['isZx']==''?: $where[]=['isZx','=',$param['isZx']];
|
|
|
@@ -165,7 +165,7 @@ class Good extends Base
|
|
|
$param['spuCode']==''?: $where[]=['spuCode','like',"%{$param['spuCode']}%"];
|
|
|
$param['good_name']==''?: $where[]=['good_name','like',"%{$param['good_name']}%"];
|
|
|
$param['companyNo']==''?: $where[]=['companyNo','like',"%{$param['companyNo']}%"];
|
|
|
- $param['supplierNo']==''?: $where[]=['supplierNo','like',"%{$param['supplierNo']}%"];
|
|
|
+ $param['supplierNo']==''?: $where[]=['supplierNo|cgd_supplierNo','like',"%{$param['supplierNo']}%"];
|
|
|
$param['creater']==''?: $where[]=['creater','like',"%{$param['creater']}%"];
|
|
|
$param['status']===''?: $where[]=['status','=',$param['status']];
|
|
|
$param['isZx']==''?: $where[]=['isZx','=',$param['isZx']];
|
|
|
@@ -176,9 +176,9 @@ class Good extends Base
|
|
|
$param['start']==''?: $where[]=['addtime','>=',date('Y-m-d 00:00:00',strtotime($param['start']))];
|
|
|
$param['end']==''?: $where[]=['addtime','<=',date('Y-m-d 23:59:59',strtotime($param['end']))];
|
|
|
$header=['商品编码','卖出方公司编号','卖出方公司','买入方公司编号','买入方公司','商品名称','采购类目编码','采购类目名称','采购开票商品名称',
|
|
|
- '财务类目编码','财务类目名称','财务开票商品名称','状态','增值税管理内容','创建人','创建时间'];
|
|
|
+ '财务类目编码','财务类目名称','财务开票商品名称','状态','增值税管理内容','创建人','创建时间','源头供应商编号',"源头供应商"];
|
|
|
$list= $this->model->export($where,['spuCode','supplierNo','supplierName','companyNo','companyName','good_name','cgd_inv_cat_code','cgd_inv_cat_name','
|
|
|
- cgd_inv_good_name','inv_cat_code','inv_cat_name','inv_good_name','status','addTax','creater','addtime']);
|
|
|
+ cgd_inv_good_name','inv_cat_code','inv_cat_name','inv_good_name','status','addTax','creater','addtime',"cgd_supplierNo",'cgd_supplierName']);
|
|
|
excelExport('结算类目设置导出表',$header,$list);
|
|
|
}
|
|
|
/**
|
