FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug 52637 第二部驳回后，应回到发起人进行修订

Browse Source
This commit is contained in:
zhangyichen
2022-04-22 16:14:55 +08:00
parent f6f088a20a
commit f7a8ffd439
2 changed files with 75 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+65 -40
View File
@@ -500,8 +500,9 @@ export default {
*/
getFormFieldList(item) {
this.$nextTick(() => {
this.standardSearch = item.standardSearch
this.roleForm = item.roleForm
this.standardSearch = JSON.parse(JSON.stringify(item))
// this.standardSearch = item.standardSearch
this.roleForm = JSON.parse(JSON.stringify(item))
});
},
//tab发生变化
@@ -621,45 +622,69 @@ export default {
if (valid) {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.standardSearch.commentText = this.commentText
var json = Object.assign(this.standardSearch, this.roleForm)
this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '24',
json: JSON.stringify({
roleForm: this.roleForm,
qbfsForm: this.standardSearch,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
this.$http.post('lawss/activiti/completeTask', {
taskIds: res.data,
userId : this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.isSubmit = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
if (this.$route.query.type === 2) {
this.isSubmit = true
this.standardSearch.commentText = this.commentText
var json = Object.assign(this.standardSearch, this.roleForm)
this.$http.post('lawss/activiti/completeTaskNew', {
taskIds: this.$route.query.taskIds,
userId : this.$store.getters.userInfo.userId,
json: JSON.stringify(json),
specialJson: JSON.stringify({
roleForm: this.roleForm,
qbfsForm: this.standardSearch,
commentText: this.commentText
})
}
})
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.isSubmit = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
})
} else {
this.isSubmit = true
this.standardSearch.commentText = this.commentText
var json = Object.assign(this.standardSearch, this.roleForm)
this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '24',
json: JSON.stringify({
roleForm: this.roleForm,
qbfsForm: this.standardSearch,
commentText: this.commentText
})
}, {
_this: this
}, res => {
if (res.ok) {
this.$http.post('lawss/activiti/completeTask', {
taskIds: res.data,
userId : this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.isSubmit = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
})
}
})
}
}else {
this.$message.warning('请检查人员信息表单是否填写完整')
}
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+10 -1
View File
@@ -2075,7 +2075,7 @@ export default {
if (row.taskInfo === '标准法规部部长审核') {
this.$router.push({
name: 'qbfzStep2',
query:{
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
@@ -2083,6 +2083,15 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '重新起草') {
this.$router.push({
name: 'qbfzStep1',
query:{
type: 2,
taskIds: row.taskIds,
prcId: row.prcId
}
})
} else if(row.taskInfo === '会签') {
this.$router.push({
name: 'qbfzStep3',