wuggemail@foxmail.com 4 月之前
父節點
當前提交
132d1bc9ec
共有 2 個文件被更改,包括 3 次插入5 次删除
  1. 3 2
      app/admin/controller/Consult.php
  2. 0 3
      app/admin/controller/Goodup.php

+ 3 - 2
app/admin/controller/Consult.php

@@ -1613,6 +1613,7 @@ class Consult extends Base
             $info->tax_status=$params['status'];
             $info->out_tax_id=$params['out_tax_id'];
             $info->out_tax=$params['out_tax'];
+            $info->remark = $params['remark']??"";
             $info->tax_exam_uid = $this->uid;
             $info->tax_exam_uname = $this->uname;
             $info->tax_exam_time=date("Y-m-d H:i:s");
@@ -1647,7 +1648,7 @@ class Consult extends Base
             return error_show(1004,$valid->getError());
         }
         $temp=[];
-        $bids = ConsultBids::whereIn('bidNo',$list['list'])->column("id,infoNo,bidNo,status,tax_status,tax,tax_id,is_combind","bidNo");
+        $bids = ConsultBids::whereIn('bidNo',$list['list'])->column("id,infoNo,bidNo,status,remark,tax_status,tax,tax_id,is_combind","bidNo");
         foreach ($list['list'] as $k=>$v){
             if (!isset($bids[$v])) return error_show(1004,"{$v}的反馈单不存在");
             if($bids[$v]['tax_status']!=0) return error_show(1004,"{$v}的反馈单状态不正确");
@@ -1665,7 +1666,7 @@ class Consult extends Base
                 "tax_exam_uid"=>$this->uid,
                 'tax_exam_uname'=>$this->uname,
                 "tax_exam_time"=>date('Y-m-d H:i:s'),
-                "tax_exam_remark"=>$v['remark']??"",
+                "tax_exam_remark"=>$v['remark']??""
                 ];
         }
         try{

+ 0 - 3
app/admin/controller/Goodup.php

@@ -500,9 +500,6 @@ class Goodup extends Base
 	        }
        
         $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']):"";
-        if($good_size==''){
-            return error_show(1004,"参数good_size不能为空");
-        }
        $proof_type = isset($this->post['proof_type'])&&$this->post['proof_type']!=""? trim($this->post['proof_type']):"";
        $proof_url = isset($this->post['proof_url'])&&$this->post['proof_url']!=""? trim($this->post['proof_url']):"";