xgxt_sd/zhxg_pc
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

保留学籍申请表单调整

Browse Source
This commit is contained in:
962704835@qq.com
2025-11-21 21:38:07 +08:00
parent cfa0c9468f
commit d42e477b9d
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/flowable/task/todo/detail/index.vue
View File

@@ -1159,13 +1159,12 @@ export default {
if (this.category == 'enlistmentReserve') { if (this.category == 'enlistmentReserve') {
this.form.enlistmentReserveApprovalList.push({nodeName: "学生申请"})
// 过滤returnTaskList，保留documentation在flowRecordList的taskName中存在的项 // 过滤returnTaskList，保留documentation在flowRecordList的taskName中存在的项
this.returnTaskList = this.returnTaskList.filter(returnTask => { this.returnTaskList = this.returnTaskList.filter(returnTask => {
// 检查flowRecordList中是否有项的taskName等于当前returnTask的documentation // 检查flowRecordList中是否有项的taskName等于当前returnTask的documentation
return this.flowRecordList.some(record => record.taskName === returnTask.documentation) return this.form.enlistmentReserveApprovalList.some(record => record.nodeName === returnTask.documentation)
}) })
console.log(this.flowRecordList);
} }
this.initApproval() this.initApproval()
}) })
@@ -1180,9 +1179,9 @@ export default {
if (element.id == this.taskForm.targetKey) { if (element.id == this.taskForm.targetKey) {
this.taskForm.variables.targetNodeName = element.documentation this.taskForm.variables.targetNodeName = element.documentation
} }
}); })
} }
this.$refs['taskForm'].validate((valid) => { this.$refs['taskForm'].validate((valid) => {
if (valid) { if (valid) {
returnTask(this.taskForm).then((res) => { returnTask(this.taskForm).then((res) => {

2
src/views/routine/enlistmentReserve/index.vue
View File

@@ -126,7 +126,7 @@
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)" <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> v-hasPermi="['routine:enlistmentReserve:remove']" v-if="scope.row.applyStatus == 0">删除</el-button>
<el-button v-if="scope.row.applyStatus == 1" size="mini" type="text" icon="el-icon-info" <el-button v-if="scope.row.applyStatus != 0" size="mini" type="text" icon="el-icon-info"
@click="detail(scope.row)">详情</el-button> @click="detail(scope.row)">详情</el-button>
</template> </template>
</el-table-column> </el-table-column>