fe / yohobuy-portal-fe · Commits

Go to a project

Authored by 陶雨
Commit 08c1bcc3ba1a0228e11f023647ed3f0d38ec5c07 2 parents f745c3c1 eb08d6fe

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

Inline Side-by-side
Showing 5 changed files with 21 additions and 17 deletions
@@ -175,9 +175,9 @@ var g=new common.grid({ @@ -175,9 +175,9 @@ var g=new common.grid({
175 }, 175 },
176 { 176 {
177 display:"<label class='red'>分类名称,款型编码,选择尺码,默认销售价必填</label>",render:function(item){ 177 display:"<label class='red'>分类名称,款型编码,选择尺码,默认销售价必填</label>",render:function(item){
178 - // if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){  
179 - // g.__gsm[item.__index]=item.goodsSizeList.length;  
180 - // } 178 + if(!item.isAdd&&!g.__gsm.hasOwnProperty(item.__index)){
  179 + g.__gsm[item.__index]=item.goodsSizeList.length;
  180 + }
181 var html=[]; 181 var html=[];
182 html.push("<div class='form-group'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+" class='factoryCode form-control' placeholder='款型编码' required/></div></div>"); 182 html.push("<div class='form-group'><div class='col-sm-11 red'><input type=text value='"+item.factoryCode+"' data-index="+item.__index+" class='factoryCode form-control' placeholder='款型编码' required/></div></div>");
183 html.push('<div class="rows" id="rows__'+item.__index+'">'); 183 html.push('<div class="rows" id="rows__'+item.__index+'">');
@@ -201,17 +201,19 @@ var g=new common.grid({ @@ -201,17 +201,19 @@ var g=new common.grid({
201 }); 201 });
202 } 202 }
203 g.__e.init(); 203 g.__e.init();
204 - // for(var i in g.__gsm){  
205 - // var warp=$("#rows__"+i).children(".form-group").slice(0, 1);  
206 - // warp.find("input").prop("readonly",true);  
207 - // warp.find("select").prop("disabled",true);  
208 - // warp.find("btn-sort-remove").remove();  
209 - // } 204 + for(var i in g.__gsm){
  205 + var warp=$("#rows__"+i).children(".form-group").slice(0, 1);
  206 + warp.find("input").prop("readonly",true);
  207 + warp.find("select").prop("disabled",true);
  208 + warp.find("btn-sort-remove").remove();
  209 + warp.find(".btn-sort-kucun").prop("readonly",false);
  210 + }
210 for(var i=0;i<g.__length;i++){ 211 for(var i=0;i<g.__length;i++){
211 var warp=$("#basicTable").find("tbody").children("tr").eq(i); 212 var warp=$("#basicTable").find("tbody").children("tr").eq(i);
212 - warp.find("input").prop("readonly",true).prop("disabled",true);  
213 - warp.find("select").prop("disabled",true);  
214 - warp.find("button").remove(); 213 + warp.find(".w-goods-text").prop("readonly",true).prop("disabled",true);
  214 + warp.find("input[name=file]").prop("readonly",true).prop("disabled",true);
  215 + warp.find(".factoryCode").prop("readonly",true).prop("disabled",true);
  216 + warp.find(".sortdelete").remove();
215 } 217 }
216 } 218 }
217 }); 219 });
@@ -56,6 +56,8 @@ dropDown.prototype = { @@ -56,6 +56,8 @@ dropDown.prototype = {
56 var param={}; 56 var param={};
57 if(Object.prototype.toString.call(option.params)=="[object Function]"){ 57 if(Object.prototype.toString.call(option.params)=="[object Function]"){
58 param=option.params(); 58 param=option.params();
  59 + }else{
  60 + param=option.params;
59 } 61 }
60 62
61 var data = $.extend({}, { 63 var data = $.extend({}, {
@@ -106,7 +106,9 @@ tabTree.prototype= { @@ -106,7 +106,9 @@ tabTree.prototype= {
106 p.stepMet(g.selected, g.active_count) 106 p.stepMet(g.selected, g.active_count)
107 } 107 }
108 g.changeVolume(); 108 g.changeVolume();
109 - // g.setHeadVal(); 109 + if(!p.url){
  110 + g.setHeadVal();
  111 + }
110 return event.stopPropagation() 112 return event.stopPropagation()
111 }); 113 });
112 $(document).click(function() { 114 $(document).click(function() {
@@ -14,10 +14,10 @@ var config = { @@ -14,10 +14,10 @@ var config = {
14 apiKey: 'sd4H1ecAqlp', 14 apiKey: 'sd4H1ecAqlp',
15 //http: //192.168.102.214:8088/platform 15 //http: //192.168.102.214:8088/platform
16 // domain: 'http://172.16.6.240:8088/platform', 16 // domain: 'http://172.16.6.240:8088/platform',
17 - // domain:'http://172.16.6.240:8088/platform', 17 + domain:'http://172.16.6.240:8088/platform',
18 // domain: 'http://172.16.6.252:9080',//陈超 18 // domain: 'http://172.16.6.252:9080',//陈超
19 // domain:'http://172.16.6.227:8088/platform',//玛丽 19 // domain:'http://172.16.6.227:8088/platform',//玛丽
20 - domain: 'http://192.168.102.202:8088/platform', 20 + // domain: 'http://192.168.102.202:8088/platform',
21 loggers: { 21 loggers: {
22 api: { 22 api: {
23 level: 'verbose', 23 level: 'verbose',
@@ -82,8 +82,6 @@ @@ -82,8 +82,6 @@
82 <div class="panel-footer"> 82 <div class="panel-footer">
83 [[if isAuditing!="200"&&isAuditing!="300"]] 83 [[if isAuditing!="200"&&isAuditing!="300"]]
84 <button class="btn btn-primary apply-success">通过</button> 84 <button class="btn btn-primary apply-success">通过</button>
85 - [[/if]]  
86 - [[if isAuditing!="300"]]  
87 <button class="btn btn-primary apply-back">驳回</button> 85 <button class="btn btn-primary apply-back">驳回</button>
88 [[/if]] 86 [[/if]]
89 </div> 87 </div>