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

Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/zhgh_hgu

Browse Source
This commit is contained in:
c-zhouhf1
2025-11-20 08:51:46 +08:00
parent 5e477a25e5 3c88b3b6b9
commit f138947e20
6 changed files with 325 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
+11 -10
View File
@@ -48,7 +48,7 @@ layout("/layouts/platform.html"){
<el-button icon="el-icon-check" size="small" type="primary" @click="onBatchSubmit">正式代表提交上报
</el-button>
</template>
<el-button icon="el-icon-download" size="small" type="primary" @click="doExport">导出</el-button>
<el-button icon="el-icon-download" size="small" type="primary" @click="exportExcel">导出</el-button>
<el-radio-group v-model="pageForm.isFormalOrAttendance" size="small" class="ml10"
@change="doSearch">
<el-radio-button label="全部"></el-radio-button>
@@ -69,8 +69,8 @@ layout("/layouts/platform.html"){
<el-table-column label="年龄" prop="age" width="80"></el-table-column>
<el-table-column label="性别" prop="sex" width="80" fixed="left"></el-table-column>
<!-- <el-table-column label="民族" prop="nation" min-width="100"></el-table-column>-->
<el-table-column label="职称" prop="professionalTitle" min-width="150"></el-table-column>
<el-table-column label="职级" prop="professionalLevel" min-width="100"></el-table-column>
<el-table-column label="职务" prop="position" min-width="100"></el-table-column>
<el-table-column label="职称" prop="professionalTitle" min-width="100"></el-table-column>
<!-- :style="{'pointer-events':(row.taskKey === 'startTask' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || !row.instanceId)?'auto':'none'}"-->
<!-- <el-table-column label="校级领导" prop="schoolLeader" min-width="100">
<template v-slot="{row}">
@@ -166,12 +166,12 @@ layout("/layouts/platform.html"){
<el-table-column label="操作" fixed="right" width="300">
<template slot-scope="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
<el-button
v-if="(row.taskKey === 'startTask' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || !row.instanceId)
<el-button
v-if="(row.taskKey === 'startTask' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || !row.instanceId)
&& $auth.hasRoleOr(['SYSADMIN'])"
@click="onEdit(row)" size="mini"
type="primary">编辑
</el-button>
@click="onEdit(row)" size="mini"
type="primary">编辑
</el-button>
<template>
<el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)"
size="mini" type="danger">
@@ -270,8 +270,9 @@ layout("/layouts/platform.html"){
})
})
},
doExport() {
},
exportExcel() {
this.$downLoad("/platform/teacherCongress/delegate/push/exportExcel", this.pageForm)
},
onBatchSubmit() {
const selection = this.$refs.tableRef.selection
/*if (selection.length === 0){
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js
+27 -5
View File
@@ -120,11 +120,23 @@ const write = {
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="文化程度" prop="education">
<el-input maxlength="100" placeholder="文化程度"
v-model="formData.education"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="职务" prop="position">
<el-input maxlength="100" placeholder="职务"
v-model="formData.position"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="职称" prop="professionalTitle">
<dict-select v-model="formData.professionalTitle" style="width: 100%"
placeholder="请选择职称"
code="technical_title_level"></dict-select>
<el-input maxlength="100" v-model="formData.professionalTitle"
placeholder="职称"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -199,6 +211,14 @@ const write = {
<el-input v-model="formData.mobile" maxlength="11"></el-input>
</el-form-item>
<el-form-item label="主要工作简历" prop="resume">
<el-input v-model="formData.resume" type="textarea"></el-input>
</el-form-item>
<el-form-item label="现实表现" prop="performance">
<el-input v-model="formData.performance" type="textarea"></el-input>
</el-form-item>
<!--<el-form-item label="电子邮箱" prop="email">
<el-input v-model="formData.email" maxlength="255"></el-input>
</el-form-item>-->
@@ -257,11 +277,13 @@ const write = {
mobile: [{required: true, message: '必填', trigger: ['blur', 'change']}],
position: [{required: false, message: '必填', trigger: ['blur', 'change']}],
political: [{required: true, message: '必填', trigger: ['blur', 'change']}],
education: [{required: true, message: '必填', trigger: ['blur', 'change']}],
// education: [{required: true, message: '必填', trigger: ['blur', 'change']}],
academicDegree: [{required: true, message: '必填', trigger: ['blur', 'change']}],
jobTitle: [{required: false, message: '必填', trigger: ['blur', 'change']}],
email: [{required: false, message: '必填', trigger: ['blur', 'change']}],
vita: [{required: true, message: '必填', trigger: ['blur', 'change']}]
vita: [{required: true, message: '必填', trigger: ['blur', 'change']}],
resume: [{required: true, message: '必填', trigger: ['blur', 'change']}],
performance: [{required: true, message: '必填', trigger: ['blur', 'change']}],
},
sessionOptions: [],
representativeTypeList: ['正式代表', '列席代表'],
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html
+7 -4
View File
@@ -23,6 +23,8 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<table-tool>
<el-button type="primary" size="small" @click="doExport" class="ml5">导出代表推荐表</el-button>
<el-button type="primary" size="small" @click="exportExcel" class="ml5">导出汇总表</el-button>
<el-radio-group @change="doSearch" v-model="pageForm.isFormalOrAttendance" size="small">
<el-radio-button label="全部"></el-radio-button>
<el-radio-button label="正式代表"></el-radio-button>
@@ -33,8 +35,6 @@ layout("/layouts/platform.html"){
<el-radio-button :label="true">已审核</el-radio-button>
<el-radio-button :label="false">未审核</el-radio-button>
</el-radio-group>
<el-button type="primary" size="small" @click="exportExcel" class="ml5">导出</el-button>
</table-tool>
<el-table
ref="tableRef"
@@ -52,8 +52,8 @@ layout("/layouts/platform.html"){
<el-table-column label="政治面貌" prop="political"
show-overflow-tooltip></el-table-column>
<el-table-column label="学历" prop="education"></el-table-column>-->
<el-table-column label="职称" prop="professionalTitle"></el-table-column>
<el-table-column label="职级" prop="professionalLevel"></el-table-column>
<el-table-column label="职务" prop="position" ></el-table-column>
<el-table-column label="职称" prop="professionalTitle" ></el-table-column>
<el-table-column label="是否高级职称" prop="seniorTeacher">
<template v-slot="{row}">
<span v-if="row.seniorTeacher" style="color:#0037ff;">是</span>
@@ -160,6 +160,9 @@ layout("/layouts/platform.html"){
exportExcel() {
this.$downLoad("/platform/teacherCongress/delegate/push/zcAudit/exportExcel", this.pageForm)
},
doExport() {
this.$downLoad("/platform/teacherCongress/delegate/push/zcAudit/doExportApplyZip", this.pageForm)
},
onView(row) {
this.writeDialog = true
this.userId = row.userId