Showing
13 changed files
with
393 additions
and
289 deletions
@@ -3,218 +3,290 @@ | @@ -3,218 +3,290 @@ | ||
3 | *@author: chenglong | 3 | *@author: chenglong |
4 | */ | 4 | */ |
5 | 5 | ||
6 | -var $ = require('jquery'); | ||
7 | -var edit = require('../common/edit'); | ||
8 | -var Handlebars = require('yoho.handlebars'); | ||
9 | -var dropDown = require('../common/dropDown'); | ||
10 | - | ||
11 | -var selectOption = | ||
12 | - '{{# data}}' + | ||
13 | - '<option value="{{id}}" {{# select}}selected{{/ select}}>{{sortName}}</option>' + | ||
14 | - '{{/ data}}'; | ||
15 | - | ||
16 | -var optionStr = Handlebars.compile(selectOption); | ||
17 | - | ||
18 | -function getAllSort(callback, selectId) { | ||
19 | - $.ajax({ | ||
20 | - url: '/product/class/queryAllProductSortList', | ||
21 | - type: 'POST', | ||
22 | - dataType: 'json' | ||
23 | - }).then(function (d) { | ||
24 | - | ||
25 | - var firstSort = [], | ||
26 | - data = d.data.data, | ||
27 | - sortLen = data.length, | ||
28 | - i; | ||
29 | - var resData; | ||
30 | - | ||
31 | - for (i = 0; i < sortLen; i++) { | ||
32 | - if (!data[i].child) { | ||
33 | - | ||
34 | - if (data[i].id === selectId) { | ||
35 | - data[i].select = true; | ||
36 | - } | ||
37 | - | ||
38 | - firstSort.push(data[i]); | ||
39 | - } | ||
40 | - } | 6 | +// var $ = require('jquery'); |
7 | +// var edit = require('../common/edit'); | ||
8 | +// var Handlebars = require('yoho.handlebars'); | ||
9 | +// var dropDown = require('../common/dropDown'); | ||
41 | 10 | ||
42 | - callback(firstSort); | ||
43 | - }); | ||
44 | -} | ||
45 | 11 | ||
46 | -function getChildSort(id, callback, selectId) { | ||
47 | - $.ajax({ | ||
48 | - url: '/product/class/queryProductSortList', | ||
49 | - type: 'POST', | ||
50 | - dataType: 'json', | ||
51 | - data: { | ||
52 | - param: id | ||
53 | - } | ||
54 | - }).then(function (d) { | ||
55 | 12 | ||
56 | - var data = d.data.data; | ||
57 | - var dataLen = data.length; | ||
58 | - var i; | ||
59 | 13 | ||
60 | - for (i = 0; i < dataLen; i++) { | 14 | +// var selectOption = |
15 | +// '{{# data}}' + | ||
16 | +// '<option value="{{id}}" {{# select}}selected{{/ select}}>{{sortName}}</option>' + | ||
17 | +// '{{/ data}}'; | ||
61 | 18 | ||
62 | - if (data[i].id === selectId) { | ||
63 | - data[i].select = true; | ||
64 | - } | ||
65 | - } | ||
66 | - | ||
67 | - callback(data); | ||
68 | - }); | ||
69 | -} | 19 | +// var optionStr = Handlebars.compile(selectOption); |
70 | 20 | ||
71 | -var $editInput = $('#editId'); | ||
72 | -var editLevel = $editInput.attr('level'); | ||
73 | -var toNum = 1; | 21 | +// function getAllSort(callback, selectId) { |
22 | +// $.ajax({ | ||
23 | +// url: '/product/class/queryAllProductSortList', | ||
24 | +// type: 'POST', | ||
25 | +// dataType: 'json' | ||
26 | +// }).then(function (d) { | ||
74 | 27 | ||
75 | -function createLevelOneOption(selectedId, callback) { | ||
76 | - getAllSort(function (data) { | 28 | +// var firstSort = [], |
29 | +// data = d.data.data, | ||
30 | +// sortLen = data.length, | ||
31 | +// i; | ||
32 | +// var resData; | ||
33 | + | ||
34 | +// for (i = 0; i < sortLen; i++) { | ||
35 | +// if (!data[i].child) { | ||
36 | + | ||
37 | +// if (data[i].id === selectId) { | ||
38 | +// data[i].select = true; | ||
39 | +// } | ||
40 | + | ||
41 | +// firstSort.push(data[i]); | ||
42 | +// } | ||
43 | +// } | ||
44 | + | ||
45 | +// callback(firstSort); | ||
46 | +// }); | ||
47 | +// } | ||
48 | + | ||
49 | +// function getChildSort(id, callback, selectId) { | ||
50 | +// $.ajax({ | ||
51 | +// url: '/product/class/queryProductSortList', | ||
52 | +// type: 'POST', | ||
53 | +// dataType: 'json', | ||
54 | +// data: { | ||
55 | +// param: id | ||
56 | +// } | ||
57 | +// }).then(function (d) { | ||
58 | + | ||
59 | +// var data = d.data.data; | ||
60 | +// var dataLen = data.length; | ||
61 | +// var i; | ||
62 | + | ||
63 | +// for (i = 0; i < dataLen; i++) { | ||
64 | + | ||
65 | +// if (data[i].id === selectId) { | ||
66 | +// data[i].select = true; | ||
67 | +// } | ||
68 | +// } | ||
69 | + | ||
70 | +// callback(data); | ||
71 | +// }); | ||
72 | +// } | ||
73 | + | ||
74 | +// var $editInput = $('#editId'); | ||
75 | +// var editLevel = $editInput.attr('level'); | ||
76 | +// var toNum = 1; | ||
77 | + | ||
78 | +// function createLevelOneOption(selectedId, callback) { | ||
79 | +// getAllSort(function (data) { | ||
77 | 80 | ||
78 | - $('#parentSortId').after(optionStr({ | ||
79 | - data: data | ||
80 | - })); | 81 | +// $('#parentSortId').after(optionStr({ |
82 | +// data: data | ||
83 | +// })); | ||
81 | 84 | ||
82 | - new dropDown({ | ||
83 | - el:'#firstSortId' | ||
84 | - }); | ||
85 | - | ||
86 | - if (callback) { | ||
87 | - callback(); | ||
88 | - } | ||
89 | - | ||
90 | - }, selectedId*toNum); | ||
91 | -} | ||
92 | - | ||
93 | -function createLevelTwoOption(parentId, selectedId) { | ||
94 | - | ||
95 | - getChildSort(parentId*toNum, function (data) { | ||
96 | - | ||
97 | - $('#secondSortId').find('option:first').after(optionStr({ | ||
98 | - data: data | ||
99 | - })); | ||
100 | - | ||
101 | - new dropDown({ | ||
102 | - el:'#secondSortId' | ||
103 | - }); | ||
104 | - | ||
105 | - }, selectedId*toNum); | ||
106 | -} | 85 | +// new dropDown({ |
86 | +// el:'#firstSortId' | ||
87 | +// }); | ||
88 | + | ||
89 | +// if (callback) { | ||
90 | +// callback(); | ||
91 | +// } | ||
92 | + | ||
93 | +// }, selectedId*toNum); | ||
94 | +// } | ||
95 | + | ||
96 | +// function createLevelTwoOption(parentId, selectedId) { | ||
97 | + | ||
98 | +// getChildSort(parentId*toNum, function (data) { | ||
99 | + | ||
100 | +// $('#secondSortId').find('option:first').after(optionStr({ | ||
101 | +// data: data | ||
102 | +// })); | ||
103 | + | ||
104 | +// new dropDown({ | ||
105 | +// el:'#secondSortId' | ||
106 | +// }); | ||
107 | + | ||
108 | +// }, selectedId*toNum); | ||
109 | +// } | ||
107 | 110 | ||
108 | 111 | ||
109 | - console.log(editLevel); | ||
110 | - | ||
111 | - // 编辑 | ||
112 | - if (editLevel) { | ||
113 | - | ||
114 | - switch (editLevel) { | ||
115 | - case "1": | ||
116 | - createLevelOneOption($editInput.val(), function () { | ||
117 | - getChildSort($editInput.val()*toNum, function (data) { | ||
118 | - $('#secondSortId').find('option:first').after(optionStr({ | ||
119 | - data: data | ||
120 | - })); | ||
121 | - }); | ||
122 | - }); | ||
123 | - new dropDown({ | ||
124 | - el:'#secondSortId' | ||
125 | - }); | ||
126 | - break; | ||
127 | - case "2": | ||
128 | - createLevelOneOption($editInput.attr('pid'), function () { | ||
129 | - createLevelTwoOption($editInput.attr('pid'), $editInput.val()); | ||
130 | - }); | ||
131 | - break; | ||
132 | - default : | ||
133 | - break; | ||
134 | - } | 112 | +// console.log(editLevel); |
113 | + | ||
114 | +// // 编辑 | ||
115 | +// if (editLevel) { | ||
116 | + | ||
117 | +// switch (editLevel) { | ||
118 | +// case "1": | ||
119 | +// createLevelOneOption($editInput.val(), function () { | ||
120 | +// getChildSort($editInput.val()*toNum, function (data) { | ||
121 | +// $('#secondSortId').find('option:first').after(optionStr({ | ||
122 | +// data: data | ||
123 | +// })); | ||
124 | +// }); | ||
125 | +// }); | ||
126 | +// new dropDown({ | ||
127 | +// el:'#secondSortId' | ||
128 | +// }); | ||
129 | +// break; | ||
130 | +// case "2": | ||
131 | +// createLevelOneOption($editInput.attr('pid'), function () { | ||
132 | +// createLevelTwoOption($editInput.attr('pid'), $editInput.val()); | ||
133 | +// }); | ||
134 | +// break; | ||
135 | +// default : | ||
136 | +// break; | ||
137 | +// } | ||
138 | + | ||
139 | +// } else { | ||
140 | +// // 添加 | ||
141 | +// getAllSort(function (data) { | ||
142 | +// $('#parentSortId').after(optionStr({ | ||
143 | +// data: data | ||
144 | +// })); | ||
145 | +// }); | ||
146 | + | ||
147 | +// // 选择一\二级菜单时渲染二 | ||
148 | +// $('.level-select').change(function () { | ||
149 | + | ||
150 | +// var id = $(this).val()*toNum; | ||
151 | + | ||
152 | +// getChildSort(id, function (data) { | ||
153 | + | ||
154 | +// $('#childSortId').after(optionStr({ | ||
155 | +// data: data | ||
156 | +// })); | ||
157 | + | ||
158 | +// }); | ||
159 | +// }); | ||
160 | + | ||
161 | +// new dropDown({ | ||
162 | +// el:'#firstSortId' | ||
163 | +// }); | ||
164 | +// new dropDown({ | ||
165 | +// el:'#secondSortId' | ||
166 | +// }); | ||
167 | +// } | ||
168 | + | ||
169 | +// // 添加品类表单验证 | ||
170 | +// var newClassVerification = new edit("#new-class-form"); | ||
171 | + | ||
172 | +// newClassVerification.init(); | ||
173 | + | ||
174 | +// $(".new-class-btn").click(function(){ | ||
175 | + | ||
176 | +// var id = $(this).attr('data-id'); | ||
177 | +// var postUrl; | ||
178 | +// var $this = $(this); | ||
179 | + | ||
180 | +// var pid = $('#secondSortId').val(); | ||
181 | +// var ppid = $('#firstSortId').val(); | ||
182 | + | ||
183 | +// if (ppid*toNum) { | ||
184 | +// $('#parentId').val(ppid); | ||
185 | +// } | ||
186 | +// if (pid*toNum) { | ||
187 | +// $('#parentId').val(pid); | ||
188 | +// } | ||
189 | + | ||
190 | +// if (!!id) { | ||
191 | +// postUrl = '/product/sort/update' | ||
192 | +// } else { | ||
193 | +// postUrl = $("#new-class-form").attr("action"); | ||
194 | +// } | ||
195 | + | ||
196 | +// newClassVerification.submit(postUrl, function(option,that) { | ||
197 | + | ||
198 | +// option.beforeSend = function () { | ||
199 | +// $this.attr('disabled', 'disabled'); | ||
200 | +// }; | ||
201 | +// option.success=function(res){ | ||
202 | + | ||
203 | +// console.log(res); | ||
135 | 204 | ||
136 | - } else { | ||
137 | - // 添加 | ||
138 | - getAllSort(function (data) { | ||
139 | - $('#parentSortId').after(optionStr({ | ||
140 | - data: data | ||
141 | - })); | ||
142 | - }); | 205 | +// if (res.data.code === 200) { |
143 | 206 | ||
144 | - // 选择一\二级菜单时渲染二 | ||
145 | - $('.level-select').change(function () { | 207 | +// newClassVerification.$tip('提交成功'); |
208 | +// $this.removeAttr('disabled'); | ||
146 | 209 | ||
147 | - var id = $(this).val()*toNum; | 210 | +// setTimeout(function () { |
211 | +// window.location.href = '/erpproduct/sort/index'; | ||
212 | +// }, 1000); | ||
213 | +// } | ||
214 | +// }; | ||
215 | +// option.error=function(res){ | ||
148 | 216 | ||
149 | - getChildSort(id, function (data) { | 217 | +// console.log('error'); |
218 | +// } | ||
219 | +// }); | ||
220 | +// return false; | ||
221 | +// }); | ||
150 | 222 | ||
151 | - $('#childSortId').after(optionStr({ | ||
152 | - data: data | ||
153 | - })); | 223 | +var $ = require('jquery'); |
224 | +var common=require('../common/common'); | ||
154 | 225 | ||
155 | - }); | ||
156 | - }); | 226 | +var e=new common.edit("#new-class-form"); |
157 | 227 | ||
158 | - new dropDown({ | ||
159 | - el:'#firstSortId' | ||
160 | - }); | ||
161 | - new dropDown({ | ||
162 | - el:'#secondSortId' | 228 | +var BLL={ |
229 | + fillselect:function(items,selectedid){ | ||
230 | + var HtmlArr=["<option value='-1'>请选择</option>"]; | ||
231 | + $.each(items,function(index,item){ | ||
232 | + var selected=(item.id==selectedid)?"selected":""; | ||
233 | + var optionHtml=common.util.__template("<option value='{value}' {selected} >{name}</option>",{value:item.id,name:item.sortName,selected:selected}); | ||
234 | + HtmlArr.push(optionHtml); | ||
163 | }); | 235 | }); |
236 | + return HtmlArr.join(''); | ||
237 | + }, | ||
238 | + select2:function(){ | ||
239 | + var __id=$("#firstSortId").val(); | ||
240 | + var el="#secondSortId"; | ||
241 | + if(__id){ | ||
242 | + common.util.__ajax({url:'/product/class/queryProductSortList',data:{param: __id}},function(res){ | ||
243 | + $(el).html(BLL.fillselect(res.data,$(el).data("value"))); | ||
244 | + },true); | ||
245 | + }else{ | ||
246 | + $(el).html(BLL.fillselect([])); | ||
247 | + } | ||
164 | } | 248 | } |
249 | +} | ||
165 | 250 | ||
166 | - // 添加品类表单验证 | ||
167 | - var newClassVerification = new edit("#new-class-form"); | ||
168 | - | ||
169 | - newClassVerification.init(); | ||
170 | - | ||
171 | - $(".new-class-btn").click(function(){ | ||
172 | - | ||
173 | - var id = $(this).attr('data-id'); | ||
174 | - var postUrl; | ||
175 | - var $this = $(this); | ||
176 | - | ||
177 | - var pid = $('#secondSortId').val(); | ||
178 | - var ppid = $('#firstSortId').val(); | 251 | +e.on("render",function(){ |
252 | + common.util.__ajax({url:'/product/class/queryAllProductSortList'},function(res){ | ||
253 | + var el="#firstSortId"; | ||
254 | + $(el).html(BLL.fillselect(res.data,$(el).data("value"))); | ||
255 | + new common.dropDown({el:el}); | ||
256 | + BLL.select2(); | ||
257 | + },true); | ||
258 | +}); | ||
259 | + | ||
260 | +e.on("bind",function(){ | ||
261 | + | ||
262 | + $("#firstSortId").change(function(){ | ||
263 | + BLL.select2(); | ||
264 | + }); | ||
265 | +}); | ||
179 | 266 | ||
180 | - if (ppid*toNum) { | ||
181 | - $('#parentId').val(ppid); | ||
182 | - } | ||
183 | - if (pid*toNum) { | ||
184 | - $('#parentId').val(pid); | ||
185 | - } | 267 | +e.init(); |
186 | 268 | ||
187 | - if (!!id) { | ||
188 | - postUrl = '/product/sort/update' | ||
189 | - } else { | ||
190 | - postUrl = $("#new-class-form").attr("action"); | 269 | +$(document).on("click",".btn-success",function(){ |
270 | + e.submit($("#new-class-form").attr("action"),function(option){ | ||
271 | + var _arr=["firstSortId","secondSortId"]; | ||
272 | + for(var i in _arr){ | ||
273 | + if(!option.data[_arr[i]]){ | ||
274 | + delete option.data[_arr[i]]; | ||
275 | + } | ||
191 | } | 276 | } |
192 | - | ||
193 | - newClassVerification.submit(postUrl, function(option,that) { | ||
194 | - | ||
195 | - option.beforeSend = function () { | ||
196 | - $this.attr('disabled', 'disabled'); | ||
197 | - }; | ||
198 | - option.success=function(res){ | ||
199 | - | ||
200 | - console.log(res); | ||
201 | - | ||
202 | - if (res.data.code === 200) { | ||
203 | - | ||
204 | - newClassVerification.$tip('提交成功'); | ||
205 | - $this.removeAttr('disabled'); | ||
206 | - | ||
207 | - setTimeout(function () { | ||
208 | - window.location.href = '/erpproduct/sort/index'; | ||
209 | - }, 1000); | ||
210 | - } | ||
211 | - }; | ||
212 | - option.error=function(res){ | ||
213 | - | ||
214 | - console.log('error'); | 277 | + option.success=function(res){ |
278 | + res=res.data; | ||
279 | + if(res.code=="200"){ | ||
280 | + e.$tip('提交成功',function(){ | ||
281 | + location.href="/erpproduct/sort/index"; | ||
282 | + },'growl-success'); | ||
283 | + }else{ | ||
284 | + e.$tip(res.message); | ||
215 | } | 285 | } |
216 | - }); | ||
217 | - return false; | 286 | + return false; |
287 | + } | ||
288 | + option.error=function(res){ | ||
289 | + e.$tip("提交失败"); | ||
290 | + }; | ||
218 | }); | 291 | }); |
219 | - | ||
220 | - | 292 | +}); |
@@ -31,9 +31,9 @@ var $ = require('jquery'), | @@ -31,9 +31,9 @@ var $ = require('jquery'), | ||
31 | }); | 31 | }); |
32 | 32 | ||
33 | 33 | ||
34 | - // sortmenu.init(function(){ | ||
35 | - // g.init('/erpproduct/sortsize/ajax/index'); | ||
36 | - // }); | 34 | + sortmenu.init(function(){ |
35 | + g.init('/erpproduct/sortsize/ajax/index'); | ||
36 | + }); | ||
37 | 37 | ||
38 | 38 | ||
39 | var _model=JSON.parse($("#model").val()); | 39 | var _model=JSON.parse($("#model").val()); |
@@ -333,7 +333,7 @@ e.on("bind",function(){ | @@ -333,7 +333,7 @@ e.on("bind",function(){ | ||
333 | //item.supplierId | 333 | //item.supplierId |
334 | var i=0; | 334 | var i=0; |
335 | $.each(g2.__rows,function(index1,item1){ | 335 | $.each(g2.__rows,function(index1,item1){ |
336 | - if(item1.supplierId==item.supplierId){ | 336 | + if(item1.brandId==item.brandId){ |
337 | i++; | 337 | i++; |
338 | } | 338 | } |
339 | }); | 339 | }); |
@@ -356,26 +356,36 @@ e.on("bind",function(){ | @@ -356,26 +356,36 @@ e.on("bind",function(){ | ||
356 | }); | 356 | }); |
357 | 357 | ||
358 | $("#updateBrand").on("click",".delete",function(){ | 358 | $("#updateBrand").on("click",".delete",function(){ |
359 | - delete g2.__rows[$(this).data("index")]; | 359 | + console.log(g2.__rows); |
360 | + g2.__rows.splice($(this).data("index"),1); | ||
361 | + console.log(g2.__rows); | ||
360 | g2.reload(); | 362 | g2.reload(); |
361 | }); | 363 | }); |
362 | }); | 364 | }); |
363 | 365 | ||
366 | +var _arr={ | ||
367 | + websiteUrl:"[]", | ||
368 | + otherUrl:"[]", | ||
369 | + shopAddress:"[]" | ||
370 | +}; | ||
371 | +var urlRegx="[a-zA-z]+://[^s]*"; | ||
372 | +var _regx={ | ||
373 | + websiteUrl:urlRegx, | ||
374 | + otherUrl:urlRegx | ||
375 | +}; | ||
364 | 376 | ||
377 | +e.on("validate",function(){ | ||
378 | + if(+$("#shopNature").val()==-1){ | ||
379 | + return "请选择店铺类型"; | ||
380 | + } | ||
381 | +}); | ||
365 | 382 | ||
366 | -e.init(); | ||
367 | - | ||
368 | -var submit=function(callback){ | ||
369 | - var _arr={ | 383 | +e.on("validate",function(){ |
384 | + _arr={ | ||
370 | websiteUrl:[], | 385 | websiteUrl:[], |
371 | otherUrl:[], | 386 | otherUrl:[], |
372 | shopAddress:[] | 387 | shopAddress:[] |
373 | }; | 388 | }; |
374 | - var urlRegx="[a-zA-z]+://[^s]*"; | ||
375 | - var _regx={ | ||
376 | - websiteUrl:urlRegx, | ||
377 | - otherUrl:urlRegx | ||
378 | - }; | ||
379 | var _count=0; | 389 | var _count=0; |
380 | for(var key in _arr){ | 390 | for(var key in _arr){ |
381 | $("#"+key+"-list").find("input:text").each(function(){ | 391 | $("#"+key+"-list").find("input:text").each(function(){ |
@@ -395,14 +405,24 @@ var submit=function(callback){ | @@ -395,14 +405,24 @@ var submit=function(callback){ | ||
395 | _arr[key]=JSON.stringify(_arr[key]); | 405 | _arr[key]=JSON.stringify(_arr[key]); |
396 | } | 406 | } |
397 | if(_count>0){ | 407 | if(_count>0){ |
398 | - common.util.__tip("网址输入错误"); | ||
399 | - return; | 408 | + return "网址输入错误"; |
400 | } | 409 | } |
410 | +}); | ||
411 | + | ||
412 | +e.on("validate",function(){ | ||
401 | _arr.shopRelation=JSON.stringify(g2.rows); | 413 | _arr.shopRelation=JSON.stringify(g2.rows); |
402 | if(!_arr.shopRelation){ | 414 | if(!_arr.shopRelation){ |
403 | - common.util.__tip("请选择关联品牌:"); | ||
404 | - return; | 415 | + return "请选择关联品牌"; |
405 | } | 416 | } |
417 | +}); | ||
418 | + | ||
419 | +e.init(); | ||
420 | + | ||
421 | +var submit=function(callback){ | ||
422 | + | ||
423 | + | ||
424 | + | ||
425 | + | ||
406 | e.submit($("#storeForm").attr("action"),function(option){ | 426 | e.submit($("#storeForm").attr("action"),function(option){ |
407 | option.data=$.extend({},option.data,_arr); | 427 | option.data=$.extend({},option.data,_arr); |
408 | console.log(option.data); | 428 | console.log(option.data); |
@@ -410,8 +430,7 @@ var submit=function(callback){ | @@ -410,8 +430,7 @@ var submit=function(callback){ | ||
410 | res=res.data; | 430 | res=res.data; |
411 | if(res.code=="200"){ | 431 | if(res.code=="200"){ |
412 | e.$tip('提交成功',function(){ | 432 | e.$tip('提交成功',function(){ |
413 | - location.href=window.me.getUrl(); | ||
414 | - //window.history.go(-1); | 433 | + location.href="/supplier/store/index"; |
415 | },'growl-success'); | 434 | },'growl-success'); |
416 | }else{ | 435 | }else{ |
417 | e.$tip(res.message); | 436 | e.$tip(res.message); |
@@ -66,7 +66,9 @@ var ENUM={// 审核状态;100 暂存 200 待审核 300 审核通过 900 驳 | @@ -66,7 +66,9 @@ var ENUM={// 审核状态;100 暂存 200 待审核 300 审核通过 900 驳 | ||
66 | } | 66 | } |
67 | 67 | ||
68 | if(authority.btn){ | 68 | if(authority.btn){ |
69 | - HtmArr.push('<a href="/supplier/store/update/'+item.shopsId+'" href="javascript:void(0);" class="btn btn-success btn-xs">编辑</a>'); | 69 | + if(+item.checkStatus!=200){ |
70 | + HtmArr.push('<a href="/supplier/store/update/'+item.shopsId+'" href="javascript:void(0);" class="btn btn-success btn-xs">编辑</a>'); | ||
71 | + } | ||
70 | if(+item.status){ | 72 | if(+item.status){ |
71 | // 1开启 0 关闭 | 73 | // 1开启 0 关闭 |
72 | HtmArr.push('<a data-index="'+item.__index+'" href="javascript:void(0);" class="closeshops btn btn-success btn-xs">开店</a>'); | 74 | HtmArr.push('<a data-index="'+item.__index+'" href="javascript:void(0);" class="closeshops btn btn-success btn-xs">开店</a>'); |
@@ -3,6 +3,7 @@ var edit=require('../common/edit'); | @@ -3,6 +3,7 @@ var edit=require('../common/edit'); | ||
3 | 3 | ||
4 | var e=new edit("#basicForm"); | 4 | var e=new edit("#basicForm"); |
5 | e.on("validate",function(){ | 5 | e.on("validate",function(){ |
6 | + | ||
6 | var contactPhone=$.trim($("#contactPhone").val()); | 7 | var contactPhone=$.trim($("#contactPhone").val()); |
7 | if(contactPhone){ | 8 | if(contactPhone){ |
8 | if(!(/^1\d{10}$/.test(contactPhone))){ | 9 | if(!(/^1\d{10}$/.test(contactPhone))){ |
@@ -38,8 +39,11 @@ var edit=require('../common/edit'); | @@ -38,8 +39,11 @@ var edit=require('../common/edit'); | ||
38 | res=res.data; | 39 | res=res.data; |
39 | if(res.code=="200"){ | 40 | if(res.code=="200"){ |
40 | e.$tip(config.msg||"提交成功",function(){ | 41 | e.$tip(config.msg||"提交成功",function(){ |
41 | - location.href=window.me.getUrl(); | ||
42 | - | 42 | + if(+option.data.operations==1){ |
43 | + location.href="/supplier/supplier/index"; | ||
44 | + }else{ | ||
45 | + location.href="/supplier/supplier/managelist"; | ||
46 | + } | ||
43 | },'growl-success'); | 47 | },'growl-success'); |
44 | }else{ | 48 | }else{ |
45 | e.$tip(res.message); | 49 | e.$tip(res.message); |
@@ -43,10 +43,9 @@ var $ = require('jquery'), | @@ -43,10 +43,9 @@ var $ = require('jquery'), | ||
43 | //提交驳回 | 43 | //提交驳回 |
44 | $(document).on('click', '.btn-return', function() { | 44 | $(document).on('click', '.btn-return', function() { |
45 | Bll.toast("确定要驳回审核吗?",function(){ | 45 | Bll.toast("确定要驳回审核吗?",function(){ |
46 | - return Bll.model({status:900,operations:1}); | 46 | + return Bll.model({status:900}); |
47 | }); | 47 | }); |
48 | }); | 48 | }); |
49 | - | ||
50 | //冻结操作 | 49 | //冻结操作 |
51 | $(document).on('click', '.btn-freeze', function() { | 50 | $(document).on('click', '.btn-freeze', function() { |
52 | Bll.toast("确定要冻结审核吗?",function(){ | 51 | Bll.toast("确定要冻结审核吗?",function(){ |
1 | -ul{margin-top:0}.admin-icon-yellow{color:#ffbe40}.admin-header{font-size:1.4rem;margin-bottom:0}.admin-header-list a:hover :after{content:none}.admin-main{background:#f3f3f3}.admin-menu{position:fixed;z-index:10;bottom:30px;right:20px}.admin-sidebar{width:260px;min-height:100%;float:left;border-right:1px solid #cecece}.admin-sidebar-list{margin-bottom:0}.admin-sidebar-list li a{color:#5c5c5c;padding-left:24px}.admin-sidebar-list li:first-child{border-top:none}.admin-sidebar-sub{margin-top:0;margin-bottom:0;box-shadow:0 16px 8px -15px #e2e2e2 inset;background:#ececec;padding-left:24px}.admin-sidebar-sub li:first-child{border-top:1px solid #dedede}.admin-sidebar-panel{margin:10px}.admin-content{width:auto;overflow:hidden;height:100%;background:#fff}.admin-content-list{border:1px solid #e9ecf1;margin-top:0}.admin-content-list li{border:1px solid #e9ecf1;border-width:0 1px;margin-left:-1px}.admin-content-list li:first-child{border-left:none}.admin-content-list li:last-child{border-right:none}.admin-content-table a{color:#535353}.admin-content-file{margin-bottom:0;color:#666}.admin-content-file p{margin:0 0 5px 0;font-size:1.4rem}.admin-content-file li{padding:10px 0}.admin-content-file li:first-child{border-top:none}.admin-content-file li:last-child{border-bottom:none}.admin-content-file li .am-progress{margin-bottom:4px}.admin-content-file li .am-progress-bar{line-height:14px}.admin-content-task{margin-bottom:0}.admin-content-task li{padding:5px 0;border-color:#eee}.admin-content-task li:first-child{border-top:none}.admin-content-task li:last-child{border-bottom:none}.admin-task-meta{font-size:1.2rem;color:#999}.admin-task-bd{font-size:1.4rem;margin-bottom:5px}.admin-content-comment{margin-bottom:0}.admin-content-comment .am-comment-bd{font-size:1.4rem}.admin-content-pagination{margin-bottom:0}.admin-content-pagination li a{padding:4px 8px}@media only screen and (min-width: 641px){.admin-sidebar{display:block;position:static;background:none}.admin-offcanvas-bar{position:static;width:auto;background:none;-webkit-transform:translate3d(0, 0, 0);-ms-transform:translate3d(0, 0, 0);transform:translate3d(0, 0, 0)}.admin-offcanvas-bar:after{content:none}}@media only screen and (max-width: 640px){.admin-sidebar{width:inherit}.admin-offcanvas-bar{background:#f3f3f3}.admin-offcanvas-bar:after{background:#BABABA}.admin-sidebar-list a:hover,.admin-sidebar-list a:active{-webkit-transition:background-color .3s ease;transition:background-color .3s ease;background:#E4E4E4}.admin-content-list li{padding:10px;border-width:1px 0;margin-top:-1px}.admin-content-list li:first-child{border-top:none}.admin-content-list li:last-child{border-bottom:none}.admin-form-text{text-align:left !important}}.user-info{margin-bottom:15px}.user-info .am-progress{margin-bottom:4px}.user-info p{margin:5px}.user-info-order{font-size:1.4rem}.error-log .am-pre-scrollable{max-height:40rem}.table-main{font-size:1.4rem;padding:.5rem}.table-main button{background:#fff}.table-check{width:30px}.table-id{width:50px}@media only screen and (max-width: 640px){.table-select{margin-top:10px;margin-left:5px}}.gallery-list li{padding:10px}.gallery-list a{color:#666}.gallery-list a:hover{color:#3bb4f2}.gallery-title{margin-top:6px;font-size:1.4rem}.gallery-desc{font-size:1.2rem;margin-top:4px}.page-404{background:#fff;border:none;width:200px;margin:0 auto}.fixed-layout,.fixed-layout body{height:100%;overflow:hidden}.fixed-layout .admin-header{position:fixed;top:0;left:0;right:0;z-index:1500}.fixed-layout .admin-main{position:relative;height:100%;padding-top:51px}.fixed-layout .admin-content,.fixed-layout .admin-sidebar{height:100%;overflow-x:hidden;overflow-y:scroll}.fixed-layout .admin-sidebar.am-active{z-index:1600}input[type=file]{display:block;opacity:0;height:60px;width:100px;position:absolute;z-index:99}.form-horizontal .form-group{margin-left:0px;margin-right:0px}.datepicker{display:none;position:absolute;padding:4px;margin-top:1px;direction:ltr}.datepicker.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;list-style:none;background-color:#fff;border:1px solid rgba(0,0,0,0.2);border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;color:#333;font-size:13px;line-height:18px}.datepicker.dropdown-menu th{padding:4px 5px}.datepicker.dropdown-menu td{padding:4px 5px}.datepicker table{border:0;margin:0;width:auto}.datepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer}.datepicker td{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker td.active.day,.datepicker td.active.year{background:#2ba6cb}.datepicker td.old,.datepicker td.new{color:#999}.datepicker td span.active{background:#2ba6cb}.datepicker td.day.disabled{color:#ccc}.datepicker th{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker th.active.day,.datepicker th.active.year{background:#2ba6cb}.datepicker th.date-switch{width:145px}.datepicker th span.active{background:#2ba6cb}.datepicker .cw{font-size:10px;width:12px;padding:0 2px 0 5px;vertical-align:middle}.datepicker.days div.datepicker-days{display:block}.datepicker.months div.datepicker-months{display:block}.datepicker.years div.datepicker-years{display:block}.datepicker thead tr:first-child th{cursor:pointer}.datepicker thead tr:first-child th.cw{cursor:default;background-color:transparent}.datepicker tfoot tr:first-child th{cursor:pointer}.datepicker-inline{width:220px}.datepicker-rtl{direction:rtl}.datepicker-rtl table tr td span{float:right}.datepicker-dropdown{top:0;left:0}.datepicker-dropdown:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:1px solid rgba(0,0,0,0.2);position:absolute;top:-7px;left:6px}.datepicker-dropdown:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:7px}.datepicker>div,.datepicker-dropdown::before,.datepicker-dropdown::after{display:none}.datepicker-close{position:absolute;top:-30px;right:0;width:15px;height:30px;padding:0;display:none}.table-striped .datepicker table tr td,.table-striped .datepicker table tr th{background-color:transparent}.panel-default .panel-heading{border-top:1px solid #e7e7e7}.red{color:red;font-family:bold}input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:0 !important}.show-grid{padding:10px}.brandBtn-group{width:150px;float:left;margin-right:8px}.brandBtn-group-lg{width:280px}.contentpanel td a{margin:0 3px}.mainwrapper .toggle-table tr{cursor:pointer}.mainwrapper .toggle-table tr.level1 td:nth-of-type(1){text-indent:2px}.mainwrapper .toggle-table tr.level2 td:nth-of-type(1){text-indent:15px}.mainwrapper .toggle-table tr.level3 td:nth-of-type(1){text-indent:30px}.pattrscroll{background:#F7F7F7}.pattrscroll ul{padding-left:0}.pattrscroll li{cursor:pointer}.mainwrapper .list-group-item.level1{text-indent:2px}.mainwrapper .list-group-item.level2{text-indent:15px}.mainwrapper .list-group-item.level3{text-indent:30px}.attr-item-active{background:#428bca;color:#fff}.pannel-scroll{height:500px;overflow-y:scroll;overflow-x:hidden}.attr-select{display:block;height:40px;line-height:40px;border:1px solid #ccc;border-radius:3px}#limit-table-box table{vertical-align:middle}#limit-table-box table th,#limit-table-box table td{text-align:center;vertical-align:middle}#limit-table-box table div.checkbox label{height:13px}#limit-table-box table .cover-img{width:100px}#limit-table-box table .width50{width:50px;text-align:center}.height40{height:40px;line-height:40px}.edit-cover-img{width:100px;margin:0 15px;float:left}.quota-text,.quota-img,.quota-video{width:300px;margin-bottom:15px}.quota-text img,.quota-img img,.quota-video img{width:100%}#text-editor{width:100%;max-width:100%;min-width:100%;height:300px;max-height:300px;min-height:300px}.product-detail input[type="text"]{width:100px}.main-table{-display:none}.bulk-import{display:none}#upload-input{display:inline-block;position:static;opacity:1;width:auto;height:auto}.excel-model{display:inline-block;width:110px;height:48px;line-height:48px;padding:0 0 0 50px;margin:0 200px;background:url(../images/excel.png) no-repeat left center}.panel-input{display:inline-block;width:100%}.panel-col,.panel-col2{float:left;width:150px;margin:0 10px}.panel-col2{width:280px} | 1 | +ul{margin-top:0}.admin-icon-yellow{color:#ffbe40}.admin-header{font-size:1.4rem;margin-bottom:0}.admin-header-list a:hover :after{content:none}.admin-main{background:#f3f3f3}.admin-menu{position:fixed;z-index:10;bottom:30px;right:20px}.admin-sidebar{width:260px;min-height:100%;float:left;border-right:1px solid #cecece}.admin-sidebar-list{margin-bottom:0}.admin-sidebar-list li a{color:#5c5c5c;padding-left:24px}.admin-sidebar-list li:first-child{border-top:none}.admin-sidebar-sub{margin-top:0;margin-bottom:0;box-shadow:0 16px 8px -15px #e2e2e2 inset;background:#ececec;padding-left:24px}.admin-sidebar-sub li:first-child{border-top:1px solid #dedede}.admin-sidebar-panel{margin:10px}.admin-content{width:auto;overflow:hidden;height:100%;background:#fff}.admin-content-list{border:1px solid #e9ecf1;margin-top:0}.admin-content-list li{border:1px solid #e9ecf1;border-width:0 1px;margin-left:-1px}.admin-content-list li:first-child{border-left:none}.admin-content-list li:last-child{border-right:none}.admin-content-table a{color:#535353}.admin-content-file{margin-bottom:0;color:#666}.admin-content-file p{margin:0 0 5px 0;font-size:1.4rem}.admin-content-file li{padding:10px 0}.admin-content-file li:first-child{border-top:none}.admin-content-file li:last-child{border-bottom:none}.admin-content-file li .am-progress{margin-bottom:4px}.admin-content-file li .am-progress-bar{line-height:14px}.admin-content-task{margin-bottom:0}.admin-content-task li{padding:5px 0;border-color:#eee}.admin-content-task li:first-child{border-top:none}.admin-content-task li:last-child{border-bottom:none}.admin-task-meta{font-size:1.2rem;color:#999}.admin-task-bd{font-size:1.4rem;margin-bottom:5px}.admin-content-comment{margin-bottom:0}.admin-content-comment .am-comment-bd{font-size:1.4rem}.admin-content-pagination{margin-bottom:0}.admin-content-pagination li a{padding:4px 8px}@media only screen and (min-width: 641px){.admin-sidebar{display:block;position:static;background:none}.admin-offcanvas-bar{position:static;width:auto;background:none;-webkit-transform:translate3d(0, 0, 0);-ms-transform:translate3d(0, 0, 0);transform:translate3d(0, 0, 0)}.admin-offcanvas-bar:after{content:none}}@media only screen and (max-width: 640px){.admin-sidebar{width:inherit}.admin-offcanvas-bar{background:#f3f3f3}.admin-offcanvas-bar:after{background:#BABABA}.admin-sidebar-list a:hover,.admin-sidebar-list a:active{-webkit-transition:background-color 0.3s ease;transition:background-color 0.3s ease;background:#E4E4E4}.admin-content-list li{padding:10px;border-width:1px 0;margin-top:-1px}.admin-content-list li:first-child{border-top:none}.admin-content-list li:last-child{border-bottom:none}.admin-form-text{text-align:left !important}}.user-info{margin-bottom:15px}.user-info .am-progress{margin-bottom:4px}.user-info p{margin:5px}.user-info-order{font-size:1.4rem}.error-log .am-pre-scrollable{max-height:40rem}.table-main{font-size:1.4rem;padding:.5rem}.table-main button{background:#fff}.table-check{width:30px}.table-id{width:50px}@media only screen and (max-width: 640px){.table-select{margin-top:10px;margin-left:5px}}.gallery-list li{padding:10px}.gallery-list a{color:#666}.gallery-list a:hover{color:#3bb4f2}.gallery-title{margin-top:6px;font-size:1.4rem}.gallery-desc{font-size:1.2rem;margin-top:4px}.page-404{background:#fff;border:none;width:200px;margin:0 auto}.fixed-layout,.fixed-layout body{height:100%;overflow:hidden}.fixed-layout .admin-header{position:fixed;top:0;left:0;right:0;z-index:1500}.fixed-layout .admin-main{position:relative;height:100%;padding-top:51px}.fixed-layout .admin-content,.fixed-layout .admin-sidebar{height:100%;overflow-x:hidden;overflow-y:scroll}.fixed-layout .admin-sidebar.am-active{z-index:1600}input[type=file]{display:block;opacity:0;height:60px;width:100px;position:absolute;z-index:99}.form-horizontal .form-group{margin-left:0px;margin-right:0px}.datepicker{display:none;position:absolute;padding:4px;margin-top:1px;direction:ltr}.datepicker.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;list-style:none;background-color:#fff;border:1px solid rgba(0,0,0,0.2);border-radius:5px;box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;color:#333;font-size:13px;line-height:18px}.datepicker.dropdown-menu th{padding:4px 5px}.datepicker.dropdown-menu td{padding:4px 5px}.datepicker table{border:0;margin:0;width:auto}.datepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer}.datepicker td{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker td.active.day,.datepicker td.active.year{background:#2ba6cb}.datepicker td.old,.datepicker td.new{color:#999}.datepicker td span.active{background:#2ba6cb}.datepicker td.day.disabled{color:#ccc}.datepicker th{text-align:center;width:20px;height:20px;border:0;font-size:12px;padding:4px 8px;background:#fff;cursor:pointer}.datepicker th.active.day,.datepicker th.active.year{background:#2ba6cb}.datepicker th.date-switch{width:145px}.datepicker th span.active{background:#2ba6cb}.datepicker .cw{font-size:10px;width:12px;padding:0 2px 0 5px;vertical-align:middle}.datepicker.days div.datepicker-days{display:block}.datepicker.months div.datepicker-months{display:block}.datepicker.years div.datepicker-years{display:block}.datepicker thead tr:first-child th{cursor:pointer}.datepicker thead tr:first-child th.cw{cursor:default;background-color:transparent}.datepicker tfoot tr:first-child th{cursor:pointer}.datepicker-inline{width:220px}.datepicker-rtl{direction:rtl}.datepicker-rtl table tr td span{float:right}.datepicker-dropdown{top:0;left:0}.datepicker-dropdown:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:1px solid rgba(0,0,0,0.2);position:absolute;top:-7px;left:6px}.datepicker-dropdown:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:7px}.datepicker>div,.datepicker-dropdown::before,.datepicker-dropdown::after{display:none}.datepicker-close{position:absolute;top:-30px;right:0;width:15px;height:30px;padding:0;display:none}.table-striped .datepicker table tr td,.table-striped .datepicker table tr th{background-color:transparent}.panel-default .panel-heading{border-top:1px solid #e7e7e7}.red{color:red;font-family:bold}input[type=date],input[type=time],input[type=datetime-local],input[type=month]{line-height:0 !important}.show-grid{padding:10px}.brandBtn-group{width:150px;float:left;margin-right:8px}.brandBtn-group-lg{width:280px}.contentpanel td a{margin:0 3px}.mainwrapper .toggle-table tr{cursor:pointer}.mainwrapper .toggle-table tr.level1 td:nth-of-type(1){text-indent:2px}.mainwrapper .toggle-table tr.level2 td:nth-of-type(1){text-indent:15px}.mainwrapper .toggle-table tr.level3 td:nth-of-type(1){text-indent:30px}.pattrscroll{background:#F7F7F7}.pattrscroll ul{padding-left:0}.pattrscroll li{cursor:pointer}.mainwrapper .list-group-item.level1{text-indent:2px}.mainwrapper .list-group-item.level2{text-indent:15px}.mainwrapper .list-group-item.level3{text-indent:30px}.attr-item-active{background:#428bca;color:#fff}.pannel-scroll{height:500px;overflow-y:scroll;overflow-x:hidden}.attr-select{display:block;height:40px;line-height:40px;border:1px solid #ccc;border-radius:3px}#limit-table-box table{vertical-align:middle}#limit-table-box table th,#limit-table-box table td{text-align:center;vertical-align:middle}#limit-table-box table div.checkbox label{height:13px}#limit-table-box table .cover-img{width:100px}#limit-table-box table .width50{width:50px;text-align:center}.height40{height:40px;line-height:40px}.edit-cover-img{width:100px;margin:0 15px;float:left}.quota-text,.quota-img,.quota-video{width:300px;margin-bottom:15px}.quota-text img,.quota-img img,.quota-video img{width:100%}#text-editor{width:100%;max-width:100%;min-width:100%;height:300px;max-height:300px;min-height:300px}.product-detail input[type="text"]{width:100px}.main-table{-display:none}.bulk-import{display:none}#upload-input{display:inline-block;position:static;opacity:1;width:auto;height:auto}.excel-model{display:inline-block;width:110px;height:48px;line-height:48px;padding:0 0 0 50px;margin:0 200px;background:url(../images/excel.png) no-repeat left center}.panel-input{display:inline-block;width:100%}.panel-col,.panel-col2{float:left;width:150px;margin:0 10px}.panel-col2{width:280px} |
@@ -31,33 +31,6 @@ exports.res = [ | @@ -31,33 +31,6 @@ exports.res = [ | ||
31 | } | 31 | } |
32 | ] | 32 | ] |
33 | },{ | 33 | },{ |
34 | - //商品管理>【品类列表ajax更新】 | ||
35 | - route: '/product/sort/update', | ||
36 | - method: 'POST', | ||
37 | - url: '/product/updateProductSort', | ||
38 | - isJsonRaw:true, | ||
39 | - params: [ | ||
40 | - { | ||
41 | - name: 'param', | ||
42 | - type: 'Number' | ||
43 | - },{ | ||
44 | - name: 'sortName', | ||
45 | - type: 'String' | ||
46 | - },{ | ||
47 | - name: 'sortInitials', | ||
48 | - type: 'String' | ||
49 | - },{ | ||
50 | - name:'parentId', | ||
51 | - type: 'Number' | ||
52 | - },{ | ||
53 | - name: 'orderBy', | ||
54 | - type: 'Number' | ||
55 | - },{ | ||
56 | - name: 'status', | ||
57 | - type: 'Number' | ||
58 | - } | ||
59 | - ] | ||
60 | - },{ | ||
61 | //商品管理>【添加品类】页面渲染 | 34 | //商品管理>【添加品类】页面渲染 |
62 | route: '/product/class/new', | 35 | route: '/product/class/new', |
63 | method: 'GET', | 36 | method: 'GET', |
@@ -67,7 +40,9 @@ exports.res = [ | @@ -67,7 +40,9 @@ exports.res = [ | ||
67 | data: { | 40 | data: { |
68 | data: { | 41 | data: { |
69 | status: 1 | 42 | status: 1 |
70 | - } | 43 | + }, |
44 | + pagetitle:"添加品类", | ||
45 | + action:"/product/sort/addProductSort" | ||
71 | } | 46 | } |
72 | },{ | 47 | },{ |
73 | //商品管理>【添加品类】ajax请求接口 | 48 | //商品管理>【添加品类】ajax请求接口 |
@@ -77,18 +52,18 @@ exports.res = [ | @@ -77,18 +52,18 @@ exports.res = [ | ||
77 | isJsonRaw:true, | 52 | isJsonRaw:true, |
78 | params: [ | 53 | params: [ |
79 | { | 54 | { |
80 | - name: 'param', | ||
81 | - type: 'Number' | ||
82 | - },{ | ||
83 | name: 'sortName', | 55 | name: 'sortName', |
84 | type: 'String' | 56 | type: 'String' |
85 | },{ | 57 | },{ |
86 | name: 'sortInitials', | 58 | name: 'sortInitials', |
87 | type: 'String' | 59 | type: 'String' |
88 | },{ | 60 | },{ |
89 | - name:'parentId', | 61 | + name:'firstSortId', |
90 | type: 'Number' | 62 | type: 'Number' |
91 | },{ | 63 | },{ |
64 | + name:'secondSortId', | ||
65 | + type:'Number' | ||
66 | + },{ | ||
92 | name: 'orderBy', | 67 | name: 'orderBy', |
93 | type: 'Number' | 68 | type: 'Number' |
94 | },{ | 69 | },{ |
@@ -104,6 +79,10 @@ exports.res = [ | @@ -104,6 +79,10 @@ exports.res = [ | ||
104 | url: '/product/getProductSort', | 79 | url: '/product/getProductSort', |
105 | src: '/product/add', | 80 | src: '/product/add', |
106 | isJsonRaw:true, | 81 | isJsonRaw:true, |
82 | + data:{ | ||
83 | + pagetitle:"修改品类", | ||
84 | + action:"/product/sort/update" | ||
85 | + }, | ||
107 | params: [ | 86 | params: [ |
108 | { | 87 | { |
109 | name: 'param', | 88 | name: 'param', |
@@ -111,6 +90,36 @@ exports.res = [ | @@ -111,6 +90,36 @@ exports.res = [ | ||
111 | } | 90 | } |
112 | ] | 91 | ] |
113 | },{ | 92 | },{ |
93 | + //商品管理>【品类列表ajax更新】 | ||
94 | + route: '/product/sort/update', | ||
95 | + method: 'POST', | ||
96 | + url: '/product/updateProductSort', | ||
97 | + isJsonRaw:true, | ||
98 | + params: [ | ||
99 | + { | ||
100 | + name: 'id', | ||
101 | + type: 'Number' | ||
102 | + },{ | ||
103 | + name: 'sortName', | ||
104 | + type: 'String' | ||
105 | + },{ | ||
106 | + name: 'sortInitials', | ||
107 | + type: 'String' | ||
108 | + },{ | ||
109 | + name:'firstSortId', | ||
110 | + type: 'Number' | ||
111 | + },{ | ||
112 | + name:'secondSortId', | ||
113 | + type:'Number' | ||
114 | + },{ | ||
115 | + name: 'orderBy', | ||
116 | + type: 'Number' | ||
117 | + },{ | ||
118 | + name: 'status', | ||
119 | + type: 'Number' | ||
120 | + } | ||
121 | + ] | ||
122 | + },{ | ||
114 | //商品管理>【产品属性】页面渲染 | 123 | //商品管理>【产品属性】页面渲染 |
115 | route: '/erpproduct/attribute/index', | 124 | route: '/erpproduct/attribute/index', |
116 | method: 'GET', | 125 | method: 'GET', |
@@ -19,19 +19,19 @@ exports.res = [{ | @@ -19,19 +19,19 @@ exports.res = [{ | ||
19 | }, | 19 | }, |
20 | src:'/store/index' | 20 | src:'/store/index' |
21 | },{ | 21 | },{ |
22 | - // 店铺审核管理页面 | 22 | + // 店铺信息管理页面 |
23 | route: '/supplier/store/examine', | 23 | route: '/supplier/store/examine', |
24 | method: 'GET', | 24 | method: 'GET', |
25 | view: 'pages/store/index', | 25 | view: 'pages/store/index', |
26 | noApi:true, | 26 | noApi:true, |
27 | data: { | 27 | data: { |
28 | - gridurl:'/supplier/store/index', | 28 | + gridurl:'/supplier/store/indexPage', |
29 | authority:'{"btn":true,"operationStatus":2,"checkStatusArr":"200,300,900"}', //300,200,900 | 29 | authority:'{"btn":true,"operationStatus":2,"checkStatusArr":"200,300,900"}', //300,200,900 |
30 | dropCheckStatus:true, | 30 | dropCheckStatus:true, |
31 | pagetitle:{ | 31 | pagetitle:{ |
32 | level1title:"店铺管理", | 32 | level1title:"店铺管理", |
33 | - level2title:"创建店铺管理", | ||
34 | - level3title:"店铺审核列表" | 33 | + level2title:"店铺信息管理", |
34 | + level3title:"店铺信息列表" | ||
35 | } | 35 | } |
36 | }, | 36 | }, |
37 | src:'/store/index', | 37 | src:'/store/index', |
@@ -42,12 +42,12 @@ exports.res = [{ | @@ -42,12 +42,12 @@ exports.res = [{ | ||
42 | view: 'pages/store/index', | 42 | view: 'pages/store/index', |
43 | noApi:true, | 43 | noApi:true, |
44 | data: { | 44 | data: { |
45 | - gridurl:'/supplier/store/checkPage', | 45 | + gridurl:'/supplier/store/indexPage', |
46 | authority:'{"btn":false,"info":true,"operationStatus":0,"checkStatusArr":"200"}', | 46 | authority:'{"btn":false,"info":true,"operationStatus":0,"checkStatusArr":"200"}', |
47 | pagetitle:{ | 47 | pagetitle:{ |
48 | level1title:"店铺管理", | 48 | level1title:"店铺管理", |
49 | - level2title:"创建店铺管理", | ||
50 | - level3title:"店铺信息列表" | 49 | + level2title:"店铺审核管理", |
50 | + level3title:"店铺审核列表" | ||
51 | } | 51 | } |
52 | }, | 52 | }, |
53 | src:'/store/index', | 53 | src:'/store/index', |
@@ -6,19 +6,19 @@ exports.uploadFile=function(req,res){ | @@ -6,19 +6,19 @@ exports.uploadFile=function(req,res){ | ||
6 | 6 | ||
7 | // TODO 代理上传 | 7 | // TODO 代理上传 |
8 | // 方法1 | 8 | // 方法1 |
9 | - // if(req.is("multipart/form-data")){ | ||
10 | - // req.body.file=fs.createReadStream(req.files[req.body.filename].path); | ||
11 | - // request.post({url:domain+'/fileupload/upload',formData:req.body},function optionalCallback(err, httpResponse, body){ | ||
12 | - // res.json(JSON.parse(body)); | ||
13 | - // }); | ||
14 | - // }else{ | ||
15 | - // res.json({code:"500",message:"请求类型错误"}); | ||
16 | - // } | ||
17 | - res.json({ | ||
18 | - "code":200, | ||
19 | - "data" : "https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=1444256491,538988776&fm=80", | ||
20 | - "message":"success" | 9 | + if(req.is("multipart/form-data")){ |
10 | + req.body.file=fs.createReadStream(req.files[req.body.filename].path); | ||
11 | + request.post({url:domain+'/fileupload/upload',formData:req.body},function optionalCallback(err, httpResponse, body){ | ||
12 | + res.json(JSON.parse(body)); | ||
21 | }); | 13 | }); |
14 | + }else{ | ||
15 | + res.json({code:"500",message:"请求类型错误"}); | ||
16 | + } | ||
17 | + // res.json({ | ||
18 | + // "code":200, | ||
19 | + // "data" : "https://ss1.baidu.com/6ONXsjip0QIZ8tyhnq/it/u=1444256491,538988776&fm=80", | ||
20 | + // "message":"success" | ||
21 | + // }); | ||
22 | 22 | ||
23 | //方法2 | 23 | //方法2 |
24 | // req.pipe(request.post(domain+'/fileupload/upload')) | 24 | // req.pipe(request.post(domain+'/fileupload/upload')) |
@@ -22,12 +22,12 @@ | @@ -22,12 +22,12 @@ | ||
22 | <div class="col-md-12"> | 22 | <div class="col-md-12"> |
23 | <div class="panel panel-default"> | 23 | <div class="panel panel-default"> |
24 | <div class="panel-heading noborder"> | 24 | <div class="panel-heading noborder"> |
25 | - <h4 class="panel-title">添加品类</h4> | 25 | + <h4 class="panel-title">{{pagetitle}}</h4> |
26 | </div> | 26 | </div> |
27 | 27 | ||
28 | <div class="panel-body nopadding"> | 28 | <div class="panel-body nopadding"> |
29 | 29 | ||
30 | - <form id="new-class-form" class="form-horizontal form-bordered" method="post" action="/product/sort/addProductSort"> | 30 | + <form id="new-class-form" class="form-horizontal form-bordered" method="post" action="{{action}}"> |
31 | <div class="form-group"> | 31 | <div class="form-group"> |
32 | <label class="col-md-1 control-label"> | 32 | <label class="col-md-1 control-label"> |
33 | 物理类目<span class="red">*</span> | 33 | 物理类目<span class="red">*</span> |
@@ -54,8 +54,7 @@ | @@ -54,8 +54,7 @@ | ||
54 | </label> | 54 | </label> |
55 | 55 | ||
56 | <div class="col-md-5"> | 56 | <div class="col-md-5"> |
57 | - <select id="firstSortId" class="level-select width300" data-placeholder=""> | ||
58 | - <option id="parentSortId" value="0">请选择</option> | 57 | + <select id="firstSortId" class="level-select width300" data-value="{{data.firstSortId}}"> |
59 | </select> | 58 | </select> |
60 | </div> | 59 | </div> |
61 | </div> | 60 | </div> |
@@ -66,8 +65,7 @@ | @@ -66,8 +65,7 @@ | ||
66 | </label> | 65 | </label> |
67 | 66 | ||
68 | <div class="col-md-5"> | 67 | <div class="col-md-5"> |
69 | - <select id="secondSortId" class="level-select width300" data-placeholder=""> | ||
70 | - <option id="childSortId" value="0">请选择</option> | 68 | + <select id="secondSortId" class="form-control level-select width300" data-value="{{data.secondSortId}}" > |
71 | </select> | 69 | </select> |
72 | </div> | 70 | </div> |
73 | </div> | 71 | </div> |
@@ -90,7 +88,7 @@ | @@ -90,7 +88,7 @@ | ||
90 | </label> | 88 | </label> |
91 | 89 | ||
92 | <div class="col-md-5"> | 90 | <div class="col-md-5"> |
93 | - <input id="orderBy" class="form-control" required value="{{data.orderBy}}" type="text" placeholder=""> | 91 | + <input id="orderBy" class="form-control" required value="{{data.orderBy}}" type="number" placeholder=""> |
94 | </div> | 92 | </div> |
95 | </div> | 93 | </div> |
96 | 94 | ||
@@ -106,29 +104,30 @@ | @@ -106,29 +104,30 @@ | ||
106 | <input id="status" type="hidden" value="{{data.status}}" for="radio"> | 104 | <input id="status" type="hidden" value="{{data.status}}" for="radio"> |
107 | </div> | 105 | </div> |
108 | </div> | 106 | </div> |
107 | + <input id="id" class="form-control" type="hidden" value="{{data.id}}"> | ||
109 | 108 | ||
110 | <!--隐藏值--> | 109 | <!--隐藏值--> |
111 | - <div class="form-group hidden"> | ||
112 | - <label class="col-md-1 control-label">ID</label> | 110 | + <!-- <div class="form-group hidden"> --> |
111 | + <!-- <label class="col-md-1 control-label">ID</label> | ||
113 | 112 | ||
114 | <div class="col-md-5"> | 113 | <div class="col-md-5"> |
115 | <input id="param" class="form-control" value="{{data.id}}" level="{{data.sortLevel}}" pid="{{data.parentId}}" type="text"> | 114 | <input id="param" class="form-control" value="{{data.id}}" level="{{data.sortLevel}}" pid="{{data.parentId}}" type="text"> |
116 | - </div> | ||
117 | - </div> | 115 | + </div> --> |
116 | + <!-- </div> --> | ||
118 | 117 | ||
119 | - <div class="form-group hidden"> | ||
120 | - <label class="col-md-1 control-label">parentID</label> | 118 | + <!-- <div class="form-group hidden"> --> |
119 | + <!-- <label class="col-md-1 control-label">parentID</label> | ||
121 | 120 | ||
122 | <div class="col-md-5"> | 121 | <div class="col-md-5"> |
123 | <input id="parentId" class="form-control" value="{{data.parentId}}" type="text"> | 122 | <input id="parentId" class="form-control" value="{{data.parentId}}" type="text"> |
124 | - </div> | ||
125 | - </div> | 123 | + </div> --> |
124 | + <!-- </div> --> | ||
126 | </form> | 125 | </form> |
127 | </div> | 126 | </div> |
128 | 127 | ||
129 | <div class="panel-footer"> | 128 | <div class="panel-footer"> |
130 | - <button type="submit" class="btn btn-info btn-xs new-class-btn" data-id="{{data.id}}">保存</button> | ||
131 | - <a href="/erpproduct/sort/index" class="btn btn-default btn-xs">取消</a> | 129 | + <button type="submit" class="btn btn-success">保存</button> |
130 | + <a href="/erpproduct/sort/index" class="btn btn-danger">取消</a> | ||
132 | </div> | 131 | </div> |
133 | </div> | 132 | </div> |
134 | </div> | 133 | </div> |
@@ -40,11 +40,11 @@ | @@ -40,11 +40,11 @@ | ||
40 | </div> | 40 | </div> |
41 | <div class="form-group"> | 41 | <div class="form-group"> |
42 | <div class="col-sm-1 control-label"> | 42 | <div class="col-sm-1 control-label"> |
43 | - <label>店铺类型:</label> | 43 | + <label>店铺类型:<span class="red">*</span></label> |
44 | </div> | 44 | </div> |
45 | <div class="col-sm-9"> | 45 | <div class="col-sm-9"> |
46 | - <select name="shopNature" id="shopNature" value='{{shopNature}}' class="form-control"> | ||
47 | - <option value="">店铺类型</option> | 46 | + <select name="shopNature" id="shopNature" value='{{shopNature}}' required class="form-control"> |
47 | + <option value="-1">店铺类型</option> | ||
48 | <option value="1">旗舰店</option> | 48 | <option value="1">旗舰店</option> |
49 | <option value="2">直营店</option> | 49 | <option value="2">直营店</option> |
50 | </select> | 50 | </select> |
@@ -161,7 +161,7 @@ | @@ -161,7 +161,7 @@ | ||
161 | 161 | ||
162 | 162 | ||
163 | <script type="text/template" id="template"> | 163 | <script type="text/template" id="template"> |
164 | -<div class="row"> | 164 | +<div class="rows"> |
165 | <div class="form-group"> | 165 | <div class="form-group"> |
166 | <select name="brandname" id="brandname" style="width: 280px" tabindex="-1" class="select2-offscreen"> | 166 | <select name="brandname" id="brandname" style="width: 280px" tabindex="-1" class="select2-offscreen"> |
167 | <option value="-1">选择品牌</option> | 167 | <option value="-1">选择品牌</option> |
@@ -42,7 +42,7 @@ | @@ -42,7 +42,7 @@ | ||
42 | <div class="form-group"> | 42 | <div class="form-group"> |
43 | <label class="col-sm-2 control-label">营业执照号 <span class="red">*</span></label> | 43 | <label class="col-sm-2 control-label">营业执照号 <span class="red">*</span></label> |
44 | <div class="col-sm-8"> | 44 | <div class="col-sm-8"> |
45 | - <input type="text" id="supplierCode" placeholder="营业执照号" class="form-control" required value="{{supplierCode}}"> | 45 | + <input type="number" id="supplierCode" placeholder="营业执照号" class="form-control" required value="{{supplierCode}}"> |
46 | </div> | 46 | </div> |
47 | </div> | 47 | </div> |
48 | 48 | ||
@@ -90,7 +90,7 @@ | @@ -90,7 +90,7 @@ | ||
90 | <div class="form-group"> | 90 | <div class="form-group"> |
91 | <label class="col-sm-2 control-label">注册资本 <span class="red">*</span></label> | 91 | <label class="col-sm-2 control-label">注册资本 <span class="red">*</span></label> |
92 | <div class="col-sm-8"> | 92 | <div class="col-sm-8"> |
93 | - <input type="number" id="registeredCapital" placeholder="请填写注册资本" class="form-control" required value="{{registeredCapital}}" pattern="/^\d+$/"> | 93 | + <input type="text" id="registeredCapital" placeholder="请填写注册资本" class="form-control" required value="{{registeredCapital}}"> |
94 | </div> | 94 | </div> |
95 | </div> | 95 | </div> |
96 | 96 |
-
Please register or login to post a comment