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

commit

Browse Source
This commit is contained in:
@jyuhsin
2024-12-09 15:49:00 +08:00
parent 1211e93a26
commit 0267d27b2a
14 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/evaluate/audit/party.html
+2 -2
View File
@@ -213,8 +213,8 @@ layout("/layouts/platform.html"){
{prop: 'userSex', label: '性别', sortable: true},
{prop: 'unitName', label: '单位', sortable: true},
{prop: 'unionName', label: '工会', sortable: true},
{prop: 'unionName', label: '加入工会时间', sortable: true},
{prop: 'unionName', label: '担任工会职务'},
{prop: 'joinTime', label: '加入工会时间', sortable: true},
{prop: 'position', label: '担任工会职务'},
]
}
},
src/main/resources/views/platform/evaluate/audit/school.html
+2 -2
View File
@@ -219,8 +219,8 @@ layout("/layouts/platform.html"){
{prop: 'userSex', label: '性别', sortable: true},
{prop: 'unitName', label: '单位', sortable: true},
{prop: 'unionName', label: '工会', sortable: true},
{prop: 'unionName', label: '加入工会时间', sortable: true},
{prop: 'unionName', label: '担任工会职务'},
{prop: 'joinTime', label: '加入工会时间', sortable: true},
{prop: 'position', label: '担任工会职务'},
],
multipleSelection: [],
}
src/main/resources/views/platform/evaluate/audit/union.html
+2 -2
View File
@@ -219,8 +219,8 @@ layout("/layouts/platform.html"){
{prop: 'userSex', label: '性别', sortable: true},
{prop: 'unitName', label: '单位', sortable: true},
{prop: 'unionName', label: '工会', sortable: true},
{prop: 'unionName', label: '加入工会时间', sortable: true},
{prop: 'unionName', label: '担任工会职务'},
{prop: 'joinTime', label: '加入工会时间', sortable: true},
{prop: 'position', label: '担任工会职务'},
]
}
},
src/main/resources/views/platform/evaluate/evaluateManage.html
+3 -7
View File
@@ -109,8 +109,7 @@ layout("/layouts/platform.html"){
<el-dropdown-item @click.native="openEdit(row)">
编辑
</el-dropdown-item>
<el-dropdown-item @click.native="deleteDo(row)"
v-if="moment().unix() <= moment(row.endTime).unix()">
<el-dropdown-item @click.native="deleteDo(row)">
删除
</el-dropdown-item>
</el-dropdown-menu>
@@ -202,11 +201,8 @@ layout("/layouts/platform.html"){
},
async deleteDo(row) {
const resp = await $.post('/platform/evaluate/getApplyData', {id: row.id})
if(resp.data && resp.data.length > 0) {
this.$notify({title: '提示', message: '此评优评先活动已有申请记录，不能删除！', type: 'warning'})
return
}
this.$confirm('您确定要删除吗？', '提示', {
const str = resp.data.length > 0 ? '此评优评先活动已有申请记录，' : ''
this.$confirm(str + '您确定要删除吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',