ad

app/cxinv/model/FinancialCancel.php

@@ -75,11 +75,11 @@ class FinancialCancel extends Base
         $log[]=[
             "type"=>$type[$v['type']],
             'order_item_id'=>$cancelInfo->id,
-            'product_id'=>$v->product_id,
-            'num'=>$v->num,
-            "fz_date"=>$v->fz_date,
-            'unit_price'=>$v->unit_price,
-            'rate'=>$v->rate,
+            'product_id'=>$v['product_id'],
+            'num'=>$v['num'],
+            "fz_date"=>$ManagerInfo->fz_date,
+            'unit_price'=>$v['unit_price'],
+            'rate'=>$v['rate'],
             'apply_id'=>$cancelInfo->apply_id,
             'apply_name'=>$cancelInfo->apply_name,
         ];
@@ -116,11 +116,13 @@ class FinancialCancel extends Base
               $log[]=[
                   "type"=>$type[$v['type']],
                   'order_item_id'=>$cancelInfo->id,
-                  'product_id'=>$v->product_id,
-                  'num'=>$v->num,
-                  "fz_date"=>$v->fz_date,
-                  'unit_price'=>$v->unit_price,
-                  'rate'=>$v->rate,
+                  'product_id'=>$v['product_id'],
+                  'num'=>$v['num'],
+                  "fz_date"=>$TzInfo->fz_date,
+                  'unit_price'=>$v['unit_price'],
+                  'rate'=>$v['rate'],
+                  'apply_id'=>$cancelInfo->apply_id,
+                  'apply_name'=>$cancelInfo->apply_name,
               ];
           }
           (new ProductOnlog)->saveAll($log);

app/user/controller/TaxCategory.php

@@ -39,6 +39,7 @@ class TaxCategory extends Base{
     public function listByCompany(){
         $params=$this->request->param([
             "cat_name"=>"",
+            'tax_id'=>"",
             "short_name"=>"",
             "income_status"=>"",
             "output_status"=>"",
@@ -48,6 +49,7 @@ class TaxCategory extends Base{
         $where=[];
         if($params["cat_name"]!='') $where[]=["cat_name","like","%".$params["cat_name"]."%"];
         if($params["short_name"]!='') $where[]=["short_name","like","%".$params["short_name"]."%"];
+        if($params["tax_id"]!=='') $where[]=["tax_category.id","=",$params["tax_id"]];
         if($params["income_status"]!=='') $where[]=$params['income_status']==0 ? ['income','=',null] :['income','=',$params['income_status']];
         if($params["output_status"]!=='') $where[]=$params['output_status']==0 ? ['output','=',null] :['output','=',$params['output_status']];
         if($params["cat_code"]!='') $where[]=["cat_code|merge_code","like","%".$params["cat_code"]."%"];