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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2025-08-29 18:01:56 +08:00
parent 43c848171d
commit c1263c753d
8 changed files with 148 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/models/EvaluateApply.java
+5
View File
@@ -50,6 +50,11 @@ public class EvaluateApply extends BaseModel {
@Comment("姓名") @Comment("姓名")
private String userName; private String userName;
@Column
@ColDefine(type = ColType.VARCHAR, width = 100)
@Comment("联系方式")
private String mobile;
@Column @Column
@Comment("出生日期") @Comment("出生日期")
@ColDefine(type = ColType.DATE) @ColDefine(type = ColType.DATE)
src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/service/impl/EvaluateServiceImpl.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class EvaluateServiceImpl extends BaseServiceImpl<EvaluateApply> implemen
$condition $condition
"""); """);
Cnd cnd = Cnd.NEW(); 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.andEX("info.evaluateId", "=", pageForm.getEvaluateId());
cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode()); cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode());
cnd.andEX("info.unitId", "=", pageForm.getUnitId()); cnd.andEX("info.unitId", "=", pageForm.getUnitId());
src/main/resources/views/platform/zhgh/dayofficework/evaluation/activity/index.html
+3
View File
@@ -237,6 +237,9 @@ layout("/layouts/platform.html"){
this.stepActive = 0 this.stepActive = 0
this.dialogVisible = true this.dialogVisible = true
this.formData={} this.formData={}
this.$nextTick(() => {
this.$refs.formRef.resetFields()
})
this.$refs.formRef.clearValidate() this.$refs.formRef.clearValidate()
this.$axios.post("/platform/evaluate/activity/initQuotaAllocations").then((res) => { this.$axios.post("/platform/evaluate/activity/initQuotaAllocations").then((res) => {
if (res.code === 0) { if (res.code === 0) {
src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/apply.js
+57 -41
View File
@@ -24,10 +24,59 @@ const apply_component = {
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="sex" label="性别" disabled> <el-form-item prop="mobile" label="联系方式" >
<el-input v-model="formData.mobile" placeholder="联系方式"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item prop="sex" label="性别" >
<el-input v-model="formData.sex" disabled></el-input> <el-input v-model="formData.sex" disabled></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="民族" prop="nation">
<dict-select style="width: 100%" placeholder="请选择民族" v-model="formData.nation"
code="USER_NATION"></dict-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item prop="education" label="学历">
<dict-select style="width: 100%" placeholder="请选择学历" v-model="formData.education"
code="USER_EDUCATION"></dict-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="political" label="政治面貌">
<dict-select
style="width: 100%"
placeholder="请选择政治面貌"
v-model="formData.political"
code="USER_POLITICAL"
></dict-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item prop="technicalTitle" label="技术职称">
<el-input v-model="formData.technicalTitle" placeholder="填写技术职称"
max="50"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="governmentPosition" label="党政职务">
<el-input v-model="formData.governmentPosition" placeholder="填写党政职务"
max="50"></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
@@ -41,46 +90,6 @@ const apply_component = {
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="民族" prop="nation">
<dict-select style="width: 100%" placeholder="请选择民族" v-model="formData.nation"
code="USER_NATION"></dict-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="political" label="政治面貌">
<dict-select
style="width: 100%"
placeholder="请选择政治面貌"
v-model="formData.political"
code="POLITICAL_STATUS"
></dict-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item prop="education" label="学历">
<dict-select style="width: 100%" placeholder="请选择学历" v-model="formData.education"
code="USER_EDUCATION"></dict-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="technicalTitle" label="技术职称">
<el-input v-model="formData.technicalTitle" placeholder="填写技术职称"
max="50"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item prop="governmentPosition" label="党政职务">
<el-input v-model="formData.governmentPosition" placeholder="填写党政职务"
max="50"></el-input>
</el-form-item>
</el-col>
</el-row>
</template> </template>
<template v-else> <template v-else>
@@ -104,6 +113,11 @@ const apply_component = {
:max="2000" style="width: 100%"></el-input-number> :max="2000" style="width: 100%"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item prop="mobile" label="联系方式" >
<el-input v-model="formData.mobile" placeholder="联系方式"></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
</template> </template>
@@ -151,6 +165,7 @@ const apply_component = {
unionName: [{required: true, message: "必填", trigger: ["change", "blur"]}], unionName: [{required: true, message: "必填", trigger: ["change", "blur"]}],
birthday: [{required: true, message: "必填", trigger: ["change", "blur"]}], birthday: [{required: true, message: "必填", trigger: ["change", "blur"]}],
sex: [{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"]}], nation: [{required: true, message: "必填", trigger: ["change", "blur"]}],
political: [{required: true, message: "必填", trigger: ["change", "blur"]}], political: [{required: true, message: "必填", trigger: ["change", "blur"]}],
education: [{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, "unionId", user.union ? user.union.id : null)
this.$set(this.formData, "unionName", user.union ? user.union.name : null) this.$set(this.formData, "unionName", user.union ? user.union.name : null)
this.$set(this.formData, "sex", user.sex) 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, "birthday", user.birthday)
this.$set(this.formData, "nation", user.nation) this.$set(this.formData, "nation", user.nation)
this.$set(this.formData, "political", user.political) this.$set(this.formData, "political", user.political)
src/main/resources/views/platform/zhgh/dayofficework/evaluation/branchUnionApproval/index.html
+28 -6
View File
@@ -8,7 +8,14 @@ layout("/layouts/platform.html"){
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy"
placeholder="选择年度"></el-date-picker> placeholder="选择年度" @change="listEvaluate"></el-date-picker>
</search-item>
<search-item label="事项：">
<el-select v-model="pageForm.evaluateId" placeholder="请选择评优评先事项" filterable clearable
style="width: 100%">
<el-option v-for="item in evaluateList" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
</search-item> </search-item>
<search-item label="申请人"> <search-item label="申请人">
<el-input @keyup.enter.native="doSearch" clearable <el-input @keyup.enter.native="doSearch" clearable
@@ -38,8 +45,9 @@ layout("/layouts/platform.html"){
<el-table-column prop="evaluateName" label="名称" show-overflow-tooltip></el-table-column> <el-table-column prop="evaluateName" label="名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="userName" label="姓名"></el-table-column> <el-table-column prop="userName" label="姓名"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column> <el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="unitName" label="单位"></el-table-column> <el-table-column prop="unitName" label="所属单位"></el-table-column>
<el-table-column prop="unionName" label="分工会"></el-table-column> <el-table-column prop="unionName" label="所属工会"></el-table-column>
<el-table-column prop="mobile" label="联系方式"></el-table-column>
<el-table-column prop="applyDateTime" label="申请时间"></el-table-column> <el-table-column prop="applyDateTime" label="申请时间"></el-table-column>
<el-table-column prop="honorName" label="类型" show-overflow-tooltip></el-table-column> <el-table-column prop="honorName" label="类型" show-overflow-tooltip></el-table-column>
<el-table-column prop="taskName" label="当前节点"></el-table-column> <el-table-column prop="taskName" label="当前节点"></el-table-column>
@@ -105,11 +113,13 @@ layout("/layouts/platform.html"){
data() { data() {
return { return {
pageForm: { pageForm: {
approval: false, year: new Date().getFullYear() + "",
searchName: "info.userName" searchName: "info.userName",
approval:false
}, },
unionList: [], unionList: [],
unitList: [], unitList: [],
evaluateList: [],
showApprovalForm: false 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() { async created() {
this.pageData() this.listEvaluate()
} }
}) })
</script> </script>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/mine/index.html
+3 -3
View File
@@ -16,11 +16,11 @@ layout("/layouts/platform.html"){
<table-tool></table-tool> <table-tool></table-tool>
<el-table :data="tableData" @sort-change="pageOrder"> <el-table :data="tableData" @sort-change="pageOrder">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="evaluateName" label="名称" show-overflow-tooltip></el-table-column> <el-table-column prop="evaluateName" label="事项名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="userName" label="姓名"></el-table-column> <el-table-column prop="userName" label="姓名"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column> <el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="unitName" label="单位"></el-table-column> <el-table-column prop="unitName" label="所属单位"></el-table-column>
<el-table-column prop="unionName" label="分工会"></el-table-column> <el-table-column prop="unionName" label="所属工会"></el-table-column>
<el-table-column prop="applyDateTime" label="申请时间"></el-table-column> <el-table-column prop="applyDateTime" label="申请时间"></el-table-column>
<el-table-column prop="honorName" label="类型" show-overflow-tooltip></el-table-column> <el-table-column prop="honorName" label="类型" show-overflow-tooltip></el-table-column>
<el-table-column prop="taskName" label="当前节点"></el-table-column> <el-table-column prop="taskName" label="当前节点"></el-table-column>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/schoolUnionApproval/index.html
+29 -10
View File
@@ -7,7 +7,14 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度"> <search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="选择年度"></el-date-picker> <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="选择年度"@change="listEvaluate"></el-date-picker>
</search-item>
<search-item label="事项：">
<el-select v-model="pageForm.evaluateId" placeholder="请选择评优评先事项" filterable clearable
style="width: 100%">
<el-option v-for="item in evaluateList" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
</search-item> </search-item>
<search-item label="申请人"> <search-item label="申请人">
<el-input @keyup.enter.native="doSearch" clearable <el-input @keyup.enter.native="doSearch" clearable
@@ -43,11 +50,12 @@ layout("/layouts/platform.html"){
</table-tool> </table-tool>
<el-table :data="tableData" @sort-change="pageOrder"> <el-table :data="tableData" @sort-change="pageOrder">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="evaluateName" label="名称" show-overflow-tooltip></el-table-column> <el-table-column prop="evaluateName" label="事项名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="userName" label="姓名"></el-table-column> <el-table-column prop="userName" label="姓名"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column> <el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="unitName" label="单位"></el-table-column> <el-table-column prop="unitName" label="所属单位"></el-table-column>
<el-table-column prop="unionName" label="分工会"></el-table-column> <el-table-column prop="unionName" label="所属工会"></el-table-column>
<el-table-column prop="mobile" label="联系方式"></el-table-column>
<el-table-column prop="honorName" label="类型" show-overflow-tooltip></el-table-column> <el-table-column prop="honorName" label="类型" show-overflow-tooltip></el-table-column>
<el-table-column prop="applyDateTime" label="申请时间"></el-table-column> <el-table-column prop="applyDateTime" label="申请时间"></el-table-column>
<el-table-column prop="taskName" label="当前节点"></el-table-column> <el-table-column prop="taskName" label="当前节点"></el-table-column>
@@ -113,14 +121,13 @@ layout("/layouts/platform.html"){
data() { data() {
return { return {
pageForm: { pageForm: {
approval: false, year: new Date().getFullYear() + "",
unionId: "", searchName: "info.userName",
unitId: "", approval:false
year: null,
searchKeyword: ""
}, },
unionList: [], unionList: [],
unitList: [], unitList: [],
evaluateList: [],
showApprovalForm: false 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() { async created() {
this.unitList = await this.$businessTool.listUnit() this.unitList = await this.$businessTool.listUnit()
this.unionList = await this.$businessTool.listUnion() this.unionList = await this.$businessTool.listUnion()
this.pageData() this.listEvaluate()
} }
}) })
</script> </script>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/summary/index.html
+22 -15
View File
@@ -13,8 +13,16 @@ layout("/layouts/platform.html"){
style="width: 100%" style="width: 100%"
v-model="pageForm.year" v-model="pageForm.year"
value-format="yyyy" value-format="yyyy"
@change="listEvaluate()"
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="事项：">
<el-select v-model="pageForm.evaluateId" placeholder="请选择评优评先事项" filterable clearable
style="width: 100%">
<el-option v-for="item in evaluateList" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
</search-item>
<search-item label="申请人"> <search-item label="申请人">
<el-input @keyup.enter.native="doSearch" clearable <el-input @keyup.enter.native="doSearch" clearable
placeholder="请输入内容" placeholder="请输入内容"
@@ -27,16 +35,7 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</el-input> </el-input>
</search-item> </search-item>
<!-- <search-item label="名称：">-->
<!-- <el-input placeholder="请输入评优评先名称查询" clearable v-model="pageForm.evaluateName"></el-input>-->
<!-- </search-item>-->
<search-item label="评优评先事项：">
<el-select v-model="pageForm.evaluateId" placeholder="请选择评优评先事项" filterable clearable
style="width: 100%">
<el-option v-for="item in evaluateList" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
</search-item>
<search-item label="所属工会："> <search-item label="所属工会：">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
style="width: 100%"> style="width: 100%">
@@ -60,13 +59,14 @@ layout("/layouts/platform.html"){
</table-tool> </table-tool>
<el-table :data="tableData"> <el-table :data="tableData">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="evaluateName" label="名称" show-overflow-tooltip></el-table-column> <el-table-column prop="evaluateName" label="事项名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="userName" label="申请人姓名"></el-table-column> <el-table-column prop="userName" label="申请人姓名"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column> <el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="unitName" label="所属单位"></el-table-column> <el-table-column prop="unitName" label="所属单位"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column>
<el-table-column prop="mobile" label="联系方式"></el-table-column>
<el-table-column prop="applyDateTime" label="申请时间"></el-table-column> <el-table-column prop="applyDateTime" label="申请时间"></el-table-column>
<el-table-column prop="honorName" label="类型" show-overflow-tooltip></el-table-column> <el-table-column prop="honorName" label="类型" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="honorTypeName" label="荣誉类型"></el-table-column>-->
<el-table-column label="操作" width="300px" fixed="right"> <el-table-column label="操作" width="300px" fixed="right">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button size="mini" type="primary" @click="openView(row)">查看</el-button> <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
@@ -127,8 +127,15 @@ layout("/layouts/platform.html"){
} }
}, },
listEvaluate() { listEvaluate() {
this.$axios.get("/platform/evaluate/activity/listEvaluateActivityByYear", {year: this.pageForm.year}).then(resp => { this.$set(this.pageForm, "evaluateId","")
this.evaluateList = resp.data 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()
}
}) })
}, },
}, },
@@ -136,7 +143,7 @@ layout("/layouts/platform.html"){
this.unitList = await this.$businessTool.listUnit() this.unitList = await this.$businessTool.listUnit()
this.unionList = await this.$businessTool.listUnion() this.unionList = await this.$businessTool.listUnion()
this.listEvaluate() this.listEvaluate()
this.pageData()
} }
}) })
</script> </script>