fe / yohobuy-portal-fe · Commits

Go to a project

Authored by liuyue
Commit fb75afa734fe3047b19b6b925327842b11dbab9f 1 parent d0e7cc0b

店铺装修管理

Inline Side-by-side
Showing 7 changed files with 448 additions and 242 deletions
@@ -64,6 +64,7 @@ var t = new common.tab({ @@ -64,6 +64,7 @@ var t = new common.tab({
64 click: function() { 64 click: function() {
65 g.options.columns[11].hidden = true; 65 g.options.columns[11].hidden = true;
66 g.options.columns[8].hidden = true; 66 g.options.columns[8].hidden = true;
  67 + g.options.page = 1;
67 var columnname = $(this).find('a').attr('columnname'); 68 var columnname = $(this).find('a').attr('columnname');
68 if (columnname == 3) { 69 if (columnname == 3) {
69 g.options.columns[11].hidden = false; 70 g.options.columns[11].hidden = false;
@@ -248,7 +249,7 @@ var g = new common.grid({ @@ -248,7 +249,7 @@ var g = new common.grid({
248 } 249 }
249 }, { 250 }, {
250 display: '上架状态', 251 display: '上架状态',
251 - name: 'status', // -1待上架，2待审核，3驳回，4通过，1已上架，0已下架，5再上架待审核，6再上架驳回，7再上架通过。 252 + name: 'status', // 8待上架，2待审核，3驳回，4通过，1已上架，0已下架，5再上架待审核，6再上架驳回，7再上架通过。
252 render: function(item) { 253 render: function(item) {
253 var html = ''; 254 var html = '';
254 if (ENUM.status[item.status]) { 255 if (ENUM.status[item.status]) {
@@ -273,10 +274,10 @@ var g = new common.grid({ @@ -273,10 +274,10 @@ var g = new common.grid({
273 render: function(item) { 274 render: function(item) {
274 var HtmArr = []; 275 var HtmArr = [];
275 276
276 - if (item.status == 4 || item.status == 1 || item.status == 5 || item.status == 0 || item.status == 6) { 277 + if (item.status == 4 || item.status == 1 || item.status == 5 || item.status == 6) {
277 HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>'); 278 HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
278 HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-skn="' + item.productSkn + '">下架</a>'); 279 HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-skn="' + item.productSkn + '">下架</a>');
279 - } else if (item.status == 3 || item.status == 8 || item.status == 2) { 280 + } else if (item.status == 3 || item.status == 8 || item.status == 2 || item.status == 0) {
280 HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>'); 281 HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
281 HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-skn="' + item.productSkn + '">上架</a>'); 282 HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-skn="' + item.productSkn + '">上架</a>');
282 } 283 }
1 'use strict'; 1 'use strict';
2 var $ = require('jquery'), 2 var $ = require('jquery'),
3 - common=require('../../common/common'); 3 + common = require('../../common/common');
4 4
5 -var ENUM={ 5 +var ENUM = {
6 //0已下架，1待上架，2待审核，3驳回，4通过，1已上架，5再上架待审核，6再上架驳回，7再上架通过。 6 //0已下架，1待上架，2待审核，3驳回，4通过，1已上架，5再上架待审核，6再上架驳回，7再上架通过。
7 status: { 7 status: {
8 - '0': '已下架',  
9 - '1': '已上架',  
10 - '2': '待审核',  
11 - '3': '驳回',  
12 - '4': '通过',  
13 - '5': '再上架待审核',  
14 - '6': '再上架驳回',  
15 - '7': '再上架通过',  
16 - '8': '待上架'  
17 - }, 8 + '0': '已下架',
  9 + '1': '已上架',
  10 + '2': '待审核',
  11 + '3': '驳回',
  12 + '4': '通过',
  13 + '5': '再上架待审核',
  14 + '6': '再上架驳回',
  15 + '7': '再上架通过',
  16 + '8': '待上架'
  17 + },
18 //tips:{"0":0,"1":0,"2":0,"3":0,"4":0,"all":0} 18 //tips:{"0":0,"1":0,"2":0,"3":0,"4":0,"all":0}
19 19
20 - enum:{  
21 - 1:'待审核',  
22 - 2:'驳回',  
23 - 3:'通过',  
24 - all:"全部商品" 20 + enum: {
  21 + 1: '待审核',
  22 + 2: '驳回',
  23 + 3: '通过',
  24 + all: "全部商品"
25 }, 25 },
26 - tips:{"1":0,"2":0,"3":0,"all":0} 26 + tips: {
  27 + "1": 0,
  28 + "2": 0,
  29 + "3": 0,
  30 + "all": 0
  31 + }
27 } 32 }
28 33
29 // 审核状态枚举 34 // 审核状态枚举
30 var AuditEnum = { 35 var AuditEnum = {
31 - status:{  
32 - 100:"待审核",  
33 - 200:"审核通过",  
34 - 300:"驳回",  
35 - "":"过期",  
36 - "1":"作废", 36 + status: {
  37 + 100: "待审核",
  38 + 200: "审核通过",
  39 + 300: "驳回",
  40 + "": "过期",
  41 + "1": "作废",
37 42
38 } 43 }
39 } 44 }
@@ -41,10 +46,10 @@ var AuditEnum = { @@ -41,10 +46,10 @@ var AuditEnum = {
41 // 年龄层枚举 46 // 年龄层枚举
42 var AgeLevelEnum = { 47 var AgeLevelEnum = {
43 level: { 48 level: {
44 - 1:"成人",  
45 - 2:"大童",  
46 - 3:"小童",  
47 - "":"未知年龄" 49 + 1: "成人",
  50 + 2: "大童",
  51 + 3: "小童",
  52 + "": "未知年龄"
48 } 53 }
49 } 54 }
50 55
@@ -59,32 +64,53 @@ var GenderEnum = { @@ -59,32 +64,53 @@ var GenderEnum = {
59 64
60 // 商品类型 65 // 商品类型
61 var GoodsTypeEnum = { 66 var GoodsTypeEnum = {
62 - type: {  
63 - 1:"普通商品",  
64 - 2:"赠品",  
65 - 3:"虚拟商品",  
66 - "":"未知类型" 67 + type: {
  68 + 1: "普通商品",
  69 + 2: "赠品",
  70 + 3: "虚拟商品",
  71 + "": "未知类型"
  72 + }
67 } 73 }
68 -}  
69 -/*下拉选择*/  
70 -new common.dropDown({el:"#shopId",ajax:"queryShop"});  
71 -new common.dropDown({el:"#brandId",ajax:"queryBrand"});  
72 -new common.dropDown({el:"#founder",ajax:"querySupplier"}); 74 + /*下拉选择*/
  75 +new common.dropDown({
  76 + el: "#shopId",
  77 + ajax: "queryShop"
  78 +});
  79 +new common.dropDown({
  80 + el: "#brandId",
  81 + ajax: "queryBrand"
  82 +});
  83 +new common.dropDown({
  84 + el: "#founder",
  85 + ajax: "querySupplier"
  86 +});
73 87
74 -new common.dropDown({el:"#isJit",ajax:""});  
75 -new common.dropDown({el:"#gender",ajax:""});  
76 -new common.dropDown({el:"#isJit",ajax:""});  
77 -new common.dropDown({el:"#size",ajax:""}); 88 +new common.dropDown({
  89 + el: "#isJit",
  90 + ajax: ""
  91 +});
  92 +new common.dropDown({
  93 + el: "#gender",
  94 + ajax: ""
  95 +});
  96 +new common.dropDown({
  97 + el: "#isJit",
  98 + ajax: ""
  99 +});
  100 +new common.dropDown({
  101 + el: "#size",
  102 + ajax: ""
  103 +});
78 104
79 105
80 -var tabTree=new common.tabTree("#sort"); 106 +var tabTree = new common.tabTree("#sort");
81 tabTree.init(); 107 tabTree.init();
82 108
83 109
84 110
85 var t = new common.tab({ 111 var t = new common.tab({
86 - el:"#basicTab",  
87 - click:function(){ 112 + el: "#basicTab",
  113 + click: function() {
88 114
89 var columnname = $(this).find('a').attr('columnname'); 115 var columnname = $(this).find('a').attr('columnname');
90 console.log("columnname = " + columnname); 116 console.log("columnname = " + columnname);
@@ -92,34 +118,37 @@ var t = new common.tab({ @@ -92,34 +118,37 @@ var t = new common.tab({
92 // 选择【全部商品】 118 // 选择【全部商品】
93 if (columnname == "all") { 119 if (columnname == "all") {
94 g.options.columns[10].hidden = false; //显示【审核状态】 120 g.options.columns[10].hidden = false; //显示【审核状态】
95 - g.options.columns[12].hidden = true; // 121 + g.options.columns[12].hidden = true; //
96 } else { 122 } else {
97 g.options.columns[10].hidden = true; 123 g.options.columns[10].hidden = true;
98 124
99 if (columnname == 2) { 125 if (columnname == 2) {
100 - g.options.columns[12].hidden = false;// 显示【驳回原因】 126 + g.options.columns[12].hidden = false; // 显示【驳回原因】
101 } else 127 } else
102 128
103 129
104 - switch (columnname) { 130 + switch (columnname) {
105 131
106 case 1: 132 case 1:
107 - case 3: { // 待审核, 通过  
108 - g.options.columns[10].hidden = true;  
109 - g.options.columns[12].hidden = true;  
110 - } 133 + case 3:
  134 + { // 待审核, 通过
  135 + g.options.columns[10].hidden = true;
  136 + g.options.columns[12].hidden = true;
  137 + }
111 break; 138 break;
112 139
113 - case 2: { // 驳回  
114 - g.options.columns[10].hidden = true;  
115 - g.options.columns[12].hidden = false;  
116 - } 140 + case 2:
  141 + { // 驳回
  142 + g.options.columns[10].hidden = true;
  143 + g.options.columns[12].hidden = false;
  144 + }
117 break; 145 break;
118 146
119 - default : {  
120 - g.options.columns[10].hidden = true;  
121 - g.options.columns[12].hidden = true;  
122 - } 147 + default:
  148 + {
  149 + g.options.columns[10].hidden = true;
  150 + g.options.columns[12].hidden = true;
  151 + }
123 152
124 } 153 }
125 154
@@ -127,59 +156,53 @@ var t = new common.tab({ @@ -127,59 +156,53 @@ var t = new common.tab({
127 156
128 g.init('/supplier/baseproduct/ajax/index'); 157 g.init('/supplier/baseproduct/ajax/index');
129 }, 158 },
130 - columns:[  
131 - {  
132 - name:"1",  
133 - display:"待审核({1})",  
134 - value:'2,5'  
135 - },  
136 - {  
137 - name:"2",  
138 - display:"驳回({2})",  
139 - value:'3,6'  
140 - },  
141 - {  
142 - name:"3",  
143 - display:"通过({3})",  
144 - value:'4,7'  
145 - },  
146 - {  
147 - name:"all",  
148 - display:"全部商品",  
149 - value:'2,3,4,5,6,7'  
150 - }  
151 - ] 159 + columns: [{
  160 + name: "1",
  161 + display: "待审核({1})",
  162 + value: '2,5'
  163 + }, {
  164 + name: "2",
  165 + display: "驳回({2})",
  166 + value: '3,6'
  167 + }, {
  168 + name: "3",
  169 + display: "通过({3})",
  170 + value: '4,7'
  171 + }, {
  172 + name: "all",
  173 + display: "全部商品",
  174 + value: '2,3,4,5,6,7'
  175 + }]
152 }).init(ENUM.tips); 176 }).init(ENUM.tips);
153 177
154 178
155 var g = new common.grid({ 179 var g = new common.grid({
156 el: '#basicTable', 180 el: '#basicTable',
157 - parms:function(){  
158 - return {  
159 - productSkn:common.util.__input("productSkn"),  
160 - productSkc:common.util.__input("productSkc"),  
161 - productSku:common.util.__input("productSku"), 181 + parms: function() {
  182 + return {
  183 + productSkn: common.util.__input("productSkn"),
  184 + productSkc: common.util.__input("productSkc"),
  185 + productSku: common.util.__input("productSku"),
162 productName: common.util.__input("productName"), 186 productName: common.util.__input("productName"),
163 shopId: common.util.__input("shopId"), 187 shopId: common.util.__input("shopId"),
164 - brandId:common.util.__input("brandId"), 188 + brandId: common.util.__input("brandId"),
165 isJit: common.util.__input("isJit"), 189 isJit: common.util.__input("isJit"),
166 gender: common.util.__input("gender"), 190 gender: common.util.__input("gender"),
167 - maxSortId: tabTree.selected.length>0?tabTree.selected[0].id:"", // 一级类目  
168 - middleSortId: tabTree.selected.length>1?tabTree.selected[1].id:"", // 二级类目  
169 - smallSortId: tabTree.selected.length>2?tabTree.selected[2].id:"", // 三级类目 191 + maxSortId: tabTree.selected.length > 0 ? tabTree.selected[0].id : "", // 一级类目
  192 + middleSortId: tabTree.selected.length > 1 ? tabTree.selected[1].id : "", // 二级类目
  193 + smallSortId: tabTree.selected.length > 2 ? tabTree.selected[2].id : "", // 三级类目
170 size: common.util.__input("size"), 194 size: common.util.__input("size"),
171 - productStatusStr:t.value?t.value: '2,3,4,5,6,7' 195 + productStatusStr: t.value ? t.value : '2,3,4,5,6,7'
172 196
173 }; 197 };
174 }, 198 },
175 - columns:[  
176 - { 199 + columns: [{
177 display: '', 200 display: '',
178 type: 'checkbox' 201 type: 'checkbox'
179 }, { 202 }, {
180 display: 'SKN', 203 display: 'SKN',
181 name: 'productSkn' 204 name: 'productSkn'
182 - },{ 205 + }, {
183 display: '图片', 206 display: '图片',
184 name: 'picImgUrl', 207 name: 'picImgUrl',
185 render: function(item) { 208 render: function(item) {
@@ -191,18 +214,19 @@ var g = new common.grid({ @@ -191,18 +214,19 @@ var g = new common.grid({
191 { 214 {
192 display: '商品信息', 215 display: '商品信息',
193 render: function(item) { 216 render: function(item) {
194 - return '<p><strong>名称：</strong>' + filterNull(item,'productName') + '</p>' +  
195 - '<p><strong>品牌：</strong>' + filterNull(item,'brandName') + '</p>' +  
196 - '<p><strong>类目：</strong>' + filterNull(item,'maxSortName') + '/' + filterNull(item,'middleSortName') + '</p>'; 217 + return '<p><strong>名称：</strong>' + filterNull(item, 'productName') + '</p>' +
  218 + '<p><strong>品牌：</strong>' + filterNull(item, 'brandName') + '</p>' +
  219 + '<p><strong>类目：</strong>' + filterNull(item, 'maxSortName') + '/' + filterNull(item, 'middleSortName') + '</p>';
197 } 220 }
198 }, 221 },
199 222
200 - {display:"售价", 223 + {
  224 + display: "售价",
201 render: function(item) { 225 render: function(item) {
202 - return '<p><strong>吊牌价：</strong>' + filterNull(item,'retailPrice') + '</p>' +  
203 - '<p><strong>销售价：</strong>' + filterNull(item,'salesPrice') + '</p>' + 226 + return '<p><strong>吊牌价：</strong>' + filterNull(item, 'retailPrice') + '</p>' +
  227 + '<p><strong>销售价：</strong>' + filterNull(item, 'salesPrice') + '</p>' +
204 '<p><strong>是否VIP：</strong></p>' + 228 '<p><strong>是否VIP：</strong></p>' +
205 - '<p style="color: #ccc;"><strong>yoho币：</strong>' + filterNull(item,'returnCoin') + '</p>'; 229 + '<p style="color: #ccc;"><strong>yoho币：</strong>' + filterNull(item, 'returnCoin') + '</p>';
206 } 230 }
207 231
208 }, 232 },
@@ -212,114 +236,131 @@ var g = new common.grid({ @@ -212,114 +236,131 @@ var g = new common.grid({
212 name: 'stock' 236 name: 'stock'
213 }, 237 },
214 238
215 - {display:"年龄层/性别",render:function(item){  
216 - var html=[];  
217 - var ageLevel = AgeLevelEnum.level[item.ageLevel];  
218 - var gender = GenderEnum.gender[item.gender];  
219 - html.push("<p>"+ageLevel+" / "+gender+"</p>");  
220 -  
221 - return html.join('');  
222 - }},  
223 -  
224 - {display:"预售/奥莱",render:function(item){ 239 + {
  240 + display: "年龄层/性别",
  241 + render: function(item) {
  242 + var html = [];
  243 + var ageLevel = AgeLevelEnum.level[item.ageLevel];
  244 + var gender = GenderEnum.gender[item.gender];
  245 + html.push("<p>" + ageLevel + " / " + gender + "</p>");
225 246
226 - var html=[];  
227 - //判断是否是预售商品  
228 - if (item.isAdvance === "Y") {  
229 - html.push("<p>预售</p>");  
230 - } else {  
231 - html.push("<p>否</p>"); 247 + return html.join('');
232 } 248 }
  249 + },
233 250
234 - if (item.isOutLets == "Y") {  
235 - html.push( "<p>/奥莱</p>");  
236 - } else {  
237 - html.push( "<p>/否</p>");  
238 - } 251 + {
  252 + display: "预售/奥莱",
  253 + render: function(item) {
239 254
240 - return html.join('');  
241 - }}, 255 + var html = [];
  256 + //判断是否是预售商品
  257 + if (item.isAdvance === "Y") {
  258 + html.push("<p>预售</p>");
  259 + } else {
  260 + html.push("<p>否</p>");
  261 + }
242 262
  263 + if (item.isOutLets == "Y") {
  264 + html.push("<p>/奥莱</p>");
  265 + } else {
  266 + html.push("<p>/否</p>");
  267 + }
243 268
  269 + return html.join('');
  270 + }
  271 + },
244 272
245 273
246 - {display:"上架时间",render: function (item) { 274 +
  275 + {
  276 + display: "上架时间",
  277 + render: function(item) {
247 278
248 279
249 - return "<p>"+filterNull(item, 'shelveTime')+"</p>";  
250 - }},  
251 - {display:"商品类别", render: function(item) {  
252 - var type = GoodsTypeEnum.type[item.attribute] ? GoodsTypeEnum.type[item.attribute]:"未知类型";  
253 - return "<p>"+type+"</p>"  
254 - }}, 280 + return "<p>" + filterNull(item, 'shelveTime') + "</p>";
  281 + }
  282 + }, {
  283 + display: "商品类别",
  284 + render: function(item) {
  285 + var type = GoodsTypeEnum.type[item.attribute] ? GoodsTypeEnum.type[item.attribute] : "未知类型";
  286 + return "<p>" + type + "</p>"
  287 + }
  288 + },
255 289
256 // 审核状态（全部商品是显示） 10 290 // 审核状态（全部商品是显示） 10
257 - {display:"审核状态",render:function(item){  
258 - var html=[];  
259 - html.push("<p>"+ENUM.status[item.status]+"</p>"); 291 + {
  292 + display: "审核状态",
  293 + render: function(item) {
  294 + var html = [];
  295 + html.push("<p>" + ENUM.status[item.status] + "</p>");
260 296
261 - if (item.status == 3 || item.status == 6) {  
262 - html.push("<p style='color:red;'>"+filterNull(item,'rejectReason')+"</p>");  
263 - } 297 + if (item.status == 3 || item.status == 6) {
  298 + html.push("<p style='color:red;'>" + filterNull(item, 'rejectReason') + "</p>");
  299 + }
264 300
265 301
266 302
267 - return html.join('');  
268 - }}, 303 + return html.join('');
  304 + }
  305 + },
269 306
270 - {display:"操作信息",render:function(item){  
271 - var html=[];  
272 - html.push("<p>"+filterNull(item,'founderName')+"</p>");  
273 - html.push("<p>"+filterNull(item,'editTime')+"</p>"); 307 + {
  308 + display: "操作信息",
  309 + render: function(item) {
  310 + var html = [];
  311 + html.push("<p>" + filterNull(item, 'founderName') + "</p>");
  312 + html.push("<p>" + filterNull(item, 'editTime') + "</p>");
274 313
275 - return html.join('');  
276 - }},  
277 - {  
278 - // 12 314 + return html.join('');
  315 + }
  316 + }, {
  317 + // 12
279 display: '驳回原因', 318 display: '驳回原因',
280 - hidden: true, 319 + hidden: true,
281 name: 'status', // 8待上架，2待审核，3驳回，4通过，1已上架，0已下架，5再上架待审核，6再上架驳回，7再上架通过 320 name: 'status', // 8待上架，2待审核，3驳回，4通过，1已上架，0已下架，5再上架待审核，6再上架驳回，7再上架通过
282 render: function(item) { 321 render: function(item) {
283 var html = ''; 322 var html = '';
284 html += ENUM.status[item.status]; 323 html += ENUM.status[item.status];
285 if (item.status == 3 || item.status == 6) { 324 if (item.status == 3 || item.status == 6) {
286 - html += '<p style="color:red;">' + filterNull(item,'rejectReason') + '</p>' 325 + html += '<p style="color:red;">' + filterNull(item, 'rejectReason') + '</p>'
287 } 326 }
288 return html; 327 return html;
289 } 328 }
290 - },  
291 - {display:"操作",render:function(item){  
292 - var html=[]; 329 + }, {
  330 + display: "操作",
  331 + render: function(item) {
  332 + var html = [];
293 333
294 334
295 - //html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn" id="btn-item-info">查看</a>');  
296 - html.push('<a href="/goods/audit/info/' + item.productSkn + '" class="btn btn-info btn-xs info-btn">查看</a>'); 335 + //html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn btn-info btn-xs edit-class-btn" id="btn-item-info">查看</a>');
  336 + html.push('<a href="/goods/audit/info/' + item.productSkn + '" class="btn btn-info btn-xs info-btn">查看</a>');
297 337
298 - //if (item.status == 3 || item.status == 6) { // 驳回  
299 - // html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-pass">通过</a>');  
300 - //} 338 + //if (item.status == 3 || item.status == 6) { // 驳回
  339 + // html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-pass">通过</a>');
  340 + //}
301 341
302 - if (item.status == 2 || item.status == 5) { // 待审核  
303 - html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-pass">通过</a>');  
304 - html.push('<a data-index="'+ item.__index+ '" href="JavaScript:;" class="btn operation btn-danger btn-xs edit-class-btn" id="btn-item-reject">驳回</a>');  
305 - } 342 + if (item.status == 2 || item.status == 5) { // 待审核
  343 + html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-pass">通过</a>');
  344 + html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-danger btn-xs edit-class-btn" id="btn-item-reject">驳回</a>');
  345 + }
306 346
307 347
308 - return html.join('');  
309 - }}, 348 + return html.join('');
  349 + }
  350 + },
310 ] 351 ]
311 }); 352 });
312 g.init('/supplier/baseproduct/ajax/index'); 353 g.init('/supplier/baseproduct/ajax/index');
313 354
314 // tab初始化 355 // tab初始化
315 -var loadTab = function () { 356 +var loadTab = function() {
316 t.active = undefined; 357 t.active = undefined;
317 - setTimeout(function () { 358 + setTimeout(function() {
318 common.util.__ajax({ 359 common.util.__ajax({
319 - url:"/supplier/baseproduct/auditCount",  
320 - data:g.options.parms()  
321 - }, function (res) {  
322 - var __dt=$.extend({},ENUM.tips,res.data); 360 + url: "/supplier/baseproduct/auditCount",
  361 + data: g.options.parms()
  362 + }, function(res) {
  363 + var __dt = $.extend({}, ENUM.tips, res.data);
323 t.init(__dt); 364 t.init(__dt);
324 }, true); 365 }, true);
325 }, 800); 366 }, 800);
@@ -327,18 +368,18 @@ var loadTab = function () { @@ -327,18 +368,18 @@ var loadTab = function () {
327 368
328 loadTab(); 369 loadTab();
329 // 筛选 370 // 筛选
330 -$(document).on('click', "#filter-btn", function () {  
331 - 371 +$(document).on('click', "#filter-btn", function() {
  372 + loadTab();
332 g.reload(); 373 g.reload();
333 }); 374 });
334 375
335 -var Bll={  
336 - toast:function(content,fn){  
337 - common.dialog.confirm("温馨提示",content,function(){ 376 +var Bll = {
  377 + toast: function(content, fn) {
  378 + common.dialog.confirm("温馨提示", content, function() {
338 common.util.__ajax({ 379 common.util.__ajax({
339 - url:'/supplier/baseproduct/auditReject',  
340 - data:fn()  
341 - },function(){ 380 + url: '/supplier/baseproduct/auditReject',
  381 + data: fn()
  382 + }, function() {
342 g.reload(); 383 g.reload();
343 loadTab(); 384 loadTab();
344 }); 385 });
@@ -348,7 +389,7 @@ var Bll={ @@ -348,7 +389,7 @@ var Bll={
348 389
349 390
350 //批量驳回 391 //批量驳回
351 -$(document).on("click","#reject-btn",function(){ 392 +$(document).on("click", "#reject-btn", function() {
352 393
353 var selectedArr = g.selected, 394 var selectedArr = g.selected,
354 len = selectedArr.length, 395 len = selectedArr.length,
@@ -358,7 +399,7 @@ $(document).on("click","#reject-btn",function(){ @@ -358,7 +399,7 @@ $(document).on("click","#reject-btn",function(){
358 return; 399 return;
359 } 400 }
360 401
361 - var data=function(){ 402 + var data = function() {
362 var reason = $('#reason').val(); 403 var reason = $('#reason').val();
363 if (reason === '' || $.trim(reason) === '') { 404 if (reason === '' || $.trim(reason) === '') {
364 return "请填写驳回原因"; 405 return "请填写驳回原因";
@@ -372,16 +413,16 @@ $(document).on("click","#reject-btn",function(){ @@ -372,16 +413,16 @@ $(document).on("click","#reject-btn",function(){
372 console.log(sknList); 413 console.log(sknList);
373 414
374 return { 415 return {
375 - productSknList:JSON.stringify(sknList),  
376 - targetStatus:3, // 驳回 416 + productSknList: JSON.stringify(sknList),
  417 + targetStatus: 3, // 驳回
377 rejectReason: reason 418 rejectReason: reason
378 }; 419 };
379 } 420 }
380 - Bll.toast($("#template").html(),data); 421 + Bll.toast($("#template").html(), data);
381 }); 422 });
382 423
383 //批量通过 424 //批量通过
384 -$(document).on("click","#pass-btn",function(){ 425 +$(document).on("click", "#pass-btn", function() {
385 426
386 var selectedArr = g.selected, 427 var selectedArr = g.selected,
387 len = selectedArr.length, 428 len = selectedArr.length,
@@ -391,7 +432,7 @@ $(document).on("click","#pass-btn",function(){ @@ -391,7 +432,7 @@ $(document).on("click","#pass-btn",function(){
391 return; 432 return;
392 } 433 }
393 434
394 - var data=function(){ 435 + var data = function() {
395 436
396 $.each(selectedArr, function(i, value) { 437 $.each(selectedArr, function(i, value) {
397 sknList.push(value['productSkn']); 438 sknList.push(value['productSkn']);
@@ -401,20 +442,20 @@ $(document).on("click","#pass-btn",function(){ @@ -401,20 +442,20 @@ $(document).on("click","#pass-btn",function(){
401 console.log(sknList); 442 console.log(sknList);
402 443
403 return { 444 return {
404 - productSknList:JSON.stringify(sknList),  
405 - targetStatus:4, // 通过 445 + productSknList: JSON.stringify(sknList),
  446 + targetStatus: 4, // 通过
406 rejectReason: "" 447 rejectReason: ""
407 }; 448 };
408 } 449 }
409 - Bll.toast("确定要通过该申请吗？",data); 450 + Bll.toast("确定要通过该申请吗？", data);
410 }); 451 });
411 452
412 // 单个驳回 453 // 单个驳回
413 -$(document).on("click","#btn-item-reject",function(){ 454 +$(document).on("click", "#btn-item-reject", function() {
414 //auditOperation([],3,) 455 //auditOperation([],3,)
415 - var item=g.rows[$(this).data("index")]; 456 + var item = g.rows[$(this).data("index")];
416 457
417 - var data=function(){ 458 + var data = function() {
418 459
419 var reason = $('#reason').val(); 460 var reason = $('#reason').val();
420 if (reason === '' || $.trim(reason) === '') { 461 if (reason === '' || $.trim(reason) === '') {
@@ -422,29 +463,29 @@ $(document).on("click","#btn-item-reject",function(){ @@ -422,29 +463,29 @@ $(document).on("click","#btn-item-reject",function(){
422 } 463 }
423 464
424 return { 465 return {
425 - productSknList:JSON.stringify([item.productSkn]),  
426 - targetStatus:3, // 驳回  
427 - rejectReason:reason 466 + productSknList: JSON.stringify([item.productSkn]),
  467 + targetStatus: 3, // 驳回
  468 + rejectReason: reason
428 }; 469 };
429 } 470 }
430 - Bll.toast($("#template").html(),data); 471 + Bll.toast($("#template").html(), data);
431 }); 472 });
432 473
433 474
434 // 单个通过 475 // 单个通过
435 -$(document).on("click","#btn-item-pass",function(){ 476 +$(document).on("click", "#btn-item-pass", function() {
436 //auditOperation([],3,) 477 //auditOperation([],3,)
437 - var item=g.rows[$(this).data("index")]; 478 + var item = g.rows[$(this).data("index")];
438 479
439 - var data=function(){ 480 + var data = function() {
440 481
441 return { 482 return {
442 - productSknList:JSON.stringify([item.productSkn]),  
443 - targetStatus:4, //通过  
444 - rejectReason:"" 483 + productSknList: JSON.stringify([item.productSkn]),
  484 + targetStatus: 4, //通过
  485 + rejectReason: ""
445 }; 486 };
446 } 487 }
447 - Bll.toast("确定要通过该申请吗？",data); 488 + Bll.toast("确定要通过该申请吗？", data);
448 }); 489 });
449 490
450 // 时间转化 491 // 时间转化
@@ -463,8 +504,7 @@ Date.prototype.format = function(format) { @@ -463,8 +504,7 @@ Date.prototype.format = function(format) {
463 } 504 }
464 for (var k in date) { 505 for (var k in date) {
465 if (new RegExp("(" + k + ")").test(format)) { 506 if (new RegExp("(" + k + ")").test(format)) {
466 - format = format.replace(RegExp.$1, RegExp.$1.length == 1  
467 - ? date[k] : ("00" + date[k]).substr(("" + date[k]).length)); 507 + format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? date[k] : ("00" + date[k]).substr(("" + date[k]).length));
468 } 508 }
469 } 509 }
470 return format; 510 return format;
@@ -479,6 +519,4 @@ function filterNull(item, instr) { @@ -479,6 +519,4 @@ function filterNull(item, instr) {
479 } else { 519 } else {
480 return ""; 520 return "";
481 } 521 }
482 -}  
483 -  
484 - 522 +}
  1 +'use strict';
  2 +var $ = require('jquery'),
  3 + common = require('../common/common');
  4 +
  5 +
  6 +var ENUM = {
  7 + checkStatus: {
  8 + 100: '暂存',
  9 + 200: '待审核',
  10 + 300: '审核通过',
  11 + 900: '驳回'
  12 + }
  13 +};
  14 +new common.dropDown({
  15 + el: "#brand-name",
  16 + ajax: "brand"
  17 +});
  18 +new common.dropDown({
  19 + el: "#supplier-name",
  20 + ajax: "supplier"
  21 +});
  22 +new common.dropDown({
  23 + el: "#shop-name",
  24 + ajax: "shopsRest"
  25 +});
  26 +
  27 +new common.dropDown({
  28 + el: "#status"
  29 +});
  30 +var g = new common.grid({
  31 + el: '#basicTable',
  32 + parms: function() {
  33 + return {
  34 + //shopsId: common.util.__input("shop-name"),
  35 + shopsId: 20,
  36 + checkStatus: common.util.__input("status"),
  37 + supplierId: common.util.__input("supplier-name"),
  38 + brandId: common.util.__input("brand-name")
  39 + };
  40 + },
  41 + columns: [{
  42 + display: "店铺ID",
  43 + name: "id"
  44 + }, {
  45 + display: "店铺名称",
  46 + name: "shopsName"
  47 + }, {
  48 + display: "包含品牌",
  49 + name: "brands",
  50 + render: function(item) {
  51 + console.log(item);
  52 + if (item.brands instanceof Array && item.brands.length > 0) {
  53 + var html = '';
  54 + $.each(item.brands, function(i, value) {
  55 + html += value.brandName + '<br>';
  56 + });
  57 +
  58 + return html;
  59 + } else {
  60 + return '';
  61 + }
  62 + }
  63 + }, {
  64 + display: "创建时间",
  65 + name: "createTime",
  66 + render: function(item) {
  67 + if (item.createTime) {
  68 + return common.util.__dateFormat(new Date(item.createTime * 1000), "yyyy-MM-dd hh:mm:ss");
  69 + } else {
  70 + return '';
  71 + }
  72 + }
  73 + }, {
  74 + display: "更新时间",
  75 + name: "updateTime",
  76 + render: function(item) {
  77 + if (item.updateTime) {
  78 + return common.util.__dateFormat(new Date(item.updateTime * 1000), "yyyy-MM-dd hh:mm:ss");
  79 + } else {
  80 + return '';
  81 + }
  82 + }
  83 + }, {
  84 + display: "状态",
  85 + name: "checkStatus",
  86 + render: function(item) {
  87 + if (item.checkStatus) {
  88 + return ENUM.checkStatus[item.checkStatus]
  89 + } else {
  90 + return '';
  91 + }
  92 + }
  93 + }, {
  94 + display: "操作",
  95 + render: function(item) {
  96 + /*var HtmArr = [];
  97 + HtmArr.push('<a href="javascript:void(0);" data-index="' + item.__index + '" class="edit btn btn-info btn-xs">店铺信息</a>');
  98 + HtmArr.push('<a href="javascript:void(0);" data-index="' + item.__index + '" class="delete btn btn-danger btn-xs">删除</button>');
  99 + return HtmArr.join('');*/
  100 + }
  101 + }]
  102 +});
  103 +
  104 +g.init($("#gridurl").val());
  105 +
  106 +// 筛选
  107 +$(document).on('click', "#filter-btn", function() {
  108 + g.reload();
  109 +});
@@ -20,6 +20,7 @@ var config = { @@ -20,6 +20,7 @@ var config = {
20 // domain: 'http://192.168.102.202:8088/platform', 20 // domain: 'http://192.168.102.202:8088/platform',
21 //domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超 21 //domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
22 domain: 'http://192.168.102.202:8088/platform', 22 domain: 'http://192.168.102.202:8088/platform',
  23 + //domain: 'http://172.16.6.239:8080', //孙杰翔
23 loggers: { 24 loggers: {
24 api: { 25 api: {
25 level: 'verbose', 26 level: 'verbose',
1 exports.domain = require('../config/common.js').domain; 1 exports.domain = require('../config/common.js').domain;
2 2
3 -exports.res = [  
4 - {  
5 - route: '/supplier/shop/decoration',  
6 - method: 'GET',  
7 - src: '/store/shop',  
8 - view: 'pages/store/shop2' 3 +exports.res = [{
  4 + route: '/supplier/shop/decoration',
  5 + method: 'GET',
  6 + src: '/store/shop',
  7 + view: 'pages/store/shop2'
  8 +}, {
  9 + //店铺装修管理 -> 页面渲染
  10 + route: '/shop/decoration/index',
  11 + method: 'GET',
  12 + src: '/store/decoration-index',
  13 + view: 'pages/store/index',
  14 + data: {
  15 + pagetitle: {
  16 + level1title: '店铺装修管理',
  17 + level2title: '店铺装修管理',
  18 + level3title: '店铺装修管理'
  19 + },
  20 + checkStatus: true,
  21 + selectShop: true,
  22 + gridurl: '/shop/ShopsDecoratorRest/findShopsDecorator'
9 } 23 }
10 -]  
  24 +}, {
  25 + //店铺装修管理 -> 列表数据
  26 + route: '/shop/ShopsDecoratorRest/findShopsDecorator',
  27 + method: 'POST',
  28 + url: '/ShopsDecoratorRest/findShopsDecorator',
  29 + params: [{
  30 + name: 'page',
  31 + type: 'number'
  32 + }, {
  33 + name: 'size',
  34 + type: 'number'
  35 + }, {
  36 + name: 'shopsId',
  37 + type: 'number'
  38 + }, {
  39 + name: 'checkStatus',
  40 + type: 'number'
  41 + }, {
  42 + name: 'supplierId',
  43 + type: 'number'
  44 + }, {
  45 + name: 'brandId',
  46 + type: 'number'
  47 + }]
  48 +}]
@@ -40,40 +40,59 @@ @@ -40,40 +40,59 @@
40 <option value="900">驳回</option> 40 <option value="900">驳回</option>
41 </select> 41 </select>
42 {{/dropCheckStatus}} --> 42 {{/dropCheckStatus}} -->
43 -  
44 - {{# if searchStatus}}  
45 - <select name="status" id="status" tabindex="-1" title="" class="select2-offscreen brandBtn-group">  
46 - <option value="-1" selected="">选择提交状态</option>  
47 - {{# each searchStatus}}  
48 - <option value="{{value}}">{{name}}</option>  
49 - {{/ each}}  
50 - </select>  
51 - {{/ if}} 43 + {{# selectShop}}
  44 + <div class="panel-col2">
  45 + <select name="shop-name" id="shop-name" style="width: 280px;" tabindex="-1" title="" class="form-control">
  46 + <option value="-1">选择店铺</option>
  47 + </select>
  48 + </div>
  49 + {{/ selectShop}}
52 50
53 - <select name="supplier-name" id="supplier-name" style="width: 280px;" tabindex="-1" title="" class="select2-offscreen brandBtn-group brandBtn-group-lg">  
54 - <option value="-1">选择供应商</option>  
55 - {{# supplierName}}  
56 - <option value="{{value}}">{{name}}</option>  
57 - {{/ supplierName}}  
58 - </select>  
59 - <select name="time-sort" id="brand-name" tabindex="-1" title="" class="select2-offscreen brandBtn-group">  
60 - <option value="-1">选择品牌</option>  
61 - {{# supplierName}}  
62 - <option value="{{value}}">{{name}}</option>  
63 - {{/ supplierName}}  
64 - </select> 51 + {{#if checkStatus}}
  52 + <div class="panel-col2">
  53 + <select name="status" id="status" style="width: 280px;" tabindex="-1" title="" class="form-control">
  54 + <option value="" selected="">选择提交状态</option>
  55 + <option value="100">暂存</option>
  56 + <option value="200">待审核</option>
  57 + <option value="300">审核通过</option>
  58 + <option value="900">驳回</option>
  59 + </select>
  60 + </div>
  61 + {{/if}}
  62 +
  63 + <div class="panel-col2">
  64 + <select name="supplier-name" id="supplier-name" style="width: 280px;" tabindex="-1" title="" class="form-control">
  65 + <option value="-1">选择供应商</option>
  66 + {{# supplierName}}
  67 + <option value="{{value}}">{{name}}</option>
  68 + {{/ supplierName}}
  69 + </select>
  70 + </div>
  71 + <div class="panel-col2">
  72 + <select name="time-sort" id="brand-name" tabindex="-1" title="" class="form-control">
  73 + <option value="-1">选择品牌</option>
  74 + {{# supplierName}}
  75 + <option value="{{value}}">{{name}}</option>
  76 + {{/ supplierName}}
  77 + </select>
  78 + </div>
65 <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a> 79 <a id="filter-btn" href="javascript:;" class="btn btn-info">筛选</a>
66 <a id="all-btn" href="" class="btn btn-info">全部</a> 80 <a id="all-btn" href="" class="btn btn-info">全部</a>
67 </div> 81 </div>
  82 +
68 </div> 83 </div>
  84 + </div>
  85 +
  86 + <div class="panel">
  87 + <div class="panel-body nopadding">
69 <input type="hidden" id="url" value="/supplier/store/indexPage"> 88 <input type="hidden" id="url" value="/supplier/store/indexPage">
70 - <div class="panel panel-primary-head">  
71 - <div id="basicTable" class="dataTables_wrapper no-footer">  
72 - <div class="dataTables_length" id="storeadmin_Tabel"></div>  
73 - </div> 89 + <div id="basicTable" class="dataTables_wrapper no-footer">
  90 + <!-- <div class="dataTables_length" id="storeadmin_Tabel"></div> -->
74 </div> 91 </div>
  92 + </div>
75 </div> 93 </div>
76 </div> 94 </div>
77 95
  96 +<input type="hidden" id="gridurl" value="{{gridurl}}">
78 <input type="hidden" id="authority" value="{{authority}}" /> 97 <input type="hidden" id="authority" value="{{authority}}" />
79 98