Authored by weiqingting

bug xiugai

@@ -181,7 +181,7 @@ if(!param){//RESPONSEDATA.isAuditing!=200 @@ -181,7 +181,7 @@ if(!param){//RESPONSEDATA.isAuditing!=200
181 }}); 181 }});
182 182
183 new common.dropDown({el:"#supplierId",ajax:"getjitSup",params:function(){ 183 new common.dropDown({el:"#supplierId",ajax:"getjitSup",params:function(){
184 - return {brandId:$("#brandId").val()} 184 + return {brandId:$("#brandId").val(),shopId:$("#shopId").val()}
185 }}); 185 }});
186 } 186 }
187 187
@@ -193,6 +193,11 @@ $('#basicTable').on('click', '.modify-btn', function() { @@ -193,6 +193,11 @@ $('#basicTable').on('click', '.modify-btn', function() {
193 var discountType = data.vip_discount_type; //折扣类型 193 var discountType = data.vip_discount_type; //折扣类型
194 194
195 console.log("返回Yoho币数量:" + returnCoin); 195 console.log("返回Yoho币数量:" + returnCoin);
  196 +
  197 + if(data.return_coin>0){
  198 + $vipPrice.attr('disabled', true);
  199 + }
  200 +
196 vipPrice(); 201 vipPrice();
197 if(returnCoin > 0){ //yoho币已设置 202 if(returnCoin > 0){ //yoho币已设置
198 if(retailPrice == salePrice && discountType == 3){ 203 if(retailPrice == salePrice && discountType == 3){
@@ -139,7 +139,8 @@ exports.res = [ @@ -139,7 +139,8 @@ exports.res = [
139 method:'POST', 139 method:'POST',
140 url:'/AgreementRest/getJitSupplierByBrandId', 140 url:'/AgreementRest/getJitSupplierByBrandId',
141 params:[ 141 params:[
142 - {name:"brandId",type:"Number"} 142 + {name:"brandId",type:"Number"},
  143 + {name:"shopId",type:"Number"}
143 ] 144 ]
144 },{ 145 },{
145 route:'/ajax/guang/article/getSortList', 146 route:'/ajax/guang/article/getSortList',