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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
c-zhangr1
2026-05-25 11:56:05 +08:00
parent 737dfd6587 5cfd2c418f
commit da0ce6d11c
5 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
+18 -10
View File
@@ -126,7 +126,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
style="width: 100%"
type="datetimerange"
v-model="formData.applyTime2"
value-format="yyyy-MM-dd HH:mm">
format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
@@ -627,6 +628,13 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
const resp = await this.$axios.post("/platform/club/examine/apply/getClubsByRole")
return resp.data
},
// 兼容历史分钟级时间，提交给后端统一补齐秒，避免首页活动同步解析失败。
normalizeDateTimeSecond(dateTime) {
if (dateTime && dateTime.length === 16) {
return dateTime + ":00"
}
return dateTime
},
// 保存
onSave() {
this.$confirm("您确定保存吗？", "提示", {
@@ -638,8 +646,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
formData.activity_type = this.activity_type
const {time, applyTime2, plannedDate} = formData
if (applyTime2 && applyTime2.length) {
formData.applyStartTime = applyTime2[0]
formData.applyEndTime = applyTime2[1]
formData.applyStartTime = this.normalizeDateTimeSecond(applyTime2[0])
formData.applyEndTime = this.normalizeDateTimeSecond(applyTime2[1])
formData.applyTime2 = null
}
if (time && time.length) {
@@ -684,8 +692,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
formData.activity_type = this.activity_type
const {time, applyTime2, plannedDate} = formData
if (applyTime2 && applyTime2.length) {
formData.applyStartTime = applyTime2[0]
formData.applyEndTime = applyTime2[1]
formData.applyStartTime = this.normalizeDateTimeSecond(applyTime2[0])
formData.applyEndTime = this.normalizeDateTimeSecond(applyTime2[1])
formData.applyTime2 = null
}
if (time && time.length) {
@@ -729,8 +737,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
formData.activity_type = this.activity_type
const {time, applyTime2, plannedDate} = formData
if (applyTime2 && applyTime2.length) {
formData.applyStartTime = applyTime2[0]
formData.applyEndTime = applyTime2[1]
formData.applyStartTime = this.normalizeDateTimeSecond(applyTime2[0])
formData.applyEndTime = this.normalizeDateTimeSecond(applyTime2[1])
formData.applyTime2 = null
}
if (time && time.length) {
@@ -807,8 +815,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
formData.activity_type = this.activity_type
const {time, applyTime2, plannedDate} = formData
if (applyTime2 && applyTime2.length) {
formData.applyStartTime = applyTime2[0]
formData.applyEndTime = applyTime2[1]
formData.applyStartTime = this.normalizeDateTimeSecond(applyTime2[0])
formData.applyEndTime = this.normalizeDateTimeSecond(applyTime2[1])
formData.applyTime2 = null
}
if (time && time.length) {
@@ -963,7 +971,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
if (data.billFiles && data.billFiles.length > 0) data.billFiles = JSON.parse(data.billFiles)
if (data.photoFiles && data.photoFiles.length > 0) data.photoFiles = JSON.parse(data.photoFiles)
if (data.otherFiles && data.otherFiles.length > 0) data.otherFiles = JSON.parse(data.otherFiles)
if (data.applyStartTime) data.applyTime2 = [data.applyStartTime, data.applyEndTime]
if (data.applyStartTime) data.applyTime2 = [this.normalizeDateTimeSecond(data.applyStartTime), this.normalizeDateTimeSecond(data.applyEndTime)]
if (data.startTime) data.time = [data.startTime, data.endTime]
if (data.startPlannedDate) data.plannedDate = [data.startPlannedDate, data.endPlannedDate]
this.userData = clone(data.tissuePersonList)