外宿申请-申请表调整

This commit is contained in:
2025-12-12 16:59:57 +08:00
parent 2b7725ab91
commit 241d70bbf7
10 changed files with 981 additions and 449 deletions

View File

@@ -12,8 +12,8 @@
<el-input v-model="queryParams.taskId" placeholder="请输入Flowable任务ID" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> -->
<el-form-item label="审批节点" prop="nodeName">
<el-input v-model="queryParams.nodeName" placeholder="请输入审批节点" clearable @keyup.enter.native="handleQuery" />
<el-form-item label="学生姓名" prop="studentName">
<el-input v-model="queryParams.studentName" placeholder="请输入学生姓名" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<!-- <el-form-item label="审批人ID" prop="approverId">
<el-input v-model="queryParams.approverId" placeholder="请输入审批人ID" clearable @keyup.enter.native="handleQuery" />
@@ -82,10 +82,11 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['routine:enlistmentReserveApproval:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['routine:enlistmentReserveApproval:remove']">删除</el-button>
v-hasPermi="['routine:enlistmentReserveApproval:remove']">删除</el-button> -->
<el-button size="mini" type="text" icon="el-icon-info" @click="detail(scope.row)">详情</el-button>
</template>
</el-table-column>
</el-table>
@@ -171,7 +172,8 @@ export default {
approverName: null,
approvalOpinion: null,
approvalResult: null,
approvalTime: null
approvalTime: null,
studentName: null
},
// 表单参数
form: {},
@@ -230,7 +232,7 @@ export default {
}
this.getList()
}
})
},
// 取消按钮
@@ -321,7 +323,13 @@ export default {
this.download('routine/enlistmentReserveApproval/export', {
...this.queryParams
}, `enlistmentReserveApproval_${new Date().getTime()}.xlsx`)
}
},
detail(row) {
this.$router.push({
path: "/routine/enlistmentReserve/applicationForm",
query: { id: row.applyId, type: 'detail', deployId: row.deployId, processInstanceId: row.processInstanceId } // 将 row.id 放在 query 中
})
},
}
};
</script>

View File

@@ -124,7 +124,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['routine:enlistmentReserve:edit']" v-if="scope.row.applyStatus == 0">修改</el-button>
v-hasPermi="['routine:enlistmentReserve:edit']" v-if="scope.row.applyStatus == 0">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['routine:enlistmentReserve:remove']" v-if="scope.row.applyStatus == 0">删除</el-button>
<el-button v-if="scope.row.applyStatus != 0" size="mini" type="text" icon="el-icon-info"
@@ -322,7 +322,7 @@ export default {
beforeRouteEnter(to, from, next) {
next(vm => {
// vm 是组件实例,这里调用数据加载方法
vm.getUser();
vm.getUser();
});
},
methods: {
@@ -344,11 +344,7 @@ export default {
if (this.roleGroup.includes("学生")) {
this.queryParams.studentName = this.user.nickName
} else if (this.roleGroup.includes("辅导员")) {
getOwnInfo().then(res => {
if (res.data) {
this.queryParams.teacherName = res.data.teacherName
}
})
this.queryParams.teacherName = this.user.nickName
}
this.getList()
}
@@ -463,7 +459,7 @@ export default {
// 跳转申请表
openForm() {
// 利用some方法快速判断是否存在重复申请找到匹配项后立即终止遍历
const isDuplicate = this.enlistmentReserveList?.some(element =>
const isDuplicate = this.enlistmentReserveList?.some(element =>
element.studentName === this.user?.nickName && element.studentNo === this.user?.userName
) || false;
@@ -476,7 +472,7 @@ export default {
detail(row) {
this.$router.push({
path: "/routine/enlistmentReserve/applicationForm",
query: { id: row.id, type: 'detail',deployId: row.deployId, processInstanceId: row.processInstanceId } // 将 row.id 放在 query 中
query: { id: row.id, type: 'detail', deployId: row.deployId, processInstanceId: row.processInstanceId } // 将 row.id 放在 query 中
})
},
}