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

app/Http/Controllers/Api/SupplierCrmApiController.php

@@ -38,6 +38,12 @@ class SupplierCrmApiController extends Controller
         //     $this->response(-1, '请指定采购员');
         //     $this->response(-1, '请指定采购员');
         // }
         // }
 
 
+        // 校验审核流状态，已拒绝的不允许再审核
+        $auditBillInfo = AuditCenterService::getAuditInfoByIdAndType($supplierId, AuditCenterService::TYPE_CUSTOMER_CONVERT_SUPPLIER_AUDIT);
+        if (!empty($auditBillInfo) && $auditBillInfo['approval_status'] == AuditCenterService::APPROVAL_STATUS_REFUSE) {
+            $this->response(-1, '审核流已被拒绝，无法继续审核');
+        }
+
         $approvalStatus = $auditOpinion == 'agree' ? 1 : 2;
         $approvalStatus = $auditOpinion == 'agree' ? 1 : 2;
 
 
         try {
         try {

app/Http/Controllers/SupplierController.php

@@ -463,6 +463,14 @@ class SupplierController extends Controller
         $this->data['userCodes'] = $intraCodeModel->getChannelUsersEncode(false);
         $this->data['userCodes'] = $intraCodeModel->getChannelUsersEncode(false);
         $this->data['has_channel_uid'] = !empty($supplier['channel_uid']);
         $this->data['has_channel_uid'] = !empty($supplier['channel_uid']);
 
 
+        // 获取审核流状态，判断是否已拒绝
+        $auditBillInfo = AuditCenterService::getAuditInfoByIdAndType($supplierId, AuditCenterService::TYPE_CUSTOMER_CONVERT_SUPPLIER_AUDIT);
+        $auditRejected = false;
+        if (!empty($auditBillInfo) && $auditBillInfo['approval_status'] == AuditCenterService::APPROVAL_STATUS_REFUSE) {
+            $auditRejected = true;
+        }
+        $this->data['audit_rejected'] = $auditRejected;
+
         return $this->view('转化供应商确认');
         return $this->view('转化供应商确认');
     }
     }
 
 

resources/views/web/ConfirmCrmSupplier.blade.php

@@ -72,6 +72,13 @@
                 <b>审核</b>
                 <b>审核</b>
             </blockquote>
             </blockquote>
 
 
+            @if($audit_rejected)
+            <div class="layui-form-item">
+                <div class="layui-input-block">
+                    <span style="color: red; font-weight: bold;">审核流已被拒绝，无法继续审核，请等待CRM重新提交</span>
+                </div>
+            </div>
+            @else
             <div class="layui-form-item">
             <div class="layui-form-item">
                 <label class="layui-form-label"><span class="require">*</span> 审核意见 : </label>
                 <label class="layui-form-label"><span class="require">*</span> 审核意见 : </label>
                 <div class="layui-input-block">
                 <div class="layui-input-block">
@@ -85,10 +92,13 @@
                     <textarea name="remark" placeholder="请输入原因说明（选填）" class="layui-textarea" style="min-height: 80px;"></textarea>
                     <textarea name="remark" placeholder="请输入原因说明（选填）" class="layui-textarea" style="min-height: 80px;"></textarea>
                 </div>
                 </div>
             </div>
             </div>
+            @endif
             <div class="layui-form-item">
             <div class="layui-form-item">
                 <div align="center" style="margin-top: 20px;text-align: right">
                 <div align="center" style="margin-top: 20px;text-align: right">
+                    @if(!$audit_rejected)
                     <button type="button" class="layui-btn layui-btn-info submit-loading" lay-submit lay-filter="confirmCrmSupplier">确定
                     <button type="button" class="layui-btn layui-btn-info submit-loading" lay-submit lay-filter="confirmCrmSupplier">确定
                     </button>
                     </button>
+                    @endif
                     <button type="button" class="layui-btn layui-btn-primary" lay-submit lay-filter="cancel">取消
                     <button type="button" class="layui-btn layui-btn-primary" lay-submit lay-filter="cancel">取消
                     </button>
                     </button>
                 </div>
                 </div>