|
@@ -98,11 +98,13 @@ export default {
|
|
|
depTree.forEach(filterEmptyDept)
|
|
|
|
|
|
// 整理数据结构
|
|
|
- function sortDep(dep) {
|
|
|
+ function sortDep(dep, labels = []) {
|
|
|
+ console.log(dep, labels)
|
|
|
const dep2 = {
|
|
|
label: dep.label,
|
|
|
value: dep.value,
|
|
|
- children: []
|
|
|
+ children: [],
|
|
|
+ _labels: [].concat((Array.isArray(labels) ? labels : []), [dep.label])
|
|
|
}
|
|
|
if (Array.isArray(dep.salers) && dep.salers.length > 0) {
|
|
|
dep2.children = dep.salers.map(item => {
|
|
@@ -110,12 +112,15 @@ export default {
|
|
|
item.value = item.id
|
|
|
item.parentLabel = dep2.label
|
|
|
item.parentValue = dep2.value
|
|
|
+ item._labels = [].concat(dep2._labels)
|
|
|
return item
|
|
|
})
|
|
|
- }
|
|
|
- if (Array.isArray(dep.children) && dep.children.length > 0) {
|
|
|
- const t = dep.children.map(sortDep)
|
|
|
- dep2.children = dep2.children.concat(t)
|
|
|
+ if (Array.isArray(dep.children) && dep.children.length > 0) {
|
|
|
+ const t = dep.children.map(v => {
|
|
|
+ return sortDep(v,dep2._labels || [])
|
|
|
+ })
|
|
|
+ dep2.children = dep2.children.concat(t)
|
|
|
+ }
|
|
|
}
|
|
|
return dep2
|
|
|
}
|
|
@@ -446,7 +451,7 @@ export default {
|
|
|
'saleWay',
|
|
|
'signCode',
|
|
|
]
|
|
|
-
|
|
|
+
|
|
|
if (pageFormValue) {
|
|
|
for (const key in pageFormValue) {
|
|
|
if (delayRestoreList.includes(key)) {
|