|
...
|
...
|
@@ -43,9 +43,7 @@ var currentSelItem; |
|
|
|
var t = new common.tab({
|
|
|
|
el: "#basicTab",
|
|
|
|
click: function() {
|
|
|
|
|
|
|
|
var columnname = $(this).find('a').attr('columnname');
|
|
|
|
|
|
|
|
if (columnname == 'all') {
|
|
|
|
g.options.columns[1].hidden = false;
|
|
|
|
g.options.columns[2].hidden = true;
|
|
...
|
...
|
@@ -86,7 +84,6 @@ var t = new common.tab({ |
|
|
|
}]
|
|
|
|
}).init(ENUM.tips);
|
|
|
|
|
|
|
|
|
|
|
|
var g = new common.grid({
|
|
|
|
el: '#basicTable',
|
|
|
|
parms: function() {
|
|
...
|
...
|
@@ -94,7 +91,6 @@ var g = new common.grid({ |
|
|
|
brandId: common.util.__input("brandId"),
|
|
|
|
isPayDelivery: common.util.__input("isPayDelivery"),
|
|
|
|
checkStatus: ENUM.tab[t.active] //(t.active && t.active!='all') ? t.active : 400
|
|
|
|
|
|
|
|
};
|
|
|
|
},
|
|
|
|
columns: [{
|
|
...
|
...
|
@@ -107,11 +103,6 @@ var g = new common.grid({ |
|
|
|
render: function(item) {
|
|
|
|
var html = [];
|
|
|
|
html.push("<p>" + ENUM.status[item.isPayDelivery] + "</p>");
|
|
|
|
|
|
|
|
//if (item.status == 3 || item.status == 6) {
|
|
|
|
// html.push("<p style='color:red;'>" + filterNull(item, 'rejectReason') + "</p>");
|
|
|
|
//}
|
|
|
|
|
|
|
|
return html.join('');
|
|
|
|
}
|
|
|
|
},
|
|
...
|
...
|
@@ -122,20 +113,15 @@ var g = new common.grid({ |
|
|
|
render: function(item) {
|
|
|
|
var html = [];
|
|
|
|
html.push("<p>" + common.util.__filterNull(item, 'applicant') + "</p>");
|
|
|
|
|
|
|
|
return html.join('');
|
|
|
|
}
|
|
|
|
}, { //3
|
|
|
|
display: "申请时间",
|
|
|
|
hidden: true,
|
|
|
|
|
|
|
|
render: function(item) {
|
|
|
|
//var html = [];
|
|
|
|
//html.push("<p>" + common.util.__filterNull(item, 'createTime') + "</p>");
|
|
|
|
//return html.join('');
|
|
|
|
var t = new Date(item.createTime * 1000);
|
|
|
|
var formatted = common.util.__dateFormat(t, "yyyy-MM-dd hh:mm:ss");
|
|
|
|
return "<p>" + formatted + "</p>";
|
|
|
|
var html = [];
|
|
|
|
html.push("<p>" + common.util.__filterNull(item, 'createTime') + "</p>");
|
|
|
|
return html.join('');
|
|
|
|
}
|
|
|
|
},{
|
|
|
|
// 4
|
|
...
|
...
|
@@ -154,9 +140,7 @@ var g = new common.grid({ |
|
|
|
html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-danger btn-xs edit-class-btn" id="btn-item-close" data-type="close">关闭</a>');
|
|
|
|
} else {
|
|
|
|
html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-open" data-type="open">开启</a>');
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return html.join('');
|
|
|
|
}
|
|
|
|
},{ // 6
|
|
...
|
...
|
@@ -164,15 +148,11 @@ var g = new common.grid({ |
|
|
|
hidden: true,
|
|
|
|
render: function(item) {
|
|
|
|
var html = [];
|
|
|
|
|
|
|
|
html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-danger btn-xs edit-class-btn" id="btn-item-reject" data-type="reject">驳回</a>');
|
|
|
|
html.push('<a data-index="' + item.__index + '" href="JavaScript:;" class="btn operation btn-success btn-xs edit-class-btn" id="btn-item-pass" data-type="pass">通过</a>');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return html.join('');
|
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
|
|
|
]
|
|
|
|
});
|
|
|
|
g.init('/payDelivery/queryTotalBrandPayDelivery');
|
|
...
|
...
|
@@ -189,7 +169,7 @@ var loadTab = function() { |
|
|
|
t.init(__dt);
|
|
|
|
}, true);
|
|
|
|
}, 800);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
loadTab();
|
|
|
|
// 筛选
|
|
...
|
...
|
@@ -206,15 +186,11 @@ $(document).on('click', "#filter-btn", function() { |
|
|
|
|
|
|
|
|
|
|
|
$(document).on('click', ".edit-class-btn", function() {
|
|
|
|
console.log($(this).data('type'));
|
|
|
|
currentBtnType = $(this).data('type');
|
|
|
|
|
|
|
|
var url = '';
|
|
|
|
var alertContent;
|
|
|
|
currentSelItem = g.rows[$(this).data("index")];
|
|
|
|
var data = function() {
|
|
|
|
|
|
|
|
|
|
|
|
var reason = $('#reason').val();
|
|
|
|
if (reason === '' || $.trim(reason) === '') {
|
|
|
|
if(currentBtnType == 'reject') {
|
|
...
|
...
|
@@ -227,16 +203,16 @@ $(document).on('click', ".edit-class-btn", function() { |
|
|
|
rejectReason: reason,
|
|
|
|
isPayDelivery: currentBtnType=='open'?1:0,
|
|
|
|
checkStatus: currentBtnType=='pass'?200:300,
|
|
|
|
id: currentSelItem.id,
|
|
|
|
id: currentSelItem.id
|
|
|
|
|
|
|
|
};
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
switch (currentBtnType) {
|
|
|
|
case 'open':
|
|
|
|
{
|
|
|
|
url = '/payDelivery/addPayDeliveryCheck';
|
|
|
|
alertContent = '开启货到付款需组长审核，您确定提交此申请吗？';
|
|
|
|
alertContent = '开启货到付款无需组长审核，您确定开启吗？';
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
...
|
...
|
|
