diff --git a/src/api/modules/report.js b/src/api/modules/report.js index 8eb9656..1bc1c2c 100644 --- a/src/api/modules/report.js +++ b/src/api/modules/report.js @@ -37,14 +37,15 @@ export default { // 标签删除|单个 labelDeleteId (data) { return request({ - url: `api/tree-label/${data.id}`, + url: `api/tree-label/delete/${data.id}`, method: 'POST' }) }, -labelUpdate(){ +labelUpdate(data){ return request({ url: 'api/tree-label/update', - method: 'POST' + method: 'POST', + data }) }, // 新增或编辑报告 diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue index c1c5084..56b9ce9 100644 --- a/src/views/Report/ReportManager.vue +++ b/src/views/Report/ReportManager.vue @@ -153,7 +153,7 @@ - + @@ -457,11 +457,7 @@ export default { this.$refs.tree.filter(val); } }, - mounted () { - this.$bus.$on('updateList',()=>{ - this.getTreeLabel() - }) - }, + methods: { init() { this.getTreeLabel() @@ -470,9 +466,14 @@ export default { this.reportDateList(); this.sysUserList(); }, + updateList(){ + this.$api.report.labelList().then(res => { + this.treeData=res.data + }) + this.$forceUpdate() + }, getTreeLabel(){ this.$api.report.labelList().then(res => { - console.log('5555',res); this.treeData=res.data }) }, @@ -494,6 +495,16 @@ export default { type: 'warning' }) .then(_ => { + this.$api.report.labelDeleteId(data).then(res=>{ + if(res.ok){ + this.$message({ + type:'success', + message:'删除成功' + }) + this.getTreeLabel() + } + }) + done(); }) .catch(_ => { }); diff --git a/src/views/Report/reportManager/labelModal.vue b/src/views/Report/reportManager/labelModal.vue index 3b28f0a..b7a06ed 100644 --- a/src/views/Report/reportManager/labelModal.vue +++ b/src/views/Report/reportManager/labelModal.vue @@ -81,6 +81,7 @@ export default { this.form.label = data.label this.form.orderNum = data.orderNum this.form.remark = data.remark + this.form.id=data.id this.form={...this.form} this.$refs.form.clearValidate('name') this.$forceUpdate() @@ -97,10 +98,29 @@ export default { if (valid) { this.form.parentId=this.form.nodeLabel[this.form.nodeLabel.length - 1] delete this.form.nodeLabel - this.$api.report.labelAdd(this.form).then(res => { + if(!this.form.id){ + this.$api.report.labelAdd(this.form).then(res => { + if(res.ok){ + this.$message({ + type:'success', + message:'添加成功' + }) + this.$emit('updateList') + } }) + }else{ + this.$api.report.labelUpdate(this.form).then(res=>{ + if(res.ok){ + this.$message({ + type:'success', + message:'更新成功' + }) + this.$emit('updateList') + + } + }) + } this.dialogVisible = false - this.$bus.$emit('updataList') } }) }