fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 马力
Commit 90a4dae4fe27c24963973da5e4193d10e1d8a1ba 1 parent 8f810d14

经营模式

Inline Side-by-side
Showing 4 changed files with 11 additions and 4 deletions
@@ -174,7 +174,8 @@ module.exports={ @@ -174,7 +174,8 @@ module.exports={
174 {name: "brandId", type: "Number"}, 174 {name: "brandId", type: "Number"},
175 {name: "sortId", type: "Number"}, 175 {name: "sortId", type: "Number"},
176 {name: "supplierId", type: "Number"}, 176 {name: "supplierId", type: "Number"},
177 - {name: "shopId", type: "Number"} 177 + {name: "shopId", type: "Number"},
  178 + {name: "sellType", type: "Number"}
178 ] 179 ]
179 }, 180 },
180 queryAllMaxSortList:{ 181 queryAllMaxSortList:{
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
178 <div class="panel-col" style="position: relative;"> 178 <div class="panel-col" style="position: relative;">
179 <input id="baseProduct" name="file" data-type="baseProduct" type="file" style="cursor: pointer; height: 37px; top: 8px;"> 179 <input id="baseProduct" name="file" data-type="baseProduct" type="file" style="cursor: pointer; height: 37px; top: 8px;">
180 </div> 180 </div>
181 - <div class="panel-col" style="line-height: 40px;position: relative;left: -60px;"> 181 + <div class="panel-col" style="line-height: 40px;position: relative;left: -60px;width: 182px;">
182 <span class="red">必须输入品牌、店铺、经营模式</span> 182 <span class="red">必须输入品牌、店铺、经营模式</span>
183 </div> 183 </div>
184 </td> 184 </td>
@@ -92,7 +92,7 @@ var SORTDATA={ @@ -92,7 +92,7 @@ var SORTDATA={
92 {id:RESPONSEDATA.sortId,sortName:RESPONSEDATA.sortName} 92 {id:RESPONSEDATA.sortId,sortName:RESPONSEDATA.sortName}
93 ], 93 ],
94 otherParam:function(){ 94 otherParam:function(){
95 - return {brandId:$("#brandId").val(),supplierId:common.util.__input("supplierId"),shopId:common.util.__input("shopId")} 95 + return {brandId:$("#brandId").val(),supplierId:common.util.__input("supplierId"),shopId:common.util.__input("shopId"),sellType:common.util.__input("sellType")}
96 }, 96 },
97 complete:function(data,bool){ 97 complete:function(data,bool){
98 if(!bool){ 98 if(!bool){
@@ -198,6 +198,8 @@ var g=new common.grid({ @@ -198,6 +198,8 @@ var g=new common.grid({
198 }else{ 198 }else{
199 if(item.isNew){ 199 if(item.isNew){
200 html.push("<p>厂家颜色:</p><p><input type='text' id='factoryGoodsName' class='w-goods-text form-control' data-index="+item.__index+" value='"+item.goodsName+"' placeholder='厂家颜色' required style='padding: 10px; width: 150px' /></p>"); 200 html.push("<p>厂家颜色:</p><p><input type='text' id='factoryGoodsName' class='w-goods-text form-control' data-index="+item.__index+" value='"+item.goodsName+"' placeholder='厂家颜色' required style='padding: 10px; width: 150px' /></p>");
  201 + }else if(RESPONSEDATA.sellType == 3 || RESPONSEDATA.isJit == 'Y'){ // JIT上架后的商品也可以修改厂家颜色
  202 + html.push("<p>厂家颜色:</p><p><input type='text' id='factoryGoodsName' class='w-goods-text form-control' data-index="+item.__index+" value='"+txt+"' placeholder='厂家颜色' required style='padding: 10px; width: 150px' /></p>");
201 }else{ 203 }else{
202 html.push("<p>厂家颜色:</p><p><input type='text' id='factoryGoodsName' disabled='disabled' class='w-goods-text form-control' data-index="+item.__index+" value='"+txt+"' placeholder='厂家颜色' required style='padding: 10px; width: 150px' /></p>"); 204 html.push("<p>厂家颜色:</p><p><input type='text' id='factoryGoodsName' disabled='disabled' class='w-goods-text form-control' data-index="+item.__index+" value='"+txt+"' placeholder='厂家颜色' required style='padding: 10px; width: 150px' /></p>");
203 } 205 }
@@ -368,6 +370,10 @@ $(document).on("change","#supplierId",function(){ // 不维护供应商 @@ -368,6 +370,10 @@ $(document).on("change","#supplierId",function(){ // 不维护供应商
368 $("#sellType").val(-1).trigger("change"); 370 $("#sellType").val(-1).trigger("change");
369 }); 371 });
370 372
  373 +$(document).on("change","#sellType",function(){
  374 + tabTree.isfeeze=false;
  375 + tabTree.init([{id:"",sortName:""},{id:"",sortName:""},{id:"",sortName:""},{id:"",sortName:""}]);
  376 +});
371 377
372 $(document).on("change",":radio[name=gender]",function(){ 378 $(document).on("change",":radio[name=gender]",function(){
373 Bll.productNameArr[1]=["男","女","通用"][+$(this).val()-1]; 379 Bll.productNameArr[1]=["男","女","通用"][+$(this).val()-1];
@@ -688,7 +688,7 @@ var shelveTable = new common.grid({ @@ -688,7 +688,7 @@ var shelveTable = new common.grid({
688 } 688 }
689 } 689 }
690 }, { 690 }, {
691 - display: '<div class="subhhead"><span>SKU</span><span>尺码</span><span>库存</span><span>SKU上架操作</span><span>SKU上架操作</span></div>', 691 + display: '<div class="subhhead"><span>SKU</span><span>尺码</span><span>库存</span><span>SKU状态</span><span>SKU上架操作</span></div>',
692 render: function (item) { 692 render: function (item) {
693 return common.util.__template2($("#template2").html(), item) 693 return common.util.__template2($("#template2").html(), item)
694 } 694 }