From 4ce900ee6a0d85e85d2647012e90542bb49e84ba Mon Sep 17 00:00:00 2001
From: = <=>
Date: Fri, 28 Aug 2026 16:55:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E6=95=B4=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=8F=91=E6=94=BE=E6=97=B6=E9=97=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=8F=91=E6=94=BE=E5=9C=B0?=
 =?UTF-8?q?=E7=82=B9=E4=B8=BA=E5=8F=91=E6=94=BE=E9=83=A8=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/zhgh/welfare/mine/selectView.js      |  6 +-----
 .../views/platform/zhgh/welfare/select/index.html |  4 ++--
 .../platform/zhgh/welfare/select/optionSelect.js  | 11 +++--------
 .../platform/zhghh5/welfare/mine/selectView.js    | 15 +--------------
 .../platform/zhghh5/welfare/select/index.html     | 13 +++----------
 .../platform/zhghh5/welfare/select/list.html      |  4 ++--
 6 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/src/main/resources/views/platform/zhgh/welfare/mine/selectView.js b/src/main/resources/views/platform/zhgh/welfare/mine/selectView.js
index 36fbbaf..28bad74 100644
--- a/src/main/resources/views/platform/zhgh/welfare/mine/selectView.js
+++ b/src/main/resources/views/platform/zhgh/welfare/mine/selectView.js
@@ -18,11 +18,7 @@ const selectView = {
                             <div class="info-value">{{ projectInfo.choiceTimeStart }} 至 {{ projectInfo.choiceTimeEnd }}</div>
                         </div>
                         <div class="info-item">
-                            <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-label">发放部门</div>
                             <div class="info-value">{{ projectInfo.provideAddress }}</div>
                         </div>
                     </div>
diff --git a/src/main/resources/views/platform/zhgh/welfare/select/index.html b/src/main/resources/views/platform/zhgh/welfare/select/index.html
index a6cae45..bfde4da 100644
--- a/src/main/resources/views/platform/zhgh/welfare/select/index.html
+++ b/src/main/resources/views/platform/zhgh/welfare/select/index.html
@@ -63,8 +63,8 @@ layout("/layouts/platform.html"){
                     >
                         <template scope="{row}" v-if="column.prop=='choiceTime'">
                             <i class="el-icon-time"></i>
-                            &ensp; {{$moment(row.choiceTimeStart) .format('YYYY/MM/DD HH:mm')}}
-                            <span>- {{$moment(row.choiceTimeEnd) .format('YYYY/MM/DD HH:mm')}}</span>
+                            &ensp; {{$moment(row.choiceTimeStart) .format('YYYY/MM/DD HH:mm:ss')}}
+                            <span>- {{$moment(row.choiceTimeEnd) .format('YYYY/MM/DD HH:mm:ss')}}</span>
                         </template>
 
                         <template scope="{row}" v-else-if="column.prop=='isChoose'">
diff --git a/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js b/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js
index ec17e0d..d32f665 100644
--- a/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js
+++ b/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js
@@ -594,14 +594,9 @@ if (this.isSubmitting) return
         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")
-
-            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/mine/selectView.js b/src/main/resources/views/platform/zhghh5/welfare/mine/selectView.js
index dac6548..38c4bbe 100644
--- a/src/main/resources/views/platform/zhghh5/welfare/mine/selectView.js
+++ b/src/main/resources/views/platform/zhghh5/welfare/mine/selectView.js
@@ -41,21 +41,8 @@ const selectView = {
                                                     </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__label">发放地点</div>
+                                                <div class="info-row__label">发放部门</div>
                                                 <div class="info-row__value">{{ projectInfo.provideAddress || '暂无'
                                                     }}
                                                 </div>
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"){
                         <div class="welfare-cell-group">
                             <van-cell title="选择时间"
                                       :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>
                         </div>
                     </van-collapse-item>
@@ -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"){
                             <div class="wf-card-heading">{{row.name}}</div>
                             <div class="wf-time-row">
                                 <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 class="wf-time-row">
                                 <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>