FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
super_liu
2022-04-19 16:51:35 +08:00
parent a021bd1f35 204253cf0f
commit 52adb01730
9 changed files with 184 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+35 -28
View File
@@ -26,30 +26,33 @@
<span
:class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span style="font-size:12px"> {{ node.label }} </span>
<!--<span>
<el-button
type="text"
size="mini"
v-show="data.show"
@click="() => append(data)">
新增
</el-button>
<el-button
type="text"
size="mini"
v-show="data.show"
@click="() => update(data)">
编辑
</el-button>
<el-button
type="text"
size="mini"
v-show="data.showDel"
@click="() => remove(node, data)">
删除
</el-button>
</span>-->
</span>
<span>
<el-button
type="text"
size="mini"
v-show="data.show"
v-btn-permission="'764f630a49072d76a237dbcc9a1831e1'"
@click="() => append(data)">
新增
</el-button>
<el-button
type="text"
size="mini"
v-show="data.show"
v-btn-permission="'afdef0736eb111e9865e19fa3129d0ac'"
@click="() => update(data)">
编辑
</el-button>
<el-button
type="text"
size="mini"
v-show="data.showDel"
v-btn-permission="'c517df26b904cb8f69495f7f38f8f77b'"
@click="() => remove(node, data)">
删除
</el-button>
</span>
</span>
</el-tree>
</el-card>
</div>
@@ -2288,7 +2291,6 @@ export default {
parentIds: null,
parentIdsName: "",
displaySeq: "",
validFlag: "",
creationTime: "",
modifyTime: "",
remarks: "",
@@ -3620,11 +3622,16 @@ export default {
if (row.parentIds.indexOf(res.data.id) != -1) {
this.productModelAdd.parentIds = row.parentIds
} else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id
idsName = row.parentIdsName + ',' + res.data.menuName
if(row.parentIds && row.parentIds.substr(-1,1) === ','){
this.productModelAdd.parentIds = row.parentIds + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName
}else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName
}
}
} else {
this.productModelAdd.parentIds = res.data.id
this.productModelAdd.parentIds = ','+res.data.id+','
idsName = res.data.menuName;
}
this.productModelAdd.parentId = res.data.id