Commit edd88c24 by 杨树贤

fix

parent dc83e83b
...@@ -179,7 +179,6 @@ class SupplierSyncController extends BaseSyncController ...@@ -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 ...@@ -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', ''),
......
...@@ -79,7 +79,7 @@ ...@@ -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>
......
...@@ -289,18 +289,18 @@ ...@@ -289,18 +289,18 @@
<?php $statusPresenter = app('App\Presenters\StatusPresenter'); ?> <?php $statusPresenter = app('App\Presenters\StatusPresenter'); ?>
<?php echo $statusPresenter->render('supplier_source', '供应商来源', 0, config('fixed.SupplierSource')); ?> <?php echo $statusPresenter->render('supplier_source', '供应商来源', 0, config('fixed.SupplierSource')); ?>
</div>
<div class="layui-inline">
<label class="layui-form-label">代理品牌</label>
<div class="layui-input-inline">
<div id="agency_brands_filter" style="width: 425px"></div>
<input type="hidden" name="agency_brands" id="agency_brands_filter_value" value="">
</div> </div>
<div class="layui-inline"> </div>
<label class="layui-form-label">代理品牌</label> <div class="layui-row">
<div class="layui-input-inline"> <div class="layui-inline" style="width: 600px">
<div id="agency_brands_filter" style="width: 425px"></div> <?php $transformableTimeIntervalPresenter = app('App\Presenters\Filter\TransformableTimeIntervalPresenter'); ?>
<input type="hidden" name="agency_brands" id="agency_brands_filter_value" value=""> <?php echo $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'创建时间','sku_create_time' => '首次上传sku时间']); ?>
</div>
</div>
<div class="layui-row">
<div class="layui-inline" style="width: 600px">
<?php $transformableTimeIntervalPresenter = app('App\Presenters\Filter\TransformableTimeIntervalPresenter'); ?>
<?php echo $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'创建时间','sku_create_time' => '首次上传sku时间']); ?>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment