Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -617,15 +617,15 @@ export default {
|
||||
},
|
||||
//流程提交
|
||||
handleSubmit() {
|
||||
if(this.$route.query.prcNum === undefined){
|
||||
if(this.$route.query.prcNum === undefined || this.$route.query.type == '2'){
|
||||
this.$refs['qbfsForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$refs['roleForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
if (this.$route.query.type === 2) {
|
||||
if (this.$route.query.type == '2') {
|
||||
this.isSubmit = true
|
||||
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', {
|
||||
taskIds: this.$route.query.taskIds,
|
||||
userId : this.$store.getters.userInfo.userId,
|
||||
@@ -647,7 +647,7 @@ export default {
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
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', {
|
||||
createUser: this.$store.getters.userInfo.userId,
|
||||
createUserName: this.$store.getters.userInfo.userName,
|
||||
|
||||
Reference in New Issue
Block a user