From a158529a26884afbc1354241c6a997f29aa9cb43 Mon Sep 17 00:00:00 2001 From: "@jyuhsin" <729757837@qq.com> Date: Sun, 19 Oct 2025 18:29:28 +0800 Subject: [PATCH] commit --- .../evaluation/controller/EvaluateMineController.java | 1 + .../honor/controller/HonorManageController.java | 2 +- .../platform/zhgh/dayofficework/article/write/index.html | 2 +- .../zhgh/dayofficework/evaluation/activity/index.html | 1 - .../zhgh/dayofficework/evaluation/apply/index.html | 4 ++++ .../platform/zhgh/dayofficework/honor/manage/index.html | 7 ++++--- .../zhgh/dayofficework/honor/registration/index.html | 7 ++++--- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateMineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateMineController.java index e36fd5bc..2550ee8b 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateMineController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateMineController.java @@ -80,6 +80,7 @@ public class EvaluateMineController { Cnd cnd = Cnd.NEW(); cnd.andEX("YEAR(info.year)", "=", year); cnd.and("info.loginName", "=", SecurityUtil.getUserLoginname()); + cnd.desc("info.createdAt"); sql.setCondition(cnd); Pagination pagination = evaluateService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); return Result.success(pagination); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorManageController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorManageController.java index f594db8e..4f9e0ba3 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorManageController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/honor/controller/HonorManageController.java @@ -64,7 +64,7 @@ public class HonorManageController { Sql sql = Sqls.create(""" SELECT h.*, - u.loginname, + u.loginName, prize.`name` AS prizeName, type.`name` AS typeName, `level`.`name` AS levelName, diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html index 605c8669..7ec01755 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html @@ -145,7 +145,7 @@ layout("/layouts/platform.html"){ type: "warning" }).then(() => { this.$axios.post('/platform/article/write/submitAgain', { - info: JSON.stringify(this.formData), + article: JSON.stringify(this.formData), taskId: GetQueryString("taskId") }).then(res => { if (res.code === 0) { diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html index b3dd0c98..38d4c19e 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html @@ -236,7 +236,6 @@ layout("/layouts/platform.html"){ openAdd() { this.stepActive = 0 this.dialogVisible = true - this.formData={} this.$nextTick(() => { this.$refs.formRef.resetFields() }) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/index.html index b1107c65..1dadb9d8 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/index.html @@ -60,6 +60,10 @@ layout("/layouts/platform.html"){ }, methods: { openApply(row) { + if(this.$moment().isAfter(this.$moment(row.endTime))) { + this.$message.warning('申请时间已截止') + return + } $.post("/platform/evaluate/apply/valid", {id: row.id}).then((res) => { if (res.code === 0) { const {msg, data} = res diff --git a/src/main/resources/views/platform/zhgh/dayofficework/honor/manage/index.html b/src/main/resources/views/platform/zhgh/dayofficework/honor/manage/index.html index ce778863..0d7a6e61 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/honor/manage/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/honor/manage/index.html @@ -34,7 +34,7 @@ layout("/layouts/platform.html"){ - + @@ -262,8 +262,7 @@ layout("/layouts/platform.html"){ unitName }, openEdit(row) { - this.$store.dispatch("pjaxRoute", "/platform/honor/registration?id=" + row.id) - // window.location.href = "/platform/honor/registration?id=" + row.id + commonUtil.pjaxPush("/platform/honor/registration?id=" + row.id) }, async doDelete(row) { const { id } = row @@ -325,6 +324,7 @@ layout("/layouts/platform.html"){ } }, async honorTypeChange(val) { + this.tableData = [] this.honorPrizeList = await this.getHonorPrize(val) const data = this.honorTypeList.find((v) => v.id === val) if (data) { @@ -334,6 +334,7 @@ layout("/layouts/platform.html"){ } }, async created() { + this.unionList = await this.$businessTool.listUnion() await this.initData() await this.pageData() } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/honor/registration/index.html b/src/main/resources/views/platform/zhgh/dayofficework/honor/registration/index.html index f6570b39..56571b11 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/honor/registration/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/honor/registration/index.html @@ -230,9 +230,9 @@ layout("/layouts/platform.html"){ - + - + @@ -303,7 +303,7 @@ layout("/layouts/platform.html"){ if (res.code === 0) { this.$message.success("操作成功，即将跳转至台账界面") setTimeout(() => { - pjaxReplace("/platform/honor/manage") + commonUtil.pjaxPush("/platform/honor/manage") }, 500) } else { this.$message.error(res.msg) @@ -423,6 +423,7 @@ layout("/layouts/platform.html"){ }, created() { this.initData() + this.isEdit = GetQueryString("id") if (GetQueryString("id")) { this.findData(GetQueryString("id")) }