禅道bug 52401 52408 52407 52404
This commit is contained in:
@@ -1103,7 +1103,16 @@
|
|||||||
} else {
|
} else {
|
||||||
this.isSubmit = true
|
this.isSubmit = true
|
||||||
this.$http.post('lawss/activiti/startProcessRollBack', {
|
this.$http.post('lawss/activiti/startProcessRollBack', {
|
||||||
type: '9'
|
createUser: this.$store.getters.userInfo.userId,
|
||||||
|
createUserName: this.$store.getters.userInfo.userName,
|
||||||
|
type: '9',
|
||||||
|
json: JSON.stringify({
|
||||||
|
form: this.form,
|
||||||
|
roleForm: this.roleForm,
|
||||||
|
commentText1: this.commentText1,
|
||||||
|
itemList: this.itemList,
|
||||||
|
sarType: this.sarType
|
||||||
|
})
|
||||||
}, {}, res => {
|
}, {}, res => {
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
var json = Object.assign(this.form, this.roleForm)
|
var json = Object.assign(this.form, this.roleForm)
|
||||||
|
|||||||
@@ -1112,7 +1112,6 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
this.isSubmit = true
|
this.isSubmit = true
|
||||||
this.$http.post('lawss/activiti/startProcessRollBack', {
|
this.$http.post('lawss/activiti/startProcessRollBack', {
|
||||||
id: this.bpnId || '',
|
|
||||||
createUser: this.$store.getters.userInfo.userId,
|
createUser: this.$store.getters.userInfo.userId,
|
||||||
createUserName: this.$store.getters.userInfo.userName,
|
createUserName: this.$store.getters.userInfo.userName,
|
||||||
type: '9',
|
type: '9',
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
|
||||||
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="content" v-show="active == '1'">
|
<div class="content" v-show="active === '1'">
|
||||||
<div style="flex: auto; overflow: auto">
|
<div style="flex: auto; overflow: auto">
|
||||||
<process-title>
|
<process-title>
|
||||||
<template slot="title">基础信息</template>
|
<template slot="title">基础信息</template>
|
||||||
@@ -817,7 +817,7 @@ export default {
|
|||||||
this.listForm.commentText = this.commentText
|
this.listForm.commentText = this.commentText
|
||||||
this.listForm.dataList = this.dataList
|
this.listForm.dataList = this.dataList
|
||||||
const json = JSON.stringify(this.listForm);
|
const json = JSON.stringify(this.listForm);
|
||||||
// this.isSubmit = true
|
this.isSubmit = true
|
||||||
this.$http.post('lawss/activiti/completeTask', {
|
this.$http.post('lawss/activiti/completeTask', {
|
||||||
taskIds: this.taskIds,
|
taskIds: this.taskIds,
|
||||||
userId: this.userId,
|
userId: this.userId,
|
||||||
|
|||||||
@@ -1669,6 +1669,9 @@ export default {
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
|
standSystem: [
|
||||||
|
{required: true, message: '请选择标准体系', trigger: 'change'}
|
||||||
|
],
|
||||||
treeListName: [
|
treeListName: [
|
||||||
{required: true, message: '请选择归档位置', trigger: 'blur'}
|
{required: true, message: '请选择归档位置', trigger: 'blur'}
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -469,6 +469,7 @@ export default {
|
|||||||
qbzxdFrom.type = this.toggleType
|
qbzxdFrom.type = this.toggleType
|
||||||
this.saveLoading = true
|
this.saveLoading = true
|
||||||
let _formData = new FormData()
|
let _formData = new FormData()
|
||||||
|
console.log(qbzxdFrom);
|
||||||
_formData.append('id', this.bpnId || '')
|
_formData.append('id', this.bpnId || '')
|
||||||
_formData.append('createUser', this.$store.getters.userInfo.userId)
|
_formData.append('createUser', this.$store.getters.userInfo.userId)
|
||||||
_formData.append('createUserName', this.$store.getters.userInfo.userName)
|
_formData.append('createUserName', this.$store.getters.userInfo.userName)
|
||||||
|
|||||||
Reference in New Issue
Block a user