From 0b9a50a8afb5a3141d240f15637eb753ca2b5c67 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 17 Nov 2021 09:31:32 +0800
Subject: [PATCH 1/2] ss

---
 src/router/index.js                           |  2 +-
 .../visual/basicinfo/cpts/people-more.vue     | 71 +++++++++++++++----
 2 files changed, 59 insertions(+), 14 deletions(-)

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 @@
               <span class="item-field">{{ field.label }}：</span>
 
               <span
-                v-if="field.itemType == 'select' || field.itemType == 'radio'"
+                v-if="
+                  field.itemType == 'select' ||
+                  field.itemType == 'radio' ||
+                  field.itemType == 'checkbox' ||
+                  field.itemType == 'cascader'
+                "
                 >{{
                   info[field.columnName] == null
                     ? "--"
-                    : getOptionLabel(field.options, info[field.columnName])
+                    : getOptionLabel(
+                        field.options,
+                        info[field.columnName],
+                        field.itemType
+                      )
                 }}</span
               >
 
@@ -89,16 +98,29 @@
           <div class="item" :key="field.itemId" v-for="field in group.itemList">
             <span class="item-field">{{ field.label }}：</span>
             <span
-              v-if="field.itemType == 'select' || field.itemType == 'radio'"
+              v-if="
+                field.itemType == 'select' ||
+                field.itemType == 'radio' ||
+                field.itemType == 'checkbox' ||
+                field.itemType == 'cascader'
+              "
               >{{
-                !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
+                    )
               }}</span
             >
 
             <span v-else>{{
-              !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]
             }}</span>
           </div>
         </div>
@@ -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) => {

From b42e29b3df97cc786614fa8ad8a6845de37d8a37 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 17 Nov 2021 10:28:49 +0800
Subject: [PATCH 2/2] ss

---
 .../visual/basicinfo/cpts/people-more.vue     | 143 ++++++++++++------
 1 file changed, 93 insertions(+), 50 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue
index 0db1f0e9..e035760c 100644
--- a/src/views/modules/visual/basicinfo/cpts/people-more.vue
+++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue
@@ -90,38 +90,81 @@
         </div>
 
         <div
-          class="list"
           :key="'group' + index"
           v-show="groupIndex % groupList.length == index"
           v-for="(group, index) in groupList"
         >
-          <div class="item" :key="field.itemId" v-for="field in group.itemList">
-            <span class="item-field">{{ field.label }}：</span>
-            <span
-              v-if="
-                field.itemType == 'select' ||
-                field.itemType == 'radio' ||
-                field.itemType == 'checkbox' ||
-                field.itemType == 'cascader'
-              "
-              >{{
+          <div v-if="group.tableName == 'ic_resi_demand' && Array.isArray(allInfo.ic_resi_demand) && allInfo.ic_resi_demand.length>0">
+            <div
+              class="list"
+              :key="'ic_resi_demand' + infoIndex"
+              v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
+            >
+              <div
+                class="item"
+                :key="field.itemId"
+                v-for="field in group.itemList"
+              >
+                <span class="item-field">{{ field.label }}：</span>
+                <span
+                  v-if="
+                    field.itemType == 'select' ||
+                    field.itemType == 'radio' ||
+                    field.itemType == 'checkbox' ||
+                    field.itemType == 'cascader'
+                  "
+                  >{{
+                    infoItem[field.columnName] == null
+                      ? "--"
+                      : getOptionLabel(
+                          field.options,
+                          infoItem[field.columnName],
+                          field.itemType
+                        )
+                  }}</span
+                >
+
+                <span v-else>{{
+                  infoItem[field.columnName] == null
+                    ? "--"
+                    : infoItem[field.columnName]
+                }}</span>
+              </div>
+            </div>
+          </div>
+          <div class="list" v-else>
+            <div
+              class="item"
+              :key="field.itemId"
+              v-for="field in group.itemList"
+            >
+              <span class="item-field">{{ field.label }}：</span>
+              <span
+                v-if="
+                  field.itemType == 'select' ||
+                  field.itemType == 'radio' ||
+                  field.itemType == 'checkbox' ||
+                  field.itemType == 'cascader'
+                "
+                >{{
+                  !allInfo[group.tableName] ||
+                  allInfo[group.tableName][0][field.columnName] == null
+                    ? "--"
+                    : getOptionLabel(
+                        field.options,
+                        allInfo[group.tableName][0][field.columnName],
+                        field.itemType
+                      )
+                }}</span
+              >
+
+              <span v-else>{{
                 !allInfo[group.tableName] ||
                 allInfo[group.tableName][0][field.columnName] == null
                   ? "--"
-                  : getOptionLabel(
-                      field.options,
-                      allInfo[group.tableName][0][field.columnName],
-                      field.itemType
-                    )
-              }}</span
-            >
-
-            <span v-else>{{
-              !allInfo[group.tableName] ||
-              allInfo[group.tableName][0][field.columnName] == null
-                ? "--"
-                : allInfo[group.tableName][0][field.columnName]
-            }}</span>
+                  : allInfo[group.tableName][0][field.columnName]
+              }}</span>
+            </div>
           </div>
         </div>
       </cpt-card>
@@ -277,32 +320,33 @@ export default {
     getOptionLabel(options, value, type = "") {
       if (Array.isArray(options)) {
         let valueArr = value.split(",");
-        return valueArr
-          .map((val) => {
-            if (type != "cascader") {
+        if (type == "cascader") {
+          if (valueArr.length > 0) {
+            let level1 = options.find((item) => item.value == valueArr[0]);
+            console.log("----------------------- cascader", options);
+            if (level1) {
+              if (valueArr.length > 1 && level1.children) {
+                let level2 = level1.children.find(
+                  (item) => item.value == valueArr[1]
+                );
+                if (level2) {
+                  return level1.label + "-" + level2.label;
+                }
+              }
+              return level1.label;
+            }
+          }
+        } else {
+          return valueArr
+            .map((val) => {
               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 "--";
+            })
+            .join("、");
+        }
       }
       return "--";
     },
@@ -377,9 +421,8 @@ export default {
         this.groupList.forEach((subList, index) => {
           subList.itemList.forEach(async (item, subIndex) => {
             if (item.optionSourceType == "remote" && item.optionSourceValue) {
-              this.groupList[index].itemList.options = await this.getOptions(
-                item.optionSourceValue
-              );
+              this.groupList[index].itemList[subIndex].options =
+                await this.getOptions(item.optionSourceValue);
             }
           });
         });