|
|
@@ -24,16 +24,26 @@ $(function () {
|
|
|
datatype: "json",
|
|
|
colModel: [
|
|
|
{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
|
|
|
- {label: '商品条码', name: 'prodBarcode', index: 'prod_barcode', width: 80},
|
|
|
- {label: 'sku', name: 'sku', index: 'sku', width: 80},
|
|
|
+ {label: '商品条码', name: 'prodBarcode', index: 'prod_barcode', width: 150},
|
|
|
+ {label: 'sku', name: 'sku', index: 'sku', width: 150},
|
|
|
{label: '门店id', name: 'storeId', index: 'store_id', width: 80},
|
|
|
{label: '抵扣比例', name: 'scoreLimit', index: 'score_limit', width: 80},
|
|
|
- {label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 80},
|
|
|
- {label: '截止日期', name: 'deadline', index: 'deadline', width: 80},
|
|
|
- {label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
|
|
|
- {label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 80},
|
|
|
- {label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
|
|
|
- {label: '修改时间', name: 'updateTime', index: 'update_time', width: 80}],
|
|
|
+ {label: '营销活动编号', name: 'mkaId', index: 'mka_id', width: 100},
|
|
|
+ {label: '截止日期', name: 'deadline', index: 'deadline', width: 200,
|
|
|
+ formatter: function (value) {
|
|
|
+ return transDate(value, 'yyyy-MM-dd hh:mm:ss');
|
|
|
+ }}
|
|
|
+ // {label: '创建时间', name: 'createTime', index: 'create_time', width: 200,
|
|
|
+ // formatter: function (value) {
|
|
|
+ // return transDate(value, 'yyyy-MM-dd hh:mm:ss');
|
|
|
+ // }},
|
|
|
+ // {label: '创建人编号', name: 'createrSn', index: 'creater_sn', width: 100},
|
|
|
+ // {label: '修改人编号', name: 'moderSn', index: 'moder_sn', width: 80},
|
|
|
+ // {label: '修改时间', name: 'updateTime', index: 'update_time', width: 200,
|
|
|
+ // formatter: function (value) {
|
|
|
+ // return transDate(value, 'yyyy-MM-dd hh:mm:ss');
|
|
|
+ // }}
|
|
|
+ ],
|
|
|
viewrecords: true,
|
|
|
postData: {'mkaId': vm.mkaId},
|
|
|
height: 550,
|
|
|
@@ -43,7 +53,9 @@ $(function () {
|
|
|
rownumWidth: 25,
|
|
|
autowidth: true,
|
|
|
multiselect: true,
|
|
|
- pager: "#jqGridPager",
|
|
|
+ shrinkToFit: true,
|
|
|
+ autoScroll: true,
|
|
|
+ pager: "#jqGridPager",
|
|
|
jsonReader: {
|
|
|
root: "page.list",
|
|
|
page: "page.currPage",
|
|
|
@@ -56,7 +68,8 @@ $(function () {
|
|
|
order: "order"
|
|
|
},
|
|
|
gridComplete: function () {
|
|
|
- $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
|
|
|
+ $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "scroll"});
|
|
|
+ $("#jqGrid").setGridWidth($(window).width());
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
@@ -68,12 +81,24 @@ let vm = new Vue({
|
|
|
title: null,
|
|
|
mkActivitiesScore: {},
|
|
|
ruleValidate: {
|
|
|
- name: [
|
|
|
- {required: true, message: '名称不能为空', trigger: 'blur'}
|
|
|
+ sku: [
|
|
|
+ {required: true, message: 'sku不能为空', trigger: 'blur'},
|
|
|
+ {max: 32, message: 'sku长度不能超过32', trigger: 'blur'}
|
|
|
+ ],
|
|
|
+ prodBarcode: [
|
|
|
+ {required: true, message: '商品条码不能为空', trigger: 'blur'},
|
|
|
+ {max: 32, message: '商品条码长度不能超过32', trigger: 'blur'}
|
|
|
+ ],
|
|
|
+ scoreLimit: [
|
|
|
+ {required: true, message: '抵扣比例不能为空', trigger: 'blur'}
|
|
|
+ ],
|
|
|
+ deadLine: [
|
|
|
+ {required: true, message: '截止日期不能为空', trigger: 'blur'}
|
|
|
]
|
|
|
},
|
|
|
q: {
|
|
|
- name: ''
|
|
|
+ name: '',
|
|
|
+ prodBarcode: ''
|
|
|
},
|
|
|
isMkactivitiesShow: true,
|
|
|
mkCode: '',
|
|
|
@@ -104,8 +129,8 @@ let vm = new Vue({
|
|
|
let url = vm.mkActivitiesScore.id == null ? "../mkactivitiesscore/save" : "../mkactivitiesscore/update";
|
|
|
|
|
|
//添加上层的门店编号与营销方式编号
|
|
|
- vm.mkActivitiesHalfPrice.shopSn = vm.storeId;
|
|
|
- vm.mkActivitiesHalfPrice.mkaId = vm.mkaId;
|
|
|
+ vm.mkActivitiesScore.storeId = vm.storeId;
|
|
|
+ vm.mkActivitiesScore.mkaId = vm.mkaId;
|
|
|
|
|
|
$.ajax({
|
|
|
type: "POST",
|
|
|
@@ -154,7 +179,8 @@ let vm = new Vue({
|
|
|
},
|
|
|
reloadSearch: function() {
|
|
|
vm.q = {
|
|
|
- name: ''
|
|
|
+ name: '',
|
|
|
+ prodBarcode: ''
|
|
|
}
|
|
|
vm.reload();
|
|
|
},
|
|
|
@@ -162,7 +188,7 @@ let vm = new Vue({
|
|
|
vm.showList = true;
|
|
|
let page = $("#jqGrid").jqGrid('getGridParam', 'page');
|
|
|
$("#jqGrid").jqGrid('setGridParam', {
|
|
|
- postData: {'name': vm.q.name},
|
|
|
+ postData: {'name': vm.q.name, 'prodBarcode': vm.q.prodBarcode},
|
|
|
page: page
|
|
|
}).trigger("reloadGrid");
|
|
|
vm.handleReset('formValidate');
|
|
|
@@ -180,7 +206,6 @@ let vm = new Vue({
|
|
|
window.location.href = "/mk/mkactivityform.html?mkCode="+vm.mkCode;
|
|
|
},
|
|
|
uploadExcelSuccess: function (data) {
|
|
|
- // console.log(data);
|
|
|
if(data.code==0){
|
|
|
alert('导入成功', function (index) {
|
|
|
$("#jqGrid").trigger("reloadGrid");
|
|
|
@@ -209,6 +234,10 @@ let vm = new Vue({
|
|
|
});
|
|
|
return promise; //通过返回一个promis对象解决
|
|
|
|
|
|
+ },
|
|
|
+ // 获取时间
|
|
|
+ getDeadLine: function (e) {
|
|
|
+ vm.mkActivitiesScore.deadLine = e;
|
|
|
}
|
|
|
}
|
|
|
});
|
zhh