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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-04-24 15:05:18 +08:00
parent 274cf8bdb1 94d19e4463
commit 470de82341
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+4 -4
View File
@@ -617,15 +617,15 @@ export default {
}, },
//流程提交 //流程提交
handleSubmit() { handleSubmit() {
if(this.$route.query.prcNum === undefined){ if(this.$route.query.prcNum === undefined || this.$route.query.type == '2'){
this.$refs['qbfsForm'].validate((valid) => { this.$refs['qbfsForm'].validate((valid) => {
if (valid) { if (valid) {
this.$refs['roleForm'].validate((valid) => { this.$refs['roleForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.$route.query.type === 2) { if (this.$route.query.type == '2') {
this.isSubmit = true this.isSubmit = true
this.standardSearch.commentText = this.commentText this.standardSearch.commentText = this.commentText
var json = Object.assign(this.standardSearch, this.roleForm) var json = Object.assign( this.roleForm,this.standardSearch)
this.$http.post('lawss/activiti/completeTaskNew', { this.$http.post('lawss/activiti/completeTaskNew', {
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
userId : this.$store.getters.userInfo.userId, userId : this.$store.getters.userInfo.userId,
@@ -647,7 +647,7 @@ export default {
} else { } else {
this.isSubmit = true this.isSubmit = true
this.standardSearch.commentText = this.commentText this.standardSearch.commentText = this.commentText
var json = Object.assign(this.standardSearch, this.roleForm) var json = Object.assign(this.roleForm, this.standardSearch)
this.$http.post('lawss/activiti/startProcessRollBack', { this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId, createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName, createUserName: this.$store.getters.userInfo.userName,