-
发放地点
+
发放部门
{{ projectInfo.provideAddress || '暂无'
}}
diff --git a/src/main/resources/views/platform/zhghh5/welfare/select/index.html b/src/main/resources/views/platform/zhghh5/welfare/select/index.html
index 4ce499f..c7bb337 100644
--- a/src/main/resources/views/platform/zhghh5/welfare/select/index.html
+++ b/src/main/resources/views/platform/zhghh5/welfare/select/index.html
@@ -601,8 +601,6 @@ layout("/layouts/platform_h5.html"){
-
@@ -1149,14 +1147,9 @@ layout("/layouts/platform_h5.html"){
formatTimeRange(start, end) {
if (!start || !end) return "未设置"
- const startDate = this.$moment(start).format("YYYY-MM-DD")
- const endDate = this.$moment(end).format("YYYY-MM-DD HH:mm")
-
- if (startDate === endDate) {
- return startDate + " " + this.$moment(start).format("HH:mm") + "~" + this.$moment(end).format("HH:mm")
- } else {
- return startDate + " ~ " + endDate
- }
+ const startText = this.$moment(start).format("YYYY-MM-DD HH:mm:ss")
+ const endText = this.$moment(end).format("YYYY-MM-DD HH:mm:ss")
+ return startText + " ~ " + endText
},
// 获取发放模式名称
diff --git a/src/main/resources/views/platform/zhghh5/welfare/select/list.html b/src/main/resources/views/platform/zhghh5/welfare/select/list.html
index e8d34fa..eebd03e 100644
--- a/src/main/resources/views/platform/zhghh5/welfare/select/list.html
+++ b/src/main/resources/views/platform/zhghh5/welfare/select/list.html
@@ -86,11 +86,11 @@ layout("/layouts/platform_h5.html"){
{{row.name}}
开始时间:
- {{$moment(row.choiceTimeStart).format('YYYY-MM-DD HH:mm')}}
+ {{$moment(row.choiceTimeStart).format('YYYY-MM-DD HH:mm:ss')}}
结束时间:
- {{$moment(row.choiceTimeEnd).format('YYYY-MM-DD HH:mm')}}
+ {{$moment(row.choiceTimeEnd).format('YYYY-MM-DD HH:mm:ss')}}