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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
@jyuhsin
2025-12-20 18:05:50 +08:00
parent 8dabc3913e 728bce548c
commit b5546625db
23 changed files with 1889 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/manage/index.html
+17
View File
@@ -38,6 +38,9 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<table-tool>
<el-button size="small" type="primary" icon="el-icon-plus" @click="doAllocateDelegation">
根据单位分配代表团
</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" @click="excelImportDialog = true">导入代表</el-button>
<el-button size="small" type="primary" icon="el-icon-plus" @click="$refs.addFormRef.onOpen(pageForm.sessionId,pageForm.delegationId)">新增代表</el-button>
<el-button
@@ -139,6 +142,20 @@ layout("/layouts/platform.html"){
}
},
methods: {
doAllocateDelegation() {
this.$confirm("确定要一键给没有代表团的代表，根据单位所在代表团设置代表团吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "info"
}).then(() => {
this.$axios.post(loc() + "/doAllocateDelegation", {sessionId: this.pageForm.sessionId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
}
})
})
},
sessionChange() {
this.pageForm.delegationId = null
this.delegationOptions = []
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/auditInfo.js
+113
View File
@@ -0,0 +1,113 @@
const auditInfo = {
template: /*language=HTML*/ `
<div>
<div class="proposal-info">
<div class="process-title">
基础信息
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
</div>
<el-descriptions :column="3" border>
<el-descriptions-item label="姓名">{{ viewData.userName }}</el-descriptions-item>
<el-descriptions-item label="工号">{{viewData.loginName }}</el-descriptions-item>
<el-descriptions-item label="性别">{{viewData.sex }}</el-descriptions-item>
<el-descriptions-item label="出生年月">{{$moment(viewData.birthday).format("YYYY-MM-DD") }}
</el-descriptions-item>
<el-descriptions-item label="手机号">{{viewData.mobile }}</el-descriptions-item>
<el-descriptions-item label="民族">{{viewData.nation }}</el-descriptions-item>
<el-descriptions-item label="政治面貌">{{viewData.political }}</el-descriptions-item>
<el-descriptions-item label="所属工会">{{viewData.unionName }}</el-descriptions-item>
<el-descriptions-item label="所属单位">{{viewData.unitName }}</el-descriptions-item>
<el-descriptions-item label="文化程度">{{viewData.education }}</el-descriptions-item>
<el-descriptions-item label="职务">{{viewData.position }}</el-descriptions-item>
<el-descriptions-item label="职称">{{viewData.professionalTitle }}</el-descriptions-item>
<el-descriptions-item label="是否聘用制">{{viewData.employ?'是':'否' }}
</el-descriptions-item>
<el-descriptions-item label="是否高级职称">{{viewData.seniorTeacher?'是':'否' }}
</el-descriptions-item>
<el-descriptions-item label="是否中级职称及以下">{{viewData.intermediateBelow?'是':'否' }}
</el-descriptions-item>
<el-descriptions-item label="是否干部">{{viewData.cadre?'是':'否' }}</el-descriptions-item>
<el-descriptions-item label="是否工人">{{viewData.worker?'是':'否' }}</el-descriptions-item>
<el-descriptions-item label="校级领导">{{viewData.schoolLeader?'是':'否' }}</el-descriptions-item>
<el-descriptions-item label="中层领导">{{viewData.middleLevelLeader?'是':'否' }}
</el-descriptions-item>
</el-descriptions>
</div>
<template v-for="task in doneTasks">
<div class="mt10"
v-if="['0cacd1e7-7bb2-47dd-818b-6a73062e0c62'].includes(task.taskName)">
<div class="process-title">{{ task.displayName }}</div>
<el-descriptions border class="flow-task-form" :column="3" :key="task.id"
>
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName
}}({{task.taskFormData.loginName}})
</el-descriptions-item>
<el-descriptions-item label="办理时间">{{ task.finishTime }}</el-descriptions-item>
<el-descriptions-item label="办理结果">
{{processSubmitTypeEnums.find(v=>v.name===task.ext.tf_type)?.message}}
<!-- {{dict.type.PROCESS_TASK_SUBMIT_TYPE.find(v=>v.code==task.ext.tf_type)}}-->
<!-- <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value=""></dict-tag>-->
</el-descriptions-item>
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
</el-descriptions>
</div>
</template>
<slot></slot>
<snaker-chart ref="snakerChartRef"></snaker-chart>
</div>
`,
dicts: ["PROCESS_TASK_SUBMIT_TYPE"],
data() {
return {
visible: false,
userData: [],
viewData: {},
row: null,
doneTasks: [],
loading: true,
search: "",
tableKey: "",
activeName: "1",
processSubmitTypeEnums:[]
}
},
methods: {
findOne() {
this.$axios.post("/platform/teacherCongress/delegate/push/write/finOne", {id: this.row.id}).then(resp => {
if (resp.code === 0) {
this.viewData = resp.data
}
})
},
// 打开
onOpen(row) {
this.row = row;
this.visible = true;
this.findOne();
this.getDoneTasks();
this.getEnumOptions()
},
// 获取已办任务审批记录
getDoneTasks() {
this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
if (res.code === 0) {
this.doneTasks = res.data
}
})
},
async getEnumOptions() {
const resp = await this.$axios.post("/open/common/dictEnumOptions", { name: "ProcessSubmitTypeEnum" })
this.processSubmitTypeEnums=resp.data
},
// 查看流程图
openChart() {
this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
}
}
}
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html
+295
View File
@@ -0,0 +1,295 @@
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="姓名/工号">
<el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="教代会">
<el-select v-model="pageForm.sessionId">
<el-option v-for="item in sessionOptions" :label="item.fullName" :value="item.id"
:key="item.id"></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card shadow="never">
<push-progress ref="pushProgressRef"></push-progress>
</el-card>
<el-card shadow="never">
<table-tool>
<el-button icon="el-icon-check" size="small" type="primary" @click="onBatchSubmit">正式代表提交上报
</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>
<el-radio-button label="列席代表"></el-radio-button>
</el-radio-group>
<el-radio-group v-model="pageForm.approval" size="small"
@change="doSearch">
<el-radio-button :label="true">已审核</el-radio-button>
<el-radio-button :label="false">未审核</el-radio-button>
</el-radio-group>
</table-tool>
<el-table
ref="tableRef"
:data="tableData"
row-key="id"
@sort-change="pageOrder"
>
<el-table-column type="index" width="55" label="序号" :index="indexMethod"></el-table-column>
<el-table-column label="姓名" prop="userName" width="100"></el-table-column>
<el-table-column label="工号" prop="loginName"></el-table-column>
<el-table-column label="性别" prop="sex" width="50"></el-table-column>
<el-table-column label="分工会" prop="unionName" show-overflow-tooltip></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="employ">
<template v-slot="{row}">
<span v-if="row.employ" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="是否高级职称" prop="seniorTeacher">
<template v-slot="{row}">
<span v-if="row.seniorTeacher" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="是否中级职称及以下" prop="intermediateBelow">
<template v-slot="{row}">
<span v-if="row.intermediateBelow" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="是否干部" prop="cadre">
<template v-slot="{row}">
<span v-if="row.cadre" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="是否工人" prop="worker">
<template v-slot="{row}">
<span v-if="row.worker" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="教代会/工代会代表" prop="isJdh">
<template v-slot="{row}">
<span v-if="row.isJdh" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<!-- <el-table-column label="工代会代表" prop="isGdh">-->
<!-- <template v-slot="{row}">-->
<!-- <span v-if="row.isGdh" style="color:#0037ff;">是</span>-->
<!-- <span v-else>否</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="代表类型" prop="representativeType"></el-table-column>
<el-table-column prop="curTaskName" label="当前节点"></el-table-column>
<el-table-column prop="instanceState" label="流程状态">
<template slot-scope="{row}">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
size="small"></enum-tag>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="300px">
<template slot-scope="{row}">
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">
审核
</el-button>
<el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #edit>
<audit-info ref="auditInfoRef">
<div v-if="showApprovalForm">
<div class="process-title">
{{formData.taskName}}
</div>
<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
class="flow-task-form">
<el-form-item label="审批意见" prop="tf_opinion"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
</el-form-item>
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction('ROLLBACK')" size="small" type="info">退回修改</el-button>
<el-button @click="handleTaskAction('AGREE')" size="small" type="primary">同意</el-button>
</el-row>
</div>
</audit-info>
</template>
</guava>
</div>
<script nonce="${cspNonce!}">
<!--#include('push-progress.js'){}#-->
<!--#include('auditInfo.js'){}#-->
new Vue({
el: '#app',
mixins: [initTableMixins],
components: {
'push-progress': pushProgress,
'audit-info': auditInfo
},
data() {
return {
sessionOptions: [],
units: [],
pageForm: {
isFormalOrAttendance: "全部",
unionId: "",
sessionId: "",
approval: false,
},
showApprovalForm: false,
}
},
methods: {
async doSearch() {
await this.pageData()
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId, "JG")
},
async pageData() {
try {
const resp = await this.$axios.post("/platform/teacherCongress/delegate/push/dwSjAudit/pageData", this.pageForm)
if (resp.code === 0) {
this.tableData = resp.data.list
this.pageForm.totalCount = resp.data.totalCount
}
} catch (e) {
console.log(e)
}
},
onBatchSubmit() {
this.$confirm('您确定要上报吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
const loading = createLoading('正在提交中')
this.$axios.post('/platform/teacherCongress/delegate/push/dwSjAudit/batchSubmit', {
sessionId: this.pageForm.sessionId
}).then(resp => {
if (resp.code === 0) {
this.$message.success(resp.msg)
this.doSearch()
}
}).finally(() => {
loading.close()
})
})
},
openAudit(row) {
this.$refs.guava.edit(() => {
this.showApprovalForm = true
this.formData = {
bizId: row.id,
userId: row.userId,
processTaskId: row.taskId,
taskKey: row.taskKey,
taskName: row.taskName,
instanceId: row.instanceId,
submitType: 1,
}
this.$refs.auditInfoRef.onOpen(row)
})
},
onView(row) {
this.$refs.guava.edit(() => {
this.showApprovalForm = false
this.$refs.auditInfoRef.onOpen(row)
})
},
handleTaskAction(tf_type) {
this.$refs.formRef.validate((valid) => {
if (valid) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.formData.tf_type = tf_type
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
})
}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
this.$refs.guava.index()
}
})
})
}
})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "info"
}).then(() => {
this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
}
})
})
},
listUnion() {
this.$businessTool.listUnit().then((res) => {
this.units = res
})
},
listSession() {
this.$axios.post("/platform/teacherCongress/common/listSession").then((res) => {
if (res.code === 0) {
this.sessionOptions = res.data
if (this.sessionOptions && this.sessionOptions.length > 0) {
this.pageForm.sessionId = this.sessionOptions[0].id
this.doSearch()
}
}
})
}
},
async created() {
this.listUnion()
this.listSession()
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
+233 -212
View File
@@ -2,193 +2,211 @@
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<el-card shadow="never">
<search @search="doSearch">
<search-item label="姓名/工号">
<el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="教代会">
<el-select v-model="pageForm.sessionId">
<el-option v-for="item in sessionOptions" :label="item.fullName" :value="item.id"
:key="item.id"></el-option>
</el-select>
</search-item>
<search-item label="分工会" v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')">
<el-select v-model="pageForm.unionId" filterable clearable style="width: 100%">
<el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</search-item>
</search>
</el-card>
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="姓名/工号">
<el-input placeholder="请输入姓名或工号" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="教代会">
<el-select v-model="pageForm.sessionId">
<el-option v-for="item in sessionOptions" :label="item.fullName" :value="item.id"
:key="item.id"></el-option>
</el-select>
</search-item>
<search-item label="分工会" v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')">
<el-select v-model="pageForm.unionId" filterable clearable style="width: 100%">
<el-option v-for="i in unionOptions" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card shadow="never">
<push-progress ref="pushProgressRef"></push-progress>
</el-card>
<el-card shadow="never">
<push-progress ref="pushProgressRef" @max-count="setMaxCount"></push-progress>
</el-card>
<el-card shadow="never">
<table-tool>
<el-button
icon="el-icon-plus"
size="small"
type="primary"
@click="$refs.pushFormalRef.onOpen(pageForm.sessionId,pageForm.unionId)"
>正式代表预选
</el-button>
<el-button
icon="el-icon-plus"
size="small"
type="primary"
@click="$refs.pushAttendanceRef.onOpen(pageForm.sessionId,pageForm.unionId)"
>列席代表预选
</el-button>
<!-- <el-button icon="el-icon-download" size="small" type="primary" @click="doExport">导出</el-button>-->
<el-card shadow="never">
<table-tool>
<el-button
icon="el-icon-plus"
size="small"
type="primary"
@click="doPushFormal"
>正式代表预选
</el-button>
<el-button
icon="el-icon-plus"
size="small"
type="primary"
@click="$refs.pushAttendanceRef.onOpen(pageForm.sessionId,pageForm.unionId)"
>列席代表预选
</el-button>
<!-- <el-button icon="el-icon-download" size="small" type="primary" @click="doExport">导出</el-button>-->
<el-button icon="el-icon-check" size="small" type="primary" @click="onBatchSubmit">正式代表提交上报
</el-button>
<el-radio-group v-model="pageForm.isFormalOrAttendance" size="small" class="ml10"
@change="doSearch">
<el-radio-button label="全部"></el-radio-button>
<el-radio-button label="正式代表"></el-radio-button>
<el-radio-button label="列席代表"></el-radio-button>
</el-radio-group>
</table-tool>
<el-radio-group v-model="pageForm.isFormalOrAttendance" size="small" class="ml10"
@change="doSearch">
<el-radio-button label="全部"></el-radio-button>
<el-radio-button label="正式代表"></el-radio-button>
<el-radio-button label="列席代表"></el-radio-button>
</el-radio-group>
</table-tool>
<el-table
ref="tableRef"
:data="tableData"
row-key="id"
@sort-change="pageOrder"
>
<!-- <el-table-column type="selection" width="55" reserve-selection fixed="left" :selectable="(row)=>{return row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62'}"></el-table-column>-->
<el-table-column type="index" width="55" label="序号" :index="indexMethod" fixed="left"></el-table-column>
<el-table-column label="姓名" prop="userName" width="100" fixed="left"></el-table-column>
<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>
<!-- :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}">
<el-checkbox
v-if="row"
v-model="row.schoolLeader"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="中层领导" prop="middleLevelLeader" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.middleLevelLeader"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>-->
<!--
<el-table-column label="专任教师" prop="ordinaryTeacher" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.ordinaryTeacher"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>-->
<el-table-column label="高级职称" prop="seniorTeacher" width="80">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.seniorTeacher"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="中级职称及以下" prop="intermediateBelow" width="120">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.intermediateBelow"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="干部" prop="cadre" width="80">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.cadre"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="工人" prop="worker" width="80">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.worker"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="教代会代表" prop="isJdh" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.isJdh"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="工代会代表" prop="isGdh" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.isGdh"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="代表类型" prop="representativeType" show-overflow-tooltip
width="100"></el-table-column>
<el-table-column prop="taskName" label="当前节点" width="120" fixed="right"></el-table-column>
<el-table-column prop="instanceState" label="流程状态" fixed="right">
<template slot-scope="{row}">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
size="small"></enum-tag>
</template>
</el-table-column>
<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"
@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">
删除
</el-button>
<el-table
ref="tableRef"
:data="tableData"
row-key="id"
@sort-change="pageOrder"
>
<!-- <el-table-column type="selection" width="55" reserve-selection fixed="left" :selectable="(row)=>{return row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62'}"></el-table-column>-->
<el-table-column type="index" width="55" label="序号" :index="indexMethod"
fixed="left"></el-table-column>
<el-table-column label="姓名" prop="userName" width="100" fixed="left"></el-table-column>
<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>
<!-- :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}">
<el-checkbox
v-if="row"
v-model="row.schoolLeader"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="中层领导" prop="middleLevelLeader" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.middleLevelLeader"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>-->
<!--
<el-table-column label="专任教师" prop="ordinaryTeacher" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.ordinaryTeacher"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>-->
<el-table-column label="高级职称" prop="seniorTeacher" width="80">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.seniorTeacher"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="中级职称及以下" prop="intermediateBelow" width="120">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.intermediateBelow"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="干部" prop="cadre" width="80">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.cadre"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="工人" prop="worker" width="80">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.worker"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="是否聘用制" prop="employ" width="80">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.employ"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="教代会代表" prop="isJdh" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.isJdh"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="工代会代表" prop="isGdh" min-width="100">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.isGdh"
style="pointer-events:none"
></el-checkbox>
</template>
</el-table-column>
<el-table-column label="代表类型" prop="representativeType" show-overflow-tooltip
width="100"></el-table-column>
<el-table-column prop="taskName" label="当前节点" width="120" fixed="right"></el-table-column>
<el-table-column prop="instanceState" label="流程状态" fixed="right">
<template slot-scope="{row}">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
size="small"></enum-tag>
</template>
</el-table-column>
<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-else-if="row.taskKey === 'startTask'
v-if="row.taskKey === 'startTask'
|| row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'
|| row.taskKey==='97b0846b-22c6-4d34-9002-a6b67d592944'
|| !row.instanceId"
@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">
删除
</el-button>
<el-button
v-else-if="row.taskKey === 'startTask'
|| row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'
|| row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62' || !row.instanceId"
@click="onDelete(row.id)"
size="mini" type="danger">删除
</el-button>
@click="onDelete(row.id)"
size="mini" type="danger">删除
</el-button>
</template>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #view>
<audit-info ref="auditInfoRef">
</audit-info>
</template>
</guava>
<push-formal-dialog ref="pushFormalRef" @refresh="doSearch"></push-formal-dialog>
<push-formal-dialog ref="pushFormalRef" @refresh="doSearch" :max-push="formalPush"></push-formal-dialog>
<push-attendance-dialog ref="pushAttendanceRef" @refresh="doSearch"></push-attendance-dialog>
@@ -213,6 +231,7 @@ layout("/layouts/platform.html"){
<!--#include('push-formal-dialog.js'){}#-->
<!--#include('push-attendance-dialog.js'){}#-->
<!--#include('write.js'){}#-->
<!--#include('auditInfo.js'){}#-->
new Vue({
el: '#app',
mixins: [initTableMixins],
@@ -220,7 +239,8 @@ layout("/layouts/platform.html"){
'push-progress': pushProgress,
'push-formal-dialog': pushFormalDialog,
'push-attendance-dialog': pushAttendanceDialog,
'formal-write': write
'formal-write': write,
'audit-info': auditInfo
},
data() {
return {
@@ -232,20 +252,36 @@ layout("/layouts/platform.html"){
writeDialog: false,
isRead: false,
userId: null
userId: null,
// 当前分工会的最大推选人员
maxPush: 0,
// 剩余正式代表推选名额
formalPush: 0
}
},
methods: {
doSearch() {
this.pageData()
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
doPushFormal() {
if (this.tableData.length >= this.maxPush) {
this.$message.warning("当前正式代表已超过最大推选人员数，如需调整请在表格数据列中选中【删除】按钮")
return
}
this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId)
this.$refs.pushFormalRef.onOpen(this.pageForm.sessionId, this.pageForm.unionId)
},
setMaxCount(data) {
this.maxPush = data
},
async doSearch() {
await this.pageData()
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId)
this.formalPush = this.maxPush - this.tableData.length
},
onView(row) {
this.writeDialog = true
this.userId = row.userId
this.isRead = true
this.$refs.guava.view(() => {
this.$refs.auditInfoRef.onOpen(row)
})
},
onEdit(row) {
this.writeDialog = true
@@ -268,33 +304,6 @@ layout("/layouts/platform.html"){
},
doExport() {
},
onBatchSubmit() {
const selection = this.$refs.tableRef.selection
/*if (selection.length === 0){
this.$message.warning('请选择要上报的记录')
return
}*/
this.$confirm('您确定要上报吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
const loading = createLoading('正在提交中')
this.$axios.post('/platform/teacherCongress/delegate/push/batchSubmit', {
ids: JSON.stringify(selection.map(v => v.id)),
sessionId: this.pageForm.sessionId
}).then(resp => {
if (resp.code === 0) {
this.$message.success(resp.msg)
this.doSearch()
this.$refs.tableRef.clearSelection()
}
}).finally(() => {
loading.close()
})
})
},
listUnion() {
this.$businessTool.listUnion().then((res) => {
this.unionOptions = res
@@ -310,6 +319,18 @@ layout("/layouts/platform.html"){
}
}
})
},
async pageData() {
try {
const resp = await this.$axios.post("/platform/teacherCongress/delegate/push/pageData", this.pageForm)
if (resp.code === 0) {
this.tableData = resp.data.list
this.pageForm.totalCount = resp.data.totalCount
}
} catch (e) {
console.log(e)
}
}
},
created() {
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-formal-dialog.js
+19 -2
View File
@@ -11,8 +11,9 @@ const pushFormalDialog = {
:data="userData"
:filter-method="filterMethod"
:props="{key: 'id',label: 'name'}"
:titles="['可报人员名单', '当前选择']"
:titles="['教职工名单', '当前选择']"
filterable
@change="onTransferChange"
>
<div slot-scope="{ option }">
<div class="transfer-item">
@@ -35,6 +36,9 @@ const pushFormalDialog = {
</span>
</el-dialog>
`,
props: {
maxPush: { type: Number, default: 1}
},
data() {
return {
dialogVisible: false,
@@ -42,10 +46,23 @@ const pushFormalDialog = {
userData: [],
rightChecked: [],
attendanceRightChecked: [],
sessionId: null
sessionId: null,
}
},
methods: {
onTransferChange(targetKeys, direction, movedKeys) {
// targetKeys 是新的 userValue
if (targetKeys.length > this.maxPush) {
this.$message.warning("剩余正式代表名额为【" + this.maxPush + "】人，请合理调配！");
// 只保留前 maxSelectCount 个（或根据业务逻辑决定保留哪些）
const validKeys = targetKeys.slice(0, this.maxPush);
// 更新 model 值（注意：避免无限触发 change）
this.userValue = validKeys;
}
},
async onOpen(sessionId, unionId) {
this.dialogVisible = true
this.sessionId = sessionId
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-progress.js
+97 -52
View File
@@ -247,7 +247,7 @@ const pushProgress = {
</div>
<!-- 45岁以下代表数 -->
<div class="metric-card">
<!--<div class="metric-card">
<div class="metric-header">
<div>
<div class="metric-title">45岁以下代表</div>
@@ -275,8 +275,41 @@ const pushProgress = {
metrics.under45.remaining
}} 人</span>
</div>
</div>
</div>-->
<!-- 聘用制代表数 -->
<div class="metric-card">
<div class="metric-header">
<div>
<div class="metric-title">聘用制代表</div>
<div class="metric-value">{{ metrics.employ.current }}<span
class="metric-target"
>/ {{ metrics.employ.target }}</span></div>
</div>
<div class="metric-icon bg-primary-light">
<i class="fas fa-user-graduate text-primary"></i>
</div>
</div>
<div class="progress-bar">
<div class="progress-bar-inner bg-primary"
:style="{width: metrics.employ.progress * 100 + '%'}"></div>
</div>
<div class="progress-info">
<span v-if="metrics.employ.progress>=1 || metrics.employ.target===0"
class="text-success">
已达标
</span>
<span v-else-if="metrics.employ.progress<1" class="text-primary">
未达标
</span>
<span v-if="metrics.employ.remaining>0" class="text-gray-500">剩余 {{
metrics.employ.remaining
}} 人</span>
</div>
</div>
<!-- &lt;!&ndash; 少数民族数 &ndash;&gt;
<div class="metric-card">
<div class="metric-header">
@@ -388,15 +421,20 @@ const pushProgress = {
<div class="update-time"></div>
</div>
<div class="card">
<!-- <div class="card">
<h2 class="legend-title">上报说明</h2>
<div class="legend-container">
<div class="legend-item">
<div class="legend-color bg-warning "></div>
<span class="legend-text">正式代表完成信息填写后才能进行上报，列席代表可直接上报且不计入名额</span>
<span class="legend-text">正式代表完成信息填写后才能进行上报，列席代表可直接上报且不计入名额</span>
</div>
<div class="legend-item">
<div class="legend-color bg-warning "></div>
<span class="legend-text" style="color: red">当前代表为预推选，不计入代表总额，需等待党委书记审核后方才记录</span>
</div>
</div>
</div>
</div>-->
</div>
</div>
@@ -417,70 +455,76 @@ const pushProgress = {
return {
metrics: {
total: {
current: 15,
target: 15,
progress: 100,
current: 0,
target: 0,
progress: 0,
remaining: 0
},
female: {
current: 3,
target: 5,
progress: 60,
remaining: 2
current: 0,
target: 0,
progress: 0,
remaining: 0
},
seniorTeacher: {
current: 4,
target: 6,
progress: 66.7,
remaining: 2
current: 0,
target: 0,
progress: 0,
remaining: 0
},
intermediateBelow: {
current: 4,
target: 6,
progress: 66.7,
remaining: 2
current: 0,
target: 0,
progress: 0,
remaining: 0
},
cadre: {
current: 4,
target: 6,
progress: 66.7,
remaining: 2
current: 0,
target: 0,
progress: 0,
remaining: 0
},
worker: {
current: 4,
target: 6,
progress: 66.7,
remaining: 2
current: 0,
target: 0,
progress: 0,
remaining: 0
},
ordinaryTeacher: {
current: 8,
target: 10,
progress: 80,
remaining: 2
current: 0,
target: 0,
progress: 0,
remaining: 0
},
under45: {
current: 5,
target: 7,
progress: 71.4,
remaining: 2
current: 0,
target: 0,
progress: 0,
remaining: 0
},
ethnicMinority:{
current: 1,
target: 2,
progress: 50,
remaining: 1
ethnicMinority: {
current: 0,
target: 0,
progress: 0,
remaining: 0
},
schoolLeader:{
current: 2,
target: 3,
progress: 66.7,
remaining: 1
schoolLeader: {
current: 0,
target: 0,
progress: 0,
remaining: 0
},
middleLevelLeader:{
current: 1,
target: 2,
progress: 33.3,
remaining: 1
middleLevelLeader: {
current: 0,
target: 0,
progress: 0,
remaining: 0
},
employ: {
current: 0,
target: 0,
progress: 0,
remaining: 0
}
},
teacherMeetName: null
@@ -501,6 +545,7 @@ const pushProgress = {
if (code === 0) {
if (data) {
this.metrics = data
this.$emit('max-count', this.metrics.total.target)
} else {
this.$message.error('暂未分配名额')
}
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/write.js
+231 -184
View File
@@ -47,172 +47,199 @@ const write = {
</div>
</div>
<el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="150px"
:class="{ hidden: !isSelected }"
:disabled="(formData && formData.taskKey!=='53ff0c2a-ba93-45e9-a9fd-db51cdab3080') || is_read"
>
<div class="form-section">
<h3 class="section-title">基本信息</h3>
<div class="form-grid">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="姓名" prop="userName">
<el-input v-model="formData.userName" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工号" prop="loginName">
<el-input v-model="formData.loginName" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="性别" prop="sex">
<el-radio-group v-model="formData.sex" size="small">
<el-radio border label="男">男</el-radio>
<el-radio border label="女">女</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出生年月" prop="birthday">
<el-date-picker
v-model="formData.birthday"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 100%"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="民族" prop="nation">
<dict-select v-model="formData.nation" style="width: 100%" placeholder="请选择民族"
code="USER_NATION"></dict-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="政治面貌" prop="political">
<el-input maxlength="100" placeholder="政治面貌"
v-model="formData.political"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属工会">
<el-input
v-model="formData.unionName"
readonly
placeholder="请输入所属工会"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属单位">
<el-input
v-model="formData.unitName"
readonly
placeholder="请输入所属单位"
clearable
></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-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否高级职称" prop="seniorTeacher">
<el-radio-group v-model="formData.seniorTeacher" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
<el-tabs v-model="activeName">
<el-tab-pane label="填写信息" name="one">
<el-form
ref="formRef"
:model="formData"
:rules="rules"
label-width="150px"
:class="{ hidden: !isSelected }"
:disabled="(formData && !['53ff0c2a-ba93-45e9-a9fd-db51cdab3080','97b0846b-22c6-4d34-9002-a6b67d592944'].includes(formData.taskKey)) || is_read"
>
<div class="form-section">
<h3 class="section-title">基本信息</h3>
<div class="form-grid">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="姓名" prop="userName">
<el-input v-model="formData.userName" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工号" prop="loginName">
<el-input v-model="formData.loginName" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="性别" prop="sex">
<el-radio-group v-model="formData.sex" size="small">
<el-radio border label="男">男</el-radio>
<el-radio border label="女">女</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出生年月" prop="birthday">
<el-date-picker
v-model="formData.birthday"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
style="width: 100%"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="民族" prop="nation">
<dict-select v-model="formData.nation" style="width: 100%"
placeholder="请选择民族"
code="USER_NATION"></dict-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="政治面貌" prop="political">
<el-input maxlength="100" placeholder="政治面貌"
v-model="formData.political"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属工会">
<el-input
v-model="formData.unionName"
readonly
placeholder="请输入所属工会"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属单位">
<el-input
v-model="formData.unitName"
readonly
placeholder="请输入所属单位"
clearable
></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-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否聘用制" prop="employ">
<el-radio-group v-model="formData.employ" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否高级职称" prop="seniorTeacher">
<el-radio-group v-model="formData.seniorTeacher" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否中级职称及以下" prop="intermediateBelow">
<el-radio-group v-model="formData.intermediateBelow" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否干部" prop="cadre">
<el-radio-group v-model="formData.cadre" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否工人" prop="worker">
<el-radio-group v-model="formData.worker" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="校级领导" prop="schoolLeader">
<el-radio-group v-model="formData.schoolLeader" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="中层领导" prop="middleLevelLeader">
<el-radio-group v-model="formData.middleLevelLeader" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="form-grid">
<el-form-item label="手机号" prop="mobile">
<el-input v-model="formData.mobile" maxlength="11"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否中级职称及以下" prop="intermediateBelow">
<el-radio-group v-model="formData.intermediateBelow" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否干部" prop="cadre">
<el-radio-group v-model="formData.cadre" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否工人" prop="worker">
<el-radio-group v-model="formData.worker" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="校级领导" prop="schoolLeader">
<el-radio-group v-model="formData.schoolLeader" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="中层领导" prop="middleLevelLeader">
<el-radio-group v-model="formData.middleLevelLeader" size="small">
<el-radio border :label="true">是</el-radio>
<el-radio border :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<!--<el-form-item label="电子邮箱" prop="email">
<el-input v-model="formData.email" maxlength="255"></el-input>
</el-form-item>-->
</div>
</div>
<div v-if="formData && ['53ff0c2a-ba93-45e9-a9fd-db51cdab3080','97b0846b-22c6-4d34-9002-a6b67d592944'].includes(formData.taskKey)"
class="form-actions">
<el-button @click="onSave">保存草稿</el-button>
<el-button type="primary" @click="onSubmit">提交信息</el-button>
</div>
</el-form>
</el-tab-pane>
<el-tab-pane label="审核信息" name="two" v-if="doneTasks&&doneTasks.length>0">
<template v-for="task in doneTasks">
<div class="mt10"
v-if="['0cacd1e7-7bb2-47dd-818b-6a73062e0c62'].includes(task.taskName)">
<div class="process-title">{{ task.displayName }}</div>
</div>
<div class="form-grid">
<el-form-item label="手机号" prop="mobile">
<el-input v-model="formData.mobile" maxlength="11"></el-input>
</el-form-item>
<!--<el-form-item label="电子邮箱" prop="email">
<el-input v-model="formData.email" maxlength="255"></el-input>
</el-form-item>-->
</div>
</div>
<div v-if="formData && formData.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'"
class="form-actions">
<el-button @click="onSave">保存草稿</el-button>
<el-button type="primary" @click="onSubmit">提交信息</el-button>
</div>
</el-form>
<div v-if="isSelected && formData && formData.taskKey!=='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'"
<el-descriptions border class="flow-task-form" :column="3" :key="task.id"
>
<el-descriptions-item label="办理用户">{{ task.taskFormData.userName
}}({{task.taskFormData.loginName}})
</el-descriptions-item>
<el-descriptions-item label="办理时间">{{ task.finishTime }}
</el-descriptions-item>
<el-descriptions-item label="办理结果">
{{processSubmitTypeEnums.find(v=>v.name===task.ext.tf_type)?.message}}
<!-- <dict-tag :options="dict.type.PROCESS_TASK_SUBMIT_TYPE"
:value="task.ext.submitType"></dict-tag>-->
</el-descriptions-item>
<el-descriptions-item label="办理意见" v-if="!task.ext.isFirstTaskNode">{{
task.taskFormData.opinion }}
</el-descriptions-item>
</el-descriptions>
</div>
</template>
</el-tab-pane>
</el-tabs>
<div v-if="isSelected && formData && !['53ff0c2a-ba93-45e9-a9fd-db51cdab3080','97b0846b-22c6-4d34-9002-a6b67d592944'].includes(formData.taskKey)"
class="completion-panel">
<div>
<i class="el-icon-success completion-icon"></i>
@@ -247,6 +274,9 @@ const write = {
},
data() {
return {
doneTasks: [],
activeName: "one",
processSubmitTypeEnums:[],
isSelected: true,
formData: {
teacherMeetId: null
@@ -300,6 +330,14 @@ const write = {
}
},
methods: {
// 获取已办任务审批记录
getDoneTasks() {
this.$axios.post("/flow/common/doneTasks", {bizId: this.formData.id}).then((res) => {
if (res.code === 0) {
this.doneTasks = res.data
}
})
},
async listSession() {
const res = await this.$axios.post("/platform/teacherCongress/common/listSession")
if (res.code === 0) {
@@ -321,7 +359,10 @@ const write = {
}
}
},
async getEnumOptions() {
const resp = await this.$axios.post("/open/common/dictEnumOptions", { name: "ProcessSubmitTypeEnum" })
this.processSubmitTypeEnums=resp.data
},
async initInfo() {
const {code, data} = await $.get('/platform/teacherCongress/delegate/push/write/info', {
sessionId: this.formData.sessionId
@@ -330,6 +371,8 @@ const write = {
this.isSelected = data.isSelected
if (this.isSelected) {
this.formData = data.delegate
this.getDoneTasks()
this.getEnumOptions()
}
}
},
@@ -347,19 +390,21 @@ const write = {
type: 'warning'
}).then(async () => {
const loading = createLoading('正在提交中')
const {code} = await $.post('/platform/teacherCongress/delegate/push/write/save', this.formData)
loading.close()
if (code === 0) {
this.$message.success('保存成功')
this.$emit('refresh')
if (this.session_id && this.user_id) {
await this.initOtherInfo()
this.$axios.post('/platform/teacherCongress/delegate/push/write/save', this.formData).then(async resp => {
loading.close()
if (resp.code === 0) {
this.$message.success('保存成功')
this.$emit('refresh')
if (this.session_id && this.user_id) {
await this.initOtherInfo()
} else {
await this.initInfo()
}
} else {
await this.initInfo()
this.$message.warning('保存失败')
}
} else {
this.$message.warning('保存失败')
}
})
}).catch(() => {
})
@@ -375,18 +420,20 @@ const write = {
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
const {code} = await $.post('/platform/teacherCongress/delegate/push/write/submit', this.formData)
if (code === 0) {
this.$message.success('提交成功')
this.$emit('refresh')
if (this.session_id && this.user_id) {
await this.initOtherInfo()
this.$axios.post('/platform/teacherCongress/delegate/push/write/submit', this.formData).then(async resp => {
if (resp.code === 0) {
this.$message.success('提交成功')
this.$emit('refresh')
if (this.session_id && this.user_id) {
await this.initOtherInfo()
} else {
await this.initInfo()
}
} else {
await this.initInfo()
this.$message.warning('提交失败')
}
} else {
this.$message.warning('提交失败')
}
})
}).catch(() => {
})
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html
+81 -14
View File
@@ -2,6 +2,7 @@
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="姓名/工号">
@@ -23,26 +24,38 @@ layout("/layouts/platform.html"){
<el-card shadow="never">
<table-tool>
<el-radio-group @change="doSearch" v-model="pageForm.isFormalOrAttendance" size="small">
<el-radio-group v-model="pageForm.approval" size="small" class="ml10"
@change="doSearch">
<el-radio-button :label="true">已审核</el-radio-button>
<el-radio-button :label="false">未审核</el-radio-button>
</el-radio-group>
<template v-if="!pageForm.approval">
<el-button type="primary" size="small" @click="doBatchApproval(1)"
:disabled="!selectDataList || selectDataList.length <= 0"
class="ml10">批量通过</el-button>
<el-button type="danger" size="small" @click="doBatchApproval(2)"
:disabled="!selectDataList || selectDataList.length <= 0"
class="ml10">批量拒绝</el-button>
</template>
<el-radio-group @change="doSearch" v-model="pageForm.isFormalOrAttendance" size="small" style="margin-left: 10px">
<el-radio-button label="全部"></el-radio-button>
<el-radio-button label="正式代表"></el-radio-button>
<el-radio-button label="列席代表"></el-radio-button>
</el-radio-group>
<el-radio-group v-model="pageForm.approval" size="small" class="ml10"
@change="doSearch">
<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>
<el-button type="primary" size="small" @click="exportExcel" class="ml10">导出</el-button>
</table-tool>
<el-table
ref="tableRef"
:data="tableData"
row-key="id"
@selection-change="tableHandleSelectionChange"
@sort-change="pageOrder"
>
<!-- <el-table-column type="selection" width="55" reserve-selection></el-table-column>-->
<el-table-column type="selection" width="55" reserve-selection></el-table-column>
<el-table-column type="index" width="55" label="序号" :index="indexMethod"></el-table-column>
<el-table-column label="姓名" prop="userName" width="100"></el-table-column>
<el-table-column label="工号" prop="loginName"></el-table-column>
@@ -115,6 +128,11 @@ layout("/layouts/platform.html"){
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #edit>
<audit-info ref="auditInfoRef">
</audit-info>
</template>
</guava>
<el-dialog :close-on-click-modal="false"
class="write-dialog"
:visible.sync="writeDialog"
@@ -134,11 +152,13 @@ layout("/layouts/platform.html"){
<script nonce="${cspNonce!}">
<!--#include('write.js'){}#-->
<!--#include('auditInfo.js'){}#-->
new Vue({
el: '#app',
mixins: [initTableMixins],
components: {
'formal-write': write
'formal-write': write,
'audit-info': auditInfo
},
data() {
return {
@@ -153,17 +173,63 @@ layout("/layouts/platform.html"){
writeDialog: false,
isRead: false,
userId: null
userId: null,
selectDataList: [],
}
},
methods: {
/**
* 批量审核
*/
tableHandleSelectionChange(val) {
this.selectDataList = val
},
/**
* 批量审核
*/
doBatchApproval(submitType) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
const loading = createLoading()
const data = this.selectDataList.map(v => {
return {
processTaskId: v.taskId,
taskName: v.curTaskName,
submitType: submitType,
id: v.id
}
})
this.$axios.post("/platform/teacherCongress/delegate/push/zcAudit/submitBatch", {
data: JSON.stringify(data)
}).then(res => {
loading.close()
if (res.code === 0) {
this.$message.success(res.msg)
this.$refs.tableRef.clearSelection()
this.doSearch()
} else {
this.$message.error(res.msg)
}
})
})
},
exportExcel() {
this.$downLoad("/platform/teacherCongress/delegate/push/zcAudit/exportExcel", this.pageForm)
},
onView(row) {
this.writeDialog = true
this.userId = row.userId
this.isRead = true
this.$refs.guava.edit(() => {
this.showApprovalForm = false
this.$refs.auditInfoRef.onOpen(row)
})
},
handleTaskAction(row, submitType) {
this.$confirm("您确定要提交吗？", "提示", {
@@ -179,7 +245,8 @@ layout("/layouts/platform.html"){
data: JSON.stringify({
...this.formData,
submitType: submitType
}), id: row.id
}),
id: row.id
}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/index.html
+7 -4
View File
@@ -43,16 +43,19 @@ layout("/layouts/platform.html"){
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50" :index="indexMethod" label="序号"></el-table-column>
<el-table-column prop="unionName" label="工会名称"></el-table-column>
<el-table-column prop="memberCount" label="会员人数"></el-table-column>
<!-- <el-table-column prop="dbCount" label="代表人数"></el-table-column>-->
<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')">
<el-table-column prop="memberCount" label="会员人数"></el-table-column>
</template>
<!-- <el-table-column prop="dbCount" label="代表人数"></el-table-column>-->
<el-table-column prop="allocationNum" label="名额分配人数"></el-table-column>
<el-table-column prop="seniorTeaNum" label="高级职称代表数"></el-table-column>
<el-table-column prop="intermediateBelowNum" label="中级职称及以下代表数"></el-table-column>
<el-table-column prop="cadreNum" label="干部代表数"></el-table-column>
<el-table-column prop="workerNum" label="工人代表数"></el-table-column>
<!-- <el-table-column prop="ordinaryTeaNum" label="专任教师代表数"></el-table-column>-->
<!-- <el-table-column prop="ordinaryTeaNum" label="专任教师代表数"></el-table-column>-->
<el-table-column prop="femaleNum" label="女代表数"></el-table-column>
<el-table-column prop="less45Num" label="45岁以下代表数"></el-table-column>
<!-- <el-table-column prop="less45Num" label="45岁以下代表数"></el-table-column>-->
<el-table-column prop="employNum" label="聘用制代表数"></el-table-column>
</el-table>
</el-card>
src/main/resources/views/platform/zhgh/democratic/teachercongress/prepare/quotaAllocation/manualAllocationDialog.js
+58 -11
View File
@@ -72,11 +72,13 @@ const MANUAL_ALLOCATION_DIALOG = {
</table-tool>
<el-table :data="unionLimit" max-height="500" :summary-method="getSummaries"
show-summary>
width="100%" show-summary>
<el-table-column prop="unionName" label="分工会"></el-table-column>
<el-table-column prop="memberCount" label="会员人数"></el-table-column>
<template v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')">
<el-table-column prop="memberCount" label="会员人数"></el-table-column>
</template>
<el-table-column align="center" prop="ratio" label="比例(%)">
<template v-slot="{$index,row}">
<template v-slot="{$index, row}">
<el-input-number
style="width: 100%"
v-model="row.ratio"
@@ -96,7 +98,6 @@ const MANUAL_ALLOCATION_DIALOG = {
:precision="0"
:step="1"
:min="0"
:max="row.memberCount"
></el-input-number>
</template>
</el-table-column>
@@ -172,11 +173,23 @@ const MANUAL_ALLOCATION_DIALOG = {
></el-input-number>
</template>
</el-table-column>
<el-table-column prop="less45Num" label="45岁以下代表数">
<!-- <el-table-column prop="less45Num" label="45岁以下代表数">-->
<!-- <template v-slot="{row}">-->
<!-- <el-input-number-->
<!-- style="width: 100%"-->
<!-- v-model="row.less45Num"-->
<!-- :precision="0"-->
<!-- :step="1"-->
<!-- :min="0"-->
<!-- :max="row.allocationNum"-->
<!-- ></el-input-number>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="employNum" label="聘用制代表数">
<template v-slot="{row}">
<el-input-number
style="width: 100%"
v-model="row.less45Num"
v-model="row.employNum"
:precision="0"
:step="1"
:min="0"
@@ -212,10 +225,33 @@ const MANUAL_ALLOCATION_DIALOG = {
{label: "干部代表数", value: "cadreNum"},
{label: "工人代表数", value: "workerNum"},
{label: "女代表数", value: "femaleNum"},
{label: "45岁以下代表数", value: "less45Num"},
// {label: "45岁以下代表数", value: "less45Num"},
{label: "聘用制代表数", value: "employNum"},
]
}
},
// watch: {
// unionLimit: {
// handler(list) {
// list.forEach(row => {
// const keys = [
// 'seniorTeaNum',
// 'intermediateBelowNum',
// 'cadreNum',
// 'workerNum',
// 'femaleNum',
// 'employNum'
// ]
// const sum = keys.reduce((s, k) => s + (row[k] || 0), 0)
// if (sum > row.allocationNum) {
// const excess = sum - row.allocationNum
// row.seniorTeaNum = Math.max(0, row.seniorTeaNum - excess)
// }
// })
// },
// deep: true
// }
// },
methods: {
getSummaries(param) {
const {columns, data} = param;
@@ -270,6 +306,7 @@ const MANUAL_ALLOCATION_DIALOG = {
},
unionLimitQuickSetting() {
this.unionUserNumCalc.forEach((v, i) => {
const that = this
const startNum = v.startNum
const endNum = v.endNum
const resultNum = v.resultNum
@@ -279,8 +316,10 @@ const MANUAL_ALLOCATION_DIALOG = {
this.unionLimit.forEach((x) => {
if (x.memberCount >= startNum && x.memberCount <= endNum) {
x.ratio = resultNum
const num = parseFloat((v.memberCount * x.ratio / 100).toFixed(0))
v.allocationNum = (num === 0 ? 1 : num)
const num = parseFloat((x.memberCount * resultNum / 100).toFixed(0))
debugger
that.$set(x, "allocationNum", (num ? num : 0))
// v.allocationNum = num ? num : 0
}
})
this.$forceUpdate()
@@ -321,9 +360,17 @@ const MANUAL_ALLOCATION_DIALOG = {
type: 'warning'
}).catch(err => err)
if (confirm === 'confirm') {
this.unionLimit = []
// this.unionLimit = []
this.unionUserNumOneKeyRatio = null
await this.getUnionUsers()
// await this.getUnionUsers()
// 除了工会和会员数据，其他设置为0
this.unionLimit.forEach(v => {
v.ratio = 0
this.settingsTypeOptions.forEach( item => {
v[item.value] = 0
})
})
}
},
applyScaleSettings() {