记得上下班打卡 | git大法好,push需谨慎

Commit 3b7ed63e authored by dongchun's avatar dongchun

修改缺陷

parent 9d94d5d9
...@@ -346,16 +346,9 @@ ...@@ -346,16 +346,9 @@
} }
}, },
{ {
field: 'WinPrizeNum', field: 'winPrizeNum',
align: 'center', align: 'center',
title: '已发出', title: '已发出'
formatter: function(value, row, index) {
if (value) {
return value;
} else {
return '-'
}
}
}, },
{ {
field: 'residue', field: 'residue',
...@@ -363,7 +356,7 @@ ...@@ -363,7 +356,7 @@
title: '奖品剩余', title: '奖品剩余',
formatter: function(value, row, index) { formatter: function(value, row, index) {
if (itemId) { if (itemId) {
return (row.prizeNum - row.WinPrizeNum) || '-' return (row.prizeNum - row.winPrizeNum) || '-'
} else { } else {
return '-' return '-'
} }
...@@ -420,16 +413,20 @@ ...@@ -420,16 +413,20 @@
$("input[name='sex'][value='2']").attr('checked', true).siblings().removeAttr('checked'); $("input[name='sex'][value='2']").attr('checked', true).siblings().removeAttr('checked');
} }
integralActivityId = res.integralActivityId; integralActivityId = res.integralActivityId;
$("#endTime").val($.common.dateFormat(res.endTime, 'yyyy-MM-dd HH:mm:ss'));
online = res.isOnline; online = res.isOnline;
if (online == 2) { if (online == 2) {
$("input[name='online'][value='2']").attr('checked', true).siblings().removeAttr('checked'); $("input[name='online'][value='2']").attr('checked', true).siblings().removeAttr('checked');
} }
// prizeList: data, // prizeList: data,
$("#startTime").val($.common.dateFormat(res.startTime, 'yyyy-MM-dd HH:mm:ss'));
timeType = res.timeType; timeType = res.timeType;
if (timeType == 2) { if (timeType == 2) {
$("input[name='sendType'][value='2']").attr('checked', true).siblings().removeAttr('checked'); $("input[name='sendType'][value='2']").attr('checked', true).siblings().removeAttr('checked');
$("#endTime").val($.common.dateFormat(res.endTime, 'yyyy-MM-dd HH:mm:ss'));
$("#startTime").val($.common.dateFormat(res.startTime, 'yyyy-MM-dd HH:mm:ss'));
} else {
$("#endTime").val("");
$("#startTime").val("");
} }
data = [...res.prizeList] data = [...res.prizeList]
options.data = data; options.data = data;
...@@ -445,7 +442,7 @@ ...@@ -445,7 +442,7 @@
prizeImgInit: "", prizeImgInit: "",
prizeImgSelect: "", prizeImgSelect: "",
winnersNum: "", winnersNum: "",
WinPrizeNum: "", winPrizeNum: "",
prizeType: "", prizeType: "",
winningProbability: "", winningProbability: "",
residue: "", residue: "",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment