ad

app/admin/controller/Consult.php

@@ -1018,6 +1018,8 @@ class Consult extends Base
         $info['unit'] = isset($unit['unit'])?$unit['unit']:'';
         $info['cat_info'] = made($info['cat_id'],[]);
         $info['noble_weight'] = $info['good_weight'];
+        $info['companyNo'] = $zx['companyNo'];
+        $info['companyName'] = $zx['companyName'];
         $user= \app\admin\common\User::getIns();
         $supplier =$user->handle("getCodeAndName",["code"=>$info['supplierNo']]);
         $info['supplierName'] = isset($supplier['data'][$info['supplierNo']])?$supplier['data'][$info['supplierNo']]:"";
@@ -1066,14 +1068,14 @@ class Consult extends Base
         $info['bargain'] =$bargain;
         $info['good_img'] = explode(',',$info['good_img']);
         $tax = TaxCategory::where(['id'=>[$info['tax_id'],$info['out_tax_id']]])->column("short_name,cat_name,cat_code,merge_code","id");
-        $info['in_tax'] = $tax[$info['tax_id']]??[];
-        $info['out_tax'] = $tax[$info['out_tax_id']]??[];
+        $info['in_info'] = $tax[$info['tax_id']]??[];
+        $info['out_info'] = $tax[$info['out_tax_id']]??[];
         $info['child'] =[];
         if($info['is_combind']==1){
             $info['child'] =ConsultTemp::where(['bidNo'=>$bidNo])->select()->each(function(&$item){
                 $tax = TaxCategory::where(['id'=>[$item['tax_id'],$item['out_tax_id']]])->column('short_name,cat_name,cat_code,merge_code','id');
-                $item['in_tax'] = $tax[$item['tax_id']]??[];
-                $item['out_tax'] = $tax[$item['out_tax_id']]??[];
+                $item['in_info'] = $tax[$item['tax_id']]??[];
+                $item['out_info'] = $tax[$item['out_tax_id']]??[];
             });
         }
         //添加商品创建人字段
@@ -2068,8 +2070,8 @@ class Consult extends Base
             }
             $value['origin_addr']=GetAddr(json_encode($place));
            $tax = TaxCategory::where(['id'=>[$value['tax_id'],$value['out_tax_id']]])->column('short_name,cat_name,cat_code,merge_code','id');
-            $value['in_tax'] = $tax[$value['tax_id']]??[];
-            $value['out_tax'] = $tax[$value['out_tax_id']]??[];
+            $value['in_info'] = $tax[$value['tax_id']]??[];
+            $value['out_info'] = $tax[$value['out_tax_id']]??[];
 		$good_info = Db::name('good_basic')
             ->field('id,createrid,creater')
             ->where('is_del',0)

app/admin/controller/Sale.php

@@ -4811,14 +4811,14 @@ class Sale extends Base
         $order["gold_price"] = isset($price['price']) ? $price['price'] : 0;
         $order["noble_weight"] = isset($order['weight']) ? $order['weight'] : 0;
         $tax = TaxCategory::where(['id'=>[$order['tax_id'],$order['out_tax_id']]])->column('short_name,cat_name,cat_code,merge_code','id');
-        $order['in_tax'] = $tax[$order['tax_id']]??[];
-        $order['out_tax'] = $tax[$order['out_tax_id']]??[];
+        $order['in_info'] = $tax[$order['tax_id']]??[];
+        $order['out_info'] = $tax[$order['out_tax_id']]??[];
         $order['child'] =[];
         if($order['is_combind']==1){
             $order['child'] =ConsultTemp::where(['bidNo'=>$order['bidNo']])->select()->each(function(&$item){
                 $tax = TaxCategory::where(['id'=>[$item['tax_id'],$item['out_tax_id']]])->column('short_name,cat_name,cat_code,merge_code','id');
-                $item['in_tax'] = $tax[$item['tax_id']]??[];
-                $item['out_tax'] = $tax[$item['out_tax_id']]??[];
+                $item['in_info'] = $tax[$item['tax_id']]??[];
+                $item['out_info'] = $tax[$item['out_tax_id']]??[];
             });
         }
         $good_info = Db::name('good_basic')