Authored by 陶雨

Merge branch 'release/qqtest' of http://git.dev.yoho.cn/platform/yohobuy-portal-…

…fe into release/qqtest
... ... @@ -249,12 +249,11 @@ var g = new common.grid({
html.push("<p>吊牌价:" + item.retailPrice + "</p>");
html.push("<p>销售价:" + item.salesPrice + "</p>");
//待审核和驳回列表中只显示吊牌价和销售价,通过的列表中显示四种
//待审核和驳回列表中只显示吊牌价和销售价,通过的列表中显示
if (item.isAuditing === 200) {
html.push("<p>是否VIP:" + YNEnum.enum[item.isVip] + "</p>");
//html.push("<p>yoho币:" + item.yohoCoin + "</p>");
html.push("<p>反yoho币金额:" + item.productPrice.returnCoin + "</p>");
}
return html.join('');
}
},
... ...
... ... @@ -137,8 +137,8 @@ var g = new common.grid({
salesPrice = item.salesPrice ? item.salesPrice : '';
return '<p><strong>吊牌价:</strong>' + retailPrice + '</p>' +
'<p><strong>销售价:</strong>' + salesPrice + '</p>' +
'<p><strong>是否VIP:</strong>' + vip + '</p>';
/*'<p style="color: #ccc;"><strong>yoho币:</strong>' + item.returnCoin + '</p>';*/
'<p><strong>是否VIP:</strong>' + vip + '</p>'+
'<p><strong>反yoho币金额:</strong>' + item.returnCoin + '</p>';
}
}, {
display: '库存',
... ...
... ... @@ -121,9 +121,6 @@ var g = new common.grid({
display: '银卡',
name: 'vip1_price'
}, {
display: '返币金额',
name: 'return_coin'
}, {
display: '操作信息',
name: 'operateInfo',
render: function(item) {
... ... @@ -232,7 +229,6 @@ $('#basicTable').on('click', '.modify-btn', function() {
product_skn: skn,
sales_price: $price.val(),
vip_discount_type: $select.val(),
return_coin: $wrap.find('.return-coin').val(),
vip_price: $vipPrice.val(),
vip1_price: $vip1Price.val(),
vip2_price: $vip2Price.val(),
... ... @@ -313,13 +309,9 @@ common.edit.ajaxfileupload("#upload-input", {
} else {
common.util.__tip(response.message, 'warning');
}
}
});
var isFirst = false,
tableHtml = '';
var p = new common.grid({
... ... @@ -406,11 +398,6 @@ var p = new common.grid({
return newPriceHtml + '<p style="color: #ccc;">' + item.oldProductPriceBo.vip2_price + '</p>';
}
}, {
display: '返币金额',
render: function(item) {
return item.newProductPriceBo.return_coin + '<p style="color: #ccc;">' + item.oldProductPriceBo.return_coin + '</p>';
}
}, {
display: '操作',
render: function(item) {
return '<a class="btn btn-info delete-btn" data-index="' + item.__index + '" href="javascript:;">删除</a>';
... ... @@ -425,17 +412,13 @@ $('#delete-all').on('click', function() {
successList.length = 0;
})
//批量变价列表单个删除
$('#priceTable').on('click', '.delete-btn', function() {
//var index = p.rows[$(this).data('index')];
successList.splice($(this).data('index'), 1);
p.reload();
// console.log(p.rows);
});
//确定变价
var path = ''; //确定变价后返回的excel名
$('#sure-change').on('click', function() {
... ... @@ -451,14 +434,6 @@ $('#sure-change').on('click', function() {
arr.push(value.newProductPriceBo);
});
// var count=Math.ceil(arr.length/200);
// for(var i=0;i<count;i++){
// item=arr.slice(i*200,(i+1)*200);
// }
// while(item=arr.slice(2,4)){
// }
data = JSON.stringify(arr);
console.log(data);
common.util.__ajax({
... ... @@ -472,7 +447,6 @@ $('#sure-change').on('click', function() {
path = res.data;
successList.length = 0;
});
});
$('#download-btn').on('click', function() {
... ...
... ... @@ -24,11 +24,12 @@ var gridParams = function() {
var select = tabTree.getAddress();
return {
auditStatus: $("#yohoCoinNav .active").data('status'),
product_skn: common.util.__input("skn"),
shop_id: common.util.__input("shop"),
brand_id: common.util.__input("brand"),
supplier_id: common.util.__input("supplier"),
productSkn: common.util.__input("skn"),
shopId: common.util.__input("shop"),
brandId: common.util.__input("brand"),
supplierId: common.util.__input("supplier"),
gender: common.util.__input("gender"),
auditorId: common.util.__input("auditor"),
maxSortId: select[0] ? select[0].id : "",
middleSortId: select[1] ? select[1].id : "",
smallSortId: select[2] ? select[2].id : "",
... ...
... ... @@ -99,6 +99,7 @@ exports.res = [
brand: true,
supplier: true,
gender: true,
auditor: true,
sortTree: true,
returnCoinTime: false
},
... ... @@ -111,12 +112,13 @@ exports.res = [
method: "POST",
url: "/yohoCoin/queryPageList4Audit ",
params:[
{name: 'auditStatus', type: 'Number'},
{name: 'productSkn', type: 'Number'},
{name: 'shopId', type: 'Number'},
{name: 'brandId', type: 'Number'},
{name: 'supplierId', type: 'Number'},
{name: 'gender', type: 'String'},
{name: 'auditStatus', type: 'Number'},
{name: 'auditorId', type: 'Number'},
{name: 'maxSortId', type: 'Number'},
{name: 'middleSortId', type: 'Number'},
{name: 'smallSortId', type: 'Number'},
... ...
... ... @@ -206,7 +206,6 @@
<th>白金价</th>
<th>金卡价</th>
<th>银卡价</th>
<th>YOHO</th>
<th>进货价</th>
<th>进货折扣</th>
<th>成本</th>
... ... @@ -238,9 +237,6 @@
<td>
<input class="vip1-price" type="text" value="{vip1_price}" disabled>
</td>
<td>
<input class="return-coin" type="text" value="{return_coin}">
</td>
<td>{purchase_price}</td>
<td>{purchase_discount}</td>
<td>{cost_price}</td>
... ...
... ... @@ -74,6 +74,16 @@
</div>
{{/ gender}}
{{# auditor}}
<div class="panel-col">
<select name="auditor" id="auditor" tabindex="-1" title="" class="form-control">
<option value="">请选择审核人</option>
<option value="2965">Tracy</option>
<option value="10235">David Wong</option>
</select>
</div>
{{/ auditor}}
{{# sortTree}}
<div class="panel-col2">
<div id="sortTree"></div>
... ...