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:
韦东恒
2025-12-14 20:49:10 +08:00
parent b8154312c5
commit 449172f99d
4 changed files with 91 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -853,7 +853,7 @@
<el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body>
<el-form ref="taskForm" :model="taskForm" label-width="80px">
<el-form-item label="退回节点" prop="targetKey">
<el-radio-group v-model="taskForm.targetKey">
<el-radio-group v-model="taskForm.targetKey" @change="handleReturnNodeChange">
<el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id">{{ item.name }}
</el-radio-button>
</el-radio-group>
@@ -1030,6 +1030,7 @@ export default {
enlistmentReserveForm: false, // 入伍保留学籍表单
outsideAccommodationForm: false, // 外宿申请表单
basicForm: false,//退伍复学表单
BasicTestData: 0, // 新增：默认0，仅退回学生申请时改为1
}
},
@@ -1661,6 +1662,26 @@ export default {
}
})
},
// 监听退回节点选择变化
handleReturnNodeChange(val) {
// 1. 找到选中的节点
const selectedNode = this.returnTaskList.find(item => item.id === val);
if (!selectedNode) {
this.BasicTestData = 0;
return;
}
// 2. 仅退伍复学场景 + 节点name是“学生申请” → testData=1
if (this.category === "退伍复学" && selectedNode.name === "学生申请") {
this.BasicTestData = 1;
// console.log("已选中学生申请，testData=", this.testData); // 调试
} else {
this.BasicTestData = 0;
}
},
/** 可退回任务列表 */
handleReturn() {
this.returnOpen = true
@@ -1687,14 +1708,14 @@ export default {
}
else if (this.category == "退伍复学") {
console.log("数据",this.returnTaskList)
// updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {})
var stNameData = ''
let newName = this.startUser.replace(/-/g, "");
// 异步请求的回调内处理后续逻辑
getStname(newName).then(response => {
stNameData = response.data;
console.log(stNameData)
console.log("stNameData.id:", stNameData.id);
// 招生与就业处
if (this.taskName == "招生与就业处") {
@@ -1812,8 +1833,8 @@ export default {
// 异步请求的回调内处理后续逻辑
getStname(newName).then(response => {
stNameData = response.data;
console.log(stNameData)
console.log("stNameData.id:", stNameData.id);
// console.log(stNameData)
// console.log("stNameData.id:", stNameData.id);
// 招生与就业处
if (this.taskName == "招生与就业处") {
@@ -1825,7 +1846,8 @@ export default {
// zsIdea: this.taskForm.comment,
zsTime: new Date(),
// zsIdea：字段缺失改为zsIdea字段
zsIdea: assigneeName
zsIdea: assigneeName,
testData: this.BasicTestData,
}).then(response => {
// this.$modal.msgSuccess(response.msg)
})
@@ -1840,7 +1862,8 @@ export default {
fdStatus: "2",
fdIdea: this.taskForm.comment,
fdTime: new Date(),
fdQm: assigneeName
fdQm: assigneeName,
testData: this.BasicTestData,
}).then(response => {
// this.$modal.msgSuccess(response.msg)
})
@@ -1855,7 +1878,8 @@ export default {
xwStatus: "2",
xwIdea: this.taskForm.comment,
xwTime: new Date(),
xwQm: assigneeName
xwQm: assigneeName,
testData: this.BasicTestData,
}).then(response => {
// this.$modal.msgSuccess(response.msg)
})
@@ -1870,7 +1894,8 @@ export default {
twoStatus: "2",
twoIdea: this.taskForm.comment,
twoTime: new Date(),
erQm: assigneeName
erQm: assigneeName,
testData: this.BasicTestData,
}).then(response => {
// this.$modal.msgSuccess(response.msg)
})
@@ -1885,7 +1910,8 @@ export default {
xjglStatus: "2",
xjIdea: this.taskForm.comment,
xjTime: new Date(),
xjQm: assigneeName
xjQm: assigneeName,
testData: this.BasicTestData,
}).then(response => {
// this.$modal.msgSuccess(response.msg)
})
@@ -1900,7 +1926,8 @@ export default {
jwStatus: "2",
jwIdea: this.taskForm.comment,
jwTime: new Date(),
jwQm: assigneeName
jwQm: assigneeName,
testData: this.BasicTestData,
}).then(response => {
// this.$modal.msgSuccess(response.msg)
})
@@ -1921,6 +1948,7 @@ export default {
this.taskForm.returnTaskShow = false
this.taskForm.defaultTaskShow = true
this.returnTaskList = []
this.BasicTestData = 0
},
/** 委派任务 */
submitDeleteTask() {

1
src/views/routine/dis/basic/index.vue
View File

@@ -439,6 +439,7 @@ export default {
this.form.twoStatus=0
this.form.Status=0
this.form.jwStatus=0
this.form.testData=0
this.form.fdIdea=""
this.form.xwIdeaI=""

4
src/views/routine/dis/she.vue
View File

@@ -310,7 +310,9 @@ export default {
dataa: null,
conversion: null,
processId: null,
deployId: null
deployId: null,
testData: null,
testTest: null
},
// 表单参数
form: {},

51
src/views/routine/dis/shenhe.vue
View File

@@ -125,10 +125,32 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
<!-- <el-button
v-if="scope.row.zsStatus === '3' || scope.row.fdStatus === '3'
|| scope.row.fdStatus === '2' || scope.row.twoStatus === '2' || scope.row.xwStatus == '2'
|| scope.row.xjglStatus == '2' || scope.row.jwStatus == '2'
|| (scope.row.zsStatus === '2' && scope.row.testData =='1' )
|| (scope.row.fdStatus === '2' && scope.row.testData =='1' )
|| (scope.row.twoStatus === '2' && scope.row.testData =='1')
|| (scope.row.xwStatus == '2' && scope.row.testData =='1')
|| (scope.row.xjglStatus == '2' && scope.row.testData =='1')
|| (scope.row.jwStatus == '2' && scope.row.testData =='1')
"
size="mini"
type="text"
icon="el-icon-edit"
@click="handledetail(scope.row)"
v-hasPermi="['routine:basic:edit']"
>修改提交</el-button> -->
<!-- 保留代码 -->
<div v-if="scope.row.conversion=='Y'">
<el-button
v-if="scope.row.zsStatus === '3'
|| (scope.row.zsStatus === '2' && scope.row.testData =='1' )
|| (scope.row.fdStatus === '2' && scope.row.testData =='1' )
|| (scope.row.twoStatus === '2' && scope.row.testData =='1')
|| (scope.row.xwStatus == '2' && scope.row.testData =='1')
|| (scope.row.xjglStatus == '2' && scope.row.testData =='1')
|| (scope.row.jwStatus == '2' && scope.row.testData =='1')
"
size="mini"
type="text"
@@ -136,6 +158,25 @@
@click="handledetail(scope.row)"
v-hasPermi="['routine:basic:edit']"
>修改提交</el-button>
</div>
<div v-if="scope.row.conversion=='N'">
<el-button
v-if=" scope.row.fdStatus === '3'
|| (scope.row.fdStatus === '2' && scope.row.testData =='1' )
|| (scope.row.twoStatus === '2' && scope.row.testData =='1')
|| (scope.row.xwStatus == '2' && scope.row.testData =='1')
|| (scope.row.xjglStatus == '2' && scope.row.testData =='1')
|| (scope.row.jwStatus == '2' && scope.row.testData =='1')
"
size="mini"
type="text"
icon="el-icon-edit"
@click="handledetail(scope.row)"
v-hasPermi="['routine:basic:edit']"
>修改提交</el-button>
</div>
<el-button
size="mini"
@@ -389,7 +430,9 @@ export default {
dataa: null,
conversion: null,
processId: null,
deployId: null
deployId: null,
testData: null,
testTest: null
},
// 表单参数
form: {},