Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit 4c29f558 by 杨树贤
Options

继续修改页面

parent ee2741c1
Inline Side-by-side
Showing with 16 additions and 13 deletions
app/Http/Controllers/Api/SupplierApiController.php
...@@ -77,6 +77,7 @@ class SupplierApiController extends Controller ...@@ -77,6 +77,7 @@ class SupplierApiController extends Controller
'ticket_time', 'ticket_time',
'billing_period_detail', 'billing_period_detail',
'settlement_type',
//付款方式 //付款方式
'pay_type', 'pay_type',
'pay_type_value', 'pay_type_value',
......
app/Http/Transformers/SupplierTransformer.php
...@@ -104,6 +104,7 @@ class SupplierTransformer ...@@ -104,6 +104,7 @@ class SupplierTransformer
$supplier['supplier_group_name'] = array_get(config('fixed.SupplierGroup'), $supplier['supplier_group']); $supplier['supplier_group_name'] = array_get(config('fixed.SupplierGroup'), $supplier['supplier_group']);
$supplier['pay_type_name'] = array_get(config('fixed.SupplierPayType'),$supplier['pay_type']); $supplier['pay_type_name'] = array_get(config('fixed.SupplierPayType'),$supplier['pay_type']);
$supplier['trading_method_name'] = array_get(config('fixed.TradingMethod'), $supplier['trading_method']); $supplier['trading_method_name'] = array_get(config('fixed.TradingMethod'), $supplier['trading_method']);
$supplier['settlement_type_name'] = array_get(config('field.SettlementType'), $supplier['settlement_type']);
$supplier['main_brand_names'] = $this->getMainBrandNames($supplier['main_brands']); $supplier['main_brand_names'] = $this->getMainBrandNames($supplier['main_brands']);
$supplier['update_time'] = $supplier['update_time'] ? date('Y-m-d H:i:s', $supplier['update_time']) : ''; $supplier['update_time'] = $supplier['update_time'] ? date('Y-m-d H:i:s', $supplier['update_time']) : '';
$supplier['create_time'] = $supplier['create_time'] ? date('Y-m-d H:i:s', $supplier['create_time']) : ''; $supplier['create_time'] = $supplier['create_time'] ? date('Y-m-d H:i:s', $supplier['create_time']) : '';
...@@ -185,8 +186,7 @@ class SupplierTransformer ...@@ -185,8 +186,7 @@ class SupplierTransformer
public function transformStockupTypeData($stockupType) public function transformStockupTypeData($stockupType)
{ {
if (!empty($stockupType)) { if (!empty($stockupType)) {
$stockupType = explode(',', $stockupType); return explode(',', $stockupType);
return $stockupType;
} }
return []; return [];
} }
......
config/validate.php
...@@ -18,7 +18,7 @@ return [ ...@@ -18,7 +18,7 @@ return [
'supplier_type_name' => '供应商类型', 'supplier_type_name' => '供应商类型',
'supplier_name' => '供应商名称', 'supplier_name' => '供应商名称',
'stockup_type' => '合作方式', 'stockup_type' => '合作方式',
'pay_type_name' => '付款类型', 'pay_type_name' => '付款周期',
'supplier_address' => '公司详细地址', 'supplier_address' => '公司详细地址',
'currency_name' => '默认结算币种', 'currency_name' => '默认结算币种',
'remark' => '附加备注', 'remark' => '附加备注',
...@@ -44,6 +44,7 @@ return [ ...@@ -44,6 +44,7 @@ return [
'shipping_address' => '发货地址', 'shipping_address' => '发货地址',
'return_address' => '退货地址', 'return_address' => '退货地址',
'return_phone' => '退货收货人电话 ', 'return_phone' => '退货收货人电话 ',
'settlement_type_name' => '结算方式 ',
'return_consignee' => '退货收货人', 'return_consignee' => '退货收货人',
'system_tags' => '系统标签', 'system_tags' => '系统标签',
'customer_tags' => '自定义标签', 'customer_tags' => '自定义标签',
......
resources/views/script/AddSupplierScript.blade.php
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
form.on('submit(addAndApplySupplier)', function (data) { form.on('submit(addAndApplySupplier)', function (data) {
layer.confirm('确定直接申请审核吗?确定后会直接进入审核中的状态,无法进行二次修改', function (index) { layer.confirm('确定直接申请审核吗?确定后会直接进入审核中的状态,无法进行二次修改,审核完成前无法进行二次修改', function (index) {
//还要判断 //还要判断
let url = '/api/supplier/AddSupplier?direct_apply=1'; let url = '/api/supplier/AddSupplier?direct_apply=1';
let res = ajax(url, data.field); let res = ajax(url, data.field);
......
resources/views/script/UpdateSupplierScript.blade.php
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
}) })
form.on('submit(applyAuditSupplier)', function (data) { form.on('submit(applyAuditSupplier)', function (data) {
let confirmMessage = '确定要修改供应商信息吗?<br>一旦修改关键字段,该供应商就会再次进入<b>审核中</b>状态,送至主管审核,期间不允许修改供应商信息'; let confirmMessage = '确定直接申请审核吗?确定后会直接进入审核中的状态,审核完成前无法进行二次修改';
layer.confirm(confirmMessage, function (index) { layer.confirm(confirmMessage, function (index) {
data.field.is_audit = 1; data.field.is_audit = 1;
updateSupplier(data); updateSupplier(data);
......
resources/views/web/SupplierDetail.blade.php
...@@ -224,20 +224,21 @@ ...@@ -224,20 +224,21 @@
供应商ID ：{{$supplier['supplier_id']}} 供应商ID ：{{$supplier['supplier_id']}}
</div> </div>
</div> </div>
<hr/>
<blockquote class="layui-elem-quote layui-text">
<b>付款方式</b>
</blockquote>
<div class="layui-row"> <div class="layui-row">
<div class="layui-col-md2"> <div class="layui-col-md2">
交易方式 ：{{$supplier['trading_method_name']}} 结算方式 ：{{$supplier['settlement_type_name']}}
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
付款方式 ：{{$supplier['pay_type_name']}} 付款周期 ：{{$supplier['pay_type_name']}}
</div> </div>
</div> </div>
<hr/> <hr/>
<blockquote class="layui-elem-quote layui-text"> <blockquote class="layui-elem-quote layui-text">
<b>付款方式</b>
</blockquote>
<hr/>
<blockquote class="layui-elem-quote layui-text">
<b>供应商标签</b> <b>供应商标签</b>
</blockquote> </blockquote>
<div class="layui-row"> <div class="layui-row">
......
resources/views/web/supplier/SupplierPayType.blade.php
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="layui-col-md3"> <div class="layui-col-md3">
@inject('statusPresenter','App\Presenters\StatusPresenter') @inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('settlement_type','结算方式 : ', {!! $statusPresenter->render('settlement_type','结算方式 : ',
'',config('field.SettlementType'),['required'=>true]) !!} $supplier['settlement_type'],config('field.SettlementType'),['required'=>true]) !!}
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<div class="layui-inline"> <div class="layui-inline">
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<div class="layui-col-md3"> <div class="layui-col-md3">
@inject('statusPresenter','App\Presenters\StatusPresenter') @inject('statusPresenter','App\Presenters\StatusPresenter')
{!! $statusPresenter->render('settlement_type','结算方式 : ', {!! $statusPresenter->render('settlement_type','结算方式 : ',
'',config('field.SettlementType'),['required'=>true]) !!} isset($supplier['settlement_type'])?$supplier['settlement_type']:'',config('field.SettlementType'),['required'=>true]) !!}
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<div class="layui-inline"> <div class="layui-inline">
......
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