【修改】监控流程
This commit is contained in:
@@ -179,15 +179,15 @@ export default {
|
|||||||
reportList=reportList.map(item=>{
|
reportList=reportList.map(item=>{
|
||||||
return item.reportId
|
return item.reportId
|
||||||
})
|
})
|
||||||
this.$api.permissionProcess.deletReport({ids:idsList}).then(()=>{
|
// this.$api.permissionProcess.deletReport({ids:idsList}).then(()=>{
|
||||||
if(reportList.length>0){
|
if(reportList.length>0){
|
||||||
let reportids= row.map(item=>item.reportId)
|
let reportids= row.map(item=>item.reportId)
|
||||||
newValue=this.value.filter(item =>
|
newValue=this.value.filter(item =>
|
||||||
reportids.indexOf(item.reportId)==-1
|
reportids.indexOf(item.reportId)==-1
|
||||||
)
|
)
|
||||||
this.$emit('updateTable', newValue)
|
this.$emit('updateTable', newValue,reportids)
|
||||||
}
|
}
|
||||||
})
|
// })
|
||||||
}else{
|
}else{
|
||||||
if(reportList.length>0){
|
if(reportList.length>0){
|
||||||
reportList=reportList.map(item=>{
|
reportList=reportList.map(item=>{
|
||||||
@@ -195,7 +195,7 @@ export default {
|
|||||||
})
|
})
|
||||||
newValue=this.value.filter(item => reportList.indexOf(item.reportId)==-1
|
newValue=this.value.filter(item => reportList.indexOf(item.reportId)==-1
|
||||||
)
|
)
|
||||||
this.$emit('updateTable', newValue)
|
this.$emit('updateTable', newValue,[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -214,14 +214,14 @@ export default {
|
|||||||
}).then(() => {
|
}).then(() => {
|
||||||
if (this.$route.query.taskDefinitionKey == 'aid4' ){
|
if (this.$route.query.taskDefinitionKey == 'aid4' ){
|
||||||
if(row.id && row.id !=''){
|
if(row.id && row.id !=''){
|
||||||
this.$api.permissionProcess.deletReport({ids:[row.id]}).then(()=>{
|
// this.$api.permissionProcess.deletReport({ids:[row.id]}).then(()=>{
|
||||||
this.$emit('updateTable',this.value.filter(item => item.id !== row.id))
|
this.$emit('updateTable',this.value.filter(item => item.id !== row.id),[row.id])
|
||||||
})
|
// })
|
||||||
}else{
|
}else{
|
||||||
this.$emit('updateTable', this.value.filter(item => item.reportId !== row.reportId))
|
this.$emit('updateTable', this.value.filter(item => item.reportId !== row.reportId),[])
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
this.$emit('updateTable', this.value.filter(item => item.reportId !== row.reportId))
|
this.$emit('updateTable', this.value.filter(item => item.reportId !== row.reportId),[])
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row>
|
<el-row>
|
||||||
<report-table v-model="tableData" @updateTable="(newValue)=>{tableData=newValue}" :disabled="showTableD"></report-table>
|
<report-table v-model="tableData" @updateTable="(newValue,jiaVlue)=>{tableData=newValue;delData=jiaVlue}" :disabled="showTableD"></report-table>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-form ref="applicationFormRef" :model="applicationForm" label-width="150px"
|
<el-form ref="applicationFormRef" :model="applicationForm" label-width="150px"
|
||||||
@@ -123,6 +123,7 @@ export default {
|
|||||||
mixins: [processMixin],
|
mixins: [processMixin],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
delData:[],
|
||||||
showTableD: false,
|
showTableD: false,
|
||||||
initShow: false, // 控制审批历史是否显示 只有在不是第一次的时候才是true
|
initShow: false, // 控制审批历史是否显示 只有在不是第一次的时候才是true
|
||||||
treeType: '',
|
treeType: '',
|
||||||
@@ -295,6 +296,12 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 真删除接口
|
||||||
|
delDatas(){
|
||||||
|
|
||||||
|
this.$api.permissionProcess.deletReport({ids:this.delData}).then(()=>{})
|
||||||
|
|
||||||
|
},
|
||||||
handleCheck(name) {
|
handleCheck(name) {
|
||||||
if (this.formControl) {
|
if (this.formControl) {
|
||||||
return false
|
return false
|
||||||
@@ -429,6 +436,9 @@ export default {
|
|||||||
if (this.initShow) {
|
if (this.initShow) {
|
||||||
this.JuggleSub(this.taskId).then(res=>{
|
this.JuggleSub(this.taskId).then(res=>{
|
||||||
if(res){
|
if(res){
|
||||||
|
if(this.delData){
|
||||||
|
this.delDatas()
|
||||||
|
}
|
||||||
let dataJson = JSON.stringify(this.tableData)
|
let dataJson = JSON.stringify(this.tableData)
|
||||||
let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
|
let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
|
||||||
this.completeProcess({
|
this.completeProcess({
|
||||||
|
|||||||
Reference in New Issue
Block a user