diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 6a47ad1bf..16fdb0ba9 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -902,7 +902,7 @@ export default {
           const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'resident_category'})
           this.resiClass = data.data
         } catch (error) {
-          console.log(error,'获取配偶情况字典');
+          console.log(error,'获取居民类别字典');
         }
       },
     computedBirth(age) {
diff --git a/src/views/modules/base/smartImport.vue b/src/views/modules/base/smartImport.vue
index 27716a362..8025cc937 100644
--- a/src/views/modules/base/smartImport.vue
+++ b/src/views/modules/base/smartImport.vue
@@ -1,130 +1,136 @@
 <template>
-	<div class="g-main">
-		<div class="m-table">
-			<div class="u-table-btn1">
-				<el-upload
-					:headers="$getElUploadHeaders()"
-					ref="upload"
-					class="upload-btn"
-					action="uploadUlr"
-					:limit="1"
-					:accept="'.xls,.xlsx'"
-					:with-credentials="true"
-					:show-file-list="false"
-					:auto-upload="true"
-					:on-progress="handleProgress"
-					:on-success="handleExcelSuccess"
-					:before-upload="beforeExcelUpload"
-					:http-request="uploadHttpRequest"
-				>
-					<el-button
-						size="small"
-						class="diy-button--white"
-						:loading="importLoading"
-						>表格导入</el-button
-					>
-				</el-upload>
-
-				<el-button
-					class="diy-button--white"
-					size="small"
-					style="margin-left: 10px"
-					@click="handleExportModule()"
-					>下载模板</el-button
-				>
-			</div>
-
-			<div v-if="dataList.length > 0">
-				<el-table
-					ref="ref_table"
-					:data="dataList"
-					border
-					:height="tableHeight"
-					class="m-table-item"
-					v-loading="dataListLoading"
-					style="width: 100%"
-				>
-					<el-table-column
-						label="序号"
-						header-align="center"
-						align="center"
-						type="index"
-						width="100"
-					></el-table-column>
-
-					<el-table-column
-						prop="srcField"
-						header-align="center"
-						align="center"
-						label="表格信息"
-						min-width="100"
-					>
-					</el-table-column>
-					<el-table-column
-						prop="field"
-						header-align="center"
-						align="center"
-						label="平台对应信息"
-						min-width="110"
-					>
-						<template slot-scope="scope">
-							<span v-if="scope.row.exist">{{
-								scope.row.field
-							}}</span>
-
-							<div v-else>
-								<el-select
-									class="item_width_sel"
-									v-model="scope.row.itemGroupId"
-									size="small"
-									placeholder="请选择"
-								>
-									<el-option
-										v-for="item in groupList"
-										@click.native="
-											handleSelGroup(scope.$index, item)
-										"
-										:key="item.id"
-										:label="item.label"
-										:value="item.id"
-									>
-									</el-option>
-								</el-select>
-
-								<el-select
-									class="item_width_sel"
-									v-model="scope.row.field"
-									size="small"
-									style="margin-left: 10px"
-									placeholder="请选择"
-								>
-									<el-option
-										v-for="item in scope.row.itemList"
-										:key="item.itemId"
-										:label="item.label"
-										:value="item.label"
-									>
-									</el-option>
-								</el-select>
-							</div>
-						</template>
-					</el-table-column>
-				</el-table>
-
-				<div ref="divEditBtn" class="m-edit-btn">
-					<el-button
-						type="primary"
-						size="small"
-						class="diy-button--blue"
-						@click="handleComfirm"
-						>保 存</el-button
-					>
-				</div>
-			</div>
-
-			<div class="m-hint" v-else>请先导入表格</div>
-		</div>
-	</div>
+  <div class="g-main">
+    <div class="m-table">
+      <div class="u-table-btn1">
+
+        <el-upload
+          :headers="$getElUploadHeaders()"
+          ref="upload"
+          class="upload-btn"
+          action="uploadUlr"
+          :limit="1"
+          :accept="'.xls,.xlsx'"
+          :with-credentials="true"
+          :show-file-list="false"
+          :auto-upload="true"
+          :on-progress="handleProgress"
+          :on-success="handleExcelSuccess"
+          :before-upload="beforeExcelUpload"
+          :http-request="uploadHttpRequest"
+        >
+          <el-dropdown
+            size="small"
+            type="primary"
+            style="margin: 0 10px; height: 30px"
+			@command="(command) => handleImportType(command)"
+			trigger="hover"
+          >
+		  <el-button type="primary">
+			表格导入<i class="el-icon-arrow-down el-icon--right"></i>
+		  </el-button>
+            
+            <el-dropdown-menu slot="dropdown" >
+              <el-dropdown-item v-for="(item,index) in resiClass" :key="index" :command="item.value" >{{item.label}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </el-upload>
+
+        <el-button
+          class="diy-button--white"
+          size="small"
+          style="margin-left: 10px"
+          @click="handleExportModule()"
+          >下载模板</el-button
+        >
+      </div>
+
+      <div v-if="dataList.length > 0">
+        <el-table
+          ref="ref_table"
+          :data="dataList"
+          border
+          :height="tableHeight"
+          class="m-table-item"
+          v-loading="dataListLoading"
+          style="width: 100%"
+        >
+          <el-table-column
+            label="序号"
+            header-align="center"
+            align="center"
+            type="index"
+            width="100"
+          ></el-table-column>
+
+          <el-table-column
+            prop="srcField"
+            header-align="center"
+            align="center"
+            label="表格信息"
+            min-width="100"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="field"
+            header-align="center"
+            align="center"
+            label="平台对应信息"
+            min-width="110"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.exist">{{ scope.row.field }}</span>
+
+              <div v-else>
+                <el-select
+                  class="item_width_sel"
+                  v-model="scope.row.itemGroupId"
+                  size="small"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in groupList"
+                    @click.native="handleSelGroup(scope.$index, item)"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+
+                <el-select
+                  class="item_width_sel"
+                  v-model="scope.row.field"
+                  size="small"
+                  style="margin-left: 10px"
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in scope.row.itemList"
+                    :key="item.itemId"
+                    :label="item.label"
+                    :value="item.label"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <div ref="divEditBtn" class="m-edit-btn">
+          <el-button
+            type="primary"
+            size="small"
+            class="diy-button--blue"
+            @click="handleComfirm"
+            >保 存</el-button
+          >
+        </div>
+      </div>
+
+      <div class="m-hint" v-else>请先导入表格</div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -132,350 +138,396 @@ import { requestPost } from "@/js/dai/request";
 import { mapGetters } from "vuex";
 
 export default {
-	data() {
-		return {
-			customerId: "", // 客户id，父组件传
-			customerName: "", // 客户名称，父组件传
-
-			tableParams: {
-				customerId: "",
-			},
-			// tableHeight: 500,
-			search: "",
-			dataList: [],
-
-			dataListLoading: false,
-			total: 0,
-			pageSize: 20,
-			pageNo: 0,
-
-			formShow: false,
-			formData: {},
-
-			scopeList: [],
-			dataSyncConfigId: "",
-			importLoading: false,
-
-			groupList: [],
-			sHeight: 0,
-
-			importCode: "",
-			importOption: { exist: {}, notExist: {} },
-
-			fileData: null,
-		};
-	},
-
-	computed: {
-		tableHeight() {
-			const h = this.clientHeight - this.sHeight + this.iframeHeigh;
-			const _h = this.clientHeight - this.sHeight;
-			return this.$store.state.inIframe ? h : _h;
-		},
-
-		...mapGetters(["clientHeight", "iframeHeight"]),
-	},
-	components: {},
-	created() {},
-	async mounted() {
-		// await this.loadData();
-		await this.loadPersonGroup();
-
-		this.sHeight = this.$refs.divEditBtn.offsetHeight + 300;
-	},
-	methods: {
-		diaClose() {
-			this.formShow = false;
-		},
-
-		async loadPersonGroup() {
-			const url = "/oper/customize/icformitemgroup/list";
-			// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-			let params = {
-				formCode: "resi_base_info",
-				policyFlag: "1",
-			};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				this.groupList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		//选择人员信息第一列下拉框
-		async handleSelGroup(index, item, isSet) {
-			const url = "/oper/customize/icformitem/getItemListV2";
-			// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-			let params = {
-				policyFlag: "1",
-				groupId: item.id,
-			};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				let oneData = this.dataList[index];
-				oneData.itemList = data;
-				this.$set(this.dataList, index, oneData);
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		// 加载列表数据
-		async loadData() {
-			this.dataListLoading = true;
-			// const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/dataSyncConfig/list'
-			const url = "/epmetuser/dataSyncConfig/list";
-
-			this.tableParams = {
-				pageSize: this.pageSize,
-				pageNo: this.pageNo,
-			};
-
-			const { data, code, msg } = await requestPost(
-				url,
-				this.tableParams
-			);
-			this.dataListLoading = false;
-			if (code === 0) {
-				this.total = data.total;
-				this.dataList = data.list;
-				this.dataList.forEach((element) => {
-					element.stateShow =
-						element.switchStatus === "open" ? true : false;
-				});
-			} else {
-				// this.$message.error(msg )
-			}
-		},
-
-		handleChangeScope(value) {
-			// console.log('value', value)
-
-			this.orgIdArray = value;
-			this.scopeList = [];
-			let selArray = this.$refs["myCascader"].getCheckedNodes();
-
-			// console.log('selArray', selArray)
-
-			selArray.forEach((element, index) => {
-				let obj = {
-					orgId: element.data.agencyId,
-					orgType: element.data.level,
-					orgIdPath: element.path.join(":"),
-				};
-				this.scopeList.push(obj);
-			});
-
-			console.log("this.scopeList", this.scopeList);
-		},
-
-		async handleExportModule() {
-			let url = "/actual/base/residentBaseInfo/import/download-template";
-
-			let params = {};
-			await this.$http({
-				method: "POST",
-				url,
-				responseType: "blob",
-				data: params,
-			})
-				.then((res) => {
-					const url = window.URL.createObjectURL(new Blob([res.data]))
-					const aLink = document.createElement('a')
-					aLink.style.display = 'none'
-					aLink.href = url
-					aLink.setAttribute('download', '人员导入模板.zip')
-					document.body.appendChild(aLink)
-					aLink.click()
-					document.body.removeChild(aLink)
-					window.URL.revokeObjectURL(url)
-					// // this.download(res.data, title + '.xls')
-					// if (res.headers["content-disposition"]) {
-					// 	let fileName = window.decodeURI(
-					// 		res.headers["content-disposition"]
-					// 			.split(";")[1]
-					// 			.split("=")[1]
-					// 	);
-					// 	console.log("filename", fileName);
-					// 	let blob = new Blob([res.data], {
-					// 		type: "application/vnd.ms-excel",
-					// 	});
-					// 	var url = window.URL.createObjectURL(blob);
-					// 	var aLink = document.createElement("a");
-					// 	aLink.style.display = "none";
-					// 	aLink.href = url;
-					// 	aLink.setAttribute("download", fileName);
-					// 	document.body.appendChild(aLink);
-					// 	aLink.click();
-					// 	document.body.removeChild(aLink); //下载完成移除元素
-					// 	window.URL.revokeObjectURL(url); //释放掉blob对象
-					// } else this.$message.error("下载失败");
-				})
-				.catch((err) => {
-					console.log("err", err);
-					return this.$message.error("网络错误");
-				});
-		},
-		// 上传大图标成功
-		handleExcelSuccess(res, file) {
-			if (res.code === 0 && res.msg === "success") {
-				console.log("resss---ppp", res);
-			} else {
-				this.$message.error(res.msg);
-			}
-		},
-		handleProgress(event, file, fileList) {
-			console.log("percentage", file.percentage);
-		},
-
-		beforeExcelUpload(file) {
-			console.log("file", file);
-			const isType = file.type === "application/vnd.ms-excel";
-			const isTypeComputer =
-				file.type ===
-				"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-			const fileType = isType || isTypeComputer;
-			const isLt1M = file.size / 1024 / 1024 < 10;
-			if (!fileType) {
-				this.$message.error("上传文件只能是xls/xlsx格式！");
-			}
-
-			if (!isLt1M) {
-				this.$message.error("上传文件大小不能超过 10MB!");
-			}
-			return fileType && isLt1M;
-		},
-		async uploadHttpRequest(file) {
-			this.importLoading = true;
-			this.importBtnTitle = "正在上传中...";
-			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-			formData.append("file", file.file); //添加文件对象
-			formData.append("code", ""); //添加文件对象
-			await this.$http
-				.post("/actual/base/residentBaseInfo/importExcel", formData)
-				.then((res) => {
-					console.log("res-up", res);
-					if (res.data.code == 0 && res.data.msg == "success") {
-						console.log(res.data.data);
-						const data = res.data.data;
-						this.afterSuccess()
-						this.dataList = [
-							...Object.keys(data.option.exist).map((k) => {
-								return {
-									index: k,
-									srcField: data.option.exist[k],
-									exist: true,
-									field: data.option.exist[k],
-								};
-							}),
-							...Object.keys(data.option.notExist).map((k) => {
-								return {
-									index: k,
-									srcField: data.option.notExist[k],
-									exist: false,
-									field: "",
-								};
-							}),
-						];
-						this.importOption = data.option;
-						this.importCode = data.code;
-						this.fileData = file;
-					} else this.$message.error(res.data.msg);
-				})
-				.catch((err) => {
-					console.log("失败", err);
-					file.onError(); //上传失败的文件会从文件列表中删除
-					// this.$message.error('导入失败')
-				});
-			this.importLoading = false;
-			this.importBtnTitle = "导入";
-			this.$refs.upload.clearFiles();
-		},
-
-		async handleComfirm() {
-			this.importLoading = true;
-			this.importBtnTitle = "正在上传中...";
-			const { importOption, importCode, dataList } = this;
-			dataList.forEach((item) => {
-				if (!item.exist) {
-					importOption.notExist[item.index] = item.field;
-				}
-			});
-			await this.$http
-				.post("/actual/base/residentBaseInfo/import/header", {
-					code: importCode,
-					option: {
-						exist: importOption.exist,
-						notExist: importOption.notExist,
-					},
-				})
-				.then((res) => {
-					console.log("res-up", res);
-					if (res.data.code == 0 && res.data.msg == "success") {
-						// this.upload2(this.fileData, this.importCode);
-						this.afterSuccess();
-					} else this.$message.error(res.data.msg);
-				})
-				.catch((err) => {
-					console.log("失败", err);
-					file.onError(); //上传失败的文件会从文件列表中删除
-					// this.$message.error('导入失败')
-				});
-			this.importLoading = false;
-			this.importBtnTitle = "导入";
-		},
-
-		async upload2(file, code) {
-			this.importLoading = true;
-			this.importBtnTitle = "正在上传中...";
-			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-			formData.append("file", file.file); //添加文件对象
-			formData.append("code", code); //添加文件对象
-			await this.$http
-				.post("/actual/base/residentBaseInfo/importExcel", formData)
-				.then((res) => {
-					console.log("res-up", res);
-					if (res.data.code == 0 && res.data.msg == "success") {
-						this.afterSuccess();
-					} else this.$message.error(res.data.msg);
-				})
-				.catch((err) => {
-					console.log("失败", err);
-					file.onError(); //上传失败的文件会从文件列表中删除
-					// this.$message.error('导入失败')
-				});
-			this.importLoading = false;
-			this.importBtnTitle = "导入";
-			this.$refs.upload.clearFiles();
-		},
-
-		afterSuccess() {
-			this.$message({
-				showClose: true,
-				dangerouslyUseHTMLString: true,
-				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-				duration: 3000
-			});
-			let than = this
-			document.getElementById('clickA').addEventListener('click',function(){
-				than.$router.replace('/main/importRecord-index');
-			})
-			this.dataList = [];
-			this.importOption = {};
-			this.importCode = "";
-			this.fileData = null;
-		},
-
-		// 取消
-		diaCancel() {
-			this.$emit("cancleBack");
-		},
+  data() {
+    return {
+      customerId: "", // 客户id，父组件传
+      customerName: "", // 客户名称，父组件传
+
+      tableParams: {
+        customerId: "",
+      },
+      // tableHeight: 500,
+      search: "",
+      dataList: [
+		// { 
+		// 	index: "key1", 
+		// 	srcField: "value1_from_exist", 
+		// 	exist: true, 
+		// 	field: "value1_from_exist"
+		// },
+		// { 
+		// 	index: "key2", 
+		// 	srcField: "value2_from_exist", 
+		// 	exist: true, 
+		// 	field: "value2_from_exist"
+		// },
+		// { 
+		// 	index: "key3", 
+		// 	srcField: "value3_from_notExist", 
+		// 	exist: false, 
+		// 	field: ""
+		// },
+		// { 
+		// 	index: "key4", 
+		// 	srcField: "value4_from_notExist", 
+		// 	exist: false, 
+		// 	field: ""
+		// },
+	  ],
+
+      dataListLoading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+
+      formShow: false,
+      formData: {},
+
+      scopeList: [],
+      dataSyncConfigId: "",
+      importLoading: false,
+
+      groupList: [],
+      sHeight: 0,
+
+      importCode: "",
+      importOption: { exist: {}, notExist: {} },
+
+      fileData: null,
+      resiClass: [],
+
+	  importType :''
+    };
+  },
+
+  computed: {
+    tableHeight() {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh;
+      const _h = this.clientHeight - this.sHeight;
+      return this.$store.state.inIframe ? h : _h;
+    },
+
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  components: {},
+  created() {},
+  async mounted() {
+    // await this.loadData();
+    await this.loadPersonGroup();
+	this.getResident()
+
+    this.sHeight = this.$refs.divEditBtn.offsetHeight + 300;
+  },
+  methods: {
+    diaClose() {
+      this.formShow = false;
+    },
+
+    async loadPersonGroup() {
+      const url = "/oper/customize/icformitemgroup/list";
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {
+        formCode: "resi_base_info",
+        policyFlag: "1",
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.groupList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //选择人员信息第一列下拉框
+    async handleSelGroup(index, item, isSet) {
+      const url = "/oper/customize/icformitem/getItemListV2";
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {
+        policyFlag: "1",
+        groupId: item.id,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        let oneData = this.dataList[index];
+        oneData.itemList = data;
+        this.$set(this.dataList, index, oneData);
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    // 加载列表数据
+    async loadData() {
+      this.dataListLoading = true;
+      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/dataSyncConfig/list'
+      const url = "/epmetuser/dataSyncConfig/list";
+
+      this.tableParams = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+      };
+
+      const { data, code, msg } = await requestPost(url, this.tableParams);
+      this.dataListLoading = false;
+      if (code === 0) {
+        this.total = data.total;
+        this.dataList = data.list;
+        this.dataList.forEach((element) => {
+          element.stateShow = element.switchStatus === "open" ? true : false;
+        });
+      } else {
+        // this.$message.error(msg )
+      }
+    },
+	handleImportType(command){
+		this.importType = command
+        // this.$refs.upload.click();
+		this.$refs['upload'].$children[0].$refs.input.click()
 	},
+    handleChangeScope(value) {
+      // console.log('value', value)
+
+      this.orgIdArray = value;
+      this.scopeList = [];
+      let selArray = this.$refs["myCascader"].getCheckedNodes();
+
+      // console.log('selArray', selArray)
+
+      selArray.forEach((element, index) => {
+        let obj = {
+          orgId: element.data.agencyId,
+          orgType: element.data.level,
+          orgIdPath: element.path.join(":"),
+        };
+        this.scopeList.push(obj);
+      });
+
+      console.log("this.scopeList", this.scopeList);
+    },
+    async getResident() {
+      try {
+        const { data } = await this.$http.post("sys/dict/data/dictlist", {
+          dictType: "resident_category",
+        });
+        this.resiClass = data.data;
+      } catch (error) {
+        console.log(error, "获取居民类别字典");
+      }
+    },
+    async handleExportModule() {
+      let url = "/actual/base/residentBaseInfo/import/download-template";
+
+      let params = {};
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+        .then((res) => {
+          const url = window.URL.createObjectURL(new Blob([res.data]));
+          const aLink = document.createElement("a");
+          aLink.style.display = "none";
+          aLink.href = url;
+          aLink.setAttribute("download", "人员导入模板.zip");
+          document.body.appendChild(aLink);
+          aLink.click();
+          document.body.removeChild(aLink);
+          window.URL.revokeObjectURL(url);
+          // // this.download(res.data, title + '.xls')
+          // if (res.headers["content-disposition"]) {
+          // 	let fileName = window.decodeURI(
+          // 		res.headers["content-disposition"]
+          // 			.split(";")[1]
+          // 			.split("=")[1]
+          // 	);
+          // 	console.log("filename", fileName);
+          // 	let blob = new Blob([res.data], {
+          // 		type: "application/vnd.ms-excel",
+          // 	});
+          // 	var url = window.URL.createObjectURL(blob);
+          // 	var aLink = document.createElement("a");
+          // 	aLink.style.display = "none";
+          // 	aLink.href = url;
+          // 	aLink.setAttribute("download", fileName);
+          // 	document.body.appendChild(aLink);
+          // 	aLink.click();
+          // 	document.body.removeChild(aLink); //下载完成移除元素
+          // 	window.URL.revokeObjectURL(url); //释放掉blob对象
+          // } else this.$message.error("下载失败");
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    // 上传大图标成功
+    handleExcelSuccess(res, file) {
+      if (res.code === 0 && res.msg === "success") {
+        console.log("resss---ppp", res);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    handleProgress(event, file, fileList) {
+      console.log("percentage", file.percentage);
+    },
+
+    beforeExcelUpload(file) {
+      console.log("file", file);
+	  console.log(this.importType);
+	
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
+      }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+      }
+
+	 if(!this.importType){
+			this.$message.error('请选择导入的类别') 
+	  }
+      return fileType && isLt1M;
+    },
+    async uploadHttpRequest(file) {
+	  if(!this.importType) return
+      this.importLoading = true;
+      this.importBtnTitle = "正在上传中...";
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      formData.append("code", ""); //添加文件对象
+      await this.$http
+        .post("/actual/base/residentBaseInfo/importExcel", formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            console.log(res.data.data);
+            const data = res.data.data;
+				this.afterSuccess();
+            this.dataList = [
+              ...Object.keys(data.option.exist).map((k) => {
+                return {
+                  index: k,
+                  srcField: data.option.exist[k],
+                  exist: true,
+                  field: data.option.exist[k],
+                };
+              }),
+              ...Object.keys(data.option.notExist).map((k) => {
+                return {
+                  index: k,
+                  srcField: data.option.notExist[k],
+                  exist: false,
+                  field: "",
+                };
+              }),
+            ];
+            this.importOption = data.option;
+            this.importCode = data.code;
+            this.fileData = file;
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
+      this.$refs.upload.clearFiles();
+    },
+
+    async handleComfirm() {
+      this.importLoading = true;
+      this.importBtnTitle = "正在上传中...";
+      const { importOption, importCode, dataList } = this;
+      dataList.forEach((item) => {
+        if (!item.exist) {
+          importOption.notExist[item.index] = item.field;
+        }
+      });
+      await this.$http
+        .post("/actual/base/residentBaseInfo/import/header", {
+          code: importCode,
+          option: {
+            exist: importOption.exist,
+            notExist: importOption.notExist,
+          },
+        })
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            // this.upload2(this.fileData, this.importCode);
+            this.afterSuccess();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
+    },
+
+    async upload2(file, code) {
+      this.importLoading = true;
+      this.importBtnTitle = "正在上传中...";
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      formData.append("code", code); //添加文件对象
+      await this.$http
+        .post("/actual/base/residentBaseInfo/importExcel", formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            this.afterSuccess();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
+      this.$refs.upload.clearFiles();
+    },
+
+    afterSuccess() {
+      this.$message({
+        showClose: true,
+        dangerouslyUseHTMLString: true,
+        message:
+          "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+        duration: 3000,
+      });
+      let than = this;
+      document.getElementById("clickA").addEventListener("click", function () {
+        than.$router.replace("/main/importRecord-index");
+      });
+      this.dataList = [];
+      this.importOption = {};
+      this.importCode = "";
+      this.fileData = null;
+    },
+
+    // 取消
+    diaCancel() {
+      this.$emit("cancleBack");
+    },
+  },
 };
 </script>
 
@@ -483,21 +535,26 @@ export default {
 @import "@/assets/scss/modules/management/list-main.scss";
 
 .m-edit-btn {
-	display: flex;
-	margin-top: 20px;
-	margin-right: 16px;
-	justify-content: flex-end;
-	text-align: center;
+  display: flex;
+  margin-top: 20px;
+  margin-right: 16px;
+  justify-content: flex-end;
+  text-align: center;
 }
 
 .item_width_sel {
-	width: 200px;
+  width: 200px;
 }
 
 .m-hint {
-	font-size: 50px;
-	line-height: 300px;
-	text-align: center;
-	color: #aaaaaa;
+  font-size: 50px;
+  line-height: 300px;
+  text-align: center;
+  color: #aaaaaa;
+}
+::v-deep .upload-btn{
+	.el-button{
+		padding: 7px 20px;
+	}
 }
 </style>
diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue
index ce87e7ab4..aa3ccfea2 100644
--- a/src/views/modules/communityService/labelConfig/addForm.vue
+++ b/src/views/modules/communityService/labelConfig/addForm.vue
@@ -99,7 +99,7 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="对应值" align="center" >
+      <el-table-column label="对应值" align="center">
         <template slot-scope="scope">
           <template v-for="item in scope.row.correspondingOpction">
             <el-select
@@ -186,7 +186,13 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column fixed="right" label="操作" align="center" width="120" v-if="formType!='info'">
+      <el-table-column
+        fixed="right"
+        label="操作"
+        align="center"
+        width="120"
+        v-if="formType != 'info'"
+      >
         <template slot-scope="scope">
           <!-- <img
             src="@/assets/img/icon-del.png"
@@ -206,11 +212,15 @@
           <el-button
             type="danger"
             @click="handleClickDelete(scope.$index)"
-            v-if="scope.$index != tableData.length - 1||(tableData.length - 1>=1&&scope.$index !='0' )"
+            v-if="
+              scope.$index != tableData.length - 1 ||
+              (tableData.length - 1 >= 1 && scope.$index != '0')
+            "
             size="small"
             icon="el-icon-minus"
             circle
-          > </el-button>
+          >
+          </el-button>
           <!-- <img
             src="@/assets/img/icon-add.png"
             @click="handleClickAddRow"
@@ -258,7 +268,7 @@ export default {
         ],
       },
       timeout: null,
-      tagObj:{},
+      tagObj: {},
       searchList: [],
       tableData: [
         {
@@ -295,14 +305,14 @@ export default {
   methods: {
     async initForm(type, row) {
       this.formType = type;
-      if(type == 'info'){
+      if (type == "info") {
         await this.getFormEdit(row.tagId);
-      }else if(type == 'edit'){
+      } else if (type == "edit") {
         await this.getFormEdit(row.tagId);
         this.formData.tagName = row.tagName;
       }
       this.tagId = row.tagId;
-      this.tagObj = row
+      this.tagObj = row;
       for (let i in this.tableData) {
         this.handleChangeSource(this.tableData[i], [i], type);
         this.handleChangeFieldsType(this.tableData[i], [i], type);
@@ -310,7 +320,6 @@ export default {
           this.handleChangeFieldsName(this.tableData[i], [i], type);
         }, 300);
       }
-      
     },
     querySearchAsync(val, cb) {
       console.log(this.searchList);
@@ -319,11 +328,11 @@ export default {
       var results = val
         ? searchList.filter(this.createStateFilter(val))
         : searchList;
-      if(results.length == 0){
-          this.handleClickAddRow()
-          this.formType = 'add'
-      }else{
-          this.formType = 'info'
+      if (results.length == 0) {
+        this.handleClickAddRow();
+        this.formType = "add";
+      } else {
+        this.formType = "info";
       }
       clearTimeout(this.timeout);
       this.timeout = setTimeout(() => {
@@ -574,7 +583,7 @@ export default {
           }
         });
       } else {
-        this.$emit("dialogOk",this.tagObj);
+        this.$emit("dialogOk", this.tagObj);
         return this.tagId;
       }
     },
@@ -588,7 +597,7 @@ export default {
           rules: this.tableData,
           tagId: this.tagId,
         };
-      } else if(this.formType == "add"){
+      } else if (this.formType == "add") {
         url = "/governance/resiSearchTag/addResiSearchTag";
         params = {
           tagName: this.formData.tagName,
@@ -598,7 +607,7 @@ export default {
       const { data, msg, code } = await requestPost(url, params);
       if (code == 0) {
         this.$message.success("操作成功");
-        this.$emit("dialogOk",{tagId:data.id,tagName:data.tagName});
+        this.$emit("dialogOk", { tagId: data.id, tagName: data.tagName });
       } else if (code >= 8000) {
         this.$message.error(msg);
       }
@@ -689,18 +698,21 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
+
 .imgBtn {
   width: 25px;
   height: 25px;
   margin-top: 3px;
   cursor: pointer;
 }
+
 .div_btn {
   display: flex;
   justify-content: flex-end;
   margin-top: 10px;
 }
-.my_form{
+
+.my_form {
   padding: 10px 50px 0;
 }
 </style>