|
|
@@ -53,8 +53,8 @@ class Good extends Base
|
|
|
'is_discount|是否有优惠政策' => 'requireIf:status,2|in:0,1',
|
|
|
'addTax|增值税管理内容' => 'max:255']);
|
|
|
$goodUpdate=[];
|
|
|
- $catArr = \app\admin\model\InvCat::where(["cat_code"=>array_unique(array_column($param['list'],"cat_code"))])
|
|
|
- ->column('tax,merge_code,short_name', 'cat_code');
|
|
|
+ $catArr = \app\admin\model\InvCat::where(["merge_code"=>array_unique(array_column($param['list'],"cat_code"))])
|
|
|
+ ->column('tax,merge_code,short_name', 'merge_code');
|
|
|
foreach ($param['list'] as $item){
|
|
|
$temp=[];
|
|
|
$item['status'] = $param['status'];
|
