diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyAudit.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyAudit.html index ef98f2d..b99a627 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyAudit.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyAudit.html @@ -57,7 +57,10 @@ layout("/layouts/platform.html"){ - 搜索 + @@ -636,6 +639,24 @@ layout("/layouts/platform.html"){ 'line-info': httpVueLoader('/components/staffbenefit/therapyRecuperation/LineInfo.vue') }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + year: moment().format('YYYY'), + searchName: 'userName', + searchKeyword: '', + isAudit: '', + lotId: '', + regionalNature: '', + selectId: '', + takePartInLineId: '', + unionId: this.unionDisabled ? this.pageForm.unionId : '', + unitId: this.unitDisabled ? this.pageForm.unitId : '', + pageNumber: 1 + } + this.unitOptions = this.pageForm.unionId ? await this.getTherapyUnits(this.pageForm.unionId) : [] + this.doSearch() + }, async validateLine() { const resp = await $.post('/platform/inclusiveTherapyV3/line/enroll/validSignUpInfo' , {enroll: JSON.stringify(this.editFormData)}) diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyTravelAudit.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyTravelAudit.html index 8aabcab..47a5b3c 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyTravelAudit.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyTravelAudit.html @@ -57,7 +57,10 @@ layout("/layouts/platform.html"){ - 搜索 + @@ -510,6 +513,22 @@ layout("/layouts/platform.html"){ 'line-info': httpVueLoader('/components/staffbenefit/therapyRecuperation/LineInfo.vue') }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + year: moment().format('YYYY'), + searchName: 'userName', + searchKeyword: '', + isAudit: '', + agencyId: '', + unionId: this.unionDisabled ? this.pageForm.unionId : '', + unitId: this.unitDisabled ? this.pageForm.unitId : '', + pageNumber: 1 + } + this.unitOptions = this.pageForm.unionId ? await this.getTherapyUnits(this.pageForm.unionId) : [] + await this.getAgencyList() + this.doSearch() + }, async getAgencyList() { const {data} = await $.post("/platform/inclusiveTherapyV3/travelAgency/selectTravelAgencyByYears", { startYear: this.pageForm.startYear, diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyXghAudit.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyXghAudit.html index 95f0ecd..c03ceac 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyXghAudit.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/audit/TheRapyXghAudit.html @@ -57,7 +57,10 @@ layout("/layouts/platform.html"){ - 搜索 + @@ -631,6 +634,24 @@ layout("/layouts/platform.html"){ }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + year: moment().format('YYYY'), + searchName: 'userName', + searchKeyword: '', + isAudit: '', + lotId: '', + regionalNature: '', + selectId: '', + takePartInLineId: '', + unionId: this.unionDisabled ? this.pageForm.unionId : '', + unitId: this.unitDisabled ? this.pageForm.unitId : '', + pageNumber: 1 + } + this.unitOptions = this.pageForm.unionId ? await this.getTherapyUnits(this.pageForm.unionId) : [] + this.doSearch() + }, async validateLine() { const resp = await $.post('/platform/inclusiveTherapyV3/line/enroll/validSignUpInfo' , {enroll: JSON.stringify(this.editFormData)}) diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/baseManage/baseManagement.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/baseManage/baseManagement.html index bf0d279..c0f917a 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/baseManage/baseManagement.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/baseManage/baseManagement.html @@ -70,6 +70,7 @@ layout("/layouts/platform.html"){
搜索 + 重置
@@ -531,6 +532,18 @@ layout("/layouts/platform.html"){ } }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + year: new Date().getFullYear().toString(), + baseName: '', + travelAgencyId: '', + regionalNature: '', + lotId: '', + pageNumber: 1 + } + this.doSearch() + }, async doSearch() { this.formData.year = this.pageForm.year; await this.yearChange(); diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/line.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/line.html index 269bdd7..a570ffe 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/line.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/line.html @@ -159,6 +159,7 @@ layout("/layouts/platform.html"){
搜索 + 重置
@@ -808,6 +809,23 @@ layout("/layouts/platform.html"){ } }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + startYear: String(this.modifyConfig.provinceStartYear), + endYear: moment().format('YYYY'), + unionId: null, + lineName: null, + travelAgencyId: null, + signUpMode: null, + lotId: null, + keywords: null, + pageNumber: 1 + } + this.yearRangeStart = null + this.yearRangeVisible = false + this.doSearch() + }, isShow(roles) { if ("${@com.budwk.app.zhgh.staffbenefit.therapyRecuperation.support.TherapyContext.hasRole('sysadmin')||@com.budwk.app.zhgh.staffbenefit.therapyRecuperation.support.TherapyContext.hasRole('A06')}" === 'true') { return true diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/travelAgency.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/travelAgency.html index 09bfa28..000879c 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/travelAgency.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/basicManage/travelAgency.html @@ -42,6 +42,7 @@ layout("/layouts/platform.html"){
搜索 + 重置
@@ -366,6 +367,15 @@ layout("/layouts/platform.html"){ } }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + year: moment().format('YYYY'), + keywords: null, + pageNumber: 1 + } + this.doSearch() + }, downloadTemplate() { window.location.href = '/platform/inclusiveTherapyV3/travelAgency/downloadTemplate'; }, diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html index b8d3348..1deee91 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyQuery.html @@ -341,7 +341,10 @@ layout("/layouts/platform.html"){ - 搜索 + @@ -1302,6 +1305,26 @@ layout("/layouts/platform.html"){ 'line-info': httpVueLoader('/components/staffbenefit/therapyRecuperation/LineInfo.vue') }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + year: moment().format('YYYY'), + searchName: 'userName', + searchKeyword: '', + agencyId: '', + takePartInLineId: '', + takePartInBaseManagementId: '', + regionalNature: '', + lotId: '', + selectId: '', + unionId: this.unionDisabled ? this.pageForm.unionId : '', + unitId: this.unitDisabled ? this.pageForm.unitId : '', + pageNumber: 1 + } + await this.getAgencyList() + await this.getUnionSelectLine() + this.flushUnits() + }, doModify(row){ this.$confirm("您确定要调整【" + row.userName + "】的此条报名信息吗?", '提示', { confirmButtonText: '确定', diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyUserQuery.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyUserQuery.html index ba653b4..cffa0e7 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyUserQuery.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/TheRapyUserQuery.html @@ -71,7 +71,10 @@ layout("/layouts/platform.html"){ - 搜索 + @@ -824,6 +827,27 @@ layout("/layouts/platform.html"){ 'line-info': httpVueLoader('/components/staffbenefit/therapyRecuperation/LineInfo.vue') }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + startYear: moment().format('YYYY'), + endYear: moment().format('YYYY'), + searchName: 'userName', + searchKeyword: '', + agencyId: '', + takePartInLineId: '', + takePartInBaseManagementId: '', + regionalNature: '', + lotId: '', + isTakePartIn: '', + unionId: '', + unitId: '', + pageNumber: 1 + } + await this.getAgencyList() + await this.getUnionSelectLine() + this.flushUnits() + }, /** * 打开代选路线弹窗,重置报名人员、线路和家属信息,避免沿用上一次代选数据。 */ diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineAdjustment.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineAdjustment.html index 23ea83b..6a0ac2a 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineAdjustment.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineAdjustment.html @@ -104,6 +104,7 @@ layout("/layouts/platform.html"){
搜索 + 重置
@@ -295,6 +296,21 @@ layout("/layouts/platform.html"){ } }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + year: new Date().getFullYear().toString(), + lineId: null, + unionId: null, + keywords: null, + regionalNature: null, + lotId: null, + pageNumber: 1 + } + await this.findUnionSignUpModeLineList() + this.lotList = this.getLotList() + this.doSearch() + }, async getLotList() { const {data} = await $.post('/platform/inclusiveTherapyV3/TheRapyConfig/findOne') this.lotList = data.lots diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineCluster.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineCluster.html index e09d6d3..f863f37 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineCluster.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineCluster.html @@ -89,6 +89,7 @@ layout("/layouts/platform.html"){
搜索 + 重置
@@ -385,6 +386,16 @@ layout("/layouts/platform.html"){ } }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + year: new Date().getFullYear().toString(), + unionId: null, + keywords: null, + pageNumber: 1 + } + this.doSearch() + }, getClusterName(item) { let count = 0 item.members.forEach(item => { diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineSelectionOverview.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineSelectionOverview.html index de2aedf..2d7c366 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineSelectionOverview.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineSelectionOverview.html @@ -99,6 +99,7 @@ layout("/layouts/platform.html"){
搜索 + 重置
@@ -459,6 +460,19 @@ layout("/layouts/platform.html"){ } }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + year: moment().format('YYYY'), + keywords: null, + travelAgencyId: null, + unionId: null, + lotId: null, + regionalNature: '全部', + pageNumber: 1 + } + this.yearChange() + }, doSearch() { this.$set(this.pageForm, 'pageNumber', 1) this.pageData() diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineUnionSelect.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineUnionSelect.html index c7af545..e9b14d7 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineUnionSelect.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/process/lineUnionSelect.html @@ -186,6 +186,7 @@ layout("/layouts/platform.html"){
搜索 + 重置
@@ -736,6 +737,21 @@ layout("/layouts/platform.html"){ } }, methods: { + async resetSearch() { + this.pageForm = { + ...this.pageForm, + year: moment().format('YYYY'), + keywords: null, + travelAgencyId: null, + lotId: null, + regionalNature: '全部', + selectStatus: -1, + pageNumber: 1 + } + await this.getLotList() + await this.getTravelAgencyOptions() + this.doSearch() + }, doSearch() { this.tableData = [] diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/statistics/lineStatistics.html b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/statistics/lineStatistics.html index fc53a9d..10b7a99 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/statistics/lineStatistics.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/therapyRecuperation/statistics/lineStatistics.html @@ -354,6 +354,7 @@ layout("/layouts/platform.html"){
搜索 + 重置
@@ -552,6 +553,17 @@ layout("/layouts/platform.html"){ 'line-info': httpVueLoader('/components/staffbenefit/therapyRecuperation/LineInfo.vue') }, methods: { + resetUserSearch() { + this.userPageForm = { + ...this.userPageForm, + searchKeyword: '', + unionId: '', + unitId: '', + pageNumber: 1 + } + this.units = [] + this.getUserDataByLineId() + }, handleSelectionChange(val) { this.$set(this, 'multipleSelection', val) }, diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/therapyRecuperation/lineList.html b/src/main/resources/views/platform/zhghh5/staffbenefit/therapyRecuperation/lineList.html index ab56b19..ffadb61 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/therapyRecuperation/lineList.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/therapyRecuperation/lineList.html @@ -401,15 +401,16 @@ layout("/layouts/platform_h5.html"){ } #app.therapy-mobile .line-toolbar .van-dropdown-menu__title--active, - #app.therapy-mobile .line-toolbar .van-dropdown-item__option--active { + #app.therapy-mobile .line-toolbar .van-dropdown-item__option--active, + #app.therapy-mobile .line-toolbar .van-dropdown-item__option--active .van-dropdown-item__icon { color: #1989fa; } #app.therapy-mobile .line-toolbar .van-dropdown-item__content { - width: auto; + width: calc(100% - 24px); max-width: none; max-height: 50vh; - margin: 0; + margin: 0 12px; box-sizing: border-box; overflow-x: hidden; overflow-y: auto; @@ -417,39 +418,23 @@ layout("/layouts/platform_h5.html"){ box-shadow: 0 10px 24px rgba(31, 65, 108, .14); } - #app.therapy-mobile .line-type-selector .van-dropdown-item__content { - left: auto; - right: max(12px, calc((100vw - 640px) / 2 + 12px)); - width: 112px; - } - - #app.therapy-mobile .line-status-selector .van-dropdown-item__content { - left: max(12px, calc((100vw - 640px) / 2 + 12px)); - right: auto; - width: calc(50% - 12px); - max-width: 308px; - } - - #app.therapy-mobile .line-source-selector .van-dropdown-item__content { - left: auto; - right: max(12px, calc((100vw - 640px) / 2 + 12px)); - width: calc(50% - 12px); - max-width: 308px; - } - #app.therapy-mobile .line-toolbar .van-dropdown-item__option { display: flex; align-items: center; min-height: 48px; - padding: 12px; + padding: 0 16px; box-sizing: border-box; + color: #46566c; font-size: 14px; } #app.therapy-mobile .line-toolbar .van-dropdown-item__option .van-cell__title { + display: flex; flex: 1 1 auto; min-width: 0; - line-height: 22px; + min-height: 20px; + align-items: center; + line-height: 20px; overflow-wrap: anywhere; } @@ -561,9 +546,6 @@ layout("/layouts/platform_h5.html"){ @media (max-width: 350px) { #app.therapy-mobile .line-type-selector { flex-basis: 100px; } - #app.therapy-mobile .line-type-selector .van-dropdown-item__content { width: 100px; right: 10px; } - #app.therapy-mobile .line-status-selector .van-dropdown-item__content { left: 10px; width: calc(50% - 10px); } - #app.therapy-mobile .line-source-selector .van-dropdown-item__content { right: 10px; width: calc(50% - 10px); } #app.therapy-mobile .line-search-row { gap: 8px; } #app.therapy-mobile .line-toolbar { padding-right: 10px; padding-left: 10px; } #app.therapy-mobile .line-title-row { flex-wrap: wrap; } @@ -588,15 +570,11 @@ layout("/layouts/platform_h5.html"){ - - + .content { padding: 16px 14px; } + #app.therapy-mobile .list-card > .content > .van-image { + flex: 0 0 30%; + width: 30% !important; + height: auto !important; + aspect-ratio: 4 / 3; + overflow: hidden; + border-radius: 12px; + } + #app.therapy-mobile .cr-title { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + white-space: normal; + color: #172033; + font-size: 16px; + line-height: 24px; + } + #app.therapy-mobile .cr-title > span { font-size: 16px !important; } + #app.therapy-mobile .concat, + #app.therapy-mobile .mobile, + #app.therapy-mobile .union { font-size: 13px; line-height: 23px; color: #66758a; } + #app.therapy-mobile .operateDiv { border-top-color: #f2f4f7; } + #app.therapy-mobile .operateDiv .van-button { border-radius: 8px; } + #app.therapy-mobile .van-list__finished-text { font-size: 14px; color: #8c93a3; }
@@ -186,24 +253,19 @@ layout("/layouts/platform_h5.html"){ title="我的疗休养"> - - - - - - -
- - - -
{{item.label}} -
-
-
+
+ + + + + + + +
-