Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
fanlin
2021-07-20 16:48:27 +08:00
@@ -2280,7 +2280,6 @@ export default {
this.selectChildMenu(data)
this.productModal = true
// 取消所有的选中效果
this.handleSelectAll(false)
this.productTitle = '编辑信息'
// const newChild = { id: this.id++, label: 'testtest', children: [] };
// if (!data.children) {
@@ -2294,7 +2293,6 @@ export default {
this.selectChildMenu(data)
this.productModal = true
// 取消所有的选中效果
this.handleSelectAll(false)
this.productTitle = '新增下级菜单信息'
this.productModelAdd.dicTypeCode = ''
// const newChild = { id: this.id++, label: 'testtest', children: [] };
@@ -2314,7 +2312,7 @@ export default {
type: 'warning'
}).then(() => {
this.$http.delete("sarResource/ts-resource", {
menuId: data.id
resourceId: data.id
}, res => {
}, e => {
if(e.ok){