diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index ef66030e9..a8813f8d9 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -1052,7 +1052,7 @@ export default {
           name:'', //姓名
           nation:'', //民族
           remark:'', //备注
-          localResidenceFlag:'', //本地户籍
+          localResidenceFlag:'1', //本地户籍
           birthday:'', //生日
           idNum:'', //证件号
           gender:'', // 性别
@@ -1097,10 +1097,10 @@ export default {
             disabilityLevel:'',//残疾等级
             disabilityNum:'',//残疾证号
             disabilityDesc:'',//残疾说明
-            guardianFlag:null,//有无监护人
-            specialSkillFlag:null,//有无技能特长【有:1 无:0】
-            workCapacityFlag:null,//有无劳动能力【有:1 无:0】
-            voluntaryEducationFlag:null,//有无非义务教育阶段助学【有:1 无:0】
+            guardianFlag:1,//有无监护人
+            specialSkillFlag:1,//有无技能特长【有:1 无:0】
+            workCapacityFlag:1,//有无劳动能力【有:1 无:0】
+            voluntaryEducationFlag:1,//有无非义务教育阶段助学【有:1 无:0】
             illnessCode:'',//所患大病字典code
             illnessTime:'',//大病患病时间yyyy-MM-dd
             chronicDiseaseCode:'',//所患慢性病code
@@ -1134,7 +1134,7 @@ export default {
             resideSituation:'',//居住情况
             marriage:'',//婚姻状况
             spouseSituation:'',//配偶情况
-            elderlyFlag:null,//有无赡养人【有:1 无:0】
+            elderlyFlag:1,//有无赡养人【有:1 无:0】
             elderlyRelation:'',//与赡养人关系【字典表】
             dependantMobile:'',//赡养人联系电话
             familyInfoRemark:'',//备注
@@ -1143,14 +1143,14 @@ export default {
             joinTime:'',//入党时间yyyy-MM-dd
             positiveTime:'',//转正时间yyyy-MM-dd
             partyOrgId:'',//所属支部
-            flowFlag:null,//是否流动党员：1是，0否
+            flowFlag:1,//是否流动党员：1是，0否
             flowActNum:'',//流动党员活动证号
             partyJob:'',//职务，字典code
-            retiredFlag:null,//是否退休：1是，0否
-            centerFlag:null,//是否党员中心户：1是，0否
+            retiredFlag:1,//是否退休：1是，0否
+            centerFlag:1,//是否党员中心户：1是，0否
             joinBranchName:'',//入党时所在党支部
             joinCommunityTime:'',//组织关系转入社区时间yyyy-MM-dd
-            longHolidayFlag:null,//是否请长假：1是，0否
+            longHolidayFlag:1,//是否请长假：1是，0否
           },
           ensureHouseDto:{//保障房信息
             housingNature:'',//住房性质，字典code
@@ -1166,7 +1166,7 @@ export default {
             employmentNum:'',//再就业优惠证号
             specialSkill:'',//技术特长
             unemploymentReason:'',//失业原因【字典表】code
-            employmentHardFlag:null,//是否就业困难对象；1是0不是
+            employmentHardFlag:1,//是否就业困难对象；1是0不是
             employmentWish:'',//劳动能力就业愿望
           },
           veteranDto:{//退役军人
@@ -1179,7 +1179,7 @@ export default {
             employmentSituation:'',//现就业情况
             joinWarStartTime:'',//参战时间开始日期yyyy-MM-dd
             joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd
-            pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否
+            pubWelfareJobFlag:1,//是否办理公益性岗位;1是0否
           },
           unitedFrontDto:{//统战人员
             duty:'',//职务
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index b65e6d94e..e305aa65a 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -551,10 +551,10 @@ export default {
 			searchH: 0,
 			changeRecordShow: false,
 			pickerOptions: {
-				disabledDate: time => {
-					//设置选择今天以及今天以前的日期
-					return time.getTime() > Date.now() - 8.64e6;
-				}
+				// disabledDate: time => {
+				// 	//设置选择今天以及今天以前的日期
+				// 	return time.getTime() > Date.now() - 8.64e6;
+				// }
 			},
 		};
 	},
diff --git a/src/views/modules/base/smartImport.vue b/src/views/modules/base/smartImport.vue
index 8025cc937..021418329 100644
--- a/src/views/modules/base/smartImport.vue
+++ b/src/views/modules/base/smartImport.vue
@@ -2,7 +2,25 @@
   <div class="g-main">
     <div class="m-table">
       <div class="u-table-btn1">
-
+        <el-dropdown
+          size="small"
+          type="primary"
+          style="margin: 0 10px; height: 30px"
+          trigger="hover"
+        >
+          <el-button type="primary" size="small">
+            表格导入<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"
+              @click.native="handleImportType(item.value)"
+            >
+              {{ item.label }}
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
         <el-upload
           :headers="$getElUploadHeaders()"
           ref="upload"
@@ -17,24 +35,7 @@
           :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-upload>
         <el-button
           class="diy-button--white"
           size="small"
@@ -149,32 +150,31 @@ export default {
       // 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: ""
-		// },
-	  ],
-
+        // {
+        //   index: "key1",
+        //   srcField: "所属房屋",
+        //   exist: true,
+        //   field: "所属房屋",
+        // },
+        // {
+        //   index: "key2",
+        //   srcField: "基础信息",
+        //   exist: true,
+        //   field: "基础信息",
+        // },
+        // {
+        //   index: "key3",
+        //   srcField: "房屋信息",
+        //   exist: false,
+        //   field: "房屋信息",
+        // },
+        // {
+        //   index: "key4",
+        //   srcField: "本地户籍",
+        //   exist: false,
+        //   field: "本地户籍",
+        // },
+      ],
       dataListLoading: false,
       total: 0,
       pageSize: 20,
@@ -196,7 +196,7 @@ export default {
       fileData: null,
       resiClass: [],
 
-	  importType :''
+      importType: "",
     };
   },
 
@@ -214,7 +214,7 @@ export default {
   async mounted() {
     // await this.loadData();
     await this.loadPersonGroup();
-	this.getResident()
+    this.getResident();
 
     this.sHeight = this.$refs.divEditBtn.offsetHeight + 300;
   },
@@ -222,7 +222,9 @@ export default {
     diaClose() {
       this.formShow = false;
     },
-
+    handleDropdownClick(event) {
+      event.stopPropagation();
+    },
     async loadPersonGroup() {
       const url = "/oper/customize/icformitemgroup/list";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
@@ -283,18 +285,14 @@ export default {
         // this.$message.error(msg )
       }
     },
-	handleImportType(command){
-		this.importType = command
-        // this.$refs.upload.click();
-		this.$refs['upload'].$children[0].$refs.input.click()
-	},
+    handleImportType(command) {
+      this.importType = command;
+      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) => {
@@ -367,6 +365,8 @@ export default {
     },
     // 上传大图标成功
     handleExcelSuccess(res, file) {
+      console.log(res, file);
+      if (!res) return;
       if (res.code === 0 && res.msg === "success") {
         console.log("resss---ppp", res);
       } else {
@@ -379,8 +379,8 @@ export default {
 
     beforeExcelUpload(file) {
       console.log("file", file);
-	  console.log(this.importType);
-	
+      console.log(this.importType);
+
       const isType = file.type === "application/vnd.ms-excel";
       const isTypeComputer =
         file.type ===
@@ -395,13 +395,13 @@ export default {
         this.$message.error("上传文件大小不能超过 10MB!");
       }
 
-	 if(!this.importType){
-			this.$message.error('请选择导入的类别') 
-	  }
+      if (!this.importType) {
+        this.$message.error("请选择导入的类别");
+      }
       return fileType && isLt1M;
     },
     async uploadHttpRequest(file) {
-	  if(!this.importType) return
+      if (!this.importType) return;
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
@@ -414,7 +414,7 @@ export default {
           if (res.data.code == 0 && res.data.msg == "success") {
             console.log(res.data.data);
             const data = res.data.data;
-				this.afterSuccess();
+            this.afterSuccess();
             this.dataList = [
               ...Object.keys(data.option.exist).map((k) => {
                 return {
@@ -552,9 +552,9 @@ export default {
   text-align: center;
   color: #aaaaaa;
 }
-::v-deep .upload-btn{
-	.el-button{
-		padding: 7px 20px;
-	}
+::v-deep .upload-btn {
+  .el-button {
+    padding: 7px 20px;
+  }
 }
 </style>