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-01 10:06:13 +08:00
parent cd338d101d 5e62f4c21f
commit 85565cc8da
1 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+48 -22
View File
@@ -188,7 +188,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
@@ -259,7 +258,7 @@ import rename from "process/creatProcess/qbzxdjhgk/component/rename";
import establish from "process/creatProcess/qbzxdjhgk/component/establish";
import delay from "process/creatProcess/qbzxdjhgk/component/delay";
import cancel from "process/creatProcess/qbzxdjhgk/component/cancel";
import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel} from "api/process";
import { saveTaskFirst, queryTaskFirst, inboundLiaisonDetail, taskDel, saveTaskForPub } from "api/process";
export default {
name: "qbzxdjhgkStep1",
@@ -441,26 +440,53 @@ export default {
},
//流程保存
handleSave() {
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
qbzxdFrom.type = this.toggleType
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '25')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
qbfsForm: qbzxdFrom,
commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
if(!this.approvalFlag){
//第一次正常保存
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
qbzxdFrom.type = this.toggleType
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '25')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
qbfsForm: qbzxdFrom,
commentText: this.commentText
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
}else{
//被驳回后的保存
this.saveLoading = true;
let qbzxdFrom = this.$refs["childForm"].qbfsForm;
qbzxdFrom.type = this.toggleType
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '25')
_formData.append('json', JSON.stringify({
roleForm: this.roleForm,
qbfsForm: qbzxdFrom,
commentText: this.commentText
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false;
});
}
},
//流程提交
handleSubmit() {