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

.env

@@ -168,6 +168,6 @@ IMAGE_SERVER_URL=http://image.liexindev.net
 
 
 FILE_SERVER_URL=http://file.liexindev.net
 FILE_SERVER_URL=http://file.liexindev.net
 
 
-CRM_URL=http://crmnew.liexindev.net
+CRM_URL=http://crmnew_v4.liexindev.net
 
 
 CUBE_URL=http://cube.liexindev.net
 CUBE_URL=http://cube.liexindev.net

app/Http/Controllers/SupplierController.php

@@ -461,6 +461,7 @@ class SupplierController extends Controller
         // 获取采购员列表
         // 获取采购员列表
         $intraCodeModel = new IntracodeModel();
         $intraCodeModel = new IntracodeModel();
         $this->data['userCodes'] = $intraCodeModel->getChannelUsersEncode(false);
         $this->data['userCodes'] = $intraCodeModel->getChannelUsersEncode(false);
+        $this->data['has_channel_uid'] = !empty($supplier['channel_uid']);
 
 
         return $this->view('转化供应商确认');
         return $this->view('转化供应商确认');
     }
     }

app/Http/Services/CrmService.php

@@ -17,7 +17,6 @@ class CrmService
             return json_decode($cachedData, true);
             return json_decode($cachedData, true);
         }
         }
 
 
-        try {
         $url = env('CRM_URL') . '/open/signComs/getSignComs?use_scope=2';
         $url = env('CRM_URL') . '/open/signComs/getSignComs?use_scope=2';
         $client = new Client();
         $client = new Client();
         $response = $client->get($url);
         $response = $client->get($url);
@@ -25,12 +24,8 @@ class CrmService
         if ($result['code'] != 0) {
         if ($result['code'] != 0) {
             return [];
             return [];
         }
         }
-
         (new RedisModel())->setex($cacheKey, 60, json_encode($result['data']['list']));
         (new RedisModel())->setex($cacheKey, 60, json_encode($result['data']['list']));
         return $result['data']['list'];
         return $result['data']['list'];
-        } catch (\Exception $e) {
-            return [];
-        }
     }
     }
 
 
     //获取简单形式给各个地方使用
     //获取简单形式给各个地方使用

app/Http/Services/SupplierAuditService.php

@@ -679,8 +679,16 @@ class SupplierAuditService
                     $logService = new LogService();
                     $logService = new LogService();
                     $logService->AddLog($supplierId, LogModel::UPDATE_OPERATE, '客户转化供应商审核', $logContent);
                     $logService->AddLog($supplierId, LogModel::UPDATE_OPERATE, '客户转化供应商审核', $logContent);
                 } else {
                 } else {
+                    $updateData = [];
+                    if (!empty($channelUid)) {
+                        $updateData['channel_uid'] = $channelUid;
+                    }
+                    if (!empty($updateData)) {
+                        $updateData['update_time'] = time();
+                        SupplierChannelModel::where('supplier_id', $supplierId)->update($updateData);
+                    }
                     // 中间节点审核通过，记录日志
                     // 中间节点审核通过，记录日志
-                    $logContent = "确认客户转化供应商：审核通过";
+                    $logContent = "确认客户转化供应商：审核通过,等待下一层审核";
                     $logService = new LogService();
                     $logService = new LogService();
                     $logService->AddLog($supplierId, LogModel::UPDATE_OPERATE, '客户转化供应商审核', $logContent);
                     $logService->AddLog($supplierId, LogModel::UPDATE_OPERATE, '客户转化供应商审核', $logContent);
                 }
                 }

resources/views/script/ConfirmCrmSupplierScript.blade.php

@@ -10,12 +10,16 @@
             let channelUid = data.field.channel_uid || '';
             let channelUid = data.field.channel_uid || '';
 
 
             let url = '/api/supplier_crm/AuditCustomerConvertSupplier';
             let url = '/api/supplier_crm/AuditCustomerConvertSupplier';
-            let res = ajax(url, {
+            let requestData = {
                 supplier_id: supplierId,
                 supplier_id: supplierId,
                 audit_opinion: auditOpinion,
                 audit_opinion: auditOpinion,
                 remark: remark,
                 remark: remark,
-                channel_uid: channelUid,
-            });
+            };
+            // 只有当channel_uid存在时才传递
+            if (channelUid) {
+                requestData.channel_uid = channelUid;
+            }
+            let res = ajax(url, requestData);
             if (!res) {
             if (!res) {
                 parent.layer.msg('网络错误，请重试', {icon: 5});
                 parent.layer.msg('网络错误，请重试', {icon: 5});
             } else {
             } else {

resources/views/web/ConfirmCrmSupplier.blade.php

@@ -57,8 +57,15 @@
                 </div>
                 </div>
                 <div class="layui-col-sm6">
                 <div class="layui-col-sm6">
                     @inject('statusPresenter','App\Presenters\StatusPresenter')
                     @inject('statusPresenter','App\Presenters\StatusPresenter')
+                    @if($has_channel_uid)
+                        <label class="layui-form-label">指定采购员 : </label>
+                        <div class="layui-input-block block-42 info-label">
+                            {{ array_get($userCodes, $supplier['channel_uid'], '未知') }}
+                        </div>
+                    @else
                         {!! $statusPresenter->render('channel_uid','指定采购员 : ',null,
                         {!! $statusPresenter->render('channel_uid','指定采购员 : ',null,
                         $userCodes,['required'=>true,'width'=>'150px']) !!}
                         $userCodes,['required'=>true,'width'=>'150px']) !!}
+                    @endif
                 </div>
                 </div>
             </div>
             </div>
             <blockquote class="layui-elem-quote layui-text">
             <blockquote class="layui-elem-quote layui-text">