diff --git a/src/views/permissionApplication/components/reportTable.vue b/src/views/permissionApplication/components/reportTable.vue
index d46dfab..f1cb5d4 100644
--- a/src/views/permissionApplication/components/reportTable.vue
+++ b/src/views/permissionApplication/components/reportTable.vue
@@ -174,7 +174,7 @@ export default {
var newValue=[]
if(idsList.length>0){
idsList=idsList.map(item=>{
- return item.id
+ return item.reportId
})
reportList=reportList.map(item=>{
return item.reportId
@@ -185,10 +185,10 @@ export default {
newValue=this.value.filter(item =>
reportids.indexOf(item.reportId)==-1
)
- this.$emit('updateTable', newValue,reportids)
+ this.$emit('updateTable', newValue,idsList)
}else{
newValue=this.value.filter(item =>
- idsList.indexOf(item.id)==-1
+ idsList.indexOf(item.reportId)==-1
)
this.$emit('updateTable', newValue,idsList)
}
@@ -220,7 +220,7 @@ export default {
if (this.$route.query.taskDefinitionKey == 'aid4' ){
if(row.id && row.id !=''){
// this.$api.permissionProcess.deletReport({ids:[row.id]}).then(()=>{
- this.$emit('updateTable',this.value.filter(item => item.id !== row.id),[row.id])
+ this.$emit('updateTable',this.value.filter(item => item.id !== row.id),[row.reportId])
// })
}else{
this.$emit('updateTable', this.value.filter(item => item.reportId !== row.reportId),[])
diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue
index a816974..223ef34 100644
--- a/src/views/permissionApplication/launch.vue
+++ b/src/views/permissionApplication/launch.vue
@@ -19,7 +19,7 @@
- {tableData=newValue;delData=jiaVlue}" :disabled="showTableD">
+
0){
+ jiaVlue.forEach(item=>{
+ this.delData.push({
+ prcId:this.prcId,
+ reportId:item
+ })
+ })
+
+ this.$set(this,'delData',this.delData)
+ }
+ this.$set(this,'tableData',newValue)
+ // this.tableData=newValue;
+ // this.delData=jiaVlue
+ },
// 真删除接口
delDatas(){
return new Promise((resolve,reject)=>{
- this.$api.permissionProcess.deletReport({ids:this.delData}).then(()=>{
+ this.$api.permissionProcess.deletReport({powerApplyList:this.delData}).then(()=>{
resolve()
})
@@ -426,7 +443,7 @@ export default {
console.log(this.$store.getters.userInfo.usid, " this.$store.getters.userInfo.USID")
this.$refs.assignFormRef.validate(v => {
this.$refs.applicationFormRef.validate(m => {
- this.$refs.processFormRef.validate(z => {
+ this.$refs.processFormRef.validate(async z => {
if (v && m && z) {
// 过了校验 需要把数据都整合 this.tableData this.applicationForm this.assignForm
// 表格数据没有不能提交 需要提示
@@ -439,22 +456,12 @@ export default {
//如果不是第一次
if (this.initShow) {
- this.JuggleSub(this.taskId).then(res=>{
- if(res){
- if(this.delData){
- this.delDatas().then(()=>{
- this.organizeData()
- let dataJson = JSON.stringify(this.tableData)
- let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
- this.completeProcess({
- dataJson,
- submitJson,
- taskId: this.taskId,
- userId: this.$store.getters.userInfo.usid,
- prcType: this.prcType
- })
- })
- }else{
+ let flag=await this.JuggleSub(this.taskId)
+ if(flag){
+ console.log(this.delData,"flagflagflagflag")
+ debugger
+ if(this.delData){
+ this.delDatas().then(()=>{
this.organizeData()
let dataJson = JSON.stringify(this.tableData)
let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
@@ -465,11 +472,21 @@ export default {
userId: this.$store.getters.userInfo.usid,
prcType: this.prcType
})
- }
-
+ })
+ }else{
+ this.organizeData()
+ let dataJson = JSON.stringify(this.tableData)
+ let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
+ this.completeProcess({
+ dataJson,
+ submitJson,
+ taskId: this.taskId,
+ userId: this.$store.getters.userInfo.usid,
+ prcType: this.prcType
+ })
}
- })
+ }
} else {
this.isSendDraft().then(()=>{
this.organizeData()