From c1263c753d184bdcee9f22d5175ea9ef8b4adfef Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Fri, 29 Aug 2025 18:01:56 +0800 Subject: [PATCH] commit --- .../evaluation/models/EvaluateApply.java | 5 + .../service/impl/EvaluateServiceImpl.java | 2 +- .../evaluation/activity/index.html | 3 + .../dayofficework/evaluation/apply/apply.js | 98 +++++++++++-------- .../evaluation/branchUnionApproval/index.html | 34 +++++-- .../dayofficework/evaluation/mine/index.html | 6 +- .../evaluation/schoolUnionApproval/index.html | 39 ++++++-- .../evaluation/summary/index.html | 37 ++++--- 8 files changed, 148 insertions(+), 76 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java index 0a663387..72aae46f 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java @@ -50,6 +50,11 @@ public class EvaluateApply extends BaseModel { @Comment("姓名") private String userName; + @Column + @ColDefine(type = ColType.VARCHAR, width = 100) + @Comment("联系方式") + private String mobile; + @Column @Comment("出生日期") @ColDefine(type = ColType.DATE) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/service/impl/EvaluateServiceImpl.java b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/service/impl/EvaluateServiceImpl.java index 48ded2a2..f43833ef 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/service/impl/EvaluateServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/service/impl/EvaluateServiceImpl.java @@ -55,7 +55,7 @@ public class EvaluateServiceImpl extends BaseServiceImpl implemen $condition """); Cnd cnd = Cnd.NEW(); - cnd.andEX("YEAR(info.year)", "=", pageForm.getYear()); + cnd.andEX("YEAR(info.applyDateTime)", "=", pageForm.getYear()); cnd.andEX("info.evaluateId", "=", pageForm.getEvaluateId()); cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode()); cnd.andEX("info.unitId", "=", pageForm.getUnitId()); 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 44c57558..b3dd0c98 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 @@ -237,6 +237,9 @@ layout("/layouts/platform.html"){ this.stepActive = 0 this.dialogVisible = true this.formData={} + this.$nextTick(() => { + this.$refs.formRef.resetFields() + }) this.$refs.formRef.clearValidate() this.$axios.post("/platform/evaluate/activity/initQuotaAllocations").then((res) => { if (res.code === 0) { diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js index d6788268..363c02b3 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js +++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js @@ -24,10 +24,59 @@ const apply_component = { - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -41,46 +90,6 @@ const apply_component = { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -151,6 +165,7 @@ const apply_component = { unionName: [{required: true, message: "必填", trigger: ["change", "blur"]}], birthday: [{required: true, message: "必填", trigger: ["change", "blur"]}], sex: [{required: true, message: "必填", trigger: ["change", "blur"]}], + mobile: [{required: true, message: "必填", trigger: ["change", "blur"]}], nation: [{required: true, message: "必填", trigger: ["change", "blur"]}], political: [{required: true, message: "必填", trigger: ["change", "blur"]}], education: [{required: true, message: "必填", trigger: ["change", "blur"]}], @@ -264,6 +279,7 @@ const apply_component = { this.$set(this.formData, "unionId", user.union ? user.union.id : null) this.$set(this.formData, "unionName", user.union ? user.union.name : null) this.$set(this.formData, "sex", user.sex) + this.$set(this.formData, "mobile", user.mobile) this.$set(this.formData, "birthday", user.birthday) this.$set(this.formData, "nation", user.nation) this.$set(this.formData, "political", user.political) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/branchUnionApproval/index.html b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/branchUnionApproval/index.html index 28460b8a..ef48add4 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/branchUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/branchUnionApproval/index.html @@ -8,7 +8,14 @@ layout("/layouts/platform.html"){ + placeholder="选择年度" @change="listEvaluate"> + + + + + - - + + + @@ -105,11 +113,13 @@ layout("/layouts/platform.html"){ data() { return { pageForm: { - approval: false, - searchName: "info.userName" + year: new Date().getFullYear() + "", + searchName: "info.userName", + approval:false }, unionList: [], unitList: [], + evaluateList: [], showApprovalForm: false } }, @@ -168,9 +178,21 @@ layout("/layouts/platform.html"){ }) }) }, + listEvaluate() { + this.$set(this.pageForm, "evaluateId","") + this.$axios.post("/platform/evaluate/activity/listEvaluateActivityByYear", {year: this.pageForm.year}).then(resp => { + if (resp.code===0){ + this.evaluateList = resp.data + if (resp.data.length > 0) { + this.$set(this.pageForm, "evaluateId", resp.data[0].id) + } + this.pageData() + } + }) + }, }, async created() { - this.pageData() + this.listEvaluate() } }) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/mine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/mine/index.html index 0826d535..e2a3c84c 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/mine/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/mine/index.html @@ -16,11 +16,11 @@ layout("/layouts/platform.html"){ - + - - + + diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/schoolUnionApproval/index.html index 277e5c04..f496989e 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/schoolUnionApproval/index.html @@ -7,7 +7,14 @@ layout("/layouts/platform.html"){ - + + + + + + - + - - + + + @@ -113,14 +121,13 @@ layout("/layouts/platform.html"){ data() { return { pageForm: { - approval: false, - unionId: "", - unitId: "", - year: null, - searchKeyword: "" + year: new Date().getFullYear() + "", + searchName: "info.userName", + approval:false }, unionList: [], unitList: [], + evaluateList: [], showApprovalForm: false } }, @@ -178,11 +185,23 @@ layout("/layouts/platform.html"){ }) }) }, + listEvaluate() { + this.$set(this.pageForm, "evaluateId","") + this.$axios.post("/platform/evaluate/activity/listEvaluateActivityByYear", {year: this.pageForm.year}).then(resp => { + if (resp.code===0){ + this.evaluateList = resp.data + if (resp.data.length > 0) { + this.$set(this.pageForm, "evaluateId", resp.data[0].id) + } + this.pageData() + } + }) + }, }, async created() { this.unitList = await this.$businessTool.listUnit() this.unionList = await this.$businessTool.listUnion() - this.pageData() + this.listEvaluate() } }) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/summary/index.html b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/summary/index.html index a2224579..abdf68b4 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/evaluation/summary/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/evaluation/summary/index.html @@ -13,8 +13,16 @@ layout("/layouts/platform.html"){ style="width: 100%" v-model="pageForm.year" value-format="yyyy" + @change="listEvaluate()" > + + + + + - - - - - - - - + @@ -60,13 +59,14 @@ layout("/layouts/platform.html"){ - + + + -