Merge branch 'ysx-CRM转化供应商流程-20260518' into Dev

app/Http/Controllers/Api/SupplierCrmApiController.php

@@ -34,9 +34,9 @@ class SupplierCrmApiController extends Controller
         if ($auditOpinion == 'disagree' && empty($remark)) {
         if ($auditOpinion == 'disagree' && empty($remark)) {
             $this->response(-1, '请填写原因说明');
             $this->response(-1, '请填写原因说明');
         }
         }
-        // if ($auditOpinion == 'agree' && empty($channelUid)) {
-        //     $this->response(-1, '请指定采购员');
-        // }
+        if ($auditOpinion == 'agree' && empty($channelUid)) {
+            $this->response(-1, '请指定采购员');
+        }
 
 
         // 校验审核流状态，已拒绝的不允许再审核
         // 校验审核流状态，已拒绝的不允许再审核
         $auditBillInfo = AuditCenterService::getAuditInfoByIdAndType($supplierId, AuditCenterService::TYPE_CUSTOMER_CONVERT_SUPPLIER_AUDIT);
         $auditBillInfo = AuditCenterService::getAuditInfoByIdAndType($supplierId, AuditCenterService::TYPE_CUSTOMER_CONVERT_SUPPLIER_AUDIT);

resources/views/script/ConfirmCrmSupplierScript.blade.php

@@ -9,6 +9,11 @@
             let remark = data.field.remark || '';
             let remark = data.field.remark || '';
             let channelUid = data.field.channel_uid || '';
             let channelUid = data.field.channel_uid || '';
 
 
+            // 同意时必须指定采购员
+            if (auditOpinion === 'agree' && !channelUid) {
+                parent.layer.msg('请指定采购员', {icon: 5});
+                return false;
+            }
             let url = '/api/supplier_crm/AuditCustomerConvertSupplier';
             let url = '/api/supplier_crm/AuditCustomerConvertSupplier';
             let requestData = {
             let requestData = {
                 supplier_id: supplierId,
                 supplier_id: supplierId,

resources/views/web/ConfirmCrmSupplier.blade.php

@@ -62,6 +62,7 @@
                         <div class="layui-input-block block-42 info-label">
                         <div class="layui-input-block block-42 info-label">
                             {{ array_get($userCodes, $supplier['channel_uid'], '未知') }}
                             {{ array_get($userCodes, $supplier['channel_uid'], '未知') }}
                         </div>
                         </div>
+                        <input type="hidden" name="channel_uid" value="{{ $supplier['channel_uid'] }}">
                     @else
                     @else
                         {!! $statusPresenter->render('channel_uid','指定采购员 : ',null,
                         {!! $statusPresenter->render('channel_uid','指定采购员 : ',null,
                         $userCodes,['required'=>true,'width'=>'150px']) !!}
                         $userCodes,['required'=>true,'width'=>'150px']) !!}