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

教代会代表 --> 教代会/工代会代表

Browse Source
This commit is contained in:
=
2025-12-08 10:34:14 +08:00
parent 9565514da0
commit e3504f84dc
8 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java
+2 -2
View File
@@ -561,8 +561,8 @@ public class TeacherCongressDelegatePushController {
entityList.add(new ExcelExportEntity("是否中级职称及以下", "intermediateBelow", 20)); entityList.add(new ExcelExportEntity("是否中级职称及以下", "intermediateBelow", 20));
entityList.add(new ExcelExportEntity("是否干部", "cadre", 20)); entityList.add(new ExcelExportEntity("是否干部", "cadre", 20));
entityList.add(new ExcelExportEntity("是否工人", "worker", 20)); entityList.add(new ExcelExportEntity("是否工人", "worker", 20));
entityList.add(new ExcelExportEntity("教代会代表", "isJdh", 20)); entityList.add(new ExcelExportEntity("教代会/工代会代表", "isJdh", 20));
entityList.add(new ExcelExportEntity("工代会代表", "isGdh", 20)); // entityList.add(new ExcelExportEntity("工代会代表", "isGdh", 20));
entityList.add(new ExcelExportEntity("代表类型", "representativeType", 20)); entityList.add(new ExcelExportEntity("代表类型", "representativeType", 20));
ExportParams exportParams = new ExportParams(); ExportParams exportParams = new ExportParams();
src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java
+2 -2
View File
@@ -149,8 +149,8 @@ public class TeacherCongressDelegatePushZgAuditController {
entityList.add(new ExcelExportEntity("是否中级职称及以下", "intermediateBelow", 20)); entityList.add(new ExcelExportEntity("是否中级职称及以下", "intermediateBelow", 20));
entityList.add(new ExcelExportEntity("是否干部", "cadre", 20)); entityList.add(new ExcelExportEntity("是否干部", "cadre", 20));
entityList.add(new ExcelExportEntity("是否工人", "worker", 20)); entityList.add(new ExcelExportEntity("是否工人", "worker", 20));
entityList.add(new ExcelExportEntity("教代会代表", "isJdh", 20)); entityList.add(new ExcelExportEntity("教代会/工代会代表", "isJdh", 20));
entityList.add(new ExcelExportEntity("工代会代表", "isGdh", 20)); // entityList.add(new ExcelExportEntity("工代会代表", "isGdh", 20));
entityList.add(new ExcelExportEntity("代表类型", "representativeType", 20)); entityList.add(new ExcelExportEntity("代表类型", "representativeType", 20));
entityList.add(new ExcelExportEntity("状态", "instanceStateName", 20)); entityList.add(new ExcelExportEntity("状态", "instanceStateName", 20));
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwFzrAudit.html
+7 -7
View File
@@ -78,18 +78,18 @@ 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="isJdh"> <el-table-column label="教代会/工代会代表" prop="isJdh">
<template v-slot="{row}"> <template v-slot="{row}">
<span v-if="row.isJdh" style="color:#0037ff;">是</span> <span v-if="row.isJdh" 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="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/dwSjAudit.html
+7 -7
View File
@@ -74,18 +74,18 @@ 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="isJdh"> <el-table-column label="教代会/工代会代表" prop="isJdh">
<template v-slot="{row}"> <template v-slot="{row}">
<span v-if="row.isJdh" style="color:#0037ff;">是</span> <span v-if="row.isJdh" 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="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
+1 -1
View File
@@ -136,7 +136,7 @@ layout("/layouts/platform.html"){
></el-checkbox> ></el-checkbox>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="教代会代表" prop="isJdh" min-width="100"> <el-table-column label="教代会/工代会代表" prop="isJdh" min-width="100">
<template v-slot="{row}"> <template v-slot="{row}">
<el-checkbox <el-checkbox
v-if="row" v-if="row"
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-statistics-table.js
+1 -1
View File
@@ -61,7 +61,7 @@ const PushStatisticsTable = {
></el-checkbox> ></el-checkbox>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="教代会代表" prop="isJdh" min-width="100"> <el-table-column label="教代会/工代会代表" prop="isJdh" min-width="100">
<template v-slot="{row}"> <template v-slot="{row}">
<el-checkbox <el-checkbox
v-if="row" v-if="row"
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/unionFzrAudit.html
+7 -7
View File
@@ -79,18 +79,18 @@ 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="isJdh"> <el-table-column label="教代会/工代会代表" prop="isJdh">
<template v-slot="{row}"> <template v-slot="{row}">
<span v-if="row.isJdh" style="color:#0037ff;">是</span> <span v-if="row.isJdh" 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="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/zcAudit.html
+7 -7
View File
@@ -80,18 +80,18 @@ 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="isJdh"> <el-table-column label="教代会/工代会代表" prop="isJdh">
<template v-slot="{row}"> <template v-slot="{row}">
<span v-if="row.isJdh" style="color:#0037ff;">是</span> <span v-if="row.isJdh" 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="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="流程状态">