diff --git a/src/views/permissionApplication/components/reportDrawer.vue b/src/views/permissionApplication/components/reportDrawer.vue index 5880f71..a25198d 100644 --- a/src/views/permissionApplication/components/reportDrawer.vue +++ b/src/views/permissionApplication/components/reportDrawer.vue @@ -153,7 +153,7 @@ export default { }, async open(form) { this.isShow = true - let oldPower = form.power + let oldPower = form.powerf?from.powerf:'' if (!form.twoApprove) { form.twoApprove = '' diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index 97ff70a..a13eb17 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -232,7 +232,7 @@ export default { this.$set(this.tableData[0],'oldpower',data.records[0].power) }else if(this.$route.query.isDraft){ // 草稿的时候 判断当前的权限跟原来的下权限还是都一样 - if(JSON.parse(this.processOld.dataJson).power==data.records[0].power){ + if(JSON.parse(this.processOld.dataJson).power==data.records[0].power || JSON.parse(this.processOld.dataJson).power==''){ this.tableData.push({...JSON.parse(this.processOld.dataJson),...JSON.parse(this.processOld.submitJson)}) }else{ @@ -251,6 +251,7 @@ export default { data.records.map(async item => { item.oneApprove = item.createUserId || '' item.oneApproveName= item.uploader || '' + item.powerf= item.power if(item.oneApprove){ let res=await this.getLearder(item.oneApprove) if(res){ @@ -260,6 +261,7 @@ export default { } item.reportId = item['id'] delete item['id'] + item.power='' templateL.push(item) }) this.tableData=templateL @@ -290,8 +292,10 @@ export default { organizeData() { let newParams=[] - newParams=this.tableData.map(item=>{ + let templ=JSON.parse(JSON.stringify(this.tableData)) + newParams=templ.map(item=>{ let obj={} + obj={ id:'', prcName:item.name, @@ -311,6 +315,7 @@ export default { twoApproveName:item.twoApproveName, userId:this.userId, } + debugger delete item['oneApprove'] delete item['oneApproveName'] delete item['twoApprove'] @@ -327,11 +332,13 @@ export default { }, // 保存 handleSave(){ + debugger this.saveLoading = true if(this.tableData.length==0){ this.$message.warning('至少需要选择一条报告数据') return } + // 处理表格数据 this.organizeData() this.params=this.params.map(item=>{ diff --git a/src/views/reportProcess/components/reportForm.vue b/src/views/reportProcess/components/reportForm.vue index 7ee1bd5..b51ba57 100644 --- a/src/views/reportProcess/components/reportForm.vue +++ b/src/views/reportProcess/components/reportForm.vue @@ -28,8 +28,8 @@ + + :props="{ }" clearable placeholder="请选择标签">