ad

app/admin/controller/Consult.php

@@ -1065,13 +1065,13 @@ class Consult extends Base
         $bargain =Db::name("bargain_order")->where(['bidsNo'=>$bidNo,"is_del"=>0])->find();
         $info['bargain'] =$bargain;
         $info['good_img'] = explode(',',$info['good_img']);
-        $tax = TaxCategory::where(['id'=>[$info['tax_id'],$info['out_tax_id']]])->column("shot_name,cat_name,cat_code,merge_code","id");
+        $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['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('shot_name,cat_name,cat_code,merge_code','id');
+                $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['specinfo'] = json_decode($item['specinfo'],true);

app/admin/controller/Sale.php

@@ -4810,13 +4810,13 @@ class Sale extends Base
         $order['supplier_name'] = $supplier_temp['data'][$order['supplierNo']]??"";
         $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('shot_name,cat_name,cat_code,merge_code','id');
-        $order['in_tax'] = $tax[$info['tax_id']]??[];
-        $order['out_tax'] = $tax[$info['out_tax_id']]??[];
+        $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['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('shot_name,cat_name,cat_code,merge_code','id');
+                $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['specinfo'] = json_decode($item['specinfo'],true);