Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -283,7 +283,6 @@ export default {
|
|||||||
qbfsForm: {},
|
qbfsForm: {},
|
||||||
formLoading: false,
|
formLoading: false,
|
||||||
approvalFlag: false,
|
approvalFlag: false,
|
||||||
saveFlag: false,
|
|
||||||
showFlag: true,
|
showFlag: true,
|
||||||
taskIds: '',
|
taskIds: '',
|
||||||
bpnId: '',
|
bpnId: '',
|
||||||
@@ -334,7 +333,6 @@ export default {
|
|||||||
this.taskIds = this.$route.query.taskIds
|
this.taskIds = this.$route.query.taskIds
|
||||||
this.bpnId = this.$route.query.bpnId
|
this.bpnId = this.$route.query.bpnId
|
||||||
if (this.bpnId !== undefined) {
|
if (this.bpnId !== undefined) {
|
||||||
this.saveFlag = true
|
|
||||||
this.getData()
|
this.getData()
|
||||||
}
|
}
|
||||||
if(this.taskIds){
|
if(this.taskIds){
|
||||||
@@ -443,7 +441,7 @@ export default {
|
|||||||
},
|
},
|
||||||
//流程保存
|
//流程保存
|
||||||
handleSave() {
|
handleSave() {
|
||||||
if(this.approvalFlag || this.saveFlag){
|
if(this.approvalFlag){
|
||||||
//被驳回后的保存
|
//被驳回后的保存
|
||||||
this.saveLoading = true;
|
this.saveLoading = true;
|
||||||
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
|
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
|
||||||
@@ -472,6 +470,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()
|
||||||
|
_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)
|
||||||
_formData.append('prcType', '25')
|
_formData.append('prcType', '25')
|
||||||
|
|||||||
Reference in New Issue
Block a user