@@ -23,7 +22,7 @@
-
+
@@ -31,12 +30,12 @@
-
+
-
+
diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue
index d02e367..3453a97 100644
--- a/src/views/permissionApplication/launch.vue
+++ b/src/views/permissionApplication/launch.vue
@@ -193,12 +193,14 @@ export default {
// 获取表格列表 吧查询到的值传给子组件
reportList(ids) {
- this.$api.permissionProcess.getReportLisy({
+ this.$api.report.reportList({
pageSize:1000,
pageNo:1,
ids: ids.split(',')
}).then(({data}) => {
this.tableData = data.records.map(item => {
+ item.oneApprove = item.createUserId || ''
+ item.oneApproveName= item.uploader || ''
item.reportId = item['id']
delete item['id']
return item
@@ -236,9 +238,10 @@ export default {
userId:this.userId,
submitIson:'',
dataJson:'',
- bpnId: this.$store.getters.handleProcess?.id
+ bpnId: this.$store.getters.handleProcess?.id,
+ reportId: item.reportId
}
- let submitIson={
+ let submitJson={
oneApprove:item.oneApprove,
oneApproveName:item.oneApproveName,
twoApprove:item.twoApprove,
@@ -249,7 +252,7 @@ export default {
delete item['twoApprove']
delete item['twoApproveName']
let dataJson=item
- obj.submitIson=JSON.stringify(submitIson)
+ obj.submitJson=JSON.stringify(submitJson)
obj.dataJson=JSON.stringify(dataJson)
return obj
})
@@ -375,7 +378,13 @@ export default {
startProcess() {
//把表单都整合到form中
- this.$api.process.startProcessALL(this.params).then(({data}) => {
+ this.$api.process.startProcessALL(this.params).then((res) => {
+ debugger
+ let data=res.data.result.split(',')
+ this.params=this.params.map((item,index)=>{
+ item.taskId=data[index]
+ return item
+ })
this.completeProcessALL(this.params)
})
},