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

南大三十年教职工疗休养

Browse Source
This commit is contained in:
c-zhangr1
2026-06-26 14:32:53 +08:00
parent a1547b133e
commit 1b888b4fce
10 changed files with 403 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/db/sys_user_add_retiring_soon.sql
+1
View File
@@ -0,0 +1 @@
ALTER TABLE sys_user ADD COLUMN retiringSoon INT DEFAULT 0 COMMENT '即将退休人员（是：1；否：0）';
src/main/resources/views/platform/zhgh/dayofficework/ThirtyTeachTour/branchUserAssignment/index.html
+13
View File
@@ -141,6 +141,14 @@ layout("/layouts/platform.html"){
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="即将退休人员">
<el-select v-model="candidateForm.retiringSoon" clearable placeholder="请选择" style="width: 100%" @change="candidateSearch">
<el-option label="是" value="true"></el-option>
<el-option label="否" value="false"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="人员类型" prop="personType">
<el-radio-group v-model="assignForm.personType" @change="assignPersonTypeChange">
@@ -494,6 +502,7 @@ layout("/layouts/platform.html"){
pageNumber: 1,
pageSize: 10,
totalCount: 0,
retiringSoon: "true",
keyword: ""
},
selectMatterForm: {
@@ -528,6 +537,7 @@ layout("/layouts/platform.html"){
pageNumber: 1,
pageSize: 10,
totalCount: 0,
retiringSoon: "true",
keyword: ""
}
},
@@ -808,6 +818,7 @@ layout("/layouts/platform.html"){
pageNumber: this.candidateForm.pageNumber,
pageSize: this.candidateForm.pageSize,
settingId: this.assignForm.settingId,
retiringSoon: this.candidateForm.retiringSoon,
keyword: (this.selectedCandidateIds || []).length > 0 ? "" : this.candidateForm.keyword,
userIds: JSON.stringify(this.selectedCandidateIds || [])
}).then((res) => {
@@ -831,6 +842,7 @@ layout("/layouts/platform.html"){
this.loadCandidatePageData()
},
resetCandidateSearch() {
this.candidateForm.retiringSoon = "true"
this.candidateForm.keyword = ""
this.candidateForm.pageNumber = 1
this.selectedCandidateIds = []
@@ -864,6 +876,7 @@ layout("/layouts/platform.html"){
pageNumber: 1,
pageSize: 20,
settingId: this.assignForm.settingId,
retiringSoon: this.candidateForm.retiringSoon,
keyword: keyword || ""
}).then((res) => {
if (res.code === 0) {
src/main/resources/views/platform/zhgh/dayofficework/ThirtyTeachTour/schoolUserAssignment/index.html
+13 -8
View File
@@ -194,6 +194,14 @@ layout("/layouts/platform.html"){
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="即将退休人员">
<el-select v-model="candidateForm.retiringSoon" clearable placeholder="请选择" style="width: 100%" @change="candidateSearch">
<el-option label="是" value="true"></el-option>
<el-option label="否" value="false"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -201,14 +209,6 @@ layout("/layouts/platform.html"){
<el-select v-model="candidateForm.unionId" clearable filterable placeholder="所属分工会" style="width: 220px" @change="candidateSearch">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
<el-select v-model="candidateForm.summerJoined" clearable placeholder="今年是否已有暑期疗休养台账" style="width: 230px" @change="candidateSearch">
<el-option label="否" value="false"></el-option>
<el-option label="是" value="true"></el-option>
</el-select>
<el-select v-model="candidateForm.lastThirtyJoined" clearable placeholder="去年是否参加30年教龄疗休养" style="width: 250px" @change="candidateSearch">
<el-option label="否" value="false"></el-option>
<el-option label="是" value="true"></el-option>
</el-select>
<el-select
v-model="selectedCandidateIds"
multiple
@@ -492,6 +492,7 @@ layout("/layouts/platform.html"){
pageSize: 10,
totalCount: 0,
unionId: "",
retiringSoon: "true",
summerJoined: "false",
lastThirtyJoined: "false",
keyword: ""
@@ -532,6 +533,7 @@ layout("/layouts/platform.html"){
pageSize: 10,
totalCount: 0,
unionId: "",
retiringSoon: "true",
summerJoined: "false",
lastThirtyJoined: "false",
keyword: ""
@@ -803,6 +805,7 @@ layout("/layouts/platform.html"){
pageSize: this.candidateForm.pageSize,
settingId: this.assignForm.settingId,
unionId: this.candidateForm.unionId,
retiringSoon: this.candidateForm.retiringSoon,
summerJoined: this.candidateForm.summerJoined,
lastThirtyJoined: this.candidateForm.lastThirtyJoined,
keyword: (this.selectedCandidateIds || []).length > 0 ? "" : this.candidateForm.keyword,
@@ -835,6 +838,7 @@ layout("/layouts/platform.html"){
},
resetCandidateSearch() {
this.candidateForm.unionId = ""
this.candidateForm.retiringSoon = "true"
this.candidateForm.summerJoined = "false"
this.candidateForm.lastThirtyJoined = "false"
this.candidateForm.keyword = ""
@@ -882,6 +886,7 @@ layout("/layouts/platform.html"){
pageSize: 20,
settingId: this.assignForm.settingId,
unionId: this.candidateForm.unionId,
retiringSoon: this.candidateForm.retiringSoon,
summerJoined: this.candidateForm.summerJoined,
lastThirtyJoined: this.candidateForm.lastThirtyJoined,
keyword: keyword || ""