Merge branch 'bug_mk' into dev

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"
+                    :key="item.fileModeCode"
-                    :label="item.label"
+                    :label="item.fileModeName"
-                    :value="item.label"
+                    :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"
+                    :label="item.columnName"
-                    :value="item.label"
+                    :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 = {
+      const { data, code, msg } = await requestPost(url);
-        formCode: "resident_base_info,community_info",
-        policyFlag: "1",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
       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 = {
+      let params ={
-        // policyFlag: "1",
+        REVISION: 1010,
-        groupId: item.id,
+        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) {