diff --git a/.env.production.sit b/.env.production.sit
index 4c51f6da4..18f137550 100644
--- a/.env.production.sit
+++ b/.env.production.sit
@@ -2,6 +2,6 @@ NODE_ENV=production
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 # VUE_APP_API_SERVER =  http://192.168.1.140/api
 VUE_APP_API_SERVER =  http://219.146.91.110:30801/api
-VUE_APP_BIPASS_API_SERVER =  http://bipaas.elinkservice.cn/linkdata/linkdata-gateway/route
+VUE_APP_BIPASS_API_SERVER = http://bipaas.elinkservice.com:30801/linkdata/linkdata-gateway/route
 VUE_APP_NODE_ENV=prod:sit
 VUE_APP_PUBLIC_PATH=epmet-oper
diff --git a/src/js/util.js b/src/js/util.js
index eef08ea21..94a6c7403 100644
--- a/src/js/util.js
+++ b/src/js/util.js
@@ -2,495 +2,502 @@
 // import FileSaver from 'file-saver'
 // import XLSX from 'xlsx'
 
-var crypto = require('crypto')
-let Base64 = require('js-base64').Base64
-import Vue from 'vue'
+var crypto = require("crypto");
+let Base64 = require("js-base64").Base64;
+import Vue from "vue";
 
 export default {
-  /**
-   *
-   * @param {*} messageObj
-   */
-  validateRule(messageObj) {
-    
-    let message = ''
-    for (var oneObj in messageObj) {
-      if(messageObj[oneObj][0].message){
-        message = message + messageObj[oneObj][0].message + ' <br/> '
-      }
-     
-    }
+	/**
+	 *
+	 * @param {*} messageObj
+	 */
+	validateRule(messageObj) {
+		let message = "";
+		for (var oneObj in messageObj) {
+			if (messageObj[oneObj][0].message) {
+				message = message + messageObj[oneObj][0].message + " <br/> ";
+			}
+		}
 
-    Vue.prototype.$message({
-      dangerouslyUseHTMLString: true,
-      message: message,
-      type: 'error'
-    })
-  },
-  /**
-   * 日期格式化
-   * @param date
-   * @param fmt yyyy-MM-dd hh:mm:ss.SSS week
-   * @param offset：加减天数
-   * @returns {*}
-   */
-  formatDate(date, fmt, offset) {
-    if (!date || !(date instanceof Date)) {
-      return date
-    } else {
-      let d = new Date(date)
-      if (offset) {
-        if (offset.day) {
-          d.setDate(d.getDate() + offset.day)
-        }
-        if (offset.month) {
-          d.setMonth(d.getMonth() + offset.month)
-        }
-      }
-      let _date = {
-        'M+': d.getMonth() + 1, // 月份
-        'd+': d.getDate(), // 日
-        'h+': d.getHours(), // 小时
-        'm+': d.getMinutes(), // 分
-        's+': d.getSeconds(), // 秒
-        'q+': Math.floor((d.getMonth() + 3) / 3), // 季度
-        S: d.getMilliseconds()
-      }
-      if (/(y+)/.test(fmt)) {
-        fmt = fmt.replace(
-          RegExp.$1,
-          (d.getFullYear() + '').substr(4 - RegExp.$1.length)
-        )
-      }
-      for (let _d in _date) {
-        if (new RegExp('(' + _d + ')').test(fmt)) {
-          fmt = fmt.replace(
-            RegExp.$1,
-            RegExp.$1.length === 1
-              ? _date[_d]
-              : ('00' + _date[_d]).substr(('' + _date[_d]).length)
-          )
-        }
-      }
-      if (/(week)/.test(fmt)) {
-        const weeks = ['日', '一', '二', '三', '四', '五', '六']
-        fmt = fmt.replace(RegExp.$1, '星期' + weeks[d.getDay()])
-      }
-      return fmt
-    }
-  },
+		Vue.prototype.$message({
+			dangerouslyUseHTMLString: true,
+			message: message,
+			type: "error",
+		});
+	},
+	/**
+	 * 日期格式化
+	 * @param date
+	 * @param fmt yyyy-MM-dd hh:mm:ss.SSS week
+	 * @param offset：加减天数
+	 * @returns {*}
+	 */
+	formatDate(date, fmt, offset) {
+		if (!date || !(date instanceof Date)) {
+			return date;
+		} else {
+			let d = new Date(date);
+			if (offset) {
+				if (offset.day) {
+					d.setDate(d.getDate() + offset.day);
+				}
+				if (offset.month) {
+					d.setMonth(d.getMonth() + offset.month);
+				}
+			}
+			let _date = {
+				"M+": d.getMonth() + 1, // 月份
+				"d+": d.getDate(), // 日
+				"h+": d.getHours(), // 小时
+				"m+": d.getMinutes(), // 分
+				"s+": d.getSeconds(), // 秒
+				"q+": Math.floor((d.getMonth() + 3) / 3), // 季度
+				S: d.getMilliseconds(),
+			};
+			if (/(y+)/.test(fmt)) {
+				fmt = fmt.replace(
+					RegExp.$1,
+					(d.getFullYear() + "").substr(4 - RegExp.$1.length)
+				);
+			}
+			for (let _d in _date) {
+				if (new RegExp("(" + _d + ")").test(fmt)) {
+					fmt = fmt.replace(
+						RegExp.$1,
+						RegExp.$1.length === 1
+							? _date[_d]
+							: ("00" + _date[_d]).substr(("" + _date[_d]).length)
+					);
+				}
+			}
+			if (/(week)/.test(fmt)) {
+				const weeks = ["日", "一", "二", "三", "四", "五", "六"];
+				fmt = fmt.replace(RegExp.$1, "星期" + weeks[d.getDay()]);
+			}
+			return fmt;
+		}
+	},
 
-  /**
-   * 获取当月第一天
-   * @param key
-   * @param value
-   */
-  getFirstDayOfMonth(date) {
-    date.setDate(1)
-    return this.timeFormat(date)
-  },
+	/**
+	 * 获取当月第一天
+	 * @param key
+	 * @param value
+	 */
+	getFirstDayOfMonth(date) {
+		date.setDate(1);
+		return this.timeFormat(date);
+	},
 
-  timeFormat(date) {
-    if (!date || typeof date === 'string') {
-      this.error('参数异常，请检查...')
-    }
-    var y = date.getFullYear() //年
-    var m = date.getMonth() + 1 //月
-    if (m < 10) m = '0' + m
-    var d = date.getDate() //日
-    if (d < 10) d = '0' + d
+	timeFormat(date) {
+		if (!date || typeof date === "string") {
+			this.error("参数异常，请检查...");
+		}
+		var y = date.getFullYear(); //年
+		var m = date.getMonth() + 1; //月
+		if (m < 10) m = "0" + m;
+		var d = date.getDate(); //日
+		if (d < 10) d = "0" + d;
 
-    return y + '-' + m + '-' + d
-  },
+		return y + "-" + m + "-" + d;
+	},
 
-  /**
-   * 获取当月第一天
-   * @param key
-   * @param value
-   */
-  getFirstDayOfMonth(date) {
-    date.setDate(1)
-    return this.timeFormat(date)
-  },
+	/**
+	 * 获取当月第一天
+	 * @param key
+	 * @param value
+	 */
+	getFirstDayOfMonth(date) {
+		date.setDate(1);
+		return this.timeFormat(date);
+	},
 
-  timeFormat(date) {
-    if (!date || typeof date === 'string') {
-      this.error('参数异常，请检查...')
-    }
-    var y = date.getFullYear() //年
-    var m = date.getMonth() + 1 //月
-    if (m < 10) m = '0' + m
-    var d = date.getDate() //日
-    if (d < 10) d = '0' + d
+	timeFormat(date) {
+		if (!date || typeof date === "string") {
+			this.error("参数异常，请检查...");
+		}
+		var y = date.getFullYear(); //年
+		var m = date.getMonth() + 1; //月
+		if (m < 10) m = "0" + m;
+		var d = date.getDate(); //日
+		if (d < 10) d = "0" + d;
 
-    return y + '-' + m + '-' + d
-  },
+		return y + "-" + m + "-" + d;
+	},
 
-  //日期时间格式转化工具类
-  dateFormatter(str,type) {
-    //默认返回yyyy-MM-dd HH-mm-ss
-    var hasTime = arguments[1] != false ? true : false //可传第二个参数false，返回yyyy-MM-dd
-    var d = new Date(str)
-    var year = d.getFullYear()
-    var month =
-      d.getMonth() + 1 < 10 ? '0' + (d.getMonth() + 1) : d.getMonth() + 1
-    var day = d.getDate() < 10 ? '0' + d.getDate() : d.getDate()
-    var hour = d.getHours() < 10 ? '0' + d.getHours() : d.getHours()
-    var minute = d.getMinutes() < 10 ? '0' + d.getMinutes() : d.getMinutes()
-    var second = d.getSeconds() < 10 ? '0' + d.getSeconds() : d.getSeconds()
-    if (type==='time' && hasTime) {
-      return (
-        [year, month, day].join('-') + ' ' + [hour, minute, second].join(':')
-      )
-    } else {
-      return [year, month, day].join('-')
-    }
-  },
+	//日期时间格式转化工具类
+	dateFormatter(str, type) {
+		//默认返回yyyy-MM-dd HH-mm-ss
+		var hasTime = arguments[1] != false ? true : false; //可传第二个参数false，返回yyyy-MM-dd
+		var d = new Date(str);
+		var year = d.getFullYear();
+		var month =
+			d.getMonth() + 1 < 10 ? "0" + (d.getMonth() + 1) : d.getMonth() + 1;
+		var day = d.getDate() < 10 ? "0" + d.getDate() : d.getDate();
+		var hour = d.getHours() < 10 ? "0" + d.getHours() : d.getHours();
+		var minute =
+			d.getMinutes() < 10 ? "0" + d.getMinutes() : d.getMinutes();
+		var second =
+			d.getSeconds() < 10 ? "0" + d.getSeconds() : d.getSeconds();
+		if (type === "time" && hasTime) {
+			return (
+				[year, month, day].join("-") +
+				" " +
+				[hour, minute, second].join(":")
+			);
+		} else {
+			return [year, month, day].join("-");
+		}
+	},
 
-  /**
-   * 本地LocalStorage获取
-   * @param value
-   */
-  getLocalStorage(key) {
-    if (arguments.length === 0) {
-      app.logger.warn('没有参数')
-      return
-    }
-    if (!window || !window.localStorage) {
-      app.logger.error('您开启了秘密浏览或无痕浏览模式，请关闭!')
-      return
-    }
+	/**
+	 * 本地LocalStorage获取
+	 * @param value
+	 */
+	getLocalStorage(key) {
+		if (arguments.length === 0) {
+			app.logger.warn("没有参数");
+			return;
+		}
+		if (!window || !window.localStorage) {
+			app.logger.error("您开启了秘密浏览或无痕浏览模式，请关闭!");
+			return;
+		}
 
-    return window.localStorage.getItem(key)
-  },
-  /**
-   * 本地LocalStorage存储
-   * @param key
-   * @param value
-   */
-  setLocalStorage(key, value) {
-    if (
-      arguments.length === 0 ||
-      arguments.length === 1 ||
-      typeof value === 'undefined'
-    ) {
-      app.logger.warn('传参错误')
-      return
-    }
-    if (!window || !window.localStorage) {
-      app.logger.error('您开启了秘密浏览或无痕浏览模式，请关闭!')
-      return
-    }
-    if (typeof value === 'object') {
-      window.localStorage.setItem(key, JSON.stringify(value))
-    } else {
-      window.localStorage.setItem(key, value)
-    }
-  },
-  /**
-   * 本地LocalStorage删除
-   * @param value
-   */
-  delLocalStorage(key) {
-    if (arguments.length === 0) {
-      app.logger.warn('没有参数')
-      return
-    }
-    if (!window || !window.localStorage) {
-      app.logger.error('您开启了秘密浏览或无痕浏览模式，请关闭!')
-      return
-    }
-    window.localStorage.removeItem(key)
-  },
-  /**
-   * 本地SessionStorage存储
-   * @param key
-   * @param value
-   */
-  sessionStorage(key) {
-    if (arguments.length === 0) {
-      app.logger.warn('没有参数')
-      return
-    }
-    if (!window || !window.sessionStorage) {
-      app.logger.error('您开启了秘密浏览或无痕浏览模式，请关闭!')
-      return
-    }
-    if (arguments.length === 1 || typeof value === 'undefined') {
-      return window.sessionStorage.getItem(key)
-    } else if (value === null || value === '') {
-      window.sessionStorage.removeItem(key)
-    } else if (typeof value === 'object') {
-      window.sessionStorage.setItem(key, JSON.stringify(value))
-    } else {
-      window.sessionStorage.setItem(key, value)
-    }
-  },
-  /**
-   * 获取本地SessionStorage存储
-   * @param key
-   */
-  getSessionStorage(key) {
-    if (key != '') {
-      return window.sessionStorage.getItem(key)
-    } else {
-      return ''
-    }
-  },
-  /**
-   * MD5加密
-   * @param data
-   * @param salt
-   * @returns {*}
-   */
-  md5(data, salt) {
-    if (!salt) {
-      salt = app.config.setting.salt
-    }
-    let md5 = crypto.createHash('md5')
-    return md5.update(data + salt).digest('hex')
-  },
+		return window.localStorage.getItem(key);
+	},
+	/**
+	 * 本地LocalStorage存储
+	 * @param key
+	 * @param value
+	 */
+	setLocalStorage(key, value) {
+		if (
+			arguments.length === 0 ||
+			arguments.length === 1 ||
+			typeof value === "undefined"
+		) {
+			app.logger.warn("传参错误");
+			return;
+		}
+		if (!window || !window.localStorage) {
+			app.logger.error("您开启了秘密浏览或无痕浏览模式，请关闭!");
+			return;
+		}
+		if (typeof value === "object") {
+			window.localStorage.setItem(key, JSON.stringify(value));
+		} else {
+			window.localStorage.setItem(key, value);
+		}
+	},
+	/**
+	 * 本地LocalStorage删除
+	 * @param value
+	 */
+	delLocalStorage(key) {
+		if (arguments.length === 0) {
+			app.logger.warn("没有参数");
+			return;
+		}
+		if (!window || !window.localStorage) {
+			app.logger.error("您开启了秘密浏览或无痕浏览模式，请关闭!");
+			return;
+		}
+		window.localStorage.removeItem(key);
+	},
+	/**
+	 * 本地SessionStorage存储
+	 * @param key
+	 * @param value
+	 */
+	sessionStorage(key) {
+		if (arguments.length === 0) {
+			app.logger.warn("没有参数");
+			return;
+		}
+		if (!window || !window.sessionStorage) {
+			app.logger.error("您开启了秘密浏览或无痕浏览模式，请关闭!");
+			return;
+		}
+		if (arguments.length === 1 || typeof value === "undefined") {
+			return window.sessionStorage.getItem(key);
+		} else if (value === null || value === "") {
+			window.sessionStorage.removeItem(key);
+		} else if (typeof value === "object") {
+			window.sessionStorage.setItem(key, JSON.stringify(value));
+		} else {
+			window.sessionStorage.setItem(key, value);
+		}
+	},
+	/**
+	 * 获取本地SessionStorage存储
+	 * @param key
+	 */
+	getSessionStorage(key) {
+		if (key != "") {
+			return window.sessionStorage.getItem(key);
+		} else {
+			return "";
+		}
+	},
+	/**
+	 * MD5加密
+	 * @param data
+	 * @param salt
+	 * @returns {*}
+	 */
+	md5(data, salt) {
+		if (!salt) {
+			salt = app.config.setting.salt;
+		}
+		let md5 = crypto.createHash("md5");
+		return md5.update(data + salt).digest("hex");
+	},
 
-  /**
-   * base64加密
-   * @param param
-   * @returns {*}
-   */
-  base64Encode(code) {
-    if (code != '') {
-      return Base64.encode(code)
-    } else {
-      return code
-    }
-  },
-  /**
-   * 验证
-   * @param type
-   * @param value
-   * @returns {boolean}
-   */
-  validate(type, value) {
-    let pattern
-    switch (type) {
-      case 'ip':
-        // 一个IP字串，由四段组成，每一段是0～255的数字，段与段之间用小数点隔开
-        // 0～9 \d 单个数字
-        // 10～99 [1-9]\d 两位数
-        // 100～199 1\d\d 百位为1的三位数
-        // 200～249 2[0-4]\d 三位数，百位是2，十位是0～9
-        // 250～255 25[0-5] 三位数，百位是2，十位是5，个位是0～5
-        pattern = /^(([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.){3}([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])$/
-        return pattern.test(value)
-      case 'domain':
-        // 一个完整的域名，由根域、顶级域、二级、三级……域名构成，每级域名之间用点分开，每级域名由字母、数字和减号构成（第一个字母不能是减号），不区分大小写，长度不超过63
-        // 单独的名字可以由正则表达式[a-zA-Z0-9][-a-zA-Z0-9]{0,62}来匹配，而完整的域名至少包括两个名字（比如google.com，由google和com构成），最后可以有一个表示根域的点（在规范中，最后有一个点的才是完整域名，但一般认为包括两个以上名字的域名也是完整域名，哪怕它后面没有点）
-        pattern = /^[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+\.?$/
-        return pattern.test(value)
-      case 'serverPort1':
-        pattern = /^([1-9]\d{0,3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/
-        return pattern.test(value)
-      case 'paymentNo':
-        pattern = /^[\s\S]{0,16}$/
-        return pattern.test(value)
-    }
-    return false
-  },
-  /**
-   * 校验 IP地址、网关是否在同一个网段
-   * @param ip
-   * @param gateway
-   * @param mask
-   * @returns {boolean}
-   */
-  checkIpMask(ip, gateway, mask) {
-    let ips = ip.split('.')
-    let gateways = gateway.split('.')
-    let masks = mask.split('.')
-    for (let i = 0, len = masks.length; i < len; i++) {
-      let _mask = masks[i]
-      if (_mask === '255') {
-        if ((parseInt(ips[i]) & 255) !== parseInt(gateways[i])) {
-          return false
-        }
-      }
-    }
-    return true
-  },
-  /**
-   * 是否移动端访问
-   * @return {boolean}
-   */
-  mobile() {
-    const userAgent = navigator.userAgent // 取得浏览器的userAgent字符串
-    if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(userAgent)) {
-      return true
-    }
-    return false
-  },
-  // 表单验证：
-  /*
-   * type 格式 number string(数字和字母) tel float
-   * num 长度
-   */
-  validateForm(type, num) {
-    if (type == 'string') {
-      if (num) {
-        return new RegExp('^[0-9a-zA-Z]{' + num + '}$')
-      } else {
-        return /^[0-9a-zA-Z]*$/
-      }
-    } else if (type == 'tel') {
-      return /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/
-    } else if (type == 'number') {
-      // 数字类型
-      if (num) {
-        return new RegExp('^[0-9]{' + num + '}$')
-      } else {
-        return /^[0-9]*$/
-      }
-    } else if (type == 'float') {
-      if (num) {
-        return new RegExp(
-          '^(([1-9][0-9]*)|(([0].d{' + num + '}|[1-9][0-9]*.d{1,2})))$'
-        )
-      } else {
-        return /^(([1-9][0-9]*)|(([0]|[0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/
-      }
-    } else if (type == 'any') {
-      return /^[^ ]+$/
-    } else if (type == 'user') {
-      return /^[a-zA-Z0-9_-]{2,16}$/
-    } else if (type == 'phone') {
-      //手机号码
-      return /^1\d{10}$/
-    } else if (type == 'email') {
-      //email
-      return /^[a-zA-Z0-9_-]+@([a-zA-Z0-9]+\.)+(com|cn|net|org)$/
-    } else if (type == 'identifyno') {
-      //身份证号
-      return /^[1-9][0-9]{5}([1][9][0-9]{2}|[2][0][0|1][0-9])([0][1-9]|[1][0|1|2])([0][1-9]|[1|2][0-9]|[3][0|1])[0-9]{3}([0-9]|[X])$/
-    }
-  },
-  debounce(func, wait, immediate) {
-    let timeout, args, context, timestamp, result
+	/**
+	 * base64加密
+	 * @param param
+	 * @returns {*}
+	 */
+	base64Encode(code) {
+		if (code != "") {
+			return Base64.encode(code);
+		} else {
+			return code;
+		}
+	},
+	/**
+	 * 验证
+	 * @param type
+	 * @param value
+	 * @returns {boolean}
+	 */
+	validate(type, value) {
+		let pattern;
+		switch (type) {
+			case "ip":
+				// 一个IP字串，由四段组成，每一段是0～255的数字，段与段之间用小数点隔开
+				// 0～9 \d 单个数字
+				// 10～99 [1-9]\d 两位数
+				// 100～199 1\d\d 百位为1的三位数
+				// 200～249 2[0-4]\d 三位数，百位是2，十位是0～9
+				// 250～255 25[0-5] 三位数，百位是2，十位是5，个位是0～5
+				pattern =
+					/^(([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.){3}([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])$/;
+				return pattern.test(value);
+			case "domain":
+				// 一个完整的域名，由根域、顶级域、二级、三级……域名构成，每级域名之间用点分开，每级域名由字母、数字和减号构成（第一个字母不能是减号），不区分大小写，长度不超过63
+				// 单独的名字可以由正则表达式[a-zA-Z0-9][-a-zA-Z0-9]{0,62}来匹配，而完整的域名至少包括两个名字（比如google.com，由google和com构成），最后可以有一个表示根域的点（在规范中，最后有一个点的才是完整域名，但一般认为包括两个以上名字的域名也是完整域名，哪怕它后面没有点）
+				pattern =
+					/^[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+\.?$/;
+				return pattern.test(value);
+			case "serverPort1":
+				pattern =
+					/^([1-9]\d{0,3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/;
+				return pattern.test(value);
+			case "paymentNo":
+				pattern = /^[\s\S]{0,16}$/;
+				return pattern.test(value);
+		}
+		return false;
+	},
+	/**
+	 * 校验 IP地址、网关是否在同一个网段
+	 * @param ip
+	 * @param gateway
+	 * @param mask
+	 * @returns {boolean}
+	 */
+	checkIpMask(ip, gateway, mask) {
+		let ips = ip.split(".");
+		let gateways = gateway.split(".");
+		let masks = mask.split(".");
+		for (let i = 0, len = masks.length; i < len; i++) {
+			let _mask = masks[i];
+			if (_mask === "255") {
+				if ((parseInt(ips[i]) & 255) !== parseInt(gateways[i])) {
+					return false;
+				}
+			}
+		}
+		return true;
+	},
+	/**
+	 * 是否移动端访问
+	 * @return {boolean}
+	 */
+	mobile() {
+		const userAgent = navigator.userAgent; // 取得浏览器的userAgent字符串
+		if (/Android|webOS|iPhone|iPod|BlackBerry/i.test(userAgent)) {
+			return true;
+		}
+		return false;
+	},
+	// 表单验证：
+	/*
+	 * type 格式 number string(数字和字母) tel float
+	 * num 长度
+	 */
+	validateForm(type, num) {
+		if (type == "string") {
+			if (num) {
+				return new RegExp("^[0-9a-zA-Z]{" + num + "}$");
+			} else {
+				return /^[0-9a-zA-Z]*$/;
+			}
+		} else if (type == "tel") {
+			return /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/;
+		} else if (type == "number") {
+			// 数字类型
+			if (num) {
+				return new RegExp("^[0-9]{" + num + "}$");
+			} else {
+				return /^[0-9]*$/;
+			}
+		} else if (type == "float") {
+			if (num) {
+				return new RegExp(
+					"^(([1-9][0-9]*)|(([0].d{" +
+						num +
+						"}|[1-9][0-9]*.d{1,2})))$"
+				);
+			} else {
+				return /^(([1-9][0-9]*)|(([0]|[0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;
+			}
+		} else if (type == "any") {
+			return /^[^ ]+$/;
+		} else if (type == "user") {
+			return /^[a-zA-Z0-9_-]{2,16}$/;
+		} else if (type == "phone") {
+			//手机号码
+			return /^1\d{10}$/;
+		} else if (type == "email") {
+			//email
+			return /^[a-zA-Z0-9_-]+@([a-zA-Z0-9]+\.)+(com|cn|net|org)$/;
+		} else if (type == "identifyno") {
+			//身份证号
+			return /^[1-9][0-9]{5}([1][9][0-9]{2}|[2][0][0|1][0-9])([0][1-9]|[1][0|1|2])([0][1-9]|[1|2][0-9]|[3][0|1])[0-9]{3}([0-9]|[X])$/;
+		}
+	},
+	debounce(func, wait, immediate) {
+		let timeout, args, context, timestamp, result;
 
-    const later = function() {
-      // 据上一次触发时间间隔
-      const last = +new Date() - timestamp
+		const later = function () {
+			// 据上一次触发时间间隔
+			const last = +new Date() - timestamp;
 
-      // 上次被包装函数被调用时间间隔last小于设定时间间隔wait
-      if (last < wait && last > 0) {
-        timeout = setTimeout(later, wait - last)
-      } else {
-        timeout = null
-        // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
-        if (!immediate) {
-          result = func.apply(context, args)
-          if (!timeout) context = args = null
-        }
-      }
-    }
+			// 上次被包装函数被调用时间间隔last小于设定时间间隔wait
+			if (last < wait && last > 0) {
+				timeout = setTimeout(later, wait - last);
+			} else {
+				timeout = null;
+				// 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
+				if (!immediate) {
+					result = func.apply(context, args);
+					if (!timeout) context = args = null;
+				}
+			}
+		};
 
-    return function(...args) {
-      context = this
-      timestamp = +new Date()
-      const callNow = immediate && !timeout
-      // 如果延时不存在，重新设定延时
-      if (!timeout) timeout = setTimeout(later, wait)
-      if (callNow) {
-        result = func.apply(context, args)
-        context = args = null
-      }
+		return function (...args) {
+			context = this;
+			timestamp = +new Date();
+			const callNow = immediate && !timeout;
+			// 如果延时不存在，重新设定延时
+			if (!timeout) timeout = setTimeout(later, wait);
+			if (callNow) {
+				result = func.apply(context, args);
+				context = args = null;
+			}
 
-      return result
-    }
-  },
-  /**
-   *map转化为对象object（map所有键都是字符串，可以将其转换为对象）
-   */
-  strMapToObj(strMap) {
-    //debugger;
-    let obj = Object.create(null)
-    for (let [k, v] of strMap) {
-      obj[k] = v
-    }
-    return obj
-  },
-  /**
-   *对象object转换为Map
-   */
-  objToStrMap(obj) {
-    let strMap = new Map()
-    for (let k of Object.keys(obj)) {
-      strMap.set(k, obj[k])
-    }
-    return strMap
-  },
-  /**
-   * 提示消息:response响应，message提示消息，type消息类型
-   */
-  showMessage(showClose = true, message = '操作失败', type = 'error') {
-    vm.$message({
-      showClose: showClose,
-      message: `${message}`,
-      type: type
-    })
-  },
-  // exportExcel(name, dom) {
-  //   //导出excel
-  //   let wb = XLSX.utils.table_to_book(document.querySelector(dom))
-  //   let wbout = XLSX.write(wb, {
-  //     bookType: 'xlsx',
-  //     bookSST: true,
-  //     type: 'array'
-  //   })
-  //   try {
-  //     FileSaver.saveAs(
-  //       new Blob([wbout], {
-  //         type: 'application/octet-stream'
-  //       }),
-  //       name + '.xlsx'
-  //     )
-  //   } catch (e) {
-  //     if (typeof console !== 'undefined') console.log(e, wbout)
-  //   }
-  //   return wbout
-  // },
-  //获取浏览器类型
-  agentType() {
-    //debugger;
-    var userAgent = navigator.userAgent //取得浏览器的userAgent字符串
-    var isOpera = userAgent.indexOf('Opera') > -1
-    if (isOpera) {
-      return 'Opera'
-    } //判断是否Opera浏览器
-    if (userAgent.indexOf('Firefox') > -1) {
-      return 'FF'
-    } //判断是否Firefox浏览器
-    if (userAgent.indexOf('Chrome') > -1) {
-      return 'Chrome'
-    }
-    if (userAgent.indexOf('Safari') > -1) {
-      return 'Safari'
-    } //判断是否Safari浏览器
-    if (userAgent.indexOf('Trident') > -1) {
-      //	debugger;
-      return 'IE'
-    } //判断是否IE浏览器
-  },
+			return result;
+		};
+	},
+	/**
+	 *map转化为对象object（map所有键都是字符串，可以将其转换为对象）
+	 */
+	strMapToObj(strMap) {
+		//debugger;
+		let obj = Object.create(null);
+		for (let [k, v] of strMap) {
+			obj[k] = v;
+		}
+		return obj;
+	},
+	/**
+	 *对象object转换为Map
+	 */
+	objToStrMap(obj) {
+		let strMap = new Map();
+		for (let k of Object.keys(obj)) {
+			strMap.set(k, obj[k]);
+		}
+		return strMap;
+	},
+	/**
+	 * 提示消息:response响应，message提示消息，type消息类型
+	 */
+	showMessage(showClose = true, message = "操作失败", type = "error") {
+		vm.$message({
+			showClose: showClose,
+			message: `${message}`,
+			type: type,
+		});
+	},
+	// exportExcel(name, dom) {
+	//   //导出excel
+	//   let wb = XLSX.utils.table_to_book(document.querySelector(dom))
+	//   let wbout = XLSX.write(wb, {
+	//     bookType: 'xlsx',
+	//     bookSST: true,
+	//     type: 'array'
+	//   })
+	//   try {
+	//     FileSaver.saveAs(
+	//       new Blob([wbout], {
+	//         type: 'application/octet-stream'
+	//       }),
+	//       name + '.xlsx'
+	//     )
+	//   } catch (e) {
+	//     if (typeof console !== 'undefined') console.log(e, wbout)
+	//   }
+	//   return wbout
+	// },
+	//获取浏览器类型
+	agentType() {
+		//debugger;
+		var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+		var isOpera = userAgent.indexOf("Opera") > -1;
+		if (isOpera) {
+			return "Opera";
+		} //判断是否Opera浏览器
+		if (userAgent.indexOf("Firefox") > -1) {
+			return "FF";
+		} //判断是否Firefox浏览器
+		if (userAgent.indexOf("Chrome") > -1) {
+			return "Chrome";
+		}
+		if (userAgent.indexOf("Safari") > -1) {
+			return "Safari";
+		} //判断是否Safari浏览器
+		if (userAgent.indexOf("Trident") > -1) {
+			//	debugger;
+			return "IE";
+		} //判断是否IE浏览器
+	},
 
-  //接口验证token
-  async interfaceToken(interface_token) {
-    //没有保存token 调用接口获取
-    if (!this.sessionStorage('KEY_ACCESS_TOKEN')) {
-      let ret = false
-      var params = {}
-      var tockenUrl = ''
-      var username = ''
-      //第三方调用密码默认为admin
-      var userpass = 'admin'
-      var password = this.md5(userpass, app.config.setting.salt)
-      /*
+	//接口验证token
+	async interfaceToken(interface_token) {
+		//没有保存token 调用接口获取
+		if (!this.sessionStorage("KEY_ACCESS_TOKEN")) {
+			let ret = false;
+			var params = {};
+			var tockenUrl = "";
+			var username = "";
+			//第三方调用密码默认为admin
+			var userpass = "admin";
+			var password = this.md5(userpass, app.config.setting.salt);
+			/*
       if(arguments.length === 0 || typeof interface_token === 'undefined'){				
       	params = {
       		grant_type: "password",
@@ -500,71 +507,80 @@ export default {
       	};
       }else{
       	*/
-      params = {
-        grant_type: 'password',
-        esapikey: interface_token,
-        username: username,
-        password: password,
-        scope: 'all'
-      }
-      //}
-      tockenUrl = app.api.common.loadToken
-      await app.ajax.interfacetokenPost(
-        // 暂时固定url，防止前后端对接时，更改url无法登陆
-        tockenUrl,
-        params,
-        (data) => {
-          var access_token = data.access_token //访问令牌
-          var token_type = data.token_type //令牌类型，必须为bearer
-          var refresh_token = data.refresh_token //刷新令牌，当访问令牌过期可使用刷新令牌获取新的访问令牌，刷新令牌的默认为15天，可设置
-          var expires_in = data.expires_in //访问令牌的失效，1800秒，可设置
-          var scope = data.scope //第三方权限范围
-          var jti = data.jti //jwt的唯一身份标识，主要用来作为一次性token,从而回避重放攻击
-          var userName = data.userExtraMessage.userName //用户名
-          var userId = data.userExtraMessage.userId //用户id
-          var userType = data.userExtraMessage.userType //用户类型
+			params = {
+				grant_type: "password",
+				esapikey: interface_token,
+				username: username,
+				password: password,
+				scope: "all",
+			};
+			//}
+			tockenUrl = app.api.common.loadToken;
+			await app.ajax.interfacetokenPost(
+				// 暂时固定url，防止前后端对接时，更改url无法登陆
+				tockenUrl,
+				params,
+				(data) => {
+					var access_token = data.access_token; //访问令牌
+					var token_type = data.token_type; //令牌类型，必须为bearer
+					var refresh_token = data.refresh_token; //刷新令牌，当访问令牌过期可使用刷新令牌获取新的访问令牌，刷新令牌的默认为15天，可设置
+					var expires_in = data.expires_in; //访问令牌的失效，1800秒，可设置
+					var scope = data.scope; //第三方权限范围
+					var jti = data.jti; //jwt的唯一身份标识，主要用来作为一次性token,从而回避重放攻击
+					var userName = data.userExtraMessage.userName; //用户名
+					var userId = data.userExtraMessage.userId; //用户id
+					var userType = data.userExtraMessage.userType; //用户类型
 
-          // 存到sessionStorage
-          this.sessionStorage('KEY_USERID', userId)
-          this.sessionStorage('KEY_USERNAME', userName)
-          this.sessionStorage('KEY_ACCESS_TOKEN', access_token)
-          this.sessionStorage('KEY_TOKEN_TYPE', token_type)
-          this.sessionStorage(
-            'KEY_EXPIRES_IN',
-            new Date().getTime() + (expires_in - 300) * 1000
-          )
-          this.sessionStorage('KEY_REFRESH_TOKEN', refresh_token)
-          this.sessionStorage('USER_TYPE', userType)
-          this.sessionStorage('HOME_TYPE', '1')
+					// 存到sessionStorage
+					this.sessionStorage("KEY_USERID", userId);
+					this.sessionStorage("KEY_USERNAME", userName);
+					this.sessionStorage("KEY_ACCESS_TOKEN", access_token);
+					this.sessionStorage("KEY_TOKEN_TYPE", token_type);
+					this.sessionStorage(
+						"KEY_EXPIRES_IN",
+						new Date().getTime() + (expires_in - 300) * 1000
+					);
+					this.sessionStorage("KEY_REFRESH_TOKEN", refresh_token);
+					this.sessionStorage("USER_TYPE", userType);
+					this.sessionStorage("HOME_TYPE", "1");
 
-          this.sessionStorage('tenantCode', '')
-          //开启token刷新计时器
-          app.auth.refreshTokenTimer()
-          ret = true
-        }
-      )
-      return ret
-    } else {
-      return true
-    }
-  },
+					this.sessionStorage("tenantCode", "");
+					//开启token刷新计时器
+					app.auth.refreshTokenTimer();
+					ret = true;
+				}
+			);
+			return ret;
+		} else {
+			return true;
+		}
+	},
 
-  //表格vue  接口页面不需要减去  title高度
-  titleHeight() {
-    if (
-      this.sessionStorage('es_interface') === null ||
-      this.sessionStorage('es_interface') === ''
-    ) {
-      return 90
-    } else {
-      return 0
-    }
-  },
-  // 换肤加class函数
-  toggleClass(element, className) {
-    if (!element || !className) {
-      return
-    }
-    element.className = className
-  }
-}
+	//表格vue  接口页面不需要减去  title高度
+	titleHeight() {
+		if (
+			this.sessionStorage("es_interface") === null ||
+			this.sessionStorage("es_interface") === ""
+		) {
+			return 90;
+		} else {
+			return 0;
+		}
+	},
+	// 换肤加class函数
+	toggleClass(element, className) {
+		if (!element || !className) {
+			return;
+		}
+		element.className = className;
+	},
+
+	// 大写下划线转驼峰
+	capitalToHump(str) {
+		return str
+			.toLowerCase()
+			.replace(/([^_])(?:_+([^_]))/g, function ($0, $1, $2) {
+				return $1 + $2.toUpperCase();
+			});
+	},
+};
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 298717546..37c3843d4 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -392,7 +392,7 @@ export default {
         callback(new Error('请输入证件号'))
       } else {
         if (!isCard(value)) {
-          callback(new Error('请输入正确的身份证号或护照号'))
+          callback(new Error('请输入正确的证件号或护照号'))
         }
         callback()
       }
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 2015ecae9..c330573fb 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -232,9 +232,11 @@
                                       size="small"
                                       v-model="form[itemj.id][itemk.formName]">
                                         <el-checkbox v-for="items in itemk.opction" 
-                                                     :label="items.label != itemk.label ? items.label :''"  
+                                                     :label="items.value"  
                                                      :style="{'margin-right':items.label != itemk.label? '' :'19px'}"   
-                                                     :key="items.label"></el-checkbox>
+                                                     :key="items.value"
+                                                     :value="items.value"
+                                                     >{{items.label}}</el-checkbox>
                                     </el-checkbox-group>
                                   </template>
                                   <template v-else-if="itemk.itemType == 'datepicker1'">
@@ -255,7 +257,9 @@
                                               :options="itemk.opction"
                                               clearable
                                               size="small"
-
+                                              :label="itemk.opction.label"
+                                              :value="itemk.opction.value"
+                                              @change="handleCateSlect"
                                               ></el-cascader>
                                 </template>
                                 <template v-else-if="itemk.itemType == 'number'">
@@ -1598,7 +1602,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    // 身份证号失去焦点事件
+    // 证件号失去焦点事件
     handleValidBlur (item) {
         console.log('n---', item)
         if (item.formName !== 'idNum') return
diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue
index b54561fe4..db8aa5cb9 100644
--- a/src/views/components/resiInfo.vue
+++ b/src/views/components/resiInfo.vue
@@ -444,68 +444,7 @@
                               </el-col>
                           </el-row>
                       </el-tab-pane>
-                      <el-tab-pane label="迁出" v-if="qcShowStatus">
-                        <el-row>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">迁出日期	 :</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.outOfTime?residentMoveOutRecordObj.outOfTime.substr(0,10):'--':'--'}}</span> 
-                               </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">迁出类型	:</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.type	?residentMoveOutRecordObj.type	:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">迁出原因	:</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.reason	?residentMoveOutRecordObj.reason:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                          </el-row>
-                          <el-row>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">迁出至组织		 :</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.deptId?residentMoveOutRecordObj.deptId:'--':'--'}}</span> 
-                               </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">小区	:</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.villageName	?residentMoveOutRecordObj.villageName	:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">楼号		:</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.buildName	?residentMoveOutRecordObj.buildName:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                          </el-row>
-                          <el-row>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">单元		 :</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.unitName	?residentMoveOutRecordObj.unitName	:'--':'--'}}</span> 
-                               </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">房屋	:</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.homeName	?residentMoveOutRecordObj.homeName	:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                              <el-col :span="8">
-                                <div class="f-flex f-bto16 f-top24">
-                                   <div class="f-labels">外迁地址 :</div>  
-                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.address	?residentMoveOutRecordObj.address:'--':'--'}}</span> 
-                                </div>
-                              </el-col>
-                          </el-row>
-                      </el-tab-pane>
+                     
                       <el-tab-pane label="更新记录">
                         <el-table
                           class="m-table-item"
@@ -538,6 +477,7 @@
       
       </el-table>
                       </el-tab-pane>
+                     
                       <el-tab-pane label="党员"  v-if="dyShowStatus">
                         <el-row>
                               <el-col :span="8">
@@ -826,7 +766,8 @@
                                   --
                                </span>
                          </section>
-                      </el-tab-pane>    <el-tab-pane label="死亡人员"  v-if="resiDetailObj.deathFlag">
+                      </el-tab-pane>    
+                      <el-tab-pane label="死亡人员"  v-if="resiDetailObj.deathFlag">
                         <el-row>
                               <el-col :span="8">
                                 <div class="f-flex f-bto16 f-top24">
@@ -856,6 +797,68 @@
                               </el-col>
                           </el-row>
                       </el-tab-pane>
+                      <el-tab-pane label="迁出" v-if="qcShowStatus">
+                        <el-row>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">迁出日期	 :</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.outOfTime?residentMoveOutRecordObj.outOfTime.substr(0,10):'--':'--'}}</span> 
+                               </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">迁出类型	:</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.type	?residentMoveOutRecordObj.type	:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">迁出原因	:</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.reason	?residentMoveOutRecordObj.reason:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                          </el-row>
+                          <el-row>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">迁出至组织		 :</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.deptId?residentMoveOutRecordObj.deptId:'--':'--'}}</span> 
+                               </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">小区	:</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.villageName	?residentMoveOutRecordObj.villageName	:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">楼号		:</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.buildName	?residentMoveOutRecordObj.buildName:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                          </el-row>
+                          <el-row>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">单元		 :</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.unitName	?residentMoveOutRecordObj.unitName	:'--':'--'}}</span> 
+                               </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">房屋	:</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.homeName	?residentMoveOutRecordObj.homeName	:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">外迁地址 :</div>  
+                                <span class="f-left8 f-font-color">{{residentMoveOutRecordObj?residentMoveOutRecordObj.address	?residentMoveOutRecordObj.address:'--':'--'}}</span> 
+                                </div>
+                              </el-col>
+                          </el-row>
+                      </el-tab-pane>
                 </el-tabs>
 
   </div>
@@ -908,6 +911,8 @@ export default {
     residentMoveOutRecordObj:{},//迁出
     // 字典分割线
     educationDictonArr:[],
+    hobbyArr:[],
+    volunteerArr:[],
     disability_levelArr:[],
     illnessArr:[],
     householdArr:[],
@@ -923,7 +928,7 @@ export default {
    }
   },
   computed: {
-    gridName(){
+        gridName(){
        let arr = []
        if(this.resiDetailObj.houseInfo&&this.resiDetailObj.houseInfo.gridName){
         arr = this.resiDetailObj.houseInfo.gridName
@@ -931,8 +936,8 @@ export default {
         arr = '--'
        }
         return arr
-      },
-      homeName(item){
+        },
+        homeName(item){
        let arr = []
        if(this.resiDetailObj.houseInfo&&this.resiDetailObj.houseInfo.homeName){
         arr = this.resiDetailObj.houseInfo.homeName
@@ -940,8 +945,8 @@ export default {
         arr = '--'
        }
         return arr
-      },
-      educationText(){
+        },
+        educationText(){
             let text = '--'
             this.educationDictonArr.forEach(item=>{
               if(item.value == this.eduInfoDto.cultureLevel){
@@ -954,7 +959,14 @@ export default {
         hobbyCodeArr(){
           let arr = []
           if(this.hobbyInfoObj.hobbyCode){
-             arr = this.hobbyInfoObj.hobbyCode.split(',')
+             let test = this.hobbyInfoObj.hobbyCode.split(',')
+             for(let i of this.hobbyArr){
+                for(let j of test){
+                    if(i.value == j){
+                      arr.push(i.label)
+                    }
+                }
+             }
           }else{
             arr = []
           }
@@ -1103,7 +1115,14 @@ export default {
         volunteerCategoryArr(){
           let arr = []
           if(this.residentVolunteerObj.volunteerCategory){
-             arr = this.residentVolunteerObj.volunteerCategory.split(',')
+             let test = this.residentVolunteerObj.volunteerCategory.split(',')
+             for(let i of this.volunteerArr){
+                for(let j of test){
+                    if(i.value == j){
+                      arr.push(i.label)
+                    }
+                }
+             }
           }else{
             arr = []
           }
@@ -1128,6 +1147,7 @@ export default {
         },
         dyShowStatus(){
           let flag = false
+          console.log(this.resiDetailObj);
           if(this.resiDetailObj.categoryInfo){
               if(this.resiDetailObj.categoryInfo.partyFlag==1){
                 flag = true
@@ -1139,19 +1159,7 @@ export default {
           }
           return flag
         },
-        qcShowStatus(){
-          let flag = false
-          if(this.resiDetailObj.houseInfo.moveOutFlag){
-              if(this.resiDetailObj.houseInfo.moveOutFlag==1){
-                flag = true
-              }else{
-                flag = false
-              }
-          }else{
-            flag = false
-          }
-          return flag
-        },
+       
         bzfShowStatus(){
           let flag = false
           if(this.resiDetailObj.categoryInfo){
@@ -1242,7 +1250,21 @@ export default {
             flag = false
           }
           return flag
-        }
+        },
+        qcShowStatus(){
+          let flag = false
+          console.log(this.resiDetailObj);
+          if(this.resiDetailObj.houseInfo){
+              if(this.resiDetailObj.houseInfo.moveOutFlag==1){
+                flag = true
+              }else{
+                flag = false
+              }
+          }else{
+            flag = false
+          }
+          return flag
+        },
   },
   watch: {
     
@@ -1271,12 +1293,22 @@ export default {
       }
 
       return _val || row[item.columnName];
+    },
+    async getVolunteerNation(){
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'VOLUNTEER_CATEGORY'})
+        this.volunteerArr = data.data
+      } catch (error) {
+        console.log(error,'获取志愿者字典');
+      }
+
     },
       handleClick(tab){
           if(tab._props.label=="教育"){
             this.getEducation()
             this.getEduInfoDtoObj()
           }else if(tab._props.label == "兴趣爱好"){
+            this.gethobbyNation()
             this.getResidentHobbyInfoObj()
           }
           else if(tab._props.label == "宗教信仰"){
@@ -1312,6 +1344,7 @@ export default {
           }else if(tab._props.label == "统战人员"){
             this.getResidentUnitedFront()
           }else if(tab._props.label == "志愿者"){
+            this.getVolunteerNation()
             this.getVolunteerDetailById()
           }else if(tab._props.label == "老年人"){
             this.getOldPeopleDetailById()
@@ -1365,6 +1398,16 @@ export default {
           console.log(error);
          }
       },
+      async gethobbyNation(){
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'SPECIAL_SKILL'})
+        this.hobbyArr= data.data
+
+      } catch (error) {
+        console.log(error,'获取兴趣爱好字典');
+      }
+
+    },
        //获取宗教信仰
        async getResidentReligionObj(){
         try {
diff --git a/src/views/dataBoard/cpts/map/popup.vue b/src/views/dataBoard/cpts/map/popup.vue
index 5cffd9376..276dd217e 100644
--- a/src/views/dataBoard/cpts/map/popup.vue
+++ b/src/views/dataBoard/cpts/map/popup.vue
@@ -37,7 +37,7 @@
 					<span>{{ info.genderShow || "--" }}</span>
 				</div>
 				<div class="item">
-					<span class="field">身份证号：</span>
+					<span class="field">证件号：</span>
 					<span>{{ info.idcard || "--" }}</span>
 				</div>
 
@@ -54,7 +54,7 @@
 					<span>{{ info.classtype || "--" }}</span>
 				</div>
 
-				<div class="operate">
+				<div class="operate" v-if="false">
 					<div
 						@click="handleClickBtn('create-demand')"
 						v-if="info.agencyId == $store.state.user.agencyId"
@@ -154,6 +154,10 @@
 					<span class="field">楼长电话：</span>
 					<span>{{ info.hm_phone || "--" }}</span>
 				</div>
+				<div class="item">
+					<span class="field">详细地址：</span>
+					<span>{{ info.location || "--" }}</span>
+				</div>
 			</div>
 
 			<div v-if="type === '4'">
@@ -198,6 +202,10 @@
 					<span class="field">房主身份证：</span>
 					<span>{{ info.holder_idcard || "--" }}</span>
 				</div>
+				<div class="item">
+					<span class="field">备注：</span>
+					<span>{{ info.remark || "--" }}</span>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/src/views/dataBoard/renfang/cpts/fwgl.vue b/src/views/dataBoard/renfang/cpts/fwgl.vue
index 7f40bc05e..d2c112759 100644
--- a/src/views/dataBoard/renfang/cpts/fwgl.vue
+++ b/src/views/dataBoard/renfang/cpts/fwgl.vue
@@ -42,7 +42,7 @@
 
 						<div
 							class="row-item marginleft10"
-							@click="toListPage('self_dwelling', '自住房屋')"
+							@click="toListPage('self_dwelling', '自住')"
 						>
 							<div class="item-one">
 								<img
@@ -62,7 +62,7 @@
 					</div>
 					<div
 						class="right-row margintop18"
-						@click="toListPage('lease', '出租房屋')"
+						@click="toListPage('lease', '出租')"
 					>
 						<div class="row-item">
 							<div class="item-one">
@@ -81,7 +81,7 @@
 
 						<div
 							class="row-item marginleft10"
-							@click="toListPage('unused', '闲置房屋')"
+							@click="toListPage('unused', '闲置')"
 						>
 							<div class="item-one">
 								<img
@@ -306,7 +306,7 @@ export default {
 				url,
 				{
 					queryParam: {
-						org_id: this.org_id,
+						org_id: this.orgId,
 					},
 				},
 				{
@@ -417,6 +417,7 @@ export default {
 
 				.row-item {
 					flex: 0 0 100px;
+					cursor: pointer;
 					.item-one {
 						display: flex;
 						.img {
diff --git a/src/views/dataBoard/renfang/cpts/jmgl.vue b/src/views/dataBoard/renfang/cpts/jmgl.vue
index 39bb790e1..a498e359d 100644
--- a/src/views/dataBoard/renfang/cpts/jmgl.vue
+++ b/src/views/dataBoard/renfang/cpts/jmgl.vue
@@ -283,7 +283,7 @@ export default {
 				url,
 				{
 					queryParam: {
-						org_id: this.org_id,
+						org_id: this.orgId,
 					},
 				},
 				{
@@ -292,7 +292,7 @@ export default {
 			);
 
 			if (code === 0) {
-				if (data && Array.isArray(data) && data.length > 0) {
+				if (data && Array.isArray(data)) {
 					let xaxis = [];
 					let series = [{ data: [] }, { data: [] }];
 					for (const {
@@ -358,6 +358,8 @@ export default {
 
 				.row-item {
 					flex: 0 0 100px;
+					cursor: pointer;
+
 					.item-one {
 						display: flex;
 						.img {
diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue
index 6715005ab..a601f0d95 100644
--- a/src/views/dataBoard/renfang/cpts/rkfx.vue
+++ b/src/views/dataBoard/renfang/cpts/rkfx.vue
@@ -126,7 +126,7 @@ export default {
 		handleClickItem(item) {
 			const { type, name } = item;
 			this.$router.push({
-				path: "/dataBoard/renfang/resi-list",
+				path: "/dataBoard/renfang/resi-analyze",
 				query: {
 					org_id: this.orgId,
 					type,
diff --git a/src/views/dataBoard/renfang/cpts/rkfxPieOption.js b/src/views/dataBoard/renfang/cpts/rkfxPieOption.js
index c266dc44e..5772b0f4a 100644
--- a/src/views/dataBoard/renfang/cpts/rkfxPieOption.js
+++ b/src/views/dataBoard/renfang/cpts/rkfxPieOption.js
@@ -43,7 +43,7 @@ export function pieOption() {
 				emphasis: {
 					label: {
 						show: true,
-						fontSize: 36,
+						// fontSize: 36,
 						fontWeight: "bold",
 					},
 				},
diff --git a/src/views/dataBoard/renfang/cpts/rkyj.vue b/src/views/dataBoard/renfang/cpts/rkyj.vue
index 9de02d590..e8d375d5a 100644
--- a/src/views/dataBoard/renfang/cpts/rkyj.vue
+++ b/src/views/dataBoard/renfang/cpts/rkyj.vue
@@ -72,6 +72,10 @@
 				</div>
 			</div>
 		</div>
+
+		<div class="empty" v-if="list.length == 0">
+			<img src="~@/assets/images/shuju/renfang/index/empty.png" />
+		</div>
 	</div>
 </template>
 
@@ -137,7 +141,7 @@ export default {
 			);
 
 			if (code === 0) {
-				if (data && Array.isArray(data) && data.length > 0) {
+				if (data && Array.isArray(data)) {
 					this.list = data;
 				}
 			} else {
@@ -241,6 +245,7 @@ export default {
 			.item-num {
 				width: 33%;
 				text-align: center;
+				cursor: pointer;
 				.img {
 					display: inline-block;
 					width: 32px;
@@ -253,5 +258,24 @@ export default {
 			background: rgba(26, 149, 255, 0.15);
 		}
 	}
+
+	.empty {
+		> img {
+			display: block;
+			width: 120px;
+			margin: 0 auto;
+			margin-top: 80px;
+		}
+		> span {
+			margin-top: 8px;
+			display: block;
+			font-size: 14px;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: rgba(255, 255, 255, 0.65);
+			line-height: 20px;
+			text-align: center;
+		}
+	}
 }
 </style>
diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 912638956..f6094cc9b 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -1,6 +1,10 @@
 <template>
 	<div>
-		<cpt-bread v-if="true" @tap="clickBreadItem" :bread-list="breadList" />
+		<cpt-bread
+			@tap="clickBreadItem"
+			v-if="breadList.length > 1"
+			:bread-list="breadList"
+		/>
 		<div class="g-row">
 			<div class="g-left">
 				<div class="m-box">
@@ -147,7 +151,7 @@
 
 							<input
 								type="text"
-								placeholder="输入关键词搜索"
+								placeholder="搜索本组织及下级的居民、小区、楼栋、房屋"
 								@keyup.enter="handleSearch"
 								v-model="searchModule.keyword"
 							/>
@@ -246,10 +250,10 @@
 							class="box-title-bg"
 						/>
 						<div class="box-title-txt" v-if="!displayedForecast">
-							居民分类分析
+							居民分类统计
 						</div>
 						<div class="box-title-txt" v-else>
-							居民分类分析-智能预测
+							居民分类统计-智能预测
 						</div>
 
 						<div
@@ -261,9 +265,15 @@
 								src="~@/assets/images/shuju/renfang/index/znyc.png"
 							/>
 							<span>智能预测</span>
-							<img
-								src="~@/assets/images/shuju/renfang/index/i-hint.png"
-							/>
+
+							<el-tooltip placement="top">
+								<div slot="content">
+									根据智能分类设置规则，预测来年育龄妇女、老年人、空巢老人、独居老人分别有多少人
+								</div>
+								<img
+									src="~@/assets/images/shuju/renfang/index/i-hint.png"
+								/>
+							</el-tooltip>
 						</div>
 
 						<div
@@ -322,6 +332,7 @@
 							v-if="resiCategoryForecastData.length > 0"
 						>
 							<div
+								@click="toResiClassPage(item.code, item.name)"
 								class="item"
 								:key="item.code + index"
 								v-for="(
@@ -452,6 +463,17 @@ import { requestPostBi } from "@/js/dai/request-bipass";
 import { requestPost } from "@/js/dai/request";
 import getQueryPara from "dai-js/modules/getQueryPara";
 
+function iniGetPerInfo() {
+	return {
+		unemployed_ratio: "--",
+		crowd_ratio: "--",
+		volunteer_ratio: "--",
+		month_update_ratio: "--",
+		aged_ratio: "--",
+		teenagers_ratio: "--",
+	};
+}
+
 export default {
 	name: "renfang",
 
@@ -502,14 +524,7 @@ export default {
 				],
 			},
 
-			perInfo: {
-				unemployed_ratio: "--",
-				crowd_ratio: "--",
-				volunteer_ratio: "--",
-				month_update_ratio: "--",
-				aged_ratio: "--",
-				teenagers_ratio: "--",
-			},
+			perInfo: iniGetPerInfo(),
 
 			displayedResiId: "",
 			displayedHouseId: "",
@@ -688,7 +703,7 @@ export default {
 
 			if (code === 0) {
 				this.perInfo = {
-					...this.perInfo,
+					...iniGetPerInfo(),
 					...data[0],
 				};
 			} else {
diff --git a/src/views/dataBoard/renfang/resi/analyze.vue b/src/views/dataBoard/renfang/resi/analyze.vue
index 97207f0d8..9f5b084dc 100644
--- a/src/views/dataBoard/renfang/resi/analyze.vue
+++ b/src/views/dataBoard/renfang/resi/analyze.vue
@@ -128,8 +128,8 @@ export default {
 				"姓名",
 				"所属网格",
 				"所属房屋",
-				"手机",
-				"身份证",
+				"联系电话",
+				"证件号",
 				"性别",
 				"出生日期",
 				"操作",
diff --git a/src/views/dataBoard/renfang/resi/class.vue b/src/views/dataBoard/renfang/resi/class.vue
index 94f507f4e..4f8e9da32 100644
--- a/src/views/dataBoard/renfang/resi/class.vue
+++ b/src/views/dataBoard/renfang/resi/class.vue
@@ -16,7 +16,7 @@
 			<div class="tip_title">{{ tableTitle }}</div>
 			<div class="title_line"></div>
 
-			<div class="second-select" v-if="type_id == '6'">
+			<div class="second-select" v-if="type_id == 'special_popu'">
 				<el-select
 					v-model="subclassId"
 					:popper-append-to-body="false"
@@ -146,8 +146,8 @@ export default {
 				"姓名",
 				"所属网格",
 				"所属房屋",
-				"手机",
-				"身份证",
+				"联系电话",
+				"证件号",
 				"性别",
 				"出生日期",
 				"操作",
@@ -170,7 +170,7 @@ export default {
 		this.pageNo = 1;
 		this.getList();
 		this.getCount();
-		if (this.type_id == "6") {
+		if (this.type_id == "special_popu") {
 			this.getSubclass();
 		}
 	},
@@ -213,7 +213,7 @@ export default {
 			const { org_id, type_id } = this;
 			this.loading = true;
 
-			const url = "resident_analyze_list";
+			const url = "special_type_list";
 
 			const { data, code, msg } = await requestPostBi(
 				url,
@@ -253,8 +253,7 @@ export default {
 				{
 					queryParam: {
 						org_id,
-						type_id,
-						subclassId,
+						type_id: subclassId || type_id,
 						pageNo,
 						pageSize,
 					},
@@ -299,8 +298,7 @@ export default {
 				{
 					queryParam: {
 						org_id,
-						type_id,
-						subclassId,
+						type_id: subclassId || type_id,
 						pageNo,
 						pageSize,
 					},
diff --git a/src/views/dataBoard/renfang/resi/list.vue b/src/views/dataBoard/renfang/resi/list.vue
index 92fbf1976..0cdf7b3ce 100644
--- a/src/views/dataBoard/renfang/resi/list.vue
+++ b/src/views/dataBoard/renfang/resi/list.vue
@@ -128,8 +128,8 @@ export default {
 				"姓名",
 				"所属网格",
 				"所属房屋",
-				"手机",
-				"身份证",
+				"联系电话",
+				"证件号",
 				"性别",
 				"出生日期",
 				"操作",
diff --git a/src/views/dataBoard/renfang/warn/resi.vue b/src/views/dataBoard/renfang/warn/resi.vue
index 2bf578135..18534820d 100644
--- a/src/views/dataBoard/renfang/warn/resi.vue
+++ b/src/views/dataBoard/renfang/warn/resi.vue
@@ -116,8 +116,8 @@ export default {
 				"姓名",
 				"所属网格",
 				"所属房屋",
-				"手机",
-				"身份证",
+				"联系电话",
+				"证件号",
 				"性别",
 				"出生日期",
 				"操作",
diff --git a/src/views/main.vue b/src/views/main.vue
index f67320e6d..656358f64 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -1,33 +1,33 @@
 <template>
-  <div
-    v-loading.fullscreen.lock="loading"
-    :element-loading-text="$t('loading')"
-    :class="[
-      'aui-wrapper',
-      {
-        'aui-sidebar--fold':
-          $store.state.sidebarActiveSubMenuList.length == 0 ||
-          $store.state.sidebarFold,
-      },
-      {
-        'aui-sidebar--noside': $store.state.inIframe,
-      },
-      { 'z-iframe': $store.state.inIframe },
-    ]"
-  >
-    <template v-if="!loading">
-      <main-navbar ref="ref_navbar" v-if="!$store.state.inIframe" />
-      <main-sidebar v-if="!$store.state.inIframe" />
-      <div class="aui-content__wrapper">
-        <main-content
-          v-if="!$store.state.contentIsNeedRefresh"
-          @changeCustomerName="changeCustomerName"
-        />
-      </div>
+	<div
+		v-loading.fullscreen.lock="loading"
+		:element-loading-text="$t('loading')"
+		:class="[
+			'aui-wrapper',
+			{
+				'aui-sidebar--fold':
+					$store.state.sidebarActiveSubMenuList.length == 0 ||
+					$store.state.sidebarFold,
+			},
+			{
+				'aui-sidebar--noside': $store.state.inIframe,
+			},
+			{ 'z-iframe': $store.state.inIframe },
+		]"
+	>
+		<template v-if="!loading">
+			<main-navbar ref="ref_navbar" v-if="!$store.state.inIframe" />
+			<main-sidebar v-if="!$store.state.inIframe" />
+			<div class="aui-content__wrapper">
+				<main-content
+					v-if="!$store.state.contentIsNeedRefresh"
+					@changeCustomerName="changeCustomerName"
+				/>
+			</div>
 
-      <!-- <secretary-log-notice v-if="!$store.state.inIframe" /> -->
-    </template>
-  </div>
+			<!-- <secretary-log-notice v-if="!$store.state.inIframe" /> -->
+		</template>
+	</div>
 </template>
 
 <script>
@@ -39,128 +39,139 @@ import debounce from "lodash/debounce";
 import { mapGetters } from "vuex";
 import nextTick from "dai-js/tools/nextTick";
 import { requestPost } from "@/js/dai/request";
+import { clearLoginInfo } from "@/utils";
 
 export default {
-  provide() {
-    return {
-      // 刷新
-      refresh() {
-        this.$store.state.contentIsNeedRefresh = true;
-        this.$nextTick(() => {
-          this.$store.state.contentIsNeedRefresh = false;
-        });
-      },
-    };
-  },
-  data() {
-    return {
-      loading: true,
-      userType: localStorage.getItem("userType"),
-    };
-  },
-  components: {
-    MainNavbar,
-    MainSidebar,
-    MainContent,
-    SecretaryLogNotice,
-  },
+	provide() {
+		return {
+			// 刷新
+			refresh() {
+				this.$store.state.contentIsNeedRefresh = true;
+				this.$nextTick(() => {
+					this.$store.state.contentIsNeedRefresh = false;
+				});
+			},
+		};
+	},
+	data() {
+		return {
+			loading: true,
+			userType: localStorage.getItem("userType"),
+		};
+	},
+	components: {
+		MainNavbar,
+		MainSidebar,
+		MainContent,
+		SecretaryLogNotice,
+	},
 
-  watch: {
-    $route: "routeHandle",
-  },
-  async created() {
-    this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
-    console.log(this.$store.state.sidebarMenuList);
+	watch: {
+		$route: "routeHandle",
+	},
+	async created() {
+		this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
+		console.log(this.$store.state.sidebarMenuList);
 
-    // this.windowResizeHandle();
-    this.routeHandle(this.$route);
-    Promise.all([this.getWorkUserInfo()]).then(() => {
-      this.loading = false;
-    });
-  },
-  computed: {},
-  methods: {
-    changeCustomerName(customerName) {
-      this.$refs["ref_navbar"].changeCustomerName(customerName);
-    },
-    // 窗口改变大小
-    windowResizeHandle() {
-      this.$store.state.sidebarFold =
-        document.documentElement["clientWidth"] <= 992 || false;
-      window.addEventListener(
-        "resize",
-        debounce(() => {
-          this.$store.state.sidebarFold =
-            document.documentElement["clientWidth"] <= 992 || false;
-        }, 150)
-      );
-    },
-    // 路由, 监听
-    routeHandle(route) {
-      if (!route.meta.isTab) {
-        return false;
-      }
-      var tab = this.$store.state.contentTabs.filter(
-        (item) => item.name === route.name
-      )[0];
-      if (!tab) {
-        tab = {
-          ...window.SITE_CONFIG["contentTabDefault"],
-          ...route.meta,
-          name: route.name,
-          params: { ...route.params },
-          query: { ...route.query },
-        };
-        this.$store.state.contentTabs =
-          this.$store.state.contentTabs.concat(tab);
-      }
+		// this.windowResizeHandle();
+		this.routeHandle(this.$route);
+		Promise.all([this.getWorkUserInfo()]).then(() => {
+			this.loading = false;
+		});
+	},
+	computed: {},
+	methods: {
+		changeCustomerName(customerName) {
+			this.$refs["ref_navbar"].changeCustomerName(customerName);
+		},
+		// 窗口改变大小
+		windowResizeHandle() {
+			this.$store.state.sidebarFold =
+				document.documentElement["clientWidth"] <= 992 || false;
+			window.addEventListener(
+				"resize",
+				debounce(() => {
+					this.$store.state.sidebarFold =
+						document.documentElement["clientWidth"] <= 992 || false;
+				}, 150)
+			);
+		},
+		// 路由, 监听
+		routeHandle(route) {
+			if (!route.meta.isTab) {
+				return false;
+			}
+			var tab = this.$store.state.contentTabs.filter(
+				(item) => item.name === route.name
+			)[0];
+			if (!tab) {
+				tab = {
+					...window.SITE_CONFIG["contentTabDefault"],
+					...route.meta,
+					name: route.name,
+					params: { ...route.params },
+					query: { ...route.query },
+				};
+				this.$store.state.contentTabs =
+					this.$store.state.contentTabs.concat(tab);
+			}
 
-      this.$store.state.sidebarMenuActiveName = tab.menuId;
-      this.$store.state.contentTabsActiveName = tab.name;
-      this.syncLevelOneMenuActive(tab.menuId);
-    },
-    async syncLevelOneMenuActive(menuId) {
-      await nextTick();
-      console.log(
-        "*******************************",
-        menuId,
-        this.$store.state.sidebarMenuList
-      );
-      const fn = (item) => {
-        if (item.id == menuId) {
-          return true;
-        } else if (item.children.length > 0) {
-          return item.children.findIndex(fn) !== -1;
-        } else {
-          return false;
-        }
-      };
-      let idx = this.$store.state.sidebarMenuList.findIndex(fn);
-      this.$store.state.LevelOneMenuActiveName =
-        idx !== -1 ? this.$store.state.sidebarMenuList[idx].id : "";
-      this.$store.state.sidebarActiveSubMenuList =
-        idx !== -1 ? this.$store.state.sidebarMenuList[idx].children : [];
-    },
-    // 获取当前管理员信息
-    async getWorkUserInfo() {
-      const url = "/epmetuser/customerstaff/staffbasicinfo";
-      let params = {};
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.$store.state.user = { ...data };
-        console.log("user---hahha", this.$store.state.user);
-        localStorage.setItem("roleList", data.roleList);
-        localStorage.setItem("customerId", data.customerId);
-        localStorage.setItem("staffId", data.id);
-        localStorage.setItem("agencyId", data.agencyId);
-        localStorage.setItem("level", data.level);
-        if (!localStorage.getItem("customerName")) {
-          localStorage.setItem("customerName", data.customerName || "");
-        }
-      } else {
-        this.$message.error(msg);
-      }
-    },
-  },
+			this.$store.state.sidebarMenuActiveName = tab.menuId;
+			this.$store.state.contentTabsActiveName = tab.name;
+			this.syncLevelOneMenuActive(tab.menuId);
+		},
+		async syncLevelOneMenuActive(menuId) {
+			await nextTick();
+			console.log(
+				"*******************************",
+				menuId,
+				this.$store.state.sidebarMenuList
+			);
+			const fn = (item) => {
+				if (item.id == menuId) {
+					return true;
+				} else if (item.children.length > 0) {
+					return item.children.findIndex(fn) !== -1;
+				} else {
+					return false;
+				}
+			};
+			let idx = this.$store.state.sidebarMenuList.findIndex(fn);
+			this.$store.state.LevelOneMenuActiveName =
+				idx !== -1 ? this.$store.state.sidebarMenuList[idx].id : "";
+			this.$store.state.sidebarActiveSubMenuList =
+				idx !== -1
+					? this.$store.state.sidebarMenuList[idx].children
+					: [];
+		},
+		// 获取当前管理员信息
+		async getWorkUserInfo() {
+			const url = "/epmetuser/customerstaff/staffbasicinfo";
+			let params = {};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				if (data) {
+					this.$store.state.user = { ...data };
+					console.log("user---hahha", this.$store.state.user);
+					localStorage.setItem("roleList", data.roleList);
+					localStorage.setItem("customerId", data.customerId);
+					localStorage.setItem("staffId", data.id);
+					localStorage.setItem("agencyId", data.agencyId);
+					localStorage.setItem("level", data.level);
+					if (!localStorage.getItem("customerName")) {
+						localStorage.setItem(
+							"customerName",
+							data.customerName || ""
+						);
+					}
+				} else {
+					clearLoginInfo();
+					this.$router.push({ name: "login" });
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+	},
 };
 </script>
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index adba323f9..19b8419d9 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -1,228 +1,260 @@
 <template>
-  <div class="g-main">
-
-    <div :style="{height:rowHeight}"
-         class="div_tree">
-      <el-input placeholder="输入关键字进行过滤"
-                v-model="filterText" @keydown.native.enter="handleChangeSerch()">
-      </el-input>
-      <el-scrollbar :style="{height:treeHeight}"
-                    class="scrollar">
-        <el-tree ref="ref_tree"
-                 v-loading="treeLoading"
-                 class="filter_tree"
-                 :data="treeData"
-                 :props="defaultProps"
-                 :highlight-current="true"
-                 node-key="id"
-                 :expand-on-click-node="false"
-                 :filter-node-method="filterNode"
-                 @node-click="handleNodeClick"
-                 lazy
-                 auto-expand-parent
-                 :default-expanded-keys="autoOpenArr"
-                 
-				      	:load="lazyLoadTree">
-
-          <span slot-scope="{ node, data }"
-                class="custom-tree-node">
-            <img v-if="data.showIcon"
-                 src="@/assets/images/index/abnormal.png"
-                 style="height:14px;width:14px;margin-right:5px;margin-top:-3px">
-
-            <!-- <span v-if="data.level==='building'&&!data.showIcon"
+	<div class="g-main">
+		<div :style="{ height: rowHeight }" class="div_tree">
+			<el-input
+				placeholder="输入关键字进行过滤"
+				v-model="filterText"
+				@keydown.native.enter="handleChangeSerch()"
+			>
+			</el-input>
+			<el-scrollbar :style="{ height: treeHeight }" class="scrollar">
+				<el-tree
+					ref="ref_tree"
+					v-loading="treeLoading"
+					class="filter_tree"
+					:data="treeData"
+					:props="defaultProps"
+					:highlight-current="true"
+					node-key="id"
+					:expand-on-click-node="false"
+					:filter-node-method="filterNode"
+					@node-click="handleNodeClick"
+					lazy
+					auto-expand-parent
+					:default-expanded-keys="autoOpenArr"
+					:load="lazyLoadTree"
+				>
+					<span slot-scope="{ node, data }" class="custom-tree-node">
+						<img
+							v-if="data.showIcon"
+							src="@/assets/images/index/abnormal.png"
+							style="
+								height: 14px;
+								width: 14px;
+								margin-right: 5px;
+								margin-top: -3px;
+							"
+						/>
+
+						<!-- <span v-if="data.level==='building'&&!data.showIcon"
                   style="padding-left:20px;">{{ '   ' }}</span> -->
-            <span v-if="data.showIcon"
-                  :id="data.id">{{ data.label+'(' }}
-              <span style="color:red">{{ data.showNum }}</span>
-              <span>{{')' }}</span>
-            </span>
-            <span v-else
-                  :id="data.id">{{ data.showName }}</span>
-          </span>
-        </el-tree>
-      </el-scrollbar>
-
-    </div>
-
-    <div :style="{height:rowHeight}"
-         class=div_left>
-
-      <div class="m-search hflex">
-
-        <el-form :inline="true"
-                 class="communityHeight"
-                 ref="ref_searchform"
-                 :label-width="'100px'">
-
-          <el-form-item label="房主姓名"
-                        prop="ownerName">
-            <el-input v-model="ownerName"
-                      class="u-item-width-normal"
-                      size="small"
-                      clearable
-                      placeholder="请输入内容">
-
-            </el-input>
-          </el-form-item>
-          <el-form-item label="联系方式"
-                        prop="ownerPhone">
-            <el-input v-model="ownerPhone"
-                      class="u-item-width-normal"
-                      size="small"
-                      clearable
-                      placeholder="请输入手机">
-            </el-input>
-
-          </el-form-item>
-
-          <el-form-item label="房屋状态"
-                        prop="rentFlag">
-            <el-select class="u-item-width-normal"
-                       v-model="rentFlag"
-                       placeholder="请选择"
-                       size="small"
-                       clearable>
-              <el-option v-for="item in rentList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="房屋用途"
-                        prop="purpose">
-            <el-select v-model="purpose"
-                       class="u-item-width-normal"
-                       placeholder="请选择"
-                       size="small"
-                       clearable>
-              <el-option v-for="item in purposeArr"
-                         :key="item.dictValue"
-                         :label="item.dictName"
-                         :value="item.dictValue">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-
-          <el-form-item label="更新时间"
-                        prop="updateStartDate">
-            <el-date-picker v-model="updateStartDate"
-                            :picker-options="startPickerOptions"
-                            class="u-item-width-daterange"
-                            size="small"
-                            type="date"
-                            value-format="yyyyMMdd"
-                            value="yyyy-MM-dd"
-                            placeholder="开始时间">
-            </el-date-picker>
-            <span class="u-data-tag">至</span>
-            <el-date-picker v-model="updateEndDate"
-                            :picker-options="endPickerOptions"
-                            class="u-item-width-daterange u-data-tag"
-                            size="small"
-                            type="date"
-                            value-format="yyyyMMdd"
-                            value="yyyy-MM-dd"
-                            placeholder="结束时间">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="备注"
-                        prop="remark">
-            <el-input v-model="remark"
-                      class="u-item-width-normal"
-                      size="small"
-                      clearable
-                      placeholder="请输入备注">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="所属房屋"
-                        prop="neighborHoodId">
-            <el-select v-model.trim="neighborHoodId"
-                       :disabled="vDisabled"
-                       placeholder="小区"
-                       filterable
-                       size="small"
-                       clearable
-                       class="u-item-width-communitycascader"
-                       @change="handleChangeV">
-                     <!-- <div>
+						<span v-if="data.showIcon" :id="data.id"
+							>{{ data.label + "(" }}
+							<span style="color: red">{{ data.showNum }}</span>
+							<span>{{ ")" }}</span>
+						</span>
+						<span v-else :id="data.id">{{ data.showName }}</span>
+					</span>
+				</el-tree>
+			</el-scrollbar>
+		</div>
+
+		<div :style="{ height: rowHeight }" class="div_left">
+			<div class="m-search hflex">
+				<el-form
+					:inline="true"
+					class="communityHeight"
+					ref="ref_searchform"
+					:label-width="'100px'"
+				>
+					<el-form-item label="房主姓名" prop="ownerName">
+						<el-input
+							v-model="ownerName"
+							class="u-item-width-normal"
+							size="small"
+							clearable
+							placeholder="请输入内容"
+						>
+						</el-input>
+					</el-form-item>
+					<el-form-item label="联系方式" prop="ownerPhone">
+						<el-input
+							v-model="ownerPhone"
+							class="u-item-width-normal"
+							size="small"
+							clearable
+							placeholder="请输入手机"
+						>
+						</el-input>
+					</el-form-item>
+
+					<el-form-item label="房屋状态" prop="rentFlag">
+						<el-select
+							class="u-item-width-normal"
+							v-model="rentFlag"
+							placeholder="请选择"
+							size="small"
+							clearable
+						>
+							<el-option
+								v-for="item in rentList"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+
+					<el-form-item label="房屋用途" prop="purpose">
+						<el-select
+							v-model="purpose"
+							class="u-item-width-normal"
+							placeholder="请选择"
+							size="small"
+							clearable
+						>
+							<el-option
+								v-for="item in purposeArr"
+								:key="item.dictValue"
+								:label="item.dictName"
+								:value="item.dictValue"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+
+					<el-form-item label="更新时间" prop="updateStartDate">
+						<el-date-picker
+							v-model="updateStartDate"
+							:picker-options="startPickerOptions"
+							class="u-item-width-daterange"
+							size="small"
+							type="date"
+							value-format="yyyyMMdd"
+							value="yyyy-MM-dd"
+							placeholder="开始时间"
+						>
+						</el-date-picker>
+						<span class="u-data-tag">至</span>
+						<el-date-picker
+							v-model="updateEndDate"
+							:picker-options="endPickerOptions"
+							class="u-item-width-daterange u-data-tag"
+							size="small"
+							type="date"
+							value-format="yyyyMMdd"
+							value="yyyy-MM-dd"
+							placeholder="结束时间"
+						>
+						</el-date-picker>
+					</el-form-item>
+					<el-form-item label="备注" prop="remark">
+						<el-input
+							v-model="remark"
+							class="u-item-width-normal"
+							size="small"
+							clearable
+							placeholder="请输入备注"
+						>
+						</el-input>
+					</el-form-item>
+
+					<el-form-item label="所属房屋" prop="neighborHoodId">
+						<el-select
+							v-model.trim="neighborHoodId"
+							:disabled="vDisabled"
+							placeholder="小区"
+							filterable
+							size="small"
+							clearable
+							class="u-item-width-communitycascader"
+							@change="handleChangeV"
+						>
+							<!-- <div>
                         <el-input
                         placeholder="请输入"
                         v-model="searchAgencyTxt"
                         @keyup.enter.native="handleChangeSerchAgency(searchAgencyTxt)"
                         >
                       </el-input> -->
-                <!-- </div> -->
-              <el-option v-for="item in optionsV"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-            <el-select v-model.trim="buildingId"
-                       placeholder="楼号"
-                       :disabled="!neighborHoodId || bDisabled"
-                       size="small"
-                       clearable
-                       class="u-item-width-buildcascader"
-                       style="margin-left:5px"
-                       @change="handleChangeB">
-              <el-option v-for="item in optionsB"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-            <el-select v-model.trim="buildingUnitId"
-                       placeholder="单元"
-                       size="small"
-                       :disabled="!buildingId"
-                       clearable
-                       class="u-item-width-buildcascader"
-                       style="margin-left:5px"
-                       @change="handleChangeD">
-              <el-option v-for="item in optionsD"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-            <el-select v-model.trim="houseId"
-                       placeholder="房号"
-                       :disabled="!buildingUnitId"
-                       size="small"
-                       clearable
-                       class="u-item-width-buildcascader"
-                       style="margin-left:5px">
-              <el-option v-for="item in optionsH"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <!-- </div> -->
-          <div class="u-search-btn">
-            <el-button size="small"
-                       class="diy-button--white"
-                       @click="resetSearch">重置</el-button>
-            <el-button style="margin-left:10px"
-                       size="small"
-                       class="diy-button--blue"
-                       @click="handleSearch">查询</el-button>
-            <!-- <el-button style="margin-left:15px"
+							<!-- </div> -->
+							<el-option
+								v-for="item in optionsV"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+						<el-select
+							v-model.trim="buildingId"
+							placeholder="楼号"
+							:disabled="!neighborHoodId || bDisabled"
+							size="small"
+							clearable
+							class="u-item-width-buildcascader"
+							style="margin-left: 5px"
+							@change="handleChangeB"
+						>
+							<el-option
+								v-for="item in optionsB"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+						<el-select
+							v-model.trim="buildingUnitId"
+							placeholder="单元"
+							size="small"
+							:disabled="!buildingId"
+							clearable
+							class="u-item-width-buildcascader"
+							style="margin-left: 5px"
+							@change="handleChangeD"
+						>
+							<el-option
+								v-for="item in optionsD"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+						<el-select
+							v-model.trim="houseId"
+							placeholder="房号"
+							:disabled="!buildingUnitId"
+							size="small"
+							clearable
+							class="u-item-width-buildcascader"
+							style="margin-left: 5px"
+						>
+							<el-option
+								v-for="item in optionsH"
+								:key="item.value"
+								:label="item.label"
+								:value="item.value"
+							>
+							</el-option>
+						</el-select>
+					</el-form-item>
+
+					<!-- </div> -->
+					<div class="u-search-btn">
+						<el-button
+							size="small"
+							class="diy-button--white"
+							@click="resetSearch"
+							>重置</el-button
+						>
+						<el-button
+							style="margin-left: 10px"
+							size="small"
+							class="diy-button--blue"
+							@click="handleSearch"
+							>查询</el-button
+						>
+						<!-- <el-button style="margin-left:15px"
                          size="small"
                          class="div-table-button--blue communityUnfold"
                          type="text"
                          @click="boxHeight = !boxHeight">{{ boxHeight ? '收起' : '展开' }}<i :class="boxHeight ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i></el-button> -->
-          </div>
-        </el-form>
-        <!-- <el-row class="flex endpoint">
+					</div>
+				</el-form>
+				<!-- <el-row class="flex endpoint">
           <el-col :span="24">
             <span></span>
             <div class="u-search-btn">
@@ -242,435 +274,450 @@
             </div>
           </el-col>
         </el-row> -->
-      </div>
-
-      <div class="">
-        <build-table v-if="selTreeObj.level==='neighborHood'&&!showRoomTable"
-                     ref="ref_neighTable"
-                     :staffAgencyId="staffAgencyId"
-                     :showImportBtn="showImportBtn"
-                     :ownerName="ownerName"
-                     :ownerPhone="ownerPhone"
-                     :rentFlag="rentFlag"
-                     :purpose="purpose"
-                     :remark="remark"
-                     :updateStartDate="updateStartDate"
-                     :updateEndDate="updateEndDate"
-                     :searchHeight="searchHeight"
-                     @toNextLevel="toNextLevel"
-                     @refreshTree="refreshTree"></build-table>
-
-        <room-table v-if="showRoomTable||selTreeObj.level==='building'"
-                    :staffAgencyId="staffAgencyId"
-                    :showImportBtn="showImportBtn"
-                    :ownerName="ownerName"
-                    :ownerPhone="ownerPhone"
-                    :rentFlag="rentFlag"
-                    :purpose="purpose"
-                    :neighborHoodId="neighborHoodId"
-                    :buildingId="buildingId"
-                    :buildingUnitId="buildingUnitId"
-                    :houseId="houseId"
-                    :remark="remark"
-                    :updateStartDate="updateStartDate"
-                    :updateEndDate="updateEndDate"
-                    ref="ref_buildingTable"
-                    @refreshTree="refreshTree"></room-table>
-
-        <community-table v-if="selTreeObj.level!=='building'&&selTreeObj.level!=='neighborHood'&&!showRoomTable"
-                         @toNextLevel="toNextLevel"
-                         :staffAgencyId="staffAgencyId"
-                         :ownerName="ownerName"
-                         :ownerPhone="ownerPhone"
-                         :rentFlag="rentFlag"
-                         :purpose="purpose"
-                         :remark="remark"
-                         :updateStartDate="updateStartDate"
-                         :updateEndDate="updateEndDate"
-                         ref="ref_communityTable"
-                         @refreshTree="refreshTree"></community-table>
-      </div>
-    </div>
-
-  </div>
+			</div>
+
+			<div class="">
+				<build-table
+					v-if="selTreeObj.level === 'neighborHood' && !showRoomTable"
+					ref="ref_neighTable"
+					:staffAgencyId="staffAgencyId"
+					:showImportBtn="showImportBtn"
+					:ownerName="ownerName"
+					:ownerPhone="ownerPhone"
+					:rentFlag="rentFlag"
+					:purpose="purpose"
+					:remark="remark"
+					:updateStartDate="updateStartDate"
+					:updateEndDate="updateEndDate"
+					:searchHeight="searchHeight"
+					@toNextLevel="toNextLevel"
+					@refreshTree="refreshTree"
+				></build-table>
+
+				<room-table
+					v-if="showRoomTable || selTreeObj.level === 'building'"
+					:staffAgencyId="staffAgencyId"
+					:showImportBtn="showImportBtn"
+					:ownerName="ownerName"
+					:ownerPhone="ownerPhone"
+					:rentFlag="rentFlag"
+					:purpose="purpose"
+					:neighborHoodId="neighborHoodId"
+					:buildingId="buildingId"
+					:buildingUnitId="buildingUnitId"
+					:houseId="houseId"
+					:remark="remark"
+					:updateStartDate="updateStartDate"
+					:updateEndDate="updateEndDate"
+					ref="ref_buildingTable"
+					@refreshTree="refreshTree"
+				></room-table>
+
+				<community-table
+					v-if="
+						selTreeObj.level !== 'building' &&
+						selTreeObj.level !== 'neighborHood' &&
+						!showRoomTable
+					"
+					@toNextLevel="toNextLevel"
+					:staffAgencyId="staffAgencyId"
+					:ownerName="ownerName"
+					:ownerPhone="ownerPhone"
+					:rentFlag="rentFlag"
+					:purpose="purpose"
+					:remark="remark"
+					:updateStartDate="updateStartDate"
+					:updateEndDate="updateEndDate"
+					ref="ref_communityTable"
+					@refreshTree="refreshTree"
+				></community-table>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-import CDialog from '@c/CDialog'
-import communityTable from './communityTable'
-import buildTable from './buildTable'
-import roomTable from './roomTable'
-import { requestPost,requestGet } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import nextTick from 'dai-js/tools/nextTick'
+import CDialog from "@c/CDialog";
+import communityTable from "./communityTable";
+import buildTable from "./buildTable";
+import roomTable from "./roomTable";
+import { requestPost, requestGet } from "@/js/dai/request";
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import nextTick from "dai-js/tools/nextTick";
 import debounce from "lodash/debounce";
 import deepClone from "@/utils/deepClone.js";
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
-    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      if (this.updateStartDate) {
-        let startTime = new Date(this.updateStartDate)
-        return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
-      } else {
-        return time.getTime() > nowData
-      }
-
-    }
-    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      return time.getTime() > nowData
-    }
-    return {
-      autoOpenArr:[],
-      boxHeight: true,
-      searchHeight: 190,
-      filterText: '',
-      treeLoading: true,
-      treeData: [],
-      searchAgencyTxt:"",
-      openNodes: [],
-      defaultProps: {
-        children: 'children',
-        label: 'showName',
-        isLeaf: "isLeaf",
-      },
-
-      selTreeObj: {},
-
-      centerPoint: [],
-      staffAgencyId: localStorage.getItem("agencyId"),
-      showImportBtn: false,
-
-      rentList: [
-        {
-          value: '1',
-          label: '出租'
-        },
-        {
-          value: '2',
-          label: '闲置'
-        },
-        {
-          value: '0',
-          label: '自住'
-        },
-        {
-          value: '3',
-          label: '未出售'
-        },
-      ],
-      ownerName: '',
-      ownerPhone: '',
-      rentFlag: '',
-      purpose: '',
-      remark: '',
-      updateStartDate: '',
-      updateEndDate: '',
-      showRoomTable: false,
-      selObj: {},
-      purposeArr: [
-        { dictValue: '1', dictName: '住宅' },
-        { dictValue: '2', dictName: '商业' },
-        { dictValue: '3', dictName: '办公' },
-        { dictValue: '4', dictName: '工业' },
-        { dictValue: '5', dictName: '仓储' },
-        { dictValue: '6', dictName: '商住混用' },
-        { dictValue: '7', dictName: '其他' }
-      ],
-      endPickerOptions: {
-        disabledDate: endDisabledDate
-      },
-      startPickerOptions: {
-        disabledDate: startDisabledDate
-      },
-
-      optionsV: [],
-      optionsB: [],
-      optionsH: [],
-      optionsD: [],
-      neighborHoodId: "",
-      buildingId: "",
-      buildingUnitId: "",
-      houseId: "",
-      selGridId: '',
-      selAgencyId: '',
-
-      vDisabled: false,
-      bDisabled: false,
-    }
-  },
-  components: {
-    CDialog
-  },
-  async mounted () {
-    this.searchHeight = this.$refs.ref_searchform.offsetHeight
-
-    this.treeLoading = true
-
-    await this.loadOrgData()
-    await this.loadTree()
-    // await this.loadOpenNode()
-    this.getValiheList('', '')
-
-    await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
-    if (this.treeData.length > 0) {
-      this.$nextTick(() => {
-        // ref_tree 元素的ref   value 绑定的node-key
-        this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
-      });
-    }
-    this.treeLoading = false
-
-  },
-  computed: {
-
-    rowHeight () {
-
-      return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px'
-
-    },
-    treeHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 245 + this.iframeHeight + 'px' : this.clientHeight - 245 + 'px'
-
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight']),
-   
-  },
-  methods: {
-    handleChangeV (val) {
-
-      this.buildingId = "";
-      this.buildingUnitId = "";
-      this.houseId = "";
-      this.getBuildList();
-      // this.getUniList();
-      // this.getHouseList();
-    },
-    // handleChangeSerchAgency(val){
-    //   console.log(val);
-    //   // this.optionsV = this.optionsV.filter(item=>item.label == val)
-    // this.optionsV.forEach( function(item){
-    //   if(item.label==val){
-    //     console.log(1);
-    //   }
-    // })
-    //   console.log(this.optionsV );
-    // },
-    handleChangeB (val) {
-
-      this.buildingUnitId = "";
-      this.houseId = "";
-      this.getUniList();
-      // this.getHouseList();
-    },
-    handleChangeD () {
-      this.houseId = "";
-      this.getHouseList();
-    },
-    async lazyLoadTree(node, resolve) {
-      console.log(node);
-				const url = `/actual/base/communityBuilding/tree/nextTreeNode?id=${node.data.id}&level=${node.data.level}`;
+	data() {
+		let endDisabledDate = (time) => {
+			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+			let nowData = Date.now();
+			if (this.updateStartDate) {
+				let startTime = new Date(this.updateStartDate);
+				return (
+					time.getTime() > nowData ||
+					time.getTime() < startTime ||
+					time.getTime() === startTime
+				);
+			} else {
+				return time.getTime() > nowData;
+			}
+		};
+		let startDisabledDate = (time) => {
+			//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+			let nowData = Date.now();
+			return time.getTime() > nowData;
+		};
+		return {
+			autoOpenArr: [],
+			boxHeight: true,
+			searchHeight: 190,
+			filterText: "",
+			treeLoading: true,
+			treeData: [],
+			searchAgencyTxt: "",
+			openNodes: [],
+			defaultProps: {
+				children: "children",
+				label: "showName",
+				isLeaf: "isLeaf",
+			},
+
+			selTreeObj: {},
+
+			centerPoint: [],
+			staffAgencyId: localStorage.getItem("agencyId"),
+			showImportBtn: false,
+
+			rentList: [
+				{
+					value: "1",
+					label: "出租",
+				},
+				{
+					value: "2",
+					label: "闲置",
+				},
+				{
+					value: "0",
+					label: "自住",
+				},
+				{
+					value: "3",
+					label: "未出售",
+				},
+			],
+			ownerName: "",
+			ownerPhone: "",
+			rentFlag: "",
+			purpose: "",
+			remark: "",
+			updateStartDate: "",
+			updateEndDate: "",
+			showRoomTable: false,
+			selObj: {},
+			purposeArr: [
+				{ dictValue: "1", dictName: "住宅" },
+				{ dictValue: "2", dictName: "商业" },
+				{ dictValue: "3", dictName: "办公" },
+				{ dictValue: "4", dictName: "工业" },
+				{ dictValue: "5", dictName: "仓储" },
+				{ dictValue: "6", dictName: "商住混用" },
+				{ dictValue: "7", dictName: "其他" },
+			],
+			endPickerOptions: {
+				disabledDate: endDisabledDate,
+			},
+			startPickerOptions: {
+				disabledDate: startDisabledDate,
+			},
+
+			optionsV: [],
+			optionsB: [],
+			optionsH: [],
+			optionsD: [],
+			neighborHoodId: "",
+			buildingId: "",
+			buildingUnitId: "",
+			houseId: "",
+			selGridId: "",
+			selAgencyId: "",
+
+			vDisabled: false,
+			bDisabled: false,
+		};
+	},
+	components: {
+		CDialog,
+		communityTable,
+		buildTable,
+		roomTable,
+	},
+	async mounted() {
+		this.searchHeight = this.$refs.ref_searchform.offsetHeight;
+
+		this.treeLoading = true;
+
+		await this.loadOrgData();
+		await this.loadTree();
+		// await this.loadOpenNode()
+		this.getValiheList("", "");
+
+		await this.$refs["ref_communityTable"].loadTable(true, this.selTreeObj);
+		if (this.treeData.length > 0) {
+			this.$nextTick(() => {
+				// ref_tree 元素的ref   value 绑定的node-key
+				this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
+			});
+		}
+		this.treeLoading = false;
+	},
+	computed: {
+		rowHeight() {
+			return this.$store.state.inIframe
+				? this.clientHeight - 140 + this.iframeHeight + "px"
+				: this.clientHeight - 140 + "px";
+		},
+		treeHeight() {
+			return this.$store.state.inIframe
+				? this.clientHeight - 245 + this.iframeHeight + "px"
+				: this.clientHeight - 245 + "px";
+		},
+
+		...mapGetters(["clientHeight", "iframeHeight"]),
+	},
+	watch: {
+		// filterText (val) {
+		//   this.$refs.ref_tree.filter(val);
+		// },
+	},
+	methods: {
+		handleChangeV(val) {
+			this.buildingId = "";
+			this.buildingUnitId = "";
+			this.houseId = "";
+			this.getBuildList();
+			// this.getUniList();
+			// this.getHouseList();
+		},
+		// handleChangeSerchAgency(val){
+		//   console.log(val);
+		//   // this.optionsV = this.optionsV.filter(item=>item.label == val)
+		// this.optionsV.forEach( function(item){
+		//   if(item.label==val){
+		//     console.log(1);
+		//   }
+		// })
+		//   console.log(this.optionsV );
+		// },
+		handleChangeB(val) {
+			this.buildingUnitId = "";
+			this.houseId = "";
+			this.getUniList();
+			// this.getHouseList();
+		},
+		handleChangeD() {
+			this.houseId = "";
+			this.getHouseList();
+		},
+		async lazyLoadTree(node, resolve) {
+			console.log(node);
+			const url = `/actual/base/communityBuilding/tree/nextTreeNode?id=${node.data.id}&level=${node.data.level}`;
+			const { data, code, msg } = await requestGet(url);
+			if (code === 0) {
+				data.forEach((element) => {
+					if (element.level === "building") {
+						element.isLeaf = true;
+					}
+				});
+				resolve(data);
+			} else {
+				this.$message.error(msg);
+			}
+			// }
+		},
+		async getValiheList() {
+			const { user } = this.$store.state;
+			if (!this.selGridId) {
+				this.selAgencyId = this.selAgencyId
+					? this.selAgencyId
+					: user.agencyId;
+			}
+
+			const url = "/actual/base/communityQuarters/listQuartersOptions";
+			// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
+			let params = {
+				gridId: this.selGridId,
+				agencyId: this.selAgencyId,
+				isPage: false,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.optionsV = data;
+
+				this.neighborHoodId = "";
+				this.buildingId = "";
+				this.buildingUnitId = "";
+				this.houseId = "";
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async getBuildList() {
+			const url = "/actual/base/communityBuilding/buildingoption";
+
+			let params = {
+				quartersId: this.neighborHoodId,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.optionsB = data;
+				this.buildingId = "";
+				this.buildingUnitId = "";
+				this.houseId = "";
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		//回车搜索组织
+		async handleChangeSerch() {
+			this.startLoading();
+			this.$refs.ref_tree.$data.store.lazy = !this.filterText;
+			if (this.filterText.length > 0 && this.filterText != "") {
+				const url = `/actual/base/communityBuilding/tree/search?keyword=${this.filterText}`;
 				const { data, code, msg } = await requestGet(url);
-				if (code === 0) {
-					data.forEach((element) => {
-						if (element.level === "building") {
-							element.isLeaf = true;
-						}
-					});
-            resolve(data);
+				if (data[0].children.length > 0) {
+					this.treeData = data;
+					for (let i in this.treeData[0].children) {
+						this.autoOpenArr.push(
+							this.treeData[0].id,
+							this.treeData[0].children[i].id,
+							this.treeData[0].children[0].children[0].id
+						);
+					}
 				} else {
-					this.$message.error(msg);
+					this.treeData = [];
+					this.$message.error("暂未找到!");
 				}
+			} else {
+				this.treeData = [];
+				this.autoOpenArr = [];
+				this.loadTree();
+			}
+			this.endLoading();
+		},
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: "正在加载……", // 加载中需要显示的文字
+				background: "rgba(0,0,0,.7)", // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		},
+		async getUniList() {
+			const url = "/actual/base/communityBuildingUnit/unitoption";
+			// const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
+			let params = {
+				buildingId: this.buildingId,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.optionsD = data;
+				this.buildingUnitId = "";
+				this.houseId = "";
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		getHouseList() {
+			let params = {
+				buildingId: this.buildingId,
+				unitId: this.buildingUnitId,
+			};
+			this.$http
+				.post("/actual/base/communityHouse/houseoption", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.optionsH = res.data;
+						this.houseId = "";
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+
+		handleSearch() {
+			// if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
+			this.showRoomTable = true;
+
+			this.$nextTick(() => {
+				this.$refs["ref_buildingTable"].loadTable(
+					"search",
+					this.selTreeObj
+				);
+			});
+			// } else {
+			//   this.$message.warning('请输入查询条件')
 			// }
 		},
-    async getValiheList () {
-      const { user } = this.$store.state;
-      if (!this.selGridId) {
-        this.selAgencyId = this.selAgencyId ? this.selAgencyId : user.agencyId
-      }
-
-      const url = "/actual/base/communityQuarters/listQuartersOptions";
-      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
-      let params = {
-        gridId: this.selGridId,
-        agencyId: this.selAgencyId,
-        isPage: false
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.optionsV = data;
-
-        this.neighborHoodId = ""
-        this.buildingId = "";
-        this.buildingUnitId = "";
-        this.houseId = "";
-      } else {
-        this.$message.error(msg);
-      }
-
-
-    },
-
-    async getBuildList () {
-      const url = "/actual/base/communityBuilding/buildingoption";
-
-      let params = {
-        quartersId: this.neighborHoodId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.optionsB = data;
-        this.buildingId = "";
-        this.buildingUnitId = "";
-        this.houseId = "";
-      } else {
-        this.$message.error(msg);
-      }
-
-
-    },
-    //回车搜索组织
-  async  handleChangeSerch (){
-       this.startLoading()
-       this.$refs.ref_tree.$data.store.lazy = !this.filterText
-      if(this.filterText.length > 0 && this.filterText!=''){
-      const url = `/actual/base/communityBuilding/tree/search?keyword=${this.filterText}`
-      const {data,code,msg} = await requestGet(url)
-       if(data[0].children.length>0){
-        this.treeData = data
-        for(let i in this.treeData[0].children){
-            this.autoOpenArr.push(this.treeData[0].id,this.treeData[0].children[i].id,this.treeData[0].children[0].children[0].id);
-        }
-       }else{
-        this.treeData = []
-        this.$message.error('暂未找到!')
-       }
-      }else {
-          this.treeData = []
-          this.autoOpenArr = []
-          this.loadTree()
-      }
-      this.endLoading()
-    } ,
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    },
-    async getUniList () {
-
-      const url = "/actual/base/communityBuildingUnit/unitoption";
-      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
-      let params = {
-        buildingId: this.buildingId,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.optionsD = data;
-        this.buildingUnitId = "";
-        this.houseId = "";
-      } else {
-        this.$message.error(msg);
-      }
-
-
-    },
-    getHouseList () {
-      let params = {
-        buildingId: this.buildingId,
-        unitId: this.buildingUnitId
-      }
-      this.$http
-        .post("/actual/base/communityHouse/houseoption", params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-
-            this.optionsH = res.data;
-            this.houseId = "";
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-
-    handleSearch () {
-      // if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
-      this.showRoomTable = true
-
-      this.$nextTick(() => {
-        this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
-      })
-      // } else {
-      //   this.$message.warning('请输入查询条件')
-      // }
-
-
-    },
-
-    //重置搜索条件
-    resetSearch () {
-      this.ownerName = ''
-      this.ownerPhone = ''
-      this.rentFlag = ''
-      this.purpose = ''
-      this.remark = ''
-      this.updateStartDate = ''
-      this.updateEndDate = ''
-      this.neighborHoodId = ''
-      this.buildingId = ''
-      this.buildingUnitId = ''
-      this.houseId = ''
-
-      this.pageSize = 10
-      this.pageNo = 1
-      // this.handleNodeClick(this.selObj)
-      // this.loadTable()
-    },
-
-    async loadOpenNode () {
-      const url = "/gov/org/building/tree-ids"
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.openNodes = data
-
-
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    async loadTree (isRefresh) {
-      const url = "/actual/base/communityBuilding/tree/initTree"
-      const { data, code, msg } = await requestGet(url)
-      this.handleNodeClick(data)
-      if (code === 0) {
-        this.treeData = []
-        this.treeData.push(data)
-        if (!isRefresh && data) {
+
+		//重置搜索条件
+		resetSearch() {
+			this.ownerName = "";
+			this.ownerPhone = "";
+			this.rentFlag = "";
+			this.purpose = "";
+			this.remark = "";
+			this.updateStartDate = "";
+			this.updateEndDate = "";
+			this.neighborHoodId = "";
+			this.buildingId = "";
+			this.buildingUnitId = "";
+			this.houseId = "";
+
+			this.pageSize = 10;
+			this.pageNo = 1;
+			// this.handleNodeClick(this.selObj)
+			// this.loadTable()
+		},
+
+		async loadOpenNode() {
+			const url = "/gov/org/building/tree-ids";
+			let params = {};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.openNodes = data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async loadTree(isRefresh) {
+			const url = "/actual/base/communityBuilding/tree/initTree";
+			const { data, code, msg } = await requestGet(url);
+			this.handleNodeClick(data);
+			if (code === 0) {
+				this.treeData = [];
+				this.treeData.push(data);
+				if (!isRefresh && data) {
 					this.selTreeObj = data;
 					if (!this.selTreeObj.latitude) {
 						this.selTreeObj.latitude = this.centerPoint[0];
@@ -680,351 +727,338 @@ export default {
 						this.selTreeObj.longitude = this.centerPoint[1];
 					}
 				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
 
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    handleTreeData (treeData) {
-      for (let i in treeData) {
-        treeData[i].showIcon = false
-        if (treeData[i].level === 'building') {
-
-
-          let array = treeData[i].showNum.split('/')
-          if (array.length === 2) {
-            let a = parseInt(array[0])
-            let b = parseInt(array[1])
-            treeData[i].showIcon = a < b
-          }
-
-        }
-
-        if (treeData[i].children) {  //存在子节点就递归
-          this.handleTreeData(treeData[i].children);
-        }
-      }
-    },
-
-    //加载组织数据
-    async loadOrgData () {
-      const url = "/gov/org/agency/maporg"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.centerPoint = []
-
-        this.centerPoint.push(data.latitude)
-        this.centerPoint.push(data.longitude)
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    async handleNodeClick (obj) {
-      this.ownerName = ''
-      this.ownerPhone = ''
-      this.rentFlag = ''
-      this.purpose = ''
-      this.remark = ''
-      this.updateStartDate = ''
-      this.updateEndDate = ''
-      this.showRoomTable = false
-      this.selObj = JSON.parse(JSON.stringify(obj))
-      this.getTreeObj(obj)
-      await nextTick(1000)
-      this.vDisabled = false
-      this.bDisabled = false
-      if (obj.level === 'building') {//点击楼栋
-        setTimeout(()=>{
-          this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
-        },100)
-        this.selAgencyId = ''
-        this.selGridId = ''
-        await this.getValiheList()
-        this.neighborHoodId = this.selTreeObj.pid
-        await this.getBuildList()
-        this.buildingId = this.selTreeObj.id
-        await this.getUniList()
-        this.vDisabled = true
-        this.bDisabled = true
-
-      } else if (obj.level === 'neighborHood') {//点击小区
-        this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
-        this.selAgencyId = ''
-        this.selGridId = ''
-        await this.getValiheList()
-        this.neighborHoodId = this.selTreeObj.id
-        await this.getBuildList()
-        this.vDisabled = true
-      } else {
-        this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
-
-        if (obj.level === 'grid') {
-          this.selAgencyId = ''
-          this.selGridId = this.selTreeObj.id
-        } else {
-          this.selAgencyId = this.selTreeObj.id
-          this.selGridId = ''
-        }
-        this.getValiheList('', '')
-      }
-
-
-    },
-
-    //添加小区结束
-    async refreshTree () {
-      this.treeLoading = true
-      await this.loadTree(this.selTreeObj.id)
-      this.$nextTick(() => {
-        // ref_tree 元素的ref   value 绑定的node-key
-        this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
-      });
-      this.treeLoading = false
-    },
-
-    //进入下一级
-    async toNextLevel (row, level) {
-      console.log(row,'row');
-      console.log(level,'level');
-      this.autoOpenArr = []
-      // console.log(this.$refs.ref_tree);
-      const { agencyId,gridId,neighborHoodId,propertyId} = row
-      let arr = [agencyId,gridId,neighborHoodId,propertyId]
-      this.autoOpenArr = arr
-      console.log(this.autoOpenArr,'默认展开数组');
-      // if (level === 'community') {
-      //   setTimeout(()=>{
-      //     nextTick(1000)
-      //     this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data || {}
-      //   },50)
-      //   this.autoOpenArr.push(this.selTreeObj.id)
-      // } else {
-      //   this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data
-      // }
-
-      console.log(this.selTreeObj,'123123123');
-      this.handleNodeClick(this.selTreeObj)
-      this.$nextTick(() => {
-        // ref_tree 元素的ref   value 绑定的node-key
-        this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
-      });
-
-      const node = document.getElementById(this.selTreeObj.id) // 通过Id获取到对应的dom元素
-      setTimeout(() => {
-        if (node) {
-          this.$nextTick(() => {
-            node.scrollIntoView({ block: 'center' }) // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示
-          })
-        }
-      }, 100)
-
-
-    },
-
-    //解析树数据
-    getTreeObj (obj) {
-      // 树接口：
-      // 组织：组织id、组织名称、type、经度、纬度
-      // 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
-      // 楼：楼id、楼名称、type、所属小区id、所属小区名称
-      if (obj.level === 'building') {//点击楼栋
-        let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid)//所属小区
-
-        let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid)//所属网格
-        let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)//所属社区
-        obj.agencyId = agencyNode.data.id
-        obj.agencyName = agencyNode.data.label
-        obj.gridId = gridNode.data.id
-        obj.gridName = gridNode.data.label
-        obj.neighborHoodId = neighborHoodNode.data.id
-        obj.neighborHoodName = neighborHoodNode.data.label
-        if (obj.agencyId === this.staffAgencyId) {
-          this.showImportBtn = true
-        } else {
-          this.showImportBtn = false
-        }
-
-      } else if (obj.level === 'neighborHood') {//点击小区
-        let gridNode = this.$refs.ref_tree.getNode(obj.pid)
-        let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)
-        obj.gridId = gridNode.data.id
-        obj.gridName = gridNode.data.label
-        obj.agencyId = agencyNode.data.id
-        obj.agencyName = agencyNode.data.label
-        if (obj.agencyId === this.staffAgencyId) {
-          this.showImportBtn = true
-        } else {
-          this.showImportBtn = false
-        }
-
-      } else {
-
-      }
-
-      if (!obj.latitude) {
-        obj.latitude = this.centerPoint[0]
-      }
-
-      if (!obj.longitude) {
-        obj.longitude = this.centerPoint[1]
-      }
-      this.selTreeObj = obj
-      console.log('selTreeObj', this.selTreeObj)
-
-    },
-
-    filterNode (value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  watch: {
-    // filterText (val) {
-    //   this.$refs.ref_tree.filter(val);
-    // },
-
-  },
-  components: {
-    communityTable, buildTable, roomTable
-  }
-}
+		handleTreeData(treeData) {
+			for (let i in treeData) {
+				treeData[i].showIcon = false;
+				if (treeData[i].level === "building") {
+					let array = treeData[i].showNum.split("/");
+					if (array.length === 2) {
+						let a = parseInt(array[0]);
+						let b = parseInt(array[1]);
+						treeData[i].showIcon = a < b;
+					}
+				}
+
+				if (treeData[i].children) {
+					//存在子节点就递归
+					this.handleTreeData(treeData[i].children);
+				}
+			}
+		},
+
+		//加载组织数据
+		async loadOrgData() {
+			const url = "/gov/org/agency/maporg";
+			// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
+			let params = {};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.centerPoint = [];
+
+				this.centerPoint.push(data.latitude);
+				this.centerPoint.push(data.longitude);
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async handleNodeClick(obj) {
+			this.ownerName = "";
+			this.ownerPhone = "";
+			this.rentFlag = "";
+			this.purpose = "";
+			this.remark = "";
+			this.updateStartDate = "";
+			this.updateEndDate = "";
+			this.showRoomTable = false;
+			this.selObj = JSON.parse(JSON.stringify(obj));
+			this.getTreeObj(obj);
+			await nextTick(1000);
+			this.vDisabled = false;
+			this.bDisabled = false;
+			if (obj.level === "building") {
+				//点击楼栋
+				setTimeout(() => {
+					this.$refs["ref_buildingTable"].loadTable(
+						"tree",
+						this.selTreeObj
+					);
+				}, 100);
+				this.selAgencyId = "";
+				this.selGridId = "";
+				await this.getValiheList();
+				this.neighborHoodId = this.selTreeObj.pid;
+				await this.getBuildList();
+				this.buildingId = this.selTreeObj.id;
+				await this.getUniList();
+				this.vDisabled = true;
+				this.bDisabled = true;
+			} else if (obj.level === "neighborHood") {
+				//点击小区
+				this.$refs["ref_neighTable"].loadTable(true, this.selTreeObj);
+				this.selAgencyId = "";
+				this.selGridId = "";
+				await this.getValiheList();
+				this.neighborHoodId = this.selTreeObj.id;
+				await this.getBuildList();
+				this.vDisabled = true;
+			} else {
+				this.$refs["ref_communityTable"].loadTable(
+					true,
+					this.selTreeObj
+				);
+
+				if (obj.level === "grid") {
+					this.selAgencyId = "";
+					this.selGridId = this.selTreeObj.id;
+				} else {
+					this.selAgencyId = this.selTreeObj.id;
+					this.selGridId = "";
+				}
+				this.getValiheList("", "");
+			}
+		},
+
+		//添加小区结束
+		async refreshTree() {
+			this.treeLoading = true;
+			await this.loadTree(this.selTreeObj.id);
+			this.$nextTick(() => {
+				// ref_tree 元素的ref   value 绑定的node-key
+				this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
+			});
+			this.treeLoading = false;
+		},
+
+		//进入下一级
+		async toNextLevel(row, level) {
+			console.log(row, "row");
+			console.log(level, "level");
+			this.autoOpenArr = [];
+			// console.log(this.$refs.ref_tree);
+			const { agencyId, gridId, neighborHoodId, propertyId } = row;
+			let arr = [agencyId, gridId, neighborHoodId, propertyId];
+			this.autoOpenArr = arr;
+			console.log(this.autoOpenArr, "默认展开数组");
+			// if (level === 'community') {
+			//   setTimeout(()=>{
+			//     nextTick(1000)
+			//     this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data || {}
+			//   },50)
+			//   this.autoOpenArr.push(this.selTreeObj.id)
+			// } else {
+			//   this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data
+			// }
+
+			console.log(this.selTreeObj, "123123123");
+			this.handleNodeClick(this.selTreeObj);
+			this.$nextTick(() => {
+				// ref_tree 元素的ref   value 绑定的node-key
+				this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
+			});
+
+			const node = document.getElementById(this.selTreeObj.id); // 通过Id获取到对应的dom元素
+			setTimeout(() => {
+				if (node) {
+					this.$nextTick(() => {
+						node.scrollIntoView({ block: "center" }); // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示
+					});
+				}
+			}, 100);
+		},
+
+		//解析树数据
+		getTreeObj(obj) {
+			// 树接口：
+			// 组织：组织id、组织名称、type、经度、纬度
+			// 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
+			// 楼：楼id、楼名称、type、所属小区id、所属小区名称
+			if (obj.level === "building") {
+				//点击楼栋
+				let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid); //所属小区
+
+				let gridNode = this.$refs.ref_tree.getNode(
+					neighborHoodNode.data.pid
+				); //所属网格
+				let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid); //所属社区
+				obj.agencyId = agencyNode.data.id;
+				obj.agencyName = agencyNode.data.label;
+				obj.gridId = gridNode.data.id;
+				obj.gridName = gridNode.data.label;
+				obj.neighborHoodId = neighborHoodNode.data.id;
+				obj.neighborHoodName = neighborHoodNode.data.label;
+				if (obj.agencyId === this.staffAgencyId) {
+					this.showImportBtn = true;
+				} else {
+					this.showImportBtn = false;
+				}
+			} else if (obj.level === "neighborHood") {
+				//点击小区
+				let gridNode = this.$refs.ref_tree.getNode(obj.pid);
+				let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid);
+				obj.gridId = gridNode.data.id;
+				obj.gridName = gridNode.data.label;
+				obj.agencyId = agencyNode.data.id;
+				obj.agencyName = agencyNode.data.label;
+				if (obj.agencyId === this.staffAgencyId) {
+					this.showImportBtn = true;
+				} else {
+					this.showImportBtn = false;
+				}
+			} else {
+			}
+
+			if (!obj.latitude) {
+				obj.latitude = this.centerPoint[0];
+			}
+
+			if (!obj.longitude) {
+				obj.longitude = this.centerPoint[1];
+			}
+			this.selTreeObj = obj;
+			console.log("selTreeObj", this.selTreeObj);
+		},
+
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.label.indexOf(value) !== -1;
+		},
+
+		// 开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: "正在加载……", // 加载中需要显示的文字
+				background: "rgba(0,0,0,.7)", // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		},
+	},
+};
 </script>
 
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/visual/communityManage.scss";
 @import "@/assets/scss/modules/management/list-main.scss";
 </style>
 
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 .m-search ::v-deep .el-row {
-  margin-right: 0;
+	margin-right: 0;
 }
 .g-main {
-  display: flex;
+	display: flex;
 }
 .scrollar {
-  margin-top: 30px;
-  /deep/
-    .el-tree--highlight-current
-    .el-tree-node.is-current
-    > .el-tree-node__content {
-    background: #e6f0ff;
-    border-radius: 2px;
-  }
-
-  /deep/ .el-tree-node:focus > .el-tree-node__content {
-    color: #0056d6;
-    // background-color: #e6f0ff;
-  }
-  // /deep/ .el-tree-node__expand-icon {
-  //   color: #0043c8;
-  //   border: 1px solid #e1ecff;
-  //   background-color: #e1ecff;
-  //   padding: 0px;
-  //   margin-right: 8px;
-  //   font-size: 9px;
-  // }
-
-  /deep/.el-tree {
-    flex: 1;
-
-    .el-tree-node {
-      margin-left: 2px;
-    }
-
-    //原有的箭头 去掉
-    // .el-icon svg {
-    //   display: none;
-    //   height: 0;
-    //   width: 0;
-    // }
-    //引入图标的位置
-    // .el-tree-node__expand-icon {
-    //   // position: absolute;
-    //   // left: 2px;
-    //   // 图标是否旋转，如果是箭头类型的，可以设置旋转90度。
-    //   .expanded {
-    //     transform: rotate(90deg);
-    //   }
-    //   // 未展开的节点
-    //   &:before {
-    //     // content: "\008B";
-    //     // content: "\008B";
-    //     font-size: 12px;
-    //     color: #0043c8;
-    //   }
-    // }
-    // 叶子节点（不显示图标）
-    .is-leaf.el-tree-node__expand-icon::before {
-      // display: none;
-      // background: none !important;
-      // border: 0px;
-
-      // content: "";
-      // width: 18px;
-      // height: 18px;
-    }
-  }
+	margin-top: 30px;
+	/deep/
+		.el-tree--highlight-current
+		.el-tree-node.is-current
+		> .el-tree-node__content {
+		background: #e6f0ff;
+		border-radius: 2px;
+	}
+
+	/deep/ .el-tree-node:focus > .el-tree-node__content {
+		color: #0056d6;
+		// background-color: #e6f0ff;
+	}
+	// /deep/ .el-tree-node__expand-icon {
+	//   color: #0043c8;
+	//   border: 1px solid #e1ecff;
+	//   background-color: #e1ecff;
+	//   padding: 0px;
+	//   margin-right: 8px;
+	//   font-size: 9px;
+	// }
+
+	/deep/.el-tree {
+		flex: 1;
+
+		.el-tree-node {
+			margin-left: 2px;
+		}
+
+		//原有的箭头 去掉
+		// .el-icon svg {
+		//   display: none;
+		//   height: 0;
+		//   width: 0;
+		// }
+		//引入图标的位置
+		// .el-tree-node__expand-icon {
+		//   // position: absolute;
+		//   // left: 2px;
+		//   // 图标是否旋转，如果是箭头类型的，可以设置旋转90度。
+		//   .expanded {
+		//     transform: rotate(90deg);
+		//   }
+		//   // 未展开的节点
+		//   &:before {
+		//     // content: "\008B";
+		//     // content: "\008B";
+		//     font-size: 12px;
+		//     color: #0043c8;
+		//   }
+		// }
+		// 叶子节点（不显示图标）
+		.is-leaf.el-tree-node__expand-icon::before {
+			// display: none;
+			// background: none !important;
+			// border: 0px;
+
+			// content: "";
+			// width: 18px;
+			// height: 18px;
+		}
+	}
 }
 
 .div_tree {
-  margin: 7px 8px 7px 7px;
-  width: 30%;
-  max-width: 304px;
-  min-width: 240px;
-  /deep/ .el-scrollbar__wrap {
-    overflow-x: hidden !important;
-  }
-
-  //搜索输入框样式
-  /deep/ .el-input--medium .el-input__inner {
-    height: 32px;
-    background: rgba(0, 0, 0, 0.05);
-    border-radius: 4px;
-  }
-  flex: 0 0 280px;
-  background: #ffffff;
-  box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08),
-    0px 3px 6px -4px rgba(0, 0, 0, 0.12);
-  // border-radius: 5px;
-  padding: 24px 15px;
-  overflow-y: hidden;
+	margin: 7px 8px 7px 7px;
+	width: 30%;
+	max-width: 304px;
+	min-width: 240px;
+	/deep/ .el-scrollbar__wrap {
+		overflow-x: hidden !important;
+	}
+
+	//搜索输入框样式
+	/deep/ .el-input--medium .el-input__inner {
+		height: 32px;
+		background: rgba(0, 0, 0, 0.05);
+		border-radius: 4px;
+	}
+	flex: 0 0 280px;
+	background: #ffffff;
+	box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08),
+		0px 3px 6px -4px rgba(0, 0, 0, 0.12);
+	// border-radius: 5px;
+	padding: 24px 15px;
+	overflow-y: hidden;
 }
 
 .filter_tree {
-  overflow-x: auto;
-  // background-color: #f6f6f6;
-  margin-top: 5px;
+	overflow-x: auto;
+	// background-color: #f6f6f6;
+	margin-top: 5px;
 }
 
 .div_left {
-  // flex: 1;
-  width: calc(100% - 300px);
+	// flex: 1;
+	width: calc(100% - 300px);
 }
 </style>
-
-
diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue
index 0123805c7..5f75e590e 100644
--- a/src/views/modules/base/community/communityExportInfo.vue
+++ b/src/views/modules/base/community/communityExportInfo.vue
@@ -1,806 +1,871 @@
 <template>
-  <div v-if="list.length > 0"
-       class="diy-container">
-    <el-tabs v-model="activeName">
-      <el-tab-pane label="自定义模板"
-                   name="first">
-        <div class="diy-wr">
-          <div class="left">
-            <el-tabs v-model="leftActive"
-                     tab-position="left"
-                     class="left-h"
-                     @tab-click="handleTabsClick">
-              <el-tab-pane v-for="item in leftList"
-                           :key="item.id"
-                           :label="item.label"
-                           :name="item.id">
-                <div class="pd10 check-boxwr scroll-h">
-                  <checkBox v-if="item.queryItemList.length > 0"
-                            :ref="'checkbox' + item.id"
-                            :list="item.queryItemList"
-                            @change="handleChangeBox" />
-                </div>
-              </el-tab-pane>
-
-            </el-tabs>
-          </div>
-          <div class="right">
-            <div class="right-header">
-              <div class="title">导出信息</div>
-              <el-button plain
-                         @click="handlePreview('')">预览</el-button>
-            </div>
-            <div class="h80 scroll-h">
-              <el-collapse v-model="activeCollapse"
-                           id="collapsWr">
-                <el-collapse-item v-for="item in rightList"
-                                  :key="item.id"
-                                  :title="item.label"
-                                  :name="item.id"
-                                  class="col-h">
-                  <dragItem :ref="'drag' + item.id"
-                            :list="item.queryItemList"
-                            :id="item.id"
-                            @del="handleDelItem"
-                            @drag="handleDrag($event, item)"></dragItem>
-                </el-collapse-item>
-              </el-collapse>
-            </div>
-          </div>
-        </div>
-      </el-tab-pane>
-      <el-tab-pane label="模板列表"
-                   name="second">
-        <el-table :data="tableData"
-                  height="calc(80vh - 140px)"
-                  style="width: 100%">
-          <el-table-column type="index"
-                           label="序号"
-                           align="center"
-                           width="50">
-          </el-table-column>
-          <el-table-column prop="name"
-                           label="模板名称"
-                           align="center"
-                           min-width="180">
-          </el-table-column>
-          <el-table-column prop="createdBy"
-                           align="center"
-                           label="创建者"
-                           width="180">
-          </el-table-column>
-          <el-table-column align="center"
-                           prop="createdTime"
-                           label="创建时间"
-                           width="180">
-          </el-table-column>
-          <el-table-column align="center"
-                           label="操作"
-                           width="160">
-            <template slot-scope="scope">
-              <el-button v-if="scope.row.isSelf"
-                         type="text"
-                         size="small"
-                         class="div-table-button--delete"
-                         @click="handleDeltemplate(scope.row.id)">删除</el-button>
-              <el-button type="text"
-                         size="small"
-                         class="div-table-button--detail"
-                         @click="handlePreview(scope.row.id)">预览</el-button>
-              <el-button type="text"
-                         size="small"
-                         class="div-table-button--edit"
-                         @click="handleExportTemplate(scope.row.id)">导出</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-tab-pane>
-    </el-tabs>
-    <div v-if="activeName == 'first'"
-         class="diy-footer">
-      <div class="left">
-        <div class="flex-div">
-          <div>模板名称：</div>
-          <el-input v-model="form.name"
-                    maxlength="20"
-                    class="wd200 mr10" />
-          <div>自定义表头：</div>
-          <el-input v-model="form.title" maxlength="20" class="wd200 mr10" />
-          <el-checkbox v-model="form.isSaveTemp">保存为常用模板</el-checkbox>
-        </div>
-      </div>
-      <el-button class="diy-button--delete"
-                 :loading="exportLoading"
-                 @click="handleExport">导出</el-button>
-    </div>
-    <el-dialog :visible.sync="diyDialog"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               width="1150px"
-               append-to-body
-               top="5vh"
-               class="dialog-h"
-               @close="handleClose">
-      <div style="padding: 20px;">
-        <el-table :data="tableData"
-                  height="calc(80vh - 140px)"
-                  style="width: 100%">
-          <el-table-column v-for="(item, index) in previewList"
-                           :label="item.label"
-                           :key="index"
-                           align="center"
-                           min-width="120">
-            <el-table-column v-for="(n, i) in item.children"
-                             :label="n.label"
-                             :key="i"
-                             align="center"
-                             min-width="120">
-
-            </el-table-column>
-          </el-table-column>
-
-        </el-table>
-      </div>
-    </el-dialog>
-  </div>
+	<div v-if="list.length > 0" class="diy-container">
+		<el-tabs v-model="activeName">
+			<el-tab-pane label="自定义模板" name="first">
+				<div class="diy-wr">
+					<div class="left">
+						<el-tabs
+							v-model="leftActive"
+							tab-position="left"
+							class="left-h"
+							@tab-click="handleTabsClick"
+						>
+							<el-tab-pane
+								v-for="item in leftList"
+								:key="item.id"
+								:label="item.label"
+								:name="item.id"
+							>
+								<div class="pd10 check-boxwr scroll-h">
+									<checkBox
+										v-if="item.queryItemList.length > 0"
+										:ref="'checkbox' + item.id"
+										:list="item.queryItemList"
+										@change="handleChangeBox"
+									/>
+								</div>
+							</el-tab-pane>
+						</el-tabs>
+					</div>
+					<div class="right">
+						<div class="right-header">
+							<div class="title">导出信息</div>
+							<el-button plain @click="handlePreview('')"
+								>预览</el-button
+							>
+						</div>
+						<div class="h80 scroll-h">
+							<el-collapse
+								v-model="activeCollapse"
+								id="collapsWr"
+							>
+								<el-collapse-item
+									v-for="item in rightList"
+									:key="item.id"
+									:title="item.label"
+									:name="item.id"
+									class="col-h"
+								>
+									<dragItem
+										:ref="'drag' + item.id"
+										:list="item.queryItemList"
+										:id="item.id"
+										@del="handleDelItem"
+										@drag="handleDrag($event, item)"
+									></dragItem>
+								</el-collapse-item>
+							</el-collapse>
+						</div>
+					</div>
+				</div>
+			</el-tab-pane>
+			<el-tab-pane label="模板列表" name="second">
+				<el-table
+					:data="tableData"
+					height="calc(80vh - 140px)"
+					style="width: 100%"
+				>
+					<el-table-column
+						type="index"
+						label="序号"
+						align="center"
+						width="50"
+					>
+					</el-table-column>
+					<el-table-column
+						prop="name"
+						label="模板名称"
+						align="center"
+						min-width="180"
+					>
+					</el-table-column>
+					<el-table-column
+						prop="createdBy"
+						align="center"
+						label="创建者"
+						width="180"
+					>
+					</el-table-column>
+					<el-table-column
+						align="center"
+						prop="createdTime"
+						label="创建时间"
+						width="180"
+					>
+					</el-table-column>
+					<el-table-column align="center" label="操作" width="160">
+						<template slot-scope="scope">
+							<el-button
+								v-if="scope.row.isSelf"
+								type="text"
+								size="small"
+								class="div-table-button--delete"
+								@click="handleDeltemplate(scope.row.id)"
+								>删除</el-button
+							>
+							<el-button
+								type="text"
+								size="small"
+								class="div-table-button--detail"
+								@click="handlePreview(scope.row.id)"
+								>预览</el-button
+							>
+							<el-button
+								type="text"
+								size="small"
+								class="div-table-button--edit"
+								@click="handleExportTemplate(scope.row.id)"
+								>导出</el-button
+							>
+						</template>
+					</el-table-column>
+				</el-table>
+			</el-tab-pane>
+		</el-tabs>
+		<div v-if="activeName == 'first'" class="diy-footer">
+			<div class="left">
+				<div class="flex-div">
+					<div>模板名称：</div>
+					<el-input
+						v-model="form.name"
+						maxlength="20"
+						class="wd200 mr10"
+					/>
+					<div>自定义表头：</div>
+					<el-input
+						v-model="form.title"
+						maxlength="20"
+						class="wd200 mr10"
+					/>
+					<el-checkbox v-model="form.isSaveTemp"
+						>保存为常用模板</el-checkbox
+					>
+				</div>
+			</div>
+			<el-button
+				class="diy-button--delete"
+				:loading="exportLoading"
+				@click="handleExport"
+				>导出</el-button
+			>
+		</div>
+		<el-dialog
+			:visible.sync="diyDialog"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			width="1150px"
+			append-to-body
+			top="5vh"
+			class="dialog-h"
+			@close="handleClose"
+		>
+			<div style="padding: 20px">
+				<el-table
+					:data="tableData"
+					height="calc(80vh - 140px)"
+					style="width: 100%"
+				>
+					<el-table-column
+						v-for="(item, index) in previewList"
+						:label="item.label"
+						:key="index"
+						align="center"
+						min-width="120"
+					>
+						<el-table-column
+							v-for="(n, i) in item.children"
+							:label="n.label"
+							:key="i"
+							align="center"
+							min-width="120"
+						>
+						</el-table-column>
+					</el-table-column>
+				</el-table>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import checkBox from '../../../components/checkBox.vue'
-import dragItem from '../../../components/dragItem.vue'
-import Sortable from 'sortablejs'
-import { requestPost } from "@/js/dai/request"
-export default {
-  props: {
-    list: {
-      type: Array,
-      default: () => []
-    },
-    search: {
-      type: Object,
-      default: () => { }
-    }
-  },
-  components: {
-    checkBox,
-    dragItem
-  },
-  data () {
-    return {
-      exportLoading: false,
-      activeCollapse: ['1'],
-      activeName: 'first',
-      leftActive: '',
-      info: {},
-      rightList: [],
-      leftList: [],
-      form: {
-        isSaveTemp: false,
-        name: '',
-        itemList: []
-      },
-      tableData: [],
-      previewList: [],
-      diyDialog: false,
-    }
-  },
-  async created () {
-    this.list.forEach(item => {
-      this.$set(this.info, item.id, [])
-    })
-    this.leftActive = this.list[0].id
-    this.leftList = [...this.list]
-    this.leftList[0].queryItemList = await this.getExportChildList(this.leftList[0].id)
-    console.log('infodiy----', this.leftList)
-    this.getTemplateList()
-  },
-  watch: {
-    rightList: {
-      handler (val) {
-        if (val.length > 0) this.dragSort()
-
-      },
-      deep: true
-    },
-    // list: {
-    //   handler(val) {
-    //     if (val.length > 0) {
-    //       this.leftList = [...val]
-    //       this.leftList[0].queryItemList = this.getExportChildList(this.leftList[0].id)
-    //     }
-    //   },
-    //   deep: true,
-    //   // immediate: true
-    // },
-  },
-  methods: {
-    handleChangeBox ({ list, pid }) {
-      console.log('ccccc----', list)
-      // if (list.length == 0) return
-      let obj = {}
-      this.leftList.forEach(item => {
-        if (item.id == pid) obj = { ...item, queryItemList: [...list] }
-      })
-      const groups = this.rightList.map(item => item.id)
-      if (groups.includes(pid)) {
-        this.rightList.forEach((item, i) => {
-          if (item.id == pid) {
-            item.queryItemList = [...list]
-            if (list.length == 0) this.rightList.splice(i, 1)
-          }
-        })
-      } else {
-        this.rightList.push(obj)
+import checkBox from "../../../components/checkBox.vue";
+import dragItem from "../../../components/dragItem.vue";
+import Sortable from "sortablejs";
+import { requestPost } from "@/js/dai/request";
 
-        this.$nextTick(() => {
-          console.log('itemttt------', this.$refs[`drag${pid}`])
-          this.$refs[`drag${pid}`][0].dragSort()
-        })
-      }
-      this.activeCollapse = [...this.activeCollapse, pid]
-    },
-    handleTabsClick (val) {
-      console.log('tabs-----', val)
-      this.leftList.forEach(async item => {
-        if (item.id == val.name) {
-          if (item.queryItemList.length == 0) item.queryItemList = await this.getExportChildList(item.id)
-        }
-      })
-    },
-    handleDelItem (val) {
-      const { item, index } = val
-      console.log('item------', item, this.$refs[`checkbox${item.itemGroupId}`])
-      let checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList
-      checkList.forEach((n, i) => {
-        if (n == item.itemId) {
-          checkList.splice(i, 1)
-          this.$refs[`checkbox${item.itemGroupId}`][0].handleChange(checkList)
-        }
-      })
-      this.rightList.forEach((n, i) => {
-        if (n.id === item.itemGroupId) {
-          n.queryItemList.splice(index, 1)
-          if (n.queryItemList.length === 0) this.rightList.splice(i, 1)
-        }
-      })
-
-    },
-    dragSort () {
-      const el = document.getElementById('collapsWr')
-      this.sortTable = Sortable.create(el, {
-        group: 'el-collapse-item',
-        ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
-        animation: 500,
-        delay: 0,
-        onEnd: evt => {
-          console.log('evt----', evt)
-          const targetRow = this.rightList.splice(evt.oldIndex, 1)[0]
-          this.rightList.splice(evt.newIndex, 0, targetRow)
-        }
-      })
-    },
-    handleDrag (val, item) {
-      console.log('drag-----', val)
-      console.log('drag-----', item)
-      this.rightList.forEach((n, i) => {
-        if (item.id == n.id) n.queryItemList = [...val]
-      })
-    },
-    handleClose () {
-      this.previewList = []
-      this.diyDialog = false
-    },
-    handleDeltemplate (id) {
-      this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.delTemplate(id)
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        });
-      })
-    },
-    handlePreview (id) {
-      if (id) this.getPreview(id)
-      else {
-        if (this.rightList.length == 0) return this.$message.error('请选择导出信息')
-        this.previewList = this.rightList.map(item => {
-          return {
-            label: item.label,
-            children: item.queryItemList
-          }
-        })
-      }
-      this.diyDialog = true
-    },
-    handleExport () {
-      if (this.rightList.length === 0) return this.$message.error('请选择导出信息')
-      if (this.form.isSaveTemp && !this.form.name) return this.$message.error('请输入模板名称')
-      this.exportLoading = true
-      this.exportTemplate()
-
-    },
-    handleExportTemplate (id) {
-      this.exportTemplate(id)
-    },
-    async exportTemplate (id) {
-      let url = "/actual/base/communityHouse/exportExcelCustom"
+export default {
+	props: {
+		list: {
+			type: Array,
+			default: () => [],
+		},
+		search: {
+			type: Object,
+			default: () => {},
+		},
+	},
+	components: {
+		checkBox,
+		dragItem,
+	},
+	data() {
+		return {
+			exportLoading: false,
+			activeCollapse: ["1"],
+			activeName: "first",
+			leftActive: "",
+			info: {},
+			rightList: [],
+			leftList: [],
+			form: {
+				isSaveTemp: false,
+				name: "",
+				itemList: [],
+			},
+			tableData: [],
+			previewList: [],
+			diyDialog: false,
+		};
+	},
+	async created() {
+		this.list.forEach((item) => {
+			this.$set(this.info, item.id, []);
+		});
+		this.leftActive = this.list[0].id;
+		this.leftList = [...this.list];
+		this.leftList[0].queryItemList = await this.getExportChildList(
+			this.leftList[0].id
+		);
+		console.log("infodiy----", this.leftList);
+		this.getTemplateList();
+	},
+	watch: {
+		rightList: {
+			handler(val) {
+				if (val.length > 0) this.dragSort();
+			},
+			deep: true,
+		},
+		// list: {
+		//   handler(val) {
+		//     if (val.length > 0) {
+		//       this.leftList = [...val]
+		//       this.leftList[0].queryItemList = this.getExportChildList(this.leftList[0].id)
+		//     }
+		//   },
+		//   deep: true,
+		//   // immediate: true
+		// },
+	},
+	methods: {
+		handleChangeBox({ list, pid }) {
+			console.log("ccccc----", list);
+			// if (list.length == 0) return
+			let obj = {};
+			this.leftList.forEach((item) => {
+				if (item.id == pid) obj = { ...item, queryItemList: [...list] };
+			});
+			const groups = this.rightList.map((item) => item.id);
+			if (groups.includes(pid)) {
+				this.rightList.forEach((item, i) => {
+					if (item.id == pid) {
+						item.queryItemList = [...list];
+						if (list.length == 0) this.rightList.splice(i, 1);
+					}
+				});
+			} else {
+				this.rightList.push(obj);
 
-      let params = {
-        templateId: id || '',
-        searchForm: { ...this.search },
-        exportConfig: {
-          ...this.form,
-          formCode: 'community_info',
-          itemList: this.rightList.map(item => {
-            return {
-              itemId: item.id,
-              label: item.label,
-              tableName: item.queryItemList[0].tableName,
-              children: item.queryItemList,
-              supportAdd: item.supportAdd
-            }
-          })
-        }
-      }
-      await this.$http({
-        method: 'POST',
-        url,
-        responseType: 'blob',
-        data: params
-      })
-        .then(res => {
-          console.log('res----dddd', res)
-          // this.download(res.data, title + '.xls')
-          // this.getTemplateList()
+				this.$nextTick(() => {
+					console.log("itemttt------", this.$refs[`drag${pid}`]);
+					this.$refs[`drag${pid}`][0].dragSort();
+				});
+			}
+			this.activeCollapse = [...this.activeCollapse, pid];
+		},
+		handleTabsClick(val) {
+			console.log("tabs-----", val);
+			this.leftList.forEach(async (item) => {
+				if (item.id == val.name) {
+					if (item.queryItemList.length == 0)
+						item.queryItemList = await this.getExportChildList(
+							item.id
+						);
+				}
+			});
+		},
+		handleDelItem(val) {
+			const { item, index } = val;
+			console.log(
+				"item------",
+				item,
+				this.$refs[`checkbox${item.itemGroupId}`]
+			);
+			let checkList =
+				this.$refs[`checkbox${item.itemGroupId}`][0].checkedList;
+			checkList.forEach((n, i) => {
+				if (n == item.itemId) {
+					checkList.splice(i, 1);
+					this.$refs[`checkbox${item.itemGroupId}`][0].handleChange(
+						checkList
+					);
+				}
+			});
+			this.rightList.forEach((n, i) => {
+				if (n.id === item.itemGroupId) {
+					n.queryItemList.splice(index, 1);
+					if (n.queryItemList.length === 0)
+						this.rightList.splice(i, 1);
+				}
+			});
+		},
+		dragSort() {
+			const el = document.getElementById("collapsWr");
+			this.sortTable = Sortable.create(el, {
+				group: "el-collapse-item",
+				ghostClass: "sortable-ghost", // Class name for the drop placeholder,
+				animation: 500,
+				delay: 0,
+				onEnd: (evt) => {
+					console.log("evt----", evt);
+					const targetRow = this.rightList.splice(evt.oldIndex, 1)[0];
+					this.rightList.splice(evt.newIndex, 0, targetRow);
+				},
+			});
+		},
+		handleDrag(val, item) {
+			console.log("drag-----", val);
+			console.log("drag-----", item);
+			this.rightList.forEach((n, i) => {
+				if (item.id == n.id) n.queryItemList = [...val];
+			});
+		},
+		handleClose() {
+			this.previewList = [];
+			this.diyDialog = false;
+		},
 
-          this.exportLoading = false
-          // if (res.data.code && res.data.code == 9999) {
-          //   return this.$message.error(res.data.msg)
-          // }
-          this.formatData(res)
+		handleDeltemplate(id) {
+			this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			})
+				.then(() => {
+					this.delTemplate(id);
+				})
+				.catch(() => {
+					this.$message({
+						type: "info",
+						message: "已取消删除",
+					});
+				});
+		},
+		handlePreview(id) {
+			if (id) this.getPreview(id);
+			else {
+				if (this.rightList.length == 0)
+					return this.$message.error("请选择导出信息");
+				this.previewList = this.rightList.map((item) => {
+					return {
+						label: item.label,
+						children: item.queryItemList,
+					};
+				});
+			}
+			this.diyDialog = true;
+		},
+		handleExport() {
+			if (this.rightList.length === 0)
+				return this.$message.error("请选择导出信息");
+			if (this.form.isSaveTemp && !this.form.name)
+				return this.$message.error("请输入模板名称");
+			this.exportLoading = true;
+			this.exportTemplate();
+		},
+		handleExportTemplate(id) {
+			this.exportTemplate(id);
+		},
+		async exportTemplate(id) {
+			let url = "/actual/base/communityHouse/exportExcelCustom";
 
-        })
-        .catch(err => {
-          console.log('err', err)
-          this.exportLoading = false
-          return this.$message.error('网络错误')
-        })
-    },
-    async getTemplateList () {
-      let params = {
-        formCode: 'community_info'
-      }
-      await this.$http
-        .post('/oper/customize/icExportTemplate/templateList', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.tableData = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    async getPreview (id) {
-      let params = {
-        id: id || ''
-      }
-      await this.$http
-        .post('/oper/customize/icExportTemplate/templateDetail', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.previewList = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    async delTemplate (id) {
-      let params = [id]
-      await this.$http
-        .post('/oper/customize/icExportTemplate/delete', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getTemplateList()
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    async getExportChildList (groupId) {
-      const url = `/oper/customize/icformitem/getItemList/${groupId}`
-      let params = {}
+			// return console.log(this.search);
 
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
+			let params = {
+				templateId: id || "",
+				searchForm: { ...this.search },
+				exportConfig: {
+					...this.form,
+					formCode: "community_info",
+					itemList: this.rightList.map((item) => {
+						return {
+							itemId: item.id,
+							label: item.label,
+							tableName: item.queryItemList[0].tableName,
+							children: item.queryItemList,
+							supportAdd: item.supportAdd,
+						};
+					}),
+				},
+			};
+			await this.$http({
+				method: "POST",
+				url,
+				responseType: "blob",
+				data: params,
+			})
+				.then((res) => {
+					console.log("res----dddd", res);
+					// this.download(res.data, title + '.xls')
+					// this.getTemplateList()
 
-        return data
+					this.exportLoading = false;
+					// if (res.data.code && res.data.code == 9999) {
+					//   return this.$message.error(res.data.msg)
+					// }
+					this.formatData(res);
+				})
+				.catch((err) => {
+					console.log("err", err);
+					this.exportLoading = false;
+					return this.$message.error("网络错误");
+				});
+		},
+		async getTemplateList() {
+			let params = {
+				formCode: "community_info",
+			};
+			await this.$http
+				.post("/oper/customize/icExportTemplate/templateList", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.tableData = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		async getPreview(id) {
+			let params = {
+				id: id || "",
+			};
+			await this.$http
+				.post("/oper/customize/icExportTemplate/templateDetail", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.previewList = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		async delTemplate(id) {
+			let params = [id];
+			await this.$http
+				.post("/oper/customize/icExportTemplate/delete", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message({
+							type: "success",
+							message: "删除成功!",
+						});
+						this.getTemplateList();
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		async getExportChildList(groupId) {
+			const url = `/oper/customize/icformitem/getItemList/${groupId}`;
+			let params = {};
 
-      } else {
-        this.$message.error(msg)
-      }
-      // if (code === 0) {
-      //   let dataTemp = []
-      //
-      //   if (groupId === '45687aa479955f9d06204d415238f7cc_0') {
-      //     dataTemp = [
-      //       {
-      //         columnName: "GRID_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
-      //         itemId: "20220422102809_1001",
-      //         itemType: null,
-      //         label: "所属组织",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/gov/org/customergrid/gridoption",
-      //         options: null,
-      //         sort: 0,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //       {
-      //         columnName: "VILLAGE_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
-      //         itemId: "20220422102809_1002",
-      //         itemType: null,
-      //         label: "所属网格",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001",
-      //         options: null,
-      //         sort: 1,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //       {
-      //         columnName: "BUILD_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
-      //         itemId: "20220422102809_1003",
-      //         itemType: null,
-      //         label: "小区名称",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002",
-      //         options: null,
-      //         sort: 2,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //       {
-      //         columnName: "UNIT_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
-      //         itemId: "20220422102809_10031",
-      //         itemType: null,
-      //         label: "关联物业",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003",
-      //         options: null,
-      //         sort: 3,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //       {
-      //         columnName: "HOME_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
-      //         itemId: "20220422102809_1004",
-      //         itemType: null,
-      //         label: "详细地址",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031",
-      //         options: null,
-      //         sort: 4,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //       {
-      //         columnName: "IS_BDHJ",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
-      //         itemId: "20220422102809_1005",
-      //         itemType: null,
-      //         label: "备注",
-      //         optionSourceType: "local",
-      //         optionSourceValue: "options表取",
-      //         options: null,
-      //         sort: 5,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //
-      //     ]
-      //   }
-      //
-      //   if (groupId === '20220422102809_101') {
-      //     dataTemp = [
-      //       {
-      //         columnName: "GRID_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "20220422102809_101",
-      //         itemId: "20220422102809_1001",
-      //         itemType: null,
-      //         label: "所属小区",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/gov/org/customergrid/gridoption",
-      //         options: null,
-      //         sort: 0,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //
-      //       {
-      //         columnName: "VILLAGE_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "20220422102809_101",
-      //         itemId: "20220422102809_1002",
-      //         itemType: null,
-      //         label: "楼栋名称",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001",
-      //         options: null,
-      //         sort: 1,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //
-      //       {
-      //         columnName: "BUILD_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "20220422102809_101",
-      //         itemId: "20220422102809_1003",
-      //         itemType: null,
-      //         label: "楼栋类型",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002",
-      //         options: null,
-      //         sort: 2,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //
-      //       {
-      //         columnName: "UNIT_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "20220422102809_101",
-      //         itemId: "20220422102809_10031",
-      //         itemType: null,
-      //         label: "单元数",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003",
-      //         options: null,
-      //         sort: 3,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //
-      //       {
-      //         columnName: "HOME_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "20220422102809_101",
-      //         itemId: "20220422102809_1004",
-      //         itemType: null,
-      //         label: "楼栋地址",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031",
-      //         options: null,
-      //         sort: 4,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //     ]
-      //   }
-      //
-      //   if (groupId === '20220422102809_102') {
-      //     dataTemp = [
-      //       {
-      //         columnName: "GRID_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "20220422102809_102",
-      //         itemId: "20220422102809_1001",
-      //         itemType: null,
-      //         label: "所属楼栋",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/gov/org/customergrid/gridoption",
-      //         options: null,
-      //         sort: 0,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //
-      //       {
-      //         columnName: "VILLAGE_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "20220422102809_102",
-      //         itemId: "20220422102809_1002",
-      //         itemType: null,
-      //         label: "单元号",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001",
-      //         options: null,
-      //         sort: 1,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //
-      //       {
-      //         columnName: "BUILD_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "20220422102809_102",
-      //         itemId: "20220422102809_1003",
-      //         itemType: null,
-      //         label: "门牌号",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002",
-      //         options: null,
-      //         sort: 2,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //
-      //       {
-      //         columnName: "UNIT_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "20220422102809_102",
-      //         itemId: "20220422102809_10031",
-      //         itemType: null,
-      //         label: "房屋类型",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003",
-      //         options: null,
-      //         sort: 3,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //
-      //       {
-      //         columnName: "HOME_ID",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "20220422102809_102",
-      //         itemId: "20220422102809_1004",
-      //         itemType: null,
-      //         label: "房屋用途",
-      //         optionSourceType: "remote",
-      //         optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031",
-      //         options: null,
-      //         sort: 4,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //       {
-      //         columnName: "IS_BDHJ",
-      //         customerId: "45687aa479955f9d06204d415238f7cc",
-      //         itemGroupId: "20220422102809_102",
-      //         itemId: "20220422102809_1005",
-      //         itemType: null,
-      //         label: "房屋状态",
-      //         optionSourceType: "local",
-      //         optionSourceValue: "options表取",
-      //         options: null,
-      //         sort: 5,
-      //         supportAdd: false,
-      //         tableName: "ic_resi_user",
-      //       },
-      //     ]
-      //   }
-      //
-      //   return dataTemp
-      //
-      // } else {
-      //   this.$message.error(msg)
-      // }
-    },
-    formatData (res) {
-      const fileReader = new FileReader()
-      fileReader.onloadend = () => {
-        try {
-          const jsonData = JSON.parse(fileReader.result) // 说明是普通对象数据，后台转换失败
-          // 后台信息
-          console.log('jsonData---1', jsonData)
-          return this.$message.error(jsonData.msg)
-        } catch (err) { // 解析成对象失败，说明是正常的文件流
-          // 下载文件
-          console.log('errr-----', err, this)
-          this.downloadFile(res)
-        }
-      }
-      fileReader.readAsText(res.data)
-    },
-    downloadFile (res) {
-      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对象
-        this.$message.success('导出成功')
-        this.$emit('close')
-      } else this.$message.error('下载失败')
-    }
-  }
-}
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				return data;
+			} else {
+				this.$message.error(msg);
+			}
+			// if (code === 0) {
+			//   let dataTemp = []
+			//
+			//   if (groupId === '45687aa479955f9d06204d415238f7cc_0') {
+			//     dataTemp = [
+			//       {
+			//         columnName: "GRID_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+			//         itemId: "20220422102809_1001",
+			//         itemType: null,
+			//         label: "所属组织",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/gov/org/customergrid/gridoption",
+			//         options: null,
+			//         sort: 0,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//       {
+			//         columnName: "VILLAGE_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+			//         itemId: "20220422102809_1002",
+			//         itemType: null,
+			//         label: "所属网格",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001",
+			//         options: null,
+			//         sort: 1,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//       {
+			//         columnName: "BUILD_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+			//         itemId: "20220422102809_1003",
+			//         itemType: null,
+			//         label: "小区名称",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002",
+			//         options: null,
+			//         sort: 2,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//       {
+			//         columnName: "UNIT_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+			//         itemId: "20220422102809_10031",
+			//         itemType: null,
+			//         label: "关联物业",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003",
+			//         options: null,
+			//         sort: 3,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//       {
+			//         columnName: "HOME_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+			//         itemId: "20220422102809_1004",
+			//         itemType: null,
+			//         label: "详细地址",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031",
+			//         options: null,
+			//         sort: 4,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//       {
+			//         columnName: "IS_BDHJ",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+			//         itemId: "20220422102809_1005",
+			//         itemType: null,
+			//         label: "备注",
+			//         optionSourceType: "local",
+			//         optionSourceValue: "options表取",
+			//         options: null,
+			//         sort: 5,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//
+			//     ]
+			//   }
+			//
+			//   if (groupId === '20220422102809_101') {
+			//     dataTemp = [
+			//       {
+			//         columnName: "GRID_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "20220422102809_101",
+			//         itemId: "20220422102809_1001",
+			//         itemType: null,
+			//         label: "所属小区",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/gov/org/customergrid/gridoption",
+			//         options: null,
+			//         sort: 0,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//
+			//       {
+			//         columnName: "VILLAGE_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "20220422102809_101",
+			//         itemId: "20220422102809_1002",
+			//         itemType: null,
+			//         label: "楼栋名称",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001",
+			//         options: null,
+			//         sort: 1,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//
+			//       {
+			//         columnName: "BUILD_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "20220422102809_101",
+			//         itemId: "20220422102809_1003",
+			//         itemType: null,
+			//         label: "楼栋类型",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002",
+			//         options: null,
+			//         sort: 2,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//
+			//       {
+			//         columnName: "UNIT_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "20220422102809_101",
+			//         itemId: "20220422102809_10031",
+			//         itemType: null,
+			//         label: "单元数",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003",
+			//         options: null,
+			//         sort: 3,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//
+			//       {
+			//         columnName: "HOME_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "20220422102809_101",
+			//         itemId: "20220422102809_1004",
+			//         itemType: null,
+			//         label: "楼栋地址",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031",
+			//         options: null,
+			//         sort: 4,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//     ]
+			//   }
+			//
+			//   if (groupId === '20220422102809_102') {
+			//     dataTemp = [
+			//       {
+			//         columnName: "GRID_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "20220422102809_102",
+			//         itemId: "20220422102809_1001",
+			//         itemType: null,
+			//         label: "所属楼栋",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/gov/org/customergrid/gridoption",
+			//         options: null,
+			//         sort: 0,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//
+			//       {
+			//         columnName: "VILLAGE_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "20220422102809_102",
+			//         itemId: "20220422102809_1002",
+			//         itemType: null,
+			//         label: "单元号",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityQuarters/listQuartersOptions?20220422102809_1001",
+			//         options: null,
+			//         sort: 1,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//
+			//       {
+			//         columnName: "BUILD_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "20220422102809_102",
+			//         itemId: "20220422102809_1003",
+			//         itemType: null,
+			//         label: "门牌号",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityBuilding/buildingoption?20220422102809_1002",
+			//         options: null,
+			//         sort: 2,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//
+			//       {
+			//         columnName: "UNIT_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "20220422102809_102",
+			//         itemId: "20220422102809_10031",
+			//         itemType: null,
+			//         label: "房屋类型",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityBuildingUnit/unitoption?20220422102809_1003",
+			//         options: null,
+			//         sort: 3,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//
+			//       {
+			//         columnName: "HOME_ID",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "20220422102809_102",
+			//         itemId: "20220422102809_1004",
+			//         itemType: null,
+			//         label: "房屋用途",
+			//         optionSourceType: "remote",
+			//         optionSourceValue: "/actual/base/communityHouse/houseoption?20220422102809_10031",
+			//         options: null,
+			//         sort: 4,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//       {
+			//         columnName: "IS_BDHJ",
+			//         customerId: "45687aa479955f9d06204d415238f7cc",
+			//         itemGroupId: "20220422102809_102",
+			//         itemId: "20220422102809_1005",
+			//         itemType: null,
+			//         label: "房屋状态",
+			//         optionSourceType: "local",
+			//         optionSourceValue: "options表取",
+			//         options: null,
+			//         sort: 5,
+			//         supportAdd: false,
+			//         tableName: "ic_resi_user",
+			//       },
+			//     ]
+			//   }
+			//
+			//   return dataTemp
+			//
+			// } else {
+			//   this.$message.error(msg)
+			// }
+		},
+		formatData(res) {
+			const fileReader = new FileReader();
+			fileReader.onloadend = () => {
+				try {
+					const jsonData = JSON.parse(fileReader.result); // 说明是普通对象数据，后台转换失败
+					// 后台信息
+					console.log("jsonData---1", jsonData);
+					return this.$message.error(jsonData.msg);
+				} catch (err) {
+					// 解析成对象失败，说明是正常的文件流
+					// 下载文件
+					console.log("errr-----", err, this);
+					this.downloadFile(res);
+				}
+			};
+			fileReader.readAsText(res.data);
+		},
+		downloadFile(res) {
+			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对象
+				this.$message.success("导出成功");
+				this.$emit("close");
+			} else this.$message.error("下载失败");
+		},
+	},
+};
 </script>
 
 <style lang="scss" scoped>
 .diy-container {
-  padding: 20px 20px 0 20px;
+	padding: 20px 20px 0 20px;
 }
 .diy-wr {
-  display: flex;
-  width: 100%;
-  height: calc(80vh - 120px);
-  .left {
-    width: 49%;
-    height: 100%;
-    .check-boxwr {
-      height: calc(80vh - 120px);
-      overflow: auto;
-    }
-  }
-  .right {
-    flex-shrink: 0;
-    width: 50%;
-    height: 100%;
-    box-sizing: border-box;
-    margin-left: 20px;
-    padding: 0 20px;
-    border-left: 1px solid #eee;
-    .right-header {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      padding-bottom: 10px;
-      // border-bottom: 1px solid #eee;
-      .title {
-        font-weight: 500;
-      }
-    }
-  }
+	display: flex;
+	width: 100%;
+	height: calc(80vh - 120px);
+	.left {
+		width: 49%;
+		height: 100%;
+		.check-boxwr {
+			height: calc(80vh - 120px);
+			overflow: auto;
+		}
+	}
+	.right {
+		flex-shrink: 0;
+		width: 50%;
+		height: 100%;
+		box-sizing: border-box;
+		margin-left: 20px;
+		padding: 0 20px;
+		border-left: 1px solid #eee;
+		.right-header {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding-bottom: 10px;
+			// border-bottom: 1px solid #eee;
+			.title {
+				font-weight: 500;
+			}
+		}
+	}
 }
 .h80 {
-  height: calc(80vh - 160px);
-  overflow: auto;
+	height: calc(80vh - 160px);
+	overflow: auto;
 }
 .diy-footer {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-top: 10px;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-top: 10px;
 }
 .left-h {
-  height: 100%;
-  ::v-deep .el-tabs__header.is-left,
-  ::v-deep .el-tabs__nav-wrap.is-left::after {
-    height: calc(80vh - 120px);
-  }
+	height: 100%;
+	::v-deep .el-tabs__header.is-left,
+	::v-deep .el-tabs__nav-wrap.is-left::after {
+		height: calc(80vh - 120px);
+	}
 }
 .flex-div {
-  display: flex;
-  align-items: center;
+	display: flex;
+	align-items: center;
 }
 // #collapsWr {
 //   .col-h {
@@ -812,15 +877,15 @@ export default {
 //   }
 // }
 .mb10 {
-  margin-bottom: 10px;
+	margin-bottom: 10px;
 }
 .pd10 {
-  padding: 10px;
+	padding: 10px;
 }
 .mr10 {
-  margin-right: 10px;
+	margin-right: 10px;
 }
 .wd200 {
-  width: 200px;
+	width: 200px;
 }
 </style>
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index cbd58b039..5bab55912 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -474,7 +474,7 @@ export default {
         this.resetData()
         this.$emit('dialogOk')
         this.btnDisable = false
-      } else {
+      } else if (code>=8000){
         this.btnDisable = false
         this.$message.error(msg)
       }
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index ad96eefe5..4df613eba 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -1,204 +1,292 @@
 <template>
-  <div class="m-table">
-
-    <div class="u-table-btn2">
-
-      <div class="u-table-btn2-left">
-        <el-button style=""
-                   size="small"
-                   class="diy-button--blue"
-                   icon="el-icon-plus"
-                   @click="handleAdd">新增小区</el-button>
-
-        <div v-if="showImportBtn"
-             class="u-btn-upload">
-
-          <el-popover v-if="showImportBtn"
-                      popper-class="btn-popper"
-                      placement="bottom"
-                      width="20"
-                      trigger="click">
-
-            <div class="table-more-btn">
-              <el-upload :headers="$getElUploadHeaders()"
-                         ref="upload_community"
-                         style="text-align: center"
-                         :multiple='false'
-                         :show-file-list='false'
-                         :before-upload="((file)=>{beforeUpload(file, 'community')})"
-                         action=""
-                         accept=".xls,.xlsx"
-                         :http-request="(()=>{uploadFile( 'community')})">
-                <el-button size="small"
-                           type="text"
-                           class="diy-button--other">导入小区数据</el-button>
-              </el-upload>
-            </div>
-
-            <div class="table-more-btn">
-
-              <el-upload :headers="$getElUploadHeaders()"
-                         style="text-align: center"
-                         ref="upload_building"
-                         :multiple='false'
-                         :show-file-list='false'
-                         :before-upload="((file)=>{beforeUpload(file, 'building')})"
-                         action=""
-                         accept=".xls,.xlsx"
-                         :http-request="(()=>{uploadFile( 'building')})">
-                <el-button size="small"
-                           type="text"
-                           class="diy-button--other">导入楼栋数据</el-button>
-              </el-upload>
-            </div>
-
-            <div class="table-more-btn">
-              <el-upload :headers="$getElUploadHeaders()"
-                         style="text-align: center"
-                         ref="upload_room"
-                         :multiple='false'
-                         :show-file-list='false'
-                         :before-upload="((file)=>{beforeUpload(file, 'room')})"
-                         action=""
-                         accept=".xls,.xlsx"
-                         :http-request="(()=>{uploadFile( 'room')})">
-                <el-button size="small"
-                           type="text"
-                           class="diy-button--other">导入房屋数据</el-button>
-              </el-upload>
-            </div>
-            <el-button size="small"
-                       style="float:right"
-                       class="diy-button--white"
-                       slot="reference">导入<i class="el-icon-arrow-down el-icon--right"></i></el-button>
-          </el-popover>
-
-        </div>
-        <el-button style="margin-left:10px"
-                   class="diy-button--white"
-                   size="small"
-                   @click="handleExportOpen">导出</el-button>
-
-        <el-button style="margin-left:10px"
-                   class="diy-button--white"
-                   size="small"
-                   @click="deleteBatch">批量删除</el-button>
-
-        <!-- <el-button style=";margin-left:10px"
+	<div class="m-table">
+		<div class="u-table-btn2">
+			<div class="u-table-btn2-left">
+				<el-button
+					style=""
+					size="small"
+					class="diy-button--blue"
+					icon="el-icon-plus"
+					@click="handleAdd"
+					>新增小区</el-button
+				>
+
+				<div v-if="showImportBtn" class="u-btn-upload">
+					<el-popover
+						v-if="showImportBtn"
+						popper-class="btn-popper"
+						placement="bottom"
+						width="20"
+						trigger="click"
+					>
+						<div class="table-more-btn">
+							<el-upload
+								:headers="$getElUploadHeaders()"
+								ref="upload_community"
+								style="text-align: center"
+								:multiple="false"
+								:show-file-list="false"
+								:before-upload="
+									(file) => {
+										beforeUpload(file, 'community');
+									}
+								"
+								action=""
+								accept=".xls,.xlsx"
+								:http-request="
+									() => {
+										uploadFile('community');
+									}
+								"
+							>
+								<el-button
+									size="small"
+									type="text"
+									class="diy-button--other"
+									>导入小区数据</el-button
+								>
+							</el-upload>
+						</div>
+
+						<div class="table-more-btn">
+							<el-upload
+								:headers="$getElUploadHeaders()"
+								style="text-align: center"
+								ref="upload_building"
+								:multiple="false"
+								:show-file-list="false"
+								:before-upload="
+									(file) => {
+										beforeUpload(file, 'building');
+									}
+								"
+								action=""
+								accept=".xls,.xlsx"
+								:http-request="
+									() => {
+										uploadFile('building');
+									}
+								"
+							>
+								<el-button
+									size="small"
+									type="text"
+									class="diy-button--other"
+									>导入楼栋数据</el-button
+								>
+							</el-upload>
+						</div>
+
+						<div class="table-more-btn">
+							<el-upload
+								:headers="$getElUploadHeaders()"
+								style="text-align: center"
+								ref="upload_room"
+								:multiple="false"
+								:show-file-list="false"
+								:before-upload="
+									(file) => {
+										beforeUpload(file, 'room');
+									}
+								"
+								action=""
+								accept=".xls,.xlsx"
+								:http-request="
+									() => {
+										uploadFile('room');
+									}
+								"
+							>
+								<el-button
+									size="small"
+									type="text"
+									class="diy-button--other"
+									>导入房屋数据</el-button
+								>
+							</el-upload>
+						</div>
+						<el-button
+							size="small"
+							style="float: right"
+							class="diy-button--white"
+							slot="reference"
+							>导入<i
+								class="el-icon-arrow-down el-icon--right"
+							></i
+						></el-button>
+					</el-popover>
+				</div>
+				<el-button
+					style="margin-left: 10px"
+					class="diy-button--white"
+					size="small"
+					@click="handleExportOpen"
+					>导出</el-button
+				>
+
+				<el-button
+					style="margin-left: 10px"
+					class="diy-button--white"
+					size="small"
+					@click="deleteBatch"
+					>批量删除</el-button
+				>
+
+				<!-- <el-button style=";margin-left:10px"
                  class="diy-button--export"
                  size="small"
                  :disabled="yihuyidangDisabled"
                  @click="handleExportYihuyidang()">导出一户一档</el-button> -->
-      </div>
-      <div>
-        <el-popover popper-class="btn-popper"
-                    placement="bottom"
-                    style="margin-left: 10px"
-                    width="20"
-                    trigger="click">
-          <div v-if="showImportBtn"
-               class="table-more-btn">
-            <el-button class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('community')">下载小区模板</el-button>
-          </div>
-
-          <div v-if="showImportBtn"
-               class="table-more-btn">
-            <el-button :headers="$getElUploadHeaders()"
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('building')">下载楼栋模板</el-button>
-          </div>
-          <div v-if="showImportBtn"
-               class="table-more-btn">
-            <el-button :headers="$getElUploadHeaders()"
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('room')">下载房屋模板</el-button>
-          </div>
-          <div v-if="showYhymInfo && customerId!=='1535072605621841922'"
-               class="table-more-btn">
-            <el-button :headers="$getElUploadHeaders()"
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       :loading="yhymLoading"
-                       @click="handleYhymInfo">补全一房一码信息</el-button>
-
-          </div>
-          <div v-if="showYhymInfo && customerId!=='1535072605621841922'"
-               class="table-more-btn">
-            <el-button class="diy-button--other"
-                       size="small"
-                       type="text"
-                       :loading="xcxmLoading"
-                       @click="createBatchNeiQrUrl">补全小程序小区码</el-button>
-          </div>
-          <div v-if="displayedBaobiaoBtn"
-               class="table-more-btn">
-            <el-button size="small"
-                       type="text"
-                       class="diy-button--other"
-                       @click="reportForm">智能填报</el-button>
-          </div>
-          <div v-if="agencyObj.level == 'community'"
-               class="table-more-btn">
-            <el-button class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleDownQr(agencyObj, 'community')">社区二维码</el-button>
-          </div>
-          <el-button size="small"
-                     style="float:right"
-                     class="diy-button--white"
-                     slot="reference">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
-        </el-popover>
-      </div>
-    </div>
-
-    <div class="m-table-item">
-      <el-table ref="ref_table"
-                :data="tableData"
-                border
-                :height="tableHeight"
-                v-loading="tableLoading"
-                style="width: 100%"
-                :show-overflow-tooltip="true"
-                @select-all="selectAll"
-                @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         :selectable="checkSelect"
-                         width="55">
-        </el-table-column>
-        <el-table-column prop="neighborHoodName"
-                         label="小区名称"
-                         header-align="left"
-                         align="left"
-                         min-width="100">
-          <template slot-scope="scope">
-            <a class="name-a"
-               @click="handleToNextLevel(scope.row)">
-              {{ scope.row.neighborHoodName }}
-            </a>
-          </template>
-        </el-table-column>
-        <el-table-column prop="agencyName"
-                         label="所属组织"
-                         header-align="left"
-                         align="left"
-                         min-width="100">
-        </el-table-column>
-        <el-table-column prop="gridName"
-                         label="所属网格"
-                         header-align="left"
-                         align="left"
-                         min-width="120">
-        </el-table-column>
-        <!-- <el-table-column prop="总单元数"
+			</div>
+			<div>
+				<el-popover
+					popper-class="btn-popper"
+					placement="bottom"
+					style="margin-left: 10px"
+					width="20"
+					trigger="click"
+				>
+					<div v-if="showImportBtn" class="table-more-btn">
+						<el-button
+							class="diy-button--other"
+							size="small"
+							type="text"
+							@click="handleExportModule('community')"
+							>下载小区模板</el-button
+						>
+					</div>
+
+					<div v-if="showImportBtn" class="table-more-btn">
+						<el-button
+							:headers="$getElUploadHeaders()"
+							class="diy-button--other"
+							size="small"
+							type="text"
+							@click="handleExportModule('building')"
+							>下载楼栋模板</el-button
+						>
+					</div>
+					<div v-if="showImportBtn" class="table-more-btn">
+						<el-button
+							:headers="$getElUploadHeaders()"
+							class="diy-button--other"
+							size="small"
+							type="text"
+							@click="handleExportModule('room')"
+							>下载房屋模板</el-button
+						>
+					</div>
+					<div
+						v-if="
+							showYhymInfo && customerId !== '1535072605621841922'
+						"
+						class="table-more-btn"
+					>
+						<el-button
+							:headers="$getElUploadHeaders()"
+							class="diy-button--other"
+							size="small"
+							type="text"
+							:loading="yhymLoading"
+							@click="handleYhymInfo"
+							>补全一房一码信息</el-button
+						>
+					</div>
+					<div
+						v-if="
+							showYhymInfo && customerId !== '1535072605621841922'
+						"
+						class="table-more-btn"
+					>
+						<el-button
+							class="diy-button--other"
+							size="small"
+							type="text"
+							:loading="xcxmLoading"
+							@click="createBatchNeiQrUrl"
+							>补全小程序小区码</el-button
+						>
+					</div>
+					<div v-if="displayedBaobiaoBtn" class="table-more-btn">
+						<el-button
+							size="small"
+							type="text"
+							class="diy-button--other"
+							@click="reportForm"
+							>智能填报</el-button
+						>
+					</div>
+					<div
+						v-if="agencyObj.level == 'community'"
+						class="table-more-btn"
+					>
+						<el-button
+							class="diy-button--other"
+							size="small"
+							type="text"
+							@click="handleDownQr(agencyObj, 'community')"
+							>社区二维码</el-button
+						>
+					</div>
+					<el-button
+						size="small"
+						style="float: right"
+						class="diy-button--white"
+						slot="reference"
+						>更多<i class="el-icon-arrow-down el-icon--right"></i
+					></el-button>
+				</el-popover>
+			</div>
+		</div>
+
+		<div class="m-table-item">
+			<el-table
+				ref="ref_table"
+				:data="tableData"
+				border
+				:height="tableHeight"
+				v-loading="tableLoading"
+				style="width: 100%"
+				:show-overflow-tooltip="true"
+				@select-all="selectAll"
+				@selection-change="selectionChange"
+			>
+				<el-table-column
+					type="selection"
+					:selectable="checkSelect"
+					width="55"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="neighborHoodName"
+					label="小区名称"
+					header-align="left"
+					align="left"
+					min-width="100"
+				>
+					<template slot-scope="scope">
+						<a class="name-a" @click="handleToNextLevel(scope.row)">
+							{{ scope.row.neighborHoodName }}
+						</a>
+					</template>
+				</el-table-column>
+				<el-table-column
+					prop="agencyName"
+					label="所属组织"
+					header-align="left"
+					align="left"
+					min-width="100"
+				>
+				</el-table-column>
+				<el-table-column
+					prop="gridName"
+					label="所属网格"
+					header-align="left"
+					align="left"
+					min-width="120"
+				>
+				</el-table-column>
+				<!-- <el-table-column prop="总单元数"
                          label="所属网格"
                          min-width="80">
         </el-table-column>
@@ -206,79 +294,100 @@
                          label="所属网格"
                          min-width="80">
         </el-table-column> -->
-        <el-table-column prop="address"
-                         label="详细地址"
-                         header-align="left"
-                         align="left"
-                         min-width="180">
-        </el-table-column>
-
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="220"
-                         header-align="center"
-                         align="center"
-                         class="operate">
-          <template slot-scope="scope">
-
-            <el-button type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleEdit(scope.row)">编辑</el-button>
-
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
-      </div>
-
-    </div>
-    <!-- 详情弹出框 -->
-    <el-dialog :visible.sync="detailShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'小区详情'"
-               width="920px"
-               top="5vh"
-               class="dialog-h"
-               @closed="detailFormCancle">
-      <community-detail ref="ref_form_detail"
-                        @diaDetailClose="detailFormCancle"></community-detail>
-    </el-dialog>
-
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="670px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <community-form ref="ref_form"
-                      @dialogCancle="addFormCancle"
-                      @dialogOk="addFormOk"></community-form>
-    </el-dialog>
-
-    <!-- <el-dialog title="导出"
+				<el-table-column
+					prop="address"
+					label="详细地址"
+					header-align="left"
+					align="left"
+					min-width="180"
+				>
+				</el-table-column>
+
+				<el-table-column
+					label="操作"
+					fixed="right"
+					width="220"
+					header-align="center"
+					align="center"
+					class="operate"
+				>
+					<template slot-scope="scope">
+						<el-button
+							type="text"
+							class="div-table-button--blue"
+							size="small"
+							@click="handleDetail(scope.row)"
+							>查看</el-button
+						>
+						<el-button
+							v-if="scope.row.showBtn"
+							type="text"
+							class="div-table-button--blue"
+							size="small"
+							@click="handleEdit(scope.row)"
+							>编辑</el-button
+						>
+
+						<el-button
+							v-if="scope.row.showBtn"
+							type="text"
+							class="div-table-button--blue"
+							size="small"
+							@click="handleDelete(scope.row)"
+							>删除</el-button
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div>
+				<el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page.sync="pageNo"
+					:page-sizes="[20, 50, 100, 200]"
+					:page-size="pageSize"
+					layout="sizes, prev, pager, next, total"
+					:total="total"
+				>
+				</el-pagination>
+			</div>
+		</div>
+		<!-- 详情弹出框 -->
+		<el-dialog
+			:visible.sync="detailShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="'小区详情'"
+			width="920px"
+			top="5vh"
+			class="dialog-h"
+			@closed="detailFormCancle"
+		>
+			<community-detail
+				ref="ref_form_detail"
+				@diaDetailClose="detailFormCancle"
+			></community-detail>
+		</el-dialog>
+
+		<!-- 修改弹出框 -->
+		<el-dialog
+			:visible.sync="formShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="formTitle"
+			width="670px"
+			top="5vh"
+			class="dialog-h"
+			@closed="diaClose"
+		>
+			<community-form
+				ref="ref_form"
+				@dialogCancle="addFormCancle"
+				@dialogOk="addFormOk"
+			></community-form>
+		</el-dialog>
+
+		<!-- <el-dialog title="导出"
                :visible.sync="dialogVisible"
                width="30%"
                :before-close="handleClose">
@@ -299,937 +408,963 @@
 
     </el-dialog> -->
 
-    <el-dialog :visible.sync="diyDialog"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               width="1150px"
-               title="导出模板"
-               top="5vh"
-               class="dialog-h">
-      <community-export-info v-if="diyDialog"
-                             ref="ref_diy"
-                             :list="exportList"
-                             :search="{
-          formCode: 'community_info',
-          pageNo: pageNo,
-          pageSize: pageSize,
-          conditions: conditions,
-        }"
-                             @close="handleDiyClose"></community-export-info>
-    </el-dialog>
-
-    <baobiao ref="baobiao" />
-  </div>
+		<el-dialog
+			:visible.sync="diyDialog"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			width="1150px"
+			title="导出模板"
+			top="5vh"
+			class="dialog-h"
+		>
+			<community-export-info
+				v-if="diyDialog"
+				ref="ref_diy"
+				:list="exportList"
+				:search="{
+					formCode: 'community_info',
+					pageNo: pageNo,
+					pageSize: pageSize,
+					conditions: conditions,
+				}"
+				@close="handleDiyClose"
+			></community-export-info>
+		</el-dialog>
+
+		<baobiao ref="baobiao" />
+	</div>
 </template>
 
 <script>
-
-import CommunityForm from './communityForm'
-import CommunityDetail from './communityDetail'
+import CommunityForm from "./communityForm";
+import CommunityDetail from "./communityDetail";
 import communityExportInfo from "./communityExportInfo.vue";
 
 import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import axios from 'axios'
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import axios from "axios";
 import baobiao from "@/views/modules/cpts/baobiao";
+import util from "@/js/util";
+
+let loading; // 加载动画
 
-let loading // 加载动画
 export default {
-  data () {
-    return {
-      searchHeight: 190,//搜索栏高度
-      // tableHeight: 0,
-      importBuildingLoading: false,
-      importRoomLoading: false,
-      importCommunityLoading: false,
-      total: 0,
-      pageSize: 20,
-      pageNo: 0,
-      tableLoading: true,
-
-      showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
-      roleList: [],//角色列表
-      showYhymInfo: false, // 是否显示补全一房一码信息按钮
-      yhymLoading: false,
-      xcxmLoading: false,
-
-      agencyObj: {},//树所选的组织对象
-
-      tableData: [],
-      validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
-      selection: [],
-      showDeletBtn: false,
-
-      //form相关
-      formShow: false,
-      formTitle: '新增小区',
-
-      detailShow: false,
-
-      files: "",
-      fileName: "",
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
-      yihuyidangDisabled: false,
-      yihuyimaDisabled: false,
-      exportBtn: false,
-
-      displayedBaobiaoBtn: false,
-      customerId: '',//烟台的客户id :  1535072605621841922
-
-      //导出
-      exportList: [],
-      diyDialog: false,
-      conditions: [],
-    }
-  },
-  components: {
-    baobiao,
-    CommunityForm,
-    CommunityDetail,
-    communityExportInfo
-  },
-  activated () {
-
-  },
-  async mounted () {
-
-    this.customerId = localStorage.getItem('customerId')
-    // this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
-    //   elseParams: {
-    //     categoryKeys: ['house_info'], categoryKey: 'house_info',
-    //   }
-    // });
-  },
-
-  methods: {
-    reportForm () {
-      let paramMap = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-        level: this.agencyObj.level,
-        id: this.agencyObj.id,
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        rentFlag: this.rentFlag,
-        purpose: this.purpose,
-        remark: this.remark,
-        sortType: this.sortType,
-        updateStartDate: this.updateStartDate,
-        updateEndDate: this.updateEndDate,
-      };
-      this.$refs.baobiao.init({
-        elseParams: {
-          categoryKeys: ['house_info'], categoryKey: 'house_info', paramMap
-        }
-      })
-    },
-    async loadTable (fromTree, treeObj) {
-      console.log(111, this.staffAgencyId)
-      // 是否显示补全一房一码信息按钮
-      this.roleList = localStorage.getItem('roleList')
-      if (this.roleList.indexOf('root_manager') > -1 || this.roleList.indexOf('manager') > -1) {
-        this.showYhymInfo = true
-      } else {
-        this.showYhymInfo = false
-      }
-      this.tableLoading = true
-      if (fromTree) {
-        this.agencyObj = treeObj
-        if (this.agencyObj.level === 'community') {//只有社区和网格显示操作按钮
-          if (this.agencyObj.id === this.staffAgencyId) {//如果所选树的组织id和登录人员id相同，有权限
-            this.showImportBtn = true
-          } else {
-            this.showImportBtn = false
-          }
-        } else if (this.agencyObj.level === 'grid') {//网格下
-          if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限
-            this.showImportBtn = true
-          } else {
-            this.showImportBtn = false
-          }
-        } else {
-          this.showImportBtn = false
-        }
-      }
-
-      const url = "/actual/base/communityQuarters/listQuarters"
-
-      let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-
-        level: this.agencyObj.level,
-        id: this.agencyObj.id
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.validTableDataNum = 0
-        this.total = data.total
-        data.list.forEach(item => {
-          if (item.agencyId === this.staffAgencyId) {
-            item.showBtn = true
-            this.validTableDataNum++
-          } else {
-            item.showBtn = false
-          }
-
-        });
-        this.tableData = data.list
-      } else {
-        this.$message.error(msg)
-      }
-      this.tableLoading = false
-    },
-
-    checkSelect (row, index) {
-      let isChecked = false;
-      if (row.showBtn) { // 判断里面是否存在某个参数
-        isChecked = true
-      } else {
-        isChecked = false
-      }
-      return isChecked
-    },
-
-    diaClose () {
-      this.$refs.ref_form.resetData()
-      this.formShow = false
-    },
-
-    async handleDetail (row) {
-      // this.formTitle = '小区详情'
-      // this.formShow = true
-      // const _data = await this.detail(row)
-      // this.$nextTick(() => {
-      //   this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
-      // })
-
-      this.detailShow = true
-
-      const _data = await this.detail(row)
-      this.$nextTick(() => {
-        this.$refs.ref_form_detail.initForm(_data)
-      })
-    },
-
-    handleAdd () {
-      this.formTitle = '新增小区'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null, this.agencyObj)
-      })
-    },
-    async detail (row) {
-      const url = "/actual/base/communityQuarters/getQuartersDetail/" + row.neighborHoodId
-
-
-      const { data, code, msg } = await requestPost(url)
-
-      if (code === 0) {
-        return data
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    // 补全一房一码点击事件
-    async handleYhymInfo () {
-      this.yhymLoading = true
-      const url = "/gov/org/house/createBatchHouseCodeAndUrl"
-
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.yhymLoading = false
-        this.$message({
-          type: "success",
-          message: "批量生成成功"
-        });
-      } else if (code > 8000) {
-        this.yhymLoading = false
-        this.$message({
-          showClose: true,
-          message: msg,
-          duration: 0
-        })
-      } else {
-        this.yhymLoading = false
-        this.$message.error(msg)
-      }
-    },
-    // 补全小程序一户一码
-    async createBatchNeiQrUrl () {
-      this.xcxmLoading = true
-      const url = "/gov/org/neighborhood/createBatchNeiQrUrl"
-
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.xcxmLoading = false
-        this.$message({
-          type: "success",
-          message: "批量生成成功"
-        });
-      } else if (code > 8000) {
-        this.xcxmLoading = false
-        this.$message({
-          showClose: true,
-          message: msg,
-          duration: 0
-        })
-      } else {
-        this.xcxmLoading = false
-        this.$message.error(msg)
-      }
-    },
-    async handleEdit (row) {
-      this.formTitle = '修改小区'
-      this.formShow = true
-      const _data = await this.detail(row)
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', _data, this.agencyObj)
-      })
-    },
-
-    handleToNextLevel (row) {
-      this.$emit('toNextLevel', row, 'community')
-    },
-
-    addFormCancle () {
-      this.formShow = false
-
-    },
-    detailFormCancle () {
-      this.$refs.ref_form_detail.diaDestroy()
-      this.detailShow = false
-    },
-    addFormOk () {
-      this.formShow = false
-      this.loadTable()
-      this.$emit('refreshTree')
-    },
-
-    deleteBatch () {
-      if (this.selection.length > 0) {
-        this.$confirm("确认删除选择的小区?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            this.deleteCommunityBatch()
-          })
-          .catch(err => {
-            if (err == "cancel") {
-              // this.$message({
-              //   type: "info",
-              //   message: "已取消删除"
-              // });
-            }
-
-          });
-      } else {
-        this.$message.warning('请先选择要删除的小区')
-      }
-    },
-    selectAll (selection) {
-
-      this.selection = selection
-
-
-    },
-    selectionChange (selection) {
-      this.selection = selection
-
-    },
-
-    async handleDelete (row) {
-
-      this.$confirm("确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.deleteCommunity(row)
-        })
-        .catch(err => {
-          if (err == "cancel") {
-            // this.$message({
-            //   type: "info",
-            //   message: "已取消删除"
-            // });
-          }
-
-        });
-    },
-
-    async deleteCommunityBatch () {
-      let ids = []
-      console.log(this.selection)
-      this.selection.forEach(element => {
-
-        ids.push(element.neighborHoodId)
-      });
-
-      const url = "/actual/base/communityHouse/deleteCommunityInfoByIds"
-
-      let params = {
-        type: 'neighborHood',
-        ids: ids
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else if (code > 8000) {
-        this.$message({
-          showClose: true,
-          message: msg,
-          duration: 0
-        })
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    async deleteCommunity (row) {
-      const url = "/actual/base/communityQuarters/deleteQuarters"
-
-      let params = {
-        quartersId: row.neighborHoodId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    async handleDownQr (row, type) {
-      let title = row.label + '二维码.png'
-      // const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}`
-      const url = '/gov/org/agency/create-qrcode'
-      const _id = type == 'community' ? row.id : row.neighborHoodId
-      const params = {
-        id: _id,
-        type
-      }
-      await axios({
-        method: 'POST',
-        url: window.SITE_CONFIG['apiURL'] + url,
-        data: params,
-        responseType: 'blob'
-      }).then(res => {
-        console.log('res----1r', res)
-        if (res.data) {
-          // let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-          // console.log('filename', fileName)
-          this.download(res.data, title) //释放掉blob对象
-        } else this.$message.error('下载失败')
-        // this.download(res.data, '1.png')
-      })
-    },
-    // 导出按钮点击事件
-    async handleExportOpen () {
-      await this.getExportList();
-
-    },
-    async getExportList (type) {
-      const url = "/oper/customize/icformitemgroup/list";
-      let params = {
-        formCode: "community_info",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        data.forEach((item) => {
-          (async (id) => {
-            // item.queryItemList = await this.getExportChildList(id)
-            item.queryItemList = [];
-          })(item.id);
-        });
-        this.exportList = [...data];
-        this.$nextTick(() => {
-          this.diyDialog = true;
-        });
-        console.log("获取详情成功getExportList----", this.exportList);
-      } else {
-        this.$message.error(msg);
-      }
-
-      // if (code === 0) {
-      //   //暂无接口
-      //   let dataTemp = [
-      //     {
-      //       childShowFlag: "0",
-      //       customerId: "45687aa479955f9d06204d415238f7cc",
-      //       display: false,
-      //       formCode: "resi_base_info",
-      //       formId: "20220422102809_1",
-      //       groupCode: "jcxx",
-      //       id: "45687aa479955f9d06204d415238f7cc_0",
-      //       label: "小区信息",
-      //       policyFlag: "1",
-      //       sort: 0,
-      //       supportAdd: false,
-      //       tableName: "ic_resi_user"
-      //     },
-      //     {
-      //       childShowFlag: "0",
-      //       customerId: "45687aa479955f9d06204d415238f7cc",
-      //       display: true,
-      //       formCode: "resi_base_info",
-      //       formId: "20220422102809_1",
-      //       groupCode: "jyxx",
-      //       id: "20220422102809_101",
-      //       label: "楼栋信息",
-      //       policyFlag: "1",
-      //       sort: 1,
-      //       supportAdd: false,
-      //       tableName: "ic_resi_user",
-      //     },
-      //     {
-      //       childShowFlag: "0",
-      //       customerId: "45687aa479955f9d06204d415238f7cc",
-      //       display: true,
-      //       formCode: "resi_base_info",
-      //       formId: "20220422102809_1",
-      //       groupCode: "xqah",
-      //       id: "20220422102809_102",
-      //       label: "房屋信息",
-      //       policyFlag: "1",
-      //       sort: 2,
-      //       supportAdd: false,
-      //       tableName: "ic_resi_user",
-      //     }
-      //   ]
-      //   dataTemp.forEach((item) => {
-      //     (async (id) => {
-      //       // item.queryItemList = await this.getExportChildList(id)
-      //       item.queryItemList = [];
-      //     })(item.id);
-      //   });
-      //   this.exportList = [...dataTemp];
-      //   this.$nextTick(() => {
-      //     this.diyDialog = true;
-      //   });
-      //   console.log("获取详情成功getExportList----", this.exportList);
-      // } else {
-      //   this.$message.error(msg);
-      // }
-    },
-    //导出表格 以前是导出 现在改成导出房屋数据
-    async handleExport () {
-      let title = this.agencyObj.label
-      title = title + '—小区列表'
-
-      const url = "/gov/org/neighborhood/exportneighborhoodinfo"
-      let params = {
-
-        level: this.agencyObj.level,
-        id: this.agencyObj.id
-      }
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-
-    },
-    handleDiyClose () {
-      this.diyDialog = false;
-    },
-    handleClose (done) {
-      this.diyDialog = false
-    },
-
-    // 下载文件
-    download (data, downFileName) {
-      if (!data) {
-        return
-      }
-
-      var csvData = new Blob([data])
-
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, downFileName);
-      }
-      // for Non-IE (chrome, firefox etc.)
-      else {
-        var a = document.createElement('a');
-        document.body.appendChild(a);
-        a.style = 'display: none';
-        var url = window.URL.createObjectURL(csvData);
-        a.href = url;
-        a.download = downFileName;
-        a.click();
-        a.remove();
-        window.URL.revokeObjectURL(url);
-      }
-
-    },
-
-    handleExportModule (type) {
-      let title = ''
-      let url = ""
-      if (type === 'community') {
-        title = '小区导入模板'
-        url = '/gov/org/neighborhood/exporttemplate'
-
-      } else if (type === 'building') {
-        title = '楼栋导入模板'
-        url = '/gov/org/building/exporttemplate'
-
-      } else if (type === 'room') {
-        title = '房间导入模板'
-        url = '/gov/org/house/exporttemplate'
-      }
-
-      let params = {}
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-    },
-
-    //导出一户一档
-    handleExportYihuyidang () {
-      this.yihuyidangDisabled = true
-      let title = this.agencyObj.label
-      title = title + '-一户一档'
-      let url = "/gov/org/house/exportHouseUser"
-
-
-      let params = {
-        agencyId: '',
-        gridId: '',
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        rentFlag: this.rentFlag,
-        purpose: this.purpose,
-        remark: this.remark,
-        updateStartDate: this.updateStartDate,
-        updateEndDate: this.updateEndDate,
-      }
-
-      if (this.agencyObj.level === 'grid') {
-        params.gridId = this.agencyObj.id
-        params.agencyId = ''
-      } else {
-        params.gridId = ''
-        params.agencyId = this.agencyObj.id
-      }
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-          this.yihuyidangDisabled = false
-        },
-        (rspMsg, data) => {
-          this.yihuyidangDisabled = false
-          this.$message.error(rspMsg);
-        }
-      );
-    },
-
-
-    // 导出一房一码
-
-    handleExportYihuyima () {
-      this.exportBtn = true
-      this.yihuyimaDisabled = true
-      let title = this.agencyObj.label
-      title = title + '-一房一码'
-      let url = "/gov/org/house/downloadZip"
-
-
-      let params = {
-        level: this.agencyObj.level,
-        id: this.agencyObj.id
-      }
-
-
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.Zip')
-          this.exportBtn = false
-          this.yihuyimaDisabled = false
-        },
-        (rspMsg, data) => {
-          this.exportBtn = false
-          this.yihuyimaDisabled = false
-          this.$message.error(rspMsg);
-        }
-      );
-    },
-
-
-
-    // 上传文件之前的钩子
-    beforeUpload (file, type) {
-      this.files = file;
-
-      const isText = file.type === 'application/vnd.ms-excel'
-      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-
-      if (!isText && !isTextComputer) {
-        this.$message.error('请选择正确格式的文件')
-        this.files = null
-        this.fileName = ''
-        return false
-      } else {
-        this.fileName = file.name;
-        return true
-      }
-
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
-    },
-
-    async uploadFile (type) {
-
-      if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
-      }
-
-      this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
-
-
-      //清空上传列表
-      let url = ''
-
-      let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgType', this.agencyObj.level === 'grid' ? 'grid' : 'agency');//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
-      if (type === 'community') {
-        this.importCommunityLoading = true
-        this.$refs['upload_community'].clearFiles()
-        url = '/gov/org/icneighborhood/neighborhoodimport'
-
-
-      } else if (type === 'building') {
-        this.$refs['upload_building'].clearFiles()
-        url = '/gov/org/building/buildingimport'
-        this.importBuildingLoading = true
-
-      } else if (type === 'room') {
-        this.$refs['upload_room'].clearFiles()
-        url = '/gov/org/house/houseimport'
-        this.importRoomLoading = true
-      }
-
-      window.app.ajax.post2(url, fileFormData,
-        (data, rspMsg) => {
-
-          if (data.code === 0 && data.msg == 'success') {
-            // this.$message.success('导入成功')
-          } else {
-            // this.$message({
-            //   showClose: true,
-            //   message: rspMsg,
-            //   duration: 0,
-            //   type: "error"
-            // })
-            // this.$message.error(rspMsg)
-          }
-          this.$emit('refreshTree')
-          this.loadTable()
-          // this.showMessage(rspMsg)
-          if (type === 'community') {
-            this.importCommunityLoading = false
-
-          } else if (type === 'building') {
-            this.importBuildingLoading = false
-
-          } else if (type === 'room') {
-            this.importRoomLoading = false
-          }
-        },
-        (rspMsg, data) => {
-          if (type === 'community') {
-            this.importCommunityLoading = false
-
-          } else if (type === 'building') {
-            this.importBuildingLoading = false
-
-          } else if (type === 'room') {
-            this.importRoomLoading = false
-          }
-          // this.$message.error(rspMsg)
-        }, { headers: { 'Content-Type': 'multipart/form-data' } })
-
-
-    },
-
-    showMessage (msg) {
-      this.$alert(msg, '操作结果', {
-        confirmButtonText: '关闭',
-        callback: action => {
-          this.$emit('refreshTree')
-          this.loadTable()
-        }
-      });
-    },
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
-    },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
-    },
-
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  computed: {
-    tableHeight () {
-      console.log(this.searchHeight)
-      let height = this.searchHeight + 270
-      return this.$store.state.inIframe ? this.clientHeight - height + this.iframeHeight : this.clientHeight - height
-
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  watch: {
-    selection (val) {
-
-      if (val.length > 0) {
-        this.showDeletBtn = true
-      } else {
-        this.showDeletBtn = false
-      }
-
-    },
-    '$store.state.sidebarFold': {
-      handler (newVal, oldVal) {
-        if (newVal) {//收起
-          this.searchHeight = 155
-
-        } else {
-
-          this.searchHeight = 190
-        }
-
-
-      },
-      deep: true
-    }
-  },
-  props: {
-    staffAgencyId: {
-      type: String,
-      default: '',
-    },
-    ownerName: {
-      type: String,
-      default: '',
-    },
-    ownerPhone: {
-      type: String,
-      default: '',
-    },
-    rentFlag: {
-      type: String,
-      default: '',
-    },
-    purpose: {
-      type: String,
-      default: '',
-    },
-    remark: {
-      type: String,
-      default: '',
-    },
-    updateStartDate: {
-      type: String,
-      default: '',
-    },
-    updateEndDate: {
-      type: String,
-      default: '',
-    },
-
-
-  }
-}
+	props: {
+		staffAgencyId: {
+			type: String,
+			default: "",
+		},
+		ownerName: {
+			type: String,
+			default: "",
+		},
+		ownerPhone: {
+			type: String,
+			default: "",
+		},
+		rentFlag: {
+			type: String,
+			default: "",
+		},
+		purpose: {
+			type: String,
+			default: "",
+		},
+		remark: {
+			type: String,
+			default: "",
+		},
+		updateStartDate: {
+			type: String,
+			default: "",
+		},
+		updateEndDate: {
+			type: String,
+			default: "",
+		},
+	},
+
+	data() {
+		return {
+			searchHeight: 190, //搜索栏高度
+			// tableHeight: 0,
+			importBuildingLoading: false,
+			importRoomLoading: false,
+			importCommunityLoading: false,
+			total: 0,
+			pageSize: 20,
+			pageNo: 0,
+			tableLoading: true,
+
+			showImportBtn: false, //是否显示操作按钮，根据登录人所属组织判断
+			roleList: [], //角色列表
+			showYhymInfo: false, // 是否显示补全一房一码信息按钮
+			yhymLoading: false,
+			xcxmLoading: false,
+
+			agencyObj: {}, //树所选的组织对象
+
+			tableData: [],
+			validTableDataNum: 0, //有效的数据数量，即有权限操作的数据数量
+			selection: [],
+			showDeletBtn: false,
+
+			//form相关
+			formShow: false,
+			formTitle: "新增小区",
+
+			detailShow: false,
+
+			files: "",
+			fileName: "",
+			uploadUlr:
+				window.SITE_CONFIG["apiURL"] + "/gov/org/neighborhood/import",
+			yihuyidangDisabled: false,
+			yihuyimaDisabled: false,
+			exportBtn: false,
+
+			displayedBaobiaoBtn: false,
+			customerId: "", //烟台的客户id :  1535072605621841922
+
+			//导出
+			exportList: [],
+			diyDialog: false,
+			conditions: [],
+
+			queryConditions: [],
+		};
+	},
+
+	computed: {
+		tableHeight() {
+			console.log(this.searchHeight);
+			let height = this.searchHeight + 270;
+			return this.$store.state.inIframe
+				? this.clientHeight - height + this.iframeHeight
+				: this.clientHeight - height;
+		},
+
+		...mapGetters(["clientHeight", "iframeHeight"]),
+	},
+	watch: {
+		selection(val) {
+			if (val.length > 0) {
+				this.showDeletBtn = true;
+			} else {
+				this.showDeletBtn = false;
+			}
+		},
+		"$store.state.sidebarFold": {
+			handler(newVal, oldVal) {
+				if (newVal) {
+					//收起
+					this.searchHeight = 155;
+				} else {
+					this.searchHeight = 190;
+				}
+			},
+			deep: true,
+		},
+	},
+
+	components: {
+		baobiao,
+		CommunityForm,
+		CommunityDetail,
+		communityExportInfo,
+	},
+
+	activated() {},
+
+	async mounted() {
+		this.customerId = localStorage.getItem("customerId");
+		// this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
+		//   elseParams: {
+		//     categoryKeys: ['house_info'], categoryKey: 'house_info',
+		//   }
+		// });
+		this.getQueryConditions();
+	},
+
+	methods: {
+		async getQueryConditions() {
+			let params = {
+				formCode: "community_info",
+				customerId: this.$store.state.user.customerId,
+			};
+
+			const { data } = await this.$http.post(
+				"/oper/customize/icform/queryItems",
+				params
+			);
+
+			if (data.code === 0) {
+				this.queryConditions = data.data.map((item) => {
+					return {
+						...item,
+						humpName: util.capitalToHump(item.columnName),
+					};
+				});
+				console.log(this.queryConditions);
+			} else {
+				this.$message.error(data.msg);
+			}
+		},
+
+		reportForm() {
+			let paramMap = {
+				pageSize: this.pageSize,
+				pageNo: this.pageNo,
+				level: this.agencyObj.level,
+				id: this.agencyObj.id,
+				ownerName: this.ownerName,
+				ownerPhone: this.ownerPhone,
+				rentFlag: this.rentFlag,
+				purpose: this.purpose,
+				remark: this.remark,
+				sortType: this.sortType,
+				updateStartDate: this.updateStartDate,
+				updateEndDate: this.updateEndDate,
+			};
+			this.$refs.baobiao.init({
+				elseParams: {
+					categoryKeys: ["house_info"],
+					categoryKey: "house_info",
+					paramMap,
+				},
+			});
+		},
+		async loadTable(fromTree, treeObj) {
+			console.log(111, treeObj);
+			// 是否显示补全一房一码信息按钮
+			this.roleList = localStorage.getItem("roleList");
+			let conditions = [];
+			if (treeObj.level == "grid") {
+				conditions.push({
+					queryType: "equal",
+					columnName: "GRID_ID",
+					tableName: "community_quarters",
+					columnValue: [treeObj.id],
+				});
+			} else {
+				conditions.push({
+					queryType: "equal",
+					columnName: "AGENCY_ID",
+					tableName: "community_quarters",
+					columnValue: [treeObj.id],
+				});
+			}
+      this.conditions = conditions ;
+      
+			if (
+				this.roleList.indexOf("root_manager") > -1 ||
+				this.roleList.indexOf("manager") > -1
+			) {
+				this.showYhymInfo = true;
+			} else {
+				this.showYhymInfo = false;
+			}
+			this.tableLoading = true;
+			if (fromTree) {
+				this.agencyObj = treeObj;
+				if (this.agencyObj.level === "community") {
+					//只有社区和网格显示操作按钮
+					if (this.agencyObj.id === this.staffAgencyId) {
+						//如果所选树的组织id和登录人员id相同，有权限
+						this.showImportBtn = true;
+					} else {
+						this.showImportBtn = false;
+					}
+				} else if (this.agencyObj.level === "grid") {
+					//网格下
+					if (this.agencyObj.pid === this.staffAgencyId) {
+						//如果所选树的父级组织id和登录人员id相同，有权限
+						this.showImportBtn = true;
+					} else {
+						this.showImportBtn = false;
+					}
+				} else {
+					this.showImportBtn = false;
+				}
+			}
+
+			const url = "/actual/base/communityQuarters/listQuarters";
+
+			let params = {
+				pageSize: this.pageSize,
+				pageNo: this.pageNo,
+
+				level: this.agencyObj.level,
+				id: this.agencyObj.id,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.validTableDataNum = 0;
+				this.total = data.total;
+				data.list.forEach((item) => {
+					if (item.agencyId === this.staffAgencyId) {
+						item.showBtn = true;
+						this.validTableDataNum++;
+					} else {
+						item.showBtn = false;
+					}
+				});
+				this.tableData = data.list;
+			} else {
+				this.$message.error(msg);
+			}
+			this.tableLoading = false;
+		},
+
+		checkSelect(row, index) {
+			let isChecked = false;
+			if (row.showBtn) {
+				// 判断里面是否存在某个参数
+				isChecked = true;
+			} else {
+				isChecked = false;
+			}
+			return isChecked;
+		},
+
+		diaClose() {
+			this.$refs.ref_form.resetData();
+			this.formShow = false;
+		},
+
+		async handleDetail(row) {
+			// this.formTitle = '小区详情'
+			// this.formShow = true
+			// const _data = await this.detail(row)
+			// this.$nextTick(() => {
+			//   this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
+			// })
+
+			this.detailShow = true;
+
+			const _data = await this.detail(row);
+			this.$nextTick(() => {
+				this.$refs.ref_form_detail.initForm(_data);
+			});
+		},
+
+		handleAdd() {
+			this.formTitle = "新增小区";
+			this.formShow = true;
+			this.$nextTick(() => {
+				this.$refs.ref_form.initForm("add", null, this.agencyObj);
+			});
+		},
+		async detail(row) {
+			const url =
+				"/actual/base/communityQuarters/getQuartersDetail/" +
+				row.neighborHoodId;
+
+			const { data, code, msg } = await requestPost(url);
+
+			if (code === 0) {
+				return data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		// 补全一房一码点击事件
+		async handleYhymInfo() {
+			this.yhymLoading = true;
+			const url = "/gov/org/house/createBatchHouseCodeAndUrl";
+
+			let params = {};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.yhymLoading = false;
+				this.$message({
+					type: "success",
+					message: "批量生成成功",
+				});
+			} else if (code > 8000) {
+				this.yhymLoading = false;
+				this.$message({
+					showClose: true,
+					message: msg,
+					duration: 0,
+				});
+			} else {
+				this.yhymLoading = false;
+				this.$message.error(msg);
+			}
+		},
+		// 补全小程序一户一码
+		async createBatchNeiQrUrl() {
+			this.xcxmLoading = true;
+			const url = "/gov/org/neighborhood/createBatchNeiQrUrl";
+
+			let params = {};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.xcxmLoading = false;
+				this.$message({
+					type: "success",
+					message: "批量生成成功",
+				});
+			} else if (code > 8000) {
+				this.xcxmLoading = false;
+				this.$message({
+					showClose: true,
+					message: msg,
+					duration: 0,
+				});
+			} else {
+				this.xcxmLoading = false;
+				this.$message.error(msg);
+			}
+		},
+		async handleEdit(row) {
+			this.formTitle = "修改小区";
+			this.formShow = true;
+			const _data = await this.detail(row);
+			this.$nextTick(() => {
+				this.$refs.ref_form.initForm("edit", _data, this.agencyObj);
+			});
+		},
+
+		handleToNextLevel(row) {
+			this.$emit("toNextLevel", row, "community");
+		},
+
+		addFormCancle() {
+			this.formShow = false;
+		},
+		detailFormCancle() {
+			this.$refs.ref_form_detail.diaDestroy();
+			this.detailShow = false;
+		},
+		addFormOk() {
+			this.formShow = false;
+			this.loadTable();
+			this.$emit("refreshTree");
+		},
+
+		deleteBatch() {
+			if (this.selection.length > 0) {
+				this.$confirm("确认删除选择的小区?", "提示", {
+					confirmButtonText: "确定",
+					cancelButtonText: "取消",
+					type: "warning",
+				})
+					.then(() => {
+						this.deleteCommunityBatch();
+					})
+					.catch((err) => {
+						if (err == "cancel") {
+							// this.$message({
+							//   type: "info",
+							//   message: "已取消删除"
+							// });
+						}
+					});
+			} else {
+				this.$message.warning("请先选择要删除的小区");
+			}
+		},
+		selectAll(selection) {
+			this.selection = selection;
+		},
+		selectionChange(selection) {
+			this.selection = selection;
+		},
+
+		async handleDelete(row) {
+			this.$confirm("确认删除?", "提示", {
+				confirmButtonText: "确定",
+				cancelButtonText: "取消",
+				type: "warning",
+			})
+				.then(() => {
+					this.deleteCommunity(row);
+				})
+				.catch((err) => {
+					if (err == "cancel") {
+						// this.$message({
+						//   type: "info",
+						//   message: "已取消删除"
+						// });
+					}
+				});
+		},
+
+		async deleteCommunityBatch() {
+			let ids = [];
+			console.log(this.selection);
+			this.selection.forEach((element) => {
+				ids.push(element.neighborHoodId);
+			});
+
+			const url = "/actual/base/communityHouse/deleteCommunityInfoByIds";
+
+			let params = {
+				type: "neighborHood",
+				ids: ids,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "删除成功",
+				});
+				this.$emit("refreshTree");
+				this.loadTable();
+			} else if (code > 8000) {
+				this.$message({
+					showClose: true,
+					message: msg,
+					duration: 0,
+				});
+				this.$emit("refreshTree");
+				this.loadTable();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async deleteCommunity(row) {
+			const url = "/actual/base/communityQuarters/deleteQuarters";
+
+			let params = {
+				quartersId: row.neighborHoodId,
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.$message({
+					type: "success",
+					message: "删除成功",
+				});
+				this.$emit("refreshTree");
+				this.loadTable();
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async handleDownQr(row, type) {
+			let title = row.label + "二维码.png";
+			// const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}`
+			const url = "/gov/org/agency/create-qrcode";
+			const _id = type == "community" ? row.id : row.neighborHoodId;
+			const params = {
+				id: _id,
+				type,
+			};
+			await axios({
+				method: "POST",
+				url: window.SITE_CONFIG["apiURL"] + url,
+				data: params,
+				responseType: "blob",
+			}).then((res) => {
+				console.log("res----1r", res);
+				if (res.data) {
+					// let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+					// console.log('filename', fileName)
+					this.download(res.data, title); //释放掉blob对象
+				} else this.$message.error("下载失败");
+				// this.download(res.data, '1.png')
+			});
+		},
+		// 导出按钮点击事件
+		async handleExportOpen() {
+			await this.getExportList();
+		},
+		async getExportList(type) {
+			const url = "/oper/customize/icformitemgroup/list";
+			let params = {
+				formCode: "community_info",
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				data.forEach((item) => {
+					(async (id) => {
+						// item.queryItemList = await this.getExportChildList(id)
+						item.queryItemList = [];
+					})(item.id);
+				});
+				this.exportList = [...data];
+				this.$nextTick(() => {
+					this.diyDialog = true;
+				});
+				console.log("获取详情成功getExportList----", this.exportList);
+			} else {
+				this.$message.error(msg);
+			}
+
+			// if (code === 0) {
+			//   //暂无接口
+			//   let dataTemp = [
+			//     {
+			//       childShowFlag: "0",
+			//       customerId: "45687aa479955f9d06204d415238f7cc",
+			//       display: false,
+			//       formCode: "resi_base_info",
+			//       formId: "20220422102809_1",
+			//       groupCode: "jcxx",
+			//       id: "45687aa479955f9d06204d415238f7cc_0",
+			//       label: "小区信息",
+			//       policyFlag: "1",
+			//       sort: 0,
+			//       supportAdd: false,
+			//       tableName: "ic_resi_user"
+			//     },
+			//     {
+			//       childShowFlag: "0",
+			//       customerId: "45687aa479955f9d06204d415238f7cc",
+			//       display: true,
+			//       formCode: "resi_base_info",
+			//       formId: "20220422102809_1",
+			//       groupCode: "jyxx",
+			//       id: "20220422102809_101",
+			//       label: "楼栋信息",
+			//       policyFlag: "1",
+			//       sort: 1,
+			//       supportAdd: false,
+			//       tableName: "ic_resi_user",
+			//     },
+			//     {
+			//       childShowFlag: "0",
+			//       customerId: "45687aa479955f9d06204d415238f7cc",
+			//       display: true,
+			//       formCode: "resi_base_info",
+			//       formId: "20220422102809_1",
+			//       groupCode: "xqah",
+			//       id: "20220422102809_102",
+			//       label: "房屋信息",
+			//       policyFlag: "1",
+			//       sort: 2,
+			//       supportAdd: false,
+			//       tableName: "ic_resi_user",
+			//     }
+			//   ]
+			//   dataTemp.forEach((item) => {
+			//     (async (id) => {
+			//       // item.queryItemList = await this.getExportChildList(id)
+			//       item.queryItemList = [];
+			//     })(item.id);
+			//   });
+			//   this.exportList = [...dataTemp];
+			//   this.$nextTick(() => {
+			//     this.diyDialog = true;
+			//   });
+			//   console.log("获取详情成功getExportList----", this.exportList);
+			// } else {
+			//   this.$message.error(msg);
+			// }
+		},
+		//导出表格 以前是导出 现在改成导出房屋数据
+		async handleExport() {
+			let title = this.agencyObj.label;
+			title = title + "—小区列表";
+
+			const url = "/gov/org/neighborhood/exportneighborhoodinfo";
+			let params = {
+				level: this.agencyObj.level,
+				id: this.agencyObj.id,
+			};
+
+			app.ajax.exportFilePost(
+				url,
+				params,
+				(data, rspMsg) => {
+					this.download(data, title + ".xls");
+				},
+				(rspMsg, data) => {
+					this.$message.error(rspMsg);
+				}
+			);
+		},
+		handleDiyClose() {
+			this.diyDialog = false;
+		},
+		handleClose(done) {
+			this.diyDialog = false;
+		},
+
+		// 下载文件
+		download(data, downFileName) {
+			if (!data) {
+				return;
+			}
+
+			var csvData = new Blob([data]);
+
+			if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+				window.navigator.msSaveOrOpenBlob(csvData, downFileName);
+			}
+			// for Non-IE (chrome, firefox etc.)
+			else {
+				var a = document.createElement("a");
+				document.body.appendChild(a);
+				a.style = "display: none";
+				var url = window.URL.createObjectURL(csvData);
+				a.href = url;
+				a.download = downFileName;
+				a.click();
+				a.remove();
+				window.URL.revokeObjectURL(url);
+			}
+		},
+
+		handleExportModule(type) {
+			let title = "";
+			let url = "";
+			if (type === "community") {
+				title = "小区导入模板";
+				url = "/gov/org/neighborhood/exporttemplate";
+			} else if (type === "building") {
+				title = "楼栋导入模板";
+				url = "/gov/org/building/exporttemplate";
+			} else if (type === "room") {
+				title = "房间导入模板";
+				url = "/gov/org/house/exporttemplate";
+			}
+
+			let params = {};
+
+			app.ajax.exportFilePost(
+				url,
+				params,
+				(data, rspMsg) => {
+					this.download(data, title + ".xls");
+				},
+				(rspMsg, data) => {
+					this.$message.error(rspMsg);
+				}
+			);
+		},
+
+		//导出一户一档
+		handleExportYihuyidang() {
+			this.yihuyidangDisabled = true;
+			let title = this.agencyObj.label;
+			title = title + "-一户一档";
+			let url = "/gov/org/house/exportHouseUser";
+
+			let params = {
+				agencyId: "",
+				gridId: "",
+				ownerName: this.ownerName,
+				ownerPhone: this.ownerPhone,
+				rentFlag: this.rentFlag,
+				purpose: this.purpose,
+				remark: this.remark,
+				updateStartDate: this.updateStartDate,
+				updateEndDate: this.updateEndDate,
+			};
+
+			if (this.agencyObj.level === "grid") {
+				params.gridId = this.agencyObj.id;
+				params.agencyId = "";
+			} else {
+				params.gridId = "";
+				params.agencyId = this.agencyObj.id;
+			}
+
+			app.ajax.exportFilePost(
+				url,
+				params,
+				(data, rspMsg) => {
+					this.download(data, title + ".xls");
+					this.yihuyidangDisabled = false;
+				},
+				(rspMsg, data) => {
+					this.yihuyidangDisabled = false;
+					this.$message.error(rspMsg);
+				}
+			);
+		},
+
+		// 导出一房一码
+
+		handleExportYihuyima() {
+			this.exportBtn = true;
+			this.yihuyimaDisabled = true;
+			let title = this.agencyObj.label;
+			title = title + "-一房一码";
+			let url = "/gov/org/house/downloadZip";
+
+			let params = {
+				level: this.agencyObj.level,
+				id: this.agencyObj.id,
+			};
+
+			app.ajax.exportFilePost(
+				url,
+				params,
+				(data, rspMsg) => {
+					this.download(data, title + ".Zip");
+					this.exportBtn = false;
+					this.yihuyimaDisabled = false;
+				},
+				(rspMsg, data) => {
+					this.exportBtn = false;
+					this.yihuyimaDisabled = false;
+					this.$message.error(rspMsg);
+				}
+			);
+		},
+
+		// 上传文件之前的钩子
+		beforeUpload(file, type) {
+			this.files = file;
+
+			const isText = file.type === "application/vnd.ms-excel";
+			const isTextComputer =
+				file.type ===
+				"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+
+			if (!isText && !isTextComputer) {
+				this.$message.error("请选择正确格式的文件");
+				this.files = null;
+				this.fileName = "";
+				return false;
+			} else {
+				this.fileName = file.name;
+				return true;
+			}
+		},
+		// 上传文件个数超过定义的数量
+		handleExceed(files, fileList) {
+			this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
+		},
+
+		async uploadFile(type) {
+			if (this.fileName == "") {
+				this.$message.warning("请选择要上传的文件！");
+				return false;
+			}
+
+			this.$message({
+				showClose: true,
+				message: "导入中，请到系统管理-导入记录中查看进度",
+				duration: 0,
+			});
+
+			//清空上传列表
+			let url = "";
+
+			let fileFormData = new FormData();
+			fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+			fileFormData.append("orgId", this.agencyObj.id); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+			fileFormData.append(
+				"orgType",
+				this.agencyObj.level === "grid" ? "grid" : "agency"
+			); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+			if (type === "community") {
+				this.importCommunityLoading = true;
+				this.$refs["upload_community"].clearFiles();
+				url = "/gov/org/icneighborhood/neighborhoodimport";
+			} else if (type === "building") {
+				this.$refs["upload_building"].clearFiles();
+				url = "/gov/org/building/buildingimport";
+				this.importBuildingLoading = true;
+			} else if (type === "room") {
+				this.$refs["upload_room"].clearFiles();
+				url = "/gov/org/house/houseimport";
+				this.importRoomLoading = true;
+			}
+
+			window.app.ajax.post2(
+				url,
+				fileFormData,
+				(data, rspMsg) => {
+					if (data.code === 0 && data.msg == "success") {
+						// this.$message.success('导入成功')
+					} else {
+						// this.$message({
+						//   showClose: true,
+						//   message: rspMsg,
+						//   duration: 0,
+						//   type: "error"
+						// })
+						// this.$message.error(rspMsg)
+					}
+					this.$emit("refreshTree");
+					this.loadTable();
+					// this.showMessage(rspMsg)
+					if (type === "community") {
+						this.importCommunityLoading = false;
+					} else if (type === "building") {
+						this.importBuildingLoading = false;
+					} else if (type === "room") {
+						this.importRoomLoading = false;
+					}
+				},
+				(rspMsg, data) => {
+					if (type === "community") {
+						this.importCommunityLoading = false;
+					} else if (type === "building") {
+						this.importBuildingLoading = false;
+					} else if (type === "room") {
+						this.importRoomLoading = false;
+					}
+					// this.$message.error(rspMsg)
+				},
+				{ headers: { "Content-Type": "multipart/form-data" } }
+			);
+		},
+
+		showMessage(msg) {
+			this.$alert(msg, "操作结果", {
+				confirmButtonText: "关闭",
+				callback: (action) => {
+					this.$emit("refreshTree");
+					this.loadTable();
+				},
+			});
+		},
+		handleSizeChange(val) {
+			this.pageSize = val;
+			this.pageNo = 1;
+			this.loadTable();
+		},
+		handleCurrentChange(val) {
+			this.pageNo = val;
+			this.loadTable();
+		},
+
+		// 开启加载动画
+		startLoading() {
+			loading = Loading.service({
+				lock: true, // 是否锁定
+				text: "正在加载……", // 加载中需要显示的文字
+				background: "rgba(0,0,0,.7)", // 背景颜色
+			});
+		},
+		// 结束加载动画
+		endLoading() {
+			// clearTimeout(timer);
+			if (loading) {
+				loading.close();
+			}
+		},
+	},
+};
 </script>
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/visual/communityManage.scss";
 @import "@/assets/scss/modules/management/list-main.scss";
 </style>
 
-<style >
+<style>
 .el-message.is-closable .el-message__content {
-  line-height: 20px;
+	line-height: 20px;
 }
 </style>
-
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 3438595fc..65c61cc17 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -337,12 +337,12 @@ export default {
     },
 
     async addRoom () {
-      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
       if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的身份证号码'
+          message: '请输入正确的证件号码'
         })
         return false;
       }
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 1d54bfd4c..d1ec848d8 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -186,7 +186,7 @@
                          width="110">
         </el-table-column>
         <el-table-column prop="ownerIdCard"
-                         label="身份证"
+                         label="证件号"
                          header-align="left"
                          align="left"
                          width="170">
diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index cf3e31c3b..b0243d9ce 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -131,7 +131,7 @@
                       style="display: block">
           <el-input class="u-edit-width-normal"
                     maxlength="30"
-                    placeholder="请输入身份证号或护照号"
+                    placeholder="请输入证件号或护照号"
                     v-model="fmData.idCard"
                     @blur="handleBlurId"
                     :disabled="formType === 'edit'"></el-input>
@@ -345,7 +345,7 @@ export default {
           callback(new Error("请输入证件号"));
         } else {
           if (!isCard(value)) {
-            callback(new Error("请输入正确的身份证号或护照号"));
+            callback(new Error("请输入正确的证件号或护照号"));
           }
           callback();
         }
@@ -360,7 +360,7 @@ export default {
         ],
         name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
         idCard: [
-          { required: true, message: "身份证号不能为空", trigger: "blur" },
+          { required: true, message: "证件号不能为空", trigger: "blur" },
           { required: true, validator: checkIdCard, trigger: "blur" },
         ],
         birthplace: [
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 81b3f8492..11befc2ec 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -141,7 +141,7 @@
                       prop="idCard"
                       style="display: block">
           <el-input class="u-edit-width-normal"
-                    placeholder="请输入身份证号或护照号"
+                    placeholder="请输入证件号或护照号"
                     v-model="fmData.idCard"
                     :disabled="formType === 'edit'"
                     @blur="handleBlurId"></el-input>
@@ -341,7 +341,7 @@ export default {
           callback(new Error('请输入证件号'))
         } else {
           if (!isCard(value)) {
-            callback(new Error('请输入正确的身份证号或护照号'))
+            callback(new Error('请输入正确的证件号或护照号'))
           }
           callback()
         }
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 3a0b19e03..df4b53bf4 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -1,133 +1,147 @@
 <template>
-  <div class="g-main">
-    <div ref="searchForm"
-         class="m-search">
-
-      <el-form :inline="true"
-               :model="fmData"
-               :label-width="'100px'">
-
-        <el-form-item prop="gridId"
-                      label="所属网格">
-
-          <el-select v-model.trim="fmData.gridId"
-                     placeholder="请选择网格"
-                     size="small"
-                     clearable
-                     class="u-item-width-normal"
-                     @change="handleChangeGrid">
-            <el-option v-for="item in optionsG"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-        <el-form-item label="所属房屋">
-
-          <el-select v-model.trim="fmData.villageId"
-                     placeholder="请选择小区"
-                     size="small"
-                     clearable
-                     class="u-item-width-communitycascader"
-                     @change="handleChangeV">
-            <el-option v-for="item in optionsV"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-          <el-select v-model.trim="fmData.buildId"
-                     placeholder="楼号"
-                     size="small"
-                     clearable
-                     :disabled="changeVDisabled"
-                     class="u-item-width-buildcascader"
-                     style="margin-left:5px"
-                     @change="handleChangeB">
-            <el-option v-for="item in optionsB"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-          <el-select v-model.trim="fmData.unitId"
-                     placeholder="单元"
-                     size="small"
-                     clearable
-                     :disabled="changeBDisabled"
-                     class="u-item-width-buildcascader"
-                     style="margin-left:5px"
-                     @change="handleChangeD">
-            <el-option v-for="item in optionsD"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-          <el-select v-model.trim="fmData.homeId"
-                     placeholder="房号"
-                     size="small"
-                     clearable
-                     :disabled="changeDDisabled"
-                     class="u-item-width-buildcascader"
-                     style="margin-left:5px">
-            <el-option v-for="item in optionsH"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-
-        <el-form-item label="姓名"
-                      prop="name">
-          <el-input v-model="fmData.name"
-                    class="u-item-width-normal"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="手机号"
-                      prop="mobile">
-          <el-input v-model="fmData.mobile"
-                    class="u-item-width-normal"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="证件号"
-                      prop="idCard">
-          <el-input v-model="fmData.idCard"
-                    class="u-item-width-normal"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="迁入时间"
-                      prop="startTime">
-          <el-date-picker v-model="rangeTime"
-                          type="daterange"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期"
-                          value-format="yyyy-MM-dd"
-                          class="u-item-width-daterange2">
-          </el-date-picker>
-        </el-form-item>
-
-        <!-- <el-form-item label="享受福利"
+	<div class="g-main">
+		<div ref="searchForm" class="m-search">
+			<el-form :inline="true" :model="fmData" :label-width="'100px'">
+				<el-form-item prop="gridId" label="所属网格">
+					<el-select
+						v-model.trim="fmData.gridId"
+						placeholder="请选择网格"
+						size="small"
+						clearable
+						class="u-item-width-normal"
+						@change="handleChangeGrid"
+					>
+						<el-option
+							v-for="item in optionsG"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="所属房屋">
+					<el-select
+						v-model.trim="fmData.villageId"
+						placeholder="请选择小区"
+						size="small"
+						clearable
+						class="u-item-width-communitycascader"
+						@change="handleChangeV"
+					>
+						<el-option
+							v-for="item in optionsV"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+
+					<el-select
+						v-model.trim="fmData.buildId"
+						placeholder="楼号"
+						size="small"
+						clearable
+						:disabled="changeVDisabled"
+						class="u-item-width-buildcascader"
+						style="margin-left: 5px"
+						@change="handleChangeB"
+					>
+						<el-option
+							v-for="item in optionsB"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+
+					<el-select
+						v-model.trim="fmData.unitId"
+						placeholder="单元"
+						size="small"
+						clearable
+						:disabled="changeBDisabled"
+						class="u-item-width-buildcascader"
+						style="margin-left: 5px"
+						@change="handleChangeD"
+					>
+						<el-option
+							v-for="item in optionsD"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+
+					<el-select
+						v-model.trim="fmData.homeId"
+						placeholder="房号"
+						size="small"
+						clearable
+						:disabled="changeDDisabled"
+						class="u-item-width-buildcascader"
+						style="margin-left: 5px"
+					>
+						<el-option
+							v-for="item in optionsH"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+				</el-form-item>
+
+				<el-form-item label="姓名" prop="name">
+					<el-input
+						v-model="fmData.name"
+						class="u-item-width-normal"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<el-form-item label="手机号" prop="mobile">
+					<el-input
+						v-model="fmData.mobile"
+						class="u-item-width-normal"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<el-form-item label="证件号" prop="idCard">
+					<el-input
+						v-model="fmData.idCard"
+						class="u-item-width-normal"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<el-form-item label="迁入时间" prop="startTime">
+					<el-date-picker
+						v-model="rangeTime"
+						type="daterange"
+						range-separator="至"
+						start-placeholder="开始日期"
+						end-placeholder="结束日期"
+						value-format="yyyy-MM-dd"
+						class="u-item-width-daterange2"
+					>
+					</el-date-picker>
+				</el-form-item>
+
+				<!-- <el-form-item label="享受福利"
                       prop="remark">
           <el-select v-model.trim="fmData.isWeifare"
                      placeholder="享受福利"
@@ -142,830 +156,924 @@
           </el-select>
         </el-form-item> -->
 
-        <div class="u-search-btn">
-          <el-button class="diy-button--white"
-                     size="small"
-                     @click="resetForm('searchForm')">重置</el-button>
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--blue"
-                     @click="handleSearch">查询</el-button>
-
-        </div>
-
-      </el-form>
-    </div>
-    <div class="m-table">
-      <div class="u-table-btn1">
-
-        <el-button class="diy-button--blue"
-                   icon="el-icon-plus"
-                   size="small"
-                   @click="handleAdd">迁入登记</el-button>
-        <el-button v-if="false"
-                   class="diy-button--white"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"
-                   v-if="false"
-                   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">{{ importBtnTitle }}</el-button>
-        </el-upload>
-
-        <el-button @click="handleChu"
-                   class="diy-button--white"
-                   size="small">导出</el-button>
-      </div>
-
-      <div class="m-table-item">
-        <el-table :data="tableData"
-                  border
-                  style="width: 100%"
-                  :height="tableHeight">
-          <el-table-column label="序号"
-                           fixed="left"
-                           type="index"
-                           align="center"
-                           width="50" />
-
-          <el-table-column prop="name"
-                           width="100"
-                           fixed="left"
-                           label="姓名"
-                           align="center">
-            <template slot-scope="scope">
-              <a class="name-a"
-                 @click="handleWatch(scope.$index)">
-                {{ scope.row.name }}
-              </a>
-            </template>
-          </el-table-column>
-
-          <el-table-column prop="gridName"
-                           align="center"
-                           label="所属网格"
-                           min-width="160"
-                           :show-overflow-tooltip="true">
-          </el-table-column>
-
-          <el-table-column prop="allName"
-                           label="所属房屋"
-                           align="center"
-                           min-width="160"
-                           :show-overflow-tooltip="true" />
-
-          <el-table-column prop="mobile"
-                           width="140"
-                           align="center"
-                           label="手机号">
-          </el-table-column>
-
-          <el-table-column prop="idCard"
-                           align="center"
-                           min-width="160"
-                           label="证件号">
-          </el-table-column>
-
-          <el-table-column prop="genderName"
-                           align="center"
-                           width="60"
-                           label="性别">
-          </el-table-column>
-
-          <el-table-column prop="age"
-                           align="center"
-                           width="60"
-                           label="年龄">
-          </el-table-column>
-
-          <el-table-column prop="inTime"
-                           align="center"
-                           min-width="140"
-                           label="迁入时间">
-          </el-table-column>
-
-          <el-table-column prop="inReason"
-                           align="center"
-                           label="迁入原因"
-                           min-width="160"
-                           show-overflow-tooltip>
-          </el-table-column>
-
-          <el-table-column prop="sourceAddress"
-                           min-width="160"
-                           align="center"
-                           label="由何地迁入">
-          </el-table-column>
-
-          <el-table-column prop="moveNumber"
-                           min-width="160"
-                           align="center"
-                           label="迁移证号码">
-          </el-table-column>
-
-          <el-table-column prop="householderName"
-                           min-width="100"
-                           align="center"
-                           label="户主姓名">
-          </el-table-column>
-
-          <el-table-column prop="householderRelationName"
-                           align="center"
-                           min-width="100"
-                           label="与户主关系">
-          </el-table-column>
-
-          <el-table-column fixed="right"
-                           label="操作"
-                           align="center"
-                           width="190">
-            <template slot-scope="scope">
-              <el-button v-if="false"
-                         @click="handleWatch(scope.$index)"
-                         type="text"
-                         class="div-table-button--blue"
-                         size="small">查看</el-button>
-
-              <el-button @click="handleEdit(scope.$index)"
-                         type="text"
-                         size="small"
-                         class="div-table-button--blue">修改</el-button>
-
-              <el-button @click="handleChangeRecord(scope.row)"
-                         type="text"
-                         size="small"
-                         class="div-table-button--blue">变更记录</el-button>
-
-              <el-popconfirm v-if="false"
-                             title="删除之后无法回复，确认删除？"
-                             @onConfirm="handleDel(scope.row, scope.$index)"
-                             @confirm="handleDel(scope.row, scope.$index)">
-                <el-button slot="reference"
-                           type="text"
-                           size="small"
-                           class="div-table-button--delete"
-                           style="margin-left: 10px">删除</el-button>
-              </el-popconfirm>
-              <el-popconfirm v-if="true"
-                             title="删除之后无法回复，确认删除？"
-                             @onConfirm="handleDelNew(scope.row)"
-                             @confirm="handleDelNew(scope.row)">
-                <el-button slot="reference"
-                           type="text"
-                           size="small"
-                           class="div-table-button--blue"
-                           style="margin-left: 10px">删除</el-button>
-              </el-popconfirm>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div>
-          <el-pagination @size-change="handleSizeChange"
-                         @current-change="handleCurrentChange"
-                         :current-page.sync="pageNo"
-                         :page-sizes="[20, 50, 100, 200]"
-                         :page-size="parseInt(pageSize)"
-                         layout="sizes, prev, pager, next, total"
-                         :total="total">
-          </el-pagination>
-        </div>
-      </div>
-    </div>
-
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="670px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleClose">
-      <edit-form v-if="formShow"
-                 ref="eleEditForm"
-                 @dialogCancle="handleClose"
-                 @dialogOk="handleEditSuccess"></edit-form>
-    </el-dialog>
-
-    <!-- 详情弹出框 -->
-    <el-dialog :visible.sync="detailShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'迁入详情'"
-               width="670px"
-               top="5vh"
-               class="dialog-h"
-               @closed="detailFormCancle">
-      <detail-form v-if="detailShow"
-                   ref="ref_form_detail"
-                   @diaDetailClose="detailFormCancle"></detail-form>
-    </el-dialog>
-
-    <!-- 变更记录 -->
-    <el-dialog :visible.sync="changeRecordShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'变更记录'"
-               width="1150px"
-               top="5vh"
-               @closed="diaClose">
-      <resi-change-record ref="ref_changerecord"></resi-change-record>
-    </el-dialog>
-  </div>
+				<div class="u-search-btn">
+					<el-button
+						class="diy-button--white"
+						size="small"
+						@click="resetForm('searchForm')"
+						>重置</el-button
+					>
+					<el-button
+						style="margin-left: 10px"
+						size="small"
+						class="diy-button--blue"
+						@click="handleSearch"
+						>查询</el-button
+					>
+				</div>
+			</el-form>
+		</div>
+
+		<div class="m-table">
+			<div class="u-table-btn1">
+				<el-button
+					class="diy-button--blue"
+					icon="el-icon-plus"
+					size="small"
+					@click="handleAdd"
+					>迁入登记</el-button
+				>
+				<el-button
+					v-if="false"
+					class="diy-button--white"
+					size="small"
+					@click="handleExportModule('room')"
+					>下载模板</el-button
+				>
+				<el-upload
+					:headers="$getElUploadHeaders()"
+					v-if="false"
+					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"
+						>{{ importBtnTitle }}</el-button
+					>
+				</el-upload>
+
+				<el-button
+					@click="handleChu"
+					class="diy-button--white"
+					size="small"
+					>导出</el-button
+				>
+			</div>
+
+			<div class="m-table-item">
+				<el-table
+					:data="tableData"
+					border
+					style="width: 100%"
+					class="resi-table"
+					:height="tableHeight"
+				>
+					<el-table-column
+						label="序号"
+						fixed="left"
+						type="index"
+						align="center"
+						width="50"
+					/>
+
+					<el-table-column
+						prop="name"
+						width="100"
+						fixed="left"
+						label="姓名"
+						align="center"
+					>
+						<template slot-scope="scope">
+							<a
+								class="name-a"
+								@click="handleWatch(scope.$index)"
+							>
+								{{ scope.row.name }}
+							</a>
+						</template>
+					</el-table-column>
+
+					<el-table-column
+						prop="gridName"
+						align="center"
+						label="所属网格"
+						min-width="160"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="allName"
+						label="所属房屋"
+						align="center"
+						min-width="160"
+						:show-overflow-tooltip="true"
+					/>
+
+					<el-table-column
+						prop="mobile"
+						width="140"
+						align="center"
+						label="手机号"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="idCard"
+						align="center"
+						min-width="160"
+						label="证件号"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="genderName"
+						align="center"
+						width="60"
+						label="性别"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="age"
+						align="center"
+						width="60"
+						label="年龄"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="inTime"
+						align="center"
+						min-width="140"
+						label="迁入时间"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="inReason"
+						align="center"
+						label="迁入原因"
+						min-width="160"
+						show-overflow-tooltip
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="sourceAddress"
+						min-width="160"
+						align="center"
+						label="由何地迁入"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="moveNumber"
+						min-width="160"
+						align="center"
+						label="迁移证号码"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="householderName"
+						min-width="100"
+						align="center"
+						label="户主姓名"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="householderRelationName"
+						align="center"
+						min-width="100"
+						label="与户主关系"
+					>
+					</el-table-column>
+
+					<el-table-column
+						fixed="right"
+						label="操作"
+						align="center"
+						width="190"
+					>
+						<template slot-scope="scope">
+							<el-button
+								v-if="false"
+								@click="handleWatch(scope.$index)"
+								type="text"
+								class="div-table-button--blue"
+								size="small"
+								>查看</el-button
+							>
+
+							<el-button
+								@click="handleEdit(scope.$index)"
+								type="text"
+								size="small"
+								class="div-table-button--blue"
+								>修改</el-button
+							>
+
+							<el-button
+								@click="handleChangeRecord(scope.row)"
+								type="text"
+								size="small"
+								class="div-table-button--blue"
+								>变更记录</el-button
+							>
+
+							<el-popconfirm
+								v-if="false"
+								title="删除之后无法回复，确认删除？"
+								@onConfirm="handleDel(scope.row, scope.$index)"
+								@confirm="handleDel(scope.row, scope.$index)"
+							>
+								<el-button
+									slot="reference"
+									type="text"
+									size="small"
+									class="div-table-button--delete"
+									style="margin-left: 10px"
+									>删除</el-button
+								>
+							</el-popconfirm>
+							<el-popconfirm
+								v-if="true"
+								title="删除之后无法回复，确认删除？"
+								@onConfirm="handleDelNew(scope.row)"
+								@confirm="handleDelNew(scope.row)"
+							>
+								<el-button
+									slot="reference"
+									type="text"
+									size="small"
+									class="div-table-button--blue"
+									style="margin-left: 10px"
+									>删除</el-button
+								>
+							</el-popconfirm>
+						</template>
+					</el-table-column>
+				</el-table>
+
+				<div>
+					<el-pagination
+						@size-change="handleSizeChange"
+						@current-change="handleCurrentChange"
+						:current-page.sync="pageNo"
+						:page-sizes="[20, 50, 100, 200]"
+						:page-size="parseInt(pageSize)"
+						layout="sizes, prev, pager, next, total"
+						:total="total"
+					>
+					</el-pagination>
+				</div>
+			</div>
+		</div>
+
+		<!-- 修改弹出框 -->
+		<el-dialog
+			:visible.sync="formShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="formTitle"
+			width="670px"
+			top="5vh"
+			class="dialog-h"
+			@closed="handleClose"
+		>
+			<edit-form
+				v-if="formShow"
+				ref="eleEditForm"
+				@dialogCancle="handleClose"
+				@dialogOk="handleEditSuccess"
+			></edit-form>
+		</el-dialog>
+
+		<!-- 详情弹出框 -->
+		<el-dialog
+			:visible.sync="detailShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="'迁入详情'"
+			width="670px"
+			top="5vh"
+			class="dialog-h"
+			@closed="detailFormCancle"
+		>
+			<detail-form
+				v-if="detailShow"
+				ref="ref_form_detail"
+				@diaDetailClose="detailFormCancle"
+			></detail-form>
+		</el-dialog>
+
+		<!-- 变更记录 -->
+		<el-dialog
+			:visible.sync="changeRecordShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="'变更记录'"
+			width="1150px"
+			top="5vh"
+			@closed="diaClose"
+		>
+			<resi-change-record ref="ref_changerecord"></resi-change-record>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { requestPost } from '@/js/dai/request'
-import nextTick from 'dai-js/tools/nextTick'
-import resiChangeRecord from '../../../../components/resiChangeRecord.vue'
-import { mapGetters } from 'vuex'
-import editForm from './edit'
-import detailForm from './detail'
-import axios from 'axios'
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import resiChangeRecord from "../../../../components/resiChangeRecord.vue";
+import { mapGetters } from "vuex";
+import editForm from "./edit";
+import detailForm from "./detail";
+import axios from "axios";
 
 export default {
-  components: { editForm, detailForm, resiChangeRecord },
-  data () {
-    return {
-      openSearch: false,
-
-      formShow: false,
-      detailShow: false,
-      formTitle: '迁入登记',
-      detailShow: false,
-      pageNo: 1,
-      pageSize: window.localStorage.getItem('pageSize') || 20,
-      total: 1,
-
-      tableData: [],
-
-      optionsV: [],
-      optionsB: [],
-      optionsH: [],
-      optionsD: [],
-      optionsG: [],
-
-      optionsWelfare: [
-        {
-          value: '1',
-          label: '是'
-        },
-        {
-          value: '0',
-          label: '否'
-        }
-      ],
-
-      fmData: {
-        gridId: '',
-        villageId: '',
-        buildId: '',
-        unitId: '',
-        homeId: '',
-        name: '',
-        mobile: '',
-        idCard: '',
-        // isWeifare: '', //福利0否，1是
-        startTime: '',
-        endTime: ''
-      },
-      rangeTime: [],
-
-      importBtnTitle: '导入',
-      importLoading: false,
-
-      searchH: 0,
-      tableHeight: 0,
-      changeRecordShow: false,
-    }
-  },
-  computed: {
-    ...mapGetters(['clientHeight', 'iframeHeight']),
-
-
-    changeVDisabled () {
-      return !this.fmData.villageId
-    },
-    changeBDisabled () {
-      return !this.fmData.buildId
-    },
-    changeDDisabled () {
-      return !this.fmData.unitId
-    }
-  },
-  watch: {
-    rangeTime: function (val) {
-      console.log('val----', val)
-      if (Array.isArray(val) && val.length == 2) {
-        this.fmData.startTime = val[0]
-        this.fmData.endTime = val[1]
-      } else {
-        this.fmData.startTime = ''
-        this.fmData.endTime = ''
-      }
-    },
-    searchH () {
-      const h = this.clientHeight - this.searchH + this.iframeHeight
-      const _h = this.clientHeight - this.searchH
-      console.log('computed-searchH---_h', _h)
-
-      this.$nextTick(() => {
-        this.tableHeight = this.$store.state.inIframe ? h : _h
-      })
-    }
-  },
-  mounted () {
-    this.getGridList()
-    this.getValiheList()
-    this.getTableData()
-
-    this.searchH = this.$refs.searchForm.offsetHeight + 290
-    console.log('searchH----', this.$refs.searchForm.offsetHeight)
-  },
-  methods: {
-    diaClose () {
-      this.changeRecordShow = false
-    },
-    //变更记录
-    async handleChangeRecord (row) {
-      this.changeRecordShow = true
-
-      await nextTick(200)
-
-      this.$refs.ref_changerecord.initForm(row)
-    },
-    handleClearVillage () {
-      this.fmData.buildId = ''
-      this.fmData.homeId = ''
-    },
-    handleClearBuild () {
-      this.fmData.buildId = ''
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-    },
-    handleClearDan () {
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-    },
-    handleChangeGrid (val) {
-      console.log('val', val)
-      this.fmData.villageId = ''
-      this.fmData.buildId = ''
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-      this.getValiheList()
-    },
-    handleChangeV (val) {
-      console.log('val', val)
-      this.fmData.buildId = ''
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-      this.getBuildList()
-    },
-    handleChangeB (val) {
-      console.log('val', val)
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-      this.getUniList()
-    },
-    handleChangeD (val) {
-      console.log('val', val)
-      this.fmData.homeId = ''
-      this.getHouseList()
-    },
-
-    getGridList () {
-      const { user } = this.$store.state
-      this.$http
-        .post('/gov/org/customergrid/gridoption', {
-          agencyId: user.agencyId,
-          purpose: 'query'
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsG = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    getValiheList () {
-      const { user } = this.$store.state
-      this.$http
-        .post('/actual/base/communityQuarters/listQuartersOptions', {
-          gridId: this.fmData.gridId,
-          agencyId: ''
-          // agencyId: user.agencyId
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsV = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    getBuildList () {
-      this.$http
-        .post('/actual/base/communityBuilding/buildingoption', {
-          quartersId: this.fmData.villageId
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsB = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    getUniList () {
-      this.$http
-        .post('/actual/base/communityBuildingUnit/unitoption', {
-          buildingId: this.fmData.buildId
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsD = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    getHouseList () {
-      this.$http
-        .post('/actual/base/communityHouse/houseoption', { unitId: this.fmData.unitId })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsH = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-
-    async handleExportModule () {
-      let url = '/actual/base/residentMoveInRecord/export'
-
-      let params = {}
-      await this.$http({
-        method: 'POST',
-        url,
-        responseType: 'blob',
-        data: params
-      })
-        .then((res) => {
-          // 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 = '正在上传中...'
-      this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
-      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append('file', file.file) //添加文件对象
-      await this.$http
-        .post(
-          '/heart/iccommunityselforganization/importcommunityselforganization',
-          formData
-        )
-        .then((res) => {
-          console.log('res-up', res)
-          if (res.data.code == 0 && res.data.msg == 'success') {
-            // this.$message.success('导入成功')
-            this.getTableData()
-          } else this.$message.error(res.data.msg)
-        })
-        .catch((err) => {
-          console.log('失败', err)
-          file.onError() //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
-        })
-      // axios({
-      //   url:
-      //     window.SITE_CONFIG["apiURL"] +
-      //     "/heart/iccommunityselforganization/importcommunityselforganization",
-      //   method: "post",
-      //   data: formData,
-      //   // responseType: "blob",
-      // })
-      //   .then((res) => {
-      //     this.importLoading = false;
-      //     this.importBtnTitle = "导入";
-      //     console.log("resresresresresresres", res);
-
-      //     this.getTableData();
-      //     if (res.data.code == 0) {
-      //       return this.$message.success(res.data.data || "导入成功");
-      //     } else {
-      //       return this.$message.error(res.data.msg);
-      //     }
-      //   })
-      //   .catch((err) => {
-      //     console.log("失败", err);
-      //   });
-      this.importLoading = false
-      this.importBtnTitle = '导入'
-      this.$refs.upload.clearFiles()
-    },
-
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      window.localStorage.setItem('pageSize', val)
-      this.getTableData()
-    },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
-      this.pageNo = val
-      this.getTableData()
-    },
-
-    handleClose () {
-      this.formShow = false
-    },
-    handleSearch (val) {
-      console.log(this.fmData)
-      this.pageNo = 1
-      this.getTableData()
-    },
-    resetForm (formName) {
-      this.$refs[formName].resetFields()
-      this.handleSearch()
-    },
-    async handleAdd () {
-      this.formShow = true
-      await nextTick()
-      console.log(this.$refs)
-      this.$refs.eleEditForm.initForm('add')
-    },
-
-    async handleChu () {
-      const url =
-        '/actual/base/residentMoveInRecord/export'
-      const { pageSize, pageNo, fmData } = this
-      await this.$http({
-        method: 'POST',
-        url,
-        responseType: 'blob',
-        data: {
-          pageSize,
-          pageNo,
-          ...fmData
-        }
-      })
-        .then(res => {
-          console.log('res----dddd', res)
-          // this.download(res.data, title + '.xls')
-          // this.getTemplateList()
-
-          // this.exportLoading = false
-          // if (res.data.code && res.data.code == 9999) {
-          //   return this.$message.error(res.data.msg)
-          // }
-          this.formatData(res)
-
-        })
-        .catch(err => {
-          console.log('err', err)
-          this.exportLoading = false
-          return this.$message.error('网络错误')
-        })
-      // axios({
-      //   url: window.SITE_CONFIG['apiURL'] + url,
-      //   method: 'post',
-      //   data: {
-      //     pageSize,
-      //     pageNo,
-      //     ...fmData
-      //   },
-      //   responseType: 'blob'
-      // })
-      //   .then((res) => {
-      //     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对象
-      //   })
-      //   .catch((err) => {
-      //     console.log('获取导出情失败', err)
-      //     return this.$message.error('网络错误')
-      //   })
-    },
-    formatData (res) {
-      const fileReader = new FileReader()
-      fileReader.onloadend = () => {
-        try {
-          const jsonData = JSON.parse(fileReader.result) // 说明是普通对象数据，后台转换失败
-          // 后台信息
-          console.log('jsonData---1', jsonData)
-          return this.$message.error(jsonData.msg)
-        } catch (err) { // 解析成对象失败，说明是正常的文件流
-          // 下载文件
-          console.log('errr-----', err, this)
-          this.downloadFile(res)
-        }
-      }
-      fileReader.readAsText(res.data)
-    },
-    downloadFile (res) {
-      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对象
-        this.$message.success('导出成功')
-        this.$emit('close')
-      } else this.$message.error('下载失败')
-    },
-
-    async handleWatch (rowIndex) {
-      // this.formShow = true
-      // await nextTick()
-      // this.$refs.eleEditForm.initForm('detail', this.tableData[rowIndex].moveInId)
-
-      this.detailShow = true
-
-      this.$nextTick(() => {
-        this.$refs.ref_form_detail.initForm(this.tableData[rowIndex].moveInId)
-      })
-
-    },
-
-    detailFormCancle () {
-
-      this.detailShow = false
-    },
-
-    async handleEdit (rowIndex) {
-      this.formShow = true
-      await nextTick()
-      this.$refs.eleEditForm.initForm('edit', this.tableData[rowIndex].moveInId)
-    },
-    handleEditSuccess () {
-      this.handleClose()
-      this.getTableData()
-    },
-
-    async handleDel (rowData, rowIndex) {
-      console.log(rowData, rowIndex)
-      const url =
-        '/actual/base/residentMoveInRecord/deleteById'
-      const { tableData } = this
-
-      const { data, code, msg } = await requestPost(url, {
-        orgId: tableData[rowIndex].orgId
-      })
-
-      if (code === 0) {
-        this.$message.success('删除成功！')
-        this.getTableData()
-      } else {
-        this.$message.success('操作失败！')
-      }
-    },
-
-    async handleDelNew (rowData) {
-      const url = "/actual/base/residentMoveInRecord/deleteById";
-      let params = {
-        id: rowData.moveInId
-      }
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.$message.success("删除成功！");
-        this.getTableData();
-      } else {
-        this.$message.success("操作失败！");
-      }
-    },
-
-    async getTableData () {
-      const url = '/actual/base/residentMoveInRecord/list'
-      const { pageSize, pageNo, fmData } = this
-      const { data, code, msg } = await requestPost(url, {
-        pageSize,
-        pageNo,
-        ...fmData
-      })
-      if (code === 0) {
-        console.log('列表请求成功！！！！！！！！！！！！！！')
-        this.total = data.total || 0
-        this.tableData = data.list
-          ? data.list.map((item) => {
-            return item
-          })
-          : []
-      } else {
-      }
-    }
-  }
-}
+	components: { editForm, detailForm, resiChangeRecord },
+	data() {
+		return {
+			openSearch: false,
+
+			formShow: false,
+			detailShow: false,
+			formTitle: "迁入登记",
+			detailShow: false,
+			pageNo: 1,
+			pageSize: window.localStorage.getItem("pageSize") || 20,
+			total: 1,
+
+			tableData: [],
+
+			optionsV: [],
+			optionsB: [],
+			optionsH: [],
+			optionsD: [],
+			optionsG: [],
+
+			optionsWelfare: [
+				{
+					value: "1",
+					label: "是",
+				},
+				{
+					value: "0",
+					label: "否",
+				},
+			],
+
+			fmData: {
+				gridId: "",
+				villageId: "",
+				buildId: "",
+				unitId: "",
+				homeId: "",
+				name: "",
+				mobile: "",
+				idCard: "",
+				// isWeifare: '', //福利0否，1是
+				startTime: "",
+				endTime: "",
+			},
+			rangeTime: [],
+
+			importBtnTitle: "导入",
+			importLoading: false,
+
+			searchH: 0,
+			tableHeight: 0,
+			changeRecordShow: false,
+		};
+	},
+	computed: {
+		...mapGetters(["clientHeight", "iframeHeight"]),
+
+		changeVDisabled() {
+			return !this.fmData.villageId;
+		},
+		changeBDisabled() {
+			return !this.fmData.buildId;
+		},
+		changeDDisabled() {
+			return !this.fmData.unitId;
+		},
+	},
+	watch: {
+		rangeTime: function (val) {
+			console.log("val----", val);
+			if (Array.isArray(val) && val.length == 2) {
+				this.fmData.startTime = val[0];
+				this.fmData.endTime = val[1];
+			} else {
+				this.fmData.startTime = "";
+				this.fmData.endTime = "";
+			}
+		},
+		searchH() {
+			const h = this.clientHeight - this.searchH + this.iframeHeight;
+			const _h = this.clientHeight - this.searchH;
+			console.log("computed-searchH---_h", _h);
+
+			this.$nextTick(() => {
+				this.tableHeight = this.$store.state.inIframe ? h : _h;
+			});
+		},
+	},
+	mounted() {
+		this.getGridList();
+		this.getValiheList();
+		this.getTableData();
+
+		this.searchH = this.$refs.searchForm.offsetHeight + 290;
+		console.log("searchH----", this.$refs.searchForm.offsetHeight);
+	},
+	methods: {
+		diaClose() {
+			this.changeRecordShow = false;
+		},
+		//变更记录
+		async handleChangeRecord(row) {
+			this.changeRecordShow = true;
+
+			await nextTick(200);
+
+			this.$refs.ref_changerecord.initForm(row);
+		},
+		handleClearVillage() {
+			this.fmData.buildId = "";
+			this.fmData.homeId = "";
+		},
+		handleClearBuild() {
+			this.fmData.buildId = "";
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+		},
+		handleClearDan() {
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+		},
+		handleChangeGrid(val) {
+			console.log("val", val);
+			this.fmData.villageId = "";
+			this.fmData.buildId = "";
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+			this.getValiheList();
+		},
+		handleChangeV(val) {
+			console.log("val", val);
+			this.fmData.buildId = "";
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+			this.getBuildList();
+		},
+		handleChangeB(val) {
+			console.log("val", val);
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+			this.getUniList();
+		},
+		handleChangeD(val) {
+			console.log("val", val);
+			this.fmData.homeId = "";
+			this.getHouseList();
+		},
+
+		getGridList() {
+			const { user } = this.$store.state;
+			this.$http
+				.post("/gov/org/customergrid/gridoption", {
+					agencyId: user.agencyId,
+					purpose: "query",
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取查询详情成功", res.data);
+						this.optionsG = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		getValiheList() {
+			const { user } = this.$store.state;
+			this.$http
+				.post("/actual/base/communityQuarters/listQuartersOptions", {
+					gridId: this.fmData.gridId,
+					agencyId: "",
+					// agencyId: user.agencyId
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取查询详情成功", res.data);
+						this.optionsV = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		getBuildList() {
+			this.$http
+				.post("/actual/base/communityBuilding/buildingoption", {
+					quartersId: this.fmData.villageId,
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取查询详情成功", res.data);
+						this.optionsB = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		getUniList() {
+			this.$http
+				.post("/actual/base/communityBuildingUnit/unitoption", {
+					buildingId: this.fmData.buildId,
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取查询详情成功", res.data);
+						this.optionsD = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		getHouseList() {
+			this.$http
+				.post("/actual/base/communityHouse/houseoption", {
+					unitId: this.fmData.unitId,
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取查询详情成功", res.data);
+						this.optionsH = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+
+		async handleExportModule() {
+			let url = "/actual/base/residentMoveInRecord/export";
+
+			let params = {};
+			await this.$http({
+				method: "POST",
+				url,
+				responseType: "blob",
+				data: params,
+			})
+				.then((res) => {
+					// 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 = "正在上传中...";
+			this.$message({
+				showClose: true,
+				message: "导入中，请到系统管理-导入记录中查看进度",
+				duration: 0,
+			});
+			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			formData.append("file", file.file); //添加文件对象
+			await this.$http
+				.post(
+					"/heart/iccommunityselforganization/importcommunityselforganization",
+					formData
+				)
+				.then((res) => {
+					console.log("res-up", res);
+					if (res.data.code == 0 && res.data.msg == "success") {
+						// this.$message.success('导入成功')
+						this.getTableData();
+					} else this.$message.error(res.data.msg);
+				})
+				.catch((err) => {
+					console.log("失败", err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			// axios({
+			//   url:
+			//     window.SITE_CONFIG["apiURL"] +
+			//     "/heart/iccommunityselforganization/importcommunityselforganization",
+			//   method: "post",
+			//   data: formData,
+			//   // responseType: "blob",
+			// })
+			//   .then((res) => {
+			//     this.importLoading = false;
+			//     this.importBtnTitle = "导入";
+			//     console.log("resresresresresresres", res);
+
+			//     this.getTableData();
+			//     if (res.data.code == 0) {
+			//       return this.$message.success(res.data.data || "导入成功");
+			//     } else {
+			//       return this.$message.error(res.data.msg);
+			//     }
+			//   })
+			//   .catch((err) => {
+			//     console.log("失败", err);
+			//   });
+			this.importLoading = false;
+			this.importBtnTitle = "导入";
+			this.$refs.upload.clearFiles();
+		},
+
+		handleSizeChange(val) {
+			console.log(`每页 ${val} 条`);
+			this.pageSize = val;
+			window.localStorage.setItem("pageSize", val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			console.log(`当前页: ${val}`);
+			this.pageNo = val;
+			this.getTableData();
+		},
+
+		handleClose() {
+			this.formShow = false;
+		},
+		handleSearch(val) {
+			console.log(this.fmData);
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		resetForm(formName) {
+			this.$refs[formName].resetFields();
+			this.handleSearch();
+		},
+		async handleAdd() {
+			this.formShow = true;
+			await nextTick();
+			console.log(this.$refs);
+			this.$refs.eleEditForm.initForm("add");
+		},
+
+		async handleChu() {
+			const url = "/actual/base/residentMoveInRecord/export";
+			const { pageSize, pageNo, fmData } = this;
+			await this.$http({
+				method: "POST",
+				url,
+				responseType: "blob",
+				data: {
+					pageSize,
+					pageNo,
+					...fmData,
+				},
+			})
+				.then((res) => {
+					console.log("res----dddd", res);
+					// this.download(res.data, title + '.xls')
+					// this.getTemplateList()
+
+					// this.exportLoading = false
+					// if (res.data.code && res.data.code == 9999) {
+					//   return this.$message.error(res.data.msg)
+					// }
+					this.formatData(res);
+				})
+				.catch((err) => {
+					console.log("err", err);
+					this.exportLoading = false;
+					return this.$message.error("网络错误");
+				});
+			// axios({
+			//   url: window.SITE_CONFIG['apiURL'] + url,
+			//   method: 'post',
+			//   data: {
+			//     pageSize,
+			//     pageNo,
+			//     ...fmData
+			//   },
+			//   responseType: 'blob'
+			// })
+			//   .then((res) => {
+			//     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对象
+			//   })
+			//   .catch((err) => {
+			//     console.log('获取导出情失败', err)
+			//     return this.$message.error('网络错误')
+			//   })
+		},
+		formatData(res) {
+			const fileReader = new FileReader();
+			fileReader.onloadend = () => {
+				try {
+					const jsonData = JSON.parse(fileReader.result); // 说明是普通对象数据，后台转换失败
+					// 后台信息
+					console.log("jsonData---1", jsonData);
+					return this.$message.error(jsonData.msg);
+				} catch (err) {
+					// 解析成对象失败，说明是正常的文件流
+					// 下载文件
+					console.log("errr-----", err, this);
+					this.downloadFile(res);
+				}
+			};
+			fileReader.readAsText(res.data);
+		},
+		downloadFile(res) {
+			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对象
+				this.$message.success("导出成功");
+				this.$emit("close");
+			} else this.$message.error("下载失败");
+		},
+
+		async handleWatch(rowIndex) {
+			// this.formShow = true
+			// await nextTick()
+			// this.$refs.eleEditForm.initForm('detail', this.tableData[rowIndex].moveInId)
+
+			this.detailShow = true;
+
+			this.$nextTick(() => {
+				this.$refs.ref_form_detail.initForm(
+					this.tableData[rowIndex].moveInId
+				);
+			});
+		},
+
+		detailFormCancle() {
+			this.detailShow = false;
+		},
+
+		async handleEdit(rowIndex) {
+			this.formShow = true;
+			await nextTick();
+			this.$refs.eleEditForm.initForm(
+				"edit",
+				this.tableData[rowIndex].moveInId
+			);
+		},
+		handleEditSuccess() {
+			this.handleClose();
+			this.getTableData();
+		},
+
+		async handleDel(rowData, rowIndex) {
+			console.log(rowData, rowIndex);
+			const url = "/actual/base/residentMoveInRecord/deleteById";
+			const { tableData } = this;
+
+			const { data, code, msg } = await requestPost(url, {
+				orgId: tableData[rowIndex].orgId,
+			});
+
+			if (code === 0) {
+				this.$message.success("删除成功！");
+				this.getTableData();
+			} else {
+				this.$message.success("操作失败！");
+			}
+		},
+
+		async handleDelNew(rowData) {
+			const url = "/actual/base/residentMoveInRecord/deleteById";
+			let params = {
+				id: rowData.moveInId,
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success("删除成功！");
+				this.getTableData();
+			} else {
+				this.$message.success("操作失败！");
+			}
+		},
+
+		async getTableData() {
+			const url = "/actual/base/residentMoveInRecord/list";
+			const { pageSize, pageNo, fmData } = this;
+			const { data, code, msg } = await requestPost(url, {
+				pageSize,
+				pageNo,
+				...fmData,
+			});
+			if (code === 0) {
+				console.log("列表请求成功！！！！！！！！！！！！！！");
+				this.total = data.total || 0;
+				this.tableData = data.list
+					? data.list.map((item) => {
+							return item;
+					  })
+					: [];
+			} else {
+			}
+		},
+	},
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 85d31f9ef..0ed681b5d 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1,81 +1,94 @@
 <template>
-  <div class="g-main">
-    <div class="m-search">
-     <section :class="showSercahStatus?'m-form-box-height-auto':'m-form-box-height'">
-      <resi-search ref="myResiSearch"  />
-     </section>
-      <el-row class="resi-search">
-        <el-col :span="24">
-          <el-button
-            size="small"
-            type="primary"
-            @click="handleSearchFrom"
-            >智能查询</el-button
-          >
-          <el-button
-            style="margin-left: 10px"
-            size="small"
-            plain
-            class=" f-right5 diy-button--white"
-            @click="resetSearchForm"
-            >重置</el-button>
-          <el-button
-            size="small"
-            type="primary"
-            @click="handleSearchFrom"
-            >查询</el-button
-          >
-            <el-button
-            type="text"
-            size="small"
-            style="margin-left: 10px"
-            class=" f-right5"
-            @click="showSercahStatus = !showSercahStatus"
-            >
-            <i :class="showSercahStatus?'el-icon-arrow-up':'el-icon-arrow-down'"></i>
-            {{showSercahStatus?'收起':'展开'}}
-          </el-button>
-        </el-col>
-      </el-row>
-    </div>
-
-    <div class="m-table">
-      <div class="div_btn">
-        <div class="div_btn_left">
-          <el-button
-            style="height:32px;"
-            v-if="btnAuths.ic_resi_add"
-            size="small"
-            @click="handleAdd"
-            type="primary"
-            icon="el-icon-plus"
-          >
-            新增</el-button
-          >
-          <el-button
-            v-if="btnAuths.ic_resi_export"
-            style="margin-left: 10px"
-            size="small"
-            class="diy-button--white"
-            @click="diyExport"
-            plain
-            >导出</el-button
-          >
-          <el-button
-            v-if="btnAuths.ic_resi_export"
-            style="margin-left: 10px"
-            size="small"
-            class="diy-button--white"
-            @click=""
-            plain
-            >核对</el-button
-          >
-          <!-- <el-button v-if="btnAuths.ic_resi_import"
+	<div class="g-main">
+		<div class="m-search">
+			<section
+				:class="
+					showSercahStatus
+						? 'm-form-box-height-auto'
+						: 'm-form-box-height'
+				"
+			>
+				<resi-search ref="myResiSearch" />
+			</section>
+			<el-row class="resi-search">
+				<el-col :span="24">
+					<el-button
+						size="small"
+						type="primary"
+						@click="handleSearchFrom"
+						>智能查询</el-button
+					>
+					<el-button
+						style="margin-left: 10px"
+						size="small"
+						plain
+						class="f-right5 diy-button--white"
+						@click="resetSearchForm"
+						>重置</el-button
+					>
+					<el-button
+						size="small"
+						type="primary"
+						@click="handleSearchFrom"
+						>查询</el-button
+					>
+					<el-button
+						type="text"
+						size="small"
+						style="margin-left: 10px"
+						class="f-right5"
+						@click="showSercahStatus = !showSercahStatus"
+					>
+						<i
+							:class="
+								showSercahStatus
+									? 'el-icon-arrow-up'
+									: 'el-icon-arrow-down'
+							"
+						></i>
+						{{ showSercahStatus ? "收起" : "展开" }}
+					</el-button>
+				</el-col>
+			</el-row>
+		</div>
+
+		<div class="m-table">
+			<div class="div_btn">
+				<div class="div_btn_left">
+					<el-button
+						style="height: 32px"
+						v-if="btnAuths.ic_resi_add"
+						size="small"
+						@click="handleAdd"
+						type="primary"
+						icon="el-icon-plus"
+					>
+						新增</el-button
+					>
+					<el-button
+						v-if="btnAuths.ic_resi_export"
+						style="margin-left: 10px"
+						size="small"
+						class="diy-button--white"
+						@click="diyExport"
+						plain
+						>导出</el-button
+					>
+					<el-button
+						v-if="btnAuths.ic_resi_export"
+						style="margin-left: 10px"
+						size="small"
+						class="diy-button--white"
+						@click=""
+						plain
+						>核对</el-button
+					>
+					<!-- <el-button v-if="btnAuths.ic_resi_import"
                      style="margin-left:10px"
                      class="diy-button--blue"
                      size="small"
                      @click="handleExportModule('room')">下载模板</el-button> -->
-          <!-- <el-upload v-if="btnAuths.ic_resi_import"
+					<!-- <el-upload v-if="btnAuths.ic_resi_import"
                      :headers="$getElUploadHeaders()"
                      ref="upload"
                      class="upload-demo"
@@ -95,354 +108,472 @@
                        :loading="importLoading">{{ importBtnTitle }}</el-button>
           </el-upload> -->
 
-          <el-button
-            v-if="btnAuths.ic_resi_smart_import && displayedBaobiaoBtn"
-            style="margin-left: 10px"
-            size="small"
-            @click="reportForm"
-            class="diy-button--white"
-            >核对</el-button
-          >
-
-          <el-button
-            style="margin-left: 10px"
-            v-if="btnAuths.ic_resi_batch_del"
-            size="small"
-            class="diy-button--white"
-            plain
-            @click="deleteBatch"
-            >批量删除</el-button
-          >
-          <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
-        </div>
-      </div>
-
-      <el-table
-        ref="ref_table"
-        class="m-table-item"
-        :data="tableData"
-        v-loading="tableLoading"
-        border
-        style="width: 100%"
-        :height="tableHeight"
-        @select-all="selectAll"
-        @selection-change="selectionChange"
-      >
-        <el-table-column
-          type="selection"
-          fixed="left"
-          align="center"
-          :selectable="checkSelectable"
-          width="50"
-        />
-        <el-table-column
-          label="序号"
-          type="index"
-          fixed="left"
-          align="left"
-          width="50"
-        >
-        </el-table-column>
-        <el-table-column
-          v-for="item in tableHeader"
-          :key="item.columnName"
-          :prop="item.columnName"
-          :label="item.label"
-          align="left"
-          :show-overflow-tooltip="true"
-          :width="item.width || ''"
-        >
-          <template slot-scope="scope">
-            <a
-              v-if="item.columnName == 'NAME' && btnAuths.ic_resi_view"
-              class="name-a"
-            >
-              {{ handleFilterSpan(scope.row, item) }}
-            </a>
-            <div v-else-if="item.columnName == 'gender'">
-              {{ scope.row.gender == 1 ? "男" : "女" }}
-            </div>
-            <div v-else-if="item.columnName == 'birthday'">
-              {{scope.row.birthday?scope.row.birthday.substr(0, 10):'' }}
-            </div>
-            <div v-else-if="item.columnName == 'idNum'">
-              {{ scope.row.idNum?`${scope.row.idNum.substr(0, 11)}` +
-                "******" +
-                `${scope.row.idNum.substr(16, 2)}`:''}}
-            </div>
-            <div v-else-if="item.columnName == 'mobile'">
-              {{
-                scope.row.mobile?`${scope.row.mobile.substr(0, 3)}` +
-                "******" +
-                `${scope.row.mobile.substr(7, 4)}`:''
-              }}
-            </div>
-            <div v-else-if="item.columnName == 'categoryInfo'">
-                <template v-if="scope.row.categoryInfo">
-                  {{scope.row.categoryInfo.bereavedPersonFlag == 1?'失独人员 ':'' }}
-                  {{scope.row.categoryInfo.chronicDiseaseFlag == 1?'慢病 ':'' }}
-                  {{scope.row.categoryInfo.dementedFlag == 1?'失智老人 ':'' }}
-                  {{scope.row.categoryInfo.disabilityFlag == 1?'残疾 ':'' }}
-                  {{scope.row.categoryInfo.disabledFlag == 1?'失能老人 ':'' }}
-                  {{scope.row.categoryInfo.emptyNesterFlag == 1?'空巢老人 ':'' }}
-                  {{scope.row.categoryInfo.ensureHouseFlag == 1?'保障房 ':'' }}
-                  {{scope.row.categoryInfo.fertileWomanFlag == 1?'育龄妇女 ':'' }}
-                  {{scope.row.categoryInfo.floatingFlag == 1?'流动人口 ':'' }}
-                  {{scope.row.categoryInfo.liveAloneFlag == 1?'独居老人 ':'' }}
-                  {{scope.row.categoryInfo.oldPeopleFlag == 1?'老年人 ':'' }}
-                  {{scope.row.categoryInfo.partyFlag == 1?'党员 ':'' }}
-                  {{scope.row.categoryInfo.petitionOfficerFlag == 1?'信访人员 ':'' }}
-                  {{scope.row.categoryInfo.seriousIllnessFlag == 1?'大病 ':'' }}
-                  {{scope.row.categoryInfo.specialCrowdFlag == 1?'特殊人群 ':'' }}
-                  {{scope.row.categoryInfo.subsistenceAllowanceFlag == 1?'低保 ':'' }}
-                  {{scope.row.categoryInfo.tenantFlag == 1?'租户 ':'' }}
-                  {{scope.row.categoryInfo.unemployedFlag == 1?'失业 ':'' }}
-                  {{scope.row.categoryInfo.unitedFrontFlag == 1?'统战人员 ':'' }}
-                  {{scope.row.categoryInfo.veteranFlag == 1?'退役军人 ':'' }}
-                  {{scope.row.categoryInfo.volunteerFlag == 1?'志愿者 ':'' }}
-                </template>
-            </div>
-            <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column fixed="right" label="操作" align="center" width="200">
-          <template slot-scope="scope">
-            <el-button
-              v-if="btnAuths.ic_resi_view"
-              type="text"
-              size="small"
-              @click="handleLook(scope.row)"
-              >查看</el-button
-            >
-
-            <template v-if="filterEdit(scope.row.agencyId)">
-              <el-button
-                v-if="btnAuths.ic_resi_update"
-                style="margin-right: 10px"
-                @click="handleEdit(scope.row)"
-                size="small"
-                type="text"
-                >编辑</el-button
-              >
-
-              <el-popconfirm
-                v-if="btnAuths.ic_resi_del"
-                title="删除之后无法回复，确认删除？"
-                @onConfirm="handleDel(scope.row)"
-              >
-                <el-button
-                  size="small"
-                  type="text"
-                  slot="reference"
-                  >删除</el-button
-                >
-              </el-popconfirm>
-
-              <el-dropdown
-                trigger="click"
-                style="margin-left: 10px"
-                @command="(command) => handelRegister(command, scope.row)"
-              >
-                <el-button
-                  class="div-table-button--blue"
-                  size="small"
-                  type="text"
-                  style="font-size: 10px"
-                >
-                  ▪▪▪</el-button
-                >
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item
-                    v-if="false && btnAuths.ic_resi_change_rec"
-                    command="bgjl"
-                    >变更记录</el-dropdown-item
-                  >
-                  <el-dropdown-item
-                    v-if="btnAuths.ic_resi_update"
-                    command="swdj"
-                    >死亡登记</el-dropdown-item
-                  >
-                  <el-dropdown-item
-                    v-if="btnAuths.ic_resi_update"
-                    command="qcdj"
-                    >迁出登记</el-dropdown-item
-                  >
-                </el-dropdown-menu>
-              </el-dropdown>
-            </template>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div class="div-flex">
-        <div class="m-page">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page.sync="currentPage"
-            :page-sizes="[20, 50, 100, 200]"
-            :page-size="pageSize"
-            layout="sizes, prev, pager, next, total"
-            :total="total"
-          >
-          </el-pagination>
-        </div>
-      </div>
-    </div>
-
-    <el-dialog
-      :title="formName === '社区居民基本信息录入表' ? '新增居民' : formName"
-      :visible.sync="dialogVisible"
-      width="986px"
-      top="5vh"
-      append-to-body
-      class="dialog-h"
-      :close-on-click-modal="false"
-      :before-close="handlerCancle"
-    >
-      <div class="dialog-h-content scroll-h">
-        <resi-form
-          v-if="dialogVisible"
-          ref="baseForm"
-          :fixed="true"
-          :form-list="formList"
-          :resi-id="editUserId"
-          @changegroup="handleChangeGroup"
-        />
-
-      </div>
-
-      <div class="resi-btns">
-        <el-button
-          size="small"
-          v-if="false"
-          @click="handlerReset"
-          class="diy-button--common"
-          >重置</el-button
-        >
-        <el-button
-          size="small"
-          @click="handlerCancle"
-          plain
-          >取消</el-button
-        >
-        <el-button
-          v-if="!editUserId"
-          type="primary"
-          size="small"
-          :loading="btnLoading"
-          @click="handleSUbmit"
-          >保存</el-button
-        >
-
-        <el-button
-          v-else
-          type="primary"
-          size="small"
-          :loading="btnLoading"
-          @click="handleEditSUbmit"
-          >提交</el-button
-        >
-      </div>
-    </el-dialog>
-
-    <el-dialog
-      title="居民详情"
-      :visible.sync="dialogVisible2"
-      width="986px"
-      top="5vh"
-      append-to-body
-      class="dialog-h"
-      :close-on-click-modal="false"
-      :before-close="() => {this.dialogVisible2 = false}"
-    >
-      <div class="dialog-h-content scroll-h">
-        <resi-info
-          v-if="dialogVisible2"
-          ref="resiInfo"
-          :fixed="true"
-          :resi-id="lookResiId"
-        />
-      </div>
-
-      <div class="resi-btns">
-        <el-button
-          size="small"
-          plain
-          @click="dialogVisible2 = false"
-          >关闭</el-button
-        >
-      </div>
-    </el-dialog>
-
-    <!-- 变更记录 -->
-    <el-dialog
-      :visible.sync="changeRecordShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'变更记录'"
-      width="1150px"
-      top="5vh"
-      @closed="diaClose"
-    >
-      <resi-change-record ref="ref_changerecord"></resi-change-record>
-    </el-dialog>
-
-    <el-dialog
-      :visible.sync="diyDialog"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="1150px"
-      top="5vh"
-      class="dialog-h"
-    >
-      <diy-info
-        v-if="diyDialog"
-        ref="ref_diy"
-        :list="exportList"
-        :search="{
-          formCode: 'resident_base_info',
-          pageNo: currentPage,
-          pageSize: pageSize,
-          conditions: conditions,
-        }"
-        @close="handleDiyClose"
-      ></diy-info>
-    </el-dialog>
-
-    <baobiao ref="baobiao" />
-
-    <!-- 迁出登记 -->
-    <el-dialog
-      :visible.sync="tranferShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'迁出登记'"
-      width="620px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <resi-change-transfer
-        ref="ref_change_transfer"
-        @dialogCancle="transferClose"
-      ></resi-change-transfer>
-    </el-dialog>
-
-    <!-- 死亡登记 -->
-    <el-dialog
-      :visible.sync="deathShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="'死亡登记'"
-      width="620px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <resideath-add ref="ref_death" @dialogCancle="deathClose"></resideath-add>
-    </el-dialog>
-  </div>
+					<el-button
+						v-if="
+							btnAuths.ic_resi_smart_import && displayedBaobiaoBtn
+						"
+						style="margin-left: 10px"
+						size="small"
+						@click="reportForm"
+						class="diy-button--white"
+						>核对</el-button
+					>
+
+					<el-button
+						style="margin-left: 10px"
+						v-if="btnAuths.ic_resi_batch_del"
+						size="small"
+						class="diy-button--white"
+						plain
+						@click="deleteBatch"
+						>批量删除</el-button
+					>
+					<!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
+				</div>
+			</div>
+
+			<el-table
+				ref="ref_table"
+				class="m-table-item"
+				:data="tableData"
+				v-loading="tableLoading"
+				border
+				style="width: 100%"
+				:height="tableHeight"
+				@select-all="selectAll"
+				@selection-change="selectionChange"
+			>
+				<el-table-column
+					type="selection"
+					fixed="left"
+					align="center"
+					:selectable="checkSelectable"
+					width="50"
+				/>
+				<el-table-column
+					label="序号"
+					type="index"
+					fixed="left"
+					align="left"
+					width="50"
+				>
+				</el-table-column>
+				<el-table-column
+					v-for="item in tableHeader"
+					:key="item.columnName"
+					:prop="item.columnName"
+					:label="item.label"
+					align="left"
+					:show-overflow-tooltip="true"
+					:width="item.width || ''"
+				>
+					<template slot-scope="scope">
+						<a
+							v-if="
+								item.columnName == 'NAME' &&
+								btnAuths.ic_resi_view
+							"
+							class="name-a"
+						>
+							{{ handleFilterSpan(scope.row, item) }}
+						</a>
+						<div v-else-if="item.columnName == 'gender'">
+							{{ scope.row.gender == 1 ? "男" : "女" }}
+						</div>
+						<div v-else-if="item.columnName == 'birthday'">
+							{{
+								scope.row.birthday
+									? scope.row.birthday.substr(0, 10)
+									: ""
+							}}
+						</div>
+						<div v-else-if="item.columnName == 'idNum'">
+							{{
+								scope.row.idNum
+									? `${scope.row.idNum.substr(0, 11)}` +
+									  "******" +
+									  `${scope.row.idNum.substr(16, 2)}`
+									: ""
+							}}
+						</div>
+						<div v-else-if="item.columnName == 'mobile'">
+							{{
+								scope.row.mobile
+									? `${scope.row.mobile.substr(0, 3)}` +
+									  "******" +
+									  `${scope.row.mobile.substr(7, 4)}`
+									: ""
+							}}
+						</div>
+						<div v-else-if="item.columnName == 'categoryInfo'">
+							<template v-if="scope.row.categoryInfo">
+								{{
+									scope.row.categoryInfo.bereavedPersonFlag ==
+									1
+										? "失独人员 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.chronicDiseaseFlag ==
+									1
+										? "慢病 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.dementedFlag == 1
+										? "失智老人 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.disabilityFlag == 1
+										? "残疾 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.disabledFlag == 1
+										? "失能老人 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.emptyNesterFlag == 1
+										? "空巢老人 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.ensureHouseFlag == 1
+										? "保障房 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.fertileWomanFlag == 1
+										? "育龄妇女 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.floatingFlag == 1
+										? "流动人口 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.liveAloneFlag == 1
+										? "独居老人 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.oldPeopleFlag == 1
+										? "老年人 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.partyFlag == 1
+										? "党员 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo
+										.petitionOfficerFlag == 1
+										? "信访人员 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.seriousIllnessFlag ==
+									1
+										? "大病 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.specialCrowdFlag == 1
+										? "特殊人群 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo
+										.subsistenceAllowanceFlag == 1
+										? "低保 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.tenantFlag == 1
+										? "租户 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.unemployedFlag == 1
+										? "失业 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.unitedFrontFlag == 1
+										? "统战人员 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.veteranFlag == 1
+										? "退役军人 "
+										: ""
+								}}
+								{{
+									scope.row.categoryInfo.volunteerFlag == 1
+										? "志愿者 "
+										: ""
+								}}
+							</template>
+						</div>
+						<span v-else>{{
+							handleFilterSpan(scope.row, item)
+						}}</span>
+					</template>
+				</el-table-column>
+				<el-table-column
+					fixed="right"
+					label="操作"
+					align="center"
+					width="200"
+				>
+					<template slot-scope="scope">
+						<el-button
+							v-if="btnAuths.ic_resi_view"
+							type="text"
+							size="small"
+							@click="handleLook(scope.row)"
+							>查看</el-button
+						>
+
+						<template v-if="filterEdit(scope.row.agencyId)">
+							<el-button
+								v-if="btnAuths.ic_resi_update"
+								style="margin-right: 10px"
+								@click="handleEdit(scope.row)"
+								size="small"
+								type="text"
+								>编辑</el-button
+							>
+
+							<el-popconfirm
+								v-if="btnAuths.ic_resi_del"
+								title="删除之后无法回复，确认删除？"
+								@onConfirm="handleDel(scope.row)"
+							>
+								<el-button
+									size="small"
+									type="text"
+									slot="reference"
+									>删除</el-button
+								>
+							</el-popconfirm>
+
+							<el-dropdown
+								trigger="click"
+								style="margin-left: 10px"
+								@command="
+									(command) =>
+										handelRegister(command, scope.row)
+								"
+							>
+								<el-button
+									class="div-table-button--blue"
+									size="small"
+									type="text"
+									style="font-size: 10px"
+								>
+									▪▪▪</el-button
+								>
+								<el-dropdown-menu slot="dropdown">
+									<el-dropdown-item
+										v-if="
+											false && btnAuths.ic_resi_change_rec
+										"
+										command="bgjl"
+										>变更记录</el-dropdown-item
+									>
+									<el-dropdown-item
+										v-if="btnAuths.ic_resi_update"
+										command="swdj"
+										>死亡登记</el-dropdown-item
+									>
+									<el-dropdown-item
+										v-if="btnAuths.ic_resi_update"
+										command="qcdj"
+										>迁出登记</el-dropdown-item
+									>
+								</el-dropdown-menu>
+							</el-dropdown>
+						</template>
+					</template>
+				</el-table-column>
+			</el-table>
+
+			<div class="div-flex">
+				<div class="m-page">
+					<el-pagination
+						@size-change="handleSizeChange"
+						@current-change="handleCurrentChange"
+						:current-page.sync="currentPage"
+						:page-sizes="[20, 50, 100, 200]"
+						:page-size="pageSize"
+						layout="sizes, prev, pager, next, total"
+						:total="total"
+					>
+					</el-pagination>
+				</div>
+			</div>
+		</div>
+
+		<el-dialog
+			:title="
+				formName === '社区居民基本信息录入表' ? '新增居民' : formName
+			"
+			:visible.sync="dialogVisible"
+			width="986px"
+			top="5vh"
+			append-to-body
+			class="dialog-h"
+			:close-on-click-modal="false"
+			:before-close="handlerCancle"
+		>
+			<div class="dialog-h-content scroll-h">
+				<resi-form
+					v-if="dialogVisible"
+					ref="baseForm"
+					:fixed="true"
+					:form-list="formList"
+					:resi-id="editUserId"
+					@changegroup="handleChangeGroup"
+				/>
+			</div>
+
+			<div class="resi-btns">
+				<el-button
+					size="small"
+					v-if="false"
+					@click="handlerReset"
+					class="diy-button--common"
+					>重置</el-button
+				>
+				<el-button size="small" @click="handlerCancle" plain
+					>取消</el-button
+				>
+				<el-button
+					v-if="!editUserId"
+					type="primary"
+					size="small"
+					:loading="btnLoading"
+					@click="handleSUbmit"
+					>保存</el-button
+				>
+
+				<el-button
+					v-else
+					type="primary"
+					size="small"
+					:loading="btnLoading"
+					@click="handleEditSUbmit"
+					>提交</el-button
+				>
+			</div>
+		</el-dialog>
+
+		<el-dialog
+			title="居民详情"
+			:visible.sync="dialogVisible2"
+			width="986px"
+			top="5vh"
+			append-to-body
+			class="dialog-h"
+			:close-on-click-modal="false"
+			:before-close="
+				() => {
+					this.dialogVisible2 = false;
+				}
+			"
+		>
+			<div class="dialog-h-content scroll-h">
+				<resi-info
+					v-if="dialogVisible2"
+					ref="resiInfo"
+					:fixed="true"
+					:resi-id="lookResiId"
+				/>
+			</div>
+
+			<div class="resi-btns">
+				<el-button size="small" plain @click="dialogVisible2 = false"
+					>关闭</el-button
+				>
+			</div>
+		</el-dialog>
+
+		<!-- 变更记录 -->
+		<el-dialog
+			:visible.sync="changeRecordShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="'变更记录'"
+			width="1150px"
+			top="5vh"
+			@closed="diaClose"
+		>
+			<resi-change-record ref="ref_changerecord"></resi-change-record>
+		</el-dialog>
+
+		<el-dialog
+			:visible.sync="diyDialog"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			width="1150px"
+			top="5vh"
+			class="dialog-h"
+		>
+			<diy-info
+				v-if="diyDialog"
+				ref="ref_diy"
+				:list="exportList"
+				:search="{
+					formCode: 'resident_base_info',
+					pageNo: currentPage,
+					pageSize: pageSize,
+					conditions: conditions,
+				}"
+				@close="handleDiyClose"
+			></diy-info>
+		</el-dialog>
+
+		<baobiao ref="baobiao" />
+
+		<!-- 迁出登记 -->
+		<el-dialog
+			:visible.sync="tranferShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="'迁出登记'"
+			width="620px"
+			top="5vh"
+			class="dialog-h"
+			@closed="diaClose"
+		>
+			<resi-change-transfer
+				ref="ref_change_transfer"
+				@dialogCancle="transferClose"
+			></resi-change-transfer>
+		</el-dialog>
+
+		<!-- 死亡登记 -->
+		<el-dialog
+			:visible.sync="deathShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="'死亡登记'"
+			width="620px"
+			top="5vh"
+			class="dialog-h"
+			@closed="diaClose"
+		>
+			<resideath-add
+				ref="ref_death"
+				@dialogCancle="deathClose"
+			></resideath-add>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
@@ -461,1098 +592,1252 @@ import { requestPost } from "@/js/dai/request";
 
 import resiChangeTransfer from "../../components/resiChangeTransfer.vue";
 import resideathAdd from "../plugins/change/resideathAdd.vue";
+import util from "@/js/util";
+import dateFormat from "dai-js/tools/dateFormat";
 
 export default {
-  components: {
-    baobiao,
-    resiSearch,
-    resiForm,
-    resiInfo,
-    resiTransfer,
-    resiChangeRecord,
-    diyInfo,
-
-    resiChangeTransfer,
-    resideathAdd,
-  },
-  data() {
-    return {
-      activeNames: [],
-      showSercahStatus:false,
-      diyDialog: false,
-      openSearch: false,
-      exportBtn: false,
-      exportBtnTitle: "导出",
-      importBtnTitle: "导入",
-      importLoading: false,
-      rowVisible: false,
-      tableLoading: false,
-      btnLoading: false,
-      disabled: false,
-      pageLoading: false,
-      selAllFlag: false,
-      selAllFlagDisabled: false,
-      isIndeterminate: false,
-      dialogEditVisible: false,
-      dialogVisible: false,
-      // 显示人员详情
-      dialogVisible2: false,
-      resiDetailList:{},//人员详情数据
-      lookResiId: "",
-
-      uploadUlr:
-        window.SITE_CONFIG["apiURL"] + "/epmetuser/icresiuser/importExcel",
-      currentPage: 1,
-      pageSize: 20,
-      total: null,
-      searchH: 0,
-      resideathAddObj1: {}, // 死亡登记子组件
-      conditions: [],
-      activeName: "",
-      tableData: [],
-      searchList: [],
-      exportList: [],
-      editAgencyId: "",
-      editForm: {
-        GRID_ID: "",
-        VILLAGE_ID: "",
-        BUILD_ID: "",
-        HOME_ID: "",
-      },
-      editTableName: {},
-      formName: "",
-      formList: [],
-      tableHeader: [
-        { columnName: "name", label: "姓名", width: 150 },
-        { columnName: "birthday", label: "生日", width: 150 },
-        { columnName: "gender", label: "性别", width: 80 },
-        { columnName: "gridName", label: "所属网格" },
-        { columnName: "homeName", label: "所属房屋" },
-        { columnName: "idNum", label: "证件号", width: 200 },
-        { columnName: "categoryInfo", label: "居民分类", width: 200 },
-        { columnName: "mobile", label: "联系电话", width: 150 },
-      ],
-      tabsList: [],
-      selection: [],
-
-      defaultCategotyKey: "",
-
-      tranferShow: false,
-      deathShow: false,
-      changeRecordShow: false,
-      lookInfo: {
-        userId: "",
-        gridName: "",
-      },
-      editUserId: "",
-
-      displayedBaobiaoBtn: false,
-
-      btnAuths: {
-        ic_resi_add: true, //新增
-        ic_resi_import: true, //导入
-        ic_resi_export: true, //导出
-        ic_resi_batch_del: true, //批量删除
-        ic_resi_smart_import: true, //智能填表
-        ic_resi_del: true, //删除
-        ic_resi_view: true, //查看
-        ic_resi_update: true, //修改
-        ic_resi_change_rec: true, //变更记录
-        ic_resi_view_real_data: true, //显示脱敏信息
-      },
-    };
-  },
-
-  props: {},
-
-  // async activated() {
-  //   console.log("this.$route.query---", this.$route.query);
-  //   if (this.$route.query && this.$route.query.columnName) {
-  //     this.searchList = [];
-  //     let query = this.$route.query;
-  //     this.defaultCategotyKey = query.columnName;
-  //     console.log("defaultCategotyKey----", this.defaultCategotyKey);
-  //   }
-  // },
-
-  computed: {
-    ...mapGetters(["clientHeight", "iframeHeight"]),
-    tableHeight() {
-      const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
-      const _h = this.clientHeight - 275 - this.searchH;
-      return this.$store.state.inIframe ? h : _h;
-    },
-  },
-
-  async created() {
-    this.updateBtnAuths();
-
-    // if (this.$route.query) {
-    //   let query = this.$route.query;
-    //   this.defaultCategotyKey = query.columnName;
-    // }
-
-    // await this.getFormList()
-    // console.log('this.$refs.resiSearch', this)
-    this.pageLoading = true;
-    console.log("storeoooo----0000", this.$store);
-  },
-
-  async mounted() {
-    // this.$nextTick(() => {
-    //   this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
-    // })
-    console.log(
-      "document.documentElement.clientWidth",
-      document.documentElement.clientHeight
-    );
-    this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
-      elseParams: {
-        categoryKeys: ["resi_info"],
-        categoryKey: "resi_info",
-      },
-    });
-  },
-
-  methods: {
-    // 更新按钮权限
-    updateBtnAuths() {
-      let rot = this.$route;
-      if (Array.isArray(rot.meta.btns)) {
-        rot.meta.btns.forEach((item) => {
-          this.btnAuths[item.permissions] = true;
-        });
-      }
-    },
-    handelRegister(command, row) {
-      console.log(command);
-      console.log(row);
-      if (command == "bgjl") {
-        this.handleChangeRecord(row);
-      } else if (command == "swdj") {
-        this.handleDeath(row);
-      } else if (command == "qcdj") {
-        this.handleChangeTransfer(row);
-      }
-    },
-    reportForm() {
-      this.$refs.baobiao.init({
-        elseParams: {
-          categoryKeys: ["resi_info"],
-          categoryKey: "resi_info",
-          paramMap: {
-            searchForm: {
-              formCode: "resident_base_info",
-              pageNo: this.currentPage,
-              pageSize: this.pageSize,
-              conditions: this.conditions,
-            },
-          },
-        },
-      });
-    },
-    handleSearchFrom() {
-      let obj = this.$refs.myResiSearch.form
-      let categoryArr = this.$refs.myResiSearch.form.categoryKey
-      let agencyId =  this.$refs.myResiSearch.form.agencyId
-      if (typeof obj.categoryKey == 'object'&&obj.categoryKey.length != 0) {
-        obj.categoryKey = obj.categoryKey.join(',')
-      } else  {
-        obj.categoryKey = "";
-      }
-      if (typeof obj.agencyId == 'object'&&obj.agencyId.length != 0) {
-        obj.agencyId = obj.agencyId.join(',')
-      } else  {
-        obj.agencyId = "";
-      }
-      this.currentPage = 1
-      console.log(obj);
-      this.getTableData(obj)
-      this.$refs.myResiSearch.form.categoryKey = categoryArr
-      this.$refs.myResiSearch.form.agencyId = agencyId
-    },
-    // 是否可以选中
-    checkSelectable(row, index) {
-      return this.filterEdit(row.agencyId);
-    },
-
-    //迁出记录
-    async handleChangeTransfer(row) {
-      this.tranferShow = true;
-      await nextTick(200);
-      this.$refs.ref_change_transfer.initForm(row);
-    },
-    //死亡记录
-    async handleDeath(row) {
-      console.log("=====", row);
-      this.deathShow = true;
-      await nextTick(200);
-      this.$refs.ref_death.initForm(row);
-    },
-
-    //变更记录
-    async handleChangeRecord(row) {
-      this.changeRecordShow = true;
-      await nextTick(200);
-      this.$refs.ref_changerecord.initForm(row);
-    },
-
-    diaClose() {
-      this.tranferShow = false;
-      this.deathShow = false;
-      this.changeRecordShow = false;
-    },
-
-    transferClose() {
-      this.tranferShow = false;
-      this.getTableData();
-    },
-    deathClose() {
-      this.deathShow = false;
-      this.getTableData();
-    },
-    handleDiyClose() {
-      this.diyDialog = false;
-    },
-    handleOpenSearch() {
-      if (!this.openSearch) this.activeNames = [this.searchList[0].itemGroupId];
-      this.openSearch = !this.openSearch;
-    },
-    async diyExport() {
-      await this.getExportList();
-    },
-    computedWidth(label, type) {
-      let wd = "";
-      if (type == "input" || type == "select") wd = 40 * label.length;
-      else if (type == "radio") wd = 20 * label.length;
-      console.log("type-----wd", wd);
-      return wd > 80 ? wd : 80;
-    },
-    filterEdit(id) {
-      const { user } = this.$store.state;
-      // return true; //临时放开权限，正式需要注释掉
-      return id === user.agencyId;
-    },
-    selectionChange(selection) {
-      this.selection = selection;
-      if (selection.length === this.tableData.length) {
-        this.selAllFlag = true;
-        this.isIndeterminate = false;
-      } else if (selection.length > 0) {
-        this.selAllFlag = false;
-        this.isIndeterminate = true;
-      } else {
-        this.selAllFlag = false;
-        this.isIndeterminate = false;
-      }
-    },
-    handleSelectAll(selectAllFlag) {
-      // if (this.tableData.length == 0) {
-      //   this.selAllFlag = false
-      //   return
-      // }
-      this.$refs.ref_table.clearSelection();
-      if (selectAllFlag) {
-        this.tableData.forEach((row) => {
-          // this.$refs.ref_table.toggleRowSelection(row);
-          if (row.isChecked) {
-            this.$refs.ref_table.toggleRowSelection(row);
-          }
-        });
-      }
-    },
-    selectAll(selection) {
-      this.selection = selection;
-
-      if (selection.length > 0) {
-        this.selAllFlag = true;
-      } else {
-        this.selAllFlag = false;
-      }
-    },
-
-    deleteBatch() {
-      if (this.selection.length > 0) {
-        this.$confirm("删除之后无法恢复，确认删除？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.deleteresiBatch();
-          })
-          .catch((err) => {
-            if (err == "cancel") {
-              // this.$message({
-              //   type: "info",
-              //   message: "已取消删除"
-              // });
-            }
-          });
-      } else {
-        this.$message.warning("请先选择要删除的居民");
-      }
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-      this.pageSize = val;
-      this.getTableData()
-    },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-      let obj = this.$refs.myResiSearch.form
-      if (typeof obj.categoryKey == 'object'&&obj.categoryKey .length != 0) {
-        obj.categoryKey = obj.categoryKey.join(',')
-      } else  {
-        obj.categoryKey = "";
-      }
-      if (typeof obj.agencyId == 'object'&&obj.agencyId .length != 0) {
-        obj.agencyId = obj.agencyId.join(',')
-      } else  {
-        obj.agencyId = "";
-      }
-      this.currentPage = val;
-      this.getTableData(obj);
-    },
-    handleFilterSpan(row, item) {
-      let _val = "";
-      if (item.itemType === "radio" && item.options.length > 0) {
-        item.options.forEach((n) => {
-          if (n.value === row[item.columnName]) _val = n.label;
-        });
-        if (row[item.columnName] == "0") return (_val = "");
-      }
-
-      return _val || row[item.columnName];
-    },
-
-    resetSearchForm() {
-      for(const n in this.$refs.myResiSearch.form) {
-        this.$refs.myResiSearch.form[n] = ''
-      }
-      this.getTableData();
-    },
-    async handleExportModule() {
-      let url = "/epmetuser/icresiuser/import/download-template";
-
-      let params = {};
-      await this.$http({
-        method: "POST",
-        url,
-        responseType: "blob",
-        data: params,
-      })
-        .then((res) => {
-          console.log("res----dddd", res);
-          // 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("网络错误");
-        });
-    },
-    // 下载文件
-    download(data, fileName) {
-      console.log("data", data);
-      if (!data) {
-        return;
-      }
-
-      var csvData = new Blob([data]);
-
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, fileName);
-      }
-      // for Non-IE (chrome, firefox etc.)
-      else {
-        var a = document.createElement("a");
-        document.body.appendChild(a);
-        a.style = "display: none";
-        var url = window.URL.createObjectURL(csvData);
-        a.href = url;
-        a.download = fileName;
-        a.click();
-        a.remove();
-        window.URL.revokeObjectURL(url);
-      }
-    },
-    async handleExport() {
-      this.exportBtn = true;
-      this.exportBtnTitle = "正在导出...";
-      let params = {
-        formCode: "resident_base_info",
-        conditions: this.conditions,
-      };
-
-      // .post('epmetuser/icresiuser/exportExcel', params)
-      await axios({
-        url: window.SITE_CONFIG["apiURL"] + "/epmetuser/icresiuser/exportExcel",
-        // url: 'epmetuser/icresiuser/exportExcel',
-        method: "post",
-        data: params,
-        responseType: "blob",
-      })
-        .then((res) => {
-          console.log("resllll", res);
-          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对象
-        })
-        .catch((err) => {
-          console.log("获取导出情失败", err);
-          this.$message.error("获取导出失败");
-        });
-      this.exportBtnTitle = "导出";
-      this.exportBtn = false;
-    },
-    // 上传大图标成功
-    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 < 100;
-      if (!fileType) {
-        this.$message.error("上传文件只能是xls/xlsx格式！");
-      }
-
-      if (!isLt1M) {
-        this.$message.error("上传文件大小不能超过 100MB!");
-      }
-      return fileType && isLt1M;
-    },
-    async uploadHttpRequest(file) {
-      this.importLoading = true;
-      this.importBtnTitle = "正在上传中...";
-      this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
-      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append("file", file.file); //添加文件对象
-      await this.$http
-        .post("/epmetuser/icresiuser/importExcel", formData)
-        .then((res) => {
-          console.log("res-up", res);
-          if (res.data.code == 0 && res.data.msg == "success") {
-            // this.$message.success('导入成功')
-            this.getTableData();
-          } else this.$message.error(res.data.msg);
-        })
-        .catch((err) => {
-          console.log("失败", err);
-          file.onError(); //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
-        });
-      // await axios({
-      //   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
-      //   method: 'post',
-      //   data: formData,
-      //   timeout: '300000',
-      //   responseType: 'blob'
-      // })
-      //   .then((res) => {
-      //     console.log('res-up', res)
-      //     // 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对象
-      //     // }
-
-      //     this.getTableData()
-      //   })
-      //   .catch(err => {
-      //     console.log('失败', err)
-      //     file.onError() //上传失败的文件会从文件列表中删除
-      //     this.$message.error('导入失败')
-      //   })
-      this.importLoading = false;
-      this.importBtnTitle = "导入";
-      this.$refs.upload.clearFiles();
-    },
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-
-    // 查看
-    async handleLook(row) {
-      this.lookResiId = row.resiId;
-      this.dialogVisible2 = true;
-    },
-
-    // 编辑
-    async handleEdit(row) {
-      this.editUserId = row.resiId;
-      this.formName = "编辑居民";
-      this.dialogVisible = true;
-      await this.residentBaseInfo();
-    },
-    // 获取详情
-    residentBaseInfo () {
-      this.$http.post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg);
-        } else {
-          this.$refs.baseForm.old_from(res.data);
-        }
-      }).catch((err) => {
-        return this.$message.error("网络错误");
-      });
-    },
-    handlerReset() {
-      this.$refs.baseForm.resetForm();
-    },
-
-    async handleAdd() {
-      this.formName = "新增居民";
-      this.editUserId = "";
-      this.dialogVisible = true;
-    },
-
-    async handleChangeGroup(val) {
-      console.log("changeguoprrrrr----", val);
-      let { childGroup, value, partyInfo } = val;
-      let hasT = false;
-      let i = 0;
-      let list = [...this.tabsList];
-      list.forEach((item, index) => {
-        if (item.tableName === childGroup.tableName) {
-          hasT = true;
-          i = index;
-        }
-      });
-      if (value === true || value === "true") {
-        // console.log('changegroup----999', value)
-        if (!hasT) {
-          childGroup.itemList.forEach(async (item) => {
-            if (item.optionSourceType === "remote") {
-              await this.getOptionsList(item.optionSourceValue).then((res) => {
-                item.options = this.getTreeData(res);
-              });
-              // console.log('')
-            }
-          });
-          if (
-            partyInfo &&
-            partyInfo.length > 0 &&
-            childGroup.tableName == "ic_party_member"
-          ) {
-            list.push({ ...childGroup, formInfo: partyInfo[0] });
-          } else list.push(childGroup);
-        }
-      } else {
-        // console.log('changegroup----000', value)
-        if (hasT) list.splice(i, 1);
-      }
-      this.tabsList = [...list];
-    },
-    formetForm() {
-      const _baseForm = this.$refs.baseForm.handleForm();
-      let arr = [];
-      if (_baseForm.length === 0) return false;
-      arr.push([..._baseForm]);
-      this.tabsList.forEach((item) => {
-        arr.push([...this.$refs["group" + item.groupId][0].handleForm()]);
-      });
-      let arr2 = arr.reduce(function (a, b) {
-        return a.concat(b);
-      });
-      let noChange = true;
-      arr2.forEach((item) => {
-        if (item.list.length !== 0) noChange = false;
-      });
-      console.log("arr2", arr2);
-      if (noChange) {
-        this.$message.warning("您还没有做任何修改");
-        return false;
-      }
-      // 合并相同tableName的多个数组
-      let hash = {};
-      let i = 0;
-      let res = [];
-      let finalArr = [];
-      arr2.forEach(function (item) {
-        let name = item.tableName;
-        if (hash[name]) {
-          res[hash[name] - 1].list.push(...item.list);
-        } else {
-          hash[name] = ++i;
-          res.push({
-            list: [...item.list],
-            supportAdd: item.supportAdd,
-            tableName: name,
-          });
-        }
-      });
-      console.log("res", res);
-      // 多个list合并成一个list子集
-      res.forEach((item) => {
-        let _form = {};
-        item.list.length > 0 &&
-          item.list.forEach((n) => {
-            _form = { ..._form, ...n };
-          });
-        if (item.list.length > 0) {
-          finalArr.push({
-            tableName: item.tableName,
-            list: item.supportAdd ? [...item.list] : [{ ..._form }],
-          });
-        }
-      });
-      console.log("finalArr", finalArr);
-      return finalArr;
-    },
-    async handleEditSUbmit() {
-      this.handleSUbmit()
-    },
-
-    async handleSUbmit() {
-      if (!this.$refs.baseForm.submit_from()) {
-        return
-      }
-      const _baseForm = JSON.parse(this.$refs.baseForm.submit_from())
-      console.log(_baseForm);
-      _baseForm.partyFlag = parseInt(_baseForm.partyFlag) //党员
-      _baseForm.subsistenceAllowanceFlag = parseInt(_baseForm.subsistenceAllowanceFlag) //低保
-      _baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag) //保障房
-      _baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag) //失业
-      _baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag), //育龄妇女
-      _baseForm.veteranFlag = parseInt(_baseForm.veteranFlag) //退役军人
-      _baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag) //统战人员
-      _baseForm.petitionOfficerFlag = parseInt(_baseForm.petitionOfficerFlag) //信访人员
-      _baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag) //志愿者
-      _baseForm.bereavedPersonFlag = parseInt(_baseForm.bereavedPersonFlag) //失独
-      _baseForm.tenantFlag = parseInt(_baseForm.tenantFlag) //租户
-      _baseForm.floatingFlag = parseInt(_baseForm.floatingFlag) //流动人口
-      _baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag) //特殊人群
-      _baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag) //老年人
-      _baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag) //空巢
-      _baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag) //独居老人
-      _baseForm.disabledFlag = parseInt(_baseForm.disabledFlag) //失能老人
-      _baseForm.dementedFlag = parseInt(_baseForm.dementedFlag) //失智老人
-      _baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag) //是否残疾
-      _baseForm.seriousIllnessFlag = parseInt(_baseForm.seriousIllnessFlag) //大病
-      _baseForm.chronicDiseaseFlag = parseInt(_baseForm.chronicDiseaseFlag) //慢病
-      var hobbyCode = ''
-      if (_baseForm.hobbyInfoDto) {
-        if (_baseForm.hobbyInfoDto.hobbyCode.length === 0) {
-          hobbyCode = "";
-          _baseForm.hobbyInfoDto.hobbyCode = hobbyCode
-        } else {
-          _baseForm.hobbyInfoDto.hobbyCode.forEach((element,index) => {
-            hobbyCode = index === 0 ? element : hobbyCode + "," + element
-          });
-          _baseForm.hobbyInfoDto.hobbyCode = hobbyCode
-        }
-      }
-
-      var volunteerCategory = ''
-      if (_baseForm.volunteerDto) {
-        if (_baseForm.volunteerDto.volunteerCategory.length === 0) {
-          volunteerCategory = "";
-          _baseForm.volunteerDto.volunteerCategory = volunteerCategory
-        } else {
-          _baseForm.volunteerDto.volunteerCategory.forEach((element,index) => {
-            volunteerCategory = index === 0 ? element : volunteerCategory + "," + element
-          });
-          _baseForm.volunteerDto.volunteerCategory = volunteerCategory
-        }
-      }
-
-      var specialCategoryCode = ''
-      if (_baseForm.specialDto) {
-        if (_baseForm.specialDto.specialCategoryCode.length === 0) {
-          specialCategoryCode = "";
-          _baseForm.specialDto.specialCategoryCode = specialCategoryCode
-        } else {
-          _baseForm.specialDto.specialCategoryCode.forEach((element,index) => {
-            specialCategoryCode = index === 0 ? element : specialCategoryCode + "," + element
-          });
-          _baseForm.specialDto.specialCategoryCode = specialCategoryCode
-        }
-      }
-      console.log(_baseForm);
-      this.submitAdd(_baseForm);
-    },
-    handleDel(row) {
-      console.log("row1", row);
-      this.$http
-        .post("/actual/base/residentBaseInfo/batchdel", [row.resiId])
-        .then(({ data: res }) => {
-          console.log("row2", row);
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("row3", row);
-            this.$message.success("删除成功");
-            this.getTableData();
-          }
-        })
-        .catch((err) => {
-          console.log("row4", err);
-          return this.$message.error("网络错误");
-        });
-    },
-    handleFormatUrl(url) {
-      return url.includes("?");
-    },
-    handlerEditCancle() {
-      this.$refs.baseForm.resetForm();
-      this.tabsList.forEach((item) => {
-        this.$refs["group" + item.groupId][0].resetForm();
-      });
-      this.dialogEditVisible = false;
-    },
-    handlerCancle() {
-      // this.$refs.baseForm.resetForm();
-      // this.tabsList.forEach((item) => {
-      //   this.$refs["group" + item.groupId][0].resetForm();
-      // });
-      this.dialogVisible = false;
-    },
-    async submitAdd(arr) {
-      console.log(arr);
-      this.btnLoading = true;
-      await this.$http
-        .post(arr.resiId ? "actual/base/residentBaseInfo/update" : "/actual/base/residentBaseInfo/save", arr)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.$message.success("提交成功");
-            // this.$refs[formName].resetFields();
-
-            this.dialogVisible = false;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-      // console.log(this.$refs.baseForm.form);
-      this.btnLoading = false;
-    },
-    async submitEdit(arr) {
-      this.btnLoading = true;
-      await this.$http
-        .post("/epmetuser/icresiuser/edit", arr)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.$message.success("提交成功");
-            // this.$refs[formName].resetFields();
-            this.$refs.baseForm.resetForm();
-            this.tabsList.forEach((item) => {
-              this.$refs["group" + item.groupId][0].resetForm();
-            });
-            this.getTableData();
-            this.dialogEditVisible = false;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-      this.btnLoading = false;
-    },
-
-    async getTableData(obj) {
-      let params = {
-        pageNo: this.currentPage,
-        pageSize: this.pageSize,
-        ...obj
-      };
-
-      this.tableLoading = true;
-      const { data} = await this.$http.post(
-        "/actual/base/residentBaseInfo/page",
-        params
-      );
-      this.tableLoading = false;
-      if (data.code === 0) {
-        this.total = data.data.total;
-        this.tableData = data.data.list
-      } else {
-        this.$message.error(data.msg);
-      }
-    },
-
-    getrowInfo(id) {
-      let params = {
-        formCode: "resident_base_info",
-        icResiUserId: id,
-      };
-      this.$http
-        .post("/epmetuser/icresiuser/detail", params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            // console.log('getrowInfo----', res.data)
-            let info = res.data;
-            this.editTableName = { ...info };
-            let list = info[this.formList[0].tableName][0];
-            for (let n in list) {
-              this.editForm[n] = list[n];
-            }
-            this.formList.forEach((item) => {
-              item.columnValue = list[item.columnName];
-              item.ID = list.ID;
-
-              if (
-                item.columnValue == "1" &&
-                item.itemType === "radio" &&
-                item.childGroup
-              ) {
-                this.tabsList.push(item.childGroup);
-              }
-
-              // if (item.childGroup && info[item.childGroup.tableName]) {
-
-              // }
-            });
-            this.tabsList.forEach((item) => {
-              let _info = info[item.tableName];
-              if (item.supportAdd) {
-                // console.log('tabsList---333', item.label)
-                const _list = [...item.itemList];
-                let mutiList = [];
-                if (_info) {
-                  _info.forEach((fo, index) => {
-                    // console.log('mutiList----555' + index, mutiList, _list)
-                    mutiList.splice(index, 0, {
-                      row: index,
-                      itemList: _list.map((m) => {
-                        // console.log('itemList---item' + index, m)
-                        return {
-                          ...m,
-                          ID: fo.ID,
-                          columnValue: fo[m.columnName],
-                        };
-                      }),
-                    });
-                    // console.log('mutiList----666' + index, mutiList)
-                  });
-                }
-                item.mutiList = mutiList;
-              } else {
-                if (_info) {
-                  item.itemList.forEach((n) => {
-                    n.ID = _info[0].ID;
-                    n.columnValue = _info[0][n.columnName];
-                  });
-                }
-              }
-            });
-            // console.log('getrowInfo---formname', this.tabsList)
-            this.dialogEditVisible = true;
-          }
-        })
-        .catch((err) => {
-          console.log("getrowInfo---formnameerr", err);
-          return this.$message.error("网络错误");
-        });
-    },
-    async getOptionsList(url) {
-      let options = [];
-      // console.log('getOptionsList----', url)
-      await this.$http
-        .post(url, { formCode: "resident_base_info" })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            options = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-      return options;
-    },
-
-    getTreeData(data) {
-      if (!Array.isArray(data)) return [];
-      let arr = data.map((item) => {
-        let _item = {};
-        if (item.children) {
-          if (item.children.length === 0)
-            _item = { ...item, children: undefined };
-          else _item = { ...item, children: this.getTreeData(item.children) };
-        } else {
-          _item = { ...item };
-        }
-        return _item;
-      });
-      return arr;
-    },
-
-    async getFormList(type) {
-      await this.$http
-        .post("/oper/customize/icform/getcustomerform", {
-          formCode: "resident_base_info",
-          dynamic: true,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log(res.data, "res.data");
-            console.log("获取详情成功getFormList");
-            let { itemList, groupList, formName } = res.data;
-            this.formName = formName;
-            this.activeName = "group" + res.data.groupList[0].groupId;
-            if (type !== "edit") {
-              itemList.forEach(async (item) => {
-                if (item.optionSourceType === "remote") {
-                  await this.getOptionsList(item.optionSourceValue).then(
-                    (res) => {
-                      item.options = this.getTreeData(res);
-                    }
-                  );
-                }
-              });
-            }
-            groupList.forEach((item) => {
-              item.itemList.forEach(async (n) => {
-                n.tableName = item.tableName;
-                if (n.optionSourceType === "remote" && type !== "edit") {
-                  await this.getOptionsList(n.optionSourceValue).then((res) => {
-                    n.options = this.getTreeData(res);
-                  });
-                }
-              });
-            });
-            this.formList = itemList;
-            this.tabsList = groupList;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    async getExportList(type) {
-      const url = "/oper/customize/icformitemgroup/list";
-      let params = {
-        formCode: "resident_base_info",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        data.forEach((item) => {
-          (async (id) => {
-            // item.queryItemList = await this.getExportChildList(id)
-            item.queryItemList = [];
-          })(item.id);
-        });
-        this.exportList = [...data];
-        this.$nextTick(() => {
-          this.diyDialog = true;
-        });
-        console.log("获取详情成功getExportList----", this.exportList);
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async getExportChildList(groupId) {
-      const url = `/oper/customize/icformitem/getItemList/${groupId}`;
-      let params = {};
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        return data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    async deleteresiBatch() {
-      if (this.selection.length === 0)
-        return this.$message.error("请选择之后进行操作");
-      let userIds = this.selection.map((item) => item.resiId);
-      this.$http
-        .post("/actual/base/residentBaseInfo/batchdel", userIds)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.$message.success("删除成功");
-            this.getTableData();
-          }
-        })
-        .catch((err) => {
-          console.log("row4", err);
-          return this.$message.error("网络错误");
-        });
-    },
-  },
-  watch: {
-  '$route': {
-     handler:  function (newVal, oldVal){
-       if(newVal.name == "base-resi"){
-        this.getTableData({categoryKey:this.$store.state.categoryStr.categoryCode||'',pageNo: this.currentPage,
-        pageSize: this.pageSize})
-        // this.$refs.myResiSearch.form.categoryKey.push(this.$store.state.categoryStr.categoryCode)
-        this.$store.commit('setCategoryCode','')
-       }
-     },
-     deep:  true,
-     immediate: true
-   }
-},
-
+	components: {
+		baobiao,
+		resiSearch,
+		resiForm,
+		resiInfo,
+		resiTransfer,
+		resiChangeRecord,
+		diyInfo,
+
+		resiChangeTransfer,
+		resideathAdd,
+	},
+	data() {
+		return {
+			activeNames: [],
+			showSercahStatus: false,
+			diyDialog: false,
+			openSearch: false,
+			exportBtn: false,
+			exportBtnTitle: "导出",
+			importBtnTitle: "导入",
+			importLoading: false,
+			rowVisible: false,
+			tableLoading: false,
+			btnLoading: false,
+			disabled: false,
+			pageLoading: false,
+			selAllFlag: false,
+			selAllFlagDisabled: false,
+			isIndeterminate: false,
+			dialogEditVisible: false,
+			dialogVisible: false,
+			// 显示人员详情
+			dialogVisible2: false,
+			resiDetailList: {}, //人员详情数据
+			lookResiId: "",
+
+			uploadUlr:
+				window.SITE_CONFIG["apiURL"] +
+				"/epmetuser/icresiuser/importExcel",
+			currentPage: 1,
+			pageSize: 20,
+			total: null,
+			searchH: 0,
+			resideathAddObj1: {}, // 死亡登记子组件
+			conditions: [],
+			activeName: "",
+			tableData: [],
+			searchList: [],
+			exportList: [],
+			editAgencyId: "",
+			editForm: {
+				GRID_ID: "",
+				VILLAGE_ID: "",
+				BUILD_ID: "",
+				HOME_ID: "",
+			},
+			editTableName: {},
+			formName: "",
+			formList: [],
+			tableHeader: [
+				{ columnName: "name", label: "姓名", width: 150 },
+				{ columnName: "birthday", label: "生日", width: 150 },
+				{ columnName: "gender", label: "性别", width: 80 },
+				{ columnName: "gridName", label: "所属网格" },
+				{ columnName: "homeName", label: "所属房屋" },
+				{ columnName: "idNum", label: "证件号", width: 200 },
+				{ columnName: "categoryInfo", label: "居民分类", width: 200 },
+				{ columnName: "mobile", label: "联系电话", width: 150 },
+			],
+			tabsList: [],
+			selection: [],
+
+			defaultCategotyKey: "",
+
+			tranferShow: false,
+			deathShow: false,
+			changeRecordShow: false,
+			lookInfo: {
+				userId: "",
+				gridName: "",
+			},
+			editUserId: "",
+
+			displayedBaobiaoBtn: false,
+
+			btnAuths: {
+				ic_resi_add: true, //新增
+				ic_resi_import: true, //导入
+				ic_resi_export: true, //导出
+				ic_resi_batch_del: true, //批量删除
+				ic_resi_smart_import: true, //智能填表
+				ic_resi_del: true, //删除
+				ic_resi_view: true, //查看
+				ic_resi_update: true, //修改
+				ic_resi_change_rec: true, //变更记录
+				ic_resi_view_real_data: true, //显示脱敏信息
+			},
+
+			queryConditions: [],
+		};
+	},
+
+	props: {},
+
+	// async activated() {
+	//   console.log("this.$route.query---", this.$route.query);
+	//   if (this.$route.query && this.$route.query.columnName) {
+	//     this.searchList = [];
+	//     let query = this.$route.query;
+	//     this.defaultCategotyKey = query.columnName;
+	//     console.log("defaultCategotyKey----", this.defaultCategotyKey);
+	//   }
+	// },
+
+	computed: {
+		...mapGetters(["clientHeight", "iframeHeight"]),
+		tableHeight() {
+			const h =
+				this.clientHeight - this.searchH - 275 + this.iframeHeight;
+			const _h = this.clientHeight - 275 - this.searchH;
+			return this.$store.state.inIframe ? h : _h;
+		},
+	},
+
+	async created() {
+		this.updateBtnAuths();
+
+		// if (this.$route.query) {
+		//   let query = this.$route.query;
+		//   this.defaultCategotyKey = query.columnName;
+		// }
+
+		// await this.getFormList()
+		// console.log('this.$refs.resiSearch', this)
+		this.pageLoading = true;
+		console.log("storeoooo----0000", this.$store);
+	},
+
+	async mounted() {
+		// this.$nextTick(() => {
+		//   this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
+		// })
+		console.log(
+			"document.documentElement.clientWidth",
+			document.documentElement.clientHeight
+		);
+		this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
+			elseParams: {
+				categoryKeys: ["resi_info"],
+				categoryKey: "resi_info",
+			},
+		});
+		this.getQueryConditions();
+	},
+
+	methods: {
+		// 更新按钮权限
+		updateBtnAuths() {
+			let rot = this.$route;
+			if (Array.isArray(rot.meta.btns)) {
+				rot.meta.btns.forEach((item) => {
+					this.btnAuths[item.permissions] = true;
+				});
+			}
+		},
+		handelRegister(command, row) {
+			console.log(command);
+			console.log(row);
+			if (command == "bgjl") {
+				this.handleChangeRecord(row);
+			} else if (command == "swdj") {
+				this.handleDeath(row);
+			} else if (command == "qcdj") {
+				this.handleChangeTransfer(row);
+			}
+		},
+		reportForm() {
+			this.$refs.baobiao.init({
+				elseParams: {
+					categoryKeys: ["resi_info"],
+					categoryKey: "resi_info",
+					paramMap: {
+						searchForm: {
+							formCode: "resident_base_info",
+							pageNo: this.currentPage,
+							pageSize: this.pageSize,
+							conditions: this.conditions,
+						},
+					},
+				},
+			});
+		},
+		handleSearchFrom() {
+			let obj = this.$refs.myResiSearch.form;
+			let categoryArr = this.$refs.myResiSearch.form.categoryKey;
+			let agencyId = this.$refs.myResiSearch.form.agencyId;
+			if (
+				typeof obj.categoryKey == "object" &&
+				obj.categoryKey.length != 0
+			) {
+				obj.categoryKey = obj.categoryKey.join(",");
+			} else {
+				obj.categoryKey = "";
+			}
+			if (typeof obj.agencyId == "object" && obj.agencyId.length != 0) {
+				obj.agencyId = obj.agencyId.join(",");
+			} else {
+				obj.agencyId = "";
+			}
+			this.currentPage = 1;
+			this.getTableData(obj);
+
+			let conditions = this.queryConditions
+				.filter((item) => obj[item.humpName])
+				.map((item) => {
+					let queryType = "equal";
+					const { humpName } = item;
+					if (
+						humpName == "name" ||
+						humpName == "mobile" ||
+						humpName == "idNum"
+					) {
+						queryType = "like";
+					}
+					return {
+						...item,
+						queryType,
+						columnValue: [obj[item.humpName]],
+					};
+				});
+			if (obj.birthdayStart || obj.birthdayEnd) {
+				conditions.push({
+					queryType: "daterange",
+					columnValue: [
+						obj.birthdayStart || "",
+						obj.birthdayEnd || "",
+					],
+					columnName: "BIRTHDAY",
+					label: "出生日期",
+					tableName: "resident_base_info",
+				});
+			}
+			if (obj.ageStart || obj.ageEnd) {
+				let ageStart = obj.ageStart || 0;
+				let ageEnd = obj.ageEnd || 200;
+				let currentYear = new Date().getFullYear();
+				let dateStart = dateFormat(
+					new Date(new Date().setFullYear(currentYear - ageStart)),
+					"yyyy-MM-dd"
+				);
+				let dateEnd = dateFormat(
+					new Date(new Date().setFullYear(currentYear - ageEnd)),
+					"yyyy-MM-dd"
+				);
+				conditions.push({
+					queryType: "daterange",
+					columnValue: [dateEnd, dateStart],
+					columnName: "BIRTHDAY",
+					label: "出生日期",
+					tableName: "resident_base_info",
+				});
+			}
+			this.conditions = conditions;
+			console.log(obj, this.conditions);
+
+			this.$refs.myResiSearch.form.categoryKey = categoryArr;
+			this.$refs.myResiSearch.form.agencyId = agencyId;
+		},
+		// 是否可以选中
+		checkSelectable(row, index) {
+			return this.filterEdit(row.agencyId);
+		},
+
+		//迁出记录
+		async handleChangeTransfer(row) {
+			this.tranferShow = true;
+			await nextTick(200);
+			this.$refs.ref_change_transfer.initForm(row);
+		},
+		//死亡记录
+		async handleDeath(row) {
+			console.log("=====", row);
+			this.deathShow = true;
+			await nextTick(200);
+			this.$refs.ref_death.initForm(row);
+		},
+
+		//变更记录
+		async handleChangeRecord(row) {
+			this.changeRecordShow = true;
+			await nextTick(200);
+			this.$refs.ref_changerecord.initForm(row);
+		},
+
+		diaClose() {
+			this.tranferShow = false;
+			this.deathShow = false;
+			this.changeRecordShow = false;
+		},
+
+		transferClose() {
+			this.tranferShow = false;
+			this.getTableData();
+		},
+		deathClose() {
+			this.deathShow = false;
+			this.getTableData();
+		},
+		handleDiyClose() {
+			this.diyDialog = false;
+		},
+		handleOpenSearch() {
+			if (!this.openSearch)
+				this.activeNames = [this.searchList[0].itemGroupId];
+			this.openSearch = !this.openSearch;
+		},
+		async diyExport() {
+			await this.getExportList();
+		},
+		computedWidth(label, type) {
+			let wd = "";
+			if (type == "input" || type == "select") wd = 40 * label.length;
+			else if (type == "radio") wd = 20 * label.length;
+			console.log("type-----wd", wd);
+			return wd > 80 ? wd : 80;
+		},
+		filterEdit(id) {
+			const { user } = this.$store.state;
+			// return true; //临时放开权限，正式需要注释掉
+			return id === user.agencyId;
+		},
+		selectionChange(selection) {
+			this.selection = selection;
+			if (selection.length === this.tableData.length) {
+				this.selAllFlag = true;
+				this.isIndeterminate = false;
+			} else if (selection.length > 0) {
+				this.selAllFlag = false;
+				this.isIndeterminate = true;
+			} else {
+				this.selAllFlag = false;
+				this.isIndeterminate = false;
+			}
+		},
+		handleSelectAll(selectAllFlag) {
+			// if (this.tableData.length == 0) {
+			//   this.selAllFlag = false
+			//   return
+			// }
+			this.$refs.ref_table.clearSelection();
+			if (selectAllFlag) {
+				this.tableData.forEach((row) => {
+					// this.$refs.ref_table.toggleRowSelection(row);
+					if (row.isChecked) {
+						this.$refs.ref_table.toggleRowSelection(row);
+					}
+				});
+			}
+		},
+		selectAll(selection) {
+			this.selection = selection;
+
+			if (selection.length > 0) {
+				this.selAllFlag = true;
+			} else {
+				this.selAllFlag = false;
+			}
+		},
+
+		deleteBatch() {
+			if (this.selection.length > 0) {
+				this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+					confirmButtonText: "确定",
+					cancelButtonText: "取消",
+					type: "warning",
+				})
+					.then(() => {
+						this.deleteresiBatch();
+					})
+					.catch((err) => {
+						if (err == "cancel") {
+							// this.$message({
+							//   type: "info",
+							//   message: "已取消删除"
+							// });
+						}
+					});
+			} else {
+				this.$message.warning("请先选择要删除的居民");
+			}
+		},
+		handleSizeChange(val) {
+			console.log(`每页 ${val} 条`);
+			this.pageSize = val;
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			console.log(`当前页: ${val}`);
+			let obj = this.$refs.myResiSearch.form;
+			if (
+				typeof obj.categoryKey == "object" &&
+				obj.categoryKey.length != 0
+			) {
+				obj.categoryKey = obj.categoryKey.join(",");
+			} else {
+				obj.categoryKey = "";
+			}
+			if (typeof obj.agencyId == "object" && obj.agencyId.length != 0) {
+				obj.agencyId = obj.agencyId.join(",");
+			} else {
+				obj.agencyId = "";
+			}
+			this.currentPage = val;
+			this.getTableData(obj);
+		},
+		handleFilterSpan(row, item) {
+			let _val = "";
+			if (item.itemType === "radio" && item.options.length > 0) {
+				item.options.forEach((n) => {
+					if (n.value === row[item.columnName]) _val = n.label;
+				});
+				if (row[item.columnName] == "0") return (_val = "");
+			}
+
+			return _val || row[item.columnName];
+		},
+
+		resetSearchForm() {
+			for (const n in this.$refs.myResiSearch.form) {
+				this.$refs.myResiSearch.form[n] = "";
+			}
+			this.getTableData();
+		},
+		async handleExportModule() {
+			let url = "/epmetuser/icresiuser/import/download-template";
+
+			let params = {};
+			await this.$http({
+				method: "POST",
+				url,
+				responseType: "blob",
+				data: params,
+			})
+				.then((res) => {
+					console.log("res----dddd", res);
+					// 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("网络错误");
+				});
+		},
+		// 下载文件
+		download(data, fileName) {
+			console.log("data", data);
+			if (!data) {
+				return;
+			}
+
+			var csvData = new Blob([data]);
+
+			if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+				window.navigator.msSaveOrOpenBlob(csvData, fileName);
+			}
+			// for Non-IE (chrome, firefox etc.)
+			else {
+				var a = document.createElement("a");
+				document.body.appendChild(a);
+				a.style = "display: none";
+				var url = window.URL.createObjectURL(csvData);
+				a.href = url;
+				a.download = fileName;
+				a.click();
+				a.remove();
+				window.URL.revokeObjectURL(url);
+			}
+		},
+		async handleExport() {
+			this.exportBtn = true;
+			this.exportBtnTitle = "正在导出...";
+			let params = {
+				formCode: "resident_base_info",
+				conditions: this.conditions,
+			};
+
+			// .post('epmetuser/icresiuser/exportExcel', params)
+			await axios({
+				url:
+					window.SITE_CONFIG["apiURL"] +
+					"/epmetuser/icresiuser/exportExcel",
+				// url: 'epmetuser/icresiuser/exportExcel',
+				method: "post",
+				data: params,
+				responseType: "blob",
+			})
+				.then((res) => {
+					console.log("resllll", res);
+					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对象
+				})
+				.catch((err) => {
+					console.log("获取导出情失败", err);
+					this.$message.error("获取导出失败");
+				});
+			this.exportBtnTitle = "导出";
+			this.exportBtn = false;
+		},
+		// 上传大图标成功
+		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 < 100;
+			if (!fileType) {
+				this.$message.error("上传文件只能是xls/xlsx格式！");
+			}
+
+			if (!isLt1M) {
+				this.$message.error("上传文件大小不能超过 100MB!");
+			}
+			return fileType && isLt1M;
+		},
+		async uploadHttpRequest(file) {
+			this.importLoading = true;
+			this.importBtnTitle = "正在上传中...";
+			this.$message({
+				showClose: true,
+				message: "导入中，请到系统管理-导入记录中查看进度",
+				duration: 0,
+			});
+			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+			formData.append("file", file.file); //添加文件对象
+			await this.$http
+				.post("/epmetuser/icresiuser/importExcel", formData)
+				.then((res) => {
+					console.log("res-up", res);
+					if (res.data.code == 0 && res.data.msg == "success") {
+						// this.$message.success('导入成功')
+						this.getTableData();
+					} else this.$message.error(res.data.msg);
+				})
+				.catch((err) => {
+					console.log("失败", err);
+					file.onError(); //上传失败的文件会从文件列表中删除
+					// this.$message.error('导入失败')
+				});
+			// await axios({
+			//   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
+			//   method: 'post',
+			//   data: formData,
+			//   timeout: '300000',
+			//   responseType: 'blob'
+			// })
+			//   .then((res) => {
+			//     console.log('res-up', res)
+			//     // 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对象
+			//     // }
+
+			//     this.getTableData()
+			//   })
+			//   .catch(err => {
+			//     console.log('失败', err)
+			//     file.onError() //上传失败的文件会从文件列表中删除
+			//     this.$message.error('导入失败')
+			//   })
+			this.importLoading = false;
+			this.importBtnTitle = "导入";
+			this.$refs.upload.clearFiles();
+		},
+		handleClick(tab, event) {
+			console.log(tab, event);
+		},
+
+		// 查看
+		async handleLook(row) {
+			this.lookResiId = row.resiId;
+			this.dialogVisible2 = true;
+		},
+
+		// 编辑
+		async handleEdit(row) {
+			this.editUserId = row.resiId;
+			this.formName = "编辑居民";
+			this.dialogVisible = true;
+			await this.residentBaseInfo();
+		},
+		// 获取详情
+		residentBaseInfo() {
+			this.$http
+				.post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$refs.baseForm.old_from(res.data);
+					}
+				})
+				.catch((err) => {
+					return this.$message.error("网络错误");
+				});
+		},
+		handlerReset() {
+			this.$refs.baseForm.resetForm();
+		},
+
+		async handleAdd() {
+			this.formName = "新增居民";
+			this.editUserId = "";
+			this.dialogVisible = true;
+		},
+
+		async handleChangeGroup(val) {
+			console.log("changeguoprrrrr----", val);
+			let { childGroup, value, partyInfo } = val;
+			let hasT = false;
+			let i = 0;
+			let list = [...this.tabsList];
+			list.forEach((item, index) => {
+				if (item.tableName === childGroup.tableName) {
+					hasT = true;
+					i = index;
+				}
+			});
+			if (value === true || value === "true") {
+				// console.log('changegroup----999', value)
+				if (!hasT) {
+					childGroup.itemList.forEach(async (item) => {
+						if (item.optionSourceType === "remote") {
+							await this.getOptionsList(
+								item.optionSourceValue
+							).then((res) => {
+								item.options = this.getTreeData(res);
+							});
+							// console.log('')
+						}
+					});
+					if (
+						partyInfo &&
+						partyInfo.length > 0 &&
+						childGroup.tableName == "ic_party_member"
+					) {
+						list.push({ ...childGroup, formInfo: partyInfo[0] });
+					} else list.push(childGroup);
+				}
+			} else {
+				// console.log('changegroup----000', value)
+				if (hasT) list.splice(i, 1);
+			}
+			this.tabsList = [...list];
+		},
+		formetForm() {
+			const _baseForm = this.$refs.baseForm.handleForm();
+			let arr = [];
+			if (_baseForm.length === 0) return false;
+			arr.push([..._baseForm]);
+			this.tabsList.forEach((item) => {
+				arr.push([
+					...this.$refs["group" + item.groupId][0].handleForm(),
+				]);
+			});
+			let arr2 = arr.reduce(function (a, b) {
+				return a.concat(b);
+			});
+			let noChange = true;
+			arr2.forEach((item) => {
+				if (item.list.length !== 0) noChange = false;
+			});
+			console.log("arr2", arr2);
+			if (noChange) {
+				this.$message.warning("您还没有做任何修改");
+				return false;
+			}
+			// 合并相同tableName的多个数组
+			let hash = {};
+			let i = 0;
+			let res = [];
+			let finalArr = [];
+			arr2.forEach(function (item) {
+				let name = item.tableName;
+				if (hash[name]) {
+					res[hash[name] - 1].list.push(...item.list);
+				} else {
+					hash[name] = ++i;
+					res.push({
+						list: [...item.list],
+						supportAdd: item.supportAdd,
+						tableName: name,
+					});
+				}
+			});
+			console.log("res", res);
+			// 多个list合并成一个list子集
+			res.forEach((item) => {
+				let _form = {};
+				item.list.length > 0 &&
+					item.list.forEach((n) => {
+						_form = { ..._form, ...n };
+					});
+				if (item.list.length > 0) {
+					finalArr.push({
+						tableName: item.tableName,
+						list: item.supportAdd ? [...item.list] : [{ ..._form }],
+					});
+				}
+			});
+			console.log("finalArr", finalArr);
+			return finalArr;
+		},
+		async handleEditSUbmit() {
+			this.handleSUbmit();
+		},
+
+		async handleSUbmit() {
+			if (!this.$refs.baseForm.submit_from()) {
+				return;
+			}
+			const _baseForm = JSON.parse(this.$refs.baseForm.submit_from());
+			console.log(_baseForm);
+			_baseForm.partyFlag = parseInt(_baseForm.partyFlag); //党员
+			_baseForm.subsistenceAllowanceFlag = parseInt(
+				_baseForm.subsistenceAllowanceFlag
+			); //低保
+			_baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag); //保障房
+			_baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag); //失业
+			(_baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag)), //育龄妇女
+				(_baseForm.veteranFlag = parseInt(_baseForm.veteranFlag)); //退役军人
+			_baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag); //统战人员
+			_baseForm.petitionOfficerFlag = parseInt(
+				_baseForm.petitionOfficerFlag
+			); //信访人员
+			_baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag); //志愿者
+			_baseForm.bereavedPersonFlag = parseInt(
+				_baseForm.bereavedPersonFlag
+			); //失独
+			_baseForm.tenantFlag = parseInt(_baseForm.tenantFlag); //租户
+			_baseForm.floatingFlag = parseInt(_baseForm.floatingFlag); //流动人口
+			_baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag); //特殊人群
+			_baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag); //老年人
+			_baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag); //空巢
+			_baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag); //独居老人
+			_baseForm.disabledFlag = parseInt(_baseForm.disabledFlag); //失能老人
+			_baseForm.dementedFlag = parseInt(_baseForm.dementedFlag); //失智老人
+			_baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag); //是否残疾
+			_baseForm.seriousIllnessFlag = parseInt(
+				_baseForm.seriousIllnessFlag
+			); //大病
+			_baseForm.chronicDiseaseFlag = parseInt(
+				_baseForm.chronicDiseaseFlag
+			); //慢病
+			var hobbyCode = "";
+			if (_baseForm.hobbyInfoDto) {
+				if (_baseForm.hobbyInfoDto.hobbyCode.length === 0) {
+					hobbyCode = "";
+					_baseForm.hobbyInfoDto.hobbyCode = hobbyCode;
+				} else {
+					_baseForm.hobbyInfoDto.hobbyCode.forEach(
+						(element, index) => {
+							hobbyCode =
+								index === 0
+									? element
+									: hobbyCode + "," + element;
+						}
+					);
+					_baseForm.hobbyInfoDto.hobbyCode = hobbyCode;
+				}
+			}
+
+			var volunteerCategory = "";
+			if (_baseForm.volunteerDto) {
+				if (_baseForm.volunteerDto.volunteerCategory.length === 0) {
+					volunteerCategory = "";
+					_baseForm.volunteerDto.volunteerCategory =
+						volunteerCategory;
+				} else {
+					_baseForm.volunteerDto.volunteerCategory.forEach(
+						(element, index) => {
+							volunteerCategory =
+								index === 0
+									? element
+									: volunteerCategory + "," + element;
+						}
+					);
+					_baseForm.volunteerDto.volunteerCategory =
+						volunteerCategory;
+				}
+			}
+
+			var specialCategoryCode = "";
+			if (_baseForm.specialDto) {
+				if (_baseForm.specialDto.specialCategoryCode.length === 0) {
+					specialCategoryCode = "";
+					_baseForm.specialDto.specialCategoryCode =
+						specialCategoryCode;
+				} else {
+					_baseForm.specialDto.specialCategoryCode.forEach(
+						(element, index) => {
+							specialCategoryCode =
+								index === 0
+									? element
+									: specialCategoryCode + "," + element;
+						}
+					);
+					_baseForm.specialDto.specialCategoryCode =
+						specialCategoryCode;
+				}
+			}
+			console.log(_baseForm);
+			this.submitAdd(_baseForm);
+		},
+		handleDel(row) {
+			console.log("row1", row);
+			this.$http
+				.post("/actual/base/residentBaseInfo/batchdel", [row.resiId])
+				.then(({ data: res }) => {
+					console.log("row2", row);
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("row3", row);
+						this.$message.success("删除成功");
+						this.getTableData();
+					}
+				})
+				.catch((err) => {
+					console.log("row4", err);
+					return this.$message.error("网络错误");
+				});
+		},
+		handleFormatUrl(url) {
+			return url.includes("?");
+		},
+		handlerEditCancle() {
+			this.$refs.baseForm.resetForm();
+			this.tabsList.forEach((item) => {
+				this.$refs["group" + item.groupId][0].resetForm();
+			});
+			this.dialogEditVisible = false;
+		},
+		handlerCancle() {
+			// this.$refs.baseForm.resetForm();
+			// this.tabsList.forEach((item) => {
+			//   this.$refs["group" + item.groupId][0].resetForm();
+			// });
+			this.dialogVisible = false;
+		},
+		async submitAdd(arr) {
+			console.log(arr);
+			this.btnLoading = true;
+			await this.$http
+				.post(
+					arr.resiId
+						? "actual/base/residentBaseInfo/update"
+						: "/actual/base/residentBaseInfo/save",
+					arr
+				)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message.success("提交成功");
+						// this.$refs[formName].resetFields();
+
+						this.dialogVisible = false;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+			// console.log(this.$refs.baseForm.form);
+			this.btnLoading = false;
+		},
+		async submitEdit(arr) {
+			this.btnLoading = true;
+			await this.$http
+				.post("/epmetuser/icresiuser/edit", arr)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message.success("提交成功");
+						// this.$refs[formName].resetFields();
+						this.$refs.baseForm.resetForm();
+						this.tabsList.forEach((item) => {
+							this.$refs["group" + item.groupId][0].resetForm();
+						});
+						this.getTableData();
+						this.dialogEditVisible = false;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+			this.btnLoading = false;
+		},
+
+		async getTableData(obj) {
+			let params = {
+				pageNo: this.currentPage,
+				pageSize: this.pageSize,
+				...obj,
+			};
+
+			this.tableLoading = true;
+			const { data } = await this.$http.post(
+				"/actual/base/residentBaseInfo/page",
+				params
+			);
+			this.tableLoading = false;
+			if (data.code === 0) {
+				this.total = data.data.total;
+				this.tableData = data.data.list;
+			} else {
+				this.$message.error(data.msg);
+			}
+		},
+
+		async getQueryConditions() {
+			let params = {
+				formCode: "resident_base_info",
+				customerId: this.$store.state.user.customerId,
+			};
+
+			const { data } = await this.$http.post(
+				"/oper/customize/icform/queryItems",
+				params
+			);
+
+			if (data.code === 0) {
+				this.queryConditions = data.data.map((item) => {
+					return {
+						...item,
+						humpName: util.capitalToHump(item.columnName),
+					};
+				});
+				console.log(this.queryConditions);
+			} else {
+				this.$message.error(data.msg);
+			}
+		},
+
+		getrowInfo(id) {
+			let params = {
+				formCode: "resident_base_info",
+				icResiUserId: id,
+			};
+			this.$http
+				.post("/epmetuser/icresiuser/detail", params)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						// console.log('getrowInfo----', res.data)
+						let info = res.data;
+						this.editTableName = { ...info };
+						let list = info[this.formList[0].tableName][0];
+						for (let n in list) {
+							this.editForm[n] = list[n];
+						}
+						this.formList.forEach((item) => {
+							item.columnValue = list[item.columnName];
+							item.ID = list.ID;
+
+							if (
+								item.columnValue == "1" &&
+								item.itemType === "radio" &&
+								item.childGroup
+							) {
+								this.tabsList.push(item.childGroup);
+							}
+
+							// if (item.childGroup && info[item.childGroup.tableName]) {
+
+							// }
+						});
+						this.tabsList.forEach((item) => {
+							let _info = info[item.tableName];
+							if (item.supportAdd) {
+								// console.log('tabsList---333', item.label)
+								const _list = [...item.itemList];
+								let mutiList = [];
+								if (_info) {
+									_info.forEach((fo, index) => {
+										// console.log('mutiList----555' + index, mutiList, _list)
+										mutiList.splice(index, 0, {
+											row: index,
+											itemList: _list.map((m) => {
+												// console.log('itemList---item' + index, m)
+												return {
+													...m,
+													ID: fo.ID,
+													columnValue:
+														fo[m.columnName],
+												};
+											}),
+										});
+										// console.log('mutiList----666' + index, mutiList)
+									});
+								}
+								item.mutiList = mutiList;
+							} else {
+								if (_info) {
+									item.itemList.forEach((n) => {
+										n.ID = _info[0].ID;
+										n.columnValue = _info[0][n.columnName];
+									});
+								}
+							}
+						});
+						// console.log('getrowInfo---formname', this.tabsList)
+						this.dialogEditVisible = true;
+					}
+				})
+				.catch((err) => {
+					console.log("getrowInfo---formnameerr", err);
+					return this.$message.error("网络错误");
+				});
+		},
+		async getOptionsList(url) {
+			let options = [];
+			// console.log('getOptionsList----', url)
+			await this.$http
+				.post(url, { formCode: "resident_base_info" })
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						options = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+			return options;
+		},
+
+		getTreeData(data) {
+			if (!Array.isArray(data)) return [];
+			let arr = data.map((item) => {
+				let _item = {};
+				if (item.children) {
+					if (item.children.length === 0)
+						_item = { ...item, children: undefined };
+					else
+						_item = {
+							...item,
+							children: this.getTreeData(item.children),
+						};
+				} else {
+					_item = { ...item };
+				}
+				return _item;
+			});
+			return arr;
+		},
+
+		async getFormList(type) {
+			await this.$http
+				.post("/oper/customize/icform/getcustomerform", {
+					formCode: "resident_base_info",
+					dynamic: true,
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log(res.data, "res.data");
+						console.log("获取详情成功getFormList");
+						let { itemList, groupList, formName } = res.data;
+						this.formName = formName;
+						this.activeName =
+							"group" + res.data.groupList[0].groupId;
+						if (type !== "edit") {
+							itemList.forEach(async (item) => {
+								if (item.optionSourceType === "remote") {
+									await this.getOptionsList(
+										item.optionSourceValue
+									).then((res) => {
+										item.options = this.getTreeData(res);
+									});
+								}
+							});
+						}
+						groupList.forEach((item) => {
+							item.itemList.forEach(async (n) => {
+								n.tableName = item.tableName;
+								if (
+									n.optionSourceType === "remote" &&
+									type !== "edit"
+								) {
+									await this.getOptionsList(
+										n.optionSourceValue
+									).then((res) => {
+										n.options = this.getTreeData(res);
+									});
+								}
+							});
+						});
+						this.formList = itemList;
+						this.tabsList = groupList;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		async getExportList(type) {
+			const url = "/oper/customize/icformitemgroup/list";
+			let params = {
+				formCode: "resident_base_info",
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				data.forEach((item) => {
+					(async (id) => {
+						// item.queryItemList = await this.getExportChildList(id)
+						item.queryItemList = [];
+					})(item.id);
+				});
+				this.exportList = [...data];
+				this.$nextTick(() => {
+					this.diyDialog = true;
+				});
+				console.log("获取详情成功getExportList----", this.exportList);
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async getExportChildList(groupId) {
+			const url = `/oper/customize/icformitem/getItemList/${groupId}`;
+			let params = {};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				return data;
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		async deleteresiBatch() {
+			if (this.selection.length === 0)
+				return this.$message.error("请选择之后进行操作");
+			let userIds = this.selection.map((item) => item.resiId);
+			this.$http
+				.post("/actual/base/residentBaseInfo/batchdel", userIds)
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						this.$message.success("删除成功");
+						this.getTableData();
+					}
+				})
+				.catch((err) => {
+					console.log("row4", err);
+					return this.$message.error("网络错误");
+				});
+		},
+	},
+	watch: {
+		$route: {
+			handler: function (newVal, oldVal) {
+				if (newVal.name == "base-resi") {
+					this.getTableData({
+						categoryKey:
+							this.$store.state.categoryStr.categoryCode || "",
+						pageNo: this.currentPage,
+						pageSize: this.pageSize,
+					});
+					// this.$refs.myResiSearch.form.categoryKey.push(this.$store.state.categoryStr.categoryCode)
+					this.$store.commit("setCategoryCode", "");
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
 };
 </script>
 
@@ -1560,169 +1845,169 @@ export default {
 @import "@/assets/scss/modules/management/list-main.scss";
 
 ::v-deep .el-tabs__nav-next {
-  box-shadow: 2px 0px 9px 0px;
+	box-shadow: 2px 0px 9px 0px;
 }
 ::v-deep .el-tabs__nav-prev {
-  box-shadow: -1px 0px 7px 0px;
+	box-shadow: -1px 0px 7px 0px;
 }
 .dialog-h {
-  .el-dialog__body {
-    position: relative;
-    max-height: 83vh;
-    box-sizing: border-box;
-    padding: 0 0 20px !important;
-    .dialog-h-content {
-      max-height: calc(83vh - 80px);
-      box-sizing: border-box;
-      padding: 50px 80px;
-      overflow: auto;
-    }
-  }
+	.el-dialog__body {
+		position: relative;
+		max-height: 83vh;
+		box-sizing: border-box;
+		padding: 0 0 20px !important;
+		.dialog-h-content {
+			max-height: calc(83vh - 80px);
+			box-sizing: border-box;
+			padding: 50px 80px;
+			overflow: auto;
+		}
+	}
 }
 .resi-container ::v-deep .el-row {
-  margin-right: 0;
+	margin-right: 0;
 }
 .tabs-other-info {
-  // ::v-deep .el-tabs__nav-wrap::after,
-  ::v-deep .el-tabs__active-bar_active {
-    background-color: #0055d7;
-  }
+	// ::v-deep .el-tabs__nav-wrap::after,
+	::v-deep .el-tabs__active-bar_active {
+		background-color: #0055d7;
+	}
 }
 ::v-deep .el-tabs__item {
-  // width: 50px;
-  box-sizing: border-box;
-  padding: 0 10px !important;
-  font-size: 14px;
-  font-weight: 600;
-  color: #666666;
-  border-radius: 2px;
-  &:hover {
-    color: #0056d6;
-  }
+	// width: 50px;
+	box-sizing: border-box;
+	padding: 0 10px !important;
+	font-size: 14px;
+	font-weight: 600;
+	color: #666666;
+	border-radius: 2px;
+	&:hover {
+		color: #0056d6;
+	}
 }
 ::v-deep .el-tabs__item.is-active {
-  color: #0056d6;
+	color: #0056d6;
 }
 ::v-deep .el-tabs__active-bar {
-  background-color: #0056d6;
+	background-color: #0056d6;
 }
 .resi-container .resi-card {
-  position: relative;
-  overflow: visible;
+	position: relative;
+	overflow: visible;
 }
 ::v-deep .el-button--primary.is-plain {
-  color: #0055d7;
-  background: #ffffff;
-  border-color: #0055d7;
+	color: #0055d7;
+	background: #ffffff;
+	border-color: #0055d7;
 }
 .resi-container .resi-card-table {
-  ::v-deep .el-table th {
-    color: #fff;
-    background-color: rgba(33, 149, 254, 1);
-    // border-right: 1px solid rgba(33, 149, 254, 1);
-  }
+	::v-deep .el-table th {
+		color: #fff;
+		background-color: rgba(33, 149, 254, 1);
+		// border-right: 1px solid rgba(33, 149, 254, 1);
+	}
 }
 .collapse-title {
-  font-weight: bold;
+	font-weight: bold;
 }
 
 .resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
+	::v-deep .el-button--text {
+		text-decoration: underline;
+	}
+	::v-deep .btn-color-del {
+		margin-left: 10px;
+		color: rgba(213, 16, 16, 1);
+	}
+	::v-deep .btn-color-edit {
+		color: rgba(0, 167, 169, 1);
+	}
 }
 .resi-search {
-  // padding-right: 20px;
-  margin-top: 10px;
-  .el-col {
-    text-align: right;
-  }
+	// padding-right: 20px;
+	margin-top: 10px;
+	.el-col {
+		text-align: right;
+	}
 }
 .resi-down {
-  position: absolute;
-  left: 50%;
-  bottom: -10px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 46px;
-  height: 12px;
-  box-sizing: border-box;
-  margin-left: -23rpx;
-  cursor: pointer;
-  background: #ffffff;
-  border-radius: 0 0 10px 10px;
-  img {
-    display: block;
-  }
+	position: absolute;
+	left: 50%;
+	bottom: -10px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 46px;
+	height: 12px;
+	box-sizing: border-box;
+	margin-left: -23rpx;
+	cursor: pointer;
+	background: #ffffff;
+	border-radius: 0 0 10px 10px;
+	img {
+		display: block;
+	}
 }
 
 .resi-card-table {
-  margin-top: 20px;
+	margin-top: 20px;
 }
 .resi-row-btn {
-  display: flex;
-  margin-bottom: 13px;
-  .el-button {
-    margin-left: 10px;
-    border: 0;
-  }
-  // .el-button--success {
-  //   background: rgba(34, 193, 195, 1);
-  // }
-  // .el-button--warning {
-  //   background: rgba(254, 179, 73, 1);
-  // }
-  // .el-button--danger {
-  //   background: rgba(254, 98, 82, 1);
-  // }
+	display: flex;
+	margin-bottom: 13px;
+	.el-button {
+		margin-left: 10px;
+		border: 0;
+	}
+	// .el-button--success {
+	//   background: rgba(34, 193, 195, 1);
+	// }
+	// .el-button--warning {
+	//   background: rgba(254, 179, 73, 1);
+	// }
+	// .el-button--danger {
+	//   background: rgba(254, 98, 82, 1);
+	// }
 }
 .resi-other {
-  width: 100%;
-  display: flex;
-  .resi-other-title {
-    flex-shrink: 0;
-    // display: inline-block;
-    width: 100px;
-    box-sizing: border-box;
-    margin-bottom: 10px;
-    // padding: 6px 12px 0 0;
-    font-size: 16px;
-    font-weight: 500;
-    color: #333;
-    text-align: center;
-  }
-  .tabs-other-info {
-    // display: inline-block;
-    // flex: 1;
-    // padding-left: 60px;
-    width: calc(100% - 100px);
-  }
+	width: 100%;
+	display: flex;
+	.resi-other-title {
+		flex-shrink: 0;
+		// display: inline-block;
+		width: 100px;
+		box-sizing: border-box;
+		margin-bottom: 10px;
+		// padding: 6px 12px 0 0;
+		font-size: 16px;
+		font-weight: 500;
+		color: #333;
+		text-align: center;
+	}
+	.tabs-other-info {
+		// display: inline-block;
+		// flex: 1;
+		// padding-left: 60px;
+		width: calc(100% - 100px);
+	}
 }
 
 .resi-btns {
-  margin-top: 20px;
-  text-align: center;
-  text-align: right;
-  margin-right: 16px;
+	margin-top: 20px;
+	text-align: center;
+	text-align: right;
+	margin-right: 16px;
 }
 .div-flex {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 100%;
-  .div_del {
-    margin-top: 15px;
-  }
-  .m-page {
-    margin-left: auto;
-  }
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	.div_del {
+		margin-top: 15px;
+	}
+	.m-page {
+		margin-left: auto;
+	}
 }
 </style>
diff --git a/src/views/modules/base/roomForm.vue b/src/views/modules/base/roomForm.vue
index 704fad4ff..e7c546a43 100644
--- a/src/views/modules/base/roomForm.vue
+++ b/src/views/modules/base/roomForm.vue
@@ -293,12 +293,12 @@ export default {
     },
 
     async addRoom () {
-      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
       if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的身份证号码'
+          message: '请输入正确的证件号码'
         })
         return false;
       }
diff --git a/src/views/modules/base/smartImport.vue b/src/views/modules/base/smartImport.vue
index e95c17fc9..17c7ae81f 100644
--- a/src/views/modules/base/smartImport.vue
+++ b/src/views/modules/base/smartImport.vue
@@ -1,472 +1,490 @@
 <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>
-      <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="deptName"
-                         header-align="center"
-                         align="center"
-                         label="表格信息"
-                         min-width="100">
-        </el-table-column>
-        <el-table-column prop="dataName"
-                         header-align="center"
-                         align="center"
-                         label="平台对应信息"
-                         min-width="110">
-          <template slot-scope="scope">
-
-            <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.itemId"
-                       size="small"
-                       style="margin-left:10px"
-                       placeholder="请选择">
-              <el-option v-for="item in scope.row.itemList"
-                         :key="item.itemId"
-                         :label="item.label"
-                         :value="item.itemId">
-              </el-option>
-            </el-select>
-
-          </template>
-        </el-table-column>
-
-      </el-table>
-      <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
-      </div>
-
-      <div ref="divEditBtn"
-           class="m-edit-btn">
-
-        <el-button type="primary"
-                   size="small"
-                   class="diy-button--blue"
-                   @click="handleComfirm">保 存</el-button>
-      </div>
-
-    </div>
-
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'数据更新配置'"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <div class="div_form">
-        <el-form ref="ref_form"
-                 :inline="true"
-                 :model="formData">
-
-          <el-form-item label="适用范围"
-                        label-width="150px"
-                        style="display: block">
-
-          </el-form-item>
-
-        </el-form>
-      </div>
-
-      <div class="div-btn">
-        <el-button size="small"
-                   @click="diaClose">取 消</el-button>
-        <el-button size="small"
-                   type="primary"
-                   @click="editDiaOK">确 定</el-button>
-      </div>
-    </el-dialog>
-
-  </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-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>
 </template>
 
 <script>
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from "vuex";
 
-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,
-    }
-  },
-
-  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)
-
-    },
-
-    handleComfirm () {
-      console.log(this.dataList)
-    },
-
-    async editDiaOK () {
-      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/dataSyncConfig/scopeSave'
-      const url = '/epmetuser/dataSyncConfig/scopeSave'
-
-      let params = {
-        dataSyncConfigId: this.dataSyncConfigId,
-        scopeList: this.scopeList
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.formShow = false
-        this.loadData()
-      } else {
-        // this.$message.error(msg )
-      }
-    },
-
-    async handleExportModule () {
-      let url = "/heart/iccommunityselforganization/import-template-download";
-
-      let params = {};
-      await this.$http({
-        method: "POST",
-        url,
-        responseType: "blob",
-        data: params,
-      })
-        .then((res) => {
-          // 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 = "正在上传中...";
-      this.$message({
-        showClose: true,
-        message: "导入中，请到系统管理-导入记录中查看进度",
-        duration: 0,
-      });
-      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append("file", file.file); //添加文件对象
-      await this.$http
-        .post(
-          "/heart/iccommunityselforganization/importcommunityselforganization",
-          formData
-        )
-        .then((res) => {
-          console.log("res-up", res);
-          if (res.data.code == 0 && res.data.msg == "success") {
-            // this.$message.success('导入成功')
-            this.getTableData();
-          } else this.$message.error(res.data.msg);
-        })
-        .catch((err) => {
-          console.log("失败", err);
-          file.onError(); //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
-        });
-      // axios({
-      //   url:
-      //     window.SITE_CONFIG["apiURL"] +
-      //     "/heart/iccommunityselforganization/importcommunityselforganization",
-      //   method: "post",
-      //   data: formData,
-      //   // responseType: "blob",
-      // })
-      //   .then((res) => {
-      //     this.importLoading = false;
-      //     this.importBtnTitle = "导入";
-      //     console.log("resresresresresresres", res);
-
-      //     this.getTableData();
-      //     if (res.data.code == 0) {
-      //       return this.$message.success(res.data.data || "导入成功");
-      //     } else {
-      //       return this.$message.error(res.data.msg);
-      //     }
-      //   })
-      //   .catch((err) => {
-      //     console.log("失败", err);
-      //   });
-      this.importLoading = false;
-      this.importBtnTitle = "导入";
-      this.$refs.upload.clearFiles();
-    },
-
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadData()
-    },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadData()
-    },
-
-    // 取消
-    diaCancel () {
-      this.$emit('cancleBack')
-    },
-
-
-  }
-}
+	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 = "/epmetuser/icresiuser/import/download-template";
+
+			let params = {};
+			await this.$http({
+				method: "POST",
+				url,
+				responseType: "blob",
+				data: params,
+			})
+				.then((res) => {
+					// 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.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);
+					} 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,
+				message: "导入成功，请到系统管理-导入记录中查看进度",
+				duration: 0,
+			});
+
+			this.dataList = [];
+			this.importOption = {};
+			this.importCode = "";
+			this.fileData = null;
+		},
+
+		// 取消
+		diaCancel() {
+			this.$emit("cancleBack");
+		},
+	},
+};
 </script>
 
 <style lang="scss" scoped>
 @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;
 }
 </style>
diff --git a/src/views/modules/cabaseinfo/carental-add-or-update.vue b/src/views/modules/cabaseinfo/carental-add-or-update.vue
index 793cbb8f4..2364bb101 100644
--- a/src/views/modules/cabaseinfo/carental-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/carental-add-or-update.vue
@@ -34,8 +34,8 @@
       <el-form-item label="隐患类型" prop="troubleType">
           <el-input v-model="dataForm.troubleType" placeholder="隐患类型"></el-input>
       </el-form-item>
-      <el-form-item label="承租人公民身份证号码" prop="renterCardNumber">
-          <el-input v-model="dataForm.renterCardNumber" placeholder="承租人公民身份证号码"></el-input>
+      <el-form-item label="承租人公民证件号码" prop="renterCardNumber">
+          <el-input v-model="dataForm.renterCardNumber" placeholder="承租人公民证件号码"></el-input>
       </el-form-item>
       <el-form-item label="承租人证件类型" prop="renterCardType">
           <el-input v-model="dataForm.renterCardType" placeholder="承租人证件类型"></el-input>
diff --git a/src/views/modules/cabaseinfo/caresident-add-or-update.vue b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
index 4383f1d75..1cafee1b8 100644
--- a/src/views/modules/cabaseinfo/caresident-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/caresident-add-or-update.vue
@@ -10,8 +10,8 @@
       <el-form-item label="证件类型" prop="idType">
           <el-input v-model="dataForm.idType" placeholder="证件类型"></el-input>
       </el-form-item>
-      <el-form-item label="证件号码（公民身份证号）" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="证件号码（公民身份证号）"></el-input>
+      <el-form-item label="证件号码（公民证件号）" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号码（公民证件号）"></el-input>
       </el-form-item>
       <el-form-item label="姓名" prop="residentName">
           <el-input v-model="dataForm.residentName" placeholder="姓名"></el-input>
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index b0b357e19..a4a424f65 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -12,8 +12,8 @@
               </el-option>
             </el-select>
          </el-form-item>
-        <el-form-item label="身份证号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
+        <el-form-item label="证件号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号" clearable></el-input>
         </el-form-item>
         <el-form-item label="姓名" prop="residentName">
           <el-input
@@ -84,7 +84,7 @@
         </el-table-column>
         <el-table-column
           prop="idCard"
-          label="证件号码（公民身份证号）"
+          label="证件号码（公民证件号）"
           header-align="center"
           align="center"
         ></el-table-column>
diff --git a/src/views/modules/cabaseinfo/carotators-add-or-update.vue b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
index eaf0bed8c..5d698ff90 100644
--- a/src/views/modules/cabaseinfo/carotators-add-or-update.vue
+++ b/src/views/modules/cabaseinfo/carotators-add-or-update.vue
@@ -1,8 +1,8 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="公民身份证号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="公民身份证号"></el-input>
+      <el-form-item label="公民证件号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="公民证件号"></el-input>
       </el-form-item>
       <el-form-item label="证件类型" prop="idType">
           <el-input v-model="dataForm.idType" placeholder="证件类型"></el-input>
diff --git a/src/views/modules/cabaseinfo/carotators-binding-house.vue b/src/views/modules/cabaseinfo/carotators-binding-house.vue
index 276d1eb46..b7014bcdd 100644
--- a/src/views/modules/cabaseinfo/carotators-binding-house.vue
+++ b/src/views/modules/cabaseinfo/carotators-binding-house.vue
@@ -92,7 +92,7 @@
                   </el-table-column>
                   <el-table-column
                     prop="ownerIdCard"
-                    label="身份证"
+                    label="证件号"
                     width="170"
                   >
                   </el-table-column>
@@ -225,7 +225,7 @@ export default {
       },
 
       typePlaceholder: {
-        jumin: "请输入姓名或电话或身份证号",
+        jumin: "请输入姓名或电话或证件号",
         fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼",
         xuqiu: "请输入需求人或需求内容或服务方",
       },
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index eb4fe9398..8a6973bd6 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -12,8 +12,8 @@
               </el-option>
             </el-select>
          </el-form-item>
-        <el-form-item label="身份证号" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
+        <el-form-item label="证件号" prop="idCard">
+          <el-input v-model="dataForm.idCard" placeholder="证件号" clearable></el-input>
         </el-form-item>
         <el-form-item label="姓名" prop="residentName">
           <el-input
@@ -84,7 +84,7 @@
         </el-table-column>
         <el-table-column
           prop="idCard"
-          label="公民身份证号"
+          label="公民证件号"
           header-align="center"
           align="center"
         ></el-table-column>
diff --git a/src/views/modules/communityParty/heart/heartAudit.vue b/src/views/modules/communityParty/heart/heartAudit.vue
index f37af575e..d9c7c8852 100644
--- a/src/views/modules/communityParty/heart/heartAudit.vue
+++ b/src/views/modules/communityParty/heart/heartAudit.vue
@@ -46,7 +46,7 @@
         <el-table-column prop="idNum"
                          header-align="center"
                          align="center"
-                         label="身份证"
+                         label="证件号"
                          width="180">
 
         </el-table-column>
diff --git a/src/views/modules/communityParty/heart/heartPerson.vue b/src/views/modules/communityParty/heart/heartPerson.vue
index bf4f48372..8a24d4d90 100644
--- a/src/views/modules/communityParty/heart/heartPerson.vue
+++ b/src/views/modules/communityParty/heart/heartPerson.vue
@@ -36,7 +36,7 @@
         <el-table-column prop="idNum"
                          header-align="center"
                          align="center"
-                         label="身份证"
+                         label="证件号"
                          width="180">
 
         </el-table-column>
diff --git a/src/views/modules/communityParty/members/crateForm.vue b/src/views/modules/communityParty/members/crateForm.vue
index 248371905..eb03a76bd 100644
--- a/src/views/modules/communityParty/members/crateForm.vue
+++ b/src/views/modules/communityParty/members/crateForm.vue
@@ -75,7 +75,7 @@
         </el-form-item>
       </div>
       <div class="flex-div">
-        <el-form-item label="身份证"
+        <el-form-item label="证件号"
                       prop="idCard"
                       class="wd50">
           <el-input v-model="form.idCard"
@@ -276,10 +276,10 @@ export default {
     }
     let checkIdCard = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入身份证'))
+        callback(new Error('请输入证件号'))
       } else {
         if (!isCard(value)) {
-          callback(new Error('身份证号格式不正确'))
+          callback(new Error('证件号格式不正确'))
         }
         callback()
       }
diff --git a/src/views/modules/communityParty/members/detailForm.vue b/src/views/modules/communityParty/members/detailForm.vue
index 07d416c4a..4669347d4 100644
--- a/src/views/modules/communityParty/members/detailForm.vue
+++ b/src/views/modules/communityParty/members/detailForm.vue
@@ -45,7 +45,7 @@
         <div class="m-detail-main-2">
 
           <div class="m-info-prop">
-            <span class="u-info-title-2">身份证：</span>
+            <span class="u-info-title-2">证件号：</span>
             <span>{{ info.idCard?info.idCard:'--' }}</span>
           </div>
           <div class="m-info-prop">
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index 80255c7f2..9b1d29233 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -41,7 +41,7 @@
                         class="input-width"
                         clearable></el-input>
             </el-form-item>
-            <el-form-item label="身份证"
+            <el-form-item label="证件号"
                           prop="idCard">
               <el-input v-model="searchForm.idCard"
                         placeholder="请输入"
@@ -226,7 +226,7 @@
                          align="center"
                          width="100" />
         <el-table-column prop="idCard"
-                         label="身份证号"
+                         label="证件号"
                          align="center"
                          min-width="180" />
         <el-table-column prop="mobile"
diff --git a/src/views/modules/communityParty/members/points.vue b/src/views/modules/communityParty/members/points.vue
index 869133f8b..f12b182d2 100644
--- a/src/views/modules/communityParty/members/points.vue
+++ b/src/views/modules/communityParty/members/points.vue
@@ -18,7 +18,7 @@
             <el-form-item label="手机号" prop="mobile">
               <el-input v-model="searchForm.mobile" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
-            <el-form-item label="身份证" prop="idCard">
+            <el-form-item label="证件号" prop="idCard">
               <el-input v-model="searchForm.idCard" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
             <el-form-item label="审核状态" prop="status">
@@ -89,7 +89,7 @@
         />
         <el-table-column
           prop="idCard"
-          label="身份证号"
+          label="证件号"
           align="center"
           min-width="180"
         />
@@ -235,7 +235,7 @@
           <el-form-item label="手机号:" :label-width="'100px'">
            <div class="input-width1">{{detailInfo.mobile}}</div>
           </el-form-item>
-          <el-form-item label="身份证:" :label-width="'100px'">
+          <el-form-item label="证件号:" :label-width="'100px'">
             <div class="input-width1">{{detailInfo.idCard}}</div>
           </el-form-item>
         </div>
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index d8f8f764f..a129cdfa4 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -1,20 +1,15 @@
 <template>
-    <div class="div_main">
+    <div class="g-main">
       <div>
-        <div class="div_search">
+        <div class="m-search">
           <el-form :inline="true"
                    :model="formData"
                    ref="ref_searchform"
-                   :label-width="'80px'">
-            <div>
-
-              <el-form-item label="服务类别"
-
-                            prop="serviceType">
-                <div class="f-flex">
+                   :label-width="'100px'">
                   <el-form-item prop="serviceType"
-                                class="u-item-width-communitycascader f-bto0">
-                    <el-select class="cell-width-1"
+                                label="服务类别"
+                               >
+                    <el-select class="u-item-width-normal"
                                v-model.trim="formData.serviceTypeLevel1Id"
                                placeholder="请选择"
                                clearable>
@@ -26,9 +21,8 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item prop="serviceType"
-                                class="u-item-width-communitycascader f-bto0">
-                    <el-select class="cell-width-1"
+                  <el-form-item prop="serviceType">
+                    <el-select class="u-item-width-normal"
                                v-model.trim="formData.serviceTypeLevel2Id"
                                placeholder="请选择"
                                clearable>
@@ -40,24 +34,22 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
-                </div>
-              </el-form-item>
 
               <el-form-item label="服务时间"
                             prop="serviceTimeStart">
                 <el-date-picker v-model="formData.serviceTimeStart"
                                 :picker-options="startPickerOptions"
-                                class="item_width_2"
+                                class="u-item-width-daterange"
                                 size="small"
                                 type="date"
                                 value-format="yyyy-MM-dd"
                                 value="yyyy-MM-dd"
                                 placeholder="开始时间">
                 </el-date-picker>
-                <span class="data-tag">至</span>
+                <span class="u-data-tag">至</span>
                 <el-date-picker v-model="formData.serviceTimeEnd"
                                 :picker-options="endPickerOptions"
-                                class="item_width_2 data-tag"
+                                class="u-item-width-daterange u-data-tag"
                                 size="small"
                                 type="date"
                                 value-format="yyyy-MM-dd"
@@ -70,7 +62,7 @@
               <el-form-item label="服务事项"
                             prop="serviceName">
                 <el-input v-model="formData.serviceName"
-                          class="item_width_1"
+                          class="u-item-width-normal"
                           size="small"
                           clearable
                           placeholder="请输入">
@@ -80,7 +72,7 @@
               <el-form-item label="服务组织"
                             prop="serviceOrgType">
                 <el-select v-model="formData.serviceOrgType"
-                           class="input-width-small"
+                           class="u-item-width-normal"
                            placeholder="请选择"
                            clearable
                            @change="handleServiceChange('add', $event)">
@@ -90,9 +82,8 @@
                              :value="item.value">
                   </el-option>
                 </el-select>
-                -
                 <el-select v-model="formData.serviceOrgId"
-                           class="input-width-middle"
+                           class="u-item-width-normal u-data-tag"
                            filterable
                            placeholder="请选择"
                            clearable>
@@ -108,7 +99,7 @@
 
               <el-form-item label="服务状态"
                             prop="serviceStatus">
-                <el-select class="item_width_2"
+                <el-select class="u-item-width-normal"
                            v-model="formData.serviceStatus"
                            placeholder="全部"
                            size="small"
@@ -123,7 +114,7 @@
               </el-form-item>
               <el-form-item label="满意度"
                             prop="satisfaction">
-                <el-select class="item_width_2"
+                <el-select class="u-item-width-normal"
                            v-model="formData.satisfaction"
                            placeholder="全部"
                            size="small"
@@ -136,25 +127,31 @@
                 </el-select>
 
               </el-form-item>
+              <el-row type="flex" >
+            <el-col :span="24" align="right">
               <el-button style="margin-left:30px"
                          size="small"
-                         class="diy-button--search"
+                         type="primary "
                          @click="handleSearch">查询</el-button>
               <el-button style="margin-left:10px"
+                         type="primary"
                          size="small"
-                         class="diy-button--reset"
                          @click="resetSearch">重置</el-button>
-            </div>
+            </el-col>
+          </el-row>
+             
           </el-form>
         </div>
 
-        <div class="div_table">
-
+        <div class="m-table">
           <div class="div_btn">
-            <el-button class="diy-button--add"
+            <div class="div_btn_left">
+              <el-button 
                        size="small"
-                       @click="handleAdd">发起服务</el-button>
-
+                       @click="handleAdd"
+                       type="primary"
+                       >发起服务</el-button>
+            </div>
             <!-- <el-button @click="handleExport"
                        class="diy-button--reset"
                        size="small">导出</el-button> -->
@@ -163,8 +160,7 @@
           <el-table :data="tableData"
                     border
                     v-loading="tableLoading"
-                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                    class="table"
+                    class="m-table-item"
                     style="width: 100%"
                     :height="maxTableHeight">
             <el-table-column label="序号"
@@ -222,27 +218,27 @@
                 <el-button @click="handleDetail(scope.row)"
                            type="text"
                            size="small"
-                           class="div-table-button--detail">查看</el-button>
+                          >查看</el-button>
                 <el-button v-if="scope.row.serviceStatus==='in_service'"
                            @click="handleEdit(scope.row)"
                            type="text"
                            size="small"
-                           class="div-table-button--edit">编辑</el-button>
+                           >编辑</el-button>
                 <el-button v-if="scope.row.serviceStatus==='in_service'"
                            @click="handleFeedback(scope.row)"
                            type="text"
                            size="small"
-                           class="div-table-button--edit">反馈</el-button>
+                           >反馈</el-button>
                 <el-button v-if="scope.row.policyId"
                            @click="handlePersonList(scope.row)"
                            type="text"
                            size="small"
-                           class="div-table-button--edit">人员名单</el-button>
+                           >人员名单</el-button>
                 <el-button v-if="scope.row.serviceStatus==='in_service'"
                            @click="handleDel(scope.row)"
                            type="text"
                            size="small"
-                           class="div-table-button--delete">取消</el-button>
+                         >取消</el-button>
 
               </template>
             </el-table-column>
@@ -380,7 +376,7 @@
         tableLoading: false,
         user: {},
         agencyId: '',
-
+        searchH:170,
         tableData: [],
 
         statusArray: [
@@ -452,9 +448,10 @@
     },
     computed: {
       maxTableHeight () {
-        return this.$store.state.inIframe
-          ? this.clientHeight - 410 + this.iframeHeigh
-          : this.clientHeight - 410;
+        const h =
+				this.clientHeight - this.searchH - 275 + this.iframeHeight;
+        const _h = this.clientHeight - 275 - this.searchH;
+        return this.$store.state.inIframe ? h : _h;
       },
       ...mapGetters(["clientHeight", "iframeHeight"]),
     },
diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue
new file mode 100644
index 000000000..6c263a8d5
--- /dev/null
+++ b/src/views/modules/communityService/labelConfig/addForm.vue
@@ -0,0 +1,590 @@
+<template>
+    <div>
+        <el-form
+           ref="label_form"
+          :inline="true"
+          :model="formData"
+          class="div_form"
+          :rules="rules"
+        >
+            <el-form-item
+            label="标签名称"
+            label-width="100px"
+            prop="tagName"
+            >
+                <el-input v-model="formData.tagName" placeholder="请输入内容"  clearable ></el-input>
+
+            </el-form-item>
+         
+        </el-form>
+        <p style="margin-left: 15px;"> <b style="color:#F56C6C">*</b> 匹配数据</p>
+        <el-table
+             border
+            :data="tableData"
+             style="width: 100%"
+             height="200"
+             >  
+             <el-table-column  label="选择数据源" align="center" width="120">
+                    <template slot-scope="scope">
+                            <el-select
+                            v-model="scope.row.dataSource"
+                            placeholder="请选择"
+                            @change="handleChangeSource(scope.row,scope.$index)"
+                            clearable
+                            >
+                                <el-option
+                                v-for="item in dataSourceOpction" 
+                                :label="item.label" 
+                                :value="item.value"
+                                :key="item.value"
+                                >
+                                </el-option>
+                            </el-select>
+                    </template>
+             </el-table-column>
+               <!-- || scope.$index == scope._self._data.tableData.length-1  -->
+
+             <el-table-column  label="字段类别" align="center" width="120">
+                    <template slot-scope="scope" v-if="scope.row.dataSource=='resi'">
+                            <el-select
+                            v-model="scope.row.itemGroupId"
+                            placeholder="请选择"
+                            clearable
+                            @change="handleChangeFieldsType(scope.row,scope.$index)"
+                            >
+                                <el-option
+                                v-for="item in scope.row.itemGroupIdOpction" 
+                                :label="item.label" 
+                                :value="item.id"
+                                :key="item.id"
+                                >
+                                </el-option>
+                            </el-select>
+                    </template>
+                    <!-- <template v-else>
+                        <el-select
+                            :placeholder="scope.row.dataSource=='house'?'房屋信息':'统计信息'"
+                            :disabled="true"
+                            >
+                            </el-select>
+                    </template> -->
+             </el-table-column>
+             <el-table-column  label="字段名称" align="center" width="120">
+                    <template slot-scope="scope">
+                            <el-select
+                            v-model="scope.row.itemId"
+                            placeholder="请选择"
+                            @change="handleChangeFieldsName(scope.row,scope.$index)"
+                            @clear="handleClearItemId(scope.row,scope.$index)"
+                            clearable
+                            >
+                                <el-option
+                                v-for="item in scope.row.itemIdOpction" 
+                                :label="item.label" 
+                                :value="scope.row.dataSource=='resi'?item.itemId:item.colKey"
+                                :key="scope.row.dataSource=='resi'?item.itemId:item.colKey"
+                                >
+                                </el-option>
+                            </el-select>
+                    </template>
+             </el-table-column>
+             <el-table-column  label="比较符" align="center" width="120">
+                    <template slot-scope="scope">
+                            <el-select
+                            v-model="scope.row.queryType"
+                            placeholder="请选择"
+                            clearable
+                            >
+                                <el-option
+                                v-for="item in queryTypeOpction" 
+                                :label="item.label" 
+                                :value="item.value"
+                                :key="item.value"
+                                >
+                                </el-option>
+                            </el-select>
+                    </template>
+             </el-table-column>
+             <el-table-column  label="对应值" align="center" width="155">
+                    <template slot-scope="scope"    >
+                        <template v-for="item in scope.row.correspondingOpction" >
+                            <el-select
+                            v-if="item.itemType == 'select'||item.itemType == 'radio'||item.itemType =='checkbox'"
+                           v-model="scope.row.colVal"
+                           placeholder="请选择"
+                           clearable
+                           >
+                               <el-option
+                               v-for="items in item.options"
+                               :label="items.label" 
+                               :value="items.value"
+                               :key="items.label"
+                               >
+                               </el-option>
+                           </el-select>
+                           <el-input
+                            v-else-if="item.itemType === 'input'||item.itemType === 'textarea'"
+                           v-model="scope.row.colVal"
+                           placeholder="请输入"
+                           clearable
+                           >
+                           </el-input>
+                           <el-input-number v-else-if="item.itemType==='inputNum'"
+                           class="item_width_2"
+                           v-model="scope.row.colVal"
+                           :min="0"
+                           size="mini"
+                           label="请输入"></el-input-number>
+                        <el-date-picker v-else-if="item.itemType==='datepicker'||item.itemType==='date'"
+                                        v-model="scope.row.colVal"
+                                        class="item_width_2"
+                                        type="datetime"
+                                        value-format="yyyy-MM-dd HH:mm:ss"
+                                        value="yyyy-MM-dd HH:mm:ss"
+                                        placeholder="开始时间">
+                        </el-date-picker>
+                        <el-input v-else
+                        class="item_width_2"
+                        size="mini"
+                        placeholder="请输入"
+                        v-model="personItem.colVal">
+                       </el-input>
+                        </template>
+                          
+                    </template>
+             </el-table-column>
+             <el-table-column  label="条件关系" align="center" width="120">
+                    <template slot-scope="scope" v-if="scope.$index!=tableData.length-1">
+                            <el-select
+                            v-model="scope.row.nextLogicalRel"
+                            placeholder="请选择"
+                            clearable
+                            >
+                                <el-option
+                                v-for="item in nextLogicalRelOpction" 
+                                :label="item.label" 
+                                :value="item.value"
+                                :key="item.value"
+                                >
+                                </el-option>
+                            </el-select>
+                    </template>
+             </el-table-column>
+            <el-table-column fixed="right" label="操作" align="center" width="120">
+                    <template slot-scope="scope">
+                        <img src="@/assets/img/icon-del.png"  
+                          v-show="scope.$index!=tableData.length-1"
+                          @click="handleClickDelete(scope.$index)" 
+                          class="imgBtn"
+                          >
+
+                        <img src="@/assets/img/icon-add.png"
+                          @click="handleClickAddRow"
+                          v-show="scope.$index==tableData.length-1"
+                          class="imgBtn">
+                        <!-- <el-button
+                            
+                            size="small"
+                            type="text"
+                          
+                            >增加</el-button
+                        >
+                        <el-button
+                          
+                            size="small"
+                            type="text"
+                            @click="handleClickDelete(scope.$index)"
+                            >删除</el-button
+                        > -->
+                    </template>
+                 </el-table-column>
+
+         </el-table> 
+        <div class="div_btn">
+        <el-button size="small" @click="handleCancle">取 消</el-button>
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleComfirm"
+          >确 定</el-button
+        >
+      </div>
+    </div>
+</template>
+
+<script>
+  import { requestPost,requestGet } from "@/js/dai/request";
+  export default {
+    data() {
+        return {
+            formData:{
+                tagName:"",
+            },
+            FormType:"",
+            rules:{
+            tagName:[{ required: true, message: '请输入标签名称', trigger: 'change' }]
+            },
+            tableData:[{
+                dataSource:"",//数据源
+                itemGroupId:"",//字段类别
+                itemId:"",//字段名称
+                queryType:"",//比较符
+                colVal:"",//对应值
+                nextLogicalRel:"",//条件关系,
+                tableName:"",//数据库表名
+                colKey:"",
+                itemIdOpction:[],
+                itemGroupIdOpction:[],
+                correspondingOpction:[]
+            }],
+            formType:'',
+            dataSourceOpction:[{label:'人员信息',value:'resi'},{label:'房屋信息',value:'house'},{label:'统计信息',value:'stat'}],
+            queryTypeOpction:[{}],
+            nextLogicalRelOpction:[{label:'并且',value:'and'},{label:'或者',value:'or'}],
+        };
+    },
+    created() {},
+    methods: {
+        async initForm(type,row) {
+            console.log(type);
+            this.FormType = type
+            await this.getFormEdit(row.tagId)
+            this.tagId = row.tagId
+            console.log( this.tableData);
+            this.formType = type
+            for(let i in this.tableData){
+                this.handleChangeSource(this.tableData[i],[i],type)
+                this.handleChangeFieldsType(this.tableData[i],[i],type)
+                setTimeout(() => {
+                this.handleChangeFieldsName(this.tableData[i],[i],type)
+                }, 300);
+            }
+           this.formData.tagName = row.tagName
+        },
+      
+        // 选择数据源
+        async handleChangeSource(row,index,type){
+        console.log(row);
+            if(row.dataSource == 'resi'){
+                let url = "/oper/customize/icformitemgroup/list"
+                let params={
+                    formCode: "resi_base_info",
+                    policyFlag: "1"
+                }
+                let {data,code,msg} = await requestPost(url,params)
+                if(code == 0){
+                    this.$set(this.tableData[index],'itemGroupIdOpction',data)
+                    console.log(this.tableData[index].itemGroupIdOpction);
+                }else {
+                this.$message.error(msg) 
+                }
+                this.hadeleClearForm(this.tableData[index],index)
+                if(!type){
+                    this.tableData[index].itemGroupId = ""
+                    this.tableData[index].itemId = ""
+                    this.tableData[index].colKey = ""
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                    this.tableData[index].itemIdOpction = []
+                }
+            }else if( row.dataSource == 'house') {
+                let url = "/governance/policy/item-list/house"
+                let params={}
+                let {data,code,msg} = await requestPost(url,params)
+                if(code == 0){
+                    this.tableData[index].itemIdOpction = data
+
+                }else{
+                    this.$message.error(msg)
+                }
+                this.hadeleClearForm(this.tableData[index],index)
+                if(!type){
+                    this.tableData[index].itemGroupId = ""
+                    this.tableData[index].itemId = ""
+                    this.tableData[index].colKey = ""
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                }
+            } else if(row.dataSource == "stat"){
+                let url = "/governance/policy/item-list/stat"
+                let params={}
+                let {data,code,msg} = await requestPost(url,params)
+                if(code == 0){
+                    this.tableData[index].itemIdOpction = data
+
+                }else{
+                    this.$message.error(msg)
+                }
+                this.hadeleClearForm(this.tableData[index],index)
+                if(!type){
+                    this.tableData[index].itemGroupId = ""
+                    this.tableData[index].itemId = ""
+                    this.tableData[index].colKey = ""
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                }
+            }else{
+                this.hadeleClearForm(this.tableData[index],index)
+                    this.tableData[index].itemGroupId = ""
+                    this.tableData[index].itemId = ""
+                    this.tableData[index].colKey = ""
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                    this.tableData[index].itemIdOpction = []
+            }
+
+            this.getCompareList()
+           
+        },
+       
+        // 字段类别修改
+        async handleChangeFieldsType(row,index,type){
+            console.log(row,index,'字段类别row');
+            if(row.dataSource != "resi") return
+            const url = "/oper/customize/icformitem/getItemListV2"
+            let params={
+                groupId: row.itemGroupId,
+                policyFlag: "1"
+            }
+            this.hadeleClearForm(this.tableData[index],index)
+            if(!type){
+                    this.tableData[index].itemId = ""
+                    this.tableData[index].colKey = ""
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                    this.tableData[index].itemIdOpction = []
+                }
+            let {data,code,msg} = await requestPost(url,params)
+            if(code == 0){
+                this.$set(this.tableData[index],'itemIdOpction',data)
+                console.log(this.tableData[index].itemIdOpction ,'see');
+            }else {
+               this.$message.error(msg) 
+            }
+        },
+        // 字段名称修改
+        async handleChangeFieldsName(row,index,type){
+            console.log(row,'字段名称row');
+            var arr = []
+            // 人的信息中colKey的字段是columnName要做一下判断
+            if(row.dataSource == 'house' || row.dataSource == 'stat'){
+                arr =  row.itemIdOpction.filter(item=>item.colKey == row.itemId)
+                this.tableData[index].tableName = arr[0].tableName
+                this.tableData[index].colKey = arr[0].colKey
+                if(!type){
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                }
+                // this.tableData[index].colVal = ''
+                // this.tableData[index].queryType = ''
+            }else if(row.dataSource == 'resi'&&row.itemId!=""){
+                    arr =  row.itemIdOpction.filter(item=>item.itemId == row.itemId)
+                    this.tableData[index].tableName = arr[0].tableName
+                    this.tableData[index].colKey = arr[0].columnName
+                    if(!type){
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                }
+                    // this.tableData[index].colVal = ''
+                    // this.tableData[index].queryType = ''
+            }
+             console.log(arr,'arr是筛选出来的');
+             if(row.itemId=="")return
+            //  列表对应值的option有的是通过接口获取的就需要再通过optionSourceType判断下
+            console.log(arr[0].optionSourceType);
+             if(arr[0].optionSourceType== "remote"){
+                let url = ""
+                let params = {}
+                if(row.dataSource == 'house'){
+                    url = arr[0].optionSourceUrl
+                    params = JSON.parse(arr[0].optionSourceParam) 
+                }else{
+                    url = arr[0].optionSourceValue
+                }
+               
+                const { data, code, msg } = await requestPost(url, params)
+               if(code == 0 ){
+                arr[0].options = data
+                this.$set( this.tableData[index],'correspondingOpction',arr)
+               }else{
+                this.$message.error(msg)
+               }
+             }else{
+                this.$set( this.tableData[index],'correspondingOpction',arr)
+             }
+
+             console.log( this.tableData);
+          
+        },
+        async getCompareList(){
+            const url = "/sys/dict/data/dictlist"
+            let params = {
+                dictType: "sql_query_type"
+            }
+            let {data,code,msg} = await requestPost(url,params)
+            if(code == 0){
+                this.queryTypeOpction = data
+            }else if(code>=8000){
+                this.$message.error(msg)
+            }
+        },
+         // 选中标签其他清空
+        hadeleClearForm(row,index){
+            let obj = {}
+             obj = {
+                            dataSource:row.dataSource?row.dataSource:'',
+                            itemId:row.itemId?row.itemId:'',
+                            queryType:row.queryType?row.queryType:'',
+                            colVal:row.colVal?row.colVal:'',
+                            colKey:row.colKey?row.colKey:'',
+                            nextLogicalRel:row.nextLogicalRel?row.nextLogicalRel:'',
+                            tableName:row.tableName?row.tableName:'',
+                            itemGroupId:row.itemGroupId?row.itemGroupId:'',
+                            itemIdOpction:row.itemIdOpction?row.itemIdOpction:[],
+                            itemGroupIdOpction:row.itemGroupIdOpction?row.itemGroupIdOpction:[]
+                        }
+            this.$set(this.tableData,index,obj)
+        },
+        async getFormEdit(id){
+            const url = `/governance/resiSearchTag/listResiSearchRulesByTagId?tagId=${id}`
+            let {code,msg,data} = await requestGet(url)
+            if(code == 0){
+                console.log(data,'获取到的详情信息');
+               this.tableData = data
+            }else if(code>=8000){
+                this.$message.error(msg)
+            }
+        },
+        async handleComfirm(){
+          this.$refs.label_form.validate((flag)=>{
+            if(flag){
+                let messageObj = {}
+                messageObj =  this.validateRule(this.tableData)
+                console.log(messageObj);
+                if(messageObj){
+                    this.$message.error(messageObj)
+                    return
+                }
+              for(let i in this.tableData){
+                    for(let j in this.tableData[i]){
+                        if(typeof this.tableData[i][j] != "string"&&typeof this.tableData[i][j] != "number"){
+                            this.$delete(this.tableData[i],j)
+                        }
+                    }
+                 }
+                 this.addSubmit()
+            }else{
+                return false
+            }
+          })
+               
+        },
+       async addSubmit(){
+               let url = ""
+               let params = {
+                }
+                 if(this.FormType == "edit"){
+                    url = "/governance/resiSearchTag/updateResiSearchTag"
+                    params = {
+                        tagName:this.formData.tagName,
+                        rules: this.tableData,
+                        tagId:this.tagId
+                    }
+                 }else {
+                    url = "/governance/resiSearchTag/addResiSearchTag"
+                    params = {
+                        tagName:this.formData.tagName,
+                        rules: this.tableData,
+                    }
+                 }
+              
+                let {data,msg,code} = await requestPost(url,params)
+                if(code==0){
+                    this.$message.success('新增成功')
+                    this.$emit('dialogOk')
+                }else if(code>=8000){
+                    this.$message.error(msg)
+                } 
+        },
+        handleCancle(){
+            this.$emit('dialogCancle')
+        },
+        validateRule(tabList){
+            console.log(tabList);
+            let message = ""
+            tabList.forEach((item,index)=>{
+                if (item.itemGroupId === '' && item.dataSource=='resi'||
+                    item.itemId === '' ||
+                    item.queryType === '' ||
+                    item.colKey === ''
+                ) {
+
+                    message = `匹配规则${item.dataSource=='resi'?'人员':item.dataSource=='house'?'房屋':item.dataSource=='stat'?'统计':''}信息不完整，请填写完整 !`
+                    return message
+                }
+                if ((index != this.tableData.length - 1) && item.nextLogicalRel === '') {
+                    message = `匹配规则${item.dataSource=='resi'?'人员':item.dataSource=='house'?'房屋':item.dataSource=='stat'?'统计':''}信息不完整，请填写完整 !`
+                    console.log(item);
+                    return message
+                }
+                if ((item.queryType !== 'is_null' && item.queryType !== 'is_not_null') && item.colVal === '') {
+                    message = `匹配规则${item.dataSource=='resi'?'人员':item.dataSource=='house'?'房屋':item.dataSource=='stat'?'统计':''}信息不完整，请填写完整 !`
+
+                    return message
+                }
+
+            })
+            return message
+        },
+        handleClickAddRow(){
+            if(this.tableData == undefined){
+                this.tableData = []
+            }
+            let obj = {}
+                obj.dataSource="";
+                obj.itemGroupId="";
+                obj.itemId="";
+                obj.queryType="";
+                obj.colVal="";
+                obj.nextLogicalRel=""
+                obj.itemIdOpction = []
+                this.tableData.push(obj)
+
+        },
+        // 删除一行
+        handleClickDelete(index){
+            this.tableData.splice(index,1)
+        },
+        handleClearItemId(row,index){
+            this.tableData[index].colVal = ''
+            this.tableData[index].queryType = ''
+        },
+    },
+    props:{},
+    computed:{},
+    watch: {},
+}
+</script>
+
+<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: right;
+    margin-right: 16px;
+    margin-top: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/communityService/labelConfig/index.vue b/src/views/modules/communityService/labelConfig/index.vue
new file mode 100644
index 000000000..a9709c2ea
--- /dev/null
+++ b/src/views/modules/communityService/labelConfig/index.vue
@@ -0,0 +1,236 @@
+<template>
+    <div class="g-main">
+        <div class="m-search">
+            <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'120px'">
+        <el-form-item label="标签名称"
+                      prop="tagName">
+          <el-input v-model="formData.tagName"
+                    size="small"
+                    class="u-item-width-normal"
+                    clearable
+                    placeholder="请输入">
+          </el-input>
+
+        </el-form-item>
+          <el-row type="flex" >
+            <el-col :span="24" align="right">
+                <el-button style="margin-left:30px"
+                   size="small"
+                   type="primary "
+                   @click="handleSearchFrom">查询</el-button>
+            </el-col>
+          </el-row>
+        
+
+      </el-form>
+        </div>
+        <div class="m-table">
+            <div class="div_btn">
+                <el-button
+                    style="height:32px;"
+                    size="small"
+                    @click="handleAdd({},'add')"
+                    type="primary"
+                    icon="el-icon-plus"
+                >
+                    新增</el-button
+                >
+             </div> 
+             <el-table
+             ref="config_table"
+             border
+            :data="tableData"
+             v-loading="tableLoading"
+             style="width: 100%"
+             :height="tableHeight"
+             >  
+                 <el-table-column
+                    label="标签名称"
+                    prop="tagName"
+                    fixed="left"
+                    align="center"
+                    key="tagName"
+                />
+                <el-table-column fixed="right" label="操作" align="center" width="200">
+                    <template slot-scope="scope">
+                        <el-button
+                            style="margin-right: 10px"
+                            @click="handleAdd(scope.row,'edit')"
+                            size="small"
+                            type="text"
+                            >修改</el-button
+                        >
+                        <!--   按钮权限-->
+                        <template >
+                       
+                        <el-popconfirm
+                            title="删除之后无法回复，确认删除？"
+                            @onConfirm="handleDel(scope.row)"
+                        >
+                            <el-button
+                            size="small"
+                            type="text"
+                            slot="reference"
+                            >删除</el-button
+                            >
+                        </el-popconfirm>
+                        </template>
+                    </template>
+                 </el-table-column>
+
+             </el-table> 
+
+             <div class="div-flex">
+                <div class="m-page">
+                    <el-pagination
+                        @size-change="handleSizeChange"
+                        @current-change="handleCurrentChange"
+                        :current-page.sync="pageNo"
+                        :page-sizes="[20, 50, 100, 200]"
+                        :page-size="pageSize"
+                        layout="sizes, prev, pager, next, total"
+                        :total="total"
+                    >
+                    </el-pagination>
+                 </div>
+             </div>
+        </div>
+        <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               destroy-on-close
+               width="900px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose"
+               
+               >
+             <add-form 
+                        v-if="formShow"
+                        ref="Config_form"
+                       :row-obj="rowObj"
+                      @dialogCancle="addFormCancle"
+                      @dialogOk="addFormOk"></add-form>
+    </el-dialog>
+    </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from "vuex";
+import addForm from "./addForm.vue"
+import nextTick from "dai-js/tools/nextTick";
+export default {
+    name:"labelConfig",
+    data(){
+        return{
+            formData:{
+                tagName:""
+            },
+            tableData:[],
+            pageNo:1,
+            pageSize:20,
+            tableLoading:true,
+            total:0,
+            searchH:100,
+            formShow:false,
+            formTitle:"",
+            rowObj:{}
+        }
+
+    },
+    created(){
+    },
+    components:{addForm},
+    methods:{
+      async getlabelConfigList(){
+          const url = "/governance/resiSearchTag/listResiSearchTags"   
+          let params = {
+            pageNo:this.pageNo,
+            pageSize:this.pageSize,
+            tagName:this.formData.tagName
+          } 
+          let {data,msg,code} = await requestPost(url,params)
+          this.tableLoading = false
+          if(code == 0 ){
+            this.tableData = data.list
+            this.total = data.total
+          }else{
+            this.$message.error(msg)
+          }
+        },
+        addFormCancle () {
+            this.formShow = false
+        },
+        addFormOk () {
+            this.formShow = false
+            this.getlabelConfigList()
+        },
+        handleAdd (row,type) {
+            if(type=="add"){
+            this.formTitle = '新增标签'
+            this.formShow = true
+            // this.$nextTick(() => {
+            // this.$refs.Config_form.initForm(type, row)
+            // })
+            }else {
+            this.formTitle = '修改标签'
+            this.formShow = true
+            console.log(row);
+            this.rowObj = row
+            this.$nextTick(() => {
+            this.$refs.Config_form.initForm(type, row)
+            })
+            }
+      },
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`);
+            this.pageSize = val;
+            this.getlabelConfigList()
+        },
+        async handleDel(row){
+            const url = `/governance/resiSearchTag/deleteResiSearchTag/${row.tagId}`
+            let {code,msg} = await requestPost(url)
+            if(code == 0 ){
+                this.$message.success('删除成功')
+            }else {
+                this.$message.error(msg)
+                
+            }
+            this.getlabelConfigList()
+        },
+        handleSearchFrom(){
+            this.getlabelConfigList()
+        },
+        handleCurrentChange(val) {
+            this.pageNo = val;
+            this.getlabelConfigList();
+        },
+        diaClose () {
+            this.formShow = false
+        },  
+    },
+    async mounted(){
+          this.getlabelConfigList()
+    },
+    computed:{
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+        tableHeight() {
+            const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
+            const _h = this.clientHeight - 275 - this.searchH;
+            return this.$store.state.inIframe ? h : _h;
+        },
+    },
+    watch:{}
+}
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+.div_btn{
+    margin-bottom: 12px;
+}
+</style>
diff --git a/src/views/modules/communityService/measure/points.vue b/src/views/modules/communityService/measure/points.vue
index 5a7b704a1..f06369051 100644
--- a/src/views/modules/communityService/measure/points.vue
+++ b/src/views/modules/communityService/measure/points.vue
@@ -18,7 +18,7 @@
             <el-form-item label="手机号" prop="mobile">
               <el-input v-model="searchForm.mobile" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
-            <el-form-item label="身份证" prop="idCard">
+            <el-form-item label="证件号" prop="idCard">
               <el-input v-model="searchForm.idCard" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
             <el-form-item label="审核状态" prop="status">
@@ -89,7 +89,7 @@
         />
         <el-table-column
           prop="idCard"
-          label="身份证号"
+          label="证件号"
           align="center"
           min-width="180"
         />
@@ -235,7 +235,7 @@
           <el-form-item label="手机号:" :label-width="'100px'">
            <div class="input-width1">{{detailInfo.mobile}}</div>
           </el-form-item>
-          <el-form-item label="身份证:" :label-width="'100px'">
+          <el-form-item label="证件号:" :label-width="'100px'">
             <div class="input-width1">{{detailInfo.idCard}}</div>
           </el-form-item>
         </div>
diff --git a/src/views/modules/communityService/policy/personListItem.vue b/src/views/modules/communityService/policy/personListItem.vue
index e6d5bdd8d..da4948474 100644
--- a/src/views/modules/communityService/policy/personListItem.vue
+++ b/src/views/modules/communityService/policy/personListItem.vue
@@ -104,13 +104,13 @@
 
           </el-form-item>
 
-          <el-form-item label="身份证"
+          <el-form-item label="证件号"
                         prop="mobile">
             <el-input v-model="formData.idCard"
                       size="small"
                       class="item_width_2"
                       clearable
-                      placeholder="请输入身份证">
+                      placeholder="请输入证件号">
             </el-input>
 
           </el-form-item>
@@ -162,7 +162,7 @@
         <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
-                         label="身份证"
+                         label="证件号"
                          width="170">
         </el-table-column>
         <el-table-column prop="neighborHoodName"
diff --git a/src/views/modules/demo/demo-add-or-update.vue b/src/views/modules/demo/demo-add-or-update.vue
index 97d6f32bd..8b27b4c68 100644
--- a/src/views/modules/demo/demo-add-or-update.vue
+++ b/src/views/modules/demo/demo-add-or-update.vue
@@ -7,8 +7,8 @@
           <el-form-item label="手机号" prop="mobile">
           <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
       </el-form-item>
-          <el-form-item label="身份证号" prop="identityNo">
-          <el-input v-model="dataForm.identityNo" placeholder="身份证号"></el-input>
+          <el-form-item label="证件号" prop="identityNo">
+          <el-input v-model="dataForm.identityNo" placeholder="证件号"></el-input>
           </el-form-item>
       </el-form>
     <template slot="footer">
diff --git a/src/views/modules/demo/demo.vue b/src/views/modules/demo/demo.vue
index f39204ccd..60c1d36f4 100644
--- a/src/views/modules/demo/demo.vue
+++ b/src/views/modules/demo/demo.vue
@@ -17,7 +17,7 @@
         </el-form-item>
         <el-form-item>
           <el-input v-model="dataForm.identityNo"
-                    placeholder="身份证号"
+                    placeholder="证件号"
                     clearable></el-input>
         </el-form-item>
         <el-form-item>
@@ -59,7 +59,7 @@
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="identityNo"
-                         label="身份证号"
+                         label="证件号"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="registFlag"
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 0e9e0a6e6..b78ea8387 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -298,7 +298,7 @@ export default {
 			},
 
 			typePlaceholder: {
-				jumin: "请输入姓名或电话或身份证号",
+				jumin: "请输入姓名或电话或证件号",
 				fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼",
 				xuqiu: "请输入需求人或需求内容或服务方",
 			},
diff --git a/src/views/modules/home/notice.vue b/src/views/modules/home/notice.vue
index 83288500b..3bfaeeb8b 100644
--- a/src/views/modules/home/notice.vue
+++ b/src/views/modules/home/notice.vue
@@ -102,6 +102,7 @@ export default {
 
 			if (item.id) {
 				params.id = item.id;
+				url += "?id=" + item.id;
 			}
 
 			const { data, code, msg } = await requestPost(url, params);
diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
index c785eae2c..0bb0065d1 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
@@ -36,13 +36,13 @@
                     placeholder="请输入姓名">
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证"
+        <el-form-item label="证件号"
                       prop="idCard">
           <el-input v-model="dataForm.idCard"
                     size="small"
                     class="list_item_width_1"
                     clearable
-                    placeholder="请输入身份证">
+                    placeholder="请输入证件号">
           </el-input>
         </el-form-item>
         <el-form-item label="手机"
@@ -98,7 +98,7 @@
         </el-table-column>
         <el-table-column prop="orgName" label="所属党组织" header-align="center" align="center"></el-table-column>
         <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="times" label="缴费次数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="money" label="缴费金额" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue
index 310d1e328..95c2710b6 100644
--- a/src/views/modules/partymember/icpartymemberpoint.vue
+++ b/src/views/modules/partymember/icpartymemberpoint.vue
@@ -45,13 +45,13 @@
           >
           </el-input>
         </el-form-item>
-        <el-form-item label="身份证" prop="idCard">
+        <el-form-item label="证件号" prop="idCard">
           <el-input
             v-model="dataForm.idCard"
             size="small"
             class="list_item_width_1"
             clearable
-            placeholder="请输入身份证"
+            placeholder="请输入证件号"
           >
           </el-input>
         </el-form-item>
@@ -123,7 +123,7 @@
         ></el-table-column>
         <el-table-column
           prop="idCard"
-          label="身份证"
+          label="证件号"
           header-align="center"
           align="center"
         ></el-table-column>
diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue
index 1716b3b79..ba8c95878 100644
--- a/src/views/modules/partymember/lookMember.vue
+++ b/src/views/modules/partymember/lookMember.vue
@@ -43,7 +43,7 @@
                             class="input-width"
                             clearable></el-input>
                 </el-form-item>
-                <el-form-item label="身份证"
+                <el-form-item label="证件号"
                               prop="idCard">
                   <el-input v-model="searchForm.idCard"
                             placeholder="请输入"
@@ -164,7 +164,7 @@
                              align="center"
                              width="100" />
             <el-table-column prop="idCard"
-                             label="身份证号"
+                             label="证件号"
                              align="center"
                              min-width="180" />
             <el-table-column prop="mobile"
diff --git a/src/views/modules/plugins/power/kernelhouseholdAddMember.vue b/src/views/modules/plugins/power/kernelhouseholdAddMember.vue
index 193834f2b..dea7ebdce 100644
--- a/src/views/modules/plugins/power/kernelhouseholdAddMember.vue
+++ b/src/views/modules/plugins/power/kernelhouseholdAddMember.vue
@@ -22,7 +22,7 @@
                              label="联系方式">
             </el-table-column>
             <el-table-column prop="idCard"
-                             label="身份证号">
+                             label="证件号">
             </el-table-column>
           </el-table>
         </div>
diff --git a/src/views/modules/plugins/power/kernelhouseholdTable.vue b/src/views/modules/plugins/power/kernelhouseholdTable.vue
index 99d8c4e5b..638cc8100 100644
--- a/src/views/modules/plugins/power/kernelhouseholdTable.vue
+++ b/src/views/modules/plugins/power/kernelhouseholdTable.vue
@@ -47,7 +47,7 @@
                          width="150">
         </el-table-column>
         <el-table-column prop="ownerIdCard"
-                         label="身份证"
+                         label="证件号"
                          width="150">
         </el-table-column>
         <el-table-column label="操作"
diff --git a/src/views/modules/plugins/rent/renthouse-add-or-update.vue b/src/views/modules/plugins/rent/renthouse-add-or-update.vue
index f522cf19e..f4bf31bbe 100644
--- a/src/views/modules/plugins/rent/renthouse-add-or-update.vue
+++ b/src/views/modules/plugins/rent/renthouse-add-or-update.vue
@@ -25,8 +25,8 @@
         <el-form-item label="房主电话" prop="ownerPhone">
             <el-input v-model="dataForm.ownerPhone" placeholder="房主电话"></el-input>
         </el-form-item>
-        <el-form-item label="房主证件号" prop="ownerIdCard">
-            <el-input v-model="dataForm.ownerIdCard" placeholder="房主证件号"></el-input>
+        <el-form-item label="房主身份证" prop="ownerIdCard">
+            <el-input v-model="dataForm.ownerIdCard" placeholder="房主身份证"></el-input>
         </el-form-item>
         <el-form-item label="网格" prop="gridName">
             <el-input v-model="dataForm.gridName" placeholder="网格"></el-input>
diff --git a/src/views/modules/plugins/rent/renthouse.vue b/src/views/modules/plugins/rent/renthouse.vue
index 781df1e41..cabf65cdc 100644
--- a/src/views/modules/plugins/rent/renthouse.vue
+++ b/src/views/modules/plugins/rent/renthouse.vue
@@ -221,7 +221,7 @@
         </el-table-column>
         <el-table-column prop="ownerName" label="房主姓名" header-align="center" align="center" min-width="70" show-overflow-tooltip></el-table-column>
         <el-table-column prop="ownerPhone" label="房主电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="ownerIdCard" label="房主证件号" header-align="center" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="ownerIdCard" label="房主身份证" header-align="center" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="purchaseDate" label="购房日期" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
diff --git a/src/views/modules/plugins/rent/renthouseForm.vue b/src/views/modules/plugins/rent/renthouseForm.vue
index 45bbaef0b..bde1cf507 100644
--- a/src/views/modules/plugins/rent/renthouseForm.vue
+++ b/src/views/modules/plugins/rent/renthouseForm.vue
@@ -144,12 +144,12 @@
                     v-model="dataForm.ownerPhone">
           </el-input>
         </el-form-item>
-        <el-form-item label="房主证件号"
+        <el-form-item label="房主身份证"
                       prop="ownerIdCard"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
-                    placeholder="请输入房主证件号"
+                    placeholder="请输入房主身份证"
                     v-model="dataForm.ownerIdCard">
           </el-input>
         </el-form-item>
@@ -519,7 +519,7 @@ export default {
     },
 
     async addRoom () {
-      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
       const regPassport = /^[a-zA-Z]{2}\d{7}$|^[a-zA-Z]{1}\d{8}$/; //护照号，1字母8数字或2字母7数字
       if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false && regPassport.test(this.dataForm.ownerIdCard) === false) {
         this.btnDisable = false
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index 52fe8ae3d..390ee23de 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -156,7 +156,7 @@
             </el-table-column>
             <el-table-column prop="ownerPhone" label="房主电话" width="110">
             </el-table-column>
-            <el-table-column prop="ownerIdCard" label="身份证" width="170">
+            <el-table-column prop="ownerIdCard" label="证件号" width="170">
             </el-table-column>
             <el-table-column
               label="操作"
@@ -240,7 +240,7 @@ export default {
       },
 
       typePlaceholder: {
-        jumin: "请输入姓名或电话或身份证号",
+        jumin: "请输入姓名或电话或证件号",
         fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼",
         xuqiu: "请输入需求人或需求内容或服务方",
       },
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index e12eb91aa..1380eac95 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -170,7 +170,7 @@
                   </el-table-column>
                   <el-table-column
                     prop="ownerIdCard"
-                    label="身份证"
+                    label="证件号"
                     width="170"
                   >
                   </el-table-column>
@@ -605,7 +605,7 @@ export default {
       },
 
       typePlaceholder: {
-        jumin: "请输入姓名或电话或身份证号",
+        jumin: "请输入姓名或电话或证件号",
         fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼",
         xuqiu: "请输入需求人或需求内容或服务方",
       },
diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index b0c0bbcc7..edef3a606 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -50,13 +50,13 @@
             </el-input>
           </el-form-item>
 
-          <el-form-item label="身份证号"
+          <el-form-item label="证件号"
                         prop="idCard"
                         label-width="150px"
                         style="display: block">
             <el-input class="cell-width-1"
                       maxlength="30"
-                      placeholder="请输入身份证号"
+                      placeholder="请输入证件号"
                       v-model="formData.idCard"></el-input>
           </el-form-item>
 
@@ -243,7 +243,7 @@ function iniFmData () {
     reportUserId: "", //	报事人ID
     name: "", //	报事人姓名
     mobile: "", //	手机号
-    idCard: "", //	身份证号
+    idCard: "", //	证件号
     sourceType: "", //	反映渠道
     happenTime: "", //发生时间
     eventContent: "", //	事件内容
@@ -322,10 +322,10 @@ export default {
     dataRule () {
       let checkIdCard = (rule, value, callback) => {
         if (value === "") {
-          callback(new Error("请输入身份证"));
+          callback(new Error("请输入证件号"));
         } else {
           if (!isCard(value)) {
-            callback(new Error("身份证号格式不正确"));
+            callback(new Error("证件号格式不正确"));
           }
           callback();
         }
@@ -340,7 +340,7 @@ export default {
           { required: true, message: "手机号不能为空", trigger: "blur" },
         ],
         // idCard: [
-        //   { required: true, message: "身份证号不能为空", trigger: "blur" },
+        //   { required: true, message: "证件号不能为空", trigger: "blur" },
         //   { required: true, validator: checkIdCard, trigger: "blur" },
         // ],
         sourceType: [
@@ -521,14 +521,14 @@ export default {
                 return false;
               }
 
-              const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+              const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
               if (
                 this.formData.idCard &&
                 regCard.test(this.formData.idCard) === false
               ) {
                 this.$message({
                   type: "warning",
-                  message: "请输入正确的身份证号码",
+                  message: "请输入正确的证件号码",
                 });
                 return false;
               }
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index ecc20e83e..6da354356 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -56,7 +56,7 @@
             <span>{{ info.mobile }}</span>
           </div>
           <div :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
-            <span class="u-info-title-2">身份证号：</span>
+            <span class="u-info-title-2">证件号：</span>
             <span>{{ info.idCard?info.idCard:'--' }}</span>
           </div>
           <div :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
diff --git a/src/views/modules/shequzhili/issue/cpts/add.vue b/src/views/modules/shequzhili/issue/cpts/add.vue
index ca354ac52..7ac195e71 100644
--- a/src/views/modules/shequzhili/issue/cpts/add.vue
+++ b/src/views/modules/shequzhili/issue/cpts/add.vue
@@ -70,7 +70,7 @@
           </el-form-item>
 
           <el-form-item
-            label="身份证号"
+            label="证件号"
             prop="idCard"
             label-width="150px"
             style="display: block"
@@ -78,7 +78,7 @@
             <el-input
               class="cell-width-1"
               maxlength="30"
-              placeholder="请输入身份证号"
+              placeholder="请输入证件号"
               v-model="formData.idCard"
             ></el-input>
           </el-form-item>
@@ -304,7 +304,7 @@ function iniFmData() {
     reportUserId: "", //	报事人ID
     name: "", //	报事人姓名
     mobile: "", //	手机号
-    idCard: "", //	身份证号
+    idCard: "", //	证件号
     sourceType: "", //	反映渠道
     happenTime: "", //发生时间
     eventContent: "", //	事件内容
@@ -379,10 +379,10 @@ export default {
     dataRule() {
       let checkIdCard = (rule, value, callback) => {
         if (value === "") {
-          callback(new Error("请输入身份证"));
+          callback(new Error("请输入证件号"));
         } else {
           if (!isCard(value)) {
-            callback(new Error("身份证号格式不正确"));
+            callback(new Error("证件号格式不正确"));
           }
           callback();
         }
@@ -397,7 +397,7 @@ export default {
           { required: true, message: "手机号不能为空", trigger: "blur" },
         ],
         // idCard: [
-        //   { required: true, message: "身份证号不能为空", trigger: "blur" },
+        //   { required: true, message: "证件号不能为空", trigger: "blur" },
         //   { required: true, validator: checkIdCard, trigger: "blur" },
         // ],
         sourceType: [
@@ -574,14 +574,14 @@ export default {
                 return false;
               }
 
-              const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+              const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
               if (
                 this.formData.idCard &&
                 regCard.test(this.formData.idCard) === false
               ) {
                 this.$message({
                   type: "warning",
-                  message: "请输入正确的身份证号码",
+                  message: "请输入正确的证件号码",
                 });
                 return false;
               }
diff --git a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
index b070e724e..b01b3a3d7 100644
--- a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
@@ -63,7 +63,7 @@
             <span>{{ eventDetailData.mobile||'--'  }}</span>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title-2">身份证号：</span>
+            <span class="u-info-title-2">证件号：</span>
             <span>{{ eventDetailData.idCard||'--'  }}</span>
           </div>
           <div class="m-info-prop">
diff --git a/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue b/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
index b070e724e..b01b3a3d7 100644
--- a/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
+++ b/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
@@ -63,7 +63,7 @@
             <span>{{ eventDetailData.mobile||'--'  }}</span>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title-2">身份证号：</span>
+            <span class="u-info-title-2">证件号：</span>
             <span>{{ eventDetailData.idCard||'--'  }}</span>
           </div>
           <div class="m-info-prop">
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
index 3a80484e6..d49d2f5b1 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
@@ -147,7 +147,7 @@
             </el-input>
           </el-form-item>
 
-          <el-form-item label="身份证号" prop="idCard">
+          <el-form-item label="证件号" prop="idCard">
             <el-input
               v-model="fmData.idCard"
               class="resi-cell-input"
@@ -237,7 +237,7 @@
           prop="ID_CARD"
           align="center"
           min-width="160"
-          label="身份证号"
+          label="证件号"
           :show-overflow-tooltip="true"
         >
         </el-table-column>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
index 2f3fc8107..547cb63d7 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
@@ -1,46 +1,50 @@
 <template>
-  <div class="resi-container">
-    <el-card ref="searchCard"
-             class="search-card">
-      <el-form ref="searchForm"
-               :inline="true"
-               :model="fmData"
-               :label-width="'100px'"
-               class="demo-form-inline">
-        <div>
-          <el-form-item prop="category"
-                        label="居民类别">
-            <div class="resi-cell-value">
-              <el-form-item prop="category">
-                <el-select v-model="fmData.category"
-                           placeholder="请选择居民类别"
-                           size="small"
-                           clearable
-                           class="resi-cell-select">
-                  <el-option v-for="(item,index) in jmlbOptions"
-                             @click.native="handleChangeJmlb(index)"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </div>
-          </el-form-item>
-          <el-form-item prop="gridId"
-                        label="所属组织">
-            <div class="resi-cell-value">
-              <el-cascader class="customer_cascader"
-                           ref="myCascader"
-                           clearable
-                           v-model="agencyIdArray"
-                           :options="orgOptions"
-                           :props="orgOptionProps"
-                           :show-all-levels="false"
-                           @change="handleChangeAgency"></el-cascader>
-            </div>
-          </el-form-item>
-          <!-- <el-form-item prop="gridId" label="所属网格">
+	<div class="g-main">
+		<div ref="searchCard" class="m-search">
+			<el-form
+				ref="searchForm"
+				:inline="true"
+				:model="fmData"
+				:label-width="'100px'"
+				class="demo-form-inline"
+			>
+				<el-form-item prop="categoryKey" label="居民类别">
+					<div class="resi-cell-value">
+						<el-form-item prop="categoryKey">
+							<el-select
+								v-model="fmData.categoryKey"
+								placeholder="请选择居民类别"
+								size="small"
+								clearable
+								class="u-item-width-normal"
+							>
+								<el-option
+									v-for="item in jmlbOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</div>
+				</el-form-item>
+
+				<el-form-item prop="gridId" label="所属组织">
+					<div class="resi-cell-value">
+						<el-cascader
+							class="u-item-width-normal"
+							ref="myCascader"
+							clearable
+							v-model="agencyIdArray"
+							:options="orgOptions"
+							:props="orgOptionProps"
+							:show-all-levels="false"
+							@change="handleChangeAgency"
+						></el-cascader>
+					</div>
+				</el-form-item>
+				<!-- <el-form-item prop="gridId" label="所属网格">
             <div class="resi-cell-value">
               <el-select
                 v-model.trim="fmData.gridId"
@@ -61,872 +65,728 @@
             </div>
           </el-form-item> -->
 
-          <el-form-item label="所属房屋">
-            <div class="resi-cell-value">
-              <div class="resi-cell-col">
-                <el-form-item prop="villageId">
-                  <el-select v-model.trim="fmData.villageId"
-                             placeholder="请选择小区"
-                             size="small"
-                             clearable
-                             class="resi-cell-select"
-                             @change="handleChangeV">
-                    <el-option v-for="item in optionsV"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="buildId">
-                  <el-select v-model.trim="fmData.buildId"
-                             placeholder="楼号"
-                             size="small"
-                             clearable
-                             :disabled="changeVDisabled"
-                             class="resi-cell-select resi-cell-select-middle"
-                             @change="handleChangeB">
-                    <el-option v-for="item in optionsB"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="unitId">
-                  <el-select v-model.trim="fmData.unitId"
-                             placeholder="单元"
-                             size="small"
-                             clearable
-                             :disabled="changeBDisabled"
-                             class="resi-cell-select resi-cell-select-middle"
-                             @change="handleChangeD">
-                    <el-option v-for="item in optionsD"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="homeId">
-                  <el-select v-model.trim="fmData.homeId"
-                             placeholder="房号"
-                             size="small"
-                             clearable
-                             :disabled="changeDDisabled"
-                             class="resi-cell-select resi-cell-select-middle">
-                    <el-option v-for="item in optionsH"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </div>
-            </div>
-          </el-form-item>
-        </div>
-
-        <div>
-          <el-form-item label="姓名"
-                        prop="name">
-            <el-input v-model="fmData.name"
-                      class="resi-cell-input"
-                      size="small"
-                      clearable
-                      placeholder="请输入">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="手机号"
-                        prop="mobile">
-            <el-input v-model="fmData.mobile"
-                      class="resi-cell-input"
-                      size="small"
-                      clearable
-                      placeholder="请输入">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="身份证号"
-                        prop="idCard">
-            <el-input v-model="fmData.idCard"
-                      class="resi-cell-input"
-                      size="small"
-                      clearable
-                      placeholder="请输入">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button class="diy-button--search"
-                       size="small"
-                       @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset"
-                       size="small"
-                       @click="resetForm('searchForm')">重置</el-button>
-          </el-form-item>
-        </div>
-      </el-form>
-    </el-card>
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-        <el-button @click="handleChu"
-                   class="diy-button--reset"
-                   size="small">导出</el-button>
-      </div>
-      <el-table :data="tableData"
-                border
-                style="width: 100%"
-                class="resi-table"
-                :height="tableHeight">
-        <el-table-column label="序号"
-                         fixed="left"
-                         type="index"
-                         align="center"
-                         width="50" />
-
-        <el-table-column prop="GRID_ID"
-                         align="center"
-                         label="所属网格"
-                         min-width="160"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column prop="HOME_ID"
-                         label="所属房屋"
-                         align="center"
-                         min-width="160"
-                         :show-overflow-tooltip="true" />
-
-        <el-table-column prop="NAME"
-                         align="center"
-                         label="姓名"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column prop="MOBILE"
-                         width="140"
-                         align="center"
-                         label="手机"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column prop="GENDER"
-                         align="center"
-                         width="60"
-                         label="性别">
-        </el-table-column>
-
-        <el-table-column prop="ID_CARD"
-                         align="center"
-                         min-width="160"
-                         label="身份证号"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column prop="BIRTHDAY"
-                         align="center"
-                         label="出生日期"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column prop="zhzlCategoryName"
-                         align="center"
-                         label="类别"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-        <el-table-column prop="REMARKS"
-                         align="center"
-                         label="备注"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column fixed="right"
-                         label="操作"
-                         align="center"
-                         width="120">
-          <template slot-scope="scope">
-            <el-button @click="handleWatch(scope.$index)"
-                       type="text"
-                       size="small">查看</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="parseInt(pageSize)"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
-      </div>
-    </el-card>
-
-    <people-more v-if="showedPeopleMoreInfo && currentPepeleId"
-                 :userId="currentPepeleId"
-                 :gridName="currentPepeleGridName"
-                 @close="showedPeopleMoreInfo = false" />
-
-    <el-dialog :visible.sync="diyDialog"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               width="1150px"
-               top="5vh"
-               class="dialog-h">
-      <diy-info v-if="diyDialog"
-                ref="ref_diy"
-                :list="exportList"
-                :search="computeQueryParams()"
-                @close="diyDialog = false"></diy-info>
-    </el-dialog>
-  </div>
+				<el-form-item label="所属房屋">
+					<div class="resi-cell-value">
+						<div class="resi-cell-col">
+							<el-form-item prop="villageId">
+								<el-select
+									v-model.trim="fmData.villageId"
+									placeholder="请选择小区"
+									size="small"
+									clearable
+									class="u-item-width-communitycascader"
+									@change="handleChangeV"
+								>
+									<el-option
+										v-for="item in optionsV"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									>
+									</el-option>
+								</el-select>
+							</el-form-item>
+							<el-form-item prop="buildId">
+								<el-select
+									v-model.trim="fmData.buildId"
+									placeholder="楼号"
+									size="small"
+									clearable
+									:disabled="changeVDisabled"
+									class="u-item-width-buildcascader"
+									@change="handleChangeB"
+								>
+									<el-option
+										v-for="item in optionsB"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									>
+									</el-option>
+								</el-select>
+							</el-form-item>
+							<el-form-item prop="unitId">
+								<el-select
+									v-model.trim="fmData.unitId"
+									placeholder="单元"
+									size="small"
+									clearable
+									:disabled="changeBDisabled"
+									class="u-item-width-buildcascader"
+									@change="handleChangeD"
+								>
+									<el-option
+										v-for="item in optionsD"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									>
+									</el-option>
+								</el-select>
+							</el-form-item>
+							<el-form-item prop="homeId">
+								<el-select
+									v-model.trim="fmData.homeId"
+									placeholder="房号"
+									size="small"
+									clearable
+									:disabled="changeDDisabled"
+									class="u-item-width-buildcascader"
+								>
+									<el-option
+										v-for="item in optionsH"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									>
+									</el-option>
+								</el-select>
+							</el-form-item>
+						</div>
+					</div>
+				</el-form-item>
+
+				<el-form-item label="姓名" prop="name">
+					<el-input
+						v-model="fmData.name"
+						class="u-item-width-normal"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<!-- <el-form-item label="手机号" prop="mobile">
+						<el-input
+							v-model="fmData.mobile"
+							class="u-item-width-normal"
+							size="small"
+							clearable
+							placeholder="请输入"
+						>
+						</el-input>
+					</el-form-item> -->
+
+				<el-form-item label="证件号" prop="idNum">
+					<el-input
+						v-model="fmData.idNum"
+						class="u-item-width-normal"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<div class="u-search-btn">
+					<el-button
+						class="diy-button--white"
+						size="small"
+						@click="resetForm('searchForm')"
+						>重置</el-button
+					>
+					<el-button
+						class="diy-button--blue"
+						size="small"
+						@click="handleSearch"
+						>查询</el-button
+					>
+				</div>
+			</el-form>
+		</div>
+
+		<div class="m-table">
+			<div class="u-table-btn1">
+				<el-button
+					@click="handleChu"
+					class="diy-button--white"
+					size="small"
+					>导出</el-button
+				>
+			</div>
+
+			<div class="m-table-item">
+				<el-table
+					:data="tableData"
+					border
+					style="width: 100%"
+					class="resi-table"
+					:height="tableHeight"
+				>
+					<el-table-column
+						label="序号"
+						fixed="left"
+						type="index"
+						align="center"
+						width="50"
+					/>
+
+					<el-table-column
+						prop="gridName"
+						align="center"
+						label="所属网格"
+						min-width="160"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="homeName"
+						label="所属房屋"
+						align="center"
+						min-width="160"
+						:show-overflow-tooltip="true"
+					/>
+
+					<el-table-column
+						prop="name"
+						align="center"
+						label="姓名"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="mobile"
+						width="140"
+						align="center"
+						label="手机"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="gender"
+						align="center"
+						width="60"
+						label="性别"
+					>
+						<template slot-scope="scope">
+							<span v-if="scope.row.gender == 1">男</span>
+							<span v-if="scope.row.gender == 2">女</span>
+						</template>
+					</el-table-column>
+
+					<el-table-column
+						prop="idNum"
+						align="center"
+						min-width="160"
+						label="证件号"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="birthday"
+						align="center"
+						label="出生日期"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="categoryName"
+						align="center"
+						label="类别"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+					<el-table-column
+						prop="remark"
+						align="center"
+						label="备注"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						fixed="right"
+						label="操作"
+						align="center"
+						width="120"
+					>
+						<template slot-scope="scope">
+							<el-button
+								@click="handleWatch(scope.$index)"
+								type="text"
+								size="small"
+								>查看</el-button
+							>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+
+			<div>
+				<el-pagination
+					@size-change="handleSizeChange"
+					@current-change="handleCurrentChange"
+					:current-page.sync="pageNo"
+					:page-sizes="[20, 50, 100, 200]"
+					:page-size="parseInt(pageSize)"
+					layout="sizes, prev, pager, next, total"
+					:total="total"
+				>
+				</el-pagination>
+			</div>
+		</div>
+
+		<resi-info
+			v-if="showedResiInfo && currentResiId"
+			:resi-id="currentResiId"
+			@close="showedResiInfo = false"
+		/>
+
+		<el-dialog
+			:visible.sync="diyDialog"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			width="1150px"
+			top="5vh"
+			class="dialog-h"
+		>
+			<diy-info
+				v-if="diyDialog"
+				ref="ref_diy"
+				:list="exportList"
+				:search="computeQueryParams()"
+				@close="diyDialog = false"
+			></diy-info>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
 import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
-import peopleMore from "@/views/modules/shequ/cpts/people-more";
 import diyInfo from "@/views/modules/base/diyInfo.vue";
+import resiInfo from "@/views/modules/cpts/resi/info";
 
 export default {
-  props: {
-
-  },
-
-  components: { peopleMore, diyInfo },
-  data () {
-    return {
-      openSearch: false,
-
-      formShow: false,
-      formTitle: "",
-
-      pageNo: 1,
-      pageSize: window.localStorage.getItem("pageSize") || 20,
-      total: 1,
-
-      tableData: [],
-
-      optionsV: [],
-      optionsB: [],
-      optionsH: [],
-      optionsD: [],
-      optionsG: [],
-      orgOptions: [],
-      jmlbOptions: [],
-      orgOptionProps: {
-        multiple: false,
-        value: 'agencyId',
-        label: 'agencyName',
-        children: 'subAgencyList',
-        checkStrictly: true
-      },
-      agencyIdArray: [],
-
-      optionsWelfare: [
-        {
-          value: "1",
-          label: "是",
-        },
-        {
-          value: "0",
-          label: "否",
-        },
-      ],
-
-      fmData: {
-        agencyId: "",
-        gridId: "",
-        villageId: "",
-        buildId: "",
-        unitId: "",
-        homeId: "",
-        name: "",
-        mobile: "",
-        idCard: "",
-        category: "",
-      },
-      rangeTime: [],
-
-      searchH: 0,
-      tableHeight: 0,
-
-      // 显示人员详情
-      showedPeopleMoreInfo: false,
-
-      currentPepeleId: "",
-      currentPepeleGridName: "",
-
-      diyDialog: false,
-      exportList: [],
-
-      elseParams: [],
-    };
-  },
-  computed: {
-    ...mapGetters(["clientHeight", "iframeHeight"]),
-    maxTableHeight () {
-      console.log("computed-searchH---", this.searchH);
-      const h = this.clientHeight - this.searchH + this.iframeHeight;
-      const _h = this.clientHeight - this.searchH;
-      console.log("computed-searchH---_h", _h);
-      return this.$store.state.inIframe ? h : _h;
-    },
-
-    changeVDisabled () {
-      return !this.fmData.villageId;
-    },
-    changeBDisabled () {
-      return !this.fmData.buildId;
-    },
-    changeDDisabled () {
-      return !this.fmData.unitId;
-    },
-  },
-  watch: {
-    rangeTime: function (val) {
-      console.log("val----", val);
-      if (Array.isArray(val) && val.length == 2) {
-        this.fmData.startTime = val[0];
-        this.fmData.endTime = val[1];
-      } else {
-        this.fmData.startTime = "";
-        this.fmData.endTime = "";
-      }
-    },
-    searchH () {
-      const h = this.clientHeight - this.searchH + this.iframeHeight;
-      const _h = this.clientHeight - this.searchH;
-      console.log("computed-searchH---_h", _h);
-
-      this.$nextTick(() => {
-        this.tableHeight = this.$store.state.inIframe ? h : _h;
-      });
-    },
-  },
-  async mounted () {
-    await this.getJmlb();
-    this.getOrgTreeList();
-    this.getGridList();
-    this.getValiheList();
-    this.getTableData();
-    this.searchH = this.$refs.searchCard.$el.offsetHeight + 270;
-    console.log("searchH----", this.$refs.searchCard.$el.offsetHeight);
-  },
-  methods: {
-    async handleWatch (rowIndex) {
-      let item = this.tableData[rowIndex];
-      this.currentPepeleId = item.icResiUserId;
-      this.currentPepeleGridName = item.GRID_ID;
-      await nextTick();
-      this.showedPeopleMoreInfo = true;
-    },
-
-    handleClearVillage () {
-      this.fmData.buildId = "";
-      this.fmData.homeId = "";
-    },
-    handleClearBuild () {
-      this.fmData.buildId = "";
-      this.fmData.unitId = "";
-      this.fmData.homeId = "";
-    },
-    handleClearDan () {
-      this.fmData.unitId = "";
-      this.fmData.homeId = "";
-    },
-    handleChangeGrid (val) {
-      console.log("val", val);
-      this.fmData.villageId = "";
-      this.fmData.buildId = "";
-      this.fmData.unitId = "";
-      this.fmData.homeId = "";
-      this.getValiheList();
-    },
-    handleChangeV (val) {
-      console.log("val", val);
-      this.fmData.buildId = "";
-      this.fmData.unitId = "";
-      this.fmData.homeId = "";
-      this.getBuildList();
-    },
-    handleChangeB (val) {
-      console.log("val", val);
-      this.fmData.unitId = "";
-      this.fmData.homeId = "";
-      this.getUniList();
-    },
-    handleChangeD (val) {
-      console.log("val", val);
-      this.fmData.homeId = "";
-      this.getHouseList();
-    },
-    handleChangeJmlb (index) {
-      // debugger
-      let selItem = this.jmlbOptions[index]
-      this.elseParams = []
-      let temp = {
-        queryType: selItem.queryType,
-        tableName: selItem.tableName,
-        columnName: selItem.columnName,
-        columnValue: [selItem.columnValue],
-      }
-
-      this.elseParams.push(temp)
-    },
-
-    async getJmlb () {
-      const url = '/data/aggregator/coverage/zhzl-category-option'
-      let params = {}
-      const { data, code, msg } = await requestPost(url, params);
-
-
-      if (code === 0) {
-        this.jmlbOptions = []
-        this.jmlbOptions = data
-        if (this.jmlbOptions.length > 0) {
-          this.fmData.category = 'anzhibangjiao'
-          // let temp = {
-          //   queryType: this.jmlbOptions[0].queryType,
-          //   tableName: this.jmlbOptions[0].tableName,
-          //   columnName: this.jmlbOptions[0].columnName,
-          //   columnValue: [this.jmlbOptions[0].columnValue],
-          // }
-          let temp = {
-            queryType: 'list_equal',
-            tableName: 'ic_special',
-            columnName: 'SPECIAL_RQLB',
-            columnValue: ["anzhibangjiao"],
-          }
-
-          this.elseParams.push(temp)
-        }
-
-      } else {
-        this.$message.error(msg)
-      }
-
-
-    },
-    getOrgTreeList () {
-
-      const { user } = this.$store.state
-      this.$http
-        .post('/gov/org/customeragency/agencygridtree', {})
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取组织树成功', res.data)
-            this.orgOptions = []
-            this.orgOptions.push(res.data)
-
-
-
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-
-    getGridList () {
-      const { user } = this.$store.state;
-      this.$http
-        .post("/gov/org/customergrid/gridoption", {
-          agencyId: user.agencyId,
-          purpose: "query",
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("获取查询详情成功", res.data);
-            this.optionsG = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getValiheList () {
-      const { user } = this.$store.state;
-      this.$http
-        .post("/actual/base/communityQuarters/listQuartersOptions", {
-          gridId: this.fmData.gridId,
-          agencyId: this.fmData.agencyId,
-          // agencyId: user.agencyId
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("获取查询详情成功", res.data);
-            this.optionsV = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getBuildList () {
-      this.$http
-        .post("/actual/base/communityBuilding/buildingoption", {
-          quartersId: this.fmData.villageId,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("获取查询详情成功", res.data);
-            this.optionsB = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getUniList () {
-      this.$http
-        .post("/actual/base/communityBuildingUnit/unitoption", {
-          buildingId: this.fmData.buildId,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("获取查询详情成功", res.data);
-            this.optionsD = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getHouseList () {
-      this.$http
-        .post("/actual/base/communityHouse/houseoption", { unitId: this.fmData.unitId })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("获取查询详情成功", res.data);
-            this.optionsH = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`);
-      this.pageSize = val;
-      window.localStorage.setItem("pageSize", val);
-      this.getTableData();
-    },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`);
-      this.pageNo = val;
-      this.getTableData();
-    },
-
-    handleClose () {
-      this.formShow = false;
-    },
-    handleSearch (val) {
-      console.log(this.fmData);
-      this.pageNo = 1;
-      this.getTableData();
-    },
-    resetForm (formName) {
-      // this.$refs[formName].resetFields();
-      this.agencyIdArray = []
-      this.fmData = {
-        agencyId: "",
-        gridId: "",
-        villageId: "",
-        buildId: "",
-        unitId: "",
-        homeId: "",
-        name: "",
-        mobile: "",
-        idCard: "",
-
-      }
-      this.elseParams = []
-      if (this.jmlbOptions.length > 0) {
-        this.fmData.category = this.jmlbOptions[0].value
-        let temp = {
-          queryType: this.jmlbOptions[0].queryType,
-          tableName: this.jmlbOptions[0].tableName,
-          columnName: this.jmlbOptions[0].columnName,
-          columnValue: [this.jmlbOptions[0].columnValue],
-        }
-
-        this.elseParams.push(temp)
-      }
-      this.handleSearch();
-    },
-
-    handleChangeAgency (val) {
-      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
-
-      if (obj) {
-        if (obj.level === 'grid') {
-          this.fmData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.fmData.agencyId = ''
-        } else {
-          this.fmData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.fmData.gridId = ''
-        }
-
-      } else {
-        this.fmData.agencyId = ''
-        this.fmData.gridId = ''
-      }
-
-
-      this.fmData.villageId = ''
-      this.fmData.buildId = ''
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-      this.getValiheList()
-    },
-
-    computeQueryParams () {
-      const { pageSize, pageNo, elseParams, fmData } = this;
-      let conditions = []
-      if (fmData.agencyId) {
-        conditions.push({
-          queryType: "like",
-          tableName: "ic_resi_user",
-          columnName: "AGENCY_ID",
-          columnValue: [fmData.agencyId],
-        })
-      }
-
-      if (fmData.gridId) {
-        conditions.push(
-          {
-            queryType: "equal",
-            tableName: "ic_resi_user",
-            columnName: "GRID_ID",
-            columnValue: [fmData.gridId],
-          }
-        )
-      }
-
-      if (fmData.villageId) {
-        conditions.push(
-          {
-            queryType: "equal",
-            tableName: "ic_resi_user",
-            columnName: "VILLAGE_ID",
-            columnValue: [fmData.villageId],
-          }
-        )
-      }
-
-      if (fmData.buildId) {
-        conditions.push({
-          queryType: "equal",
-          tableName: "ic_resi_user",
-          columnName: "BUILD_ID",
-          columnValue: [fmData.buildId],
-        })
-      }
-
-      if (fmData.unitId) {
-        conditions.push({
-          queryType: "equal",
-          tableName: "ic_resi_user",
-          columnName: "UNIT_ID",
-          columnValue: [fmData.unitId],
-        })
-      }
-
-      if (fmData.homeId) {
-        conditions.push({
-          queryType: "equal",
-          tableName: "ic_resi_user",
-          columnName: "HOME_ID",
-          columnValue: [fmData.homeId],
-        })
-      }
-
-      if (fmData.name) {
-        conditions.push({
-          queryType: "like",
-          tableName: "ic_resi_user",
-          columnName: "NAME",
-          columnValue: [fmData.name],
-        })
-      }
-      if (fmData.mobile) {
-        conditions.push({
-          queryType: "like",
-          tableName: "ic_resi_user",
-          columnName: "MOBILE",
-          columnValue: [fmData.mobile],
-        })
-      }
-      if (fmData.idCard) {
-        conditions.push({
-          queryType: "like",
-          tableName: "ic_resi_user",
-          columnName: "ID_CARD",
-          columnValue: [fmData.idCard],
-        })
-      }
-
-      return {
-        formCode: "resi_base_info",
-        pageSize,
-        pageNo,
-        conditions: [
-
-          ...conditions,
-
-          ...elseParams,
-        ],
-      };
-    },
-
-    async handleChu () {
-      this.getExportList();
-    },
-
-    async getExportList () {
-      const url = "/oper/customize//icformitemgroup/list";
-      let params = {
-        formCode: "resi_base_info",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        data.forEach((item) => {
-          (async (id) => {
-            // item.queryItemList = await this.getExportChildList(id)
-            item.queryItemList = [];
-          })(item.id);
-        });
-        this.exportList = [...data];
-        this.$nextTick(() => {
-          this.diyDialog = true;
-        });
-        console.log("获取详情成功getExportList----", this.exportList);
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    async getTableData () {
-      const url = "/epmetuser/icresiuser/listresi-zhzl";
-      const { data, code, msg } = await requestPost(url, {
-        ...this.computeQueryParams(),
-      });
-      if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！");
-        this.total = data.total || 0;
-        this.tableData = data.list
-          ? data.list.map((item) => {
-            return item;
-          })
-          : [];
-      } else {
-      }
-    },
-  },
+	props: {},
+
+	components: { resiInfo, diyInfo },
+
+	data() {
+		return {
+			openSearch: false,
+
+			formShow: false,
+			formTitle: "",
+
+			pageNo: 1,
+			pageSize: window.localStorage.getItem("pageSize") || 20,
+			total: 1,
+
+			tableData: [],
+
+			optionsV: [],
+			optionsB: [],
+			optionsH: [],
+			optionsD: [],
+			optionsG: [],
+			orgOptions: [],
+			jmlbOptions: [],
+			orgOptionProps: {
+				multiple: false,
+				value: "agencyId",
+				label: "agencyName",
+				children: "subAgencyList",
+				checkStrictly: true,
+			},
+			agencyIdArray: [],
+
+			optionsWelfare: [
+				{
+					value: "1",
+					label: "是",
+				},
+				{
+					value: "0",
+					label: "否",
+				},
+			],
+
+			fmData: {
+				agencyId: "",
+				gridId: "",
+				villageId: "",
+				buildId: "",
+				unitId: "",
+				homeId: "",
+				name: "",
+				mobile: "",
+				idNum: "",
+				categoryKey: "",
+			},
+			rangeTime: [],
+
+			searchH: 0,
+			tableHeight: 0,
+
+			// 显示人员详情
+			showedResiInfo: false,
+
+			currentResiId: "",
+			currentPepeleGridName: "",
+
+			diyDialog: false,
+			exportList: [],
+		};
+	},
+	computed: {
+		...mapGetters(["clientHeight", "iframeHeight"]),
+		maxTableHeight() {
+			console.log("computed-searchH---", this.searchH);
+			const h = this.clientHeight - this.searchH + this.iframeHeight;
+			const _h = this.clientHeight - this.searchH;
+			console.log("computed-searchH---_h", _h);
+			return this.$store.state.inIframe ? h : _h;
+		},
+
+		changeVDisabled() {
+			return !this.fmData.villageId;
+		},
+		changeBDisabled() {
+			return !this.fmData.buildId;
+		},
+		changeDDisabled() {
+			return !this.fmData.unitId;
+		},
+	},
+	watch: {
+		rangeTime: function (val) {
+			console.log("val----", val);
+			if (Array.isArray(val) && val.length == 2) {
+				this.fmData.startTime = val[0];
+				this.fmData.endTime = val[1];
+			} else {
+				this.fmData.startTime = "";
+				this.fmData.endTime = "";
+			}
+		},
+		searchH() {
+			const h = this.clientHeight - this.searchH + this.iframeHeight;
+			const _h = this.clientHeight - this.searchH;
+			console.log("computed-searchH---_h", _h);
+
+			this.$nextTick(() => {
+				this.tableHeight = this.$store.state.inIframe ? h : _h;
+			});
+		},
+	},
+	async mounted() {
+		await this.getJmlb();
+		this.getOrgTreeList();
+		this.getGridList();
+		this.getValiheList();
+		this.getTableData();
+		this.searchH = this.$refs.searchCard.offsetHeight + 270;
+		console.log("searchH----", this.$refs.searchCard.offsetHeight);
+	},
+	methods: {
+		async handleWatch(rowIndex) {
+			let item = this.tableData[rowIndex];
+			this.currentResiId = item.resiId;
+			await nextTick();
+			this.showedResiInfo = true;
+		},
+
+		handleClearVillage() {
+			this.fmData.buildId = "";
+			this.fmData.homeId = "";
+		},
+		handleClearBuild() {
+			this.fmData.buildId = "";
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+		},
+		handleClearDan() {
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+		},
+		handleChangeGrid(val) {
+			console.log("val", val);
+			this.fmData.villageId = "";
+			this.fmData.buildId = "";
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+			this.getValiheList();
+		},
+		handleChangeV(val) {
+			console.log("val", val);
+			this.fmData.buildId = "";
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+			this.getBuildList();
+		},
+		handleChangeB(val) {
+			console.log("val", val);
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+			this.getUniList();
+		},
+		handleChangeD(val) {
+			console.log("val", val);
+			this.fmData.homeId = "";
+			this.getHouseList();
+		},
+
+		async getJmlb() {
+			const url = "/actual/base/residentSpecial/zhzl-category-option";
+			let params = {};
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.jmlbOptions = [];
+				this.jmlbOptions = data;
+				if (this.jmlbOptions.length > 0) {
+					this.fmData.categoryKey = data[0].value;
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		getOrgTreeList() {
+			const { user } = this.$store.state;
+			this.$http
+				.post("/gov/org/customeragency/agencygridtree", {})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取组织树成功", res.data);
+						this.orgOptions = [];
+						this.orgOptions.push(res.data);
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+
+		getGridList() {
+			const { user } = this.$store.state;
+			this.$http
+				.post("/gov/org/customergrid/gridoption", {
+					agencyId: user.agencyId,
+					purpose: "query",
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取查询详情成功", res.data);
+						this.optionsG = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		getValiheList() {
+			const { user } = this.$store.state;
+			this.$http
+				.post("/actual/base/communityQuarters/listQuartersOptions", {
+					gridId: this.fmData.gridId,
+					agencyId: this.fmData.agencyId,
+					// agencyId: user.agencyId
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取查询详情成功", res.data);
+						this.optionsV = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		getBuildList() {
+			this.$http
+				.post("/actual/base/communityBuilding/buildingoption", {
+					quartersId: this.fmData.villageId,
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取查询详情成功", res.data);
+						this.optionsB = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		getUniList() {
+			this.$http
+				.post("/actual/base/communityBuildingUnit/unitoption", {
+					buildingId: this.fmData.buildId,
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取查询详情成功", res.data);
+						this.optionsD = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+		getHouseList() {
+			this.$http
+				.post("/actual/base/communityHouse/houseoption", {
+					unitId: this.fmData.unitId,
+				})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取查询详情成功", res.data);
+						this.optionsH = res.data;
+					}
+				})
+				.catch(() => {
+					return this.$message.error("网络错误");
+				});
+		},
+
+		handleSizeChange(val) {
+			console.log(`每页 ${val} 条`);
+			this.pageSize = val;
+			window.localStorage.setItem("pageSize", val);
+			this.getTableData();
+		},
+		handleCurrentChange(val) {
+			console.log(`当前页: ${val}`);
+			this.pageNo = val;
+			this.getTableData();
+		},
+
+		handleClose() {
+			this.formShow = false;
+		},
+		handleSearch(val) {
+			console.log(this.fmData);
+			this.pageNo = 1;
+			this.getTableData();
+		},
+		resetForm(formName) {
+			// this.$refs[formName].resetFields();
+			this.agencyIdArray = [];
+			this.fmData = {
+				agencyId: "",
+				gridId: "",
+				villageId: "",
+				buildId: "",
+				unitId: "",
+				homeId: "",
+				name: "",
+				mobile: "",
+				idNum: "",
+			};
+			if (this.jmlbOptions.length > 0) {
+				this.fmData.categoryKey = this.jmlbOptions[0].value;
+			}
+			this.handleSearch();
+		},
+
+		handleChangeAgency(val) {
+			let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
+
+			if (obj) {
+				if (obj.level === "grid") {
+					this.fmData.gridId =
+						this.agencyIdArray.length > 0
+							? this.agencyIdArray[this.agencyIdArray.length - 1]
+							: "";
+					this.fmData.agencyId = "";
+				} else {
+					this.fmData.agencyId =
+						this.agencyIdArray.length > 0
+							? this.agencyIdArray[this.agencyIdArray.length - 1]
+							: "";
+					this.fmData.gridId = "";
+				}
+			} else {
+				this.fmData.agencyId = "";
+				this.fmData.gridId = "";
+			}
+
+			this.fmData.villageId = "";
+			this.fmData.buildId = "";
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+			this.getValiheList();
+		},
+
+		computeQueryParams() {
+			const { pageSize, pageNo, fmData } = this;
+
+			return {
+				formCode: "resi_base_info",
+				pageSize,
+				pageNo,
+				...fmData,
+			};
+		},
+
+		async handleChu() {
+			this.getExportList();
+		},
+
+		async getExportList() {
+			const url = "/oper/customize//icformitemgroup/list";
+			let params = {
+				formCode: "resi_base_info",
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				data.forEach((item) => {
+					(async (id) => {
+						// item.queryItemList = await this.getExportChildList(id)
+						item.queryItemList = [];
+					})(item.id);
+				});
+				this.exportList = [...data];
+				this.$nextTick(() => {
+					this.diyDialog = true;
+				});
+				console.log("获取详情成功getExportList----", this.exportList);
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async getTableData() {
+			const url = "/actual/base/residentSpecial/page-zongzhirenqun";
+			const { data, code, msg } = await requestPost(url, {
+				...this.computeQueryParams(),
+			});
+			if (code === 0) {
+				console.log("列表请求成功！！！！！！！！！！！！！！");
+				this.total = data.total || 0;
+				this.tableData = data.list
+					? data.list.map((item) => {
+							return item;
+					  })
+					: [];
+			} else {
+			}
+		},
+	},
 };
 </script>
 
 <style lang="scss" scoped>
-@import "@/assets/scss/buttonstyle.scss";
-
-.resi-container .resi-card-table {
-  ::v-deep .el-table th {
-    color: #fff;
-    background-color: rgba(33, 149, 254, 1);
-    // border-right: 1px solid rgba(33, 149, 254, 1);
-  }
-}
-.resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-}
-.resi-card-table {
-  margin-top: 20px;
-}
-.resi-row-btn {
-  margin-bottom: 13px;
-  .upload-btn {
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
-
-.resi-btns {
-  margin-top: 20px;
-  text-align: center;
-}
-
-.resi-container .resi-card {
-  position: relative;
-  overflow: visible;
-}
-
-.demo-form-inline {
-  // display: flex;
-  // align-items: center;
-  // margin-bottom: 20px;
-
-  .resi-cell-label {
-    flex-shrink: 0;
-    min-width: 0;
-    box-sizing: border-box;
-    margin-right: 15px;
-    // text-align: right;
-    // line-height: 32;
-  }
-  .resi-cell-label1 {
-    width: max-content;
-  }
-  .resi-cell-value-radio {
-    display: flex;
-    align-items: center;
-    min-height: 32px;
-  }
-  .resi-cell-input {
-    width: 200px;
-  }
-  .resi-cell--daterange {
-    max-width: 260px;
-  }
-  .resi-cell-select {
-    width: 200px;
-    box-sizing: border-box;
-    margin-right: 10px;
-    &-middle {
-      width: 120px;
-    }
-    &-small {
-      width: 88px;
-    }
-  }
-  .resi-cell-select:last-child {
-    margin-right: 0;
-  }
-}
-
-.mt10 {
-  margin-top: 10px;
-}
+@import "@/assets/scss/modules/management/list-main.scss";
 </style>
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
index 0a7dcec40..a63a5a059 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
@@ -178,7 +178,7 @@
           <el-input
             class="item_width_1"
             maxlength="30"
-            placeholder="请输入身份证号或证件号"
+            placeholder="请输入证件号或证件号"
             v-model="fmData.idCard"
             @blur="handleBlurId"
             :disabled="formType === 'edit'"
@@ -447,7 +447,7 @@ export default {
           callback(new Error("请输入证件号"));
         } else {
           if (!isCard(value)) {
-            callback(new Error("请输入正确的身份证号或护照号"));
+            callback(new Error("请输入正确的证件号或护照号"));
           }
           callback();
         }
diff --git a/src/views/modules/sys/icvaccineprarmeter-check.vue b/src/views/modules/sys/icvaccineprarmeter-check.vue
index a21e361b4..021c67466 100644
--- a/src/views/modules/sys/icvaccineprarmeter-check.vue
+++ b/src/views/modules/sys/icvaccineprarmeter-check.vue
@@ -102,7 +102,7 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="身份证号"
+        <el-form-item label="证件号"
                       prop="idCard"
                       label-width="150px"
                       style="display: block">
diff --git a/src/views/modules/sys/roomForm.vue b/src/views/modules/sys/roomForm.vue
index d7a3f6723..ad1c364da 100644
--- a/src/views/modules/sys/roomForm.vue
+++ b/src/views/modules/sys/roomForm.vue
@@ -327,12 +327,12 @@ export default {
     },
 
     async addRoom () {
-      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //证件号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
       if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的身份证号码'
+          message: '请输入正确的证件号码'
         })
         return false;
       }
diff --git a/src/views/modules/visual/basicinfo/peopleList copy.vue b/src/views/modules/visual/basicinfo/peopleList copy.vue
index b7d47fb8c..4dbe15851 100644
--- a/src/views/modules/visual/basicinfo/peopleList copy.vue	
+++ b/src/views/modules/visual/basicinfo/peopleList copy.vue	
@@ -28,7 +28,7 @@
               <div class="td td3">所属网格</div>
               <div class="td td3">所属房屋</div>
               <div class="td td2">手机</div>
-              <div class="td td3">身份证</div>
+              <div class="td td3">证件号</div>
               <div class="td td1">性别</div>
               <div class="td td2">出生日期</div>
               <div class="td td1">操作</div>
diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue
index d2005d1c2..ace920f1f 100644
--- a/src/views/modules/visual/basicinfo/peopleList.vue
+++ b/src/views/modules/visual/basicinfo/peopleList.vue
@@ -127,7 +127,7 @@ export default {
           "所属网格",
           "所属房屋",
           "手机",
-          "身份证",
+          "证件号",
           "性别",
           "出生日期",
           "操作",
diff --git a/src/views/modules/visual/command/cpts/popup.vue b/src/views/modules/visual/command/cpts/popup.vue
index f68b60234..e94861b04 100644
--- a/src/views/modules/visual/command/cpts/popup.vue
+++ b/src/views/modules/visual/command/cpts/popup.vue
@@ -36,7 +36,7 @@
           <span>{{ info.genderShow || "--" }}</span>
         </div>
         <div class="item">
-          身份证号：
+          证件号：
           <span>{{ info.idCard || "--" }}</span>
         </div>
 
@@ -255,7 +255,7 @@
           <span>{{ info.mobile || "--" }}</span>
         </div>
         <!-- <div class="item">
-          身份证号：
+          证件号：
           <span>{{ info.idCard || "--" }}</span>
         </div> -->
 
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 813711594..908ca9067 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
@@ -618,7 +618,7 @@ export default {
     //             <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>性别：
     //               <span>`+ data.genderShow + `</span>
     //             </div> 
-    //             <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>身份证号：
+    //             <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>证件号：
     //               <span>`+ data.idCard + `</span>
     //             </div> 
     //             <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>出生日期：
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
index 7730e2e79..f1feea9aa 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
@@ -137,7 +137,7 @@
           <div class="popContentTitle">性别：
             <span>{{ selInfo.genderShow }}</span>
           </div>
-          <div class="popContentTitle">身份证号：
+          <div class="popContentTitle">证件号：
             <span>{{ selInfo.idCard }}</span>
           </div>
 
@@ -248,7 +248,7 @@
           <div class="popContentTitle">手机号：
             <span>{{ selInfo.mobile || "--" }}</span>
           </div>
-          <div class="popContentTitle">身份证号：
+          <div class="popContentTitle">证件号：
             <span>{{ selInfo.idCard || "--" }}</span>
           </div>
 
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
index 74cbe5d27..42a3e55c3 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
@@ -136,7 +136,7 @@
           <div class="popContentTitle">性别：
             <span>{{ selInfo.genderShow }}</span>
           </div>
-          <div class="popContentTitle">身份证号：
+          <div class="popContentTitle">证件号：
             <span>{{ selInfo.idCard }}</span>
           </div>
 
@@ -247,7 +247,7 @@
           <div class="popContentTitle">手机号：
             <span>{{ selInfo.mobile || "--" }}</span>
           </div>
-          <div class="popContentTitle">身份证号：
+          <div class="popContentTitle">证件号：
             <span>{{ selInfo.idCard || "--" }}</span>
           </div>
 
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
index 50b9ca78d..79dc2cdaf 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@@ -137,7 +137,7 @@
           <div class="popContentTitle">性别：
             <span>{{ selInfo.genderShow }}</span>
           </div>
-          <div class="popContentTitle">身份证号：
+          <div class="popContentTitle">证件号：
             <span>{{ selInfo.idCard }}</span>
           </div>
 
@@ -248,7 +248,7 @@
           <div class="popContentTitle">手机号：
             <span>{{ selInfo.mobile || "--" }}</span>
           </div>
-          <div class="popContentTitle">身份证号：
+          <div class="popContentTitle">证件号：
             <span>{{ selInfo.idCard || "--" }}</span>
           </div>
 
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 15a6a426c..0100df9b6 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -134,7 +134,7 @@
           <div class="popContentTitle">性别：
             <span>{{ selInfo.genderShow }}</span>
           </div>
-          <div class="popContentTitle">身份证号：
+          <div class="popContentTitle">证件号：
             <span>{{ selInfo.idCard }}</span>
           </div>
 
@@ -245,7 +245,7 @@
           <div class="popContentTitle">手机号：
             <span>{{ selInfo.mobile || "--" }}</span>
           </div>
-          <div class="popContentTitle">身份证号：
+          <div class="popContentTitle">证件号：
             <span>{{ selInfo.idCard || "--" }}</span>
           </div>
 
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index a6459c9d0..27bfe68e6 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -71,7 +71,7 @@
               <span>{{ eventInfo.mobile || "--" }}</span>
             </div>
             <!-- <div class="m-info-prop">
-              <span>身份证号：</span>
+              <span>证件号：</span>
               <span>{{ eventInfo.idCard || "--" }}</span>
             </div> -->
 
diff --git a/src/views/modules/visual/communityParty/crateForm.vue b/src/views/modules/visual/communityParty/crateForm.vue
index d210c9b92..6883c8b31 100644
--- a/src/views/modules/visual/communityParty/crateForm.vue
+++ b/src/views/modules/visual/communityParty/crateForm.vue
@@ -29,7 +29,7 @@
                 <span>{{ form.showMobile }}</span>
               </div>
               <div class="m-info-prop">
-                <span>身份证：</span>
+                <span>证件号：</span>
                 <span>{{ form.showIdCard }}</span>
               </div>
               <div class="m-info-prop">
@@ -136,10 +136,10 @@ export default {
     }
     let checkIdCard = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入身份证'))
+        callback(new Error('请输入证件号'))
       } else {
         if (!isCard(value)) {
-          callback(new Error('身份证号格式不正确'))
+          callback(new Error('证件号格式不正确'))
         }
         callback()
       }
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index ca77115b2..1c299c46d 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -578,7 +578,7 @@ export default {
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>手机号：
                   <span>`+ mobile + `</span>
                 </div>
-                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>身份证号：
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>证件号：
                   <span>`+ idCard + `</span>
                 </div> 
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>工作单位：
diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index 186806dd5..51e8e9758 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -582,7 +582,7 @@ export default {
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>性别：
                   <span>`+ data.genderShow + `</span>
                 </div> 
-                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>身份证号：
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>证件号：
                   <span>`+ data.idCard + `</span>
                 </div> 
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>出生日期：
diff --git a/src/views/modules/visual/plugin/power/components/house-dialog.vue b/src/views/modules/visual/plugin/power/components/house-dialog.vue
index fac6686cb..b334033f0 100644
--- a/src/views/modules/visual/plugin/power/components/house-dialog.vue
+++ b/src/views/modules/visual/plugin/power/components/house-dialog.vue
@@ -54,7 +54,7 @@ export default {
         { title: "与户主关系", coulmn: 'yhzgx' },
         { title: "性别", coulmn: 'gender' },
         { title: "是否党员", coulmn: 'isParty' },
-        { title: "身份证号", coulmn: 'idCard' },
+        { title: "证件号", coulmn: 'idCard' },
         { title: "手机号", coulmn: 'mobile' }
       ],
       headerStyle: [
diff --git a/src/views/modules/visual/shundeju/controlCount.vue b/src/views/modules/visual/shundeju/controlCount.vue
index 1c6a5928c..a2b6866dc 100644
--- a/src/views/modules/visual/shundeju/controlCount.vue
+++ b/src/views/modules/visual/shundeju/controlCount.vue
@@ -132,7 +132,7 @@ export default {
       headerList: [
         { title: "姓名", coulmn: 'name' },
         { title: "人脸", coulmn: 'faceImg' },
-        { title: "身份证", coulmn: 'idCard' },
+        { title: "证件号", coulmn: 'idCard' },
         // { title: "性别", coulmn: 'gender' },
         { title: "手机号", coulmn: 'mobile' },
         // { title: "类型", coulmn: 'type' },
diff --git a/src/views/modules/visual/warning/components/screen-table/people-list.vue b/src/views/modules/visual/warning/components/screen-table/people-list.vue
index 742e13c72..66ead4dc5 100644
--- a/src/views/modules/visual/warning/components/screen-table/people-list.vue
+++ b/src/views/modules/visual/warning/components/screen-table/people-list.vue
@@ -113,7 +113,7 @@ export default {
           width: "10%",
         },
       ],
-      header: ["序号", "姓名", "单元", "门牌号", "手机", "身份证", "操作"],
+      header: ["序号", "姓名", "单元", "门牌号", "手机", "证件号", "操作"],
 
       loading: false,
       pageNo: 0,
diff --git a/src/views/modules/warning/components/screen-table/people-list.vue b/src/views/modules/warning/components/screen-table/people-list.vue
index 4ddde0608..cea534be1 100644
--- a/src/views/modules/warning/components/screen-table/people-list.vue
+++ b/src/views/modules/warning/components/screen-table/people-list.vue
@@ -29,7 +29,7 @@
               <el-table-column prop="doorName" label="门牌号" width="80">
               </el-table-column>
               <el-table-column prop="mobile" label="手机"> </el-table-column>
-              <el-table-column prop="idCard" label="身份证"> </el-table-column>
+              <el-table-column prop="idCard" label="证件号"> </el-table-column>
               <el-table-column
                 fixed="right"
                 label="操作"