Authored by weiqingting

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

# Conflicts:
#	server/interface/basegoods.js
... ... @@ -63,6 +63,8 @@ var g=new common.grid({
columns:[
{display:"分类名称",render:function(item){
var html=[];
html.push("<p>名称:<input type='text' class='' /><p>");
html.push("<p>色系:"+item.goodsName+"<p>");
html.push('<button type="button" data-index='+item.__index+' class="sortdelete btn btn-danger btn-xs">删除</button>');
return html.join("");
... ...
... ... @@ -3,16 +3,17 @@ var $ = require('jquery'),
common=require('../common/common');
var ENUM={
status:{0:'待审核',1:'审核通过',2:'驳回',3:'过期',4:'作废'},//全部
tips:{"0":0,"1":0,"2":0,"3":0,"4":0,"all":0}
status:{toAuditNum:'待审核',failAuditNum:'驳回',passAuditNum:'通过',all:'全部'},//全部
tips:{"toAuditNum":0,"failAuditNum":0,"passAuditNum":0,"all":""}
}
// 审核状态枚举
var AuditEnum = {
status:{
100:"未审核",
200:"审核通过",
300:"审核不通过"
toAuditNum:100,
passAuditNum:200,
failAuditNum:300,
}
}
... ... @@ -22,7 +23,6 @@ var AgeLevelEnum = {
1:"成人",
2:"大童",
3:"小童",
"":"未知年龄"
}
}
... ... @@ -35,6 +35,16 @@ var GenderEnum = {
}
}
// 性别
//1可补货,2不可补货 3部分可补货
var ReplenishEnum = {
enum: {
1: "可补货",
2: "不可补货",
3: "部分可补货"
}
}
// 商品类型
var GoodsTypeEnum = {
type: {
... ... @@ -67,12 +77,10 @@ var t = new common.tab({
g.reload(1);
},
columns:[
{name:"0",display:"待审核({0})"},
{name:"1",display:"审核通过({1})"},
{name:"2",display:"驳回({2})"},
{name:"3",display:"过期({3})"},
{name:"4",display:"作废({4})"},
{name:"all",display:"全部({all})"}
{name:"toAuditNum",display:"待审核({toAuditNum})"},
{name:"failAuditNum",display:"驳回({failAuditNum})"},
{name:"passAuditNum",display:"通过({passAuditNum})"},
{name:"all",display:"全部{all}"}
]
}).init(ENUM.tips);
... ... @@ -80,16 +88,25 @@ var t = new common.tab({
var g = new common.grid({
el: '#basicTable',
parms:function(){
console.log(t.active);
return {
productSkn:common.util.__input("productSkn"),
productName: common.util.__input("productName"),
shopId: common.util.__input("shopId"),
brandId:common.util.__input("brandId"),
name:common.util.__input("filter-name"),
reqDepartment:common.util.__input("filter-dep"),
status: t.active,
isJit: common.util.__input("isJit"),
isOutLets: common.util.__input("isOutLets"),
isAdvance: common.util.__input("isAdvance"),
isAuditing: AuditEnum.status[t.active],
sortId: tabTree.selected.length>0?tabTree.selected[tabTree.selected.length-1].id:""
};
},
columns:[
{
display: '',
type: 'checkbox'
},
{display:"SKN",render:function(item){
var html=[];
html.push('<a data-index="'+ item.__index+ '" href="/base/goods/info/'+ item.productSkn +'" class="btn btn-info btn-xs edit-class-btn">'+item.productSkn+'</a>');
... ... @@ -101,6 +118,18 @@ var g = new common.grid({
var catgory = item.maxSortName;
if(item.middleSortName) {
catgory += "/"+item.middleSortName;
}
if (item.smallSortName) {
catgory += "/"+item.smallSortName;
}
if (item.sortName) {
catgory += "/"+item.sortName;
}
html.push("<p>名称:"+item.productName+"</p>");
html.push("<p>品牌:"+item.brandName+"</p>");
html.push("<p>品类:"+catgory+"</p>");
... ... @@ -115,7 +144,7 @@ var g = new common.grid({
//待审核和驳回列表中只显示吊牌价和销售价,通过的列表中显示四种
if (item.isAuditing === 200) {
html.push("<p>是否VIP:"+YNEnum.enum(item.isVip)+"</p>");
html.push("<p>是否VIP:"+YNEnum.enum[item.isVip]+"</p>");
html.push("<p>yoho币:"+item.yohoCoin+"</p>");
}
... ... @@ -169,7 +198,7 @@ var g = new common.grid({
var grade = (item.grade == 1) ? "重点款" : "非重点款";
var limited = (item.isLimited == "Y")? "限量款" : "非限量款";
var limitedPurchase = (item.isLimitbuy == "Y")? "限购" : "非限购";
var replenishment = "暂无此字段";
var replenishment = ReplenishEnum.enum[item.isSupplied];
var gender = GenderEnum.gender[item.gender];
html.push("<p>"+grade+"</p>");
... ... @@ -191,6 +220,12 @@ var g = new common.grid({
{display:"操作",render:function(item){
var html=[];
if (item.isAuditing) { // 200 审核通过
} else {
}
html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn">修改</a>');
html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn">通过</a>');
html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn">驳回</a>');
... ... @@ -205,14 +240,16 @@ g.init('/base/goods/ajax/index');
$(document).on('click', "#filter-btn", function () {
g.reload();
loadTab();
});
var Bll={
// 通过
var BllPass={
toast:function(content,fn){
common.dialog.confirm("温馨提示",content,function(){
common.util.__ajax({
url:'/supplier/index/status',
url:'/base/goods/pass',
data:fn()
},function(){
g.reload();
... ... @@ -220,28 +257,127 @@ var Bll={
});
}
}
//通过
// 驳回
var BllReject={
toast:function(content,fn){
common.dialog.confirm("温馨提示",content,function(){
common.util.__ajax({
url:'/base/goods/reject',
data:fn()
},function(){
g.reload();
});
});
}
}
// tab初始化
var loadTab = function () {
t.active = undefined;
setTimeout(function () {
common.util.__ajax({
url:"/base/goods/ajax/auditCount",
data:g.options.parms()
}, function (res) {
var __dt=$.extend({},ENUM.tips,res.data);
t.init(__dt);
}, true);
}, 400);
}
loadTab();
//单个通过
$(document).on("click",".apply-success",function(){
var item=g.rows[$(this).data("index")];
var data=function(){
return {
id:item.id
productSknList:JSON.stringify([item.productSku]),
};
}
Bll.toast("你确定审核通过吗?",data);
BllPass.toast("你确定审核通过吗?",data);
});
//驳回
//单个驳回
$(document).on("click",".apply-back",function(){
var item=g.rows[$(this).data("index")];
var data=function(){
var reason = $('#reason').val();
if (reason === '' || $.trim(reason) === '') {
return "请填写驳回原因";
}
return {
id:item.id
productSknList:JSON.stringify([item.productSku]),
rejectReason:reason
};
}
Bll.toast($("#template").html(),data);
BllReject.toast($("#template").html(),data);
});
//批量驳回
$(document).on("click","#reject-btn",function(){
var selectedArr = g.selected,
len = selectedArr.length,
sknList = [];
if (len <= 0) {
common.util.__tip('请选择要驳回的商品', 'warning');
return;
}
var data=function(){
var reason = $('#reason').val();
if (reason === '' || $.trim(reason) === '') {
return "请填写驳回原因";
}
$.each(selectedArr, function(i, value) {
sknList.push(value['productSkn']);
});
console.log(sknList);
return {
productSknList:JSON.stringify(sknList),
targetStatus:3, // 驳回
rejectReason: reason
};
}
BllReject.toast($("#template").html(),data);
});
//批量通过
$(document).on("click","#pass-btn",function(){
var selectedArr = g.selected,
len = selectedArr.length,
sknList = [];
if (len <= 0) {
common.util.__tip('请选择审核通过的商品', 'warning');
return;
}
var data=function(){
$.each(selectedArr, function(i, value) {
sknList.push(value['productSkn']);
});
console.log(sknList);
return {
productSknList:JSON.stringify(sknList),
};
}
BllPass.toast("确定要通过该申请吗?",data);
});
// 时间转化
Date.prototype.format = function(format) {
var date = {
... ...
... ... @@ -53,16 +53,23 @@ new common.dropDown({
});
var editPostion = '';
var t = new common.tab({
el: "#basicTab",
click: function() {
g.options.columns[11].hidden = true;
g.options.columns[8].hidden = true;
if ($(this).find('a').attr('columnname') == 3) {
var columnname = $(this).find('a').attr('columnname');
if (columnname == 3) {
g.options.columns[11].hidden = false;
} else if ($(this).find('a').attr('columnname') == 2) {
} else if (columnname == 2) {
g.options.columns[8].hidden = false;
};
if (columnname == 1 || columnname == 2) {
editPostion = '#position9';
}
g.init($("#gridurl").val());
},
columns: [{
... ... @@ -133,7 +140,10 @@ var g = new common.grid({
type: 'checkbox'
}, {
display: 'skn',
name: 'productSkn'
name: 'productSkn',
render: function(item) {
return '<a href="/goods/netsale/info/' + item.productSkn + editPostion + '">' + item.productSkn + '</a>'
}
}, {
display: '图片',
name: 'picImgUrl',
... ... @@ -152,7 +162,7 @@ var g = new common.grid({
render: function(item) {
return '<p><strong>吊牌价:</strong>' + item.retailPrice + '</p>' +
'<p><strong>销售价:</strong>' + item.salesPrice + '</p>' +
'<p><strong>是否VIP:</strong></p>' +
'<p><strong>是否VIP:</strong></p>' + item.isVIP + '</p>' +
'<p style="color: #ccc;"><strong>yoho币:</strong>' + item.returnCoin + '</p>';
}
}, {
... ... @@ -174,10 +184,10 @@ var g = new common.grid({
display: '搜索/标签',
hidden: true,
render: function(item) {
return '关键词:' + '<br>' +
return '关键词:' + item.searchAndLabel + '<br>' +
'风格:' + item.style + '<br>' +
'纹理:' + item.style + '<br>' +
'工艺:' + item.style + '<br>';
'纹理:' + item.pattern + '<br>' +
'工艺:' + item.makeCrafts + '<br>';
}
}, {
display: '操作信息',
... ... @@ -190,6 +200,7 @@ var g = new common.grid({
if (item.editTime) {
html += '<p>' + item.editTime + '</p>';
}
return html;
}
}, {
... ... @@ -201,6 +212,9 @@ var g = new common.grid({
if (item.shelveTime) {
html += '<br>上架时间:' + item.shelveTime;
}
if (item.status == 3 || item.status == 6) {
html += '<p style="color:red;">(' + item.rejectReason + ')</p>'
}
return html;
}
}, {
... ... @@ -215,13 +229,13 @@ var g = new common.grid({
var HtmArr = [];
if (item.status == 1) {
HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
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 != 2 && item.status != 5) {
HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
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>');
}
HtmArr.push('<a href="/goods/netsale/info/' + item.productSkn + '" class="btn btn-info btn-xs info-btn">查看</a>');
HtmArr.push('<a href="/goods/netsale/info/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs info-btn">查看</a>');
return HtmArr.join('');
}
}]
... ... @@ -273,6 +287,8 @@ function shelveModal(title, html) {
if (res.data.code == 200) {
e.$tip(res.data.message, function() {
shelveLayer.close();
loadtab();
g.reload();
}, 'growl-success');
} else {
e.$tip(res.data.message);
... ...
... ... @@ -41,7 +41,9 @@ var basicInfohtml = '',
1: '普通',
2: '赠品'
}
};
},
basicInfo = NETSALEDATA.baseProductInfo.baseProduct || '',
productExtBo = NETSALEDATA.productExtBo || '';
/*
* 基本信息value值转换
... ... @@ -56,7 +58,7 @@ function convert(basicInfo, obj) {
return basicInfo;
}
var basicInfoData = convert(NETSALEDATA.baseProductInfo.baseProduct, convertObj);
var basicInfoData = convert(basicInfo, convertObj);
//基本信息
basicInfoData.renderType = $('.contentpanel').data('type');
... ... @@ -69,9 +71,10 @@ $('#goods-table').html(common.util.__template2($('#goodsList').html(), {
}));
//上架必填
NETSALEDATA.productExtBo.renderType = $('.contentpanel').data('type');
NETSALEDATA.productExtBo.sellChannels = NETSALEDATA.productExtBo.sellChannels.replace(/,/g, "|");
$('#product-ext').html(common.util.__template2($('#productExtBoTemp').html(), NETSALEDATA.productExtBo));
productExtBo.renderType = $('.contentpanel').data('type');
productExtBo.sellChannels = productExtBo.sellChannels ? productExtBo.sellChannels.replace(/,/g, "|") : '';
$('#product-ext').html(common.util.__template2($('#productExtBoTemp').html(), productExtBo));
if ($('.contentpanel').data('type') == 'info') {
... ...
... ... @@ -30,12 +30,16 @@ common.util.__ajax({
}));
if (NETSALEDATA.brandRelationList) {
$('#brandWrap').html(common.util.__template2($('#brandWrap').html(), {
$('.selected-brand').html(common.util.__template2($('#brandShowTemp').html(), {
brandRelationList: NETSALEDATA.brandRelationList,
brandRelation: brandSelectArr.join('|')
}));
};
e.init();
if ($('.contentpanel').data('type') == 'info') {
$('.brand-list').find('input').attr('disabled', true);
}
}, true);
$.each(NETSALEDATA.brandRelationList, function(index, value) {
... ...
... ... @@ -15,7 +15,7 @@ if(window.NETSALEDATA&&window.NETSALEDATA.baseProductInfo&&window.NETSALEDATA.ba
window.UMdescriptioner = UM.getEditor('edit-descriptioner');
/*商品描述*/
if(window.NETSALEDATA&&window.NETSALEDATA.productExtBo.productDesc){
if(window.NETSALEDATA&&window.NETSALEDATA.productExtBo.productDesc&&window.NETSALEDATA.productExtBo.productDesc){
UMdescriptioner.setContent(window.NETSALEDATA.productExtBo.productDesc)
}
$(document).on("click","#btn-descriptioner",function(){
... ... @@ -32,7 +32,7 @@ $(document).on("click","#btn-descriptioner",function(){
window.UMrecommender = UM.getEditor('edit-recommender');
/*小编推荐*/
if(window.NETSALEDATA&&window.NETSALEDATA.productExtBo){
if(window.NETSALEDATA&&window.NETSALEDATA.productExtBo&&window.NETSALEDATA.productExtBo.recommend){
UMrecommender.setContent(window.NETSALEDATA.productExtBo.recommend);
}
$(document).on("click","#btn-recommand",function(){
... ...
... ... @@ -10,15 +10,45 @@ exports.res = [
iscreate:true
}
},
{
// 列表头部各个审核状态的数量
route:'/base/goods/ajax/auditCount',
method:'POST',
url:'/product/getbaseProductCountByStatus',
params:[
{name: 'supplierId',type:'Number'},
{name: 'productSkn',type: 'Number'},
{name: 'productName',type: 'String'},
{name: 'founder',type:'Number'},
{name: 'shopId',type: 'Number'},
{name: 'brandId',type: 'Number'},
{name: 'isOutLets',type:'String'},
{name: 'isAdvance',type:'String'},
{name: 'gender',type:'String'},
{name: 'isJit',type:'String'},
{name: 'maxSortId',type:'Number'},
{name: 'middleSortId',type: 'Number'},
{name: 'smallSortId',type: 'Number'},
{name: 'sortId',type: 'Number'},
{name: 'page',type: 'Number'},
{name: 'size',type: 'Number'},
{name: 'supplierId',type:'Number'},
{name: 'isAuditing',type:'Number'},
]
},
{//ajax列表数据
route:'/base/goods/ajax/index',
method:'POST',
url:'/product/getBaseProductList',
params:[
{name: 'page',type: 'Number'},
{name: 'size',type: 'Number'},
{name: 'supplierId',type:'Number'},
{name: 'supplierId',type:'Number'},
{name: 'productSkn',type: 'Number'},
{name: 'productName',type: 'String'},
{name: 'founder',type:'Number'},
... ... @@ -39,6 +69,8 @@ exports.res = [
{name: 'page',type: 'Number'},
{name: 'size',type: 'Number'},
{name: 'supplierId',type:'Number'},
{name: 'isAuditing',type:'Number'},
]
},
{//添加页面
... ... @@ -121,9 +153,26 @@ exports.res = [
{name:'productSkn',type:'Number'},
]
},
{
{//获取颜色
route:'/base/goods/queryProductColors',
method:'POST',
url:'/productColor/queryProductColors'
},
{
// 通过
route:'/base/goods/pass',
method:'POST',
url:'/product/batchAuditPassBaseProduct',
params:[
{name:'productSknList',type:'Number'},
]
},{
// 驳回
route:'/base/goods/reject',
method:'POST',
url:'/product/auditRejectBaseProduct',
params:[
{name:'productSknList',type:'Number'},
]
}
];
\ No newline at end of file
... ...
exports.domain = require('../config/common.js').domain;
// exports.domain = 'http://172.16.6.227:8083/yohobuy-platform-web'; //马力
//exports.domain = require('../config/common.js').domain;
exports.domain = 'http://172.16.6.227:8083/yohobuy-platform-web'; //马力
//exports.domain = 'http://172.16.6.236:8080/platform'; //钱军
//exports.domain = 'http://172.16.6.162:8088/platform'; //李建
... ... @@ -580,7 +580,7 @@ exports.res = [
name: 'idName',
type: 'String'
}]
},{
}, {
//查询通过审核店铺列表接口
route: '/goods/query/shopPass',
method: 'POST',
... ...
... ... @@ -40,7 +40,7 @@
<p>
{{#data}}
{{#each list}}
<button type="button" class="btn btn-default sortadd btn-xs" data-id="1">红色(+)</button>
<button type="button" class="btn btn-default sortadd btn-xs" data-id="{{id}}">{{colorName}}(+)</button>
{{/each}}
{{/data}}
</p>
... ...
... ... @@ -28,74 +28,80 @@
{{/ iscreate}}
<div class="panel-body">
<div class="row">
<div class="panel-col">
<input type="text" id="productSkn" value="" class="form-control" placeholder="SKN" style="height: 39px;" />
</div>
<div class="panel-col">
<input type="text" id="productName" class="form-control" placeholder="商品名称" style="height: 39px;"/>
</div>
<div class="panel-col">
<select id="founder" class="form-control">
<option value="-1">创建人</option>
</select>
</div>
<div class="panel-col">
<select id="shopId" class="form-control">
<option value="-1">请选择店铺</option>
</select>
</div>
<div class="panel-col">
<select id="brandId" class="form-control">
<option value="-1">请选择品牌</option>
</select>
</div>
<div class="panel-col">
<select id="isOutLets" class="form-control">
<option value="-1">是否奥莱</option>
<option value="Y"></option>
<option value="N"></option>
<div class="panel-col">
<input type="text" id="productSkn" value="" class="form-control" placeholder="SKN"
style="height: 39px;"/>
</div>
<div class="panel-col">
<input type="text" id="productName" class="form-control" placeholder="商品名称" style="height: 39px;"/>
</div>
<div class="panel-col">
<select id="founder" class="form-control">
<option value="-1">创建人</option>
</select>
</div>
<div class="panel-col">
<select id="shopId" class="form-control">
<option value="-1">请选择店铺</option>
</select>
</div>
<div class="panel-col">
<select id="brandId" class="form-control">
<option value="-1">请选择品牌</option>
</select>
</div>
<div class="panel-col">
<select id="isOutLets" class="form-control">
<option value="-1">是否奥莱</option>
<option value="Y"></option>
<option value="N"></option>
</select>
</div>
<div class="panel-col">
<select id="isAdvance" class="form-control">
<option value="-1">是否预售</option>
<option value="Y"></option>
<option value="N"></option>
</select>
</div>
<div class="panel-col">
<select id="isAdvance" class="form-control">
<option value="-1">是否预售</option>
<option value="Y"></option>
<option value="N"></option>
</select>
</div>
<div class="panel-col">
<select id="gender" class="form-control">
<option value="-1">请选择性别</option>
<option value="1"></option>
<option value="2"></option>
<option value="3">通用</option>
</select>
</div>
<div class="panel-col">
<select id="gender" class="form-control">
<option value="-1">请选择性别</option>
<option value="1"></option>
<option value="2"></option>
<option value="3">通用</option>
</select>
</div>
</select>
</div>
<div class="panel-col" style="width:300px">
<div id="sort"></div>
</div>
<div class="panel-col">
<select id="isJit" class="form-control">
<option value="-1">是否JIT商品</option>
<option value="Y">是JIT</option>
<option value="N">非JIT</option>
<div class="panel-col" style="width:300px">
<div id="sort"></div>
</div>
<div class="panel-col">
<select id="isJit" class="form-control">
<option value="-1">是否JIT商品</option>
<option value="Y">是JIT</option>
<option value="N">非JIT</option>
</select>
</div>
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
</div>
</select>
</div>
<div class="panel-col">
<a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
<a id="all-btn" href="" class="btn btn-info">全部</a>
</div>
<div class="panel-col">
<a id="pass-btn" href="javascript:;" class="btn btn-info">通过</a>
<a id="reject-btn" href="javascript:;" class="btn btn-info">驳回</a>
</div>
</div>
</div>
</div>
<div class="panel panel-primary-head">
<div class="dataTab_wrapper" id="basicTab"></div>
<div class="dataTab_wrapper" id="basicTable" ></div>
<div class="dataTab_wrapper" id="basicTable"></div>
</div>
</div>
... ... @@ -103,14 +109,15 @@
<input type="hidden" id="gridurl" value="{{gridurl}}">
<script type="text/template" id="template">
<div class="rows" style="height: 100px;">
<div class="form-group">
<span class="col-sm-2 control-label">驳回原因:</span>
<div class="col-sm-8">
<textarea id="bohui" class="form-control" rows="3" ></textarea>
<div class="rows" style="height: 100px;">
<div class="form-group">
<span class="col-sm-2 control-label">驳回原因:</span>
<div class="col-sm-8">
<textarea id="bohui" class="form-control" rows="3"></textarea>
</div>
</div>
</div>
</div>
</div>
</div>
</script>
... ...
... ... @@ -57,16 +57,16 @@
</div>
<div class="panel-col">
<select name="isScreen" id="isScreen" tabindex="-1" title="" class="form-control height40">
<option value="-1">拍摄状态</option>
<option value="1">已拍摄</option>
<option value="0">未拍摄</option>
<option value="">拍摄状态</option>
<option value="Y">已拍摄</option>
<option value="N">未拍摄</option>
</select>
</div>
<div class="panel-col">
<select name="isMeasure" id="isMeasure" tabindex="-1" title="" class="form-control height40">
<option value="-1">测量状态</option>
<option value="1">已测量</option>
<option value="0">未测量</option>
<option value="">测量状态</option>
<option value="Y">已测量</option>
<option value="N">未测量</option>
</select>
</div>
<div class="panel-col">
... ... @@ -104,15 +104,15 @@
</div>
<div class="panel-col">
<select name="productStatus" id="productStatus" tabindex="-1" title="" class="form-control height40">
<option value="-1">状态</option>
<option value="1">待上架</option>
<option value="0">待审核</option>
<option value="">状态</option>
<option value="-1">待上架</option>
<option value="2">待审核</option>
<option value="3">驳回</option>
<option value="0">通过</option>
<option value="1">再次上架待审核</option>
<option value="0">再次上架驳回</option>
<option value="1">再次上架通过</option>
<option value="0">已上架</option>
<option value="4">通过</option>
<option value="5">再次上架待审核</option>
<option value="6">再次上架驳回</option>
<option value="7">再次上架通过</option>
<option value="1">已上架</option>
<option value="0">已下架</option>
</select>
</div>
... ...
... ... @@ -24,12 +24,19 @@
<div class="col-sm-3">店铺:[[shopName]]</div>
<div class="col-sm-3">品牌:[[brandName]]</div>
<div class="col-sm-3">供应商:[[supplierName]]</div>
[[if renderType=='edit']]
<div class="col-sm-3">厂家编号:[[factoryCode]]</div>
[[else]]
<div class="col-sm-3"><img src="[[productImageUrl]]" alt=""></div>
[[/if]]
</div>
<div class="form-group">
<div class="col-sm-3">品类:</div>
<div class="col-sm-3">货品年:[[goodsYears]]</div>
<div class="col-sm-3">货品季:[[goodsSeason]]</div>
[[if renderType=='info']]
<div class="col-sm-3">厂家编号:[[factoryCode]]</div>
[[/if]]
</div>
<div class="form-group">
<div class="col-sm-3">SKN[[productSkn]]</div>
... ...
... ... @@ -4,15 +4,12 @@
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">商品关联</h2>
<h2 class="panel-title">(商品)品牌关联</h2>
</div>
<div id="brandWrap" class="panel-body">
<div class="form-group selected-brand" style="min-height: 60px;">
<input id="brandRelationList" type="hidden" value="[[brandRelation]]" for="checkbox">
[[each brandRelationList as a index]]
<div class="col-sm-2" data-id="[[a.brandId]]">[[a.brandName]]</div>
[[/each]]
</div>
<div class="form-group brand-list">
</div>
... ... @@ -36,4 +33,10 @@
</div>
</div>
[[/each]]
</script>
<script type="text/template" id="brandShowTemp">
<input id="brandRelationList" type="hidden" value="[[brandRelation]]" for="checkbox">
[[each brandRelationList as a index]]
<div class="col-sm-2" data-id="[[a.brandId]]">[[a.brandName]]</div>
[[/each]]
</script>
\ No newline at end of file
... ...