c-hongqw1/zhgh_ypi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

福利整改，屏蔽发放时间字段，修改发放地点为发放部门

Browse Source
This commit is contained in:
=
2026-08-28 16:55:47 +08:00
parent 99c4e81768
commit 4ce900ee6a
6 changed files with 12 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/welfare/mine/selectView.js
+1 -5
View File
@@ -18,11 +18,7 @@ const selectView = {
<div class="info-value">{{ projectInfo.choiceTimeStart }} 至 {{ projectInfo.choiceTimeEnd }}</div> <div class="info-value">{{ projectInfo.choiceTimeStart }} 至 {{ projectInfo.choiceTimeEnd }}</div>
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="info-label">发放时间</div> <div class="info-label">发放部门</div>
<div class="info-value">{{ projectInfo.provideTimeStart }} 至 {{ projectInfo.provideTimeEnd }}</div>
</div>
<div class="info-item">
<div class="info-label">发放地点</div>
<div class="info-value">{{ projectInfo.provideAddress }}</div> <div class="info-value">{{ projectInfo.provideAddress }}</div>
</div> </div>
</div> </div>
src/main/resources/views/platform/zhgh/welfare/select/index.html
+2 -2
View File
@@ -63,8 +63,8 @@ layout("/layouts/platform.html"){
> >
<template scope="{row}" v-if="column.prop=='choiceTime'"> <template scope="{row}" v-if="column.prop=='choiceTime'">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
&ensp; {{$moment(row.choiceTimeStart) .format('YYYY/MM/DD HH:mm')}} &ensp; {{$moment(row.choiceTimeStart) .format('YYYY/MM/DD HH:mm:ss')}}
<span>- {{$moment(row.choiceTimeEnd) .format('YYYY/MM/DD HH:mm')}}</span> <span>- {{$moment(row.choiceTimeEnd) .format('YYYY/MM/DD HH:mm:ss')}}</span>
</template> </template>
<template scope="{row}" v-else-if="column.prop=='isChoose'"> <template scope="{row}" v-else-if="column.prop=='isChoose'">
src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js
+3 -8
View File
@@ -594,14 +594,9 @@ if (this.isSubmitting) return
formatTimeRange(start, end) { formatTimeRange(start, end) {
if (!start || !end) return "未设置" if (!start || !end) return "未设置"
const startDate = this.$moment(start).format("YYYY-MM-DD") const startText = this.$moment(start).format("YYYY-MM-DD HH:mm:ss")
const endDate = this.$moment(end).format("YYYY-MM-DD") const endText = this.$moment(end).format("YYYY-MM-DD HH:mm:ss")
return startText + " ~ " + endText
if (startDate === endDate) {
return startDate + " " + this.$moment(start).format("HH:mm") + "~" + this.$moment(end).format("HH:mm")
} else {
return startDate + " ~ " + endDate
}
}, },
// 提交选择 // 提交选择
src/main/resources/views/platform/zhghh5/welfare/mine/selectView.js
+1 -14
View File
@@ -41,21 +41,8 @@ const selectView = {
</div> </div>
</div> </div>
</div> </div>
<div class="info-row info-row--time">
<div class="info-row__label">发放时间</div>
<div class="info-row__value">
<div class="time-item time-item--start">{{
$moment(projectInfo.provideTimeStart).format('YYYY-MM-DD HH:mm')
}}
</div>
<div class="time-item time-item--end">{{
$moment(projectInfo.provideTimeEnd).format('YYYY-MM-DD HH:mm')
}}
</div>
</div>
</div>
<div class="info-row"> <div class="info-row">
<div class="info-row__label">发放地点</div> <div class="info-row__label">发放部门</div>
<div class="info-row__value">{{ projectInfo.provideAddress || '暂无' <div class="info-row__value">{{ projectInfo.provideAddress || '暂无'
}} }}
</div> </div>
src/main/resources/views/platform/zhghh5/welfare/select/index.html
+3 -10
View File
@@ -601,8 +601,6 @@ layout("/layouts/platform_h5.html"){
<div class="welfare-cell-group"> <div class="welfare-cell-group">
<van-cell title="选择时间" <van-cell title="选择时间"
:value="formatTimeRange(projectInfo.choiceTimeStart, projectInfo.choiceTimeEnd)"></van-cell> :value="formatTimeRange(projectInfo.choiceTimeStart, projectInfo.choiceTimeEnd)"></van-cell>
<van-cell title="发放时间"
:value="formatTimeRange(projectInfo.provideTimeStart, projectInfo.provideTimeEnd)"></van-cell>
<van-cell title="发放部门" :value="projectInfo.provideAddress"></van-cell> <van-cell title="发放部门" :value="projectInfo.provideAddress"></van-cell>
</div> </div>
</van-collapse-item> </van-collapse-item>
@@ -1149,14 +1147,9 @@ layout("/layouts/platform_h5.html"){
formatTimeRange(start, end) { formatTimeRange(start, end) {
if (!start || !end) return "未设置" if (!start || !end) return "未设置"
const startDate = this.$moment(start).format("YYYY-MM-DD") const startText = this.$moment(start).format("YYYY-MM-DD HH:mm:ss")
const endDate = this.$moment(end).format("YYYY-MM-DD HH:mm") const endText = this.$moment(end).format("YYYY-MM-DD HH:mm:ss")
return startText + " ~ " + endText
if (startDate === endDate) {
return startDate + " " + this.$moment(start).format("HH:mm") + "~" + this.$moment(end).format("HH:mm")
} else {
return startDate + " ~ " + endDate
}
}, },
// 获取发放模式名称 // 获取发放模式名称
src/main/resources/views/platform/zhghh5/welfare/select/list.html
+2 -2
View File
@@ -86,11 +86,11 @@ layout("/layouts/platform_h5.html"){
<div class="wf-card-heading">{{row.name}}</div> <div class="wf-card-heading">{{row.name}}</div>
<div class="wf-time-row"> <div class="wf-time-row">
<span class="wf-time-label">开始时间:</span> <span class="wf-time-label">开始时间:</span>
{{$moment(row.choiceTimeStart).format('YYYY-MM-DD HH:mm')}} {{$moment(row.choiceTimeStart).format('YYYY-MM-DD HH:mm:ss')}}
</div> </div>
<div class="wf-time-row"> <div class="wf-time-row">
<span class="wf-time-label">结束时间:</span> <span class="wf-time-label">结束时间:</span>
{{$moment(row.choiceTimeEnd).format('YYYY-MM-DD HH:mm')}} {{$moment(row.choiceTimeEnd).format('YYYY-MM-DD HH:mm:ss')}}
</div> </div>
</div> </div>
</div> </div>