Commit 861c913b by 杨树贤

页面修改

parent 24970fbd
......@@ -7,121 +7,6 @@
let element = layui.element;
let xmSelect = layui.xmSelect;
form.on('checkbox(cn_filter)', function (data) {
if (data.elem.checked === true) {
$('#cn_max').val(9999999);
}
});
form.on('checkbox(hk_filter)', function (data) {
if (data.elem.checked === true) {
$('#hk_max').val(9999999);
}
});
//渲染主营品牌的多选
function getExcludeBrandOption(element, idName = 'exclude_main_brands') {
return {
el: '#' + element,
filterable: true,
paging: true,
height: '250px',
size: 'mini',
direction: 'auto',
autoRow: true,
prop: {
name: 'brand_name',
value: 'brand_id',
},
remoteSearch: true,
pageRemote: true,
template({item, sels, name, value}) {
return item.brand_name + '<span style="position: absolute; right: 10px; color: #8799a3">' + item.mapping_brand_names + '</span>'
},
filterMethod: function (val, item, index, prop) {
},
pageSize: 30,
remoteMethod: function (val, cb, show, pageIndex) {
//val: 搜索框的内容, 不开启搜索默认为空, cb: 回调函数, show: 当前下拉框是否展开, pageIndex: 当前第几页
$.ajax({
url: '/api/common/getStandardBrandList',
type: 'post',
data: {
brand_name: val,
page: pageIndex
},
dataType: 'json',
timeout: 10000,
success: function (res) {
if (!res) return layer.msg('网络错误,请重试', {icon: 5});
if (res.err_code === 0) {
cb(res.data, res.last_page);
} else {
layer.msg(res.err_msg, {icon: 6});
}
},
error: function () {
return layer.msg('网络错误,请重试', {icon: 5});
}
});
},
on: function (data) {
let arr = data.arr;
let excludeBrandIds = '';
for (let i in arr) {
excludeBrandIds += arr[i].brand_id + ',';
}
$('#' + idName).val(excludeBrandIds);
},
};
}
//主营品牌的渲染
let brandOption = getExcludeBrandOption('exclude_brand_selector');
let excludeBrandSelector = xmSelect.render(brandOption);
let excludeBrandIds = $('#exclude_main_brands').attr('value');
let excludeBrandInitValue = {!! json_encode($exclude_brand_init_value?:[])!!};
excludeBrandSelector.setValue(excludeBrandInitValue);
//批量新增主营品牌
$('#batchAddExcludeMainBrands').click(function () {
layer.open({
title: "批量增加主营品牌",
area: ['600px', '400px'],
type: 1,
content: $('#batchAddExcludeMainBrandsDiv')
});
});
$('#confirmBatchAddExcludeMainBrands').click(function () {
let brandValue = excludeBrandSelector.getValue();
console.log(brandValue);
let standardBrandNames = $('#batchAddExcludeMainBrandsTextarea').val();
//请求接口获取返回的数据,并且合并目前选择的主营品牌,重新渲染xm-select
let res = ajax('/api/supplier/getBatchAddExcludeMainBrandsData', {standard_brand_names: standardBrandNames});
let data = res.data;
let brandNames = arrayColumn(data, 'brand_name').join(',')
$('#batchAddExcludeMainBrandsBlockQuote').text(brandNames);
if (data.length === 0) {
layer.msg('没有匹配到有效的标准品牌', {icon: 5});
return false;
} else {
brandValue = brandValue.concat(data);
brandValue = multiArrayUnique(brandValue);
excludeBrandSelector.setValue(brandValue);
$('#exclude_main_brands').val(arrayColumn(brandValue, 'brand_id').join(','));
$('#batchAddExcludeMainBrandsTextarea').val('');
$('#batchAddExcludeMainBrandsBlockQuote').text('');
layer.msg('批量添加主营品牌成功', {icon: 6});
}
});
$('#closeBatchAddExcludeMainBrands').click(function () {
$('#batchAddExcludeMainBrandsTextarea').val('');
$('#batchAddExcludeMainBrandsBlockQuote').text('');
layer.closeAll();
});
table.render({
elem: '#purchaseRemarkList',
url: '/api/purchase_remark/GetPurchaseRemarkList',
......
......@@ -142,20 +142,5 @@
id: 'purchaseRemarkList',
page: {},
});
//新增联系方式
$("#savePurchaserRemark").click(function () {
let supplierId = getQueryVariable('supplier_id');
layer.open({
type: 2,
content: '/purchase_remark/SavePurchaseRemark?view=iframe&supplier_id=' + supplierId,
area: ['800px', '725px'],
title: '新增采购备注',
end: function () { // 监听弹窗关闭
table.reload('purchaseRemarkList');
}
});
})
});
</script>
\ No newline at end of file
......@@ -11,6 +11,32 @@
{!! $singleSelectPresenter->render('participate_type','参与类型 :',!empty($remark)?$remark['participate_type']:1,config('field.PurchaseRemarkParticipateType'),['required'=>true]) !!}
</div>
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>参与内容 : </label>
<div class="layui-input-block">
<input type="text" name="register_company_name" id="register_company_name"
placeholder="请输入注册公司名,注册公司名必须同执照" class="layui-input"
value="{{$remark['register_company_name'] or ''}}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>参与时间 : </label>
<div class="layui-input-block">
<input type="text" id="established_time" name="established_time"
placeholder="请输入成立时间"
class="layui-input"
autocomplete="off"
value="{{$supplier['established_time'] or ''}}">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>备注内容 : </label>
<div class="layui-input-block">
<textarea rows="7" name="remark_content" placeholder="活动内容(展示在【询报价系统】供销售查看的内容通知)"
class="layui-textarea"
id="remark_content">{{$remark['remark_content'] or ''}}</textarea>
</div>
</div>
<div class="layui-form-item">
<div align="right" style="margin-top: 20px">
<button type="button" class="layui-btn layui-btn-sm layui-btn-info submit-loading" lay-submit
lay-filter="load">确认
......
<blockquote class="layui-elem-quote layui-text">
<b>运费设置<span style="color: orange;margin-left: 10px">PS:设置后的运费规则,将会应用在网站下单页面;</span></b>
</blockquote>
<div class="layui-form-item">
<table class="layui-table">
<colgroup>
<col width="300">
<col width="400">
</colgroup>
<thead>
<tr>
<th>包邮</th>
<th>不包邮</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<div class="layui-row">
<div class="layui-col-md12">
<div class="layui-input-inline" style="width: 100px;">
<input type="checkbox" title="无条件包邮" lay-skin="primary" lay-filter="cn_filter">
</div>
</div>
<br>
<br>
<div class="layui-col-md12">
<div>
<label class="layui-form-label" style="width: 150px">商品下单数量达到或者超过</label>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[max]" id="cn_max"
value="{{$supplier['extra_fee']['cn']['max'] or ''}}"
lay-verify="num">
</div>
<div class="layui-form-label" style="width: 50px;margin-left: -20px">个,包邮</div>
</div>
</div>
<div class="layui-col-md12">
<div>
<label class="layui-form-label" style="width: 150px">商品下单金额达到或超过</label>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[max]" id="cn_max"
value="{{$supplier['extra_fee']['cn']['max'] or ''}}"
lay-verify="num">
</div>
<div class="layui-form-label" style="width: 100px;margin-left: -20px">元(RMB)包邮</div>
</div>
</div>
<div class="layui-col-md12">
<div>
<label class="layui-form-label" style="width: 150px">商品下单数量达到或超过</label>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[max]" id="cn_max"
value="{{$supplier['extra_fee']['cn']['max'] or ''}}"
lay-verify="num">
</div>
<div class="layui-form-label" style="width: 170px;margin-left: -10px">个 +
商品下单金额达到或者超过
</div>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[price]"
value="{{$supplier['extra_fee']['cn']['price'] or ''}}"
lay-verify="float" value="">
</div>
<div class="layui-form-label" style="width: 110px;margin-left: -20px">元(RMB),包邮</div>
</div>
</div>
</div>
</td>
<td>
<div class="layui-row">
<div class="layui-col-md12">
<div>
<label class="layui-form-label" style="width: 110px">商品下单数量未达到</label>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[max]" id="cn_max"
value="{{$supplier['extra_fee']['cn']['max'] or ''}}"
lay-verify="num">
</div>
<div class="layui-form-label" style="width: 70px;margin-left: -10px">个,收取运费</div>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[price]"
value="{{$supplier['extra_fee']['cn']['price'] or ''}}"
lay-verify="float" value="">
</div>
<div class="layui-form-label" style="width:80px;margin-left: -20px">元(RMB)</div>
</div>
</div>
<div class="layui-col-md12">
<div>
<label class="layui-form-label" style="width: 110px">商品下单金额未达到</label>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[max]" id="cn_max"
value="{{$supplier['extra_fee']['cn']['max'] or ''}}"
lay-verify="num">
</div>
<div class="layui-form-label" style="width: 120px;margin-left: -10px">元(RMB),收取运费</div>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[price]"
value="{{$supplier['extra_fee']['cn']['price'] or ''}}"
lay-verify="float" value="">
</div>
<div class="layui-form-label" style="width: 70px;margin-left: -20px">元(RMB)</div>
</div>
</div>
<div class="layui-col-md12">
<div>
<label class="layui-form-label" style="width: 110px">商品下单数量未达到</label>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[max]" id="cn_max"
value="{{$supplier['extra_fee']['cn']['max'] or ''}}"
lay-verify="num">
</div>
<div class="layui-form-label" style="width: 140px;margin-left: -10px">个 + 商品下单金额未达到
</div>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[price]"
value="{{$supplier['extra_fee']['cn']['price'] or ''}}"
lay-verify="float" value="">
</div>
<div class="layui-form-label" style="width: 130px;margin-left: -20px">元(RMB),收取运费</div>
<div class="layui-input-inline" style="width: 100px;">
<input class="layui-input" type="text" name="cn[price]"
value="{{$supplier['extra_fee']['cn']['price'] or ''}}"
lay-verify="float" value="">
</div>
<div class="layui-form-label" style="width: 110px;margin-left: -20px">元(RMB)</div>
</div>
</div>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<blockquote class="layui-elem-quote layui-text">
<b>商品上架限制</b>
</blockquote>
<div class="layui-form-item">
<span>ECCN编码包含以下内容的,不允许上架</span>
<div class="layui-form-item layui-form-text">
<textarea name="credit_investigation" placeholder="请输入资信调查"
class="layui-textarea">{{$supplier['credit_investigation'] or ''}}</textarea>
</div>
<span style="color: darkgrey">支持通配符“%”,如:①EAR开头:EAR%;②002结尾:%002;③包含A99:%A99%;</span>
</div>
<div class="layui-form-item">
<span>供应商品牌包含以下标准品牌的,不允许上架</span>
<div class="layui-form-item">
<div class="layui-col-md12">
<div id="exclude_brand_selector" class="layui-input-inline" style="width: 100%;">
</div>
<input type="hidden" name="exclude_main_brands" value=""
id="main_brands" value="{{$supplier['exclude_main_brands'] or ''}}">
<a style="color: #009688;" id="batchAddExcludeMainBrands">+批量增加主营品牌</a>
<div id="batchAddExcludeMainBrandsDiv"
style="padding-left: 30px;padding-top: 30px;padding-right: 30px;display: none">
<div class="layui-col-md12">
<textarea rows="7" placeholder="标准品牌名称,多个用英文逗号隔开" class="layui-textarea"
id="batchAddExcludeMainBrandsTextarea"></textarea>
<blockquote class="layui-elem-quote" id="batchAddExcludeMainBrandsBlockQuote"></blockquote>
<span style="color: red" id="invalid_exclude_brand_name_list"></span>
</div>
<div class="layui-col-md12">
<button class="layui-btn layui-btn-sm" type="button" id="confirmBatchAddExcludeMainBrands">
验证并且添加
</button>
<button class="layui-btn layui-btn-sm layui-btn-primary" type="button"
id="closeBatchAddExcludeMainBrands">关闭
</button>
</div>
</div>
</div>
</div>
</div>
<blockquote class="layui-elem-quote layui-text">
<b>采购备注<span
style="color: orange;margin-left: 10px">PS:设置后的备注信息,将会应用在【询报价系统】供销售看到</span></b>
style="color: orange;margin-left: 10px">PS:设置后的备注信息,将会应用在【询报价系统】供销售看到(仅做为提示)</span></b>
</blockquote>
<div class="layui-form-item">
<button class="layui-btn layui-btn-sm" type="button" id="savePurchaserRemark">添加备注</button>
......@@ -288,4 +110,4 @@
</div>
</div>
@include('script.supplier.SupplierRulerScript')
\ No newline at end of file
@include('script.supplier.OrderRemarkScript')
\ No newline at end of file
......@@ -176,15 +176,6 @@
</div>
<blockquote class="layui-elem-quote layui-text">
<b>采购备注<span
style="color: orange;margin-left: 10px">PS:设置后的备注信息,将会应用在【询报价系统】供销售看到;</span></b>
</blockquote>
<div class="layui-form-item">
<button class="layui-btn layui-btn-sm" type="button" id="savePurchaserRemark">添加备注</button>
<table class="layui-table" lay-filter="purchaseRemarkList" id="purchaseRemarkList"></table>
</div>
<div style="margin-bottom: 300px"></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