Authored by 陶雨

Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

... ... @@ -341,6 +341,7 @@ grid.prototype = {
reload: function(param) {
var g = this,
p = this.options;
if (param == 1) {
p.page = 1;
}
... ...
... ... @@ -41,7 +41,7 @@ var util = {
success: function(res) {
res = res.data;
if (res.code != 200) {
util.__tip(res.message, "danger");
util.__tip(res.message, "warning");
} else {
return callback.bind(this, res)();
}
... ...
... ... @@ -64,6 +64,7 @@ var t = new common.tab({
click: function() {
g.options.columns[11].hidden = true;
g.options.columns[8].hidden = true;
g.options.page = 1;
var columnname = $(this).find('a').attr('columnname');
if (columnname == 3) {
g.options.columns[11].hidden = false;
... ... @@ -248,7 +249,7 @@ var g = new common.grid({
}
}, {
display: '上架状态',
name: 'status', // -1待上架,2待审核,3驳回,4通过,1已上架,0已下架,5再上架待审核,6再上架驳回,7再上架通过。
name: 'status', // 8待上架,2待审核,3驳回,4通过,1已上架,0已下架,5再上架待审核,6再上架驳回,7再上架通过。
render: function(item) {
var html = '';
if (ENUM.status[item.status]) {
... ... @@ -273,10 +274,10 @@ var g = new common.grid({
render: function(item) {
var HtmArr = [];
if (item.status == 4 || item.status == 1 || item.status == 5 || item.status == 0 || item.status == 6) {
if (item.status == 4 || item.status == 1 || item.status == 5 || item.status == 6) {
HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-skn="' + item.productSkn + '">下架</a>');
} else if (item.status == 3 || item.status == 8 || item.status == 2) {
} else if (item.status == 3 || item.status == 8 || item.status == 2 || item.status == 0) {
HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-skn="' + item.productSkn + '">上架</a>');
}
... ... @@ -381,6 +382,56 @@ $('#export-btn').on('click', function() {
window.open("/ajax/down?queryConf=" + JSON.stringify(data) + "&type=netSale");
});
//sku skc上架表格
var shelveTable = new common.grid({
el: "#shelve-table",
secondIndex: 2,
columns: [{
display: 'SKC(商品信息)',
render: function(item) {
return 'SKC:' + item.productSkc + '<br>' +
'颜色:' + item.goodsName;
}
}, {
display: 'SKC上架操作(状态)',
render: function(item) {
if (item.status == 0) {
return '<a class="btn btn-success" data-type="1" data-skc="' + item.productSkc + '" href="javascript:;">点击上架</a>';
} else {
return '<a class="btn btn-danger" data-type="0" data-skc="' + item.productSkc + '" href="javascript:;">点击下架</a>';
}
}
}, {
display: 'SKU',
name: 'productSku'
}, {
display: '尺码',
name: 'sizeName'
}, {
display: '库存',
name: 'stock'
}, {
display: 'SKU上架操作',
render: function(item) {
if (item.status == 0) {
return '下架';
} else {
return '上架';
}
}
}, {
display: 'SKU上架操作',
render: function(item) {
if (item.status == 0) {
return '<a class="btn btn-success" data-type="1" data-sku="' + item.productSku + '" href="javascript:;">上架</a>';
} else {
return '<a class="btn btn-danger" data-type="0" data-sku="' + item.productSku + '" href="javascript:;">下架</a>';
}
}
}]
});
//单个sku,skc上下架
$('#basicTable').on('click', '.shelve-btn', function() {
var that = this,
... ... @@ -405,54 +456,6 @@ $('#basicTable').on('click', '.shelve-btn', function() {
$(that).removeClass('disabled');
var shelveTable = new common.grid({
el: "#shelve-table",
secondIndex: 2,
columns: [{
display: 'SKC(商品信息)',
render: function(item) {
return 'SKC:' + item.productSkc + '<br>' +
'颜色:' + item.goodsName;
}
}, {
display: 'SKC上架操作(状态)',
render: function(item) {
if (item.status == 0) {
return '<a class="btn btn-success" data-type="1" data-skc="' + item.productSkc + '" href="javascript:;">点击上架</a>';
} else {
return '<a class="btn btn-danger" data-type="0" data-skc="' + item.productSkc + '" href="javascript:;">点击下架</a>';
}
}
}, {
display: 'SKU',
name: 'productSku'
}, {
display: '尺码',
name: 'sizeName'
}, {
display: '库存',
name: 'stock'
}, {
display: 'SKU上架操作',
render: function(item) {
if (item.status == 0) {
return '下架';
} else {
return '上架';
}
}
}, {
display: 'SKU上架操作',
render: function(item) {
if (item.status == 0) {
return '<a class="btn btn-success" data-type="1" data-sku="' + item.productSku + '" href="javascript:;">上架</a>';
} else {
return '<a class="btn btn-danger" data-type="0" data-sku="' + item.productSku + '" href="javascript:;">下架</a>';
}
}
}]
});
shelveTable.init(res.data.goodsList, 'goodsSizeList');
$('#shelve-table').on('click', '.btn', function() {
... ...
... ... @@ -2,6 +2,12 @@ var $ = require('jquery'),
common = require('../../common/common');
var basicInfohtml = '',
ENUM = {
isSuppled: {
'Y': '是',
'N': '否'
}
},
convertObj = {
ageLevel: {
'1': '成人',
... ... @@ -91,17 +97,34 @@ basicInfohtml = common.util.__template2($('#basicInfo').html(), basicInfoData);
$('#basic-info').html(basicInfohtml);
//能否补货
$('#goods-table').html(common.util.__template2($('#goodsList').html(), {
goodsList: NETSALEDATA.goodsList
}));
var suppledTable = new common.grid({
el: '#suppled-table',
hash: false,
secondIndex: 1,
columns: [{
display: 'SKC(厂家颜色)',
render: function(item) {
return item.productSkc + '(' + item.goodsName + ')';
}
}, {
display: 'SKU(尺码)',
render: function(item) {
return item.productSku + '(' + item.sizeName + ')';
}
}, {
display: '能否补货',
render: function(item) {
return ENUM.isSuppled[item.isSuppled];
}
}]
});
suppledTable.init(NETSALEDATA.goodsList, 'goodsSizeList')
//上架必填
productExtBo.renderType = $('.contentpanel').data('type');
productExtBo.sellChannels = productExtBo.sellChannels ? productExtBo.sellChannels.replace(/,/g, "|") : '';
productExtBo.shopIds = productExtBo.shopIdList ? productExtBo.shopIdList.join('|') : '';
//productExtBo.shopList =
common.util.__ajax({
url: '/goods/ShopsRest/queryShopsByBrandId',
data: {
... ... @@ -112,7 +135,6 @@ common.util.__ajax({
$('#product-ext').html(common.util.__template2($('#productExtBoTemp').html(), productExtBo));
e.init();
}, true);
$('#product-ext').html(common.util.__template2($('#productExtBoTemp').html(), productExtBo));
... ...
... ... @@ -138,6 +138,7 @@ var Bll = {
button: [{
value: "提交",
callback: function() {
e.submit(url, function(option) {
option.data.id = item.id;
option.data.productSkn = productSkn;
... ... @@ -197,6 +198,10 @@ $(document).on("click", ".poseditimg .close", function(e) {
});
$(document).on("change", ".poseditimg .pos-text", function() {
var item = Bll.posData[$(this).data("index")];
/*if ($.trim($(this).val()).length > 8) {
common.util.__tip('skn不能超过8位', 'warning');
return;
};*/
item.id = $(this).val();
});
... ... @@ -225,14 +230,14 @@ $(document).on("click", "#dapeiTable .delete", function() {
//修改
$(document).on("click", "#dapeiTable .edit", function() {
var item = g.rows[$(this).data("index")];
common.util.__ajax({
common.util.__ajax2({
url: '/netSale/selectCollocationById',
data: {
param: item.id
}
}, function(data) {
Bll.toast("添加搭配", data.data, "/netSale/updateCollocation");
}, true);
});
// item.infoStr=[{"top":223,"left":380,"id":"ffffff"},{"top":454,"left":309,"id":"ggggg"}];
// Bll.toast("添加搭配",item,"/netSale/updateCollocation");
});
... ...
'use strict';
var $ = require('jquery'),
common=require('../../common/common');
common = require('../../common/common');
var ENUM={
var ENUM = {
//0已下架,1待上架,2待审核,3驳回,4通过,1已上架,5再上架待审核,6再上架驳回,7再上架通过。
status: {
'0': '已下架',
'1': '已上架',
'2': '待审核',
'3': '驳回',
'4': '通过',
'5': '再上架待审核',
'6': '再上架驳回',
'7': '再上架通过',
'8': '待上架'
},
'0': '已下架',
'1': '已上架',
'2': '待审核',
'3': '驳回',
'4': '通过',
'5': '再上架待审核',
'6': '再上架驳回',
'7': '再上架通过',
'8': '待上架'
},
//tips:{"0":0,"1":0,"2":0,"3":0,"4":0,"all":0}
enum:{
1:'待审核',
2:'驳回',
3:'通过',
all:"全部商品"
enum: {
1: '待审核',
2: '驳回',
3: '通过',
all: "全部商品"
},
tips:{"1":0,"2":0,"3":0,"all":0}
tips: {
"1": 0,
"2": 0,
"3": 0,
"all": 0
}
}
// 审核状态枚举
var AuditEnum = {
status:{
100:"待审核",
200:"审核通过",
300:"驳回",
"":"过期",
"1":"作废",
status: {
100: "待审核",
200: "审核通过",
300: "驳回",
"": "过期",
"1": "作废",
}
}
... ... @@ -41,10 +46,10 @@ var AuditEnum = {
// 年龄层枚举
var AgeLevelEnum = {
level: {
1:"成人",
2:"大童",
3:"小童",
"":"未知年龄"
1: "成人",
2: "大童",
3: "小童",
"": "未知年龄"
}
}
... ... @@ -59,32 +64,53 @@ var GenderEnum = {
// 商品类型
var GoodsTypeEnum = {
type: {
1:"普通商品",
2:"赠品",
3:"虚拟商品",
"":"未知类型"
type: {
1: "普通商品",
2: "赠品",
3: "虚拟商品",
"": "未知类型"
}
}
}
/*下拉选择*/
new common.dropDown({el:"#shopId",ajax:"queryShop"});
new common.dropDown({el:"#brandId",ajax:"queryBrand"});
new common.dropDown({el:"#founder",ajax:"querySupplier"});
/*下拉选择*/
new common.dropDown({
el: "#shopId",
ajax: "queryShop"
});
new common.dropDown({
el: "#brandId",
ajax: "queryBrand"
});
new common.dropDown({
el: "#founder",
ajax: "querySupplier"
});
new common.dropDown({el:"#isJit",ajax:""});
new common.dropDown({el:"#gender",ajax:""});
new common.dropDown({el:"#isJit",ajax:""});
new common.dropDown({el:"#size",ajax:""});
new common.dropDown({
el: "#isJit",
ajax: ""
});
new common.dropDown({
el: "#gender",
ajax: ""
});
new common.dropDown({
el: "#isJit",
ajax: ""
});
new common.dropDown({
el: "#size",
ajax: ""
});
var tabTree=new common.tabTree("#sort");
var tabTree = new common.tabTree("#sort");
tabTree.init();
var t = new common.tab({
el:"#basicTab",
click:function(){
el: "#basicTab",
click: function() {
var columnname = $(this).find('a').attr('columnname');
console.log("columnname = " + columnname);
... ... @@ -92,34 +118,37 @@ var t = new common.tab({
// 选择【全部商品】
if (columnname == "all") {
g.options.columns[10].hidden = false; //显示【审核状态】
g.options.columns[12].hidden = true; //
g.options.columns[12].hidden = true; //
} else {
g.options.columns[10].hidden = true;
if (columnname == 2) {
g.options.columns[12].hidden = false;// 显示【驳回原因】
g.options.columns[12].hidden = false; // 显示【驳回原因】
} else
switch (columnname) {
switch (columnname) {
case 1:
case 3: { // 待审核, 通过
g.options.columns[10].hidden = true;
g.options.columns[12].hidden = true;
}
case 3:
{ // 待审核, 通过
g.options.columns[10].hidden = true;
g.options.columns[12].hidden = true;
}
break;
case 2: { // 驳回
g.options.columns[10].hidden = true;
g.options.columns[12].hidden = false;
}
case 2:
{ // 驳回
g.options.columns[10].hidden = true;
g.options.columns[12].hidden = false;
}
break;
default : {
g.options.columns[10].hidden = true;
g.options.columns[12].hidden = true;
}
default:
{
g.options.columns[10].hidden = true;
g.options.columns[12].hidden = true;
}
}
... ... @@ -127,59 +156,53 @@ var t = new common.tab({
g.init('/supplier/baseproduct/ajax/index');
},
columns:[
{
name:"1",
display:"待审核({1})",
value:'2,5'
},
{
name:"2",
display:"驳回({2})",
value:'3,6'
},
{
name:"3",
display:"通过({3})",
value:'4,7'
},
{
name:"all",
display:"全部商品",
value:'2,3,4,5,6,7'
}
]
columns: [{
name: "1",
display: "待审核({1})",
value: '2,5'
}, {
name: "2",
display: "驳回({2})",
value: '3,6'
}, {
name: "3",
display: "通过({3})",
value: '4,7'
}, {
name: "all",
display: "全部商品",
value: '2,3,4,5,6,7'
}]
}).init(ENUM.tips);
var g = new common.grid({
el: '#basicTable',
parms:function(){
return {
productSkn:common.util.__input("productSkn"),
productSkc:common.util.__input("productSkc"),
productSku:common.util.__input("productSku"),
parms: function() {
return {
productSkn: common.util.__input("productSkn"),
productSkc: common.util.__input("productSkc"),
productSku: common.util.__input("productSku"),
productName: common.util.__input("productName"),
shopId: common.util.__input("shopId"),
brandId:common.util.__input("brandId"),
brandId: common.util.__input("brandId"),
isJit: common.util.__input("isJit"),
gender: common.util.__input("gender"),
maxSortId: tabTree.selected.length>0?tabTree.selected[0].id:"", // 一级类目
middleSortId: tabTree.selected.length>1?tabTree.selected[1].id:"", // 二级类目
smallSortId: tabTree.selected.length>2?tabTree.selected[2].id:"", // 三级类目
maxSortId: tabTree.selected.length > 0 ? tabTree.selected[0].id : "", // 一级类目
middleSortId: tabTree.selected.length > 1 ? tabTree.selected[1].id : "", // 二级类目
smallSortId: tabTree.selected.length > 2 ? tabTree.selected[2].id : "", // 三级类目
size: common.util.__input("size"),
productStatusStr:t.value?t.value: '2,3,4,5,6,7'
productStatusStr: t.value ? t.value : '2,3,4,5,6,7'
};
},
columns:[
{
columns: [{
display: '',
type: 'checkbox'
}, {
display: 'SKN',
name: 'productSkn'
},{
}, {
display: '图片',
name: 'picImgUrl',
render: function(item) {
... ... @@ -191,18 +214,19 @@ var g = new common.grid({
{
display: '商品信息',
render: function(item) {
return '<p><strong>名称:</strong>' + filterNull(item,'productName') + '</p>' +
'<p><strong>品牌:</strong>' + filterNull(item,'brandName') + '</p>' +
'<p><strong>类目:</strong>' + filterNull(item,'maxSortName') + '/' + filterNull(item,'middleSortName') + '</p>';
return '<p><strong>名称:</strong>' + filterNull(item, 'productName') + '</p>' +
'<p><strong>品牌:</strong>' + filterNull(item, 'brandName') + '</p>' +
'<p><strong>类目:</strong>' + filterNull(item, 'maxSortName') + '/' + filterNull(item, 'middleSortName') + '</p>';
}
},
{display:"售价",
{
display: "售价",
render: function(item) {
return '<p><strong>吊牌价:</strong>' + filterNull(item,'retailPrice') + '</p>' +
'<p><strong>销售价:</strong>' + filterNull(item,'salesPrice') + '</p>' +
return '<p><strong>吊牌价:</strong>' + filterNull(item, 'retailPrice') + '</p>' +
'<p><strong>销售价:</strong>' + filterNull(item, 'salesPrice') + '</p>' +
'<p><strong>是否VIP:</strong></p>' +
'<p style="color: #ccc;"><strong>yoho币:</strong>' + filterNull(item,'returnCoin') + '</p>';
'<p style="color: #ccc;"><strong>yoho币:</strong>' + filterNull(item, 'returnCoin') + '</p>';
}
},
... ... @@ -212,114 +236,131 @@ var g = new common.grid({
name: 'stock'
},
{display:"年龄层/性别",render:function(item){
var html=[];
var ageLevel = AgeLevelEnum.level[item.ageLevel];
var gender = GenderEnum.gender[item.gender];
html.push("<p>"+ageLevel+" / "+gender+"</p>");
return html.join('');
}},
{display:"预售/奥莱",render:function(item){
{
display: "年龄层/性别",
render: function(item) {
var html = [];
var ageLevel = AgeLevelEnum.level[item.ageLevel];
var gender = GenderEnum.gender[item.gender];
html.push("<p>" + ageLevel + " / " + gender + "</p>");
var html=[];
//判断是否是预售商品
if (item.isAdvance === "Y") {
html.push("<p>预售</p>");
} else {
html.push("<p>否</p>");
return html.join('');
}
},
if (item.isOutLets == "Y") {
html.push( "<p>/奥莱</p>");
} else {
html.push( "<p>/否</p>");
}
{
display: "预售/奥莱",
render: function(item) {
return html.join('');
}},
var html = [];
//判断是否是预售商品
if (item.isAdvance === "Y") {
html.push("<p>预售</p>");
} else {
html.push("<p>否</p>");
}
if (item.isOutLets == "Y") {
html.push("<p>/奥莱</p>");
} else {
html.push("<p>/否</p>");
}
return html.join('');
}
},
{display:"上架时间",render: function (item) {
{
display: "上架时间",
render: function(item) {
return "<p>"+filterNull(item, 'shelveTime')+"</p>";
}},
{display:"商品类别", render: function(item) {
var type = GoodsTypeEnum.type[item.attribute] ? GoodsTypeEnum.type[item.attribute]:"未知类型";
return "<p>"+type+"</p>"
}},
return "<p>" + filterNull(item, 'shelveTime') + "</p>";
}
}, {
display: "商品类别",
render: function(item) {
var type = GoodsTypeEnum.type[item.attribute] ? GoodsTypeEnum.type[item.attribute] : "未知类型";
return "<p>" + type + "</p>"
}
},
// 审核状态(全部商品是显示) 10
{display:"审核状态",render:function(item){
var html=[];
html.push("<p>"+ENUM.status[item.status]+"</p>");
{
display: "审核状态",
render: function(item) {
var html = [];
html.push("<p>" + ENUM.status[item.status] + "</p>");
if (item.status == 3 || item.status == 6) {
html.push("<p style='color:red;'>"+filterNull(item,'rejectReason')+"</p>");
}
if (item.status == 3 || item.status == 6) {
html.push("<p style='color:red;'>" + filterNull(item, 'rejectReason') + "</p>");
}
return html.join('');
}},
return html.join('');
}
},
{display:"操作信息",render:function(item){
var html=[];
html.push("<p>"+filterNull(item,'founderName')+"</p>");
html.push("<p>"+filterNull(item,'editTime')+"</p>");
{
display: "操作信息",
render: function(item) {
var html = [];
html.push("<p>" + filterNull(item, 'founderName') + "</p>");
html.push("<p>" + filterNull(item, 'editTime') + "</p>");
return html.join('');
}},
{
// 12
return html.join('');
}
}, {
// 12
display: '驳回原因',
hidden: true,
hidden: true,
name: 'status', // 8待上架,2待审核,3驳回,4通过,1已上架,0已下架,5再上架待审核,6再上架驳回,7再上架通过
render: function(item) {
var html = '';
html += ENUM.status[item.status];
if (item.status == 3 || item.status == 6) {
html += '<p style="color:red;">' + filterNull(item,'rejectReason') + '</p>'
html += '<p style="color:red;">' + filterNull(item, 'rejectReason') + '</p>'
}
return html;
}
},
{display:"操作",render:function(item){
var html=[];
}, {
display: "操作",
render: function(item) {
var html = [];
//html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn" id="btn-item-info">查看</a>');
html.push('<a href="/goods/audit/info/' + item.productSkn + '" class="btn btn-info btn-xs info-btn">查看</a>');
//html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn" id="btn-item-info">查看</a>');
html.push('<a href="/goods/audit/info/' + item.productSkn + '" class="btn btn-info btn-xs info-btn">查看</a>');
//if (item.status == 3 || item.status == 6) { // 驳回
// html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-pass">通过</a>');
//}
//if (item.status == 3 || item.status == 6) { // 驳回
// html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-pass">通过</a>');
//}
if (item.status == 2 || item.status == 5) { // 待审核
html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-pass">通过</a>');
html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn operation btn-danger btn-xs edit-class-btn" id="btn-item-reject">驳回</a>');
}
if (item.status == 2 || item.status == 5) { // 待审核
html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-pass">通过</a>');
html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-danger btn-xs edit-class-btn" id="btn-item-reject">驳回</a>');
}
return html.join('');
}},
return html.join('');
}
},
]
});
g.init('/supplier/baseproduct/ajax/index');
// tab初始化
var loadTab = function () {
var loadTab = function() {
t.active = undefined;
setTimeout(function () {
setTimeout(function() {
common.util.__ajax({
url:"/supplier/baseproduct/auditCount",
data:g.options.parms()
}, function (res) {
var __dt=$.extend({},ENUM.tips,res.data);
url: "/supplier/baseproduct/auditCount",
data: g.options.parms()
}, function(res) {
var __dt = $.extend({}, ENUM.tips, res.data);
t.init(__dt);
}, true);
}, 800);
... ... @@ -327,18 +368,18 @@ var loadTab = function () {
loadTab();
// 筛选
$(document).on('click', "#filter-btn", function () {
$(document).on('click', "#filter-btn", function() {
loadTab();
g.reload();
});
var Bll={
toast:function(content,fn){
common.dialog.confirm("温馨提示",content,function(){
var Bll = {
toast: function(content, fn) {
common.dialog.confirm("温馨提示", content, function() {
common.util.__ajax({
url:'/supplier/baseproduct/auditReject',
data:fn()
},function(){
url: '/supplier/baseproduct/auditReject',
data: fn()
}, function() {
g.reload();
loadTab();
});
... ... @@ -348,7 +389,7 @@ var Bll={
//批量驳回
$(document).on("click","#reject-btn",function(){
$(document).on("click", "#reject-btn", function() {
var selectedArr = g.selected,
len = selectedArr.length,
... ... @@ -358,7 +399,7 @@ $(document).on("click","#reject-btn",function(){
return;
}
var data=function(){
var data = function() {
var reason = $('#reason').val();
if (reason === '' || $.trim(reason) === '') {
return "请填写驳回原因";
... ... @@ -372,16 +413,16 @@ $(document).on("click","#reject-btn",function(){
console.log(sknList);
return {
productSknList:JSON.stringify(sknList),
targetStatus:3, // 驳回
productSknList: JSON.stringify(sknList),
targetStatus: 3, // 驳回
rejectReason: reason
};
}
Bll.toast($("#template").html(),data);
Bll.toast($("#template").html(), data);
});
//批量通过
$(document).on("click","#pass-btn",function(){
$(document).on("click", "#pass-btn", function() {
var selectedArr = g.selected,
len = selectedArr.length,
... ... @@ -391,7 +432,7 @@ $(document).on("click","#pass-btn",function(){
return;
}
var data=function(){
var data = function() {
$.each(selectedArr, function(i, value) {
sknList.push(value['productSkn']);
... ... @@ -401,20 +442,20 @@ $(document).on("click","#pass-btn",function(){
console.log(sknList);
return {
productSknList:JSON.stringify(sknList),
targetStatus:4, // 通过
productSknList: JSON.stringify(sknList),
targetStatus: 4, // 通过
rejectReason: ""
};
}
Bll.toast("确定要通过该申请吗?",data);
Bll.toast("确定要通过该申请吗?", data);
});
// 单个驳回
$(document).on("click","#btn-item-reject",function(){
$(document).on("click", "#btn-item-reject", function() {
//auditOperation([],3,)
var item=g.rows[$(this).data("index")];
var item = g.rows[$(this).data("index")];
var data=function(){
var data = function() {
var reason = $('#reason').val();
if (reason === '' || $.trim(reason) === '') {
... ... @@ -422,29 +463,29 @@ $(document).on("click","#btn-item-reject",function(){
}
return {
productSknList:JSON.stringify([item.productSkn]),
targetStatus:3, // 驳回
rejectReason:reason
productSknList: JSON.stringify([item.productSkn]),
targetStatus: 3, // 驳回
rejectReason: reason
};
}
Bll.toast($("#template").html(),data);
Bll.toast($("#template").html(), data);
});
// 单个通过
$(document).on("click","#btn-item-pass",function(){
$(document).on("click", "#btn-item-pass", function() {
//auditOperation([],3,)
var item=g.rows[$(this).data("index")];
var item = g.rows[$(this).data("index")];
var data=function(){
var data = function() {
return {
productSknList:JSON.stringify([item.productSkn]),
targetStatus:4, //通过
rejectReason:""
productSknList: JSON.stringify([item.productSkn]),
targetStatus: 4, //通过
rejectReason: ""
};
}
Bll.toast("确定要通过该申请吗?",data);
Bll.toast("确定要通过该申请吗?", data);
});
// 时间转化
... ... @@ -463,8 +504,7 @@ Date.prototype.format = function(format) {
}
for (var k in date) {
if (new RegExp("(" + k + ")").test(format)) {
format = format.replace(RegExp.$1, RegExp.$1.length == 1
? date[k] : ("00" + date[k]).substr(("" + date[k]).length));
format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? date[k] : ("00" + date[k]).substr(("" + date[k]).length));
}
}
return format;
... ... @@ -479,6 +519,4 @@ function filterNull(item, instr) {
} else {
return "";
}
}
}
\ No newline at end of file
... ...
'use strict';
var $ = require('jquery'),
common = require('../common/common');
var ENUM = {
checkStatus: {
100: '暂存',
200: '待审核',
300: '审核通过',
900: '驳回'
}
};
new common.dropDown({
el: "#brand-name",
ajax: "brand"
});
new common.dropDown({
el: "#supplier-name",
ajax: "supplier"
});
new common.dropDown({
el: "#shop-name",
ajax: "shopsRest"
});
new common.dropDown({
el: "#status"
});
var g = new common.grid({
el: '#basicTable',
parms: function() {
return {
//shopsId: common.util.__input("shop-name"),
shopsId: 20,
checkStatus: common.util.__input("status"),
supplierId: common.util.__input("supplier-name"),
brandId: common.util.__input("brand-name")
};
},
columns: [{
display: "店铺ID",
name: "id"
}, {
display: "店铺名称",
name: "shopsName"
}, {
display: "包含品牌",
name: "brands",
render: function(item) {
console.log(item);
if (item.brands instanceof Array && item.brands.length > 0) {
var html = '';
$.each(item.brands, function(i, value) {
html += value.brandName + '<br>';
});
return html;
} else {
return '';
}
}
}, {
display: "创建时间",
name: "createTime",
render: function(item) {
if (item.createTime) {
return common.util.__dateFormat(new Date(item.createTime * 1000), "yyyy-MM-dd hh:mm:ss");
} else {
return '';
}
}
}, {
display: "更新时间",
name: "updateTime",
render: function(item) {
if (item.updateTime) {
return common.util.__dateFormat(new Date(item.updateTime * 1000), "yyyy-MM-dd hh:mm:ss");
} else {
return '';
}
}
}, {
display: "状态",
name: "checkStatus",
render: function(item) {
if (item.checkStatus) {
return ENUM.checkStatus[item.checkStatus]
} else {
return '';
}
}
}, {
display: "操作",
render: function(item) {
/*var HtmArr = [];
HtmArr.push('<a href="javascript:void(0);" data-index="' + item.__index + '" class="edit btn btn-info btn-xs">店铺信息</a>');
HtmArr.push('<a href="javascript:void(0);" data-index="' + item.__index + '" class="delete btn btn-danger btn-xs">删除</button>');
return HtmArr.join('');*/
}
}]
});
g.init($("#gridurl").val());
// 筛选
$(document).on('click', "#filter-btn", function() {
g.reload();
});
\ No newline at end of file
... ...
... ... @@ -20,6 +20,7 @@ var config = {
// domain: 'http://192.168.102.202:8088/platform',
//domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
domain: 'http://192.168.102.202:8088/platform',
//domain: 'http://172.16.6.239:8080', //孙杰翔
loggers: {
api: {
level: 'verbose',
... ...
exports.domain = require('../config/common.js').domain;
exports.res = [
{
route: '/supplier/shop/decoration',
method: 'GET',
src: '/store/shop',
view: 'pages/store/shop2'
exports.res = [{
route: '/supplier/shop/decoration',
method: 'GET',
src: '/store/shop',
view: 'pages/store/shop2'
}, {
//店铺装修管理 -> 页面渲染
route: '/shop/decoration/index',
method: 'GET',
src: '/store/decoration-index',
view: 'pages/store/index',
data: {
pagetitle: {
level1title: '店铺装修管理',
level2title: '店铺装修管理',
level3title: '店铺装修管理'
},
checkStatus: true,
selectShop: true,
gridurl: '/shop/ShopsDecoratorRest/findShopsDecorator'
}
]
\ No newline at end of file
}, {
//店铺装修管理 -> 列表数据
route: '/shop/ShopsDecoratorRest/findShopsDecorator',
method: 'POST',
url: '/ShopsDecoratorRest/findShopsDecorator',
params: [{
name: 'page',
type: 'number'
}, {
name: 'size',
type: 'number'
}, {
name: 'shopsId',
type: 'number'
}, {
name: 'checkStatus',
type: 'number'
}, {
name: 'supplierId',
type: 'number'
}, {
name: 'brandId',
type: 'number'
}]
}]
\ No newline at end of file
... ...
... ... @@ -40,40 +40,59 @@
<option value="900">驳回</option>
</select>
{{/dropCheckStatus}} -->
{{# if searchStatus}}
<select name="status" id="status" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="-1" selected="">选择提交状态</option>
{{# each searchStatus}}
<option value="{{value}}">{{name}}</option>
{{/ each}}
</select>
{{/ if}}
{{# selectShop}}
<div class="panel-col2">
<select name="shop-name" id="shop-name" style="width: 280px;" tabindex="-1" title="" class="form-control">
<option value="-1">选择店铺</option>
</select>
</div>
{{/ selectShop}}
<select name="supplier-name" id="supplier-name" style="width: 280px;" tabindex="-1" title="" class="select2-offscreen brandBtn-group brandBtn-group-lg">
<option value="-1">选择供应商</option>
{{# supplierName}}
<option value="{{value}}">{{name}}</option>
{{/ supplierName}}
</select>
<select name="time-sort" id="brand-name" tabindex="-1" title="" class="select2-offscreen brandBtn-group">
<option value="-1">选择品牌</option>
{{# supplierName}}
<option value="{{value}}">{{name}}</option>
{{/ supplierName}}
</select>
{{#if checkStatus}}
<div class="panel-col2">
<select name="status" id="status" style="width: 280px;" tabindex="-1" title="" class="form-control">
<option value="" selected="">选择提交状态</option>
<option value="100">暂存</option>
<option value="200">待审核</option>
<option value="300">审核通过</option>
<option value="900">驳回</option>
</select>
</div>
{{/if}}
<div class="panel-col2">
<select name="supplier-name" id="supplier-name" style="width: 280px;" tabindex="-1" title="" class="form-control">
<option value="-1">选择供应商</option>
{{# supplierName}}
<option value="{{value}}">{{name}}</option>
{{/ supplierName}}
</select>
</div>
<div class="panel-col2">
<select name="time-sort" id="brand-name" tabindex="-1" title="" class="form-control">
<option value="-1">选择品牌</option>
{{# supplierName}}
<option value="{{value}}">{{name}}</option>
{{/ supplierName}}
</select>
</div>
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
</div>
</div>
</div>
<div class="panel">
<div class="panel-body nopadding">
<input type="hidden" id="url" value="/supplier/store/indexPage">
<div class="panel panel-primary-head">
<div id="basicTable" class="dataTables_wrapper no-footer">
<div class="dataTables_length" id="storeadmin_Tabel"></div>
</div>
<div id="basicTable" class="dataTables_wrapper no-footer">
<!-- <div class="dataTables_length" id="storeadmin_Tabel"></div> -->
</div>
</div>
</div>
</div>
<input type="hidden" id="gridurl" value="{{gridurl}}">
<input type="hidden" id="authority" value="{{authority}}" />
... ...
... ... @@ -8,7 +8,13 @@
</div>
<div id="basicInfoWrap" class="panel-body nopadding">
<div id="basic-info"></div>
<div id="goods-table"></div>
<div id="goods-table">
<div class="form-group">
<h5>能否补货</h5>
<div id="suppled-table" class="dataTables_wrapper no-footer">
</div>
</div>
</div>
<div id="product-ext"></div>
</div>
<div class="panel-footer">
... ... @@ -89,7 +95,7 @@
</div>
</script>
<script type="text/template" id="goodsList">
<!-- <script type="text/template" id="goodsList">
<div class="form-group">
<h5>能否补货</h5>
<table class="table table-bordered">
... ... @@ -119,7 +125,7 @@
</tbody>
</table>
</div>
</script>
</script> -->
<script type="text/template" id="productExtBoTemp">
<div class="form-group">
... ...