ad

app/admin/controller/Goodup.php

@@ -494,7 +494,7 @@ class Goodup extends Base
 	        $cgd_apply_name =  isset($this->post['cgd_apply_name'])&&$this->post['cgd_apply_name']!=''? trim($this->post['cgd_apply_name']):'';
 //	        $supplier_origin_price =  isset($this->post['supplier_origin_price'])&&$this->post['supplier_origin_price']!=''? floatval($this->post['supplier_origin_price']):'';
 	        $cgd_supplier_name='';
-	        if(isset($supplierArr['relation_code']) && $supplierArr['relation_code']!=''){
+	        if(isset($supplierArr['relation_code']) && $supplierArr['relation_code']!='' && $isCombind==0){
 	            if($cgd_supplier_code=="")return error_show(1004,'采购供应商信息不能为空');
 	            if($cgd_apply_id=="")return error_show(1004,'采购竞单人信息不能为空');
 //	            if($supplier_origin_price==="")return error_show(1004,'采购供应商信息采购成本不能为空');
@@ -890,7 +890,7 @@ class Goodup extends Base
 	        $cgd_apply_name =  isset($this->post['cgd_apply_name'])&&$this->post['cgd_apply_name']!=''? trim($this->post['cgd_apply_name']):'';
 //	        $supplier_origin_price =  isset($this->post['supplier_origin_price'])&&$this->post['supplier_origin_price']!=''? floatval($this->post['supplier_origin_price']):'';
 	        $cgd_supplier_name='';
-	        if(isset($supplierArr['relation_code']) && $supplierArr['relation_code']!=''){
+	        if(isset($supplierArr['relation_code']) && $supplierArr['relation_code']!=''  && $isCombind==0){
 	            if($cgd_supplier_code=='')return error_show(1004,'采购供应商信息不能为空');
 	            if($cgd_apply_id=='')return error_show(1004,'采购竞单人信息不能为空');
 //	            if($supplier_origin_price==='')return error_show(1004,'采购供应商信息采购成本不能为空');
@@ -2344,7 +2344,7 @@ class Goodup extends Base
 	        $cgd_apply_id =  isset($this->post['cgd_apply_id'])&&$this->post['cgd_apply_id']!=''? trim($this->post['cgd_apply_id']):'';
 	        $cgd_apply_name =  isset($this->post['cgd_apply_name'])&&$this->post['cgd_apply_name']!=''? trim($this->post['cgd_apply_name']):'';
 	        $cgd_supplier_name='';
-	        if(isset($supplierArr['relation_code']) && $supplierArr['relation_code']!=''){
+	        if(isset($supplierArr['relation_code']) && $supplierArr['relation_code']!='' && $isCombind==0){
 	            if($cgd_supplier_code=='')return error_show(1004,'采购供应商信息不能为空');
 	            if($cgd_apply_id=='')return error_show(1004,'采购竞单人信息不能为空');
 	              $cgd_supplier =$userCommon->handle('getCodeAndName',['code'=>$cgd_supplier_code]);

app/admin/route/app.php

@@ -90,7 +90,6 @@ Route::rule('Resigninfostatu', 'admin/Resigninfo/statu');//离职交接单审核
 
 Route::rule('Consultlist', 'admin/Consult/list');
 Route::rule('Consultinfo', 'admin/Consult/info');
-Route::rule('Consultdel', 'admin/Consult/del');
 
 Route::rule('infolist', 'admin/Listcustomer/list');