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-01-21 15:17:59 +08:00
parent ccd9e9db16
commit 75d6420f9b
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/service/TeacherCongressDelegatePushServiceImpl.java
+1
View File
@@ -195,6 +195,7 @@ public class TeacherCongressDelegatePushServiceImpl extends BaseServiceImpl<Teac
// cnd.andEX("info.schoolLeader", "!=", 1); // cnd.andEX("info.schoolLeader", "!=", 1);
SqlExpressionGroup group = new SqlExpressionGroup(); SqlExpressionGroup group = new SqlExpressionGroup();
group.or("t.taskName", "=", "c9227a2f-7b73-4549-b1f7-aa4779b31378"); group.or("t.taskName", "=", "c9227a2f-7b73-4549-b1f7-aa4779b31378");
group.or("t.taskName", "=", "900217e4-4332-4a21-90dd-363b8be17801");
group.or("t.taskName", "is", null); group.or("t.taskName", "is", null);
cnd.and(group); cnd.and(group);
cnd.and("ins.state", "!=", ProcessInstanceStateEnum.REJECT.getCode()); cnd.and("ins.state", "!=", ProcessInstanceStateEnum.REJECT.getCode());
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html
+6 -6
View File
@@ -100,12 +100,12 @@ layout("/layouts/platform.html"){
<span v-else>否</span> <span v-else>否</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="工代会代表" prop="isGdh">--> <el-table-column label="工代会代表" prop="isGdh">
<!-- <template v-slot="{row}">--> <template v-slot="{row}">
<!-- <span v-if="row.isGdh" style="color:#0037ff;">是</span>--> <span v-if="row.isGdh" style="color:#0037ff;">是</span>
<!-- <span v-else>否</span>--> <span v-else>否</span>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<el-table-column label="代表类型" prop="representativeType"></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="curTaskName" label="当前节点"></el-table-column>
<el-table-column prop="instanceState" label="流程状态"> <el-table-column prop="instanceState" label="流程状态">
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
+5 -3
View File
@@ -188,7 +188,9 @@ layout("/layouts/platform.html"){
<el-button <el-button
v-else-if="row.taskKey === 'startTask' v-else-if="row.taskKey === 'startTask'
|| row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080' || row.taskKey==='53ff0c2a-ba93-45e9-a9fd-db51cdab3080'
|| row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62' || !row.instanceId" || row.taskKey==='0cacd1e7-7bb2-47dd-818b-6a73062e0c62'
|| !row.instanceId
|| row.instanceState===45"
@click="onDelete(row.id)" @click="onDelete(row.id)"
size="mini" type="danger">删除 size="mini" type="danger">删除
</el-button> </el-button>
@@ -262,7 +264,7 @@ layout("/layouts/platform.html"){
}, },
methods: { methods: {
doPushFormal() { doPushFormal() {
if (this.tableData.length >= this.maxPush) { if (this.pageForm.totalCount >= this.maxPush) {
this.$message.warning("当前正式代表已超过最大推选人员数，如需调整请在表格数据列中选中【删除】按钮") this.$message.warning("当前正式代表已超过最大推选人员数，如需调整请在表格数据列中选中【删除】按钮")
return return
} }
@@ -276,7 +278,7 @@ layout("/layouts/platform.html"){
await this.pageData() await this.pageData()
const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName; const fullName = this.sessionOptions.find(v => v.id === this.pageForm.sessionId)?.fullName;
await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId) await this.$refs.pushProgressRef.refreshData(this.pageForm.sessionId, fullName, this.pageForm.unionId)
this.formalPush = this.maxPush - this.tableData.length this.formalPush = this.maxPush - this.pageForm.totalCount
}, },
onView(row) { onView(row) {
this.$refs.guava.view(() => { this.$refs.guava.view(() => {