ad

app/admin/controller/Consult.php

@@ -1639,34 +1639,21 @@ class Consult extends Base
         if(!$valid->check($list)){
             return error_show(1004,$valid->getError());
         }
-         $valids = Validate::rule([
-            'bidNo|反馈单编号'=>'require',
-            'status|状态'=>'require|number',
-            'remark|备注'=>'max:255',
-            'out_tax_id|税目id'=>'requireIf:status,1|number',
-            'out_tax|税目税率'=>'requireIf:status,1'
-        ]);
         $temp=[];
+        $bids = ConsultBids::where(['id'=>$list['list']])->column("id,infoNo,bidNo,status,tax_status,tax,tax_id,is_combind","bidNo");
         foreach ($list['list'] as $k=>$v){
-            if(!$valids->check($v)){
-                return error_show(1004,$valids->getError());
-            }
-            $info =ConsultBids::where(['bidNo'=>$v['bidNo'],'is_del'=>0])->findOrEmpty();
-            if($info->isEmpty()){
-                return error_show(1004,"未找到{$v['bidNo']}商品数据");
-            }
-            $consult_info =ConsultInfo::where(['infoNo'=>$info['infoNo'],'is_del'=>0])->findOrEmpty();
+            if (!isset($bids[$v])) return error_show(1004,"{$v}的反馈单不存在");
+            $consult_info =ConsultInfo::where(['infoNo'=>$bids[$v]['infoNo'],'is_del'=>0])->findOrEmpty();
             if($consult_info->isEmpty()) $this->error("未找到{$v['bidNo']}的咨询单数据");
             if($consult_info['status']!=2&&$consult_info['status']!=3&&$consult_info['status']!=7){
-                return error_show(1004,"{$v['bidNo']}的咨询单招标未结束或已确认商品");
+                return error_show(1004,"{$v}的咨询单招标未结束或已确认商品");
             }
-           if ($info->is_combind==1 && $v['status']==1)return error_show(1004,$v['bidNo'].'组合商品不可参与批量审核');
+           if ($bids[$v]['is_combind']==1)return error_show(1004,$v.'组合商品不可参与批量审核');
             $temp[]=[
-                "id"=>$info->id,
-                "tax_status"=>$v['status'],
-                "out_tax_id"=>$v['out_tax_id'],
-                "out_tax"=>$v['out_tax'],
-                "remark"=>$v['remark']
+                "id"=>$bids[$v]['id'],
+                "tax_status"=>1,
+                "out_tax_id"=>$bids[$v]['tax_id'],
+                "out_tax"=>$bids[$v]['tax']
                 ];
         }
         try{

app/admin/controller/Purch.php

@@ -287,15 +287,14 @@ class Purch extends Base
          $taxInfo=OrderTax::where(['code'=>$data['cgdNo']])->findOrEmpty();
          $data['tax_name'] = $taxInfo['tax_name']??'';
          $data['tax_code'] =$taxInfo['tax_code']??'';
-          $data['tax_short_name'] =$taxInfo['tax_short_name']??'';
+         $data['tax_short_name'] =$taxInfo['tax_short_name']??'';
          $data['tax']=$taxInfo['inv_tax']??'';
          $data['inv_good_name']=$taxInfo['inv_good_name']??'';
-
-            $goon['exclusive'] = isset($goon['is_exclusive']) ? makeExcluse($goon['is_exclusive']) : "";
-            $unit = Db::name("unit")->where(["id" => $goon['good_unit']])->find();
-            $goon['unit'] = isset($unit['unit']) ? $unit['unit'] : '';
-            $spec = Db::name("good_spec")->where(["spuCode" => $goon['spuCode'], "is_del" => 0])->select()->toArray();
-            $speclist = [];
+        $goon['exclusive'] = isset($goon['is_exclusive']) ? makeExcluse($goon['is_exclusive']) : "";
+        $unit = Db::name("unit")->where(["id" => $goon['good_unit']])->find();
+        $goon['unit'] = isset($unit['unit']) ? $unit['unit'] : '';
+        $spec = Db::name("good_spec")->where(["spuCode" => $goon['spuCode'], "is_del" => 0])->select()->toArray();
+        $speclist = [];
             if (!empty($spec)) {
                 foreach ($spec as $value) {
                     $temp = [];
@@ -389,7 +388,6 @@ class Purch extends Base
             $data['wsm_supplierNo'] = isset($wsmcode['data'][$data['wsm_code']]) ? $wsmcode['data'][$data['wsm_code']] : "";
             $data['wsm_contactor'] = isset($wsmcode['wsm_contactor']) ? $wsmcode['wsm_contactor'] : "";
             $data['wsm_mobile'] = isset($wsmcode['wsm_mobile']) ? $wsmcode['wsm_mobile'] : "";
-            // $data['wsm_addr'] =isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr']:"";
             $data['addr_code'] = isset($wsmcode['addr_code']) ? $wsmcode['addr_code'] : "";
             $data['wsm_addr'] = isset($wsmcode['addr_code']) ? GetAddr($wsmcode['addr_code']) : "";
             $data['wsm_addr'] .= isset($wsmcode['wsm_addr']) ? $wsmcode['wsm_addr'] : "";

app/admin/model/OrderTax.php

@@ -3,7 +3,6 @@
 
 namespace app\admin\model;
 
-
 use think\Model;
 class OrderTax extends Model {
     protected $createTime = 'createTime';