From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
index a5c4f0f..ea7f157 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tSysReformist/tRedSet.js
@@ -20,17 +20,13 @@
{title: '操作人', field: 'handle', visible: true, align: 'center', valign: 'middle',
},
- {title: '红包可抵扣比例', field: 'proportion', visible: true, align: 'center', valign: 'middle',
+ {title: '红包可抵扣比例', field: 'deductionRatio', visible: true, align: 'center', valign: 'middle',
formatter: function (value, row) {
- var btn = "";
- if(row.proportion != '' && row.proportion != null) {
- var time = row.proportion;
- btn = time+"%"
- }
- return btn;
+
+ return value+"%";
}
},
- {title: '生效时间', field: 'startTime', visible: true, align: 'center', valign: 'middle',},
+ {title: '生效时间', field: 'effectiveDate', visible: true, align: 'center', valign: 'middle',},
];
};
--
Gitblit v1.7.1