From 91ac1f39f47a60375b0007eac87152dd933f5a3c Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 9 May 2022 14:54:05 +0800
Subject: [PATCH 01/37] 2222

---
 .../modules/base/huji/chusheng/cpts/edit.vue  | 540 +++++++++++
 .../modules/base/huji/chusheng/index.vue      | 851 ++++++++++++++++++
 2 files changed, 1391 insertions(+)
 create mode 100644 src/views/modules/base/huji/chusheng/cpts/edit.vue
 create mode 100644 src/views/modules/base/huji/chusheng/index.vue

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
new file mode 100644
index 00000000..59ec51c3
--- /dev/null
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -0,0 +1,540 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="dataForm"
+        :rules="dataRule"
+        :disabled="formType === 'detail'"
+        class="form"
+      >
+        <el-form-item
+          label="组织名称	"
+          prop="organizationName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入组织名称	"
+            v-model="dataForm.organizationName"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="组织人数	"
+          prop="organizationPersonCount"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="number"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入组织人数	"
+            v-model="dataForm.organizationPersonCount"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="组织成员	"
+          prop="organizationPersonnel"
+          label-width="150px"
+          style="display: block"
+        >
+          <div class="m-staffs">
+            <div
+              class="item"
+              :key="'staff' + index"
+              v-for="(item, index) in dataForm.organizationPersonnel"
+            >
+              <el-input
+                class="item_width_1"
+                maxlength="50"
+                show-word-limit
+                placeholder="成员姓名"
+                v-model="item.personName"
+              />
+
+              <el-input
+                style="margin-left: 10px"
+                class="item_width_1"
+                maxlength="50"
+                show-word-limit
+                placeholder="联系电话"
+                v-model="item.personPhone"
+              />
+
+              <el-button
+                style="margin-left: 10px"
+                size="small"
+                @click="handleDelStaff(index)"
+                >删除</el-button
+              >
+            </div>
+
+            <div class="item-add">
+              <el-button size="small" @click="handleAddStaff">添加</el-button>
+            </div>
+          </div>
+        </el-form-item>
+
+        <el-form-item
+          label="服务事项"
+          prop="serviceItem"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            maxlength="1000"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入服务事项，不超过1000字"
+            v-model="dataForm.serviceItem"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="负责人	"
+          prop="principalName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入负责人	"
+            v-model="dataForm.principalName"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="联系电话	"
+          prop="principalPhone"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入联系电话	"
+            v-model="dataForm.principalPhone"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="创建时间"
+          prop="organizationCreatedTime"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-date-picker
+            v-model="dataForm.organizationCreatedTime"
+            placeholder="创建时间"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item
+          label="位置坐标"
+          prop="longitude"
+          label-width="150px"
+          style="display: block"
+        >
+          <div style="width: 500px">
+            <el-input
+              class="item_width_4"
+              maxlength="50"
+              placeholder="请输入关键字"
+              v-model="dataForm.address"
+            >
+            </el-input>
+            <el-button
+              style="margin-left: 10px"
+              type="primary"
+              size="small"
+              @click="handleSearchMap"
+              >查询</el-button
+            >
+            <div id="app" class="div_map"></div>
+            <div style="margin-top: 10px">
+              <span>经度</span>
+              <el-input
+                class="item_width_3"
+                maxlength="50"
+                placeholder="请输入经度"
+                v-model="dataForm.longitude"
+              >
+              </el-input>
+              <span style="margin-left: 20px">纬度</span>
+              <el-input
+                class="item_width_3"
+                maxlength="50"
+                placeholder="请输入纬度"
+                v-model="dataForm.latitude"
+              >
+              </el-input>
+            </div>
+          </div>
+        </el-form-item>
+
+        <el-form-item
+          label="备注"
+          prop="remark"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            maxlength="500"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入备注，不超过500字"
+            v-model="dataForm.remark"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="div_btn resi-btns">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        v-if="formType != 'detail'"
+        type="primary"
+        size="small"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import formVltHelper from "dai-js/tools/formVltHelper";
+
+var map;
+var search;
+var markers;
+var infoWindowList;
+let loading; // 加载动画
+
+export default {
+  data() {
+    return {
+      formType: "add", //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      orgId: "",
+      dataForm: {
+        organizationName: "",
+        serviceItem: "",
+        organizationPersonCount: "",
+        principalName: "",
+        principalPhone: "",
+        organizationCreatedTime: "",
+        address: "",
+        remark: "",
+        longitude: "",
+        latitude: "",
+        organizationPersonnel: [],
+      },
+    };
+  },
+  components: {},
+  computed: {
+    dataRule() {
+      return {
+        organizationName: [
+          { required: true, message: "组织名称	不能为空", trigger: "blur" },
+          {
+            min: 1,
+            max: 50,
+            message: "组织名称	长度在 1 到 50个字符",
+            trigger: "blur",
+          },
+        ],
+        organizationPersonCount: [
+          { required: true, message: "组织人数不能为空", trigger: "blur" },
+        ],
+        serviceItem: [
+          { required: true, message: "服务事项不能为空", trigger: "blur" },
+        ],
+        principalName: [
+          { required: true, message: "负责人不能为空", trigger: "blur" },
+        ],
+        principalPhone: [
+          { required: true, message: "联系电话不能为空", trigger: "blur" },
+        ],
+        longitude: [
+          { required: true, message: "位置坐标不能为空", trigger: "blur" },
+        ],
+      };
+    },
+  },
+  props: {},
+  watch: {},
+
+  async mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    handleAddStaff() {
+      this.dataForm.organizationPersonnel = [
+        ...this.dataForm.organizationPersonnel,
+        { personName: "", personPhone: "" },
+      ];
+    },
+    handleDelStaff(index) {
+      const { organizationPersonnel } = this.dataForm;
+      organizationPersonnel.splice(index, 1);
+      this.dataForm.organizationPersonnel = organizationPersonnel;
+    },
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap() {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519);
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById("app"), {
+        center: center, // 设置地图中心点坐标
+        zoom: 17.2, // 设置地图缩放级别
+        pitch: 43.5, // 设置俯仰角
+        rotation: 45, // 设置地图旋转角度
+      });
+
+      search = new window.TMap.service.Search({ pageSize: 10 });
+      // 新建一个地点搜索类
+      markers = new TMap.MultiMarker({
+        map: map,
+        geometries: [],
+      });
+      infoWindowList = Array(10);
+
+      // 监听地图平移结束
+      map.on("panend", () => {
+        this.handleMoveCenter();
+      });
+      this.handleMoveCenter();
+    },
+
+    setMarker(lat, lng) {
+      markers.setGeometries([]);
+      markers.add([
+        {
+          id: "4",
+          styleId: "marker",
+          position: new TMap.LatLng(lat, lng),
+          properties: {
+            title: "marker4",
+          },
+        },
+      ]);
+    },
+
+    handleSearchMap() {
+      infoWindowList.forEach((infoWindow) => {
+        infoWindow.close();
+      });
+      infoWindowList.length = 0;
+      markers.setGeometries([]);
+      // 在地图显示范围内以给定的关键字搜索地点
+      search
+        .searchRectangle({
+          keyword: this.dataForm.address,
+          bounds: map.getBounds(),
+        })
+        .then((result) => {
+          let { data } = result;
+          if (Array.isArray(data) && data.length > 0) {
+            const {
+              location: { lat, lng },
+            } = data[0];
+            map.setCenter(new TMap.LatLng(lat, lng));
+            this.setMarker(lat, lng);
+            this.dataForm.latitude = lat;
+            this.dataForm.longitude = lng;
+          } else {
+            this.$message.error("未检索到相关位置坐标");
+          }
+        });
+    },
+
+    handleMoveCenter() {
+      //修改地图中心点
+      const center = map.getCenter();
+      const lat = center.getLat();
+      const lng = center.getLng();
+      this.dataForm.latitude = lat;
+      this.dataForm.longitude = lng;
+      this.setMarker(lat, lng);
+    },
+
+    async initForm(type, row) {
+      this.$refs.ref_form.resetFields();
+
+      this.formType = type;
+      console.log(row);
+      if (row) {
+        this.dataForm = { ...this.dataForm, ...row };
+        this.orgId = this.dataForm.orgId;
+        map.setCenter(new TMap.LatLng(row.latitude, row.longitude));
+      }
+    },
+
+    async handleComfirm() {
+      this.btnDisable = true;
+      setTimeout(() => {
+        this.btnDisable = false;
+      }, 10000);
+      this.$refs["ref_form"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
+          this.btnDisable = false;
+        } else {
+          if (!formVltHelper.userOrMobile(this.dataForm.principalPhone)) {
+            return this.$message({
+              type: "error",
+              message: "手机号格式有误",
+            });
+          }
+          this.submit();
+        }
+      });
+    },
+
+    async submit() {
+      let url = "";
+      if (this.formType === "add") {
+        url = "/heart/iccommunityselforganization/addcommunityselforganization";
+        // url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
+      } else {
+        url =
+          "/heart/iccommunityselforganization/editcommunityselforganization";
+
+        this.dataForm.orgId = this.orgId;
+      }
+
+      const { data, code, msg } = await requestPost(url, this.dataForm);
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功",
+        });
+        this.resetData();
+        this.$emit("dialogOk");
+        this.btnDisable = false;
+      } else {
+        this.btnDisable = false;
+        this.$message.error(msg);
+      }
+    },
+
+    handleCancle() {
+      this.resetData();
+      this.$emit("dialogCancle");
+    },
+    resetData() {
+      this.orgId = "";
+      this.dataForm = {
+        organizationName: "",
+        serviceItem: "",
+        organizationPersonCount: "",
+        principalName: "",
+        principalPhone: "",
+        organizationCreatedTime: "",
+        address: "",
+        remark: "",
+        longitude: "",
+        latitude: "",
+        organizationPersonnel: [],
+      };
+    },
+    // 开启加载动画
+    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>
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  margin-top: 10px;
+}
+
+.div_btn {
+  // display: flex;
+  // justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+
+.m-staffs {
+  width: 468px;
+  .item {
+    display: flex;
+    justify-content: space-around;
+    margin-bottom: 7px;
+  }
+  .item-add {
+  }
+}
+</style>
+
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
new file mode 100644
index 00000000..5b82941b
--- /dev/null
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -0,0 +1,851 @@
+<template>
+  <div class="resi-container">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        class="demo-form-inline"
+      >
+        <el-row class="resi-row">
+          <el-col :span="6">
+            <div class="resi-cell">
+              <div class="resi-cell-label">所属网格</div>
+              <div class="resi-cell-value">
+                <el-select
+                  v-model.trim="form.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>
+            </div>
+          </el-col>
+          <el-col :span="18">
+            <div class="resi-cell">
+              <div class="resi-cell-label">所属房屋</div>
+              <div class="resi-cell-value">
+                <el-select
+                  v-model.trim="form.villageId"
+                  placeholder="请选择小区"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  @clear="handleClearVillage"
+                  @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="form.buildId"
+                  placeholder="楼号"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell-select"
+                  :disabled="changeVDisabled"
+                  @clear="handleClearBuild"
+                  @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="form.unitId"
+                  :disabled="changeBDisabled"
+                  placeholder="单元"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell-select"
+                  @click="handleClearDan"
+                  @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="form.homeId"
+                  :disabled="changeDDisabled"
+                  placeholder="房号"
+                  size="small"
+                  clearable
+                  style="width: 120px"
+                  class="resi-cell-select"
+                >
+                  <el-option
+                    v-for="item in optionsH"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+
+        <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 label="出生日期" prop="birthdayTime">
+          <el-date-picker
+            v-model="fmData.birthdayTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="享受福利" prop="remark">
+          <el-input
+            v-model="fmData.remark"
+            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>
+      </el-form>
+    </el-card>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button class="diy-button--add" size="small" @click="handleAdd"
+          >新增</el-button
+        >
+        <el-button
+          v-if="false"
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule('room')"
+          >下载模板</el-button
+        >
+        <el-upload
+          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--delete"
+            :loading="importLoading"
+            >{{ importBtnTitle }}</el-button
+          >
+        </el-upload>
+
+        <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="maxTableHeight"
+      >
+        <el-table-column label="序号" type="index" align="center" width="50" />
+
+        <el-table-column prop="name" 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="所属网格"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop=""
+          label="所属房屋"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="mobile"
+          width="100"
+          align="center"
+          label="手机号"
+        >
+        </el-table-column>
+
+        <el-table-column prop="idCard" align="center" label="身份证号">
+        </el-table-column>
+
+        <el-table-column prop="gender" align="center" label="性别">
+        </el-table-column>
+
+        <el-table-column prop="birthday" align="center" label="出生日期">
+        </el-table-column>
+
+        <el-table-column prop="birthplace" align="center" label="出生地">
+        </el-table-column>
+
+        <el-table-column align="center" label="出生人父/母姓名">
+          <template slot-scope="scope">
+            <span> {{ scope.row.father }} / {{ scope.row.mother }} </span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="count" align="center" label="胎次">
+        </el-table-column>
+
+        <el-table-column prop="reportDate" align="center" label="申报户口日期">
+        </el-table-column>
+
+        <el-table-column prop="houseHolderName" align="center" label="户主姓名">
+        </el-table-column>
+
+        <el-table-column
+          prop="houseHolderRelation"
+          align="center"
+          label="与户主关系"
+        >
+        </el-table-column>
+
+        <el-table-column fixed="right" label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <!-- <el-button
+              @click="handleWatch(scope.$index)"
+              type="text"
+              size="small"
+              >查看</el-button
+            > -->
+
+            <el-button
+              @click="handleEdit(scope.$index)"
+              type="text"
+              size="small"
+              class="div-table-button--edit"
+              >修改</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>
+          </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>
+
+    <!-- 修改弹出框 -->
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <edit-form
+        ref="eleEditForm"
+        @dialogCancle="handleClose"
+        @dialogOk="handleEditSuccess"
+      ></edit-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import editForm from "./cpts/edit";
+import axios from "axios";
+
+export default {
+  components: { editForm },
+  data() {
+    return {
+      openSearch: false,
+
+      formShow: false,
+      formTitle: "组织信息",
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      tableData: [],
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+
+      fmData: {
+        gridId: "",
+        villageId: "",
+        buildId: "",
+        unitId: "",
+        homeId: "",
+        name: "",
+        mobile: "",
+        idCard: "",
+        welfare: "", //福利0否，1是
+        birthdayStart: "",
+        birthdayEnd: "",
+        birthdayTime: ["", ""],
+      },
+
+      importBtnTitle: "导入",
+      importLoading: false,
+
+      //积分记录
+      scoreDiaTitle: "积分记录",
+      scoreDiaShow: false,
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 360 + this.iframeHeigh
+        : this.clientHeight - 360;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    changeVDisabled() {
+      return !this.form.villageId;
+    },
+    changeBDisabled() {
+      return !this.form.buildId;
+    },
+    changeDDisabled() {
+      return !this.form.unitId;
+    },
+  },
+  watch: {
+    "fmData.birthdayTime": function (val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.fmData.birthdayStart = val[0];
+        this.fmData.birthdayEnd = val[1];
+      } else {
+        this.fmData.birthdayStart = "";
+        this.fmData.birthdayEnd = "";
+      }
+    },
+  },
+  mounted() {
+    this.getGridList();
+    this.getValiheList();
+    this.getTableData();
+  },
+  methods: {
+    handleChangeGrid(val) {
+      console.log("val", val);
+      this.form.villageId = "";
+      this.form.buildId = "";
+      this.form.unitId = "";
+      this.form.homeId = "";
+      this.getValiheList();
+    },
+    handleChangeV(val) {
+      console.log("val", val);
+      this.form.buildId = "";
+      this.form.unitId = "";
+      this.form.homeId = "";
+      this.getBuildList();
+    },
+    handleChangeB(val) {
+      console.log("val", val);
+      this.form.unitId = "";
+      this.form.homeId = "";
+      this.getUniList();
+    },
+    handleChangeD(val) {
+      console.log("val", val);
+      this.form.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.form.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.form.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.form.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.form.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 = "/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) {
+      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 =
+        "/heart/iccommunityselforganization/exportcommunityselforganization";
+      const { pageSize, pageNo, fmData } = this;
+      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("网络错误");
+        });
+    },
+
+    async handleWatch(rowIndex) {
+      this.formShow = true;
+      await nextTick();
+      this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
+    },
+
+    async handleEdit(rowIndex) {
+      this.formShow = true;
+      await nextTick();
+      this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
+    },
+    handleEditSuccess() {
+      this.handleClose();
+      this.getTableData();
+    },
+
+    async handleDel(rowData, rowIndex) {
+      console.log(rowData, rowIndex);
+      const url =
+        "/heart/iccommunityselforganization/delcommunityselforganization";
+      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 getTableData() {
+      const url = "/epmetuser/birth/page";
+      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>
+@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;
+}
+</style>

From 4b1eb2fd5679d1dd8f097307baed35d420d1b60a Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 9 May 2022 15:30:26 +0800
Subject: [PATCH 02/37] 2222222

---
 .../modules/base/huji/chusheng/index.vue      | 142 ++++++++++++++----
 1 file changed, 109 insertions(+), 33 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 5b82941b..3ab387f6 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -13,7 +13,7 @@
               <div class="resi-cell-label">所属网格</div>
               <div class="resi-cell-value">
                 <el-select
-                  v-model.trim="form.gridId"
+                  v-model.trim="fmData.gridId"
                   placeholder="请选择"
                   size="small"
                   clearable
@@ -36,7 +36,7 @@
               <div class="resi-cell-label">所属房屋</div>
               <div class="resi-cell-value">
                 <el-select
-                  v-model.trim="form.villageId"
+                  v-model.trim="fmData.villageId"
                   placeholder="请选择小区"
                   size="small"
                   clearable
@@ -53,7 +53,7 @@
                   </el-option>
                 </el-select>
                 <el-select
-                  v-model.trim="form.buildId"
+                  v-model.trim="fmData.buildId"
                   placeholder="楼号"
                   size="small"
                   clearable
@@ -72,7 +72,7 @@
                   </el-option>
                 </el-select>
                 <el-select
-                  v-model.trim="form.unitId"
+                  v-model.trim="fmData.unitId"
                   :disabled="changeBDisabled"
                   placeholder="单元"
                   size="small"
@@ -91,7 +91,7 @@
                   </el-option>
                 </el-select>
                 <el-select
-                  v-model.trim="form.homeId"
+                  v-model.trim="fmData.homeId"
                   :disabled="changeDDisabled"
                   placeholder="房号"
                   size="small"
@@ -158,14 +158,22 @@
         </el-form-item>
 
         <el-form-item label="享受福利" prop="remark">
-          <el-input
-            v-model="fmData.remark"
-            class="resi-cell-input"
+          <el-select
+            v-model.trim="fmData.welfare"
+            placeholder="享受福利"
             size="small"
             clearable
-            placeholder="请输入"
+            style="width: 120px"
+            class="resi-cell-select"
           >
-          </el-input>
+            <el-option
+              v-for="item in optionsWelfare"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
 
         <el-form-item>
@@ -230,9 +238,9 @@
         class="resi-table"
         :height="maxTableHeight"
       >
-        <el-table-column label="序号" type="index" align="center" width="50" />
+        <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
 
-        <el-table-column prop="name" label="姓名" align="center">
+        <el-table-column prop="name" fixed="left" label="姓名" align="center">
           <template slot-scope="scope">
             <a class="name-a" @click="handleWatch(scope.$index)">
               {{ scope.row.name }}
@@ -249,7 +257,7 @@
         </el-table-column>
 
         <el-table-column
-          prop=""
+          prop="home"
           label="所属房屋"
           align="center"
           :show-overflow-tooltip="true"
@@ -276,10 +284,7 @@
         <el-table-column prop="birthplace" align="center" label="出生地">
         </el-table-column>
 
-        <el-table-column align="center" label="出生人父/母姓名">
-          <template slot-scope="scope">
-            <span> {{ scope.row.father }} / {{ scope.row.mother }} </span>
-          </template>
+        <el-table-column prop="parentName" align="center" label="出生人父/母姓名">
         </el-table-column>
 
         <el-table-column prop="count" align="center" label="胎次">
@@ -396,6 +401,21 @@ export default {
       optionsD: [],
       optionsG: [],
 
+      optionsWelfare: [
+        {
+          value: "",
+          label: "全部",
+        },
+        {
+          value: "1",
+          label: "是",
+        },
+        {
+          value: "0",
+          label: "否",
+        },
+      ],
+
       fmData: {
         gridId: "",
         villageId: "",
@@ -427,13 +447,13 @@ export default {
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
     changeVDisabled() {
-      return !this.form.villageId;
+      return !this.fmData.villageId;
     },
     changeBDisabled() {
-      return !this.form.buildId;
+      return !this.fmData.buildId;
     },
     changeDDisabled() {
-      return !this.form.unitId;
+      return !this.fmData.unitId;
     },
   },
   watch: {
@@ -453,30 +473,43 @@ export default {
     this.getTableData();
   },
   methods: {
-    handleChangeGrid(val) {
-      console.log("val", val);
-      this.form.villageId = "";
+    handleClearVillage() {
       this.form.buildId = "";
+      this.form.homeId = "";
+    },
+    handleClearBuild() {
+      this.form.buildId = "";
+      this.form.unitId = "";
+      this.form.homeId = "";
+    },
+    handleClearDan() {
       this.form.unitId = "";
       this.form.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.form.buildId = "";
-      this.form.unitId = "";
-      this.form.homeId = "";
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
       this.getBuildList();
     },
     handleChangeB(val) {
       console.log("val", val);
-      this.form.unitId = "";
-      this.form.homeId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
       this.getUniList();
     },
     handleChangeD(val) {
       console.log("val", val);
-      this.form.homeId = "";
+      this.fmData.homeId = "";
       this.getHouseList();
     },
 
@@ -503,7 +536,7 @@ export default {
       const { user } = this.$store.state;
       this.$http
         .post("/gov/org/icneighborhood/neighborhoodoption", {
-          gridId: this.form.gridId,
+          gridId: this.fmData.gridId,
           agencyId: "",
           // agencyId: user.agencyId
         })
@@ -522,7 +555,7 @@ export default {
     getBuildList() {
       this.$http
         .post("/gov/org/icbuilding/buildingoption", {
-          neighborHoodId: this.form.villageId,
+          neighborHoodId: this.fmData.villageId,
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
@@ -539,7 +572,7 @@ export default {
     getUniList() {
       this.$http
         .post("/gov/org/icbuildingunit/unitoption", {
-          buildingId: this.form.buildId,
+          buildingId: this.fmData.buildId,
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
@@ -555,7 +588,7 @@ export default {
     },
     getHouseList() {
       this.$http
-        .post("/gov/org/ichouse/houseoption", { unitId: this.form.unitId })
+        .post("/gov/org/ichouse/houseoption", { unitId: this.fmData.unitId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -848,4 +881,47 @@ export default {
   position: relative;
   overflow: visible;
 }
+
+.resi-cell {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+
+  .resi-cell-label {
+    flex-shrink: 0;
+    // min-width: 70px;
+    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: 130px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+}
 </style>

From aa4ae983bf62467e62c6214bab04664d0c83a34c Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 9 May 2022 17:09:14 +0800
Subject: [PATCH 03/37] =?UTF-8?q?=E9=A3=9E=E9=A3=9E=E9=A3=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/huji/chusheng/cpts/edit.vue  | 701 ++++++++++++------
 .../modules/base/huji/chusheng/index.vue      |  38 +-
 2 files changed, 489 insertions(+), 250 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 59ec51c3..b48889af 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -4,14 +4,120 @@
       <el-form
         ref="ref_form"
         :inline="true"
-        :model="dataForm"
+        :model="fmData"
         :rules="dataRule"
         :disabled="formType === 'detail'"
         class="form"
       >
         <el-form-item
-          label="组织名称	"
-          prop="organizationName"
+          label="所属网格	"
+          prop="gridId"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.gridId"
+            placeholder="请选择"
+            size="small"
+            clearable
+            class="resi-cell-select"
+            @change="handleChangeGrid"
+            style="width: 250px"
+          >
+            <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="所属房屋	"
+          prop="homeId"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.villageId"
+            placeholder="请选择小区"
+            size="small"
+            clearable
+            class="resi-cell-select"
+            @clear="handleClearVillage"
+            @change="handleChangeV"
+            style="margin-right: 8px; width: 120px"
+          >
+            <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
+            style="margin-right: 8px; width: 120px"
+            class="resi-cell-select"
+            :disabled="changeVDisabled"
+            @clear="handleClearBuild"
+            @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"
+            :disabled="changeBDisabled"
+            placeholder="单元"
+            size="small"
+            clearable
+            style="margin-right: 8px; width: 120px"
+            class="resi-cell-select"
+            @click="handleClearDan"
+            @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"
+            :disabled="changeDDisabled"
+            placeholder="房号"
+            size="small"
+            clearable
+            style="width: 120px"
+            class="resi-cell-select"
+          >
+            <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"
           label-width="150px"
           style="display: block"
         >
@@ -19,15 +125,15 @@
             class="item_width_1"
             maxlength="50"
             show-word-limit
-            placeholder="请输入组织名称	"
-            v-model="dataForm.organizationName"
+            placeholder="请输入姓名	"
+            v-model="fmData.name"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-          label="组织人数	"
-          prop="organizationPersonCount"
+          label="手机号"
+          prop="mobile"
           label-width="150px"
           style="display: block"
         >
@@ -36,75 +142,84 @@
             type="number"
             maxlength="50"
             show-word-limit
-            placeholder="请输入组织人数	"
-            v-model="dataForm.organizationPersonCount"
+            placeholder="请输入手机号	"
+            v-model="fmData.mobile"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-          label="组织成员	"
-          prop="organizationPersonnel"
+          label="身份证号"
+          prop="idCard"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入身份证号"
+            v-model="fmData.idCard"
+            @blur="handleBlurId"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="性别"
+          prop="principalName"
           label-width="150px"
           style="display: block"
         >
-          <div class="m-staffs">
-            <div
-              class="item"
-              :key="'staff' + index"
-              v-for="(item, index) in dataForm.organizationPersonnel"
+          <el-select
+            v-model.trim="fmData.gender"
+            placeholder="性别"
+            size="small"
+            clearable
+            style="width: 120px"
+            class="resi-cell-select"
+          >
+            <el-option
+              v-for="item in optionsGender"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             >
-              <el-input
-                class="item_width_1"
-                maxlength="50"
-                show-word-limit
-                placeholder="成员姓名"
-                v-model="item.personName"
-              />
-
-              <el-input
-                style="margin-left: 10px"
-                class="item_width_1"
-                maxlength="50"
-                show-word-limit
-                placeholder="联系电话"
-                v-model="item.personPhone"
-              />
-
-              <el-button
-                style="margin-left: 10px"
-                size="small"
-                @click="handleDelStaff(index)"
-                >删除</el-button
-              >
-            </div>
-
-            <div class="item-add">
-              <el-button size="small" @click="handleAddStaff">添加</el-button>
-            </div>
-          </div>
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
+          label="出生日期"
+          prop="birthday"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-date-picker
+            v-model="fmData.birthday"
+            type="date"
+            placeholder="出生日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
         </el-form-item>
 
         <el-form-item
-          label="服务事项"
-          prop="serviceItem"
+          label="出生地"
+          prop="birthplace"
           label-width="150px"
           style="display: block"
         >
           <el-input
             class="item_width_1"
-            type="textarea"
-            maxlength="1000"
+            maxlength="50"
             show-word-limit
-            :rows="3"
-            placeholder="请输入服务事项，不超过1000字"
-            v-model="dataForm.serviceItem"
-          ></el-input>
+            placeholder="请输入出生地"
+            v-model="fmData.birthplace"
+          >
+          </el-input>
         </el-form-item>
 
         <el-form-item
-          label="负责人	"
-          prop="principalName"
+          label="出生人父亲姓名"
+          prop="father"
           label-width="150px"
           style="display: block"
         >
@@ -112,15 +227,15 @@
             class="item_width_1"
             maxlength="50"
             show-word-limit
-            placeholder="请输入负责人	"
-            v-model="dataForm.principalName"
+            placeholder="请输入出生人父亲姓名"
+            v-model="fmData.father"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-          label="联系电话	"
-          prop="principalPhone"
+          label="出生人母亲姓名"
+          prop="mother"
           label-width="150px"
           style="display: block"
         >
@@ -128,70 +243,82 @@
             class="item_width_1"
             maxlength="50"
             show-word-limit
-            placeholder="请输入联系电话	"
-            v-model="dataForm.principalPhone"
+            placeholder="请输入出生人母亲姓名"
+            v-model="fmData.mother"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
-          label="创建时间"
-          prop="organizationCreatedTime"
+          label="胎次"
+          prop="count"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input-number
+            v-model="fmData.count"
+            :min="1"
+            :max="50"
+            label="请输入胎次"
+          ></el-input-number>
+        </el-form-item>
+
+        <el-form-item
+          label="申报户口日期"
+          prop="reportDate"
           label-width="150px"
           style="display: block"
         >
           <el-date-picker
-            v-model="dataForm.organizationCreatedTime"
-            placeholder="创建时间"
+            v-model="fmData.reportDate"
+            placeholder="申报户口日期"
             value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
 
         <el-form-item
-          label="位置坐标"
-          prop="longitude"
+          label="户主姓名"
+          prop="houseHolderName"
           label-width="150px"
           style="display: block"
         >
-          <div style="width: 500px">
-            <el-input
-              class="item_width_4"
-              maxlength="50"
-              placeholder="请输入关键字"
-              v-model="dataForm.address"
-            >
-            </el-input>
-            <el-button
-              style="margin-left: 10px"
-              type="primary"
-              size="small"
-              @click="handleSearchMap"
-              >查询</el-button
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入户主姓名"
+            v-model="fmData.houseHolderName"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="与户主关系"
+          prop="houseHolderRelation"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.houseHolderRelation"
+            placeholder="与户主关系"
+            size="small"
+            clearable
+            style="width: 120px"
+            class="resi-cell-select"
+          >
+            <el-option
+              v-for="item in optionsRelation"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             >
-            <div id="app" class="div_map"></div>
-            <div style="margin-top: 10px">
-              <span>经度</span>
-              <el-input
-                class="item_width_3"
-                maxlength="50"
-                placeholder="请输入经度"
-                v-model="dataForm.longitude"
-              >
-              </el-input>
-              <span style="margin-left: 20px">纬度</span>
-              <el-input
-                class="item_width_3"
-                maxlength="50"
-                placeholder="请输入纬度"
-                v-model="dataForm.latitude"
-              >
-              </el-input>
-            </div>
-          </div>
+            </el-option>
+          </el-select>
         </el-form-item>
 
         <el-form-item
+          v-if="false"
           label="备注"
           prop="remark"
           label-width="150px"
@@ -204,7 +331,7 @@
             show-word-limit
             :rows="3"
             placeholder="请输入备注，不超过500字"
-            v-model="dataForm.remark"
+            v-model="fmData.remark"
           ></el-input>
         </el-form-item>
       </el-form>
@@ -228,6 +355,8 @@ import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import formVltHelper from "dai-js/tools/formVltHelper";
+import { computedCard } from "@/utils/index";
+import { isCard, isMobile } from "@/utils/validate";
 
 var map;
 var search;
@@ -235,6 +364,28 @@ var markers;
 var infoWindowList;
 let loading; // 加载动画
 
+function iniFmData() {
+  return {
+    gridId: "",
+    villageId: "",
+    buildId: "",
+    unitId: "",
+    homeId: "",
+    name: "",
+    mobile: "",
+    idCard: "",
+    welfare: "", //福利0否，1是
+    gender: "",
+    birthplace: "",
+    father: "",
+    mother: "",
+    count: "",
+    reportDate: "",
+    houseHolderName: "",
+    houseHolderRelation: "",
+  };
+}
+
 export default {
   data() {
     return {
@@ -242,149 +393,243 @@ export default {
 
       btnDisable: false,
 
-      orgId: "",
-      dataForm: {
-        organizationName: "",
-        serviceItem: "",
-        organizationPersonCount: "",
-        principalName: "",
-        principalPhone: "",
-        organizationCreatedTime: "",
-        address: "",
-        remark: "",
-        longitude: "",
-        latitude: "",
-        organizationPersonnel: [],
-      },
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+      optionsGender: [
+        {
+          value: "1",
+          label: "男",
+        },
+        {
+          value: "2",
+          label: "女",
+        },
+      ],
+      optionsRelation: [],
+
+      fmData: iniFmData(),
     };
   },
   components: {},
   computed: {
     dataRule() {
+      let checkIdCard = (rule, value, callback) => {
+        if (value === "") {
+          callback(new Error("请输入身份证"));
+        } else {
+          if (!isCard(value)) {
+            callback(new Error("身份证号格式不正确"));
+          }
+          callback();
+        }
+      };
+
       return {
-        organizationName: [
-          { required: true, message: "组织名称	不能为空", trigger: "blur" },
-          {
-            min: 1,
-            max: 50,
-            message: "组织名称	长度在 1 到 50个字符",
-            trigger: "blur",
-          },
-        ],
-        organizationPersonCount: [
-          { required: true, message: "组织人数不能为空", trigger: "blur" },
-        ],
-        serviceItem: [
-          { required: true, message: "服务事项不能为空", trigger: "blur" },
+        gridId: [
+          { required: true, message: "所属网格不能为空", trigger: "blur" },
         ],
-        principalName: [
-          { required: true, message: "负责人不能为空", trigger: "blur" },
+        homeId: [
+          { required: true, message: "所属房屋不能为空", trigger: "blur" },
         ],
-        principalPhone: [
-          { required: true, message: "联系电话不能为空", trigger: "blur" },
+        name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
+        idCard: [
+          { required: true, message: "身份证号不能为空", trigger: "blur" },
+          { required: true, validator: checkIdCard, trigger: "blur" },
         ],
-        longitude: [
-          { required: true, message: "位置坐标不能为空", trigger: "blur" },
+        birthplace: [
+          { required: true, message: "出生地不能为空", trigger: "blur" },
         ],
       };
     },
+
+    changeVDisabled() {
+      return !this.fmData.villageId;
+    },
+    changeBDisabled() {
+      return !this.fmData.buildId;
+    },
+    changeDDisabled() {
+      return !this.fmData.unitId;
+    },
   },
   props: {},
   watch: {},
 
   async mounted() {
-    this.initMap();
+    this.getGridList();
+    this.getValiheList();
+    this.getRelationList();
   },
 
   methods: {
-    handleAddStaff() {
-      this.dataForm.organizationPersonnel = [
-        ...this.dataForm.organizationPersonnel,
-        { personName: "", personPhone: "" },
-      ];
+    handleBlurId() {
+      console.log("33333333333333333333");
+      const { sex, birth, age } = computedCard(this.fmData.idCard);
+      this.fmData.birthday = birth;
+      this.fmData.gender = sex == 1 ? "1" : "2";
     },
-    handleDelStaff(index) {
-      const { organizationPersonnel } = this.dataForm;
-      organizationPersonnel.splice(index, 1);
-      this.dataForm.organizationPersonnel = organizationPersonnel;
-    },
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap() {
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519);
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById("app"), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45, // 设置地图旋转角度
-      });
 
-      search = new window.TMap.service.Search({ pageSize: 10 });
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: [],
-      });
-      infoWindowList = Array(10);
-
-      // 监听地图平移结束
-      map.on("panend", () => {
-        this.handleMoveCenter();
-      });
-      this.handleMoveCenter();
+    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();
     },
 
-    setMarker(lat, lng) {
-      markers.setGeometries([]);
-      markers.add([
-        {
-          id: "4",
-          styleId: "marker",
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: "marker4",
-          },
-        },
-      ]);
+    getRelationList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/sys/dict/data/relationship", {
+          formCode: "resi_base_info",
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsRelation = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
     },
 
-    handleSearchMap() {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close();
-      });
-      infoWindowList.length = 0;
-      markers.setGeometries([]);
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchRectangle({
-          keyword: this.dataForm.address,
-          bounds: map.getBounds(),
+    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((result) => {
-          let { data } = result;
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng },
-            } = data[0];
-            map.setCenter(new TMap.LatLng(lat, lng));
-            this.setMarker(lat, lng);
-            this.dataForm.latitude = lat;
-            this.dataForm.longitude = lng;
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
           } else {
-            this.$message.error("未检索到相关位置坐标");
+            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("网络错误");
         });
     },
 
-    handleMoveCenter() {
-      //修改地图中心点
-      const center = map.getCenter();
-      const lat = center.getLat();
-      const lng = center.getLng();
-      this.dataForm.latitude = lat;
-      this.dataForm.longitude = lng;
-      this.setMarker(lat, lng);
+    handleAddStaff() {
+      this.fmData.organizationPersonnel = [
+        ...this.fmData.organizationPersonnel,
+        { personName: "", personPhone: "" },
+      ];
+    },
+    handleDelStaff(index) {
+      const { organizationPersonnel } = this.fmData;
+      organizationPersonnel.splice(index, 1);
+      this.fmData.organizationPersonnel = organizationPersonnel;
     },
 
     async initForm(type, row) {
@@ -393,9 +638,7 @@ export default {
       this.formType = type;
       console.log(row);
       if (row) {
-        this.dataForm = { ...this.dataForm, ...row };
-        this.orgId = this.dataForm.orgId;
-        map.setCenter(new TMap.LatLng(row.latitude, row.longitude));
+        this.fmData = { ...this.fmData, ...row };
       }
     },
 
@@ -409,7 +652,7 @@ export default {
           app.util.validateRule(messageObj);
           this.btnDisable = false;
         } else {
-          if (!formVltHelper.userOrMobile(this.dataForm.principalPhone)) {
+          if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
             return this.$message({
               type: "error",
               message: "手机号格式有误",
@@ -423,16 +666,14 @@ export default {
     async submit() {
       let url = "";
       if (this.formType === "add") {
-        url = "/heart/iccommunityselforganization/addcommunityselforganization";
-        // url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
+        url = "/epmetuser/birth/save";
       } else {
-        url =
-          "/heart/iccommunityselforganization/editcommunityselforganization";
+        url = "/epmetuser/birth/edit";
 
-        this.dataForm.orgId = this.orgId;
+        this.fmData.orgId = this.orgId;
       }
 
-      const { data, code, msg } = await requestPost(url, this.dataForm);
+      const { data, code, msg } = await requestPost(url, this.fmData);
 
       if (code === 0) {
         this.$message({
@@ -454,19 +695,7 @@ export default {
     },
     resetData() {
       this.orgId = "";
-      this.dataForm = {
-        organizationName: "",
-        serviceItem: "",
-        organizationPersonCount: "",
-        principalName: "",
-        principalPhone: "",
-        organizationCreatedTime: "",
-        address: "",
-        remark: "",
-        longitude: "",
-        latitude: "",
-        organizationPersonnel: [],
-      };
+      this.fmData = iniFmData();
     },
     // 开启加载动画
     startLoading() {
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 3ab387f6..4055aefc 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -195,7 +195,7 @@
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
         <el-button class="diy-button--add" size="small" @click="handleAdd"
-          >新增</el-button
+          >出生登记</el-button
         >
         <el-button
           v-if="false"
@@ -238,7 +238,13 @@
         class="resi-table"
         :height="maxTableHeight"
       >
-        <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
+        <el-table-column
+          label="序号"
+          fixed="left"
+          type="index"
+          align="center"
+          width="50"
+        />
 
         <el-table-column prop="name" fixed="left" label="姓名" align="center">
           <template slot-scope="scope">
@@ -284,7 +290,11 @@
         <el-table-column prop="birthplace" align="center" label="出生地">
         </el-table-column>
 
-        <el-table-column prop="parentName" align="center" label="出生人父/母姓名">
+        <el-table-column
+          prop="parentName"
+          align="center"
+          label="出生人父/母姓名"
+        >
         </el-table-column>
 
         <el-table-column prop="count" align="center" label="胎次">
@@ -387,7 +397,7 @@ export default {
       openSearch: false,
 
       formShow: false,
-      formTitle: "组织信息",
+      formTitle: "出生登记",
 
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
@@ -474,17 +484,17 @@ export default {
   },
   methods: {
     handleClearVillage() {
-      this.form.buildId = "";
-      this.form.homeId = "";
+      this.fmData.buildId = "";
+      this.fmData.homeId = "";
     },
     handleClearBuild() {
-      this.form.buildId = "";
-      this.form.unitId = "";
-      this.form.homeId = "";
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
     },
     handleClearDan() {
-      this.form.unitId = "";
-      this.form.homeId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
     },
     handleChangeGrid(val) {
       console.log("val", val);
@@ -882,14 +892,14 @@ export default {
   overflow: visible;
 }
 
-.resi-cell {
+.demo-form-inline .resi-cell {
   display: flex;
   align-items: center;
-  margin-bottom: 20px;
+  // margin-bottom: 20px;
 
   .resi-cell-label {
     flex-shrink: 0;
-    // min-width: 70px;
+    min-width: 0;
     box-sizing: border-box;
     margin-right: 15px;
     // text-align: right;

From 98c51e155dd453f7f679af8de645e980b9d960a6 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 9 May 2022 18:05:24 +0800
Subject: [PATCH 04/37] =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/huji/chusheng/cpts/edit.vue  | 37 ++++++++++++++
 .../modules/base/huji/chusheng/index.vue      | 48 +++++++++----------
 2 files changed, 61 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index b48889af..85fe68b6 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -102,6 +102,7 @@
             placeholder="房号"
             size="small"
             clearable
+            @change="handleChangeH"
             style="width: 120px"
             class="resi-cell-select"
           >
@@ -125,10 +126,14 @@
             class="item_width_1"
             maxlength="50"
             show-word-limit
+            style="width: 200px;margin-right:20px;"
             placeholder="请输入姓名	"
             v-model="fmData.name"
           >
           </el-input>
+
+          <el-checkbox v-model="fmData.welfare" true-label="1" false-label="0" >享受福利</el-checkbox>
+          <el-checkbox v-model="fmData.isResiUser" true-label="1" false-label="0">补充居民信息</el-checkbox>
         </el-form-item>
 
         <el-form-item
@@ -288,6 +293,7 @@
             maxlength="50"
             show-word-limit
             placeholder="请输入户主姓名"
+            :disabled="fmData.alreadyHaveMaster"
             v-model="fmData.houseHolderName"
           >
           </el-input>
@@ -375,6 +381,7 @@ function iniFmData() {
     mobile: "",
     idCard: "",
     welfare: "", //福利0否，1是
+    isResiUser: "",
     gender: "",
     birthplace: "",
     father: "",
@@ -383,6 +390,7 @@ function iniFmData() {
     reportDate: "",
     houseHolderName: "",
     houseHolderRelation: "",
+    alreadyHaveMaster: false,
   };
 }
 
@@ -511,6 +519,10 @@ export default {
       this.fmData.homeId = "";
       this.getHouseList();
     },
+    handleChangeH(val) {
+      console.log("val", val);
+      this.getHouseMaster();
+    },
 
     getRelationList() {
       const { user } = this.$store.state;
@@ -620,6 +632,31 @@ export default {
         });
     },
 
+    getHouseMaster() {
+      const { homeId } = this.fmData;
+      if (!homeId) return (this.alreadyHaveMaster = false);
+
+      this.$http
+        .post("/epmetuser/icresiuser/queryhousehold/" + homeId, {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取户主信息成功", res.data);
+            const { name } = res.data;
+            if (name) {
+              this.fmData.houseHolderName = name;
+              this.alreadyHaveMaster = true;
+            } else {
+              this.alreadyHaveMaster = false;
+            }
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+
     handleAddStaff() {
       this.fmData.organizationPersonnel = [
         ...this.fmData.organizationPersonnel,
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 4055aefc..aa54ff43 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -9,15 +9,15 @@
       >
         <el-row class="resi-row">
           <el-col :span="6">
-            <div class="resi-cell">
-              <div class="resi-cell-label">所属网格</div>
-              <div class="resi-cell-value">
+            <div class="resi-cell2">
+              <div class="resi-cell2-label">所属网格</div>
+              <div class="resi-cell2-value">
                 <el-select
                   v-model.trim="fmData.gridId"
                   placeholder="请选择"
                   size="small"
                   clearable
-                  class="resi-cell-select"
+                  class="resi-cell2-select"
                   @change="handleChangeGrid"
                 >
                   <el-option
@@ -32,15 +32,15 @@
             </div>
           </el-col>
           <el-col :span="18">
-            <div class="resi-cell">
-              <div class="resi-cell-label">所属房屋</div>
-              <div class="resi-cell-value">
+            <div class="resi-cell2">
+              <div class="resi-cell2-label">所属房屋</div>
+              <div class="resi-cell2-value">
                 <el-select
                   v-model.trim="fmData.villageId"
                   placeholder="请选择小区"
                   size="small"
                   clearable
-                  class="resi-cell-select"
+                  class="resi-cell2-select"
                   @clear="handleClearVillage"
                   @change="handleChangeV"
                 >
@@ -58,7 +58,7 @@
                   size="small"
                   clearable
                   style="width: 120px"
-                  class="resi-cell-select"
+                  class="resi-cell2-select"
                   :disabled="changeVDisabled"
                   @clear="handleClearBuild"
                   @change="handleChangeB"
@@ -78,7 +78,7 @@
                   size="small"
                   clearable
                   style="width: 120px"
-                  class="resi-cell-select"
+                  class="resi-cell2-select"
                   @click="handleClearDan"
                   @change="handleChangeD"
                 >
@@ -97,7 +97,7 @@
                   size="small"
                   clearable
                   style="width: 120px"
-                  class="resi-cell-select"
+                  class="resi-cell2-select"
                 >
                   <el-option
                     v-for="item in optionsH"
@@ -115,7 +115,7 @@
         <el-form-item label="姓名" prop="name">
           <el-input
             v-model="fmData.name"
-            class="resi-cell-input"
+            class="resi-cell2-input"
             size="small"
             clearable
             placeholder="请输入"
@@ -126,7 +126,7 @@
         <el-form-item label="手机号" prop="mobile">
           <el-input
             v-model="fmData.mobile"
-            class="resi-cell-input"
+            class="resi-cell2-input"
             size="small"
             clearable
             placeholder="请输入"
@@ -137,7 +137,7 @@
         <el-form-item label="身份证号" prop="idCard">
           <el-input
             v-model="fmData.idCard"
-            class="resi-cell-input"
+            class="resi-cell2-input"
             size="small"
             clearable
             placeholder="请输入"
@@ -164,7 +164,7 @@
             size="small"
             clearable
             style="width: 120px"
-            class="resi-cell-select"
+            class="resi-cell2-select"
           >
             <el-option
               v-for="item in optionsWelfare"
@@ -892,12 +892,12 @@ export default {
   overflow: visible;
 }
 
-.demo-form-inline .resi-cell {
+.demo-form-inline .resi-cell2 {
   display: flex;
   align-items: center;
-  // margin-bottom: 20px;
+  margin-bottom: 20px;
 
-  .resi-cell-label {
+  .resi-cell2-label {
     flex-shrink: 0;
     min-width: 0;
     box-sizing: border-box;
@@ -905,21 +905,21 @@ export default {
     // text-align: right;
     // line-height: 32;
   }
-  .resi-cell-label1 {
+  .resi-cell2-label1 {
     width: max-content;
   }
-  .resi-cell-value-radio {
+  .resi-cell2-value-radio {
     display: flex;
     align-items: center;
     min-height: 32px;
   }
-  .resi-cell-input {
+  .resi-cell2-input {
     width: 200px;
   }
-  .resi-cell--daterange {
+  .resi-cell2--daterange {
     max-width: 260px;
   }
-  .resi-cell-select {
+  .resi-cell2-select {
     width: 200px;
     box-sizing: border-box;
     margin-right: 10px;
@@ -930,7 +930,7 @@ export default {
       width: 88px;
     }
   }
-  .resi-cell-select:last-child {
+  .resi-cell2-select:last-child {
     margin-right: 0;
   }
 }

From a0c2b2ce9c85e0d3fbcd3efb0f982cde7cab10b4 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 10 May 2022 09:02:38 +0800
Subject: [PATCH 05/37] 1

---
 .../base/houseChange/houseChangeList.vue      | 570 ++++++++++++++++++
 1 file changed, 570 insertions(+)
 create mode 100644 src/views/modules/base/houseChange/houseChangeList.vue

diff --git a/src/views/modules/base/houseChange/houseChangeList.vue b/src/views/modules/base/houseChange/houseChangeList.vue
new file mode 100644
index 00000000..b37d403a
--- /dev/null
+++ b/src/views/modules/base/houseChange/houseChangeList.vue
@@ -0,0 +1,570 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
+        <div>
+
+          <el-form-item label="所属网格"
+                        prop="gridId">
+            <el-select class="item_width_1"
+                       v-model="formData.gridId"
+                       placeholder="全部"
+                       size="small"
+                       @change="handleChangeG"
+                       clearable>
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </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="formData.villageId"
+                             :disabled="!this.formData.gridId"
+                             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="formData.buildId"
+                             placeholder="楼号"
+                             :disabled="!this.formData.villageId"
+                             size="small"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             @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="formData.unitId"
+                             placeholder="单元"
+                             size="small"
+                             :disabled="!this.formData.buildId"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             @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="formData.homeId"
+                             placeholder="房号"
+                             :disabled="!this.formData.unitId"
+                             size="small"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1">
+                    <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="startTime">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="daterange"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            @change="handleTimeChange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
+          </el-form-item>
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+
+      <el-table ref="ref_table"
+                class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="name"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="90">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="idCard"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         width="170">
+        </el-table-column>
+        <el-table-column prop="allName"
+                         header-align="center"
+                         align="center"
+                         label="所属房屋"
+                         min-width="200">
+        </el-table-column>
+        <el-table-column prop="reason"
+                         header-align="center"
+                         align="center"
+                         label="关注原因"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="remark"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="备注"
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="lastInformTime"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="最后一次通知时间"
+                         width="170">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-popover popper-class="btn-popper"
+                        placement="bottom"
+                        style="margin-left:10px"
+                        width="20"
+                        trigger="hover">
+              <div class="table-more-btn">
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleNoticeList(scope.row)">通知记录</el-button>
+              </div>
+
+              <div class="table-more-btn">
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleVisiteList(scope.row) ">随访记录</el-button>
+              </div>
+
+              <el-button type="text"
+                         size="small"
+                         class="div-table-button--more"
+                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
+            </el-popover>
+
+          </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>
+
+  </div>
+</template>
+
+<script>
+
+
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 1,
+      tableLoading: false,
+
+      // formData: {
+      //   attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
+      //   name: '',
+      //   mobile: '',
+      //   idCard: '',
+      //   remark: '',
+      //   reason: '',
+
+      // },
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+
+
+      tableData: [],
+
+      agencyId: '',
+      gridList: [],//所属网格list--场所区域
+      timeRange: [],
+      formData: {
+        gridId: '',//所属网格【网格Id】
+        villageId: '',
+        buildId: '',
+        unitId: '',
+        homeId: '',
+        startTime: '',
+        endTime: '',
+      }
+
+
+    }
+  },
+  components: {
+
+  },
+  async created () {
+
+  },
+  activated () {
+    this.$refs['ref_table'].doLayout()
+  },
+  async mounted () {
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+
+      this.loadTable()
+    },
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/epmetuser/icEpidemicSpecialAttention/list"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+        this.analysisTableSelection()
+        this.tableData.forEach(item => {
+          if (!item.allName) {
+            item.allName = '--'
+          }
+          item.roomShow = ''
+          if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) {
+            item.roomShow = '--'
+          } else {
+            if (item.villageName) {
+              item.roomShow = item.roomShow + item.villageName
+            }
+            if (item.buildName) {
+              item.roomShow = item.roomShow + item.buildName
+            }
+            if (item.unitName) {
+              item.roomShow = item.roomShow + item.unitName
+            }
+            if (item.villageName) {
+              item.roomShow = item.roomShow + item.homeName
+            }
+          }
+
+
+        });
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+
+    handleChangeG (val) {
+      console.log('val', val)
+      this.formData.villageId = ''
+      this.formData.buildId = ''
+      this.formData.unitId = ''
+      this.formData.homeId = ''
+      this.getValiheList()
+      this.getBuildList()
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeV (val) {
+      console.log('val', val)
+      this.formData.buildId = ''
+      this.formData.unitId = ''
+      this.formData.homeId = ''
+      this.getBuildList()
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeB (val) {
+      console.log('val', val)
+      this.formData.unitId = ''
+      this.formData.homeId = ''
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeD () {
+      this.formData.homeId = ''
+      this.getHouseList()
+    },
+
+    getValiheList () {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId, 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.formData.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.formData.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.formData.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('网络错误')
+        })
+    },
+
+    handleTimeChange (time) {
+      if (time) {
+        const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+        const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+
+        this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+        this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+
+        // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+        // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      } else {
+        this.formData.startTime = ''
+        this.formData.endTime = ''
+        // this.startTimeShow = ''
+        // this.endTimeShow = ''
+      }
+
+    },
+
+
+
+
+    //重置搜索条件
+    resetSearch () {
+      this.timeRange = []
+      this.formData = {
+        attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
+        name: '',
+        mobile: '',
+        idCard: '',
+        vaccinationCount: '',
+      }
+
+      this.pageNo = 1
+      // 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 () {
+      return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
+

From 60d6243a12bb65074eefcfb40c40d517f6666118 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 10 May 2022 09:32:32 +0800
Subject: [PATCH 06/37] 33

---
 .../modules/base/huji/chusheng/cpts/edit.vue  | 51 ++++++++++++++++---
 1 file changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 85fe68b6..9471fecd 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -126,14 +126,22 @@
             class="item_width_1"
             maxlength="50"
             show-word-limit
-            style="width: 200px;margin-right:20px;"
+            style="width: 200px; margin-right: 20px"
             placeholder="请输入姓名	"
             v-model="fmData.name"
           >
           </el-input>
 
-          <el-checkbox v-model="fmData.welfare" true-label="1" false-label="0" >享受福利</el-checkbox>
-          <el-checkbox v-model="fmData.isResiUser" true-label="1" false-label="0">补充居民信息</el-checkbox>
+          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0"
+            >享受福利</el-checkbox
+          >
+          <el-checkbox
+            v-model="fmData.isResiUser"
+            true-label="1"
+            false-label="0"
+            @change="checkResiAvailable"
+            >补充居民信息</el-checkbox
+          >
         </el-form-item>
 
         <el-form-item
@@ -380,8 +388,8 @@ function iniFmData() {
     name: "",
     mobile: "",
     idCard: "",
-    welfare: "", //福利0否，1是
-    isResiUser: "",
+    isWelfare: "0", //福利0否，1是
+    isResiUser: "0",
     gender: "",
     birthplace: "",
     father: "",
@@ -473,11 +481,38 @@ export default {
   },
 
   methods: {
+    async checkResiAvailable() {
+      const {
+        fmData: { idCard, isResiUser },
+      } = this;
+      if (isResiUser == "1" && isCard(idCard)) {
+        const { data, code, msg } = await requestPost(
+          "/epmetuser/icresiuser/checkuser",
+          {
+            idCard,
+            agencyId: this.$store.state.user.agencyId,
+          }
+        );
+        if (code === 0) {
+          if (!data.moveInstatus) {
+            this.$message({
+              type: "error",
+              message: `请联系${data.resiAgencyName}迁出该居民后操作`,
+            });
+          }
+        } else {
+          this.$message.error(msg);
+        }
+      }
+    },
+
     handleBlurId() {
-      console.log("33333333333333333333");
       const { sex, birth, age } = computedCard(this.fmData.idCard);
-      this.fmData.birthday = birth;
-      this.fmData.gender = sex == 1 ? "1" : "2";
+      if (birth) {
+        this.fmData.birthday = birth;
+        this.fmData.gender = sex == 1 ? "1" : "2";
+        this.checkResiAvailable();
+      }
     },
 
     handleClearVillage() {

From 57609aec88871ef4eed226993c60dacade32c701 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 10 May 2022 10:34:32 +0800
Subject: [PATCH 07/37] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/huji/chusheng/cpts/edit.vue  | 63 +++++++++----------
 .../modules/base/huji/chusheng/index.vue      | 13 ++--
 2 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 9471fecd..96c2ecdc 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -136,7 +136,7 @@
             >享受福利</el-checkbox
           >
           <el-checkbox
-            v-model="fmData.isResiUser"
+            v-model="fmData.isCheck"
             true-label="1"
             false-label="0"
             @change="checkResiAvailable"
@@ -292,7 +292,7 @@
 
         <el-form-item
           label="户主姓名"
-          prop="houseHolderName"
+          prop="householderName"
           label-width="150px"
           style="display: block"
         >
@@ -302,19 +302,19 @@
             show-word-limit
             placeholder="请输入户主姓名"
             :disabled="fmData.alreadyHaveMaster"
-            v-model="fmData.houseHolderName"
+            v-model="fmData.householderName"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
           label="与户主关系"
-          prop="houseHolderRelation"
+          prop="householderRelation"
           label-width="150px"
           style="display: block"
         >
           <el-select
-            v-model.trim="fmData.houseHolderRelation"
+            v-model.trim="fmData.householderRelation"
             placeholder="与户主关系"
             size="small"
             clearable
@@ -365,21 +365,17 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import formVltHelper from "dai-js/tools/formVltHelper";
 import { computedCard } from "@/utils/index";
-import { isCard, isMobile } from "@/utils/validate";
+import { isCard } from "@/utils/validate";
 
-var map;
-var search;
-var markers;
-var infoWindowList;
 let loading; // 加载动画
 
 function iniFmData() {
   return {
+    id: "",
     gridId: "",
     villageId: "",
     buildId: "",
@@ -389,15 +385,15 @@ function iniFmData() {
     mobile: "",
     idCard: "",
     isWelfare: "0", //福利0否，1是
-    isResiUser: "0",
+    isCheck: "0",
     gender: "",
     birthplace: "",
     father: "",
     mother: "",
     count: "",
     reportDate: "",
-    houseHolderName: "",
-    houseHolderRelation: "",
+    householderName: "",
+    householderRelation: "",
     alreadyHaveMaster: false,
   };
 }
@@ -483,9 +479,9 @@ export default {
   methods: {
     async checkResiAvailable() {
       const {
-        fmData: { idCard, isResiUser },
+        fmData: { idCard, isCheck },
       } = this;
-      if (isResiUser == "1" && isCard(idCard)) {
+      if (isCheck == "1" && isCard(idCard)) {
         const { data, code, msg } = await requestPost(
           "/epmetuser/icresiuser/checkuser",
           {
@@ -680,7 +676,7 @@ export default {
             console.log("获取户主信息成功", res.data);
             const { name } = res.data;
             if (name) {
-              this.fmData.houseHolderName = name;
+              this.fmData.householderName = name;
               this.alreadyHaveMaster = true;
             } else {
               this.alreadyHaveMaster = false;
@@ -692,25 +688,28 @@ export default {
         });
     },
 
-    handleAddStaff() {
-      this.fmData.organizationPersonnel = [
-        ...this.fmData.organizationPersonnel,
-        { personName: "", personPhone: "" },
-      ];
-    },
-    handleDelStaff(index) {
-      const { organizationPersonnel } = this.fmData;
-      organizationPersonnel.splice(index, 1);
-      this.fmData.organizationPersonnel = organizationPersonnel;
-    },
-
     async initForm(type, row) {
       this.$refs.ref_form.resetFields();
 
       this.formType = type;
       console.log(row);
       if (row) {
-        this.fmData = { ...this.fmData, ...row };
+        // this.fmData = { ...this.fmData, ...row };
+        this.getInfo(row.id);
+      }
+    },
+
+    async getInfo(id) {
+      const { data, code, msg } = await requestPost(
+        "/epmetuser/icBirthRecord",
+        {
+          id,
+        }
+      );
+      if (code === 0) {
+        this.fmData = { ...this.fmData, ...data };
+      } else {
+        this.$message.error(msg);
       }
     },
 
@@ -738,9 +737,9 @@ export default {
     async submit() {
       let url = "";
       if (this.formType === "add") {
-        url = "/epmetuser/birth/save";
+        url = "/epmetuser/icBirthRecord/save";
       } else {
-        url = "/epmetuser/birth/edit";
+        url = "/epmetuser/icBirthRecord/update";
 
         this.fmData.orgId = this.orgId;
       }
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index aa54ff43..bdf9db96 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -159,7 +159,7 @@
 
         <el-form-item label="享受福利" prop="remark">
           <el-select
-            v-model.trim="fmData.welfare"
+            v-model.trim="fmData.isWelfare"
             placeholder="享受福利"
             size="small"
             clearable
@@ -303,11 +303,11 @@
         <el-table-column prop="reportDate" align="center" label="申报户口日期">
         </el-table-column>
 
-        <el-table-column prop="houseHolderName" align="center" label="户主姓名">
+        <el-table-column prop="householderName" align="center" label="户主姓名">
         </el-table-column>
 
         <el-table-column
-          prop="houseHolderRelation"
+          prop="householderRelation"
           align="center"
           label="与户主关系"
         >
@@ -435,7 +435,7 @@ export default {
         name: "",
         mobile: "",
         idCard: "",
-        welfare: "", //福利0否，1是
+        isWelfare: "", //福利0否，1是
         birthdayStart: "",
         birthdayEnd: "",
         birthdayTime: ["", ""],
@@ -764,8 +764,7 @@ export default {
     },
 
     async handleChu() {
-      const url =
-        "/heart/iccommunityselforganization/exportcommunityselforganization";
+      const url = "/epmetuser/icBirthRecord/export";
       const { pageSize, pageNo, fmData } = this;
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
@@ -834,7 +833,7 @@ export default {
     },
 
     async getTableData() {
-      const url = "/epmetuser/birth/page";
+      const url = "/epmetuser/icBirthRecord/page";
       const { pageSize, pageNo, fmData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,

From 32825910272f023a65431580c54b429e606b880f Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 10 May 2022 15:42:54 +0800
Subject: [PATCH 08/37] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../houseChange/houseChangeList.vue           | 211 ++++++------------
 1 file changed, 63 insertions(+), 148 deletions(-)
 rename src/views/modules/base/{ => huji}/houseChange/houseChangeList.vue (66%)

diff --git a/src/views/modules/base/houseChange/houseChangeList.vue b/src/views/modules/base/huji/houseChange/houseChangeList.vue
similarity index 66%
rename from src/views/modules/base/houseChange/houseChangeList.vue
rename to src/views/modules/base/huji/houseChange/houseChangeList.vue
index b37d403a..32ac7815 100644
--- a/src/views/modules/base/houseChange/houseChangeList.vue
+++ b/src/views/modules/base/huji/houseChange/houseChangeList.vue
@@ -27,8 +27,8 @@
           <el-form-item label="所属房屋">
             <div class="resi-cell-value">
               <div class="resi-cell-col">
-                <el-form-item prop="villageId">
-                  <el-select v-model.trim="formData.villageId"
+                <el-form-item prop="neighborHoodId">
+                  <el-select v-model.trim="formData.neighborHoodId"
                              :disabled="!this.formData.gridId"
                              placeholder="小区"
                              size="small"
@@ -42,10 +42,10 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item prop="buildId">
-                  <el-select v-model.trim="formData.buildId"
+                <el-form-item prop="buildingId">
+                  <el-select v-model.trim="formData.buildingId"
                              placeholder="楼号"
-                             :disabled="!this.formData.villageId"
+                             :disabled="!this.formData.neighborHoodId"
                              size="small"
                              clearable
                              class="resi-cell-select resi-cell-select-middle list_item_width_1"
@@ -57,11 +57,11 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item prop="unitId">
-                  <el-select v-model.trim="formData.unitId"
+                <el-form-item prop="buildingUnitId">
+                  <el-select v-model.trim="formData.buildingUnitId"
                              placeholder="单元"
                              size="small"
-                             :disabled="!this.formData.buildId"
+                             :disabled="!this.formData.buildingId"
                              clearable
                              class="resi-cell-select resi-cell-select-middle list_item_width_1"
                              @change="handleChangeD">
@@ -72,10 +72,10 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item prop="homeId">
-                  <el-select v-model.trim="formData.homeId"
+                <el-form-item prop="houseId">
+                  <el-select v-model.trim="formData.houseId"
                              placeholder="房号"
-                             :disabled="!this.formData.unitId"
+                             :disabled="!this.formData.buildingUnitId"
                              size="small"
                              clearable
                              class="resi-cell-select resi-cell-select-middle list_item_width_1">
@@ -95,11 +95,11 @@
 
         <div>
           <el-form-item label="变更时间"
-                        prop="startTime">
+                        prop="startDate">
             <el-date-picker v-model="timeRange"
                             size="small"
                             type="daterange"
-                            value-format="yyyy-MM-dd HH:mm:ss"
+                            value-format="yyyy-MM-dd"
                             @change="handleTimeChange"
                             range-separator="至"
                             start-placeholder="开始时间"
@@ -135,95 +135,41 @@
                          type="index"
                          width="50"></el-table-column>
 
-        <el-table-column prop="name"
+        <el-table-column prop="gridName"
                          header-align="center"
                          align="center"
-                         label="姓名"
-                         width="90">
-        </el-table-column>
-        <el-table-column prop="mobile"
-                         header-align="center"
-                         align="center"
-                         label="手机号"
-                         width="110">
-        </el-table-column>
-        <el-table-column prop="idCard"
-                         header-align="center"
-                         align="center"
-                         label="身份证"
-                         width="170">
+                         show-overflow-tooltip
+                         label="所属网格"
+                         min-width="150">
         </el-table-column>
-        <el-table-column prop="allName"
+        <el-table-column prop="houseName"
                          header-align="center"
                          align="center"
+                         show-overflow-tooltip
                          label="所属房屋"
-                         min-width="200">
-        </el-table-column>
-        <el-table-column prop="reason"
-                         header-align="center"
-                         align="center"
-                         label="关注原因"
-                         width="180">
+                         min-width="150">
         </el-table-column>
-        <el-table-column prop="remark"
+        <el-table-column prop="changeBefore"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="备注"
-                         min-width="180">
+                         label="变更前"
+                         min-width="250">
         </el-table-column>
-        <el-table-column prop="lastInformTime"
+        <el-table-column prop="changeAfter"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="最后一次通知时间"
-                         width="170">
+                         label="变更后"
+                         min-width="250">
         </el-table-column>
-
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="140"
+        <el-table-column prop="changeTime"
                          header-align="center"
                          align="center"
-                         class="operate">
-          <template slot-scope="scope">
-
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-popover popper-class="btn-popper"
-                        placement="bottom"
-                        style="margin-left:10px"
-                        width="20"
-                        trigger="hover">
-              <div class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail--noline"
-                           size="small"
-                           @click="handleNoticeList(scope.row)">通知记录</el-button>
-              </div>
-
-              <div class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail--noline"
-                           size="small"
-                           @click="handleVisiteList(scope.row) ">随访记录</el-button>
-              </div>
-
-              <el-button type="text"
-                         size="small"
-                         class="div-table-button--more"
-                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
-            </el-popover>
-
-          </template>
+                         label="变更时间"
+                         width="130">
         </el-table-column>
+
       </el-table>
       <div>
         <el-pagination @size-change="handleSizeChange"
@@ -244,7 +190,7 @@
 <script>
 
 
-
+import util from '@js/util.js';
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
@@ -259,15 +205,6 @@ export default {
       pageNo: 1,
       tableLoading: false,
 
-      // formData: {
-      //   attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
-      //   name: '',
-      //   mobile: '',
-      //   idCard: '',
-      //   remark: '',
-      //   reason: '',
-
-      // },
       optionsV: [],
       optionsB: [],
       optionsH: [],
@@ -281,12 +218,12 @@ export default {
       timeRange: [],
       formData: {
         gridId: '',//所属网格【网格Id】
-        villageId: '',
-        buildId: '',
-        unitId: '',
-        homeId: '',
-        startTime: '',
-        endTime: '',
+        neighborHoodId: '',//小区ID	
+        buildingId: '',//楼栋ID	
+        buildingUnitId: '',//楼栋单元ID	
+        houseId: '',//房屋ID	
+        startDate: '',//开始日期，eg：20220510	
+        endDate: '',//结束日期，eg：20220510	
       }
 
 
@@ -339,7 +276,7 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/epmetuser/icEpidemicSpecialAttention/list"
+      const url = "/gov/org/icHouseChangeRecord/list"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
       let params = {
         pageSize: this.pageSize,
@@ -353,31 +290,7 @@ export default {
         this.total = data.total
         this.tableData = data.list
 
-        this.analysisTableSelection()
-        this.tableData.forEach(item => {
-          if (!item.allName) {
-            item.allName = '--'
-          }
-          item.roomShow = ''
-          if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) {
-            item.roomShow = '--'
-          } else {
-            if (item.villageName) {
-              item.roomShow = item.roomShow + item.villageName
-            }
-            if (item.buildName) {
-              item.roomShow = item.roomShow + item.buildName
-            }
-            if (item.unitName) {
-              item.roomShow = item.roomShow + item.unitName
-            }
-            if (item.villageName) {
-              item.roomShow = item.roomShow + item.homeName
-            }
-          }
-
 
-        });
       } else {
         this.$message.error(msg)
       }
@@ -387,10 +300,10 @@ export default {
 
     handleChangeG (val) {
       console.log('val', val)
-      this.formData.villageId = ''
-      this.formData.buildId = ''
-      this.formData.unitId = ''
-      this.formData.homeId = ''
+      this.formData.neighborHoodId = ''
+      this.formData.buildingId = ''
+      this.formData.buildingUnitId = ''
+      this.formData.houseId = ''
       this.getValiheList()
       this.getBuildList()
       this.getUniList()
@@ -398,29 +311,29 @@ export default {
     },
     handleChangeV (val) {
       console.log('val', val)
-      this.formData.buildId = ''
-      this.formData.unitId = ''
-      this.formData.homeId = ''
+      this.formData.buildingId = ''
+      this.formData.buildingUnitId = ''
+      this.formData.houseId = ''
       this.getBuildList()
       this.getUniList()
       this.getHouseList()
     },
     handleChangeB (val) {
       console.log('val', val)
-      this.formData.unitId = ''
-      this.formData.homeId = ''
+      this.formData.buildingUnitId = ''
+      this.formData.houseId = ''
       this.getUniList()
       this.getHouseList()
     },
     handleChangeD () {
-      this.formData.homeId = ''
+      this.formData.houseId = ''
       this.getHouseList()
     },
 
     getValiheList () {
       const { user } = this.$store.state
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId, agencyId: user.agencyId })
+        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -436,7 +349,7 @@ export default {
 
     getBuildList () {
       this.$http
-        .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.villageId })
+        .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.neighborHoodId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -451,7 +364,7 @@ export default {
     },
     getUniList () {
       this.$http
-        .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildId })
+        .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildingId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -466,7 +379,7 @@ export default {
     },
     getHouseList () {
       this.$http
-        .post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId })
+        .post('/gov/org/ichouse/houseoption', { buildingUnitId: this.formData.buildingUnitId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -485,14 +398,14 @@ export default {
         const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
         const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
 
-        this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
-        this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+        this.formData.startDate = startTimeArray[0] + startTimeArray[1] + startTimeArray[2]
+        this.formData.endDate = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
 
         // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
         // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
       } else {
-        this.formData.startTime = ''
-        this.formData.endTime = ''
+        this.formData.startDate = ''
+        this.formData.endDate = ''
         // this.startTimeShow = ''
         // this.endTimeShow = ''
       }
@@ -506,11 +419,13 @@ export default {
     resetSearch () {
       this.timeRange = []
       this.formData = {
-        attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
-        name: '',
-        mobile: '',
-        idCard: '',
-        vaccinationCount: '',
+        gridId: '',//所属网格【网格Id】
+        neighborHoodId: '',//小区ID	
+        buildingId: '',//楼栋ID	
+        buildingUnitId: '',//楼栋单元ID	
+        houseId: '',//房屋ID	
+        startDate: '',//开始日期，eg：20220510	
+        endDate: '',//结束日期，eg：20220510	
       }
 
       this.pageNo = 1

From 5ae9771ddf4c0a69fe06ab4aca34d56df9647507 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 10 May 2022 16:42:44 +0800
Subject: [PATCH 09/37] =?UTF-8?q?=E8=BF=81=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/huji/immigration/edit.vue    | 854 +++++++++++++++
 .../modules/base/huji/immigration/index.vue   | 971 ++++++++++++++++++
 2 files changed, 1825 insertions(+)
 create mode 100644 src/views/modules/base/huji/immigration/edit.vue
 create mode 100644 src/views/modules/base/huji/immigration/index.vue

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
new file mode 100644
index 00000000..437ac47e
--- /dev/null
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -0,0 +1,854 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="fmData"
+        :rules="dataRule"
+        :disabled="formType === 'detail'"
+        class="form"
+      >
+        <el-form-item
+          label="所属网格	"
+          prop="gridId"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.gridId"
+            placeholder="请选择"
+            size="small"
+            clearable
+            class="item_width_1"
+            @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="所属房屋	"
+          prop="homeId"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.villageId"
+            placeholder="请选择小区"
+            size="small"
+            clearable
+            class="resi-cell-select"
+            @clear="handleClearVillage"
+            @change="handleChangeV"
+            style="margin-right: 8px; width: 120px"
+          >
+            <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
+            style="margin-right: 8px; width: 120px"
+            class="resi-cell-select"
+            :disabled="changeVDisabled"
+            @clear="handleClearBuild"
+            @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"
+            :disabled="changeBDisabled"
+            placeholder="单元"
+            size="small"
+            clearable
+            style="margin-right: 8px; width: 120px"
+            class="resi-cell-select"
+            @click="handleClearDan"
+            @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"
+            :disabled="changeDDisabled"
+            placeholder="房号"
+            size="small"
+            clearable
+            @change="handleChangeH"
+            style="width: 120px"
+            class="resi-cell-select"
+          >
+            <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"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            style="margin-right: 20px"
+            placeholder="请输入姓名	"
+            v-model="fmData.name"
+          >
+          </el-input>
+
+          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0"
+            >享受福利</el-checkbox
+          >
+          <el-checkbox
+            v-model="fmData.isCHeck"
+            true-label="1"
+            false-label="0"
+            @change="checkResiAvailable"
+            >补充居民信息</el-checkbox
+          >
+        </el-form-item>
+
+        <el-form-item
+          label="手机号"
+          prop="mobile"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="number"
+            maxlength="11"
+            show-word-limit
+            placeholder="请输入手机号	"
+            v-model="fmData.mobile"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="身份证号"
+          prop="idCard"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入身份证号"
+            v-model="fmData.idCard"
+            @blur="handleBlurId"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="性别"
+          prop="principalName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.gender"
+            placeholder="性别"
+            size="small"
+            clearable
+            class="item_width_1"
+          >
+            <el-option
+              v-for="item in optionsGender"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="年龄"
+          prop="age"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="number"
+            show-word-limit
+            placeholder="请输入手机号	"
+            v-model="fmData.age"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="迁入时间"
+          prop="inTime"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-date-picker
+            v-model="fmData.inTime"
+            type="date"
+            placeholder="迁入时间"
+            value-format="yyyy-MM-dd"
+            class="item_width_1"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item
+          label="迁入原因"
+          prop="inReason"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            type="textarea"
+            class="item_width_2"
+            placeholder="请输入迁入原因"
+            v-model="fmData.inReason"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="来源地"
+          prop="sourceAddress"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-cascader ref="nowArea" class="item_width_1" :props="areaProps" 
+            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+          <!-- <el-input
+            class="item_width_1"
+            placeholder="请输入来源地"
+            v-model="fmData.sourceAddress"
+          > -->
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="详细地址"
+          prop="address"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入详细地址"
+            v-model="fmData.address"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          label="迁移证号码"
+          prop="moveNumber"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入迁移证号码"
+            v-model="fmData.moveNumber"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="户主姓名"
+          prop="houseHolderName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入户主姓名"
+            :disabled="fmData.alreadyHaveMaster"
+            v-model="fmData.houseName"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="与户主关系"
+          prop="houseHolderRelation"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.houseRelation"
+            placeholder="与户主关系"
+            size="small"
+            clearable
+            class="item_width_1"
+          >
+            <el-option
+              v-for="item in optionsRelation"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="div_btn resi-btns">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        v-if="formType != 'detail'"
+        type="primary"
+        size="small"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import formVltHelper from 'dai-js/tools/formVltHelper'
+import { computedCard } from '@/utils/index'
+import { isCard, isMobile } from '@/utils/validate'
+
+function iniFmData() {
+  return {
+    gridId: '',
+    villageId: '',
+    buildId: '',
+    unitId: '',
+    homeId: '',
+    name: '',
+    mobile: '',
+    idCard: '',
+    isWelfare: '0', //福利0否，1是
+    isCHeck: '0',
+    gender: '',
+    age: '',
+    inTime: '',
+    inReason: '',
+    sourceAddress: '',
+    address: '',
+    sourceAddressPathCode: '',
+    sourceAddressCode: '',
+    houseName: '',
+    houseRelation: '',
+    alreadyHaveMaster: false
+  }
+}
+
+export default {
+  data() {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+      nowAllCode: [],
+      optionsGender: [
+        {
+          value: '1',
+          label: '男'
+        },
+        {
+          value: '2',
+          label: '女'
+        }
+      ],
+      optionsRelation: [],
+
+      fmData: iniFmData(),
+      areaProps: {
+        // checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      }
+    }
+  },
+  components: {},
+  computed: {
+    dataRule() {
+      let checkIdCard = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入身份证'))
+        } else {
+          if (!isCard(value)) {
+            callback(new Error('身份证号格式不正确'))
+          }
+          callback()
+        }
+      }
+
+      return {
+        gridId: [
+          { required: true, message: '所属网格不能为空', trigger: 'blur' }
+        ],
+        homeId: [
+          { required: true, message: '所属房屋不能为空', trigger: 'blur' }
+        ],
+        name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+        idCard: [
+          { required: true, message: '身份证号不能为空', trigger: 'blur' },
+          { required: true, validator: checkIdCard, trigger: 'blur' }
+        ],
+        inTime: [
+          { required: true, message: '迁入时间不能为空', trigger: 'blur' }
+        ],
+        inReason: [
+          { required: true, message: '迁入原因不能为空', trigger: 'blur' }
+        ],
+        sourceAddress: [
+          { required: true, message: '来源地不能为空', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '详细地址不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+    changeVDisabled() {
+      return !this.fmData.villageId
+    },
+    changeBDisabled() {
+      return !this.fmData.buildId
+    },
+    changeDDisabled() {
+      return !this.fmData.unitId
+    }
+  },
+  props: {},
+  watch: {},
+
+  async mounted() {
+    this.getGridList()
+    this.getValiheList()
+    this.getRelationList()
+  },
+
+  methods: {
+    lzayLoadArea(node, resolve) {
+      // this.getArea(node, resolve)
+      setTimeout(() => {
+        this.getArea(node, resolve)
+      }, 200)
+    },
+    async checkResiAvailable() {
+      const {
+        fmData: { idCard, isResiUser }
+      } = this
+      if (isCard(idCard)) {
+        const { data, code, msg } = await requestPost(
+          '/epmetuser/icresiuser/checkuser',
+          {
+            idCard,
+            agencyId: this.$store.state.user.agencyId
+          }
+        )
+        if (code === 0) {
+          if (!data.moveInstatus) {
+            this.$message({
+              type: 'error',
+              message: `请联系${data.resiAgencyName}迁出该居民后操作`
+            })
+          }
+        } else {
+          this.$message.error(msg)
+        }
+      }
+    },
+    handleNowArea(val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.nowArea.getCheckedNodes())
+      if (val.length > 0) {
+        const labels = this.$refs.nowArea.getCheckedNodes()[0].pathLabels
+        this.fmData.presentAddressCode = val[val.length - 1]
+        this.fmData.presentAddress = labels.join('-')
+        this.fmData.presentAddressPathCode = val.join(',')
+        console.log('presentAddress', this.formData.presentAddress)
+        this.$refs.ref_form.clearValidate('presentAddress')
+      } else {
+        this.fmData.presentAddressCode = ''
+        this.fmData.presentAddress = ''
+        this.fmData.presentAddressPathCode = ''
+      }
+    },
+    handleBlurId(val) {
+      const { sex, age } = computedCard(this.fmData.idCard)
+      if (val) {
+        this.fmData.age = age
+        this.fmData.gender = sex == 1 ? '1' : '2'
+        this.checkResiAvailable()
+      }
+    },
+
+    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()
+    },
+    handleChangeH(val) {
+      console.log('val', val)
+      this.getHouseMaster()
+    },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, // 
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    getRelationList() {
+      const { user } = this.$store.state
+      this.$http
+        .post('/sys/dict/data/relationship', {
+          formCode: 'resi_base_info'
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsRelation = 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('/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('网络错误')
+        })
+    },
+
+    getHouseMaster() {
+      const { homeId } = this.fmData
+      if (!homeId) return (this.alreadyHaveMaster = false)
+
+      this.$http
+        .post('/epmetuser/icresiuser/queryhousehold/' + homeId, {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取户主信息成功', res.data)
+            const { name } = res.data
+            if (name) {
+              this.fmData.houseHolderName = name
+              this.alreadyHaveMaster = true
+            } else {
+              this.alreadyHaveMaster = false
+            }
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    async initForm(type, id) {
+      this.$refs.ref_form.resetFields()
+
+      this.formType = type
+      if (id) {
+        this.getDatail(id)
+      }
+    },
+    async getDatail(moveInId) {
+      let url = '/epmetuser/icMoveIn/detail'
+      
+      const params = {
+        moveInId: moveInId || ''
+      }
+      const { data, code, msg } = await requestPost(url, this.fmData)
+      if (code === 0) {
+        this.fmData = { ...data }
+      } else this.$message.error(msg)
+    },
+
+    async handleComfirm() {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+          if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
+            return this.$message({
+              type: 'error',
+              message: '手机号格式有误'
+            })
+          }
+          this.submit()
+        }
+      })
+    },
+
+    async submit() {
+      let url = ''
+      if (this.formType === 'add') {
+        url = '/epmetuser/icMoveIn/save'
+      } else {
+        url = '/epmetuser/icMoveIn/edit'
+
+        this.fmData.orgId = this.orgId
+      }
+
+      const { data, code, msg } = await requestPost(url, this.fmData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle() {
+      this.resetData()
+      this.$emit('dialogCancle')
+    },
+    resetData() {
+      this.orgId = ''
+      this.nowAllCode = []
+      this.fmData = iniFmData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 220px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  margin-top: 10px;
+}
+
+.div_btn {
+  // display: flex;
+  // justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+
+.m-staffs {
+  width: 468px;
+  .item {
+    display: flex;
+    justify-content: space-around;
+    margin-bottom: 7px;
+  }
+  .item-add {
+  }
+}
+</style>
+
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
new file mode 100644
index 00000000..f49e38cd
--- /dev/null
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -0,0 +1,971 @@
+<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="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
+                    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
+                    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
+                    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>
+        </div>
+        <div>
+          <el-form-item label="迁入时间" prop="rangeTime">
+            <el-date-picker
+              v-model="fmData.rangeTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="享受福利" prop="remark">
+            <el-select
+              v-model.trim="fmData.isWeifare"
+              placeholder="享受福利"
+              size="small"
+              clearable
+              style="width: 120px"
+              class="resi-cell-select"
+            >
+              <el-option
+                v-for="item in optionsWelfare"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </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 class="diy-button--add" size="small" @click="handleAdd"
+          >迁入登记</el-button
+        >
+        <el-button
+          v-if="false"
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule('room')"
+          >下载模板</el-button
+        >
+        <el-upload
+          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--delete"
+            :loading="importLoading"
+            >{{ importBtnTitle }}</el-button
+          >
+        </el-upload>
+
+        <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="maxTableHeight"
+      >
+        <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="homeName"
+          label="所属房屋"
+          align="center"
+          min-width="160"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <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="gender" 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="source"
+          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="houseName"
+          min-width="100"
+          align="center"
+          label="户主姓名"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="houseRelationName"
+          align="center"
+          min-width="100"
+          label="与户主关系"
+        >
+        </el-table-column>
+
+        <el-table-column fixed="right" label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button
+              @click="handleWatch(scope.$index)"
+              type="text"
+              size="small"
+              >查看</el-button
+            >
+
+            <el-button
+              @click="handleEdit(scope.$index)"
+              type="text"
+              size="small"
+              class="div-table-button--edit"
+              >修改</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>
+          </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>
+
+    <!-- 修改弹出框 -->
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <edit-form
+        ref="eleEditForm"
+        @dialogCancle="handleClose"
+        @dialogOk="handleEditSuccess"
+      ></edit-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from '@/js/dai/request'
+import nextTick from 'dai-js/tools/nextTick'
+import { mapGetters } from 'vuex'
+import editForm from './edit'
+import axios from 'axios'
+
+export default {
+  components: { editForm },
+  data() {
+    return {
+      openSearch: false,
+
+      formShow: false,
+      formTitle: '出生登记',
+
+      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,
+
+      //积分记录
+      scoreDiaTitle: '积分记录',
+      scoreDiaShow: false
+    }
+  },
+  computed: {
+    maxTableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 360 + this.iframeHeigh
+        : this.clientHeight - 360
+    },
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    changeVDisabled() {
+      return !this.fmData.villageId
+    },
+    changeBDisabled() {
+      return !this.fmData.buildId
+    },
+    changeDDisabled() {
+      return !this.fmData.unitId
+    }
+  },
+  watch: {
+    rangeTime: function (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 = ''
+      }
+    }
+  },
+  mounted() {
+    this.getGridList()
+    this.getValiheList()
+    this.getTableData()
+  },
+  methods: {
+    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('网络错误')
+        })
+    },
+
+    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) {
+      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 =
+        '/heart/iccommunityselforganization/exportcommunityselforganization'
+      const { pageSize, pageNo, fmData } = this
+      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('网络错误')
+        })
+    },
+
+    async handleWatch(rowIndex) {
+      this.formShow = true
+      await nextTick()
+      this.$refs.eleEditForm.initForm('detail', this.tableData[rowIndex].moveInId)
+    },
+
+    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 =
+        '/heart/iccommunityselforganization/delcommunityselforganization'
+      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 getTableData() {
+      const url = '/epmetuser/icMoveIn/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>
+@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 .resi-cell {
+  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: 130px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+}
+.mt10 {
+  margin-top: 10px;
+}
+</style>

From 9487f3aca95d07d2de88cabd814634ad895ffe6e Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 11 May 2022 15:07:26 +0800
Subject: [PATCH 10/37] =?UTF-8?q?=E5=B5=8C=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/huji/immigration/edit.vue    |  89 ++++++----
 .../modules/base/huji/immigration/index.vue   | 157 +++++++++++++-----
 2 files changed, 174 insertions(+), 72 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 437ac47e..2aab95da 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -123,8 +123,6 @@
         >
           <el-input
             class="item_width_1"
-            maxlength="50"
-            show-word-limit
             style="margin-right: 20px"
             placeholder="请输入姓名	"
             v-model="fmData.name"
@@ -213,16 +211,16 @@
         </el-form-item>
 
         <el-form-item
-          label="迁入时间"
+          label="迁入日期"
           prop="inTime"
           label-width="150px"
           style="display: block"
         >
           <el-date-picker
             v-model="fmData.inTime"
-            type="date"
+            type="datetime"
             placeholder="迁入时间"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
             class="item_width_1"
           >
           </el-date-picker>
@@ -288,27 +286,26 @@
 
         <el-form-item
           label="户主姓名"
-          prop="houseHolderName"
+          prop="householderName"
           label-width="150px"
           style="display: block"
         >
           <el-input
             class="item_width_1"
             placeholder="请输入户主姓名"
-            :disabled="fmData.alreadyHaveMaster"
-            v-model="fmData.houseName"
+            v-model="fmData.householderName"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
           label="与户主关系"
-          prop="houseHolderRelation"
+          prop="householderRelation"
           label-width="150px"
           style="display: block"
         >
           <el-select
-            v-model.trim="fmData.houseRelation"
+            v-model.trim="fmData.householderRelation"
             placeholder="与户主关系"
             size="small"
             clearable
@@ -365,9 +362,11 @@ function iniFmData() {
     address: '',
     sourceAddressPathCode: '',
     sourceAddressCode: '',
-    houseName: '',
-    houseRelation: '',
-    alreadyHaveMaster: false
+    householderName: '',
+    moveNumber: '',
+    householderRelation: '',
+    alreadyHaveMaster: false,
+    isReplace: '0'
   }
 }
 
@@ -401,7 +400,8 @@ export default {
         // checkStrictly: true,
         lazy: true,
         lazyLoad: this.lzayLoadArea
-      }
+      },
+      userInfo: {}
     }
   },
   components: {},
@@ -490,6 +490,7 @@ export default {
               message: `请联系${data.resiAgencyName}迁出该居民后操作`
             })
           }
+          this.userInfo = { ...data }
         } else {
           this.$message.error(msg)
         }
@@ -500,15 +501,15 @@ export default {
       console.log('label-----', this.$refs.nowArea.getCheckedNodes())
       if (val.length > 0) {
         const labels = this.$refs.nowArea.getCheckedNodes()[0].pathLabels
-        this.fmData.presentAddressCode = val[val.length - 1]
-        this.fmData.presentAddress = labels.join('-')
-        this.fmData.presentAddressPathCode = val.join(',')
-        console.log('presentAddress', this.formData.presentAddress)
-        this.$refs.ref_form.clearValidate('presentAddress')
+        this.fmData.sourceAddressCode = val[val.length - 1]
+        this.fmData.sourceAddress = labels.join('-')
+        this.fmData.sourceAddressPathCode = val.join(',')
+        console.log('sourceAddress', this.fmData.sourceAddressPathCode)
+        this.$refs.ref_form.clearValidate('sourceAddress')
       } else {
-        this.fmData.presentAddressCode = ''
-        this.fmData.presentAddress = ''
-        this.fmData.presentAddressPathCode = ''
+        this.fmData.sourceAddressCode = ''
+        this.fmData.sourceAddress = ''
+        this.fmData.sourceAddressPathCode = ''
       }
     },
     handleBlurId(val) {
@@ -707,9 +708,10 @@ export default {
             return this.$message.error(res.msg)
           } else {
             console.log('获取户主信息成功', res.data)
-            const { name } = res.data
-            if (name) {
-              this.fmData.houseHolderName = name
+            
+            if (res.data) {
+              const { name } = res.data
+              this.fmData.householderName = name
               this.alreadyHaveMaster = true
             } else {
               this.alreadyHaveMaster = false
@@ -725,8 +727,14 @@ export default {
       this.$refs.ref_form.resetFields()
 
       this.formType = type
+      
       if (id) {
-        this.getDatail(id)
+        await this.getDatail(id)
+      }
+      if (this.formType != 'add') {
+        this.getBuildList()
+        this.getUniList()
+        this.getHouseList()
       }
     },
     async getDatail(moveInId) {
@@ -735,17 +743,18 @@ export default {
       const params = {
         moveInId: moveInId || ''
       }
-      const { data, code, msg } = await requestPost(url, this.fmData)
+      const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
         this.fmData = { ...data }
+        this.nowAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
       } else this.$message.error(msg)
     },
 
     async handleComfirm() {
       this.btnDisable = true
-      setTimeout(() => {
-        this.btnDisable = false
-      }, 10000)
+      // setTimeout(() => {
+      //   this.btnDisable = false
+      // }, 10000)
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj)
@@ -763,9 +772,27 @@ export default {
     },
 
     async submit() {
+      if (this.fmData.isCHeck && this.userInfo && this.userInfo.resiHomeId) {
+        const { user } = this.$store.state
+        if (user.agencyId == this.userInfo.resiAgencyId) {
+          if (this.userInfo.resiHomeId !== this.fmData.homeId) {
+            this.$confirm('居民信息中房屋信息与当前选择房屋不一致，是否更新？', '提示', {
+              confirmButtonText: '更新',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.fmData.isReplace = '1'
+            }).catch(() => {
+              this.fmData.isReplace = '0'       
+            });
+            return
+          }
+        }
+        
+      }
       let url = ''
       if (this.formType === 'add') {
-        url = '/epmetuser/icMoveIn/save'
+        url = '/epmetuser/icMoveIn/add'
       } else {
         url = '/epmetuser/icMoveIn/edit'
 
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index f49e38cd..897365ca 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -235,7 +235,7 @@
         border
         style="width: 100%"
         class="resi-table"
-        :height="maxTableHeight"
+        :height="tableHeight"
       >
         <el-table-column
           label="序号"
@@ -269,13 +269,12 @@
         </el-table-column>
 
         <el-table-column
-          prop="homeName"
+          prop="allName"
           label="所属房屋"
           align="center"
           min-width="160"
           :show-overflow-tooltip="true"
-        >
-        </el-table-column>
+        />
 
         <el-table-column
           prop="mobile"
@@ -317,7 +316,7 @@
         </el-table-column>
 
         <el-table-column
-          prop="source"
+          prop="sourceAddress"
           min-width="160"
           align="center"
           label="由何地迁入"
@@ -333,7 +332,7 @@
         </el-table-column>
 
         <el-table-column
-          prop="houseName"
+          prop="householderName"
           min-width="100"
           align="center"
           label="户主姓名"
@@ -341,7 +340,7 @@
         </el-table-column>
 
         <el-table-column
-          prop="houseRelationName"
+          prop="householderRelationName"
           align="center"
           min-width="100"
           label="与户主关系"
@@ -432,7 +431,7 @@ export default {
       openSearch: false,
 
       formShow: false,
-      formTitle: '出生登记',
+      formTitle: '迁入登记',
 
       pageNo: 1,
       pageSize: window.localStorage.getItem('pageSize') || 20,
@@ -475,18 +474,21 @@ export default {
       importBtnTitle: '导入',
       importLoading: false,
 
-      //积分记录
-      scoreDiaTitle: '积分记录',
-      scoreDiaShow: false
+      searchH: 0,
+      tableHeight: 0
     }
   },
   computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
     maxTableHeight() {
-      return this.$store.state.inIframe
-        ? this.clientHeight - 360 + this.iframeHeigh
-        : this.clientHeight - 360
+      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
+      
     },
-    ...mapGetters(['clientHeight', 'iframeHeight']),
+    
     changeVDisabled() {
       return !this.fmData.villageId
     },
@@ -506,12 +508,23 @@ export default {
         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.searchCard.$el.offsetHeight + 260
+    console.log('searchH----', this.$refs.searchCard.$el.offsetHeight)
   },
   methods: {
     handleClearVillage() {
@@ -796,38 +809,99 @@ export default {
 
     async handleChu() {
       const url =
-        '/heart/iccommunityselforganization/exportcommunityselforganization'
+        '/epmetuser/icMoveIn/export'
       const { pageSize, pageNo, fmData } = this
-      axios({
-        url: window.SITE_CONFIG['apiURL'] + url,
-        method: 'post',
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
         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对象
+        .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)
+        .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) {
@@ -923,9 +997,9 @@ export default {
   overflow: visible;
 }
 
-.demo-form-inline .resi-cell {
-  display: flex;
-  align-items: center;
+.demo-form-inline {
+  // display: flex;
+  // align-items: center;
   // margin-bottom: 20px;
 
   .resi-cell-label {
@@ -965,6 +1039,7 @@ export default {
     margin-right: 0;
   }
 }
+
 .mt10 {
   margin-top: 10px;
 }

From 880bd944100e2e2fa963d2eb00d3043e8f406ff7 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 11 May 2022 15:48:29 +0800
Subject: [PATCH 11/37] dd

---
 src/views/modules/base/huji/immigration/edit.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 2aab95da..9143e550 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -489,6 +489,7 @@ export default {
               type: 'error',
               message: `请联系${data.resiAgencyName}迁出该居民后操作`
             })
+            this.btnDisable = true
           }
           this.userInfo = { ...data }
         } else {

From afd969583f5c7f88f22a384a12a4dbbc6fcd8d67 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 11 May 2022 16:20:52 +0800
Subject: [PATCH 12/37] =?UTF-8?q?=E4=B8=80=E5=8C=BA=E4=B8=80=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildTable.vue     | 48 ++++++++++++++++
 .../modules/base/community/community.vue      | 21 +++++--
 .../modules/base/community/communityTable.vue | 55 +++++++++++++++++++
 .../modules/base/community/roomTable.vue      | 46 ++++++++++++++++
 4 files changed, 164 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 290d53a4..125a8feb 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -52,6 +52,10 @@
                  class="diy-button--more"
                  size="small"
                  @click="deleteBatch">批量删除</el-button>
+      <el-button style=";margin-left:10px"
+                 class="diy-button--export"
+                 size="small"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button>
     </div>
 
     <div class="div_table_item">
@@ -582,6 +586,38 @@ export default {
       );
     },
 
+    //导出一户一档
+    handleExportYihuyidang () {
+      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,
+        neighborHoodId: this.agencyObj.id
+
+      }
+
+
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
 
     // 上传文件之前的钩子
     beforeUpload (file, type) {
@@ -725,6 +761,18 @@ export default {
       type: Boolean,
       default: false,
     },
+    ownerName: {
+      type: String,
+      default: '',
+    },
+    ownerPhone: {
+      type: String,
+      default: '',
+    },
+    rentFlag: {
+      type: String,
+      default: '',
+    },
   }
 }
 </script>
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 156903b8..01f94046 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -62,7 +62,7 @@
           <div class="resi-cell-value">
 
             <el-select class="item_width_1"
-                       v-model="rentState"
+                       v-model="rentFlag"
                        placeholder="请选择"
                        size="small"
                        clearable>
@@ -92,18 +92,27 @@
                    ref="ref_neighTable"
                    :staffAgencyId="staffAgencyId"
                    :showImportBtn="showImportBtn"
+                   :ownerName="ownerName"
+                   :ownerPhone="ownerPhone"
+                   :rentFlag="rentFlag"
                    @toNextLevel="toNextLevel"
                    @refreshTree="refreshTree"></build-table>
 
       <room-table v-if="showRoomTable||selTreeObj.level==='building'"
                   :staffAgencyId="staffAgencyId"
                   :showImportBtn="showImportBtn"
+                  :ownerName="ownerName"
+                  :ownerPhone="ownerPhone"
+                  :rentFlag="rentFlag"
                   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"
                        ref="ref_communityTable"
                        @refreshTree="refreshTree"></community-table>
 
@@ -156,7 +165,7 @@ export default {
       ],
       ownerName: '',
       ownerPhone: '',
-      rentState: '',
+      rentFlag: '',
       showRoomTable: false,
       selObj: {},
     }
@@ -197,11 +206,11 @@ export default {
   methods: {
 
     handleSearch () {
-      if (this.ownerName || this.ownerPhone || this.rentState) {
+      if (this.ownerName || this.ownerPhone || this.rentFlag) {
         this.showRoomTable = true
 
         this.$nextTick(() => {
-          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentState)
+          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentFlag)
         })
       } else {
         this.$message.warning('请输入查询条件')
@@ -214,7 +223,7 @@ export default {
     resetSearch () {
       this.ownerName = ''
       this.ownerPhone = ''
-      this.rentState = ''
+      this.rentFlag = ''
 
       this.pageSize = 10
       this.pageNo = 1
@@ -285,7 +294,7 @@ export default {
     handleNodeClick (obj) {
       this.ownerName = ''
       this.ownerPhone = ''
-      this.rentState = ''
+      this.rentFlag = ''
       this.showRoomTable = false
 
       this.selObj = JSON.parse(JSON.stringify(obj))
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index e93868af..11aaf2be 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -61,6 +61,7 @@
                      size="small"
                      class="diy-button--delete">导入房屋数据</el-button>
         </el-upload>
+
       </div>
       <el-button style="margin-left:10px"
                  class="diy-button--reset"
@@ -75,6 +76,10 @@
                  class="diy-button--more"
                  size="small"
                  @click="deleteBatch">批量删除</el-button>
+      <el-button style=";margin-left:10px"
+                 class="diy-button--export"
+                 size="small"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button>
 
     </div>
 
@@ -562,6 +567,44 @@ export default {
       );
     },
 
+    //导出一户一档
+    handleExportYihuyidang () {
+      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,
+      }
+
+      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')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+
+
     // 上传文件之前的钩子
     beforeUpload (file, type) {
       this.files = file;
@@ -717,6 +760,18 @@ export default {
       type: String,
       default: '',
     },
+    ownerName: {
+      type: String,
+      default: '',
+    },
+    ownerPhone: {
+      type: String,
+      default: '',
+    },
+    rentFlag: {
+      type: String,
+      default: '',
+    },
 
   }
 }
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 49574f4c..5f4c75f0 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -35,6 +35,10 @@
                  class="diy-button--more"
                  size="small"
                  @click="deleteBatch">批量删除</el-button>
+      <el-button style=";margin-left:10px"
+                 class="diy-button--export"
+                 size="small"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button>
     </div>
 
     <div class="div_table_item ">
@@ -603,6 +607,36 @@ export default {
       );
     },
 
+    //导出一户一档
+    handleExportYihuyidang () {
+      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,
+        buildingId: this.agencyObj.id
+      }
+
+
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
     // 上传文件之前的钩子
     beforeUpload (file) {
       this.files = file;
@@ -730,6 +764,18 @@ export default {
       type: Boolean,
       default: false,
     },
+    ownerName: {
+      type: String,
+      default: '',
+    },
+    ownerPhone: {
+      type: String,
+      default: '',
+    },
+    rentFlag: {
+      type: String,
+      default: '',
+    },
   }
 }
 </script>

From 6baa9bb8e92dcfbf426c92c04660edccb6ae0a45 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 11 May 2022 16:37:18 +0800
Subject: [PATCH 13/37] dd

---
 src/views/modules/base/huji/immigration/edit.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 9143e550..55830b1c 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -823,6 +823,7 @@ export default {
     resetData() {
       this.orgId = ''
       this.nowAllCode = []
+      this.btnDisable = false
       this.fmData = iniFmData()
     }
   }

From 3bb707bec82ee6104527e217ce9e720b8d288c78 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 11 May 2022 16:42:25 +0800
Subject: [PATCH 14/37] 666

---
 .../modules/base/huji/chusheng/cpts/edit.vue  | 79 ++++++++++++++-----
 1 file changed, 61 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 96c2ecdc..4ad5714a 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -22,6 +22,7 @@
             clearable
             class="resi-cell-select"
             @change="handleChangeGrid"
+            :disabled="formType === 'edit'"
             style="width: 250px"
           >
             <el-option
@@ -48,6 +49,7 @@
             class="resi-cell-select"
             @clear="handleClearVillage"
             @change="handleChangeV"
+            :disabled="formType === 'edit'"
             style="margin-right: 8px; width: 120px"
           >
             <el-option
@@ -65,7 +67,7 @@
             clearable
             style="margin-right: 8px; width: 120px"
             class="resi-cell-select"
-            :disabled="changeVDisabled"
+            :disabled="changeVDisabled || formType === 'edit'"
             @clear="handleClearBuild"
             @change="handleChangeB"
           >
@@ -79,7 +81,7 @@
           </el-select>
           <el-select
             v-model.trim="fmData.unitId"
-            :disabled="changeBDisabled"
+            :disabled="changeBDisabled || formType === 'edit'"
             placeholder="单元"
             size="small"
             clearable
@@ -98,7 +100,7 @@
           </el-select>
           <el-select
             v-model.trim="fmData.homeId"
-            :disabled="changeDDisabled"
+            :disabled="changeDDisabled || formType === 'edit'"
             placeholder="房号"
             size="small"
             clearable
@@ -128,17 +130,23 @@
             show-word-limit
             style="width: 200px; margin-right: 20px"
             placeholder="请输入姓名	"
+            :disabled="formType === 'edit'"
             v-model="fmData.name"
           >
           </el-input>
 
-          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0"
+          <el-checkbox
+            v-model="fmData.isWelfare"
+            :disabled="formType === 'edit'"
+            true-label="1"
+            false-label="0"
             >享受福利</el-checkbox
           >
           <el-checkbox
             v-model="fmData.isCheck"
             true-label="1"
             false-label="0"
+            :disabled="formType === 'edit'"
             @change="checkResiAvailable"
             >补充居民信息</el-checkbox
           >
@@ -157,6 +165,7 @@
             show-word-limit
             placeholder="请输入手机号	"
             v-model="fmData.mobile"
+            :disabled="formType === 'edit'"
           >
           </el-input>
         </el-form-item>
@@ -172,6 +181,7 @@
             placeholder="请输入身份证号"
             v-model="fmData.idCard"
             @blur="handleBlurId"
+            :disabled="formType === 'edit'"
           ></el-input>
         </el-form-item>
 
@@ -188,6 +198,7 @@
             clearable
             style="width: 120px"
             class="resi-cell-select"
+            :disabled="formType === 'edit'"
           >
             <el-option
               v-for="item in optionsGender"
@@ -210,6 +221,7 @@
             type="date"
             placeholder="出生日期"
             value-format="yyyy-MM-dd"
+            :disabled="formType === 'edit'"
           >
           </el-date-picker>
         </el-form-item>
@@ -386,6 +398,7 @@ function iniFmData() {
     idCard: "",
     isWelfare: "0", //福利0否，1是
     isCheck: "0",
+    isReplace: "0",
     gender: "",
     birthplace: "",
     father: "",
@@ -410,6 +423,7 @@ export default {
       optionsH: [],
       optionsD: [],
       optionsG: [],
+      optionsRelation: [],
       optionsGender: [
         {
           value: "1",
@@ -420,9 +434,9 @@ export default {
           label: "女",
         },
       ],
-      optionsRelation: [],
 
       fmData: iniFmData(),
+      checkResult: {},
     };
   },
   components: {},
@@ -490,6 +504,7 @@ export default {
           }
         );
         if (code === 0) {
+          this.checkResult = data;
           if (!data.moveInstatus) {
             this.$message({
               type: "error",
@@ -566,11 +581,10 @@ export default {
             return this.$message.error(res.msg);
           } else {
             console.log("获取查询详情成功", res.data);
-            this.optionsRelation = res.data;
+            if (res.data) {
+              this.optionsRelation = res.data;
+            }
           }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
         });
     },
 
@@ -682,9 +696,6 @@ export default {
               this.alreadyHaveMaster = false;
             }
           }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
         });
     },
 
@@ -696,14 +707,18 @@ export default {
       if (row) {
         // this.fmData = { ...this.fmData, ...row };
         this.getInfo(row.id);
+        this.getValiheList();
+        this.getBuildList();
+        this.getUniList();
+        this.getHouseList();
       }
     },
 
     async getInfo(id) {
       const { data, code, msg } = await requestPost(
-        "/epmetuser/icBirthRecord",
+        "/epmetuser/icBirthRecord/" + id,
         {
-          id,
+          // id,
         }
       );
       if (code === 0) {
@@ -738,13 +753,37 @@ export default {
       let url = "";
       if (this.formType === "add") {
         url = "/epmetuser/icBirthRecord/save";
-      } else {
+      } else if (this.formType === "edit") {
         url = "/epmetuser/icBirthRecord/update";
+      } else {
+        return;
+      }
 
-        this.fmData.orgId = this.orgId;
+      const { fmData, checkResult } = this;
+      if (
+        fmData.isCheck == "1" &&
+        checkResult.resiHomeId != fmData.homeId &&
+        checkResult.status == "0"
+      ) {
+        await this.$confirm(
+          "居民信息中房屋信息与当前选择房屋不一致，是否更新？",
+          "提示",
+          {
+            confirmButtonText: "更新",
+            cancelButtonText: "不更新",
+            type: "warning",
+            center: true,
+          }
+        )
+          .then(() => {
+            this.fmData.isReplace = "1";
+          })
+          .catch(() => {
+            this.fmData.isReplace = "0";
+          });
       }
 
-      const { data, code, msg } = await requestPost(url, this.fmData);
+      const { data, code, msg } = await requestPost(url, fmData);
 
       if (code === 0) {
         this.$message({
@@ -765,7 +804,11 @@ export default {
       this.$emit("dialogCancle");
     },
     resetData() {
-      this.orgId = "";
+      this.checkResult = {};
+      this.optionsB = [];
+      this.optionsH = [];
+      this.optionsD = [];
+      this.optionsRelation = [];
       this.fmData = iniFmData();
     },
     // 开启加载动画

From 5628026ac6876a79a2d67424955416d6d0465a85 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 11 May 2022 16:50:41 +0800
Subject: [PATCH 15/37] =?UTF-8?q?=E4=B8=80=E6=88=B7=E4=B8=80=E6=A1=A3?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=98=B2=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/buildTable.vue     | 7 ++++++-
 src/views/modules/base/community/communityTable.vue | 7 ++++++-
 src/views/modules/base/community/roomTable.vue      | 8 +++++++-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 125a8feb..3fe03ac3 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -55,6 +55,7 @@
       <el-button style=";margin-left:10px"
                  class="diy-button--export"
                  size="small"
+                 :disabled="yihuyidangDisabled"
                  @click="handleExportYihuyidang()">导出一户一档</el-button>
     </div>
 
@@ -227,6 +228,8 @@ export default {
       formShow: false,
       formTitle: '新增楼栋',
 
+      yihuyidangDisabled: false,
+
     }
   },
   components: {
@@ -588,6 +591,7 @@ export default {
 
     //导出一户一档
     handleExportYihuyidang () {
+      this.yihuyidangDisabled = true
       let title = this.agencyObj.label
       title = title + '-一户一档'
       let url = "/gov/org/house/exportHouseUser"
@@ -604,16 +608,17 @@ export default {
       }
 
 
-
       app.ajax.exportFilePost(
         url,
         params,
         (data, rspMsg) => {
 
           this.download(data, title + '.xls')
+          this.yihuyidangDisabled = false
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
+          this.yihuyidangDisabled = false
         }
       );
     },
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 11aaf2be..5eb4596f 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -79,6 +79,7 @@
       <el-button style=";margin-left:10px"
                  class="diy-button--export"
                  size="small"
+                 :disabled="yihuyidangDisabled"
                  @click="handleExportYihuyidang()">导出一户一档</el-button>
 
     </div>
@@ -222,7 +223,8 @@ export default {
 
       files: "",
       fileName: "",
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import'
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
+      yihuyidangDisabled: false,
 
     }
   },
@@ -569,6 +571,7 @@ export default {
 
     //导出一户一档
     handleExportYihuyidang () {
+      this.yihuyidangDisabled = true
       let title = this.agencyObj.label
       title = title + '-一户一档'
       let url = "/gov/org/house/exportHouseUser"
@@ -596,8 +599,10 @@ export default {
         (data, rspMsg) => {
 
           this.download(data, title + '.xls')
+          this.yihuyidangDisabled = false
         },
         (rspMsg, data) => {
+          this.yihuyidangDisabled = false
           this.$message.error(rspMsg);
         }
       );
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 5f4c75f0..a3b8a17a 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -38,6 +38,7 @@
       <el-button style=";margin-left:10px"
                  class="diy-button--export"
                  size="small"
+                 :disabled="yihuyidangDisabled"
                  @click="handleExportYihuyidang()">导出一户一档</el-button>
     </div>
 
@@ -235,7 +236,9 @@ export default {
           value: '0',
           label: '自住'
         },
-      ]
+      ],
+
+      yihuyidangDisabled: false,
 
 
     }
@@ -609,6 +612,7 @@ export default {
 
     //导出一户一档
     handleExportYihuyidang () {
+      this.yihuyidangDisabled = true
       let title = this.agencyObj.label
       title = title + '-一户一档'
       let url = "/gov/org/house/exportHouseUser"
@@ -631,9 +635,11 @@ export default {
         (data, rspMsg) => {
 
           this.download(data, title + '.xls')
+          this.yihuyidangDisabled = false
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
+          this.yihuyidangDisabled = false
         }
       );
     },

From 0eb05f15c3e9c01bcca44d38e80460472d4a6378 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 11 May 2022 16:57:44 +0800
Subject: [PATCH 16/37] dd

---
 .../modules/base/huji/immigration/edit.vue    | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 55830b1c..e05e4997 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -767,30 +767,33 @@ export default {
               message: '手机号格式有误'
             })
           }
-          this.submit()
+          if (this.fmData.isCHeck && this.userInfo && this.userInfo.resiHomeId) {
+            const { user } = this.$store.state
+            if (user.agencyId == this.userInfo.resiAgencyId) {
+              if (this.userInfo.resiHomeId !== this.fmData.homeId) {
+                this.$confirm('居民信息中房屋信息与当前选择房屋不一致，是否更新？', '提示', {
+                  confirmButtonText: '更新',
+                  cancelButtonText: '取消',
+                  type: 'warning'
+                }).then(() => {
+                  this.fmData.isReplace = '1'
+                  this.submit()
+                }).catch(() => {
+                  this.fmData.isReplace = '0'    
+                  this.submit()   
+                });
+                return
+              }
+            }
+            
+          } else this.submit()
+          
         }
       })
     },
 
     async submit() {
-      if (this.fmData.isCHeck && this.userInfo && this.userInfo.resiHomeId) {
-        const { user } = this.$store.state
-        if (user.agencyId == this.userInfo.resiAgencyId) {
-          if (this.userInfo.resiHomeId !== this.fmData.homeId) {
-            this.$confirm('居民信息中房屋信息与当前选择房屋不一致，是否更新？', '提示', {
-              confirmButtonText: '更新',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              this.fmData.isReplace = '1'
-            }).catch(() => {
-              this.fmData.isReplace = '0'       
-            });
-            return
-          }
-        }
-        
-      }
+      
       let url = ''
       if (this.formType === 'add') {
         url = '/epmetuser/icMoveIn/add'

From 59832047cd20b22cb5aa38bb94f8dcc52882f31c Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 11 May 2022 16:59:46 +0800
Subject: [PATCH 17/37] dd

---
 src/views/modules/base/huji/immigration/edit.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index e05e4997..fa7bad01 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -133,7 +133,7 @@
             >享受福利</el-checkbox
           >
           <el-checkbox
-            v-model="fmData.isCHeck"
+            v-model="fmData.isCheck"
             true-label="1"
             false-label="0"
             @change="checkResiAvailable"
@@ -353,7 +353,7 @@ function iniFmData() {
     mobile: '',
     idCard: '',
     isWelfare: '0', //福利0否，1是
-    isCHeck: '0',
+    isCheck: '0',
     gender: '',
     age: '',
     inTime: '',
@@ -767,7 +767,7 @@ export default {
               message: '手机号格式有误'
             })
           }
-          if (this.fmData.isCHeck && this.userInfo && this.userInfo.resiHomeId) {
+          if (this.fmData.isCheck && this.userInfo && this.userInfo.resiHomeId) {
             const { user } = this.$store.state
             if (user.agencyId == this.userInfo.resiAgencyId) {
               if (this.userInfo.resiHomeId !== this.fmData.homeId) {

From cb98ec6e0ce44ad9869195cd9d45fc6077d7ed76 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 11 May 2022 17:30:59 +0800
Subject: [PATCH 18/37] dd

---
 .../modules/base/huji/immigration/edit.vue    | 27 +++++++++++++++----
 .../modules/base/huji/immigration/index.vue   |  2 +-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index fa7bad01..183b2c24 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -21,6 +21,7 @@
             size="small"
             clearable
             class="item_width_1"
+            :disabled="formType === 'edit'"
             @change="handleChangeGrid"
           >
             <el-option
@@ -47,6 +48,7 @@
             class="resi-cell-select"
             @clear="handleClearVillage"
             @change="handleChangeV"
+            :disabled="formType === 'edit'"
             style="margin-right: 8px; width: 120px"
           >
             <el-option
@@ -64,7 +66,7 @@
             clearable
             style="margin-right: 8px; width: 120px"
             class="resi-cell-select"
-            :disabled="changeVDisabled"
+            :disabled="changeVDisabled || formType === 'edit'"
             @clear="handleClearBuild"
             @change="handleChangeB"
           >
@@ -78,7 +80,7 @@
           </el-select>
           <el-select
             v-model.trim="fmData.unitId"
-            :disabled="changeBDisabled"
+            :disabled="changeBDisabled || formType === 'edit'"
             placeholder="单元"
             size="small"
             clearable
@@ -97,7 +99,7 @@
           </el-select>
           <el-select
             v-model.trim="fmData.homeId"
-            :disabled="changeDDisabled"
+            :disabled="changeDDisabled || formType === 'edit'"
             placeholder="房号"
             size="small"
             clearable
@@ -126,16 +128,18 @@
             style="margin-right: 20px"
             placeholder="请输入姓名	"
             v-model="fmData.name"
+            :disabled="formType === 'edit'"
           >
           </el-input>
 
-          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0"
+          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0" :disabled="formType === 'edit'"
             >享受福利</el-checkbox
           >
           <el-checkbox
             v-model="fmData.isCheck"
             true-label="1"
             false-label="0"
+            :disabled="formType === 'edit'"
             @change="checkResiAvailable"
             >补充居民信息</el-checkbox
           >
@@ -153,6 +157,7 @@
             maxlength="11"
             show-word-limit
             placeholder="请输入手机号	"
+            :disabled="formType === 'edit'"
             v-model="fmData.mobile"
           >
           </el-input>
@@ -168,6 +173,7 @@
             class="item_width_1"
             placeholder="请输入身份证号"
             v-model="fmData.idCard"
+            :disabled="formType === 'edit'"
             @blur="handleBlurId"
           ></el-input>
         </el-form-item>
@@ -184,6 +190,7 @@
             size="small"
             clearable
             class="item_width_1"
+            :disabled="formType === 'edit'"
           >
             <el-option
               v-for="item in optionsGender"
@@ -204,8 +211,9 @@
             class="item_width_1"
             type="number"
             show-word-limit
-            placeholder="请输入手机号	"
+            placeholder="请输入"
             v-model="fmData.age"
+            :disabled="formType === 'edit'"
           >
           </el-input>
         </el-form-item>
@@ -222,6 +230,7 @@
             placeholder="迁入时间"
             value-format="yyyy-MM-dd HH:mm:ss"
             class="item_width_1"
+            :disabled="formType === 'edit'"
           >
           </el-date-picker>
         </el-form-item>
@@ -541,6 +550,8 @@ export default {
       this.fmData.buildId = ''
       this.fmData.unitId = ''
       this.fmData.homeId = ''
+      this.fmData.householderName = ''
+      this.fmData.householderRelation = ''
       this.getValiheList()
     },
     handleChangeV(val) {
@@ -548,17 +559,23 @@ export default {
       this.fmData.buildId = ''
       this.fmData.unitId = ''
       this.fmData.homeId = ''
+      this.fmData.householderName = ''
+      this.fmData.householderRelation = ''
       this.getBuildList()
     },
     handleChangeB(val) {
       console.log('val', val)
       this.fmData.unitId = ''
       this.fmData.homeId = ''
+      this.fmData.householderName = ''
+      this.fmData.householderRelation = ''
       this.getUniList()
     },
     handleChangeD(val) {
       console.log('val', val)
       this.fmData.homeId = ''
+      this.fmData.householderName = ''
+      this.fmData.householderRelation = ''
       this.getHouseList()
     },
     handleChangeH(val) {
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 897365ca..0c5b8937 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -523,7 +523,7 @@ export default {
     this.getGridList()
     this.getValiheList()
     this.getTableData()
-    this.searchH = this.$refs.searchCard.$el.offsetHeight + 260
+    this.searchH = this.$refs.searchCard.$el.offsetHeight + 270
     console.log('searchH----', this.$refs.searchCard.$el.offsetHeight)
   },
   methods: {

From ee04da846e773c54dd4474286d24ba47c3fb360f Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 10:43:35 +0800
Subject: [PATCH 19/37] dd

---
 src/views/modules/base/huji/immigration/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 0c5b8937..c71e261d 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -143,9 +143,9 @@
           </el-form-item>
         </div>
         <div>
-          <el-form-item label="迁入时间" prop="rangeTime">
+          <el-form-item label="迁入时间" prop="startTime">
             <el-date-picker
-              v-model="fmData.rangeTime"
+              v-model="rangeTime"
               type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
@@ -501,6 +501,7 @@ export default {
   },
   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]

From 5470217091cc04d79ec83104b3a249258ec6b92d Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 11:07:15 +0800
Subject: [PATCH 20/37] dd

---
 src/views/modules/base/huji/immigration/edit.vue  | 6 ++++--
 src/views/modules/base/huji/immigration/index.vue | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 183b2c24..89424a12 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -468,8 +468,9 @@ export default {
   watch: {},
 
   async mounted() {
-    this.getGridList()
-    this.getValiheList()
+    console.log('mounted-----我执行了')
+    await this.getGridList()
+    
     this.getRelationList()
   },
 
@@ -750,6 +751,7 @@ export default {
         await this.getDatail(id)
       }
       if (this.formType != 'add') {
+        this.getValiheList()
         this.getBuildList()
         this.getUniList()
         this.getHouseList()
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index c71e261d..06faa43f 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -409,6 +409,7 @@
       @closed="handleClose"
     >
       <edit-form
+        v-if="formShow"
         ref="eleEditForm"
         @dialogCancle="handleClose"
         @dialogOk="handleEditSuccess"

From 375e5ee4a5cf985104875408ae0b5f9cd772b34e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 12 May 2022 11:22:28 +0800
Subject: [PATCH 21/37] 22

---
 src/views/modules/base/huji/chusheng/cpts/edit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 4ad5714a..003d84b3 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -706,7 +706,7 @@ export default {
       console.log(row);
       if (row) {
         // this.fmData = { ...this.fmData, ...row };
-        this.getInfo(row.id);
+        await this.getInfo(row.id);
         this.getValiheList();
         this.getBuildList();
         this.getUniList();

From 5664d8c007928c5e49bfe128d607cac94fbcf146 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 13:33:05 +0800
Subject: [PATCH 22/37] dd

---
 src/views/components/resiChangeRecord.vue | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/components/resiChangeRecord.vue b/src/views/components/resiChangeRecord.vue
index 58722bdb..7d92656a 100644
--- a/src/views/components/resiChangeRecord.vue
+++ b/src/views/components/resiChangeRecord.vue
@@ -36,10 +36,16 @@
       <el-table-column prop="changeTime"
                        header-align="center"
                        align="center"
-                       label="调整时间"
+                       label="变更时间"
                        width="160">
       </el-table-column>
-
+      <el-table-column prop="remark"
+                       header-align="center"
+                       align="center"
+                       label="原因"
+                       show-overflow-tooltip
+                       min-width="120">
+      </el-table-column>
       <el-table-column prop="operatorName"
                        header-align="center"
                        align="center"
@@ -51,9 +57,15 @@
                        header-align="center"
                        align="center"
                        label="备注"
-                       width="120">
+                       show-overflow-tooltip
+                       min-width="120">
+      </el-table-column>
+      <el-table-column prop="createdTime"
+                       header-align="center"
+                       align="center"
+                       label="调整时间"
+                       width="160">
       </el-table-column>
-
     </el-table>
     <div>
       <el-pagination @size-change="handleSizeChange"

From 8ff55a762b162ddf80239c4851e396c3c60d8354 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 12 May 2022 13:51:53 +0800
Subject: [PATCH 23/37] 66

---
 src/views/modules/base/huji/chusheng/cpts/edit.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 003d84b3..2c9a6405 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -808,7 +808,6 @@ export default {
       this.optionsB = [];
       this.optionsH = [];
       this.optionsD = [];
-      this.optionsRelation = [];
       this.fmData = iniFmData();
     },
     // 开启加载动画

From aa2ffbe015938f79a40a82e15281cfed9f7c04f5 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 14:45:53 +0800
Subject: [PATCH 24/37] dd

---
 src/views/modules/base/huji/immigration/edit.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 89424a12..f8dcf6eb 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -777,7 +777,7 @@ export default {
       // }, 10000)
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
-          app.util.validateRule(messageObj)
+          // app.util.validateRule(messageObj)
           this.btnDisable = false
         } else {
           if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
@@ -846,6 +846,7 @@ export default {
       this.orgId = ''
       this.nowAllCode = []
       this.btnDisable = false
+      this.userInfo = {}
       this.fmData = iniFmData()
     }
   }

From 010ccbe8770c9c6924c6e08fb4c35a9065831087 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 14:55:21 +0800
Subject: [PATCH 25/37] dd

---
 src/views/modules/base/huji/immigration/edit.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index f8dcf6eb..c226f35a 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -771,7 +771,7 @@ export default {
     },
 
     async handleComfirm() {
-      this.btnDisable = true
+      
       // setTimeout(() => {
       //   this.btnDisable = false
       // }, 10000)
@@ -786,6 +786,7 @@ export default {
               message: '手机号格式有误'
             })
           }
+          this.btnDisable = true
           if (this.fmData.isCheck && this.userInfo && this.userInfo.resiHomeId) {
             const { user } = this.$store.state
             if (user.agencyId == this.userInfo.resiAgencyId) {
@@ -804,8 +805,8 @@ export default {
                 return
               }
             }
-            
-          } else this.submit()
+          }
+          this.submit()
           
         }
       })

From 4828379239d73580798136d4f0e98b21f74e54cb Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 15:03:11 +0800
Subject: [PATCH 26/37] dd

---
 src/views/modules/base/huji/immigration/edit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index c226f35a..6754fd0d 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -500,7 +500,7 @@ export default {
               message: `请联系${data.resiAgencyName}迁出该居民后操作`
             })
             this.btnDisable = true
-          }
+          } else this.btnDisable = false
           this.userInfo = { ...data }
         } else {
           this.$message.error(msg)

From 5c62e71359d23768ffd95d61d9f770f3ce6544a9 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 15:08:26 +0800
Subject: [PATCH 27/37] dd

---
 src/views/modules/base/huji/immigration/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 06faa43f..283abe28 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -347,9 +347,10 @@
         >
         </el-table-column>
 
-        <el-table-column fixed="right" label="操作" align="center" width="160">
+        <el-table-column fixed="right" label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button
+              v-if="false"
               @click="handleWatch(scope.$index)"
               type="text"
               size="small"

From 7ea189d71dbffb7d20c8c1e4231d726996776f1a Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 15:14:04 +0800
Subject: [PATCH 28/37] dd

---
 src/views/components/resiChangeRecord.vue | 41 ++++++++++++-----------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/views/components/resiChangeRecord.vue b/src/views/components/resiChangeRecord.vue
index 7d92656a..a13585a8 100644
--- a/src/views/components/resiChangeRecord.vue
+++ b/src/views/components/resiChangeRecord.vue
@@ -20,38 +20,46 @@
                        label="变更类型"
                        width="80">
       </el-table-column>
-      <el-table-column prop="beforeChangeName"
-                       header-align="center"
-                       align="center"
-                       label="变更前"
-                       width="230">
-      </el-table-column>
-      <el-table-column prop="afterChangeName"
+      <el-table-column prop="reason"
                        header-align="center"
                        align="center"
-                       label="变更后"
-                       min-width="230">
+                       label="原因"
+                       show-overflow-tooltip
+                       min-width="120">
       </el-table-column>
-
       <el-table-column prop="changeTime"
                        header-align="center"
                        align="center"
                        label="变更时间"
                        width="160">
       </el-table-column>
-      <el-table-column prop="remark"
+      <el-table-column prop="beforeChangeName"
                        header-align="center"
                        align="center"
-                       label="原因"
+                       label="变更前"
                        show-overflow-tooltip
-                       min-width="120">
+                       width="230">
       </el-table-column>
+      <el-table-column prop="afterChangeName"
+                       header-align="center"
+                       align="center"
+                       label="变更后"
+                       show-overflow-tooltip
+                       min-width="230">
+      </el-table-column>
+      
       <el-table-column prop="operatorName"
                        header-align="center"
                        align="center"
                        label="操作人"
                        width="80">
       </el-table-column>
+      <el-table-column prop="createdTime"
+                       header-align="center"
+                       align="center"
+                       label="调整时间"
+                       width="160">
+      </el-table-column>
 
       <el-table-column prop="remark"
                        header-align="center"
@@ -60,12 +68,7 @@
                        show-overflow-tooltip
                        min-width="120">
       </el-table-column>
-      <el-table-column prop="createdTime"
-                       header-align="center"
-                       align="center"
-                       label="调整时间"
-                       width="160">
-      </el-table-column>
+      
     </el-table>
     <div>
       <el-pagination @size-change="handleSizeChange"

From c99fae3264581adfb5cf9ff2f2f6168c01446433 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 12 May 2022 15:36:56 +0800
Subject: [PATCH 29/37] 000

---
 .../modules/base/huji/chusheng/index.vue      | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index bdf9db96..e8677dac 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -275,41 +275,69 @@
           width="100"
           align="center"
           label="手机号"
+          :show-overflow-tooltip="true"
         >
         </el-table-column>
 
-        <el-table-column prop="idCard" align="center" label="身份证号">
+        <el-table-column
+          prop="idCard"
+          align="center"
+          label="身份证号"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
         <el-table-column prop="gender" align="center" label="性别">
         </el-table-column>
 
-        <el-table-column prop="birthday" align="center" label="出生日期">
+        <el-table-column
+          prop="birthday"
+          align="center"
+          label="出生日期"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
-        <el-table-column prop="birthplace" align="center" label="出生地">
+        <el-table-column
+          prop="birthplace"
+          align="center"
+          label="出生地"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
         <el-table-column
           prop="parentName"
           align="center"
           label="出生人父/母姓名"
+          :show-overflow-tooltip="true"
         >
         </el-table-column>
 
         <el-table-column prop="count" align="center" label="胎次">
         </el-table-column>
 
-        <el-table-column prop="reportDate" align="center" label="申报户口日期">
+        <el-table-column
+          prop="reportDate"
+          align="center"
+          label="申报户口日期"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
-        <el-table-column prop="householderName" align="center" label="户主姓名">
+        <el-table-column
+          prop="householderName"
+          align="center"
+          label="户主姓名"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
 
         <el-table-column
           prop="householderRelation"
           align="center"
           label="与户主关系"
+          :show-overflow-tooltip="true"
         >
         </el-table-column>
 

From 774d420ff98195772d4aad2caa69076f9717f43f Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 12 May 2022 15:53:29 +0800
Subject: [PATCH 30/37] dd

---
 .../modules/base/huji/immigration/edit.vue    | 166 ++++++++++--------
 .../modules/base/huji/immigration/index.vue   |   2 +-
 2 files changed, 89 insertions(+), 79 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 6754fd0d..1365b5ec 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -40,81 +40,90 @@
           label-width="150px"
           style="display: block"
         >
-          <el-select
-            v-model.trim="fmData.villageId"
-            placeholder="请选择小区"
-            size="small"
-            clearable
-            class="resi-cell-select"
-            @clear="handleClearVillage"
-            @change="handleChangeV"
-            :disabled="formType === 'edit'"
-            style="margin-right: 8px; width: 120px"
-          >
-            <el-option
-              v-for="item in optionsV"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+          <el-input
+            v-if="formType == 'detail'"
+            class="item_width_2"
+            placeholder="请输入来源地"
+            disabled
+            v-model="fmData.allName"
+          />
+          <template v-else>
+            <el-select
+              v-model.trim="fmData.villageId"
+              placeholder="请选择小区"
+              size="small"
+              clearable
+              class="resi-cell-select"
+              @clear="handleClearVillage"
+              @change="handleChangeV"
+              :disabled="formType === 'edit'"
+              style="margin-right: 8px; width: 120px"
             >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model.trim="fmData.buildId"
-            placeholder="楼号"
-            size="small"
-            clearable
-            style="margin-right: 8px; width: 120px"
-            class="resi-cell-select"
-            :disabled="changeVDisabled || formType === 'edit'"
-            @clear="handleClearBuild"
-            @change="handleChangeB"
-          >
-            <el-option
-              v-for="item in optionsB"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              <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
+              style="margin-right: 8px; width: 120px"
+              class="resi-cell-select"
+              :disabled="changeVDisabled || formType === 'edit'"
+              @clear="handleClearBuild"
+              @change="handleChangeB"
             >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model.trim="fmData.unitId"
-            :disabled="changeBDisabled || formType === 'edit'"
-            placeholder="单元"
-            size="small"
-            clearable
-            style="margin-right: 8px; width: 120px"
-            class="resi-cell-select"
-            @click="handleClearDan"
-            @change="handleChangeD"
-          >
-            <el-option
-              v-for="item in optionsD"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              <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"
+              :disabled="changeBDisabled || formType === 'edit'"
+              placeholder="单元"
+              size="small"
+              clearable
+              style="margin-right: 8px; width: 120px"
+              class="resi-cell-select"
+              @click="handleClearDan"
+              @change="handleChangeD"
             >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model.trim="fmData.homeId"
-            :disabled="changeDDisabled || formType === 'edit'"
-            placeholder="房号"
-            size="small"
-            clearable
-            @change="handleChangeH"
-            style="width: 120px"
-            class="resi-cell-select"
-          >
-            <el-option
-              v-for="item in optionsH"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              <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"
+              :disabled="changeDDisabled || formType === 'edit'"
+              placeholder="房号"
+              size="small"
+              clearable
+              @change="handleChangeH"
+              style="width: 120px"
+              class="resi-cell-select"
             >
-            </el-option>
-          </el-select>
+              <el-option
+                v-for="item in optionsH"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </template>
         </el-form-item>
 
         <el-form-item
@@ -256,16 +265,17 @@
           label-width="150px"
           style="display: block"
         >
-          <el-cascader ref="nowArea" class="item_width_1" :props="areaProps" 
-            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
-          <!-- <el-input
-            class="item_width_1"
+          <el-input
+            v-if="formType == 'detail'"
+            class="item_width_2"
             placeholder="请输入来源地"
+            disabled
             v-model="fmData.sourceAddress"
-          > -->
-          </el-input>
+          />
+          <el-cascader v-else ref="nowArea" class="item_width_1" :props="areaProps" 
+            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+          
         </el-form-item>
-
         <el-form-item
           label="详细地址"
           prop="address"
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 283abe28..316ca203 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -292,7 +292,7 @@
         >
         </el-table-column>
 
-        <el-table-column prop="gender" align="center" width="60" label="性别">
+        <el-table-column prop="genderName" align="center" width="60" label="性别">
         </el-table-column>
 
         <el-table-column prop="age" align="center" width="60" label="年龄">

From 694dfbd64ef59c64ea1be59069e016a0ee5bbad0 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 12 May 2022 15:56:50 +0800
Subject: [PATCH 31/37] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0-=E7=A4=BE=E5=8C=BA=E6=B2=BB=E7=90=86-=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E4=B8=8B=E6=8B=89=E6=A1=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityGovern/processAnalyze.vue | 47 +++++++++----------
 .../visual/communityGovern/typeAnalyze.vue    |  6 ++-
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue
index 7c2c3276..186b05bd 100644
--- a/src/views/modules/visual/communityGovern/processAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/processAnalyze.vue
@@ -183,26 +183,7 @@ export default {
       status: 'pending',//状态:待处理 pending，结案closed
       agencyInfo: {},
       projectList: [],
-      projectList1: [
-        {
-          agencyId: '',
-          projectId: '',
-          origin: '',
-          status: 'pending',
-          title: '南宁第二网格南宁第二网格',
-          latitude: 36.062227,
-          longitude: 120.389455,
-        },
-        {
-          agencyId: '',
-          projectId: '',
-          origin: '',
-          status: 'closed',
-          latitude: 36.082227,
-          longitude: 120.389455,
-          title: "南宁第二网格",
-        }
-      ],
+
 
       iconUrlArray: [],
       iconTextStyle: {},
@@ -212,6 +193,7 @@ export default {
       customerList: [],
       iscascaderShow: 0,
 
+
       optionProps: {
         multiple: false,
         value: 'agencyId',
@@ -273,6 +255,13 @@ export default {
 
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
+        let treeData = []
+        console.log(this.treeData)
+        treeData.push(data)
+        //重构树，去除网格
+        let treeDataNew
+        treeDataNew = this.filterTree(treeData)
+
         this.agencyInfo = data
         this.agencyId = this.agencyInfo.agencyId
         if (!this.agencyInfo.latitude) {
@@ -291,7 +280,7 @@ export default {
         this.agencyIdArray.length = []
 
         if (data) {
-          this.casOptions.push(data)
+          this.casOptions = treeDataNew
           this.agencyIdArray.push(this.agencyId)
         }
 
@@ -301,6 +290,17 @@ export default {
 
     },
 
+    //重构树，去除网格
+    filterTree (treeData) {
+
+      let newTree = treeData.filter(x => x.level !== 'grid')
+      newTree.forEach(x => x.subAgencyList && (x.subAgencyList = this.filterTree(x.subAgencyList)))
+      return newTree
+
+    },
+
+
+
     //加载项目
     async getProjectTotal () {
       if (this.$refs.pieChart) {
@@ -370,12 +370,7 @@ export default {
       if (code === 0) {
 
         this.projectList = [...data]
-        // if (this.status === 'closed') {
-        //   this.projectList = this.projectList1
-        // } else {
-        //   this.projectList = this.projectList2
 
-        // }
         this.projectList.forEach(item => {
           item.values_ = {
             name: item.title
diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue
index d5ec1516..32c4c41d 100644
--- a/src/views/modules/visual/communityGovern/typeAnalyze.vue
+++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue
@@ -210,12 +210,14 @@ export default {
 
     // 获取当前登录人员信息及组织信息
     async getAgencylist () {
-      const url = "/gov/org/customeragency/agencygridtree";
+      // const url = "/gov/org/customeragency/agencygridtree";
+      const url = '/gov/org/customeragency/agencylist'
 
       let params = {};
 
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
+
         this.agencyInfo = data
         this.agencyId = this.agencyInfo.agencyId
         if (!this.agencyInfo.latitude) {
@@ -389,7 +391,7 @@ export default {
     },
 
     async handleChangeAgency (value) {
-
+      this.demand.list = []
       this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
       this.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''
       await this.getPieChart()

From 07055a98e8f4bf7154ab5920b8239740aeb5f6ca Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 13 May 2022 09:37:29 +0800
Subject: [PATCH 32/37] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/epidemic.scss     |  7 +++--
 .../base/huji/houseChange/houseChangeList.vue | 28 +++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index 5de15397..f8ff057c 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -37,12 +37,15 @@
   .div_search {
     background: #ffffff;
     border-radius: 4px;
-    padding: 30px 20px 5px;
+    padding: 20px 20px 5px 5px;
     box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
   }
 
   .list_item_width_1 {
-    width: 185px;
+    width: 165px;
+  }
+  .list_item_width_2 {
+    width: 135px;
   }
 }
 
diff --git a/src/views/modules/base/huji/houseChange/houseChangeList.vue b/src/views/modules/base/huji/houseChange/houseChangeList.vue
index 32ac7815..5ff47c77 100644
--- a/src/views/modules/base/huji/houseChange/houseChangeList.vue
+++ b/src/views/modules/base/huji/houseChange/houseChangeList.vue
@@ -4,7 +4,7 @@
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
-               :label-width="'90px'">
+               :label-width="'80px'">
         <div>
 
           <el-form-item label="所属网格"
@@ -48,7 +48,7 @@
                              :disabled="!this.formData.neighborHoodId"
                              size="small"
                              clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             class="resi-cell-select resi-cell-select-middle list_item_width_2"
                              @change="handleChangeB">
                     <el-option v-for="item in optionsB"
                                :key="item.value"
@@ -63,7 +63,7 @@
                              size="small"
                              :disabled="!this.formData.buildingId"
                              clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             class="resi-cell-select resi-cell-select-middle list_item_width_2"
                              @change="handleChangeD">
                     <el-option v-for="item in optionsD"
                                :key="item.value"
@@ -78,7 +78,7 @@
                              :disabled="!this.formData.buildingUnitId"
                              size="small"
                              clearable
-                             class="resi-cell-select resi-cell-select-middle list_item_width_1">
+                             class="resi-cell-select resi-cell-select-middle list_item_width_2">
                     <el-option v-for="item in optionsH"
                                :key="item.value"
                                :label="item.label"
@@ -305,9 +305,9 @@ export default {
       this.formData.buildingUnitId = ''
       this.formData.houseId = ''
       this.getValiheList()
-      this.getBuildList()
-      this.getUniList()
-      this.getHouseList()
+      // this.getBuildList()
+      // this.getUniList()
+      // this.getHouseList()
     },
     handleChangeV (val) {
       console.log('val', val)
@@ -315,15 +315,15 @@ export default {
       this.formData.buildingUnitId = ''
       this.formData.houseId = ''
       this.getBuildList()
-      this.getUniList()
-      this.getHouseList()
+      // this.getUniList()
+      // this.getHouseList()
     },
     handleChangeB (val) {
       console.log('val', val)
       this.formData.buildingUnitId = ''
       this.formData.houseId = ''
       this.getUniList()
-      this.getHouseList()
+      // this.getHouseList()
     },
     handleChangeD () {
       this.formData.houseId = ''
@@ -379,7 +379,7 @@ export default {
     },
     getHouseList () {
       this.$http
-        .post('/gov/org/ichouse/houseoption', { buildingUnitId: this.formData.buildingUnitId })
+        .post('/gov/org/ichouse/houseoption', { unitId: this.formData.buildingUnitId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -462,7 +462,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415
+      return this.$store.state.inIframe ? this.clientHeight - 365 + this.iframeHeight : this.clientHeight - 365
 
     },
 
@@ -479,6 +479,10 @@ export default {
 
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/management/epidemic.scss";
+
+.item_width_1 {
+  width: 260px;
+}
 </style>
 
 

From 12f6caa1c380f1c15f4acec3556d482cc0bc3771 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 13 May 2022 09:58:01 +0800
Subject: [PATCH 33/37] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/huji/chusheng/cpts/edit.vue  |  10 +-
 .../modules/base/huji/chusheng/index.vue      | 376 +++++++++---------
 2 files changed, 194 insertions(+), 192 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 2c9a6405..ccf2018e 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -126,7 +126,7 @@
         >
           <el-input
             class="item_width_1"
-            maxlength="50"
+            maxlength="30"
             show-word-limit
             style="width: 200px; margin-right: 20px"
             placeholder="请输入姓名	"
@@ -160,8 +160,7 @@
         >
           <el-input
             class="item_width_1"
-            type="number"
-            maxlength="50"
+            maxlength="30"
             show-word-limit
             placeholder="请输入手机号	"
             v-model="fmData.mobile"
@@ -178,6 +177,7 @@
         >
           <el-input
             class="item_width_1"
+            maxlength="30"
             placeholder="请输入身份证号"
             v-model="fmData.idCard"
             @blur="handleBlurId"
@@ -250,7 +250,7 @@
         >
           <el-input
             class="item_width_1"
-            maxlength="50"
+            maxlength="30"
             show-word-limit
             placeholder="请输入出生人父亲姓名"
             v-model="fmData.father"
@@ -266,7 +266,7 @@
         >
           <el-input
             class="item_width_1"
-            maxlength="50"
+            maxlength="30"
             show-word-limit
             placeholder="请输入出生人母亲姓名"
             v-model="fmData.mother"
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index e8677dac..9995bdaf 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -7,189 +7,188 @@
         :model="fmData"
         class="demo-form-inline"
       >
-        <el-row class="resi-row">
-          <el-col :span="6">
-            <div class="resi-cell2">
-              <div class="resi-cell2-label">所属网格</div>
-              <div class="resi-cell2-value">
-                <el-select
-                  v-model.trim="fmData.gridId"
-                  placeholder="请选择"
-                  size="small"
-                  clearable
-                  class="resi-cell2-select"
-                  @change="handleChangeGrid"
+        <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
-                    v-for="item in optionsG"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </div>
+                </el-option>
+              </el-select>
             </div>
-          </el-col>
-          <el-col :span="18">
-            <div class="resi-cell2">
-              <div class="resi-cell2-label">所属房屋</div>
-              <div class="resi-cell2-value">
-                <el-select
-                  v-model.trim="fmData.villageId"
-                  placeholder="请选择小区"
-                  size="small"
-                  clearable
-                  class="resi-cell2-select"
-                  @clear="handleClearVillage"
-                  @change="handleChangeV"
+          </el-form-item>
+
+          <el-form-item label="所属房屋">
+            <div class="resi-cell-value">
+              <el-select
+                v-model.trim="fmData.villageId"
+                placeholder="请选择小区"
+                size="small"
+                clearable
+                class="resi-cell-select"
+                @clear="handleClearVillage"
+                @change="handleChangeV"
+              >
+                <el-option
+                  v-for="item in optionsV"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
-                  <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
-                  style="width: 120px"
-                  class="resi-cell2-select"
-                  :disabled="changeVDisabled"
-                  @clear="handleClearBuild"
-                  @change="handleChangeB"
+                </el-option>
+              </el-select>
+              <el-select
+                v-model.trim="fmData.buildId"
+                placeholder="楼号"
+                size="small"
+                clearable
+                style="width: 120px"
+                class="resi-cell-select"
+                :disabled="changeVDisabled"
+                @clear="handleClearBuild"
+                @change="handleChangeB"
+              >
+                <el-option
+                  v-for="item in optionsB"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
-                  <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"
-                  :disabled="changeBDisabled"
-                  placeholder="单元"
-                  size="small"
-                  clearable
-                  style="width: 120px"
-                  class="resi-cell2-select"
-                  @click="handleClearDan"
-                  @change="handleChangeD"
+                </el-option>
+              </el-select>
+              <el-select
+                v-model.trim="fmData.unitId"
+                :disabled="changeBDisabled"
+                placeholder="单元"
+                size="small"
+                clearable
+                style="width: 120px"
+                class="resi-cell-select"
+                @click="handleClearDan"
+                @change="handleChangeD"
+              >
+                <el-option
+                  v-for="item in optionsD"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
-                  <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"
-                  :disabled="changeDDisabled"
-                  placeholder="房号"
-                  size="small"
-                  clearable
-                  style="width: 120px"
-                  class="resi-cell2-select"
+                </el-option>
+              </el-select>
+              <el-select
+                v-model.trim="fmData.homeId"
+                :disabled="changeDDisabled"
+                placeholder="房号"
+                size="small"
+                clearable
+                style="width: 120px"
+                class="resi-cell-select"
+              >
+                <el-option
+                  v-for="item in optionsH"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
-                  <el-option
-                    v-for="item in optionsH"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </div>
+                </el-option>
+              </el-select>
             </div>
-          </el-col>
-        </el-row>
-
-        <el-form-item label="姓名" prop="name">
-          <el-input
-            v-model="fmData.name"
-            class="resi-cell2-input"
-            size="small"
-            clearable
-            placeholder="请输入"
-          >
-          </el-input>
-        </el-form-item>
+          </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-cell2-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-cell2-input"
-            size="small"
-            clearable
-            placeholder="请输入"
-          >
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="出生日期" prop="birthdayTime">
-          <el-date-picker
-            v-model="fmData.birthdayTime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </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>
+        </div>
+
+        <div>
+          <el-form-item label="出生日期" prop="birthdayTime">
+            <el-date-picker
+              v-model="fmData.birthdayTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
 
-        <el-form-item label="享受福利" prop="remark">
-          <el-select
-            v-model.trim="fmData.isWelfare"
-            placeholder="享受福利"
-            size="small"
-            clearable
-            style="width: 120px"
-            class="resi-cell2-select"
-          >
-            <el-option
-              v-for="item in optionsWelfare"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+          <el-form-item label="享受福利" prop="remark">
+            <el-select
+              v-model.trim="fmData.isWelfare"
+              placeholder="请选择"
+              size="small"
+              clearable
+              style="width: 120px"
+              class="resi-cell-select"
             >
-            </el-option>
-          </el-select>
-        </el-form-item>
+              <el-option
+                v-for="item in optionsWelfare"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </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>
+          <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">
@@ -440,10 +439,10 @@ export default {
       optionsG: [],
 
       optionsWelfare: [
-        {
-          value: "",
-          label: "全部",
-        },
+        // {
+        //   value: "",
+        //   label: "全部",
+        // },
         {
           value: "1",
           label: "是",
@@ -882,7 +881,6 @@ export default {
   },
 };
 </script>
-
 <style lang="scss" scoped>
 @import "@/assets/scss/buttonstyle.scss";
 
@@ -919,12 +917,12 @@ export default {
   overflow: visible;
 }
 
-.demo-form-inline .resi-cell2 {
-  display: flex;
-  align-items: center;
-  margin-bottom: 20px;
+.demo-form-inline {
+  // display: flex;
+  // align-items: center;
+  // margin-bottom: 20px;
 
-  .resi-cell2-label {
+  .resi-cell-label {
     flex-shrink: 0;
     min-width: 0;
     box-sizing: border-box;
@@ -932,21 +930,21 @@ export default {
     // text-align: right;
     // line-height: 32;
   }
-  .resi-cell2-label1 {
+  .resi-cell-label1 {
     width: max-content;
   }
-  .resi-cell2-value-radio {
+  .resi-cell-value-radio {
     display: flex;
     align-items: center;
     min-height: 32px;
   }
-  .resi-cell2-input {
+  .resi-cell-input {
     width: 200px;
   }
-  .resi-cell2--daterange {
+  .resi-cell--daterange {
     max-width: 260px;
   }
-  .resi-cell2-select {
+  .resi-cell-select {
     width: 200px;
     box-sizing: border-box;
     margin-right: 10px;
@@ -957,8 +955,12 @@ export default {
       width: 88px;
     }
   }
-  .resi-cell2-select:last-child {
+  .resi-cell-select:last-child {
     margin-right: 0;
   }
 }
+
+.mt10 {
+  margin-top: 10px;
+}
 </style>

From 0954a007e48b9a0db8220c95dcdf923fc33f4af5 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 13 May 2022 09:59:52 +0800
Subject: [PATCH 34/37] dd

---
 src/views/modules/base/huji/immigration/edit.vue  | 11 ++++++-----
 src/views/modules/base/huji/immigration/index.vue | 11 +++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 1365b5ec..8cf1a260 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -138,6 +138,7 @@
             placeholder="请输入姓名	"
             v-model="fmData.name"
             :disabled="formType === 'edit'"
+            maxlength="30"
           >
           </el-input>
 
@@ -199,7 +200,7 @@
             size="small"
             clearable
             class="item_width_1"
-            :disabled="formType === 'edit'"
+            :disabled="true"
           >
             <el-option
               v-for="item in optionsGender"
@@ -222,7 +223,7 @@
             show-word-limit
             placeholder="请输入"
             v-model="fmData.age"
-            :disabled="formType === 'edit'"
+            :disabled="true"
           >
           </el-input>
         </el-form-item>
@@ -235,9 +236,9 @@
         >
           <el-date-picker
             v-model="fmData.inTime"
-            type="datetime"
+            type="date"
             placeholder="迁入时间"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd"
             class="item_width_1"
             :disabled="formType === 'edit'"
           >
@@ -797,7 +798,7 @@ export default {
             })
           }
           this.btnDisable = true
-          if (this.fmData.isCheck && this.userInfo && this.userInfo.resiHomeId) {
+          if (this.fmData.isCheck == '1' && this.userInfo && this.userInfo.resiHomeId) {
             const { user } = this.$store.state
             if (user.agencyId == this.userInfo.resiAgencyId) {
               if (this.userInfo.resiHomeId !== this.fmData.homeId) {
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 316ca203..64134370 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -53,9 +53,10 @@
                 <el-form-item prop="buildId">
                   <el-select
                     v-model.trim="fmData.buildId"
-                    placeholder="请选择楼号"
+                    placeholder="楼号"
                     size="small"
                     clearable
+                    :disabled="changeVDisabled"
                     class="resi-cell-select resi-cell-select-middle"
                     @change="handleChangeB"
                   >
@@ -71,9 +72,10 @@
                 <el-form-item prop="unitId">
                   <el-select
                     v-model.trim="fmData.unitId"
-                    placeholder="请选择单元"
+                    placeholder="单元"
                     size="small"
                     clearable
+                    :disabled="changeBDisabled"
                     class="resi-cell-select resi-cell-select-middle"
                     @change="handleChangeD"
                   >
@@ -89,9 +91,10 @@
                 <el-form-item prop="homeId">
                   <el-select
                     v-model.trim="fmData.homeId"
-                    placeholder="请选择房号"
+                    placeholder="房号"
                     size="small"
                     clearable
+                    :disabled="changeDDisabled"
                     class="resi-cell-select resi-cell-select-middle"
                   >
                     <el-option
@@ -1032,7 +1035,7 @@ export default {
     box-sizing: border-box;
     margin-right: 10px;
     &-middle {
-      width: 130px;
+      width: 120px;
     }
     &-small {
       width: 88px;

From 3b9fe8ab3f68f54cdba91a9129ca1cd4eaa3f64f Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 13 May 2022 10:07:39 +0800
Subject: [PATCH 35/37] =?UTF-8?q?=E5=AF=B9=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 7f2b7357..a76cfa99 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -126,10 +126,10 @@
                        type="text"
                        size="small"
                        class="btn-color-look">查看</el-button> -->
-            <el-button @click="handleTransfer(scope.row)"
+            <!-- <el-button @click="handleTransfer(scope.row)" 
                        type="text"
                        size="small"
-                       class="div-table-button--detail">变动</el-button>
+                       class="div-table-button--detail">变动</el-button> -->
             <el-button @click="handleChangeRecord(scope.row)"
                        type="text"
                        size="small"

From e5d8e469c5b80caa25800429f37e4f0810d95601 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 13 May 2022 10:12:48 +0800
Subject: [PATCH 36/37] 0

---
 src/views/modules/base/huji/chusheng/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 9995bdaf..99b9837f 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -5,6 +5,7 @@
         ref="searchForm"
         :inline="true"
         :model="fmData"
+        :label-width="'100px'"
         class="demo-form-inline"
       >
         <div>

From e734c4196ae1c4ac0c7278116b3e442ff6649064 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 13 May 2022 13:40:51 +0800
Subject: [PATCH 37/37] =?UTF-8?q?=E6=88=BF=E4=B8=BB=E5=A7=93=E5=90=8D?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/roomForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 37316861..aaf8d1a5 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -86,6 +86,7 @@
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
+                    maxlength="30"
                     placeholder="请输入房主姓名"
                     v-model="dataForm.ownerName">
           </el-input>