From 39ee74f0a9b2b2ad78eef6a2cf2d8411105a430f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=8C=E5=85=88=E8=88=9C?= <2499071264@qq.com> Date: Tue, 3 Nov 2026 20:20:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=A6=8F=E5=88=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/zhgh/welfare/mine/index.html | 7 + .../zhgh/welfare/projectMange/filterUser.js | 8 + .../zhgh/welfare/projectMange/index.html | 8 + .../platform/zhgh/welfare/select/index.html | 5 + .../zhgh/welfare/select/optionSelect.js | 33 +++- .../welfare/selectionSituation/index.html | 15 ++ .../zhgh/welfare/statistics/index.html | 10 ++ .../zhgh/welfare/userChoose/chooseWelfare.js | 28 +++- .../zhgh/welfare/userChoose/index.html | 5 + .../zhgh/welfare/welfareUser/index.html | 22 +++ .../platform/zhghh5/welfare/select/index.html | 152 ++++++++++++++++-- .../zhghh5/welfare/userChoose/index.html | 25 ++- 12 files changed, 286 insertions(+), 32 deletions(-) diff --git a/src/main/resources/views/platform/zhgh/welfare/mine/index.html b/src/main/resources/views/platform/zhgh/welfare/mine/index.html index 59ab51b..24e2799 100644 --- a/src/main/resources/views/platform/zhgh/welfare/mine/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/mine/index.html @@ -17,6 +17,9 @@ layout("/layouts/platform.html"){ value-format="yyyy" > + @@ -115,6 +118,10 @@ layout("/layouts/platform.html"){ "select-view": selectView }, methods: { + resetSearch() { + this.pageForm.year = moment().format("YYYY") + this.doSearch() + }, async openView(row) { this.$refs.selectViewRef.onOpen(row.id) } diff --git a/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js b/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js index 075c477..117bc56 100644 --- a/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js +++ b/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js @@ -117,6 +117,9 @@ const filterUser = { + @@ -200,6 +203,11 @@ const filterUser = { this.pageData() }, + resetSearch() { + this.resetPageForm() + this.doSearch() + }, + resetPageForm() { this.$set(this.pageForm, "userName", null) this.$set(this.pageForm, "loginName", null) diff --git a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html index 99ddf41..917ba85 100644 --- a/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/projectMange/index.html @@ -21,6 +21,9 @@ layout("/layouts/platform.html"){ + @@ -294,6 +297,11 @@ layout("/layouts/platform.html"){ } }, methods: { + resetSearch() { + this.pageForm.year = moment().format("YYYY") + this.$set(this.pageForm, "name", null) + this.doSearch() + }, dropdownCommand(command) { const { type, data } = command if (type === "edit") { 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..e8d543a 100644 --- a/src/main/resources/views/platform/zhgh/welfare/select/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/select/index.html @@ -22,6 +22,7 @@ layout("/layouts/platform.html"){
搜索 + 重置
@@ -120,6 +121,10 @@ layout("/layouts/platform.html"){ "option-select": optionSelect }, methods: { + resetSearch() { + this.$set(this.pageForm, "year", null) + this.doSearch() + }, go_back() { this.doSearch() this.$refs.guava.index() 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 0eda10a..3443528 100644 --- a/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js +++ b/src/main/resources/views/platform/zhgh/welfare/select/optionSelect.js @@ -34,7 +34,7 @@ const optionSelect = {
节日信息
-
{{ projectInfo.festival }} · {{ projectInfo.year }}年
+
{{ projectInfo.year }}年
选择时间
@@ -48,10 +48,12 @@ const optionSelect = { projectInfo.provideTimeEnd) }}
+ @@ -143,8 +145,15 @@ const optionSelect = {
联系信息
+ + + 学校自提 + 邮寄 + +
超出江浙沪不包邮，超出部分自理，具体金额联系供应商。
+ - + @@ -158,10 +167,10 @@ const optionSelect = { - + 添加地址 - + - + 0 && this.userSelection[0].receiveAddress) { - this.contactForm.receiveAddress = this.userSelection[0].receiveAddress + const receiveAddress = this.userSelection[0].receiveAddress + this.deliveryMethod = receiveAddress === "学校自提" ? "pickup" : "mail" + this.contactForm.receiveAddress = this.deliveryMethod === "mail" ? receiveAddress : "" // this.contactForm.userName = this.userSelection[0].userName; // this.contactForm.mobile = this.userSelection[0].mobile; this.$set(this.contactForm, "userName", this.userSelection[0].userName) @@ -526,6 +539,10 @@ const optionSelect = { // 执行提交 doSubmit() { + if (this.projectInfo.provideMode === 3 && !this.deliveryMethod) { + this.$message.warning("请选择领取方式") + return + } // 验证手机号 this.$refs.contactForm.validate((valid) => { if (!valid) { @@ -547,7 +564,7 @@ const optionSelect = { mobile: this.contactForm.mobile, userName: this.contactForm.userName, userSign: this.contactForm.userSign, - receiveAddress: this.contactForm.receiveAddress + receiveAddress: this.deliveryMethod === "pickup" ? "学校自提" : this.contactForm.receiveAddress } ] } @@ -560,7 +577,7 @@ const optionSelect = { mobile: this.contactForm.mobile, userName: this.contactForm.userName, userSign: this.contactForm.userSign, - receiveAddress: this.contactForm.receiveAddress + receiveAddress: this.deliveryMethod === "pickup" ? "学校自提" : this.contactForm.receiveAddress })) } diff --git a/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html b/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html index ede80cb..1e5c54e 100644 --- a/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html @@ -69,6 +69,9 @@ layout("/layouts/platform.html"){ + @@ -173,6 +176,18 @@ layout("/layouts/platform.html"){ } }, methods: { + resetSearch() { + this.pageForm.year = new Date().getFullYear().toString() + this.$set(this.pageForm, "welfareOptionId", null) + this.$set(this.pageForm, "userName", null) + this.$set(this.pageForm, "loginName", null) + this.$set(this.pageForm, "unionId", null) + this.$set(this.pageForm, "aidFundMemberUserType", null) + this.$set(this.pageForm, "userAttribute", null) + this.$set(this.pageForm, "isSelect", null) + this.$set(this.pageForm, "unitIds", []) + this.getWelfareList() + }, // 获取福利列表 getWelfareList() { this.$axios.post("/platform/welfare/common/list", { year: this.pageForm.year }).then((res) => { diff --git a/src/main/resources/views/platform/zhgh/welfare/statistics/index.html b/src/main/resources/views/platform/zhgh/welfare/statistics/index.html index 0208572..58314f2 100644 --- a/src/main/resources/views/platform/zhgh/welfare/statistics/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/statistics/index.html @@ -28,6 +28,9 @@ layout("/layouts/platform.html"){ + @@ -110,6 +113,13 @@ layout("/layouts/platform.html"){ } }, methods: { + resetSearch() { + this.pageForm.year = new Date().getFullYear().toString() + const isBranchChairman = !this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN", "SCHOOL_UNION_WELFARE_ADMIN"]) && + this.$auth.hasRoleOr(["BRANCH_UNION_CHAIRMAN"]) + this.$set(this.pageForm, "unionId", isBranchChairman ? this.$store.state.user.union.id : null) + this.getWelfareProjectList() + }, remindUnSelectedPlaceholder() { this.$message.info("提醒未选择人员功能待开发") }, diff --git a/src/main/resources/views/platform/zhgh/welfare/userChoose/chooseWelfare.js b/src/main/resources/views/platform/zhgh/welfare/userChoose/chooseWelfare.js index 2288d5d..bb15677 100644 --- a/src/main/resources/views/platform/zhgh/welfare/userChoose/chooseWelfare.js +++ b/src/main/resources/views/platform/zhgh/welfare/userChoose/chooseWelfare.js @@ -112,7 +112,15 @@ let CHOOSE_WELFARE = { -