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
2026-01-14 09:26:11 +08:00
parent c7593dcb35 635738368e
commit f00393bdba
3 changed files with 27 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/democratic/grassrootscongress/material/write/index.html
+1
View File
@@ -159,6 +159,7 @@ layout("/layouts/platform.html"){
this.$set(this.formData, "userName", this.$store.state.user.username)
this.$set(this.formData, "loginName", this.$store.state.user.loginname)
this.$set(this.formData, "unionName", this.$store.state.user.union.name)
this.$set(this.formData, "unionId", this.$store.state.user.union.id)
}
}
},
src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html
+19 -74
View File
@@ -75,96 +75,41 @@ layout("/layouts/platform.html"){
<!-- <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">
<el-table-column label="是否聘用制" prop="employ">
<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>
<span v-if="row.employ" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="中级职称及以下" prop="intermediateBelow" width="120">
<el-table-column label="是否高级职称" prop="seniorTeacher">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.intermediateBelow"
style="pointer-events:none"
></el-checkbox>
<span v-if="row.seniorTeacher" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="干部" prop="cadre" width="80">
<el-table-column label="是否中级职称及以下" prop="intermediateBelow">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.cadre"
style="pointer-events:none"
></el-checkbox>
<span v-if="row.intermediateBelow" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="工人" prop="worker" width="80">
<el-table-column label="是否干部" prop="cadre">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.worker"
style="pointer-events:none"
></el-checkbox>
<span v-if="row.cadre" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="是否聘用制" prop="employ" width="80">
<el-table-column label="是否工人" prop="worker">
<template v-slot="{row}">
<el-checkbox
v-if="row"
v-model="row.employ"
style="pointer-events:none"
></el-checkbox>
<span v-if="row.worker" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="教代会代表" prop="isJdh" min-width="100">
<el-table-column label="教代会/工代会代表" prop="isJdh">
<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>
<span v-if="row.isJdh" style="color:#0037ff;">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="代表类型" prop="representativeType" show-overflow-tooltip