Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit 35ce3993 by 杨树贤
Options

修复冲突

parents 397e8e38 0eb68828
Inline Side-by-side
Showing with 36 additions and 6 deletions
app/Http/Services/DataService.php
...@@ -518,5 +518,30 @@ class DataService ...@@ -518,5 +518,30 @@ class DataService
}); });
})->export('csv'); })->export('csv');
} }
public function exportSupplierJsonForUnited()
{
$suppliers = SupplierChannelModel::where('is_type', 0)
->pluck('supplier_group', 'supplier_id')->toArray();
$exportJson = [];
$items = array_map(function ($value) {
$value = array_get(config('fixed.SupplierGroup'), $value);
return $value;
}, $suppliers);
$jsonItems = [];
foreach ($items as $key => $item) {
$jsonItems[] = [
'i' => $key,
'n' => $item
];
}
$exportJson = [
'sysId' => 1,
'cType' => 2,
'list' => $jsonItems,
];
echo json_encode($exportJson);
}
} }
app/Http/Services/SkuService.php
...@@ -99,6 +99,7 @@ class SkuService ...@@ -99,6 +99,7 @@ class SkuService
$item['encoded_user_name'] = array_get($encodedUsers, $encoded, ''); $item['encoded_user_name'] = array_get($encodedUsers, $encoded, '');
$item['moq'] = $item['moq'] ?: 0; $item['moq'] = $item['moq'] ?: 0;
$item['stock'] = $item['stock'] ?: 0; $item['stock'] = $item['stock'] ?: 0;
$item['cp_time'] = $item['cp_time'] ? date('Y-m-d H:i:s', $item['cp_time']) : '';
return $item; return $item;
}, $list); }, $list);
} }
......
app/Http/Validators/SupplierValidator.php
...@@ -57,6 +57,7 @@ class SupplierValidator ...@@ -57,6 +57,7 @@ class SupplierValidator
'main_brands' => 'required', 'main_brands' => 'required',
'pay_type' => 'required', 'pay_type' => 'required',
'settlement_type' => 'required', 'settlement_type' => 'required',
'established_time' => 'required',
'currency' => 'required', 'currency' => 'required',
'supplier_group' => 'required', 'supplier_group' => 'required',
'main_customers' => 'max:100', 'main_customers' => 'max:100',
......
config/fixed.php
...@@ -86,6 +86,7 @@ return [ ...@@ -86,6 +86,7 @@ return [
//账期-定期结算 //账期-定期结算
2 => '货到付款', 2 => '货到付款',
// 4 => '定金' // 4 => '定金'
5 => '验货付款',
], ],
'SupplierApiType' => [ 'SupplierApiType' => [
......
resources/views/script/SkuListScript.blade.php
...@@ -38,11 +38,13 @@ ...@@ -38,11 +38,13 @@
@if (request()->get('search')==1) @if (request()->get('search')==1)
setTimeout(function () { setTimeout(function () {
$('#getSupplierListButton').click(); $('#getSupplierListButton').click();
},500); }, 500);
@endif @endif
let cols = [ let cols = [
{type: 'checkbox'}, {type: 'checkbox'},
{field: 'cp_time', title: '上架有效期', align: 'center', width: 180},
{ {
field: 'goods_name', title: '型号', align: 'center', width: 200, templet: function (data) { field: 'goods_name', title: '型号', align: 'center', width: 200, templet: function (data) {
return "<a href='{{config('website.FootstoneUrl')}}/footstone/addsku?sku_id=" + data.goods_id + "' style='color:blue' target='_blank'>" return "<a href='{{config('website.FootstoneUrl')}}/footstone/addsku?sku_id=" + data.goods_id + "' style='color:blue' target='_blank'>"
......
resources/views/web/AddSupplier.blade.php
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
{!! $singleSelectPresenter->render('has_legal_ID_card','法人身份证 :',-1,[1=>'有',-1=>'无']) !!} {!! $singleSelectPresenter->render('has_legal_ID_card','法人身份证 :',-1,[1=>'有',-1=>'无']) !!}
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<label class="layui-form-label" style="width: 80px">成立时间 : <label class="layui-form-label" style="width: 80px"><span class="require">*</span>成立时间 :
</label> </label>
<div class="layui-input-block" style="width: 150px"> <div class="layui-input-block" style="width: 150px">
<input type="text" id="established_time" name="established_time" <input type="text" id="established_time" name="established_time"
......
resources/views/web/PrintSupplier.blade.php
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
style="text-align: left;padding-left: 20px">{{$printData['supplier_address']}}</td> style="text-align: left;padding-left: 20px">{{$printData['supplier_address']}}</td>
</tr> </tr>
<tr> <tr>
<td width="20%" colspan="1">供应商办公/发货地址*</td> <td width="20%" colspan="1">供应商办公/发货地址</td>
<td width="80%" colspan="5" <td width="80%" colspan="5"
style="text-align: left;padding-left: 20px">{{$printData['shipping_address']}}</td> style="text-align: left;padding-left: 20px">{{$printData['shipping_address']}}</td>
</tr> </tr>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<td width="80%" colspan="5" style="text-align: left;padding-left: 20px"></td> <td width="80%" colspan="5" style="text-align: left;padding-left: 20px"></td>
</tr> </tr>
<tr> <tr>
<td width="20%" colspan="1">供应商到票时间*</td> <td width="20%" colspan="1">供应商到票时间</td>
<td width="80%" colspan="5" <td width="80%" colspan="5"
style="text-align: left;padding-left: 20px">{{$printData['ticket_time'] or ''}}</td> style="text-align: left;padding-left: 20px">{{$printData['ticket_time'] or ''}}</td>
</tr> </tr>
......
resources/views/web/SupplierDetail.blade.php
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
：{{$supplier['has_legal_ID_card_name']}} ：{{$supplier['has_legal_ID_card_name']}}
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
成立时间 ：{{$supplier['established_time']}} <span class="required_field">*</span> 成立时间 ：{{$supplier['established_time']}}
</div> </div>
</div> </div>
<div class="layui-row"> <div class="layui-row">
......
resources/views/web/supplier/SupplierBase.blade.php
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
{!! $singleSelectPresenter->render('has_legal_ID_card','法人身份证 :',$supplier['has_legal_ID_card'],[1=>'有',-1=>'无']) !!} {!! $singleSelectPresenter->render('has_legal_ID_card','法人身份证 :',$supplier['has_legal_ID_card'],[1=>'有',-1=>'无']) !!}
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<label class="layui-form-label" style="width: 80px">成立时间 : <label class="layui-form-label" style="width: 80px"><span class="require">*</span>成立时间 :
</label> </label>
<div class="layui-input-block" style="width: 150px"> <div class="layui-input-block" style="width: 150px">
<input type="text" id="established_time" name="established_time" <input type="text" id="established_time" name="established_time"
......
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