From 6d12d513fb7bf57cb538298228a4b50c997616ba Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 8 Jul 2024 14:25:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E8=A1=A8=E5=A4=B4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/smartImport/cpts/createdTask.vue     | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/base/smartImport/cpts/createdTask.vue b/src/views/modules/base/smartImport/cpts/createdTask.vue
index 191bb5e2f..6cc7d28a5 100644
--- a/src/views/modules/base/smartImport/cpts/createdTask.vue
+++ b/src/views/modules/base/smartImport/cpts/createdTask.vue
@@ -199,9 +199,9 @@
                   <el-option
                     v-for="item in groupList"
                     @click.native="handleSelGroup(scope.$index, item, 'change')"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.label"
+                    :key="item.fileModeCode"
+                    :label="item.fileModeName"
+                    :value="item.fileModeName"
                   >
                   </el-option>
                 </el-select>
@@ -216,8 +216,8 @@
                   <el-option
                     v-for="item in scope.row.itemList"
                     :key="item.itemId"
-                    :label="item.label"
-                    :value="item.label"
+                    :label="item.columnName"
+                    :value="item.columnName"
                   >
                   </el-option>
                 </el-select>
@@ -277,15 +277,9 @@ export default {
       this.categoryName = null;
     },
     async loadPersonGroup() {
-      const url = "/oper/customize/icformitemgroup/list";
+      const url = "/oper/customize/fileModeColumns/listModule";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {
-        formCode: "resident_base_info,community_info",
-        policyFlag: "1",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
+      const { data, code, msg } = await requestPost(url);
       if (code === 0) {
         this.groupList = data;
       } else {
@@ -293,11 +287,12 @@ export default {
       }
     },
     async handleSelGroup(index, item, change) {
-      const url = "/oper/customize/icformitem/getItemListV2";
+      console.log(item);
+      const url = "/oper/customize/fileModeColumns/listField";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {
-        // policyFlag: "1",
-        groupId: item.id,
+      let params ={
+        REVISION: 1010,
+        fileModeCode: item.fileModeCode,
       };
       const { data, code, msg } = await requestPost(url, params);
 
@@ -335,7 +330,7 @@ export default {
           this.groupList.map((item) => [item.label, item])
         );
         for (let i in this.dataList) {
-          this.handleSelGroup(i, groupMap.get(this.dataList[i].itemGroupId));
+          this.handleSelGroup(i, groupMap.get(this.dataList[i].fileModeCode));
         }
         this.dataListLoading = false;
       } else if (code >= 8000) {

From 764b5280018902ea71d7de62ebc805392b31afec Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 8 Jul 2024 14:43:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E6=8B=93=E5=B1=95=E4=BF=A1=E6=81=AF=E8=A1=A8=E5=8D=95=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiExpand/index.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/components/resiExpand/index.vue b/src/views/components/resiExpand/index.vue
index ca53d6540..0851c9a4a 100644
--- a/src/views/components/resiExpand/index.vue
+++ b/src/views/components/resiExpand/index.vue
@@ -311,14 +311,15 @@ export default {
         handleClickSUbmitExpand() {
             console.log(this.formList);
             console.log(this.form);
-            this.formList.forEach((group) => {
-                group.children.forEach((item) => {
-                    if (item.check && !this.form[group.id][item.formName]) {
-                        this.$message.error(`${item.label}不能为空`);
-                        throw new Error(`${item.label}不能为空`);
-                    }
-                });
-            });
+            // 去掉添加居民拓展信息表单验证
+            // this.formList.forEach((group) => {
+            //     group.children.forEach((item) => {
+            //         if (item.check && !this.form[group.id][item.formName]) {
+            //             this.$message.error(`${item.label}不能为空`);
+            //             throw new Error(`${item.label}不能为空`);
+            //         }
+            //     });
+            // });
             if (this.formType === 'add') {
                 this.form.id = this.form.partyOrgId;
             }