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

app/Http/Controllers/Sync/SupplierSyncController.php

@@ -179,7 +179,6 @@ class SupplierSyncController extends BaseSyncController
         }
         }
 
 
         $customerName = trim($data['customer_name']);
         $customerName = trim($data['customer_name']);
-
         // 幂等处理：供应商名称已存在
         // 幂等处理：供应商名称已存在
         $existingSupplier = SupplierChannelModel::where('supplier_name', $customerName)->first();
         $existingSupplier = SupplierChannelModel::where('supplier_name', $customerName)->first();
         if ($existingSupplier) {
         if ($existingSupplier) {
@@ -254,7 +253,7 @@ class SupplierSyncController extends BaseSyncController
                 'phone' => $phone,
                 'phone' => $phone,
                 'supplier_address' => $supplierAddress,
                 'supplier_address' => $supplierAddress,
                 'legal_representative' => $legalRepresentative,
                 'legal_representative' => $legalRepresentative,
-                'established_time' => $establishedTime,
+                'established_time' => strtotime($establishedTime),
 
 
                 // 采购员信息（主表只存channel_uid）
                 // 采购员信息（主表只存channel_uid）
                 'channel_uid' => array_get($data, 'purchaser_uid', ''),
                 'channel_uid' => array_get($data, 'purchaser_uid', ''),

storage/framework/views/5238497145456f693cc29f1fe0a7ff8fb43fd269.php

@@ -79,7 +79,7 @@
     <?php if(checkPerm('TransferSupplier')): ?>
     <?php if(checkPerm('TransferSupplier')): ?>
         <button type="button" class="layui-btn layui-btn-sm" id="transfer_supplier">供应商交接</button>
         <button type="button" class="layui-btn layui-btn-sm" id="transfer_supplier">供应商交接</button>
     <?php endif; ?>
     <?php endif; ?>
-    <?php if(checkPerm('ConfirmCrmSupplier') && checkPerm('ViewConfirmSupplier')): ?>
+    <?php if(checkPerm('ConfirmCrmSupplier')): ?>
         <button type="button" class="layui-btn layui-btn-sm" id="confirm_crm_supplier">确认客户转化供应商</button>
         <button type="button" class="layui-btn layui-btn-sm" id="confirm_crm_supplier">确认客户转化供应商</button>
     <?php endif; ?>
     <?php endif; ?>
     <button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="col_setting">展示列设置</button>
     <button type="button" class="layui-btn layui-btn-sm layui-btn-normal" id="col_setting">展示列设置</button>