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

2022-01-07 15:12:10 +08:00
parent 01a714f630 6293ba587f
commit 046aaf947e
5 changed files with 770 additions and 16 deletions
@@ -438,6 +438,7 @@ export default {
        this.addForm.remarks = row.remarks
        this.addForm.parentId = row.parentId
        this.addForm.parent = row.parent
+        this.addForm.useFlag = row.useFlag === 0 ? '禁用' : '启用'
        this.addForm.id = row.id
        this.nodeList3 = []
        this.nodeList3.push(this.addForm.parentId)