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
2026-03-13 17:39:06 +08:00
parent 4cb90db2fa
commit 6f208d5435
12 changed files with 1206 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/delegationOnePush/onePushFormalDialog.js
+1 -1
View File
@@ -4,7 +4,7 @@ const DELEGATION_ONE_PUSH_FORMAL_DIALOG = {
<el-dialog
:close-on-click-modal="false"
:visible.sync="dialogVisible"
title="分工会推选委员"
title="代表团推选委员"
width="70%"
>
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/executiveCommitteeConfig/index.html
+124 -82
View File
@@ -3,8 +3,8 @@ layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<custom-card>
<template slot="header" class="mb10">
<search @search="fetchConfig">
<search-item label="教代会届次">
<el-select
@@ -23,82 +23,112 @@ layout("/layouts/platform.html"){
</el-select>
</search-item>
</search>
</el-card>
<el-card class="mt10" shadow="never">
<table-tool label="基础信息"></table-tool>
<el-form ref="form" label-width="140px" :model="formData" :rules="formRules">
<el-form-item prop="prepareGroupQuotaCount" label="筹备组推荐名额数">
<el-input-number v-model="formData.prepareGroupQuotaCount" placeholder="请填写筹备组推荐名额数"
style="width: 100%"></el-input-number>
</el-form-item>
</template>
<el-form-item prop="unionQuotaCount" label="分工会推荐总数">
<el-input-number v-model="formData.unionQuotaCount"
placeholder="请填写分工会推荐名额总数" style="width: 100%"></el-input-number>
</el-form-item>
<el-form-item prop="committeeQuotaCount" label="委员会预选人数">
<el-input-number v-model="formData.committeeQuotaCount"
placeholder="请填写委员会预选人数" style="width: 100%"></el-input-number>
</el-form-item>
<el-form-item prop="firstTime" label="第一次预选时间">
<el-date-picker
v-model="formData.firstTime"
style="width: 100%"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="-"
start-placeholder="请选择开始日期"
end-placeholder="请选择结束日期"
></el-date-picker>
</el-form-item>
<el-form-item prop="secondTime" label="第二次预选时间">
<el-date-picker
v-model="formData.secondTime"
style="width: 100%"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="-"
start-placeholder="请选择开始日期"
end-placeholder="请选择结束日期"
></el-date-picker>
</el-form-item>
</el-form>
<table-tool label="分工会名额分配"></table-tool>
<el-table :data="formData.unionQuotaList" show-summar size="mini" max-height="500">
<el-table-column
align="center"
header-align="center"
type="index"
:index="indexMethod"
label="序号"
width="80px"
></el-table-column>
<el-table-column
v-for="column in tableColumns"
:key="column.prop"
align="center"
header-align="center"
:label="column.label"
:prop="column.prop"
show-overflow-tooltip
>
<template v-if="column.prop === 'quotaCount'" #default="{ row }">
<el-input-number
v-model="row.quotaCount"
:precision="0"
:step="1"
:min="0"
:max="100"
></el-input-number>
</template>
</el-table-column>
</el-table>
<el-row type="flex" justify="end" class="mt20">
<el-button type="primary" @click="onHandle">提 交</el-button>
</el-row>
<table-tool label="基础信息"></table-tool>
<el-form ref="formRef" label-width="140px" :model="formData" :rules="formRules">
<el-form-item prop="prepareGroupQuotaCount" label="筹备组推荐名额数">
<el-input-number v-model="formData.prepareGroupQuotaCount" placeholder="请填写筹备组推荐名额数"
style="width: 100%"></el-input-number>
</el-form-item>
<el-form-item prop="unionQuotaCount" label="分工会推荐总数">
<el-input-number v-model="formData.unionQuotaCount"
placeholder="请填写分工会推荐名额总数" style="width: 100%"></el-input-number>
</el-form-item>
<el-form-item prop="delegationQuotaCount" label="代表团推荐总数">
<el-input-number v-model="formData.delegationQuotaCount"
placeholder="请填写代表团推荐名额总数" style="width: 100%"></el-input-number>
</el-form-item>
<el-form-item prop="committeeQuotaCount" label="委员会预选人数">
<el-input-number v-model="formData.committeeQuotaCount"
placeholder="请填写委员会预选人数" style="width: 100%"></el-input-number>
</el-form-item>
<el-form-item prop="firstTime" label="第一次预选时间">
<el-date-picker
v-model="formData.firstTime"
style="width: 100%"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="-"
start-placeholder="请选择开始日期"
end-placeholder="请选择结束日期"
></el-date-picker>
</el-form-item>
<el-form-item prop="secondTime" label="第二次预选时间">
<el-date-picker
v-model="formData.secondTime"
style="width: 100%"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="-"
start-placeholder="请选择开始日期"
end-placeholder="请选择结束日期"
></el-date-picker>
</el-form-item>
</el-form>
<table-tool label="分工会名额分配"></table-tool>
<el-table :data="formData.unionQuotaList" show-summar size="mini" max-height="500">
<el-table-column
align="center"
header-align="center"
type="index"
:index="indexMethod"
label="序号"
width="80px"
></el-table-column>
<el-table-column
v-for="column in tableColumns"
:key="column.prop"
align="center"
header-align="center"
:label="column.label"
:prop="column.prop"
show-overflow-tooltip
>
<template v-if="column.prop === 'quotaCount'" #default="{ row }">
<el-input-number
v-model="row.quotaCount"
:precision="0"
:step="1"
:min="0"
:max="100"
></el-input-number>
</template>
</el-table-column>
</el-table>
<table-tool label="代表团名额分配"></table-tool>
<el-table :data="formData.delegationQuotaList" show-summar size="mini" max-height="500">
<el-table-column
type="index"
:index="indexMethod"
label="序号"
width="80px"
></el-table-column>
<el-table-column
v-for="column in delegationTableColumns"
:key="column.prop"
:label="column.label"
:prop="column.prop"
show-overflow-tooltip
>
<template v-if="column.prop === 'quotaCount'" #default="{ row }">
<el-input-number
v-model="row.quotaCount"
:precision="0"
:step="1"
:min="0"
:max="100"
></el-input-number>
</template>
</el-table-column>
</el-table>
<template slot="footer">
<el-button type="primary" @click="onHandle">提 交</el-button>
</template>
</custom-card>
</el-card>
</guava>
</div>
<script>
@@ -117,13 +147,19 @@ layout("/layouts/platform.html"){
{prop: 'dbCount', label: '代表人数', sortable: true},
{prop: 'quotaCount', label: '分配人数', sortable: true}
],
delegationTableColumns: [
{prop: 'delegationName', label: '代表团名称', sortable: true},
{prop: 'dbCount', label: '代表人数', sortable: true},
{prop: 'quotaCount', label: '分配人数', sortable: true}
],
formData: {},
formRules: {
prepareGroupQuotaCount: [{required: true, message: '必填', trigger: ['blur']}],
committeeQuotaCount: [{required: true, message: '必填', trigger: ['blur']}],
unionQuotaCount: [{required: true, message: '必填', trigger: ['blur']}],
firstTime: [{required: true, message: '必填', trigger: ['blur']}],
secondTime: [{required: true, message: '必填', trigger: ['blur']}]
prepareGroupQuotaCount: [{required: true, message: '必填', trigger: ["change", "blur"]}],
committeeQuotaCount: [{required: true, message: '必填', trigger: ["change", "blur"]}],
unionQuotaCount: [{required: true, message: '必填', trigger: ["change", "blur"]}],
delegationQuotaCount: [{required: true, message: '必填', trigger: ["change", "blur"]}],
firstTime: [{required: true, message: '必填', trigger: ["change", "blur"]}],
secondTime: [{required: true, message: '必填', trigger: ["change", "blur"]}]
}
}
},
@@ -147,7 +183,7 @@ layout("/layouts/platform.html"){
},
onHandle() {
this.$refs['form'].validate(async (valid) => {
this.$refs.formRef.validate((valid) => {
if (valid) {
this.$confirm('您确定要提交吗？', '提示', {
confirmButtonText: '确定',
@@ -159,6 +195,11 @@ layout("/layouts/platform.html"){
this.$message.warning('各分工会名额分配数之和不能超过' + this.formData.unionQuotaCount)
return
}
const delegationTotal = this.formData.delegationQuotaList.reduce((sum, item) => sum + (item.quotaCount || 0), 0)
if (delegationTotal > this.formData.delegationQuotaCount) {
this.$message.warning('各代表团名额分配数之和不能超过' + this.formData.delegationQuotaCount)
return
}
if (this.formData.firstTime && this.formData.firstTime.length > 1) {
this.$set(this.formData, 'firstStartTime', this.formData.firstTime[0])
this.$set(this.formData, 'firstEndTime', this.formData.firstTime[1])
@@ -169,6 +210,7 @@ layout("/layouts/platform.html"){
}
this.$set(this.formData, 'teacherMeetId', this.pageForm.sessionId)
this.$set(this.formData, 'unionQuotaList', JSON.stringify(this.formData.unionQuotaList))
this.$set(this.formData, 'delegationQuotaList', JSON.stringify(this.formData.delegationQuotaList))
const resp = await this.$axios.post('/platform/executiveCommittee/executiveCommitteeConfig/onHandle', this.formData)
if (resp.code === 0) {
await this.fetchConfig()
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/pushDwSjAudit/index.html
+174
View File
@@ -0,0 +1,174 @@
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="姓名/工号">
<el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable>
</el-input>
</search-item>
<search-item label="教代会">
<el-select
v-model="pageForm.teacherMeetId"
filterable
placeholder="请选择教代会"
style="width:100%;"
@change="getAllDelegation(pageForm.teacherMeetId);doSearch()"
>
<el-option
v-for="item in teacherMeets"
:key="item.id"
:label="item.fullName"
:value="item.id"
></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card shadow="never" class="mt10">
<table-tool label="上报列表">
<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 :index="indexMethod" align="center" header-align="center"
label="序号"
fixed
type="index"
width="50"></el-table-column>
<el-table-column label="工号" prop="loginName"></el-table-column>
<el-table-column label="姓名" prop="userName"></el-table-column>
<el-table-column label="年龄" prop="age"></el-table-column>
<el-table-column label="性别" prop="sex"></el-table-column>
<el-table-column label="代表团" prop="delegationName"></el-table-column>
<el-table-column label="所属工会" prop="unionName"></el-table-column>
<el-table-column label="所属单位" prop="unitName"></el-table-column>
<el-table-column prop="curTaskName" 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="操作" width="250" fixed="right">
<template scope="{row}">
<el-button v-if="row.taskState === 10" @click="handleTaskAction(1,row)" size="mini"
type="primary">
通过
</el-button>
<el-button v-if="row.taskState === 10" @click="handleTaskAction(2,row)" size="mini"
type="danger">
返回修改
</el-button>
<el-button v-if="row.canRevoke||[45].includes(row.instanceState)" @click="onRevoke(row)"
size="mini"
type="danger">撤回
</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
</guava>
</div>
<script>
new Vue({
el: '#app',
mixins: [initTableMixins],
data() {
return {
pageForm: {
teacherMeetId: null,
unionId: null,
approval: false,
},
teacherMeets: [],
unionOptions: [],
delegations: []
}
},
async created() {
this.unionOptions = await this.$businessTool.listUnion()
await this.getAllJdh()
},
methods: {
handleTaskAction(tf_type, row) {
this.$confirm("您确定要" + (tf_type === 1 ? "通过" : "返回修改") + "吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.formData = {
bizId: row.id,
userId: row.userId,
processTaskId: row.taskId,
taskKey: row.taskKey,
taskName: row.taskName,
instanceId: row.instanceId,
submitType: tf_type,
}
this.$axios.post("/platform/executiveCommittee/pushDwSjAudit/executeTask", {
data: JSON.stringify({
...this.formData,
})
}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.doSearch()
}
})
})
},
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()
}
})
})
},
getAllDelegation(id) {
this.$axios.post("/platform/teacherCongress/common/listDelegation", {sessionId: id}).then(resp => {
if (resp.code === 0) {
this.delegations = resp.data
}
})
},
getAllJdh() {
this.$axios.post("/platform/teacherCongress/common/listSession", {}).then(resp => {
if (resp.code === 0) {
this.teacherMeets = resp.data
if (this.teacherMeets && this.teacherMeets.length > 0) {
this.$set(this.pageForm, 'teacherMeetId', this.teacherMeets[0].id)
this.getAllDelegation(this.teacherMeets[0].id)
this.pageData()
}
}
})
},
}
})
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/unionPush/index.html
+196
View File
@@ -0,0 +1,196 @@
<!--#
layout("/layouts/platform.html"){
#-->
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="姓名/工号">
<el-input v-model="pageForm.searchKeyword" placeholder="请输入姓名或工号" clearable>
</el-input>
</search-item>
<search-item label="教代会">
<el-select
v-model="pageForm.teacherMeetId"
filterable
placeholder="请选择教代会"
style="width:100%;"
@change="getAllDelegation(pageForm.teacherMeetId);doSearch()"
>
<el-option
v-for="item in teacherMeets"
:key="item.id"
:label="item.fullName"
:value="item.id"
></el-option>
</el-select>
</search-item>
</search>
</el-card>
<el-card shadow="never" class="mt10">
<table-tool label="上报列表">
<el-button
icon="el-icon-check"
size="small"
type="primary"
@click="$refs.pushFormalRef.onOpen(pageForm.teacherMeetId)"
>委员推选
</el-button>
</table-tool>
<el-table
ref="tableRef"
:data="tableData"
row-key="id"
@sort-change="pageOrder"
>
<el-table-column :index="indexMethod" align="center" header-align="center"
label="序号"
fixed
type="index"
width="50"></el-table-column>
<el-table-column label="工号" prop="loginName"></el-table-column>
<el-table-column label="姓名" prop="userName"></el-table-column>
<el-table-column label="年龄" prop="age"></el-table-column>
<el-table-column label="性别" prop="sex"></el-table-column>
<el-table-column label="代表团" prop="delegationName"></el-table-column>
<el-table-column label="所属工会" prop="unionName"></el-table-column>
<el-table-column label="所属单位" prop="unitName"></el-table-column>
<el-table-column prop="curTaskName" 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="操作" width="100" fixed="right">
<template scope="{row}">
<el-button
v-if="row.instanceState!=20"
size="mini"
type="danger"
@click="onDelete(row)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
</guava>
<union-push-formal-dialog ref="pushFormalRef" @refresh="doSearch"></union-push-formal-dialog>
</div>
<script>
<!--#include("pushFormalDialog.js"){}#-->
new Vue({
el: '#app',
mixins: [initTableMixins],
data() {
return {
pageForm: {
teacherMeetId: null,
unionId: null
},
teacherMeets: [],
unionOptions: [],
delegations: []
}
},
components: {
"union-push-formal-dialog": UNION_PUSH_FORMAL_DIALOG
},
async created() {
this.unionOptions = await this.$businessTool.listUnion()
await this.getAllJdh()
},
methods: {
getAllDelegation(id) {
this.$axios.post("/platform/teacherCongress/common/listDelegation", {sessionId: id}).then(resp => {
if (resp.code === 0) {
this.delegations = resp.data
}
})
},
getAllJdh() {
this.$axios.post("/platform/teacherCongress/common/listSession", {}).then(resp => {
if (resp.code === 0) {
this.teacherMeets = resp.data
if (this.teacherMeets && this.teacherMeets.length > 0) {
this.$set(this.pageForm, 'teacherMeetId', this.teacherMeets[0].id)
this.getAllDelegation(this.teacherMeets[0].id)
this.pageData()
}
}
})
},
onDelete(row) {
this.$confirm('确定要删除该条数据吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
const resp = await this.$axios.post('/platform/executiveCommittee/unionPush/doDelete', {
id: row.id,
teacherMeetId: this.pageForm.teacherMeetId
})
if (resp.code === 0) {
this.doSearch()
this.$message.success(resp.msg)
}
})
},
}
})
</script>
<style>
.pushFormDialog .el-transfer-panel__item.el-checkbox {
height: auto;
display: block;
margin-right: 0;
padding: 0 15px;
}
.pushFormDialog .el-checkbox__input {
vertical-align: top;
margin-top: 5px;
}
.pushFormDialog .transfer-item {
padding: 5px;
font-size: 12px;
border-bottom: 1px solid #f0f0f0;
}
.pushFormDialog .el-transfer-panel {
height: 60vh;
width: unset !important;
flex: 2 !important;
}
.pushFormDialog .el-transfer-panel__body {
height: calc(100% - 40px) !important;
display: flex;
flex-direction: column;
}
.pushFormDialog .el-transfer-panel__list.is-filterable {
flex: 1;
}
</style>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/democratic/executiveCommittee/unionPush/pushFormalDialog.js
+104
View File
@@ -0,0 +1,104 @@
const UNION_PUSH_FORMAL_DIALOG = {
template: /*language=HTML*/ `
<div class="pushFormDialog">
<el-dialog
:close-on-click-modal="false"
:visible.sync="dialogVisible"
title="分工会推选委员"
width="70%"
>
<el-transfer
ref="transfer"
v-model="userValue"
:data="userData"
filter-placeholder="请按姓名模糊搜索"
:filter-method="filterMethod"
:props="{key: 'userId',label: 'name'}"
:right-default-checked="rightChecked"
:titles="['可推选人员名单', '当前选择']"
filterable
class="transfer-high"
>
<div slot-scope="{ option }">
<div class="transfer-item">
<div class="transfer-item-name">{{ option.userName }} - {{ option.loginName
}} - {{option.unitName}} - {{option.unionName}}
</div>
<div class="transfer-item-details">
<span class="detail-item">
{{option.sex}}
</span>
<span class="detail-item">{{ option.age }}岁</span>
<span class="detail-item">{{ option.professionalTitle }}</span>
</div>
</div>
</div>
</el-transfer>
<span slot="footer">
<span style="color:red;font-size: 15px; display:flex;text-align: right;">推选名额：{{quotaCount}}个</span>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="onConfirm">确 定</el-button>
</span>
</span>
</el-dialog>
</div>
`,
data() {
return {
dialogVisible: false,
userValue: [],
userData: [],
rightChecked: [],
attendanceRightChecked: [],
teacherMeetId: null,
quotaCount: 0
}
},
methods: {
async onOpen(teacherMeetId) {
this.teacherMeetId = teacherMeetId
this.userValue = []
this.userData = []
const {
code,
msg,
data
} = await this.$axios.post('/platform/executiveCommittee/unionPush/getUnionUser', {teacherMeetId: teacherMeetId})
if (code === 0) {
data.userData.forEach(v => {
this.userData.push({userId: v.userId, ...v})
})
this.quotaCount = data.quotaCount
this.dialogVisible = true
} else {
this.$message.error(msg)
}
},
filterMethod(query, item) {
return item.userName.indexOf(query) > -1
},
async onConfirm() {
const {
code,
msg
} = await this.$axios.post('/platform/executiveCommittee/unionPush/addPush', {
userValue: JSON.stringify(this.userValue),
teacherMeetId: this.teacherMeetId
})
if (code === 0) {
this.dialogVisible = false
this.$message.success(msg)
this.$emit('refresh')
} else {
this.$message.error(msg)
}
}
},
style: /*language=CSS*/ `
`
}
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html
-1
View File
@@ -231,7 +231,6 @@ layout("/layouts/platform.html"){
}
this.$refs.auditInfoRef.onOpen(row)
})
},
onView(row) {
this.$refs.guava.edit(() => {