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

commit

Browse Source
This commit is contained in:
=
2026-05-15 10:02:12 +08:00
parent dc1d2aba8a
commit 9677e23908
16 changed files with 450 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/democratic/proposal/transact/commissioner/index.html
+8 -6
View File
@@ -63,7 +63,7 @@ layout("/layouts/platform.html"){
<el-table-column label="操作" fixed="right" width="200px">
<template slot-scope="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="!row.pcoId" @click="openAudit(row)" size="mini" type="primary">审核</el-button>
<el-button v-if="row.taskState === 10" @click="openAudit(row)" size="mini" type="primary">审核</el-button>
</template>
</el-table-column>
</el-table>
@@ -132,7 +132,8 @@ layout("/layouts/platform.html"){
{label: "立案票数", prop: "CONFIRM_FILING_COUNT"},
{label: "作为建议票数", prop: "SUGGESTION_COUNT"},
{label: "不予立案票数", prop: "NOT_COUNT"},
{label: "当前节点", prop: "taskName"},
{label: "当前节点", prop: "curTaskName"},
{label: "审核人", prop: "auditUser", width: "160px"},
{label: "流程状态", prop: "instanceState"}
],
pageForm: {
@@ -160,18 +161,19 @@ layout("/layouts/platform.html"){
openAudit(row) {
this.$refs.guava.edit(() => {
this.showApprovalForm = true
this.formData = {
this.$set(this, "formData", {
processTaskId: row.taskId,
proposalId: row.id,
caseFilingResult: null,
caseFilingType: null,
opinion: null
}
})
this.$refs.proposalInfoRef.onOpen(row)
})
},
doSubmit() {
this.$refs.formRef.validate(async (valid) => {
this.$refs.formRef.validate((valid) => {
if (!valid) return
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
@@ -190,7 +192,7 @@ layout("/layouts/platform.html"){
},
// 教代会
async meetingChange(val) {
meetingChange(val) {
this.doSearch()
},
src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html
+69 -9
View File
@@ -100,7 +100,7 @@ layout("/layouts/platform.html"){
{{formData.taskName}}
</div>
<el-form :model="formData" ref="formRef" label-width="120px" :rules="formRules" label-suffix="">
<el-form-item label="立案结果" prop="tf_caseFilingResult"
<el-form-item v-if="isCommitteeTask()" label="立案结果" prop="tf_caseFilingResult"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<el-radio-group v-model="formData.tf_caseFilingResult" size="small">
<el-radio v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT" :label="item.code"
@@ -108,7 +108,7 @@ layout("/layouts/platform.html"){
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="['CONFIRM_FILING'].includes(formData.tf_caseFilingResult)" label="立案类型"
<el-form-item v-if="isCommitteeTask() && ['CONFIRM_FILING'].includes(formData.tf_caseFilingResult)" label="立案类型"
prop="tf_caseFilingType"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<el-radio-group v-model="formData.tf_caseFilingType" size="small">
@@ -119,7 +119,7 @@ layout("/layouts/platform.html"){
</el-form-item>
<el-form-item
label="主办单位"
v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
v-if="isCommitteeTask() && ['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
:rules="[{required:['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult),message:'必填',trigger:['change','blur']}]"
prop="tf_masterUnitId"
>
@@ -134,7 +134,7 @@ layout("/layouts/platform.html"){
</el-select>
</el-form-item>
<el-form-item label="协办单位"
v-if="['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
v-if="isCommitteeTask() && ['CONFIRM_FILING','SUGGESTION'].includes(formData.tf_caseFilingResult)"
prop="tf_slaveUnitIds"
>
<el-select v-model="formData.tf_slaveUnitIds" filterable clearable multiple
@@ -148,6 +148,30 @@ layout("/layouts/platform.html"){
></el-option>
</el-select>
</el-form-item>
<el-form-item
label="分管校领导"
v-if="isBranchSchoolLeaderRequired()"
prop="userId"
>
<el-select
v-model="formData.userId"
filterable
clearable
remote
reserve-keyword
:remote-method="listBranchSchoolLeader"
:loading="branchSchoolLeaderLoading"
placeholder="请输入姓名或工号搜索"
style="width: 100%"
>
<el-option
v-for="item in branchSchoolLeaderOptions"
:label="item.label"
:value="item.id"
:key="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="审核意见" prop="approvalOpinion"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
@@ -210,10 +234,21 @@ layout("/layouts/platform.html"){
showApprovalForm: false,
sessionOptions: [],
delegationOptions: [],
underTakeOptions: []
underTakeOptions: [],
branchSchoolLeaderOptions: [],
branchSchoolLeaderLoading: false
}
},
methods: {
isCommitteeTask() {
return this.formData.taskKey === "committee"
},
isCommitteeDirectorOpinionTask() {
return this.formData.taskKey === "committee_director_opinion"
},
isBranchSchoolLeaderRequired() {
return this.isCommitteeDirectorOpinionTask() || (this.isCommitteeTask() && this.formData.tf_caseFilingResult === "CONFIRM_FILING")
},
openView(row) {
this.$refs.guava.edit(() => {
this.showApprovalForm = false
@@ -223,17 +258,24 @@ layout("/layouts/platform.html"){
openAudit(row) {
this.$refs.guava.edit(() => {
this.showApprovalForm = true
this.formData = {
this.$set(this, "formData", {
processTaskId: row.taskId,
taskKey: row.taskKey,
taskName: row.curTaskName,
userId: null,
tf_masterUnitId: null,
tf_slaveUnitIds: []
}
})
this.listBranchSchoolLeader("")
this.$refs.proposalInfoRef.onOpen(row)
})
},
handleTaskAction(val) {
if (val === 1 && this.isBranchSchoolLeaderRequired() && !this.formData.userId) {
this.$message.warning("请选择分管校领导")
return
}
this.$refs.formRef.validate(valid => {
if (valid) {
this.$confirm("您确定要提交吗？", "提示", {
@@ -243,7 +285,7 @@ layout("/layouts/platform.html"){
}).then(() => {
// 是否有协办单位
let tf_helpunitreply
if (this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) {
if (this.isCommitteeTask() && this.formData.tf_slaveUnitIds && this.formData.tf_slaveUnitIds.length > 0) {
tf_helpunitreply = "HAS_HELP_UNIT"
} else {
tf_helpunitreply = "NO_HELP_UNIT"
@@ -273,6 +315,18 @@ layout("/layouts/platform.html"){
})
},
// 查询提案分管校领导
listBranchSchoolLeader(keyword) {
this.$set(this, "branchSchoolLeaderLoading", true)
this.$axios.post("/platform/proposal/committeeFiling/listBranchSchoolLeader", { keyword }).then((res) => {
if (res.code === 0) {
this.$set(this, "branchSchoolLeaderOptions", res.data)
}
}).finally(() => {
this.$set(this, "branchSchoolLeaderLoading", false)
})
},
// 打开并案审核
openMerge() {
const selection = this.$refs.tableRef.selection
@@ -280,10 +334,16 @@ layout("/layouts/platform.html"){
this.$message.warning("请先勾选需要并案审核的提案，至少需要两条提案")
return
}
if (selection.some(v => v.taskKey !== "committee")) {
this.$message.warning("只有提案委委员主任审核节点可以并案审核")
return
}
this.$refs.guava.public(() => {
this.$refs.mergeRef.onOpen(selection, {
processTaskIds: selection.map(v => v.taskId),
taskKey: selection[0].taskKey,
taskName: selection[0].curTaskName,
userId: null,
tf_masterUnitId: null,
tf_slaveUnitIds: []
})
@@ -327,7 +387,7 @@ layout("/layouts/platform.html"){
listUnderTake() {
this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
if (res.code === 0) {
this.underTakeOptions = res.data
this.$set(this, "underTakeOptions", res.data)
}
})
}
src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/merge.js
+49 -4
View File
@@ -71,6 +71,30 @@ const merge = {
></el-option>
</el-select>
</el-form-item>
<el-form-item
label="分管校领导"
v-if="isBranchSchoolLeaderRequired()"
prop="userId"
>
<el-select
v-model="formData.userId"
filterable
clearable
remote
reserve-keyword
:remote-method="listBranchSchoolLeader"
:loading="branchSchoolLeaderLoading"
placeholder="请输入姓名或工号搜索"
style="width: 100%"
>
<el-option
v-for="item in branchSchoolLeaderOptions"
:label="item.label"
:value="item.id"
:key="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="审核意见" prop="approvalOpinion"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
<user-opinion-textarea v-model="formData.approvalOpinion"></user-opinion-textarea>
@@ -98,14 +122,20 @@ const merge = {
tf_masterUnitId: [{ required: true, message: "请选择主办单位", trigger: "blur" }],
approvalOpinion: [{ required: true, message: "请填写审核意见", trigger: "blur" }],
},
underTakeOptions: []
underTakeOptions: [],
branchSchoolLeaderOptions: [],
branchSchoolLeaderLoading: false
}
},
methods: {
isBranchSchoolLeaderRequired() {
return this.formData.taskKey === "committee_director_opinion" || this.formData.tf_caseFilingResult === "CONFIRM_FILING"
},
onOpen(selection, formData) {
this.selection = selection
this.formData = formData
this.$set(this, "selection", selection)
this.$set(this, "formData", formData)
this.listUnderTake()
this.listBranchSchoolLeader("")
},
// 移除
onRemove(index) {
@@ -119,11 +149,26 @@ const merge = {
listUnderTake() {
this.$axios.post("/platform/proposal/common/listUnderTake").then((res) => {
if (res.code === 0) {
this.underTakeOptions = res.data
this.$set(this, "underTakeOptions", res.data)
}
})
},
// 查询提案分管校领导
listBranchSchoolLeader(keyword) {
this.$set(this, "branchSchoolLeaderLoading", true)
this.$axios.post("/platform/proposal/committeeFiling/listBranchSchoolLeader", { keyword }).then((res) => {
if (res.code === 0) {
this.$set(this, "branchSchoolLeaderOptions", res.data)
}
}).finally(() => {
this.$set(this, "branchSchoolLeaderLoading", false)
})
},
handleTaskAction(val) {
if (val === 1 && this.isBranchSchoolLeaderRequired() && !this.formData.userId) {
this.$message.warning("请选择分管校领导")
return
}
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
src/main/resources/views/platform/zhgh/democratic/proposal/transact/schoolLeaderApproval/index.html
+22 -6
View File
@@ -108,9 +108,9 @@ layout("/layouts/platform.html"){
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction('back')" size="small" type="danger">退回重新答复
<el-button v-if="isSchoolLeaderTask()" @click="handleTaskAction('back')" :loading="submitLoading" size="small" type="danger">退回重新答复
</el-button>
<el-button @click="handleTaskAction('agree')" size="small" type="primary">同意答复</el-button>
<el-button @click="handleTaskAction('agree')" :loading="submitLoading" size="small" type="primary">{{submitButtonText()}}</el-button>
</el-row>
</div>
</proposal-info>
@@ -145,31 +145,44 @@ layout("/layouts/platform.html"){
},
formData: {},
showApprovalForm: false,
submitLoading: false,
sessionOptions: [],
delegationOptions: [],
}
},
methods: {
isInstructionTask() {
return this.formData.taskKey === "school_leader_instruction"
},
isSchoolLeaderTask() {
return this.formData.taskKey === "school_leader"
},
submitButtonText() {
return this.isInstructionTask() ? "提交批示" : "同意答复"
},
openView(row) {
this.$refs.guava.edit(() => {
this.showApprovalForm = false
this.$set(this, "showApprovalForm", false)
this.$refs.proposalInfoRef.onOpen(row)
})
},
openAudit(row) {
this.$refs.guava.edit(() => {
this.showApprovalForm = true
this.formData = {
this.$set(this, "showApprovalForm", true)
this.$set(this, "formData", {
processTaskId: row.taskId,
taskKey: row.taskKey,
taskName: row.taskName,
proposalId: row.id
}
})
this.$refs.proposalInfoRef.onOpen(row)
})
},
handleTaskAction(val) {
if (this.submitLoading) {
return
}
this.$refs.formRef.validate(valid => {
if (!valid) return
@@ -185,6 +198,7 @@ layout("/layouts/platform.html"){
delete formData.taskKey
delete formData.taskName
this.$set(this, "submitLoading", true)
this.$axios.post("/platform/proposal/schoolLeaderApproval/executeTask", {
data: JSON.stringify(formData)
}).then((res) => {
@@ -193,6 +207,8 @@ layout("/layouts/platform.html"){
this.$message.success(res.msg)
this.doSearch()
}
}).finally(() => {
this.$set(this, "submitLoading", false)
})
})
})
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html
+5 -4
View File
@@ -32,7 +32,7 @@ layout("/layouts/platform_h5.html"){
<table-column label="提案类别">{{row.typeName}}</table-column>
<table-column label="提案人">{{row.createUserName}}</table-column>
<table-column label="代表团">{{row.delegationName}}</table-column>
<table-column label="当前节点">{{row.taskName}}</table-column>
<table-column label="当前节点">{{row.curTaskName}}</table-column>
<table-column label="委员意见">
<van-tag type="primary">立案：{{row.CONFIRM_FILING_COUNT}}</van-tag>
<van-tag type="warning">建议：{{row.SUGGESTION_COUNT}}</van-tag>
@@ -44,7 +44,7 @@ layout("/layouts/platform_h5.html"){
<i class="fa fa-eye"></i>
<span>查看</span>
</div>
<div class="action-btn" v-if="!row.pcoId" @click="onApproval(row)">
<div class="action-btn" v-if="row.taskState === 10" @click="onApproval(row)">
<i class="fa fa-edit"></i>
<span>审核</span>
</div>
@@ -187,12 +187,13 @@ layout("/layouts/platform_h5.html"){
onApproval(row) {
this.showApprovalForm = true
this.$refs.proposalInfoRef.onOpen(row)
this.formData = {
this.$set(this, "formData", {
processTaskId: row.taskId,
proposalId: row.id,
caseFilingResult: null,
caseFilingType: null,
opinion: null
}
})
},
async doSubmit() {
src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html
+26 -8
View File
@@ -65,8 +65,8 @@ layout("/layouts/platform_h5.html"){
></van-field>
</van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
<van-button type="danger" block @click="handleTaskAction('back')">退回答复</van-button>
<van-button type="primary" block @click="handleTaskAction('agree')">同意答复</van-button>
<van-button v-if="isSchoolLeaderTask()" type="danger" block :loading="submitLoading" @click="handleTaskAction('back')">退回答复</van-button>
<van-button type="primary" block :loading="submitLoading" @click="handleTaskAction('agree')">{{submitButtonText()}}</van-button>
</div>
</div>
</proposal-info>
@@ -92,6 +92,7 @@ layout("/layouts/platform_h5.html"){
sessionOptions: [],
formData: {},
submitLoading: false,
showApprovalForm: false
}
},
@@ -120,22 +121,37 @@ layout("/layouts/platform_h5.html"){
},
onView(row) {
this.showApprovalForm = false
this.$set(this, "showApprovalForm", false)
this.$refs.proposalInfoRef.onOpen(row)
},
onApproval(row) {
this.showApprovalForm = true
this.$set(this, "showApprovalForm", true)
this.$refs.proposalInfoRef.onOpen(row)
this.formData = {
this.$set(this, "formData", {
processTaskId: row.taskId,
taskKey: row.taskKey,
taskName: row.taskName,
proposalId: row.id
}
})
},
isInstructionTask() {
return this.formData.taskKey === "school_leader_instruction"
},
isSchoolLeaderTask() {
return this.formData.taskKey === "school_leader"
},
submitButtonText() {
return this.isInstructionTask() ? "提交批示" : "同意答复"
},
async handleTaskAction(val) {
if (this.submitLoading) {
return
}
try {
await this.$refs.formRef.validate();
this.$dialog.confirm({
@@ -150,8 +166,8 @@ layout("/layouts/platform_h5.html"){
delete formData.taskKey
delete formData.taskName
this.$axios.post("/flow/common/executeTask", {
this.$set(this, "submitLoading", true)
this.$axios.post("/platform/proposal/schoolLeaderApproval/executeTask", {
data: JSON.stringify(formData)
}).then((res) => {
if (res.code === 0) {
@@ -159,6 +175,8 @@ layout("/layouts/platform_h5.html"){
this.$toast.success(res.msg)
this.doSearch()
}
}).finally(() => {
this.$set(this, "submitLoading", false)
})
}).catch(() => {