餐补审核界面添加餐补模式
diff --git a/src/main/resources/templates/restaurant/discountrule/rule.html b/src/main/resources/templates/restaurant/discountrule/rule.html
index 55a2568..87ffeb4 100644
--- a/src/main/resources/templates/restaurant/discountrule/rule.html
+++ b/src/main/resources/templates/restaurant/discountrule/rule.html
@@ -67,7 +67,6 @@
},
{
field: 'rulemode', title: '餐补模式', align: 'center', width: 120, sort: true, templet: function (d) {
- console.log(d);
if ('day' == d.rulemode) {
return '按日';
} else if ('month' == d.rulemode) {
diff --git a/src/main/resources/templates/restaurant/discountrule/rulecheck.html b/src/main/resources/templates/restaurant/discountrule/rulecheck.html
index 75bcab1..96891f9 100644
--- a/src/main/resources/templates/restaurant/discountrule/rulecheck.html
+++ b/src/main/resources/templates/restaurant/discountrule/rulecheck.html
@@ -51,7 +51,7 @@
cols: [
[
{field: 'rulename', title: '餐补名称', align: 'center', fixed: 'left'},
- {field: 'timeperiod', title: '优惠时间段',width:100,align: 'center'},
+ {field: 'timeperiod', title: '优惠时间段',width:150,align: 'center'},
{
field: 'ruletype',
title: '餐补类型',
@@ -71,6 +71,17 @@
}
},
{
+ field: 'rulemode', title: '餐补模式', align: 'center', width: 120, sort: true, templet: function (d) {
+ if ('day' == d.rulemode) {
+ return '按日';
+ } else if ('month' == d.rulemode) {
+ return '按月';
+ } else {
+ return '按日';
+ }
+ }
+ },
+ {
field: 'amount', title: '金额/折率', align: 'center', sort: true, templet: function (d) {
if ('discount' == d.ruletype) {
return d.amount + '折';
@@ -83,7 +94,6 @@
field: 'status',
title: '状态',
align: 'center',
- width: 120,
sort: true,
templet: function (d) {
if ('uncheck' == d.status) {
@@ -102,7 +112,6 @@
{
align: 'center',
title: '操作',
- width: 250,
toolbar: '#discountrule-check-table-bar',
fixed: 'right'
}