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 1/3] =?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 60d6243a12bb65074eefcfb40c40d517f6666118 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 10 May 2022 09:32:32 +0800
Subject: [PATCH 2/3] 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 3/3] =?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,