diff --git a/src/router/index.js b/src/router/index.js index 0babe9dc..74034c36 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -82,7 +82,7 @@ export const moduleShujuRoutes = { component: () => import("@/views/main-shuju/main"), name: "main-shuju", redirect: { - name: "visual-basicinfo-basicInfoMain", + path: "/main-shuju/visual-basicinfo-basicInfoMain", }, meta: { title: "主入口布局", diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue index dda9d374..0db1f0e9 100644 --- a/src/views/modules/visual/basicinfo/cpts/people-more.vue +++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue @@ -36,11 +36,20 @@ {{ field.label }}: {{ info[field.columnName] == null ? "--" - : getOptionLabel(field.options, info[field.columnName]) + : getOptionLabel( + field.options, + info[field.columnName], + field.itemType + ) }} @@ -89,16 +98,29 @@
{{ field.label }}: {{ - !allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null + !allInfo[group.tableName] || + allInfo[group.tableName][0][field.columnName] == null ? "--" - : getOptionLabel(field.options, allInfo[group.tableName][0][field.columnName]) + : getOptionLabel( + field.options, + allInfo[group.tableName][0][field.columnName], + field.itemType + ) }} {{ - !allInfo[group.tableName] || allInfo[group.tableName][0][field.columnName] == null ? "--" : allInfo[group.tableName][0][field.columnName] + !allInfo[group.tableName] || + allInfo[group.tableName][0][field.columnName] == null + ? "--" + : allInfo[group.tableName][0][field.columnName] }}
@@ -214,7 +236,7 @@ export default { watch: { userId() { - this.getInfo(); + this.getApiData(); }, }, @@ -252,12 +274,35 @@ export default { this.getHomeList(); }, - getOptionLabel(options, value) { + getOptionLabel(options, value, type = "") { if (Array.isArray(options)) { - let item = options.find((item) => item.value == value); - if (item && item.label) { - return item.label; - } + let valueArr = value.split(","); + return valueArr + .map((val) => { + if (type != "cascader") { + let item = options.find((item) => item.value == val); + if (item && item.label) { + return item.label; + } + } else { + let idx, subIdx; + options.forEach((item, index) => { + if (item.children) { + item.children.forEach((subitem, subIndex) => { + if (subitem.value == val) { + idx = index; + subIdx = subIndex; + } + }); + } + }); + if (idx && subIdx) { + return options[idx].children[subIdx].label; + } + } + return "--"; + }) + .join("、"); } return "--"; }, @@ -327,7 +372,7 @@ export default { } }); }); - console.log('1111111111111111111111111',this.groupList); + console.log("1111111111111111111111111", this.groupList); this.groupList.forEach((subList, index) => { subList.itemList.forEach(async (item, subIndex) => {