Authored by weiqingting

4.5

... ... @@ -561,7 +561,8 @@ $(document).on("click","#btnReview",function(){
e.submit($("#basicForm").attr("action"),function(option){
var select=tabTree.getAddress();
// option.data.isAuditing=200;
option.data.supplierId=common.util.__input("supplierId")?$("#supplierId").val():"0";
option.data.shopId=common.util.__input("shopId")?$("#shopId").val():"0";
... ...
... ... @@ -132,7 +132,7 @@ var t = new common.tab({
g.options.columns[6].hidden = false;
g.options.columns[15].hidden = false; //显示【状态】
g.options.columns[16].hidden = false; //显示【操作信息】
$("#daochu").hide();
} else {
switch (columnname) {
... ... @@ -141,6 +141,7 @@ var t = new common.tab({
g.options.columns[9].hidden = false; //显示【创建时间】
g.options.columns[10].hidden = false; //显示【创建人】
}
$("#daochu").hide();
break;
case 'failAuditNum':
... ... @@ -148,6 +149,7 @@ var t = new common.tab({
g.options.columns[11].hidden = false; //显示【驳回时间】
g.options.columns[12].hidden = false; //显示【原因】
}
$("#daochu").hide();
break;
case 'passAuditNum':
... ... @@ -156,12 +158,14 @@ var t = new common.tab({
g.options.columns[13].hidden = false; //显示【通过时间】
g.options.columns[14].hidden = false; //显示【通过人】
}
$("#daochu").show();
break;
default:
{
}
$("#daochu").hide();
break;
}
}
... ... @@ -543,32 +547,66 @@ $(document).on("click", ".apply-back", function() {
//批量驳回
$(document).on("click", "#reject-btn", function() {
var selectedArr = g.selected,
// var selectedArr = g.selected,
// len = selectedArr.length,
// sknList = [];
// if (len <= 0) {
// common.util.__tip('请选择要驳回的商品', 'warning');
// return;
// }
// var data = function() {
// var reason = $('#bohui').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
// };
// }
var count = 0,
selectedArr = g.selected,
len = selectedArr.length,
sknList = [];
if (len <= 0) {
common.util.__tip('请选择要驳回的商品', 'warning');
return;
data = g.options.parms();
var reason = $('#bohui').val();
if (reason === '' || $.trim(reason) === '') {
return "请填写驳回原因";
}
var data = function() {
var reason = $('#bohui').val();
if (reason === '' || $.trim(reason) === '') {
return "请填写驳回原因";
$.each(data, function(key, value) {
if (value && value != '' && key != 'size' && key != 'tab') {
count++;
}
});
if (count == 0 && len <= 0) {
common.util.__tip('请选择导出商品的条件', 'warning');
return;
}
if (len > 0) {
data.productSknList = [];
$.each(selectedArr, function(i, value) {
sknList.push(value['productSkn']);
data.sknList.push(value['productSkn']);
});
console.log(sknList);
return {
productSknList: JSON.stringify(sknList),
targetStatus: 3, // 驳回
rejectReason: reason
};
}
var result={
targetStatus: 3,
rejectReason: reason
};
for(var name in data){
if(data.hasOwnProperty(name)&&data[name]){
result[name]=data[name];
}
}
BllReject.toast.call(this, $("#template").html(), data);
});
... ... @@ -576,26 +614,35 @@ $(document).on("click", "#reject-btn", function() {
//批量通过
$(document).on("click", "#pass-btn", function() {
var selectedArr = g.selected,
var count = 0,
selectedArr = g.selected,
len = selectedArr.length,
sknList = [];
if (len <= 0) {
common.util.__tip('请选择审核通过的商品', 'warning');
return;
}
data = g.options.parms();
var data = function() {
$.each(data, function(key, value) {
if (value && value != '' && key != 'size' && key != 'tab') {
count++;
}
});
if (count == 0 && len <= 0) {
common.util.__tip('请选择导出商品的条件', 'warning');
return;
}
if (len > 0) {
data.productSknList = [];
$.each(selectedArr, function(i, value) {
sknList.push(value['productSkn']);
data.sknList.push(value['productSkn']);
});
return {
productSknList: JSON.stringify(sknList),
};
}
BllPass.toast.call(this, "确定要通过该申请吗?", data);
var result={};
for(var name in data){
if(data.hasOwnProperty(name)&&data[name]){
result[name]=data[name];
}
}
BllPass.toast.call(this, "确定要通过该申请吗?", result);
});
... ...
... ... @@ -7,6 +7,7 @@ var $ = require('jquery'),
*/
window.NETSALEDATA = require('./partials/data.js');
console.log(window.NETSALEDATA.baseProductInfo.baseProduct);
window.GOLABDATA = {
on: function(key, callback) {
... ... @@ -214,17 +215,19 @@ if (location.hash) {
}
// alert(location.hash.replace(/^#/,'').split(',')[0]);
try {
$(".floatnav li").each(function() {
var name = $.trim($(this).data('pos')),
that = this;
if (name == location.hash.replace(/^#/, '')) {
setTimeout(function() {
$(that).click();
}, 500);
}
});
var status=window.NETSALEDATA.baseProductInfo.baseProduct.status;
if(!([8,2,3,4].indexOf(status)>-1)){
$(".floatnav li").each(function() {
var name = $.trim($(this).data('pos')),
that = this;
if (name == location.hash.replace(/^#/, '')) {
setTimeout(function() {
$(that).click();
}, 500);
}
});
}
} catch (e) {
}
\ No newline at end of file
... ...
... ... @@ -84,7 +84,9 @@ var g = new common.grid({
productStatusStr: t.value,
tab: $('#basicTab').find('.active').index(),
isInfoMiss: t.isInfoMiss,
sortFlag: t.sortFlag
sortFlag: t.sortFlag,
skcOnsaleStatus:common.util.__input("skcOnsaleStatus"),
isAdvance:common.util.__input("isAdvance")
};
},
columns: [{
... ... @@ -285,7 +287,8 @@ var t = new common.tab({
columns: [{
name: "0",
value: '8,3,2',
display: "上架前({1})"
display: "上架前({1})",
active:true
}, {
name: "1",
value: '4,1,0,5,6',
... ... @@ -307,7 +310,7 @@ var t = new common.tab({
//tab
var loadtab = function() {
t.active = undefined;
// t.active = undefined;
setTimeout(function() {
common.util.__ajax({
url: '/goods/product/queryTabProductNum',
... ... @@ -315,12 +318,13 @@ var loadtab = function() {
}, function(res) {
var __dt = $.extend({}, ENUM.tab, res.data);
t.init(__dt);
g.init($("#gridurl").val());
}, true);
}, 400);
}
loadtab();
g.init($("#gridurl").val());
//筛选
$("#filter-btn").click(function() {
... ... @@ -432,6 +436,11 @@ var shelveTable = new common.grid({
el: "#shelve-table",
secondIndex: 2,
columns: [{
display: '默认封面图',
render: function(item) {
return '<img src="'+item.initGoodsImageUrl+'">'
}
},{
display: 'SKC(商品信息)',
render: function(item) {
... ...
... ... @@ -102,7 +102,7 @@ var suppledTable = new common.grid({
hash: false,
secondIndex: 1,
columns: [{
display: 'SKC(厂家颜色)',
display: 'SKC(色系颜色)',
render: function(item) {
return item.productSkc + '(' + item.goodsName + ')';
}
... ...
... ... @@ -283,10 +283,40 @@ var goodsList = {};
if (window.NETSALEDATA && window.NETSALEDATA.goodsList) {
goodsList = window.NETSALEDATA.goodsList;
}
$("#fenmianWrap").html(common.util.__template2($("#fenmianTemp").html(), {
goodsList: goodsList
}));
var count=0;
goodsList.forEach(function(item){
if(item.isDefault&&item.isDefault=="Y"){
count++;
}
});
if(!count&&goodsList[0]){
goodsList[0].isDefault="Y";
}
renderGoodList();
function renderGoodList(){
$("#fenmianWrap").html(common.util.__template2($("#fenmianTemp").html(), {
goodsList: goodsList
}));
//添加封面图
common.edit.ajaxfileupload(".fenmianfile", {
params: {
__type: "upload",
bucket: "goodsimg"
},
valid_extensions: ['png', 'jpg', 'jpeg'],
onComplete: function(response) {
if (response.status && response.code == 200) {
var data = addFengmian($(this).data("index"), response.data);
$("#fenmianWrap").html(common.util.__template2($("#fenmianTemp").html(), {
goodsList: goodsList
}));
} else {
common.util.__tip(response.message, 'warning');
}
}
});
}
/*
* 添加封面
* @param {index} goodsList[index]
... ... @@ -296,9 +326,14 @@ $("#fenmianWrap").html(common.util.__template2($("#fenmianTemp").html(), {
function addFengmian(index, src) {
var item = goodsList[index].goodsImagesList || [];
var len = item ? item.length : 1;
var gender=window.NETSALEDATA.baseProductInfo.baseProduct.gender;
var map={
"男":1,
"女":2
};
var data = {
"angle": 0,
"genderCover": 0,
"genderCover": len==1?0:(map[gender]||3),
"imageUrl": src,
"orderBy": len,
"productSkc": goodsList[index].productSkc,
... ... @@ -308,26 +343,9 @@ function addFengmian(index, src) {
};
item.push(data);
goodsList[index].goodsImagesList = item;
return data;
}
//添加封面图
common.edit.ajaxfileupload(".fenmianfile", {
params: {
__type: "upload",
bucket: "goodsimg"
},
valid_extensions: ['png', 'jpg', 'jpeg'],
onComplete: function(response) {
console.log(response);
if (response.status && response.code == 200) {
var data = addFengmian($(this).data("index"), response.data);
$(this).parents(".cover-image-item").before(common.util.__template2($("#fenmianImgTemp").html(), data));
} else {
common.util.__tip(response.message, 'warning');
}
}
});
//封面调用图片
var uesImgDialog = null;
... ... @@ -367,59 +385,53 @@ $(document).on('click', '.use-img', function() {
});
//设置颜色封面
$('.cover-image-list').on("click", ".btn-metro", function() {
$('#fenmianWrap').on("click", ".btn-metro", function() {
var index = $(this).parents(".cover-image-list").data("index");
var index1 = $(this).parents(".cover-image-item").index();
var list=goodsList[index].goodsImagesList;
var item = goodsList[index].goodsImagesList[index1];
var colorIndex = $(this).index();
if ($(this).hasClass('info')) {
$(this).removeClass('info');
} else {
$(this).parents('.cover-image-item').siblings().each(function() {
$(this).find('.btn-metro').eq(colorIndex).removeClass('info');
if(colorIndex==0){
list.forEach(function(item,index){
if(index==index1){
item.isDefault="Y";
}else{
item.isDefault="N";
}
});
$(this).siblings('.btn-metro').removeClass('info').end().addClass('info');
}
var isDefault = $(this).parents('.cover-color').find('.btn-metro').eq(0).hasClass('info') ? 'Y' : 'N';
var genderCover = $(this).parents('.cover-color').find('.info').index() >= 0 ? $(this).parents('.cover-color').find('.info').index() : 0;
$.each(goodsList[index].goodsImagesList, function(i, value) {
if (value.genderCover == genderCover) {
value.genderCover = 0;
}
if (value.isDefault == isDefault) {
value.isDefault = 'N';
}else{
if(item.genderCover&&item.genderCover!=3&&item.genderCover!=colorIndex){
item.genderCover=3;
}else
if(item.genderCover&&item.genderCover==3){
item.genderCover=3-colorIndex;
}else
if(item.genderCover&&item.genderCover!=3&&item.genderCover==colorIndex){
item.genderCover=0;
}else{
item.genderCover=colorIndex;
}
});
item.genderCover = genderCover;
item.isDefault = isDefault;
}
renderGoodList();
});
//设置商品封面
$(document).on("click", ".cover-goods .btn-goods-cover", function() {
var index = $(this).data("index");
var item = goodsList[index];
if ($(this).hasClass("info")) {
$(this).removeClass("info");
} else {
$('.cover-goods .btn-goods-cover').removeClass("info");
$(this).addClass("info");
}
$.each(goodsList, function(i, value) {
value.isDefault = 'N';
});
item.isDefault = $(this).hasClass("info") ? "Y" : "N";
item.isDefault = $(this).hasClass("info") ? "N" : "Y";
renderGoodList();
});
//删除封面图
$(document).on('click', '.remove-item-btn', function() {
var index = $(this).parents(".cover-image-list").data("index");
var index1 = $(this).parents(".cover-image-item").index();
$(this).parents('.cover-image-item').remove();
goodsList[index].goodsImagesList.splice(index1, 1);
renderGoodList();
});
//单独保存封面
... ...
... ... @@ -22,7 +22,7 @@ var config = {
//domain: 'http://172.16.6.146:8088/platform', //玛丽
//domain:'http://172.16.6.157:8080/yohobuy-platform-web',//葛超
// domain: 'http://192.168.102.216:8086/platform',
domain: 'http://192.168.102.202:8088/platform',
domain: 'http://192.168.102.210:8088/platform',
//domain:'http://172.16.6.120:8088/platform',//曹艳
//domain:'http://172.16.6.231:8080/platform',//王伟
//domain: 'http://172.16.6.239:8080', //孙杰翔
... ...
... ... @@ -466,16 +466,151 @@ exports.res = [{ //基础商品列表
route: '/base/goods/pass',
method: 'POST',
url: '/product/batchAuditPassBaseProduct',
params: [{
name: 'productSknList',
type: 'String'
}, ]
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'
}, {
name: 'founderName',
type: 'String'
},
{
name: 'productSknList',
type: 'String'
}
]
}, {
// 驳回
route: '/base/goods/reject',
method: 'POST',
url: '/product/batchAuditRejectBaseProduct',
params: [{
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'
}, {
name: 'founderName',
type: 'String'
},
{
name: 'productSknList',
type: 'String'
}, {
... ...
... ... @@ -88,6 +88,12 @@ exports.res = [{
}, {
name: 'descFlag',
type: 'string'
},{
name:'isAdvance',
type:'string'
},{
name:'skcOnsaleStatus',
type:'string'
}]
}, {
//网销信息 -> tab页
... ... @@ -142,6 +148,12 @@ exports.res = [{
}, {
name: 'productStatus',
type: 'number'
},{
name:'isAdvance',
type:'string'
},{
name:'skcOnsaleStatus',
type:'string'
}]
}, {
... ... @@ -346,6 +358,12 @@ exports.res = [{
}, {
name: 'productMaterial',
type: 'string'
},{
name:'isAdvance',
type:'string'
},{
name:'skcOnsaleStatus',
type:'string'
}]
}, {
//网销信息 -> 保存基本信息接口
... ...
... ... @@ -98,7 +98,7 @@
<div class="panel-col">
<a id="import-btn" href="/goods/base/batch" class="btn btn-info">基础商品导入</a>
</div>
<div class="panel-col">
<div class="panel-col" style="display: none;" id="daochu">
<a href="javascript:;" class="btn btn-info" id="basedaochu">基础商品导出</a>
</div>
<div class="panel-col">
... ...
... ... @@ -39,59 +39,59 @@
<input id="productName" class="form-control panel-input" type="text" placeholder="商品名称">
</div>
<div class="panel-col2">
<select name="shopId" id="shopId" tabindex="-1" title="" class="form-control">
<select name="shopId" id="shopId" class="form-control">
<option value="-1">请选择店铺</option>
</select>
</div>
<div class="panel-col">
<select name="brandId" id="brandId" tabindex="-1" title="" class="form-control">
<select name="brandId" id="brandId" class="form-control">
<option value="-1">请选择品牌</option>
</select>
</div>
<div class="panel-col">
<select name="stock" id="stock" tabindex="-1" title="" class="form-control">
<select name="stock" id="stock" class="form-control">
<option value="-1">库存情况</option>
<option value="1">有库存</option>
<option value="0">无库存</option>
</select>
</div>
<div class="panel-col">
<select name="isScreen" id="isScreen" tabindex="-1" title="" class="form-control height40">
<select name="isScreen" id="isScreen" class="form-control height40">
<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">
<select name="isMeasure" id="isMeasure" class="form-control height40">
<option value="">测量状态</option>
<option value="Y">已测量</option>
<option value="N">未测量</option>
</select>
</div>
<div class="panel-col">
<select name="gender" id="gender" tabindex="-1" title="" class="form-control height40">
<select name="gender" id="gender" class="form-control height40">
<option value="-1">选择性别</option>
<option value="1"></option>
<option value="2"></option>
<option value="3">通用</option>
</select>
</div>
<!-- <div class="panel-col">
<select name="maxSortId" id="maxSortId" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择一级类目</option>
</select>
</div>
<div class="panel-col">
<select name="middleSortId" id="middleSortId" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择二级类目</option>
<select name="gender" id="skcOnsaleStatus" class="form-control height40">
<option value="-1">SKC是否上架</option>
<option value="1"></option>
<option value="0"></option>
</select>
</div>
<div class="panel-col">
<select name="smallSortId" id="smallSortId" tabindex="-1" title="" class="form-control height40">
<option value="-1">请选择三级类目</option>
<select name="gender" id="isAdvance" class="form-control height40">
<option value="-1">是否预售</option>
<option value="1"></option>
<option value="0"></option>
</select>
</div> -->
</div>
<div class="panel-col2">
<div id="sortTree"></div>
</div>
... ...
... ... @@ -134,14 +134,6 @@
<blockquote>上架必填</blockquote>
</div>
<div class="form-group">
<!-- <div class="col-sm-2 height40">商品短评<i class="red">*</i>:</div>
<div class="col-sm-8 height40">
[[if renderType=='edit']]
<input id="phrase" class="form-control" placeholder="商品短评" value="[[phrase]]" type="text" required>
[[else]]
<span>[[phrase]]</span>
[[/if]]
</div> -->
<div class="col-sm-12">
<label>商品短评<i class="red">*</i>:</label>
[[if renderType=='edit']]
... ...
... ... @@ -40,13 +40,13 @@
<a href="javascript:;" class="btn btn-default btn-metro">默认</a>
[[/if]]
[[if _item.genderCover==1]]
[[if _item.genderCover==1||_item.genderCover==3]]
<a href="javascript:;" class="btn btn-default btn-metro info">男封</a>
[[else]]
<a href="javascript:;" class="btn btn-default btn-metro">男封</a>
[[/if]]
[[if _item.genderCover==2]]
[[if _item.genderCover==2||_item.genderCover==3]]
<a href="javascript:;" class="btn btn-default btn-metro info">女封</a>
[[else]]
<a href="javascript:;" class="btn btn-default btn-metro">女封</a>
... ... @@ -66,33 +66,12 @@
<div class="fm-side col-sm-2">商品封面:</div>
<div class="cover-goods col-sm-10">
[[if item.isDefault=="Y"]]
<a href="javascript:;" class="btn-goods-cover btn btn-default btn-metro info" data-index=[[index]]>设置默认</a>
<a href="javascript:;" class="btn-goods-cover btn btn-default info" data-index=[[index]]>设置默认</a>
[[else]]
<a href="javascript:;" class="btn-goods-cover btn btn-default btn-metro" data-index=[[index]]>设置默认</a>
<a href="javascript:;" class="btn-goods-cover btn btn-default" data-index=[[index]]>设置默认</a>
[[/if]]
<a href="javascript:;" class="btn-use-img btn btn-default btn-metro" data-productSkc="[[item.productSkc]]" data-index="[[index]]">调用图片</a>
<a href="javascript:;" class="btn-use-img btn btn-default" data-productSkc="[[item.productSkc]]" data-index="[[index]]">调用图片</a>
</div>
</div>
[[/each]]
</script>
<script type="text/template" id="fenmianImgTemp">
<li class="cover-image-item fileinput-button" data-index=[[__index]]>
<div class="goods-img">
<a class="fileinput-button-icon" href="javascript:void(0);"><img src="[[imageUrl]]"></a>
<i class="remove-item-btn glyphicon glyphicon-remove-circle"></i>
</div>
<div class="cover-color">
<a href="javascript:;" class="btn btn-default btn-metro">默认</a>
<a href="javascript:;" class="btn btn-default btn-metro">男封</a>
<a href="javascript:;" class="btn btn-default btn-metro">女封</a>
</div>
</li>
</script>
<!-- <script type="text/template" id="colorCoverTemp">
<div class="cover-color-box height40">
<a href="javascript:;" class="btn btn-default btn-metro">默认</a>
<a href="javascript:;" class="btn btn-default btn-metro">男封</a>
<a href="javascript:;" class="btn btn-default btn-metro">女封</a>
</div>
</script> -->
\ No newline at end of file
... ...