diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index 132b39be..922bfaf7 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -36,12 +36,12 @@
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
   margin-top: 15px;
-  padding: 10px;
+  padding: 10px 20px;
   position: relative;
 
   .div_btn {
     margin-top: 10px;
-    margin-left: 10px;
+    // margin-left: 10px;
     display: flex;
 
     .btn_upload {
diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 8222c786..ec6637bc 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -2,6 +2,7 @@
   <div>
     <div class="dialog-h-content scroll-h">
       <el-form
+        v-if="iniLoaded"
         ref="ref_form"
         :model="fmData"
         :inline="true"
@@ -59,6 +60,22 @@
             </div>
           </template>
 
+          <template v-if="item.type == 'number'">
+            <el-input-number
+              v-model="fmData[item.keyName]"
+              type="textarea"
+              size="small"
+              clearable
+              show-word-limit
+              :rows="3"
+              :min="item.min || 0"
+              :max="item.max || 999999999999"
+              :placeholder="item.placeholder || '请输入'"
+            >
+            </el-input-number>
+            <span v-if="item.unitName">（{{ item.unitName }}）</span>
+          </template>
+
           <template v-else-if="item.type == 'select'">
             <el-select
               v-model="fmData[item.keyName]"
@@ -155,6 +172,27 @@ export default {
       type: String,
       default: "info",
     },
+    idName: {
+      type: String,
+      default: "",
+    },
+    addUrl: {
+      type: String,
+      default: "",
+    },
+    editUrl: {
+      type: String,
+      default: "",
+    },
+    delUrl: {
+      type: String,
+      default: "",
+    },
+    infoUrl: {
+      type: String,
+      default: "",
+    },
+
     editParams: {
       type: Array,
       default: () => [],
@@ -163,6 +201,8 @@ export default {
 
   data() {
     return {
+      iniLoaded: false,
+
       btnDisable: false,
 
       fmData: {},
@@ -192,10 +232,20 @@ export default {
       }
     },
 
+    computeFmData() {
+      console.log(this.fmData);
+    },
+
     iniFmData() {
-      const { editParams } = this;
-      editParams.forEach(async (item, index) => {
-        this.fmData[item.keyName] = item.value;
+      const { editParams, fmData } = this;
+      editParams.forEach((item, index) => {
+        fmData[item.keyName] = item.value || "";
+        if (item.supValues) {
+          item.supValues.forEach((value, index) => {
+            fmData[item.supKeys[index]] = value;
+          });
+        }
+
         if (item.type == "select") {
           if (item.optionUrl) {
             this.getFmOptions(
@@ -205,10 +255,16 @@ export default {
             );
           }
         } else if (item.type == "address") {
-          await nextTick(500);
-          this.initMap(item);
+          this.$nextTick(async () => {
+            await nextTick(500);
+            this.initMap(item);
+          });
         }
       });
+
+      this.fmData = { ...fmData };
+      console.log("------------------------------------", this.fmData);
+      this.iniLoaded = true;
     },
 
     async getFmOptions(index, url, params) {
@@ -286,8 +342,10 @@ export default {
             } = data[0];
             map.setCenter(new TMap.LatLng(lat, lng));
             this.setMarker(lat, lng);
-            item.supValues[0] = lng;
-            item.supValues[1] = lat;
+            // item.supValues[0] = lng;
+            // item.supValues[1] = lat;
+            this.fmData[item.supKeys[0]] = lng;
+            this.fmData[item.supKeys[1]] = lat;
           } else {
             this.$message.error("未检索到相关位置坐标");
           }
@@ -299,22 +357,26 @@ export default {
       const center = map.getCenter();
       const lat = center.getLat();
       const lng = center.getLng();
-      item.supValues[0] = lng;
-      item.supValues[1] = lat;
+      // item.supValues[0] = lng;
+      // item.supValues[1] = lat;
+      this.fmData[item.supKeys[0]] = lng;
+      this.fmData[item.supKeys[1]] = lat;
       this.setMarker(lat, lng);
 
       geocoder
         .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
         .then((result) => {
-          item.value = result.result.address;
+          this.fmData[item.keyName] = result.result.address;
         });
     },
 
     async getInfo() {
-      const url = "/heart/icServiceOrg/detail";
+      const url = this.infoUrl;
+      if (!url) return;
+      const { idName } = this;
 
       const params = {
-        icServiceOrgId: this.formId,
+        [idName]: this.formId,
       };
 
       const { data, code, msg } = await requestPost(url, params);
@@ -322,9 +384,12 @@ export default {
         this.fmData = {
           ...this.fmData,
           ...data,
-          serviceTypeArr: data.serviceType.split(","),
         };
-        map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
+        console.log("------------------------------------info", this.fmData);
+
+        if (map) {
+          map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
+        }
       } else {
         this.$message.error(msg);
       }
@@ -339,7 +404,7 @@ export default {
       setTimeout(() => {
         this.btnDisable = false;
       }, 5000);
-      this.computeFmData();
+
       this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj);
@@ -350,25 +415,10 @@ export default {
       });
     },
 
-    computeFmData() {
-      console.log("11111111111111111112", this.fmData);
-      // let fmData = {};
-      // this.editParams.forEach((item) => {
-      //   fmData[item.keyName] = item.value;
-      //   if (item.supValues) {
-      //     item.supValues.forEach((value, index) => {
-      //       fmData[item.supKeys[index]] = value;
-      //     });
-      //   }
-      // });
-      // this.fmData = fmData;
-      return this.fmData;
-    },
-
     async submit() {
       let url = "";
       let params = {
-        ...this.computeFmData(),
+        ...this.fmData,
         // serviceType: this.fmData.serviceTypeArr.join(","),
       };
 
@@ -376,8 +426,6 @@ export default {
         url = this.addUrl;
       } else {
         url = this.editUrl;
-
-        // params.icServiceOrgId = this.formId;
       }
 
       const { data, code, msg } = await requestPost(url, params);
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 11a22dea..f0bfe47b 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -2,7 +2,7 @@
   <div class="div_main">
     <div v-show="true">
       <div class="div_search">
-        <el-form :inline="true" ref="ref_searchform" :label-width="'80px'">
+        <el-form :inline="true" ref="ref_searchform" label-width="100px">
           <div>
             <el-form-item
               v-for="item in searchParams"
@@ -67,12 +67,39 @@
             >新增</el-button
           >
 
-          <!-- <el-button
+          <el-button
+            v-if="mubanUrl"
+            class="btn_upload diy-button--export"
+            size="small"
+            @click="handleExportModule('room')"
+            >下载模板</el-button
+          >
+
+          <el-upload
+            v-if="importUrl"
+            ref="upload"
+            class="upload-btn"
+            action="uploadUlr"
+            :limit="1"
+            :accept="'.xls,.xlsx'"
+            :with-credentials="true"
+            :show-file-list="false"
+            :auto-upload="true"
+            :before-upload="beforeExcelUpload"
+            :http-request="uploadHttpRequest"
+          >
+            <el-button size="small" class="btn_upload diy-button--delete"
+              >导入</el-button
+            >
+          </el-upload>
+
+          <el-button
+            v-if="exportUrl"
             @click="handleExport"
-            class="diy-button--reset"
+            class="btn_upload diy-button--reset"
             size="small"
             >导出</el-button
-          > -->
+          >
         </div>
 
         <el-table
@@ -86,7 +113,7 @@
           <template v-for="item in tableParams" :prop="item.keyName">
             <el-table-column
               v-if="item.type == 'no'"
-              :key="'table' + item.keyName"
+              :key="'table-no' + item.keyName"
               :label="item.field"
               fixed="left"
               type="index"
@@ -95,8 +122,8 @@
             />
 
             <el-table-column
-              :key="'table' + item.keyName"
               v-else-if="item.type == 'text'"
+              :key="'table' + item.keyName"
               :prop="item.keyName"
               :label="item.field"
               align="center"
@@ -176,9 +203,13 @@
     >
       <edit-form
         ref="eleEditForm"
+        :idName="idName"
         :formId="formId"
         :formType="formType"
         :editParams="editParams"
+        :infoUrl="infoUrl"
+        :addUrl="addUrl"
+        :editUrl="editUrl"
         @close="handleClose"
         @afterEdit="handleEditSuccess"
       ></edit-form>
@@ -227,15 +258,32 @@ export default {
       type: String,
       default: "",
     },
+    infoUrl: {
+      type: String,
+      default: "",
+    },
     exportUrl: {
       type: String,
       default: "",
     },
+    importUrl: {
+      type: String,
+      default: "",
+    },
+    mubanUrl: {
+      type: String,
+      default: "",
+    },
 
     editParams: {
       type: Array,
       default: () => [],
     },
+
+    idName: {
+      type: String,
+      default: "id",
+    },
   },
 
   data() {
@@ -308,6 +356,89 @@ export default {
       this.getTableData();
     },
 
+    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) {
+      let { importUrl: url } = this;
+      if (!url) return;
+
+      this.$message({
+        showClose: true,
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
+
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      await this.$http
+        .post(url, formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            // this.$message.success('导入成功')
+            this.getTableData();
+            this.$refs.upload.clearFiles();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+    },
+
+    async handleExportModule() {
+      let { mubanUrl: url } = this;
+      if (!url) return;
+
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: {},
+      })
+        .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("网络错误");
+        });
+    },
+
     async handleExport() {
       const { exportUrl: url } = this;
       if (!url) return;
@@ -353,15 +484,17 @@ export default {
     },
 
     handleWatch(row) {
+      const { idName } = this;
       this.formType = "watch";
-      this.formId = row.icServiceOrgId;
+      this.formId = row[idName];
       this.formTitle = "查看";
       this.formShow = true;
     },
 
     handleEdit(row) {
+      const { idName } = this;
       this.formType = "edit";
-      this.formId = row.icServiceOrgId;
+      this.formId = row[idName];
       this.formTitle = "编辑";
       this.formShow = true;
     },
@@ -380,10 +513,10 @@ export default {
       const { delUrl: url } = this;
       if (!url) return;
 
-      const { tableData } = this;
+      const { tableData, idName } = this;
 
       const { data, code, msg } = await requestPost(url, {
-        icServiceOrgId: tableData[rowIndex].icServiceOrgId,
+        [idName]: tableData[rowIndex][idName],
       });
 
       if (code === 0) {
@@ -447,5 +580,5 @@ export default {
 <style lang="scss" scoped>
 @import "@/assets/scss/buttonstyle.scss";
 @import "@/assets/scss/modules/management/list-main.scss";
-@import "@/assets/scss/modules/shequzhili/event-info.scss";
+// @import "@/assets/scss/modules/shequzhili/event-info.scss";
 </style>
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index 4ebad94f..69e549c3 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -252,6 +252,7 @@
             style="margin-top: 10px; padding: 0 20px"
           >
             <el-table
+              v-if="vaccineList"
               class="table"
               :data="vaccineList"
               border
@@ -368,6 +369,8 @@ export default {
       homeList: [],
       natList: [], // 核酸检测
       tripList: [], // 行程信息
+
+      vaccineList: [],
     };
   },
 
@@ -502,18 +505,19 @@ export default {
       return "--";
     },
 
-    getNodePath(node, val, path) { // node:所有数据，val:后台返回的id, path:要渲染的数组id
+    getNodePath(node, val, path) {
+      // node:所有数据，val:后台返回的id, path:要渲染的数组id
       for (let i = 0; i < node.length; i++) {
         const ele = node[i];
         if (ele.value === val) {
           path.push(ele.label);
-          return path
+          return path;
         } else if (ele.children && ele.children.length > 0) {
-          if (ele.children.some(row => row.value === val)) {
+          if (ele.children.some((row) => row.value === val)) {
             path.unshift(ele.label);
-            this.getNodePath(ele.children,val,path);
+            this.getNodePath(ele.children, val, path);
           } else {
-            this.getNodePath(ele.children,val,path);
+            this.getNodePath(ele.children, val, path);
           }
         }
       }
diff --git a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
index 79e71c99..91301a2e 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
@@ -7,8 +7,12 @@
       :addUrl="addUrl"
       :editUrl="editUrl"
       :delUrl="delUrl"
+      :infoUrl="infoUrl"
       :exportUrl="exportUrl"
+      :importUrl="importUrl"
+      :mubanUrl="mubanUrl"
       :editParams="editParams"
+      idName="icDangerousChemicalsId"
     ></base-page>
   </div>
 </template>
@@ -22,73 +26,114 @@ export default {
   data() {
     return {
       searchParams: [
+        { field: "企业名称", keyName: "name", type: "input" },
         {
-          field: "服务类别",
-          keyName: "serviceType",
+          field: "企业类型",
+          keyName: "category",
+          type: "select",
+          optionUrl: "/gov/org/coverage/dict-select-list/dangerous_chemicals",
+          optionUrlParams: {},
+          optionList: [],
+        },
+        {
+          field: "危化品种类",
+          keyName: "dangerType",
           type: "select",
           optionUrl: "/sys/dict/data/dictlist",
           optionUrlParams: {
-            dictType: "ic_service_type",
+            dictType: "ic_danger_type",
           },
           optionList: [],
         },
-        { field: "服务组织", keyName: "orgName", type: "input" },
-        { field: "服务地址", keyName: "address", type: "input" },
-        { field: "备注", keyName: "remark", type: "input" },
       ],
 
       tableParams: [
         { field: "序号", keyName: "", type: "no" },
-        { field: "服务类别", keyName: "serviceType", type: "text" },
-        { field: "服务组织名称", keyName: "orgName", type: "text" },
-        { field: "服务地址", keyName: "address", type: "text" },
+        { field: "企业名称", keyName: "name", type: "text" },
+        { field: "企业类别", keyName: "categoryName", type: "text" },
+        { field: "周边安全间距", keyName: "safeDistanceName", type: "text" },
+        { field: "危化品种类", keyName: "dangerTypeName", type: "text" },
+        { field: "经营地址", keyName: "address", type: "text" },
+        { field: "负责人", keyName: "principalName", type: "text" },
+        { field: "联系电话", keyName: "principalMobile", type: "text" },
         { field: "备注", keyName: "remark", type: "text" },
       ],
-      tableUrl: "/heart/icServiceOrg/list",
-      exportUrl: "/gov/project/icEvent/export",
+      tableUrl: "/gov/org/icDangerousChemicals/list",
+      mubanUrl: "/gov/org/icDangerousChemicals/download",
+      importUrl: "/gov/org/icDangerousChemicals/import",
+      exportUrl: "/gov/org/icDangerousChemicals/export",
+
+      addUrl: "/gov/org/icDangerousChemicals/add",
+      editUrl: "/gov/org/icDangerousChemicals/edit",
+      infoUrl: "/gov/org/icDangerousChemicals/detail",
+      delUrl: "/gov/org/icDangerousChemicals/del",
 
       editParams: [
         {
-          field: "服务类别",
-          keyName: "serviceType",
+          field: "企业名称",
+          keyName: "name",
+          type: "input",
+          maxlength: 100,
+          editDisabled: true,
+          rules: [
+            {
+              required: true,
+              message: "企业名称不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "企业分类",
+          keyName: "category",
           type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
+          optionUrl: "/gov/org/coverage/dict-select-list/dangerous_chemicals",
           optionUrlParams: {
-            dictType: "ic_service_type",
+            // dictType: "ic_service_type",
           },
           optionList: [],
           editDisabled: true,
           rules: [
-            { required: true, message: "服务类别不能为空", trigger: "blur" },
+            { required: true, message: "企业分类不能为空", trigger: "blur" },
           ],
         },
         {
-          field: "服务组织",
-          keyName: "orgName",
-          type: "input",
-          maxlength: 100,
+          field: "周边安全间距",
+          keyName: "safeDistance",
+          type: "number",
+          min: 0,
+          max: 1000000000,
+          unitName: "公里",
+        },
+        {
+          field: "危化品种类",
+          keyName: "dangerType",
+          type: "select",
+          optionUrl: "/sys/dict/data/dictlist",
+          optionUrlParams: {
+            dictType: "ic_danger_type",
+          },
+          optionList: [],
           editDisabled: true,
-          rules: [
-            {
-              required: true,
-              message: "服务组织名称不能为空",
-              trigger: "blur",
-            },
-          ],
         },
+        { field: "负责人", keyName: "principalName", type: "input" },
+        { field: "联系电话", keyName: "principalMobile", type: "input" },
         {
-          field: "服务地址",
+          field: "经营地址",
           keyName: "address",
           type: "address",
           supKeys: ["longitude", "latitude"],
           supValues: ["", ""],
+          rules: [
+            {
+              required: true,
+              message: "经营地址坐标不能为空",
+              trigger: "blur",
+            },
+          ],
         },
-        { field: "备注", keyName: "remark", type: "input" },
+        { field: "备注", keyName: "remark", type: "textarea" },
       ],
-
-      addUrl: "/heart/icServiceOrg/add",
-      editUrl: "/heart/icServiceOrg/edit",
-      delUrl: "/heart/icServiceOrg/del",
     };
   },
   components: { basePage },
diff --git a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
index 79e71c99..1d8aa749 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
@@ -7,8 +7,12 @@
       :addUrl="addUrl"
       :editUrl="editUrl"
       :delUrl="delUrl"
+      :infoUrl="infoUrl"
       :exportUrl="exportUrl"
+      :importUrl="importUrl"
+      :mubanUrl="mubanUrl"
       :editParams="editParams"
+      idName="icSuperiorResourceId"
     ></base-page>
   </div>
 </template>
@@ -22,73 +26,95 @@ export default {
   data() {
     return {
       searchParams: [
+        { field: "场所名称", keyName: "name", type: "input" },
         {
-          field: "服务类别",
+          field: "场所分类",
           keyName: "serviceType",
           type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
-          optionUrlParams: {
-            dictType: "ic_service_type",
-          },
+          optionUrl: "/gov/org/coverage/dict-select-list/superior_resource",
+          optionUrlParams: {},
           optionList: [],
         },
-        { field: "服务组织", keyName: "orgName", type: "input" },
-        { field: "服务地址", keyName: "address", type: "input" },
-        { field: "备注", keyName: "remark", type: "input" },
       ],
 
       tableParams: [
         { field: "序号", keyName: "", type: "no" },
-        { field: "服务类别", keyName: "serviceType", type: "text" },
-        { field: "服务组织名称", keyName: "orgName", type: "text" },
-        { field: "服务地址", keyName: "address", type: "text" },
-        { field: "备注", keyName: "remark", type: "text" },
+        { field: "场所名称", keyName: "name", type: "text" },
+        { field: "场所类别", keyName: "categoryName", type: "text" },
+        { field: "占地面积", keyName: "areaCoveredName", type: "text" },
+        { field: "容纳人数", keyName: "capacityName", type: "text" },
+        { field: "地址", keyName: "address", type: "text" },
       ],
-      tableUrl: "/heart/icServiceOrg/list",
-      exportUrl: "/gov/project/icEvent/export",
+      tableUrl: "/gov/org/icSuperiorResource/list",
+      mubanUrl: "/gov/org/icSuperiorResource/download",
+      importUrl: "/gov/org/icSuperiorResource/import",
+      exportUrl: "/gov/org/icSuperiorResource/export",
+
+      addUrl: "/gov/org/icSuperiorResource/add",
+      editUrl: "/gov/org/icSuperiorResource/edit",
+      infoUrl: "/gov/org/icSuperiorResource/detail",
+      delUrl: "/gov/org/icSuperiorResource/del",
 
       editParams: [
         {
-          field: "服务类别",
+          field: "场所名称",
+          keyName: "name",
+          type: "input",
+          maxlength: 100,
+          editDisabled: true,
+          rules: [
+            {
+              required: true,
+              message: "场所名称不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "场所分类",
           keyName: "serviceType",
           type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
+          optionUrl: "/gov/org/coverage/dict-select-list/superior_resource",
           optionUrlParams: {
-            dictType: "ic_service_type",
+            // dictType: "ic_service_type",
           },
           optionList: [],
           editDisabled: true,
           rules: [
-            { required: true, message: "服务类别不能为空", trigger: "blur" },
+            { required: true, message: "场所分类不能为空", trigger: "blur" },
           ],
         },
         {
-          field: "服务组织",
-          keyName: "orgName",
-          type: "input",
-          maxlength: 100,
-          editDisabled: true,
-          rules: [
-            {
-              required: true,
-              message: "服务组织名称不能为空",
-              trigger: "blur",
-            },
-          ],
+          field: "占地面积",
+          keyName: "areaCovered",
+          type: "number",
+          min: 0,
+          max: 1000000000,
+          unitName: "平方公里",
+        },
+        {
+          field: "容纳人数",
+          keyName: "capacity",
+          type: "number",
+          min: 0,
+          max: 1000000000,
+          //   unitName: "个",
         },
         {
-          field: "服务地址",
+          field: "位置坐标",
           keyName: "address",
           type: "address",
           supKeys: ["longitude", "latitude"],
           supValues: ["", ""],
+          rules: [
+            {
+              required: true,
+              message: "地址坐标不能为空",
+              trigger: "blur",
+            },
+          ],
         },
-        { field: "备注", keyName: "remark", type: "input" },
       ],
-
-      addUrl: "/heart/icServiceOrg/add",
-      editUrl: "/heart/icServiceOrg/edit",
-      delUrl: "/heart/icServiceOrg/del",
     };
   },
   components: { basePage },
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue
index 79e71c99..0b98fd9e 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue
@@ -1,104 +1,840 @@
 <template>
-  <div>
-    <base-page
-      :searchParams="searchParams"
-      :tableParams="tableParams"
-      :tableUrl="tableUrl"
-      :addUrl="addUrl"
-      :editUrl="editUrl"
-      :delUrl="delUrl"
-      :exportUrl="exportUrl"
-      :editParams="editParams"
-    ></base-page>
+  <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="gridId" label="所属网格">
+            <div class="resi-cell-value">
+              <el-select
+                v-model.trim="fmData.gridId"
+                placeholder="请选择网格"
+                size="small"
+                clearable
+                class="resi-cell-select"
+                @change="handleChangeGrid"
+              >
+                <el-option
+                  v-for="item in optionsG"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </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="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"
+    />
   </div>
 </template>
 
 <script>
-import basePage from "@/views/modules/cpts/base/index";
+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";
 
 export default {
-  props: {},
-
+  components: { peopleMore },
   data() {
     return {
-      searchParams: [
-        {
-          field: "服务类别",
-          keyName: "serviceType",
-          type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
-          optionUrlParams: {
-            dictType: "ic_service_type",
-          },
-          optionList: [],
-        },
-        { field: "服务组织", keyName: "orgName", type: "input" },
-        { field: "服务地址", keyName: "address", type: "input" },
-        { field: "备注", keyName: "remark", type: "input" },
-      ],
+      openSearch: false,
 
-      tableParams: [
-        { field: "序号", keyName: "", type: "no" },
-        { field: "服务类别", keyName: "serviceType", type: "text" },
-        { field: "服务组织名称", keyName: "orgName", type: "text" },
-        { field: "服务地址", keyName: "address", type: "text" },
-        { field: "备注", keyName: "remark", type: "text" },
-      ],
-      tableUrl: "/heart/icServiceOrg/list",
-      exportUrl: "/gov/project/icEvent/export",
+      formShow: false,
+      formTitle: "",
 
-      editParams: [
-        {
-          field: "服务类别",
-          keyName: "serviceType",
-          type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
-          optionUrlParams: {
-            dictType: "ic_service_type",
-          },
-          optionList: [],
-          editDisabled: true,
-          rules: [
-            { required: true, message: "服务类别不能为空", trigger: "blur" },
-          ],
-        },
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      tableData: [],
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+
+      optionsWelfare: [
         {
-          field: "服务组织",
-          keyName: "orgName",
-          type: "input",
-          maxlength: 100,
-          editDisabled: true,
-          rules: [
-            {
-              required: true,
-              message: "服务组织名称不能为空",
-              trigger: "blur",
-            },
-          ],
+          value: "1",
+          label: "是",
         },
         {
-          field: "服务地址",
-          keyName: "address",
-          type: "address",
-          supKeys: ["longitude", "latitude"],
-          supValues: ["", ""],
+          value: "0",
+          label: "否",
         },
-        { field: "备注", keyName: "remark", type: "input" },
       ],
 
-      addUrl: "/heart/icServiceOrg/add",
-      editUrl: "/heart/icServiceOrg/edit",
-      delUrl: "/heart/icServiceOrg/del",
+      fmData: {
+        gridId: "",
+        villageId: "",
+        buildId: "",
+        unitId: "",
+        homeId: "",
+        name: "",
+        mobile: "",
+        idCard: "",
+      },
+      rangeTime: [],
+
+      searchH: 0,
+      tableHeight: 0,
+
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+
+      currentPepeleId: "",
+      currentPepeleGridName: "",
     };
   },
-  components: { basePage },
-  computed: {},
-  watch: {},
+  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);
 
-  async mounted() {},
+      this.$nextTick(() => {
+        this.tableHeight = this.$store.state.inIframe ? h : _h;
+      });
+    },
+  },
+  mounted() {
+    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();
+    },
+
+    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("/gov/org/icneighborhood/neighborhoodoption", {
+          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("/gov/org/icbuilding/buildingoption", {
+          neighborHoodId: 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("/gov/org/icbuildingunit/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("/gov/org/ichouse/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.handleSearch();
+    },
+
+    async handleChu() {
+      const url = "/epmetuser/icMoveIn/export";
+      const { pageSize, pageNo, fmData } = this;
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: {
+          pageSize,
+          pageNo,
+          ...{
+            formCode: "resi_base_info",
+            pageNo: 1,
+            pageSize: 20,
+            conditions: [
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "GRID_ID",
+                columnValue: [fmData.gridId],
+              },
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "VILLAGE_ID",
+                columnValue: [fmData.villageId],
+              },
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "BUILD_ID",
+                columnValue: [fmData.buildId],
+              },
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "UNIT_ID",
+                columnValue: [fmData.unitId],
+              },
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "HOME_ID",
+                columnValue: [fmData.homeId],
+              },
+              {
+                queryType: "like",
+                tableName: "ic_resi_user",
+                columnName: "NAME",
+                columnValue: [fmData.name],
+              },
+              {
+                queryType: "like",
+                tableName: "ic_resi_user",
+                columnName: "MOBILE",
+                columnValue: [fmData.mobile],
+              },
+              {
+                queryType: "like",
+                tableName: "ic_resi_user",
+                columnName: "ID_CARD",
+                columnValue: [fmData.idCard],
+              },
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "IS_XFRY",
+                columnValue: ["1"],
+              },
+            ],
+          },
+        },
+      })
+        .then((res) => {
+          console.log("res----dddd", res);
+          this.formatData(res);
+        })
+        .catch((err) => {
+          console.log("err", err);
+          this.exportLoading = false;
+          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("下载失败");
+    },
 
-  methods: {},
+    async getTableData() {
+      const url = "/epmetuser/icresiuser/listresi";
+      const { pageSize, pageNo, fmData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...{
+          formCode: "resi_base_info",
+          pageNo: 1,
+          pageSize: 20,
+          conditions: [
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "GRID_ID",
+              columnValue: [fmData.gridId],
+            },
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "VILLAGE_ID",
+              columnValue: [fmData.villageId],
+            },
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "BUILD_ID",
+              columnValue: [fmData.buildId],
+            },
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "UNIT_ID",
+              columnValue: [fmData.unitId],
+            },
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "HOME_ID",
+              columnValue: [fmData.homeId],
+            },
+            {
+              queryType: "like",
+              tableName: "ic_resi_user",
+              columnName: "NAME",
+              columnValue: [fmData.name],
+            },
+            {
+              queryType: "like",
+              tableName: "ic_resi_user",
+              columnName: "MOBILE",
+              columnValue: [fmData.mobile],
+            },
+            {
+              queryType: "like",
+              tableName: "ic_resi_user",
+              columnName: "ID_CARD",
+              columnValue: [fmData.idCard],
+            },
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "IS_XFRY",
+              columnValue: ["1"],
+            },
+          ],
+        },
+      });
+      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></style>
+<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;
+}
+</style>