wugg 1 년 전
부모
커밋
a089189582
2개의 변경된 파일10개의 추가작업 그리고 10개의 파일을 삭제
  1. 2 8
      app/admin/controller/Good.php
  2. 8 2
      app/admin/model/Good.php

+ 2 - 8
app/admin/controller/Good.php

@@ -163,14 +163,8 @@ class Good extends Base
     	$param['end']==''?: $where[]=['addtime','<=',date('Y-m-d 23:59:59',strtotime($param['end']))];
 		$header=['商品编码','卖出方公司编号','卖出方公司','买入方公司编号','买入方公司','商品名称','采购类目编码','采购类目名称','采购开票商品名称',
 		'财务类目编码','财务类目名称','财务开票商品名称','状态','增值税管理内容','创建人','创建时间'];
-		$list =$this->model->where($where)
-		->field('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')
-		->withAttr('status',function ($v){return \app\admin\model\Good::$status[$v]?:'';})
-		->withAttr('inv_cat_code',function ($v){return $v.' ';})
-		->withAttr('cgd_inv_cat_code',function ($v){return $v.' ';})
-		->select();
-		
+		$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']);
 		excelExport('结算类目设置导出表',$header,$list);
 	}
     /**

+ 8 - 2
app/admin/model/Good.php

@@ -38,7 +38,11 @@ class Good extends Model
     public function GetCgdInvTaxAttr($v){
        return $v==""?'':  strval($v*100).'%';
     }
-    
+     public function GetCgdInvCatCodeAttr($v){
+        return $v.' ';
+    } public function GetInvCatCodeAttr($v){
+       return $v." ";
+    }
     public function export($where,$field){
     	
       $list=  $this->where($where)->field($field)->cursor();
@@ -53,7 +57,9 @@ class Good extends Model
       	if(isset($item['isZx'])){
       	     $item['isZx']=self::$Zx[$item['isZx']];
       	}
-      	
+      	if(isset($item['status'])){
+      	    $item['status']=self::$status[$item['status']];
+      	 }
       	yield $item;
       }
     }