fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit d79fbd95fbecfd7802d4ed43557f83256f3c4ee9 2 parents 67a4d8e8 ffa450db

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

# Conflicts:
#	server/interface/basegoods.js
Inline Side-by-side
Showing 13 changed files with 362 additions and 135 deletions
@@ -63,6 +63,8 @@ var g=new common.grid({ @@ -63,6 +63,8 @@ var g=new common.grid({
63 columns:[ 63 columns:[
64 {display:"分类名称",render:function(item){ 64 {display:"分类名称",render:function(item){
65 var html=[]; 65 var html=[];
  66 + html.push("<p>名称:<input type='text' class='' /><p>");
  67 +
66 html.push("<p>色系:"+item.goodsName+"<p>"); 68 html.push("<p>色系:"+item.goodsName+"<p>");
67 html.push('<button type="button" data-index='+item.__index+' class="sortdelete btn btn-danger btn-xs">删除</button>'); 69 html.push('<button type="button" data-index='+item.__index+' class="sortdelete btn btn-danger btn-xs">删除</button>');
68 return html.join(""); 70 return html.join("");
@@ -3,16 +3,17 @@ var $ = require('jquery'), @@ -3,16 +3,17 @@ var $ = require('jquery'),
3 common=require('../common/common'); 3 common=require('../common/common');
4 4
5 var ENUM={ 5 var ENUM={
6 - status:{0:'待审核',1:'审核通过',2:'驳回',3:'过期',4:'作废'},//全部  
7 - tips:{"0":0,"1":0,"2":0,"3":0,"4":0,"all":0} 6 + status:{toAuditNum:'待审核',failAuditNum:'驳回',passAuditNum:'通过',all:'全部'},//全部
  7 + tips:{"toAuditNum":0,"failAuditNum":0,"passAuditNum":0,"all":""}
8 } 8 }
9 9
10 // 审核状态枚举 10 // 审核状态枚举
11 var AuditEnum = { 11 var AuditEnum = {
12 status:{ 12 status:{
13 - 100:"未审核",  
14 - 200:"审核通过",  
15 - 300:"审核不通过" 13 + toAuditNum:100,
  14 + passAuditNum:200,
  15 + failAuditNum:300,
  16 +
16 } 17 }
17 } 18 }
18 19
@@ -22,7 +23,6 @@ var AgeLevelEnum = { @@ -22,7 +23,6 @@ var AgeLevelEnum = {
22 1:"成人", 23 1:"成人",
23 2:"大童", 24 2:"大童",
24 3:"小童", 25 3:"小童",
25 - "":"未知年龄"  
26 } 26 }
27 } 27 }
28 28
@@ -35,6 +35,16 @@ var GenderEnum = { @@ -35,6 +35,16 @@ var GenderEnum = {
35 } 35 }
36 } 36 }
37 37
  38 +// 性别
  39 +//1可补货，2不可补货 3部分可补货
  40 +var ReplenishEnum = {
  41 + enum: {
  42 + 1: "可补货",
  43 + 2: "不可补货",
  44 + 3: "部分可补货"
  45 + }
  46 +}
  47 +
38 // 商品类型 48 // 商品类型
39 var GoodsTypeEnum = { 49 var GoodsTypeEnum = {
40 type: { 50 type: {
@@ -67,12 +77,10 @@ var t = new common.tab({ @@ -67,12 +77,10 @@ var t = new common.tab({
67 g.reload(1); 77 g.reload(1);
68 }, 78 },
69 columns:[ 79 columns:[
70 - {name:"0",display:"待审核({0})"},  
71 - {name:"1",display:"审核通过({1})"},  
72 - {name:"2",display:"驳回({2})"},  
73 - {name:"3",display:"过期({3})"},  
74 - {name:"4",display:"作废({4})"},  
75 - {name:"all",display:"全部({all})"} 80 + {name:"toAuditNum",display:"待审核({toAuditNum})"},
  81 + {name:"failAuditNum",display:"驳回({failAuditNum})"},
  82 + {name:"passAuditNum",display:"通过({passAuditNum})"},
  83 + {name:"all",display:"全部{all}"}
76 ] 84 ]
77 }).init(ENUM.tips); 85 }).init(ENUM.tips);
78 86
@@ -80,16 +88,25 @@ var t = new common.tab({ @@ -80,16 +88,25 @@ var t = new common.tab({
80 var g = new common.grid({ 88 var g = new common.grid({
81 el: '#basicTable', 89 el: '#basicTable',
82 parms:function(){ 90 parms:function(){
  91 + console.log(t.active);
83 return { 92 return {
84 productSkn:common.util.__input("productSkn"), 93 productSkn:common.util.__input("productSkn"),
  94 + productName: common.util.__input("productName"),
  95 + shopId: common.util.__input("shopId"),
85 brandId:common.util.__input("brandId"), 96 brandId:common.util.__input("brandId"),
86 name:common.util.__input("filter-name"), 97 name:common.util.__input("filter-name"),
87 - reqDepartment:common.util.__input("filter-dep"),  
88 - status: t.active, 98 + isJit: common.util.__input("isJit"),
  99 + isOutLets: common.util.__input("isOutLets"),
  100 + isAdvance: common.util.__input("isAdvance"),
  101 + isAuditing: AuditEnum.status[t.active],
89 sortId: tabTree.selected.length>0?tabTree.selected[tabTree.selected.length-1].id:"" 102 sortId: tabTree.selected.length>0?tabTree.selected[tabTree.selected.length-1].id:""
90 }; 103 };
91 }, 104 },
92 columns:[ 105 columns:[
  106 + {
  107 + display: '',
  108 + type: 'checkbox'
  109 + },
93 {display:"SKN",render:function(item){ 110 {display:"SKN",render:function(item){
94 var html=[]; 111 var html=[];
95 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>'); 112 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({ @@ -101,6 +118,18 @@ var g = new common.grid({
101 118
102 var catgory = item.maxSortName; 119 var catgory = item.maxSortName;
103 120
  121 + if(item.middleSortName) {
  122 + catgory += "/"+item.middleSortName;
  123 + }
  124 +
  125 + if (item.smallSortName) {
  126 + catgory += "/"+item.smallSortName;
  127 + }
  128 +
  129 + if (item.sortName) {
  130 + catgory += "/"+item.sortName;
  131 + }
  132 +
104 html.push("<p>名称："+item.productName+"</p>"); 133 html.push("<p>名称："+item.productName+"</p>");
105 html.push("<p>品牌："+item.brandName+"</p>"); 134 html.push("<p>品牌："+item.brandName+"</p>");
106 html.push("<p>品类："+catgory+"</p>"); 135 html.push("<p>品类："+catgory+"</p>");
@@ -115,7 +144,7 @@ var g = new common.grid({ @@ -115,7 +144,7 @@ var g = new common.grid({
115 144
116 //待审核和驳回列表中只显示吊牌价和销售价，通过的列表中显示四种 145 //待审核和驳回列表中只显示吊牌价和销售价，通过的列表中显示四种
117 if (item.isAuditing === 200) { 146 if (item.isAuditing === 200) {
118 - html.push("<p>是否VIP："+YNEnum.enum(item.isVip)+"</p>"); 147 + html.push("<p>是否VIP："+YNEnum.enum[item.isVip]+"</p>");
119 html.push("<p>yoho币："+item.yohoCoin+"</p>"); 148 html.push("<p>yoho币："+item.yohoCoin+"</p>");
120 } 149 }
121 150
@@ -169,7 +198,7 @@ var g = new common.grid({ @@ -169,7 +198,7 @@ var g = new common.grid({
169 var grade = (item.grade == 1) ? "重点款" : "非重点款"; 198 var grade = (item.grade == 1) ? "重点款" : "非重点款";
170 var limited = (item.isLimited == "Y")? "限量款" : "非限量款"; 199 var limited = (item.isLimited == "Y")? "限量款" : "非限量款";
171 var limitedPurchase = (item.isLimitbuy == "Y")? "限购" : "非限购"; 200 var limitedPurchase = (item.isLimitbuy == "Y")? "限购" : "非限购";
172 - var replenishment = "暂无此字段"; 201 + var replenishment = ReplenishEnum.enum[item.isSupplied];
173 var gender = GenderEnum.gender[item.gender]; 202 var gender = GenderEnum.gender[item.gender];
174 203
175 html.push("<p>"+grade+"</p>"); 204 html.push("<p>"+grade+"</p>");
@@ -191,6 +220,12 @@ var g = new common.grid({ @@ -191,6 +220,12 @@ var g = new common.grid({
191 220
192 {display:"操作",render:function(item){ 221 {display:"操作",render:function(item){
193 var html=[]; 222 var html=[];
  223 +
  224 + if (item.isAuditing) { // 200 审核通过
  225 +
  226 + } else {
  227 +
  228 + }
194 html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn">修改</a>'); 229 html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn">修改</a>');
195 html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn">通过</a>'); 230 html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn">通过</a>');
196 html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn">驳回</a>'); 231 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'); @@ -205,14 +240,16 @@ g.init('/base/goods/ajax/index');
205 $(document).on('click', "#filter-btn", function () { 240 $(document).on('click', "#filter-btn", function () {
206 241
207 g.reload(); 242 g.reload();
  243 + loadTab();
208 }); 244 });
209 245
210 246
211 -var Bll={ 247 +// 通过
  248 +var BllPass={
212 toast:function(content,fn){ 249 toast:function(content,fn){
213 common.dialog.confirm("温馨提示",content,function(){ 250 common.dialog.confirm("温馨提示",content,function(){
214 common.util.__ajax({ 251 common.util.__ajax({
215 - url:'/supplier/index/status', 252 + url:'/base/goods/pass',
216 data:fn() 253 data:fn()
217 },function(){ 254 },function(){
218 g.reload(); 255 g.reload();
@@ -220,28 +257,127 @@ var Bll={ @@ -220,28 +257,127 @@ var Bll={
220 }); 257 });
221 } 258 }
222 } 259 }
223 -//通过 260 +
  261 +// 驳回
  262 +var BllReject={
  263 + toast:function(content,fn){
  264 + common.dialog.confirm("温馨提示",content,function(){
  265 + common.util.__ajax({
  266 + url:'/base/goods/reject',
  267 + data:fn()
  268 + },function(){
  269 + g.reload();
  270 + });
  271 + });
  272 + }
  273 +}
  274 +
  275 +// tab初始化
  276 +var loadTab = function () {
  277 + t.active = undefined;
  278 + setTimeout(function () {
  279 + common.util.__ajax({
  280 + url:"/base/goods/ajax/auditCount",
  281 + data:g.options.parms()
  282 + }, function (res) {
  283 + var __dt=$.extend({},ENUM.tips,res.data);
  284 + t.init(__dt);
  285 + }, true);
  286 + }, 400);
  287 +}
  288 +
  289 +loadTab();
  290 +
  291 +//单个通过
224 $(document).on("click",".apply-success",function(){ 292 $(document).on("click",".apply-success",function(){
225 var item=g.rows[$(this).data("index")]; 293 var item=g.rows[$(this).data("index")];
226 var data=function(){ 294 var data=function(){
227 return { 295 return {
228 - id:item.id 296 + productSknList:JSON.stringify([item.productSku]),
229 }; 297 };
230 } 298 }
231 - Bll.toast("你确定审核通过吗？",data); 299 + BllPass.toast("你确定审核通过吗？",data);
232 }); 300 });
233 -//驳回 301 +
  302 +//单个驳回
234 $(document).on("click",".apply-back",function(){ 303 $(document).on("click",".apply-back",function(){
235 var item=g.rows[$(this).data("index")]; 304 var item=g.rows[$(this).data("index")];
236 var data=function(){ 305 var data=function(){
  306 +
  307 + var reason = $('#reason').val();
  308 + if (reason === '' || $.trim(reason) === '') {
  309 + return "请填写驳回原因";
  310 + }
  311 +
237 return { 312 return {
238 - id:item.id 313 + productSknList:JSON.stringify([item.productSku]),
  314 + rejectReason:reason
239 }; 315 };
240 } 316 }
241 - Bll.toast($("#template").html(),data); 317 + BllReject.toast($("#template").html(),data);
242 }); 318 });
243 319
244 320
  321 +//批量驳回
  322 +$(document).on("click","#reject-btn",function(){
  323 +
  324 + var selectedArr = g.selected,
  325 + len = selectedArr.length,
  326 + sknList = [];
  327 + if (len <= 0) {
  328 + common.util.__tip('请选择要驳回的商品', 'warning');
  329 + return;
  330 + }
  331 +
  332 + var data=function(){
  333 + var reason = $('#reason').val();
  334 + if (reason === '' || $.trim(reason) === '') {
  335 + return "请填写驳回原因";
  336 + }
  337 +
  338 + $.each(selectedArr, function(i, value) {
  339 + sknList.push(value['productSkn']);
  340 +
  341 + });
  342 +
  343 + console.log(sknList);
  344 +
  345 + return {
  346 + productSknList:JSON.stringify(sknList),
  347 + targetStatus:3, // 驳回
  348 + rejectReason: reason
  349 + };
  350 + }
  351 + BllReject.toast($("#template").html(),data);
  352 +});
  353 +
  354 +//批量通过
  355 +$(document).on("click","#pass-btn",function(){
  356 +
  357 + var selectedArr = g.selected,
  358 + len = selectedArr.length,
  359 + sknList = [];
  360 + if (len <= 0) {
  361 + common.util.__tip('请选择审核通过的商品', 'warning');
  362 + return;
  363 + }
  364 +
  365 + var data=function(){
  366 +
  367 + $.each(selectedArr, function(i, value) {
  368 + sknList.push(value['productSkn']);
  369 +
  370 + });
  371 +
  372 + console.log(sknList);
  373 +
  374 + return {
  375 + productSknList:JSON.stringify(sknList),
  376 + };
  377 + }
  378 + BllPass.toast("确定要通过该申请吗？",data);
  379 +});
  380 +
245 // 时间转化 381 // 时间转化
246 Date.prototype.format = function(format) { 382 Date.prototype.format = function(format) {
247 var date = { 383 var date = {
@@ -53,16 +53,23 @@ new common.dropDown({ @@ -53,16 +53,23 @@ new common.dropDown({
53 }); 53 });
54 54
55 55
  56 +var editPostion = '';
  57 +
56 var t = new common.tab({ 58 var t = new common.tab({
57 el: "#basicTab", 59 el: "#basicTab",
58 click: function() { 60 click: function() {
59 g.options.columns[11].hidden = true; 61 g.options.columns[11].hidden = true;
60 g.options.columns[8].hidden = true; 62 g.options.columns[8].hidden = true;
61 - if ($(this).find('a').attr('columnname') == 3) { 63 + var columnname = $(this).find('a').attr('columnname');
  64 + if (columnname == 3) {
62 g.options.columns[11].hidden = false; 65 g.options.columns[11].hidden = false;
63 - } else if ($(this).find('a').attr('columnname') == 2) { 66 + } else if (columnname == 2) {
64 g.options.columns[8].hidden = false; 67 g.options.columns[8].hidden = false;
65 }; 68 };
  69 +
  70 + if (columnname == 1 || columnname == 2) {
  71 + editPostion = '#position9';
  72 + }
66 g.init($("#gridurl").val()); 73 g.init($("#gridurl").val());
67 }, 74 },
68 columns: [{ 75 columns: [{
@@ -133,7 +140,10 @@ var g = new common.grid({ @@ -133,7 +140,10 @@ var g = new common.grid({
133 type: 'checkbox' 140 type: 'checkbox'
134 }, { 141 }, {
135 display: 'skn', 142 display: 'skn',
136 - name: 'productSkn' 143 + name: 'productSkn',
  144 + render: function(item) {
  145 + return '<a href="/goods/netsale/info/' + item.productSkn + editPostion + '">' + item.productSkn + '</a>'
  146 + }
137 }, { 147 }, {
138 display: '图片', 148 display: '图片',
139 name: 'picImgUrl', 149 name: 'picImgUrl',
@@ -152,7 +162,7 @@ var g = new common.grid({ @@ -152,7 +162,7 @@ var g = new common.grid({
152 render: function(item) { 162 render: function(item) {
153 return '<p><strong>吊牌价：</strong>' + item.retailPrice + '</p>' + 163 return '<p><strong>吊牌价：</strong>' + item.retailPrice + '</p>' +
154 '<p><strong>销售价：</strong>' + item.salesPrice + '</p>' + 164 '<p><strong>销售价：</strong>' + item.salesPrice + '</p>' +
155 - '<p><strong>是否VIP：</strong></p>' + 165 + '<p><strong>是否VIP：</strong></p>' + item.isVIP + '</p>' +
156 '<p style="color: #ccc;"><strong>yoho币：</strong>' + item.returnCoin + '</p>'; 166 '<p style="color: #ccc;"><strong>yoho币：</strong>' + item.returnCoin + '</p>';
157 } 167 }
158 }, { 168 }, {
@@ -174,10 +184,10 @@ var g = new common.grid({ @@ -174,10 +184,10 @@ var g = new common.grid({
174 display: '搜索/标签', 184 display: '搜索/标签',
175 hidden: true, 185 hidden: true,
176 render: function(item) { 186 render: function(item) {
177 - return '关键词：' + '<br>' + 187 + return '关键词：' + item.searchAndLabel + '<br>' +
178 '风格：' + item.style + '<br>' + 188 '风格：' + item.style + '<br>' +
179 - '纹理：' + item.style + '<br>' +  
180 - '工艺：' + item.style + '<br>'; 189 + '纹理：' + item.pattern + '<br>' +
  190 + '工艺：' + item.makeCrafts + '<br>';
181 } 191 }
182 }, { 192 }, {
183 display: '操作信息', 193 display: '操作信息',
@@ -190,6 +200,7 @@ var g = new common.grid({ @@ -190,6 +200,7 @@ var g = new common.grid({
190 if (item.editTime) { 200 if (item.editTime) {
191 html += '<p>' + item.editTime + '</p>'; 201 html += '<p>' + item.editTime + '</p>';
192 } 202 }
  203 +
193 return html; 204 return html;
194 } 205 }
195 }, { 206 }, {
@@ -201,6 +212,9 @@ var g = new common.grid({ @@ -201,6 +212,9 @@ var g = new common.grid({
201 if (item.shelveTime) { 212 if (item.shelveTime) {
202 html += '<br>上架时间：' + item.shelveTime; 213 html += '<br>上架时间：' + item.shelveTime;
203 } 214 }
  215 + if (item.status == 3 || item.status == 6) {
  216 + html += '<p style="color:red;">(' + item.rejectReason + ')</p>'
  217 + }
204 return html; 218 return html;
205 } 219 }
206 }, { 220 }, {
@@ -215,13 +229,13 @@ var g = new common.grid({ @@ -215,13 +229,13 @@ var g = new common.grid({
215 var HtmArr = []; 229 var HtmArr = [];
216 230
217 if (item.status == 1) { 231 if (item.status == 1) {
218 - HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + '" class="btn btn-info btn-xs edit-btn">编辑</a>'); 232 + HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
219 HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-skn="' + item.productSkn + '">下架</a>'); 233 HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-skn="' + item.productSkn + '">下架</a>');
220 } else if (item.status != 2 && item.status != 5) { 234 } else if (item.status != 2 && item.status != 5) {
221 - HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + '" class="btn btn-info btn-xs edit-btn">编辑</a>'); 235 + HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
222 HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-skn="' + item.productSkn + '">上架</a>'); 236 HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-skn="' + item.productSkn + '">上架</a>');
223 } 237 }
224 - HtmArr.push('<a href="/goods/netsale/info/' + item.productSkn + '" class="btn btn-info btn-xs info-btn">查看</a>'); 238 + HtmArr.push('<a href="/goods/netsale/info/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs info-btn">查看</a>');
225 return HtmArr.join(''); 239 return HtmArr.join('');
226 } 240 }
227 }] 241 }]
@@ -273,6 +287,8 @@ function shelveModal(title, html) { @@ -273,6 +287,8 @@ function shelveModal(title, html) {
273 if (res.data.code == 200) { 287 if (res.data.code == 200) {
274 e.$tip(res.data.message, function() { 288 e.$tip(res.data.message, function() {
275 shelveLayer.close(); 289 shelveLayer.close();
  290 + loadtab();
  291 + g.reload();
276 }, 'growl-success'); 292 }, 'growl-success');
277 } else { 293 } else {
278 e.$tip(res.data.message); 294 e.$tip(res.data.message);
@@ -41,7 +41,9 @@ var basicInfohtml = '', @@ -41,7 +41,9 @@ var basicInfohtml = '',
41 1: '普通', 41 1: '普通',
42 2: '赠品' 42 2: '赠品'
43 } 43 }
44 - }; 44 + },
  45 + basicInfo = NETSALEDATA.baseProductInfo.baseProduct || '',
  46 + productExtBo = NETSALEDATA.productExtBo || '';
45 47
46 /* 48 /*
47 * 基本信息value值转换 49 * 基本信息value值转换
@@ -56,7 +58,7 @@ function convert(basicInfo, obj) { @@ -56,7 +58,7 @@ function convert(basicInfo, obj) {
56 return basicInfo; 58 return basicInfo;
57 } 59 }
58 60
59 -var basicInfoData = convert(NETSALEDATA.baseProductInfo.baseProduct, convertObj); 61 +var basicInfoData = convert(basicInfo, convertObj);
60 62
61 //基本信息 63 //基本信息
62 basicInfoData.renderType = $('.contentpanel').data('type'); 64 basicInfoData.renderType = $('.contentpanel').data('type');
@@ -69,9 +71,10 @@ $('#goods-table').html(common.util.__template2($('#goodsList').html(), { @@ -69,9 +71,10 @@ $('#goods-table').html(common.util.__template2($('#goodsList').html(), {
69 })); 71 }));
70 72
71 //上架必填 73 //上架必填
72 -NETSALEDATA.productExtBo.renderType = $('.contentpanel').data('type');  
73 -NETSALEDATA.productExtBo.sellChannels = NETSALEDATA.productExtBo.sellChannels.replace(/,/g, "|");  
74 -$('#product-ext').html(common.util.__template2($('#productExtBoTemp').html(), NETSALEDATA.productExtBo)); 74 +productExtBo.renderType = $('.contentpanel').data('type');
  75 +productExtBo.sellChannels = productExtBo.sellChannels ? productExtBo.sellChannels.replace(/,/g, "|") : '';
  76 +$('#product-ext').html(common.util.__template2($('#productExtBoTemp').html(), productExtBo));
  77 +
75 78
76 79
77 if ($('.contentpanel').data('type') == 'info') { 80 if ($('.contentpanel').data('type') == 'info') {
@@ -30,12 +30,16 @@ common.util.__ajax({ @@ -30,12 +30,16 @@ common.util.__ajax({
30 })); 30 }));
31 31
32 if (NETSALEDATA.brandRelationList) { 32 if (NETSALEDATA.brandRelationList) {
33 - $('#brandWrap').html(common.util.__template2($('#brandWrap').html(), { 33 + $('.selected-brand').html(common.util.__template2($('#brandShowTemp').html(), {
34 brandRelationList: NETSALEDATA.brandRelationList, 34 brandRelationList: NETSALEDATA.brandRelationList,
35 brandRelation: brandSelectArr.join('|') 35 brandRelation: brandSelectArr.join('|')
36 })); 36 }));
37 }; 37 };
38 e.init(); 38 e.init();
  39 + if ($('.contentpanel').data('type') == 'info') {
  40 + $('.brand-list').find('input').attr('disabled', true);
  41 + }
  42 +
39 }, true); 43 }, true);
40 44
41 $.each(NETSALEDATA.brandRelationList, function(index, value) { 45 $.each(NETSALEDATA.brandRelationList, function(index, value) {
@@ -15,7 +15,7 @@ if(window.NETSALEDATA&&window.NETSALEDATA.baseProductInfo&&window.NETSALEDATA.ba @@ -15,7 +15,7 @@ if(window.NETSALEDATA&&window.NETSALEDATA.baseProductInfo&&window.NETSALEDATA.ba
15 window.UMdescriptioner = UM.getEditor('edit-descriptioner'); 15 window.UMdescriptioner = UM.getEditor('edit-descriptioner');
16 16
17 /*商品描述*/ 17 /*商品描述*/
18 -if(window.NETSALEDATA&&window.NETSALEDATA.productExtBo.productDesc){ 18 +if(window.NETSALEDATA&&window.NETSALEDATA.productExtBo.productDesc&&window.NETSALEDATA.productExtBo.productDesc){
19 UMdescriptioner.setContent(window.NETSALEDATA.productExtBo.productDesc) 19 UMdescriptioner.setContent(window.NETSALEDATA.productExtBo.productDesc)
20 } 20 }
21 $(document).on("click","#btn-descriptioner",function(){ 21 $(document).on("click","#btn-descriptioner",function(){
@@ -32,7 +32,7 @@ $(document).on("click","#btn-descriptioner",function(){ @@ -32,7 +32,7 @@ $(document).on("click","#btn-descriptioner",function(){
32 32
33 window.UMrecommender = UM.getEditor('edit-recommender'); 33 window.UMrecommender = UM.getEditor('edit-recommender');
34 /*小编推荐*/ 34 /*小编推荐*/
35 -if(window.NETSALEDATA&&window.NETSALEDATA.productExtBo){ 35 +if(window.NETSALEDATA&&window.NETSALEDATA.productExtBo&&window.NETSALEDATA.productExtBo.recommend){
36 UMrecommender.setContent(window.NETSALEDATA.productExtBo.recommend); 36 UMrecommender.setContent(window.NETSALEDATA.productExtBo.recommend);
37 } 37 }
38 $(document).on("click","#btn-recommand",function(){ 38 $(document).on("click","#btn-recommand",function(){
@@ -10,15 +10,45 @@ exports.res = [ @@ -10,15 +10,45 @@ exports.res = [
10 iscreate:true 10 iscreate:true
11 } 11 }
12 }, 12 },
  13 +
  14 + {
  15 + // 列表头部各个审核状态的数量
  16 + route:'/base/goods/ajax/auditCount',
  17 + method:'POST',
  18 + url:'/product/getbaseProductCountByStatus',
  19 + params:[
  20 + {name: 'supplierId',type:'Number'},
  21 + {name: 'productSkn',type: 'Number'},
  22 + {name: 'productName',type: 'String'},
  23 + {name: 'founder',type:'Number'},
  24 + {name: 'shopId',type: 'Number'},
  25 + {name: 'brandId',type: 'Number'},
  26 +
  27 + {name: 'isOutLets',type:'String'},
  28 + {name: 'isAdvance',type:'String'},
  29 +
  30 + {name: 'gender',type:'String'},
  31 + {name: 'isJit',type:'String'},
  32 +
  33 + {name: 'maxSortId',type:'Number'},
  34 + {name: 'middleSortId',type: 'Number'},
  35 + {name: 'smallSortId',type: 'Number'},
  36 + {name: 'sortId',type: 'Number'},
  37 +
  38 + {name: 'page',type: 'Number'},
  39 + {name: 'size',type: 'Number'},
  40 + {name: 'supplierId',type:'Number'},
  41 + {name: 'isAuditing',type:'Number'},
  42 + ]
  43 + },
  44 +
13 {//ajax列表数据 45 {//ajax列表数据
14 route:'/base/goods/ajax/index', 46 route:'/base/goods/ajax/index',
15 method:'POST', 47 method:'POST',
16 url:'/product/getBaseProductList', 48 url:'/product/getBaseProductList',
17 params:[ 49 params:[
18 - {name: 'page',type: 'Number'},  
19 - {name: 'size',type: 'Number'},  
20 - {name: 'supplierId',type:'Number'},  
21 50
  51 + {name: 'supplierId',type:'Number'},
22 {name: 'productSkn',type: 'Number'}, 52 {name: 'productSkn',type: 'Number'},
23 {name: 'productName',type: 'String'}, 53 {name: 'productName',type: 'String'},
24 {name: 'founder',type:'Number'}, 54 {name: 'founder',type:'Number'},
@@ -39,6 +69,8 @@ exports.res = [ @@ -39,6 +69,8 @@ exports.res = [
39 {name: 'page',type: 'Number'}, 69 {name: 'page',type: 'Number'},
40 {name: 'size',type: 'Number'}, 70 {name: 'size',type: 'Number'},
41 {name: 'supplierId',type:'Number'}, 71 {name: 'supplierId',type:'Number'},
  72 + {name: 'isAuditing',type:'Number'},
  73 +
42 ] 74 ]
43 }, 75 },
44 {//添加页面 76 {//添加页面
@@ -121,9 +153,26 @@ exports.res = [ @@ -121,9 +153,26 @@ exports.res = [
121 {name:'productSkn',type:'Number'}, 153 {name:'productSkn',type:'Number'},
122 ] 154 ]
123 }, 155 },
124 - { 156 + {//获取颜色
125 route:'/base/goods/queryProductColors', 157 route:'/base/goods/queryProductColors',
126 method:'POST', 158 method:'POST',
127 url:'/productColor/queryProductColors' 159 url:'/productColor/queryProductColors'
  160 + },
  161 + {
  162 + // 通过
  163 + route:'/base/goods/pass',
  164 + method:'POST',
  165 + url:'/product/batchAuditPassBaseProduct',
  166 + params:[
  167 + {name:'productSknList',type:'Number'},
  168 + ]
  169 + },{
  170 + // 驳回
  171 + route:'/base/goods/reject',
  172 + method:'POST',
  173 + url:'/product/auditRejectBaseProduct',
  174 + params:[
  175 + {name:'productSknList',type:'Number'},
  176 + ]
128 } 177 }
129 ]; 178 ];
1 -exports.domain = require('../config/common.js').domain;  
2 -// exports.domain = 'http://172.16.6.227:8083/yohobuy-platform-web'; //马力 1 +//exports.domain = require('../config/common.js').domain;
  2 +exports.domain = 'http://172.16.6.227:8083/yohobuy-platform-web'; //马力
3 //exports.domain = 'http://172.16.6.236:8080/platform'; //钱军 3 //exports.domain = 'http://172.16.6.236:8080/platform'; //钱军
4 //exports.domain = 'http://172.16.6.162:8088/platform'; //李建 4 //exports.domain = 'http://172.16.6.162:8088/platform'; //李建
5 5
@@ -580,7 +580,7 @@ exports.res = [ @@ -580,7 +580,7 @@ exports.res = [
580 name: 'idName', 580 name: 'idName',
581 type: 'String' 581 type: 'String'
582 }] 582 }]
583 - },{ 583 + }, {
584 //查询通过审核店铺列表接口 584 //查询通过审核店铺列表接口
585 route: '/goods/query/shopPass', 585 route: '/goods/query/shopPass',
586 method: 'POST', 586 method: 'POST',
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 <p> 40 <p>
41 {{#data}} 41 {{#data}}
42 {{#each list}} 42 {{#each list}}
43 - <button type="button" class="btn btn-default sortadd btn-xs" data-id="1">红色(+)</button> 43 + <button type="button" class="btn btn-default sortadd btn-xs" data-id="{{id}}">{{colorName}}(+)</button>
44 {{/each}} 44 {{/each}}
45 {{/data}} 45 {{/data}}
46 </p> 46 </p>
@@ -28,74 +28,80 @@ @@ -28,74 +28,80 @@
28 {{/ iscreate}} 28 {{/ iscreate}}
29 <div class="panel-body"> 29 <div class="panel-body">
30 <div class="row"> 30 <div class="row">
31 - <div class="panel-col">  
32 - <input type="text" id="productSkn" value="" class="form-control" placeholder="SKN" style="height: 39px;" />  
33 - </div>  
34 - <div class="panel-col">  
35 - <input type="text" id="productName" class="form-control" placeholder="商品名称" style="height: 39px;"/>  
36 - </div>  
37 - <div class="panel-col">  
38 - <select id="founder" class="form-control">  
39 - <option value="-1">创建人</option>  
40 - </select>  
41 - </div>  
42 - <div class="panel-col">  
43 - <select id="shopId" class="form-control">  
44 - <option value="-1">请选择店铺</option>  
45 - </select>  
46 - </div>  
47 - <div class="panel-col">  
48 - <select id="brandId" class="form-control">  
49 - <option value="-1">请选择品牌</option>  
50 - </select>  
51 - </div>  
52 - <div class="panel-col">  
53 - <select id="isOutLets" class="form-control">  
54 - <option value="-1">是否奥莱</option>  
55 - <option value="Y">是</option>  
56 - <option value="N">否</option> 31 + <div class="panel-col">
  32 + <input type="text" id="productSkn" value="" class="form-control" placeholder="SKN"
  33 + style="height: 39px;"/>
  34 + </div>
  35 + <div class="panel-col">
  36 + <input type="text" id="productName" class="form-control" placeholder="商品名称" style="height: 39px;"/>
  37 + </div>
  38 + <div class="panel-col">
  39 + <select id="founder" class="form-control">
  40 + <option value="-1">创建人</option>
  41 + </select>
  42 + </div>
  43 + <div class="panel-col">
  44 + <select id="shopId" class="form-control">
  45 + <option value="-1">请选择店铺</option>
  46 + </select>
  47 + </div>
  48 + <div class="panel-col">
  49 + <select id="brandId" class="form-control">
  50 + <option value="-1">请选择品牌</option>
  51 + </select>
  52 + </div>
  53 + <div class="panel-col">
  54 + <select id="isOutLets" class="form-control">
  55 + <option value="-1">是否奥莱</option>
  56 + <option value="Y">是</option>
  57 + <option value="N">否</option>
57 58
58 - </select>  
59 - </div>  
60 - <div class="panel-col">  
61 - <select id="isAdvance" class="form-control">  
62 - <option value="-1">是否预售</option>  
63 - <option value="Y">是</option>  
64 - <option value="N">否</option> 59 + </select>
  60 + </div>
  61 + <div class="panel-col">
  62 + <select id="isAdvance" class="form-control">
  63 + <option value="-1">是否预售</option>
  64 + <option value="Y">是</option>
  65 + <option value="N">否</option>
65 66
66 - </select>  
67 - </div>  
68 - <div class="panel-col">  
69 - <select id="gender" class="form-control">  
70 - <option value="-1">请选择性别</option>  
71 - <option value="1">男</option>  
72 - <option value="2">女</option>  
73 - <option value="3">通用</option> 67 + </select>
  68 + </div>
  69 + <div class="panel-col">
  70 + <select id="gender" class="form-control">
  71 + <option value="-1">请选择性别</option>
  72 + <option value="1">男</option>
  73 + <option value="2">女</option>
  74 + <option value="3">通用</option>
74 75
75 - </select>  
76 - </div> 76 + </select>
  77 + </div>
77 78
78 - <div class="panel-col" style="width:300px">  
79 - <div id="sort"></div>  
80 - </div>  
81 - <div class="panel-col">  
82 - <select id="isJit" class="form-control">  
83 - <option value="-1">是否JIT商品</option>  
84 - <option value="Y">是JIT</option>  
85 - <option value="N">非JIT</option> 79 + <div class="panel-col" style="width:300px">
  80 + <div id="sort"></div>
  81 + </div>
  82 + <div class="panel-col">
  83 + <select id="isJit" class="form-control">
  84 + <option value="-1">是否JIT商品</option>
  85 + <option value="Y">是JIT</option>
  86 + <option value="N">非JIT</option>
86 87
87 - </select>  
88 - </div>  
89 - <div class="panel-col">  
90 - <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>  
91 - <a id="all-btn" href="" class="btn btn-info">全部</a>  
92 - </div> 88 + </select>
  89 + </div>
  90 + <div class="panel-col">
  91 + <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
  92 + <a id="all-btn" href="" class="btn btn-info">全部</a>
  93 + </div>
  94 +
  95 + <div class="panel-col">
  96 + <a id="pass-btn" href="javascript:;" class="btn btn-info">通过</a>
  97 + <a id="reject-btn" href="javascript:;" class="btn btn-info">驳回</a>
  98 + </div>
93 </div> 99 </div>
94 </div> 100 </div>
95 </div> 101 </div>
96 <div class="panel panel-primary-head"> 102 <div class="panel panel-primary-head">
97 <div class="dataTab_wrapper" id="basicTab"></div> 103 <div class="dataTab_wrapper" id="basicTab"></div>
98 - <div class="dataTab_wrapper" id="basicTable" ></div> 104 + <div class="dataTab_wrapper" id="basicTable"></div>
99 </div> 105 </div>
100 </div> 106 </div>
101 107
@@ -103,14 +109,15 @@ @@ -103,14 +109,15 @@
103 <input type="hidden" id="gridurl" value="{{gridurl}}"> 109 <input type="hidden" id="gridurl" value="{{gridurl}}">
104 110
105 <script type="text/template" id="template"> 111 <script type="text/template" id="template">
106 -<div class="rows" style="height: 100px;">  
107 - <div class="form-group">  
108 - <span class="col-sm-2 control-label">驳回原因:</span>  
109 - <div class="col-sm-8">  
110 - <textarea id="bohui" class="form-control" rows="3" ></textarea> 112 + <div class="rows" style="height: 100px;">
  113 + <div class="form-group">
  114 + <span class="col-sm-2 control-label">驳回原因:</span>
  115 +
  116 + <div class="col-sm-8">
  117 + <textarea id="bohui" class="form-control" rows="3"></textarea>
  118 + </div>
111 </div> 119 </div>
112 </div> 120 </div>
113 -</div>  
114 -</div> 121 + </div>
115 </script> 122 </script>
116 123
@@ -57,16 +57,16 @@ @@ -57,16 +57,16 @@
57 </div> 57 </div>
58 <div class="panel-col"> 58 <div class="panel-col">
59 <select name="isScreen" id="isScreen" tabindex="-1" title="" class="form-control height40"> 59 <select name="isScreen" id="isScreen" tabindex="-1" title="" class="form-control height40">
60 - <option value="-1">拍摄状态</option>  
61 - <option value="1">已拍摄</option>  
62 - <option value="0">未拍摄</option> 60 + <option value="">拍摄状态</option>
  61 + <option value="Y">已拍摄</option>
  62 + <option value="N">未拍摄</option>
63 </select> 63 </select>
64 </div> 64 </div>
65 <div class="panel-col"> 65 <div class="panel-col">
66 <select name="isMeasure" id="isMeasure" tabindex="-1" title="" class="form-control height40"> 66 <select name="isMeasure" id="isMeasure" tabindex="-1" title="" class="form-control height40">
67 - <option value="-1">测量状态</option>  
68 - <option value="1">已测量</option>  
69 - <option value="0">未测量</option> 67 + <option value="">测量状态</option>
  68 + <option value="Y">已测量</option>
  69 + <option value="N">未测量</option>
70 </select> 70 </select>
71 </div> 71 </div>
72 <div class="panel-col"> 72 <div class="panel-col">
@@ -104,15 +104,15 @@ @@ -104,15 +104,15 @@
104 </div> 104 </div>
105 <div class="panel-col"> 105 <div class="panel-col">
106 <select name="productStatus" id="productStatus" tabindex="-1" title="" class="form-control height40"> 106 <select name="productStatus" id="productStatus" tabindex="-1" title="" class="form-control height40">
107 - <option value="-1">状态</option>  
108 - <option value="1">待上架</option>  
109 - <option value="0">待审核</option> 107 + <option value="">状态</option>
  108 + <option value="-1">待上架</option>
  109 + <option value="2">待审核</option>
110 <option value="3">驳回</option> 110 <option value="3">驳回</option>
111 - <option value="0">通过</option>  
112 - <option value="1">再次上架待审核</option>  
113 - <option value="0">再次上架驳回</option>  
114 - <option value="1">再次上架通过</option>  
115 - <option value="0">已上架</option> 111 + <option value="4">通过</option>
  112 + <option value="5">再次上架待审核</option>
  113 + <option value="6">再次上架驳回</option>
  114 + <option value="7">再次上架通过</option>
  115 + <option value="1">已上架</option>
116 <option value="0">已下架</option> 116 <option value="0">已下架</option>
117 </select> 117 </select>
118 </div> 118 </div>
@@ -24,12 +24,19 @@ @@ -24,12 +24,19 @@
24 <div class="col-sm-3">店铺：[[shopName]]</div> 24 <div class="col-sm-3">店铺：[[shopName]]</div>
25 <div class="col-sm-3">品牌：[[brandName]]</div> 25 <div class="col-sm-3">品牌：[[brandName]]</div>
26 <div class="col-sm-3">供应商：[[supplierName]]</div> 26 <div class="col-sm-3">供应商：[[supplierName]]</div>
  27 + [[if renderType=='edit']]
27 <div class="col-sm-3">厂家编号：[[factoryCode]]</div> 28 <div class="col-sm-3">厂家编号：[[factoryCode]]</div>
  29 + [[else]]
  30 + <div class="col-sm-3"><img src="[[productImageUrl]]" alt=""></div>
  31 + [[/if]]
28 </div> 32 </div>
29 <div class="form-group"> 33 <div class="form-group">
30 <div class="col-sm-3">品类：</div> 34 <div class="col-sm-3">品类：</div>
31 <div class="col-sm-3">货品年：[[goodsYears]]</div> 35 <div class="col-sm-3">货品年：[[goodsYears]]</div>
32 <div class="col-sm-3">货品季：[[goodsSeason]]</div> 36 <div class="col-sm-3">货品季：[[goodsSeason]]</div>
  37 + [[if renderType=='info']]
  38 + <div class="col-sm-3">厂家编号：[[factoryCode]]</div>
  39 + [[/if]]
33 </div> 40 </div>
34 <div class="form-group"> 41 <div class="form-group">
35 <div class="col-sm-3">SKN：[[productSkn]]</div> 42 <div class="col-sm-3">SKN：[[productSkn]]</div>
@@ -4,15 +4,12 @@ @@ -4,15 +4,12 @@
4 <div class="panel-btns" style="display: none;"> 4 <div class="panel-btns" style="display: none;">
5 <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a> 5 <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
6 </div> 6 </div>
7 - <h2 class="panel-title">商品关联</h2> 7 + <h2 class="panel-title">（商品）品牌关联</h2>
8 </div> 8 </div>
9 <div id="brandWrap" class="panel-body"> 9 <div id="brandWrap" class="panel-body">
10 <div class="form-group selected-brand" style="min-height: 60px;"> 10 <div class="form-group selected-brand" style="min-height: 60px;">
11 - <input id="brandRelationList" type="hidden" value="[[brandRelation]]" for="checkbox">  
12 -  
13 - [[each brandRelationList as a index]]  
14 - <div class="col-sm-2" data-id="[[a.brandId]]">[[a.brandName]]</div>  
15 - [[/each]] 11 +
  12 +
16 </div> 13 </div>
17 <div class="form-group brand-list"> 14 <div class="form-group brand-list">
18 </div> 15 </div>
@@ -36,4 +33,10 @@ @@ -36,4 +33,10 @@
36 </div> 33 </div>
37 </div> 34 </div>
38 [[/each]] 35 [[/each]]
  36 +</script>
  37 +<script type="text/template" id="brandShowTemp">
  38 + <input id="brandRelationList" type="hidden" value="[[brandRelation]]" for="checkbox">
  39 + [[each brandRelationList as a index]]
  40 + <div class="col-sm-2" data-id="[[a.brandId]]">[[a.brandName]]</div>
  41 + [[/each]]
39 </script> 42 </script>