居民信息调整

src/js/columns/constants/index.js

@@ -59,3 +59,29 @@ export const dormitoryTypeList = [
     value: '0'
   }
 ]
+export const idTypeList = [
+  {
+    label: '其他',
+    value: 0
+  },
+  {
+    label: '身份证',
+    value: 1
+  },
+  {
+    label: '护照',
+    value: 2
+  },
+  {
+    label: '港澳通行证',
+    value: 3
+  },
+  {
+    label: '军人证',
+    value: 4
+  },
+  {
+    label: '台胞证',
+    value: 5
+  }
+]

src/views/components/resiSearch.vue

@@ -833,7 +833,7 @@ export default {
         agencyIdTemp = this.form.agencyId[this.form.agencyId.length - 1]
       }
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', {
+        .post('/actual/base/communityQuarters/listQuartersOptions', {
           gridId: this.form.agencyId[1],
           agencyId: this.form.agencyId[0],
           // agencyId: user.agencyId

src/views/modules/base/resi.vue

@@ -145,7 +145,7 @@
               <template v-if="scope.row.categoryInfo">
                 <div class="resiCategoryInfoBox">
                   {{
-									scope.row.categoryInfo.bereavedPersonFlag ==
+									scope.row.categoryInfo.specialSupportFlag ==
 									1
 										? "特扶人员 "
 										: ""
@@ -332,7 +332,7 @@
 				formName === '社区居民基本信息录入表' ? '新增居民' : formName
 			"
                :visible.sync="dialogVisible"
-               width="986px"
+               width="1086px"
                top="5vh"
                append-to-body
                class="dialog-h"
@@ -518,9 +518,11 @@ export default {
         { columnName: "name", label: "姓名", width: 80 },
         { columnName: "birthday", label: "生日", width: 100 },
         { columnName: "gender", label: "性别", width: 50 },
+        { columnName: "nationalityName", label: "国籍", width: 50 },
         { columnName: "agencyName", label: "所属组织", width: 150 },
         { columnName: "gridName", label: "所属网格", width: 150 },
         { columnName: "homeName", label: "所属房屋", width: 150 },
+        { columnName: "idTypeName", label: "证件类型", width: 80 },
         { columnName: "idNum", label: "证件号", width: 170 },
         { columnName: "categoryInfo", label: "居民分类" },
         { columnName: "mobile", label: "联系电话", width: 110 },
@@ -583,6 +585,7 @@ export default {
         categoryKey: "resi_info",
       },
     });
+    this.handleSearchFrom()
   },
 
   methods: {
@@ -1063,7 +1066,7 @@ export default {
         return;
       }
       const _baseForm = JSON.parse(this.$refs.baseForm.submit_from());
-      console.log(_baseForm);
+
       _baseForm.partyFlag = parseInt(_baseForm.partyFlag); //党员
       _baseForm.subsistenceAllowanceFlag = parseInt(
         _baseForm.subsistenceAllowanceFlag
@@ -1080,9 +1083,9 @@ export default {
       //信访人员
       _baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag); //失业
       _baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag); //志愿者
-      _baseForm.bereavedPersonFlag = parseInt(
+      _baseForm.specialSupportFlag = parseInt(
-        _baseForm.bereavedPersonFlag
+        _baseForm.specialSupportFlag
-      ); //失独
+      ); //特扶
       _baseForm.tenantFlag = parseInt(_baseForm.tenantFlag); //租户
       _baseForm.floatingFlag = parseInt(_baseForm.floatingFlag); //流动人口
       _baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag); //特殊人群
@@ -1155,7 +1158,7 @@ export default {
             specialCategoryCode;
         }
       }
-      console.log(_baseForm);
+      console.log('居民信息提交表单：', _baseForm);
       this.submitAdd(_baseForm);
     },
     handleDel (row) {
@@ -1181,7 +1184,7 @@ export default {
       this.dialogVisible = false;
     },
     async submitAdd (arr) {
-      console.log(arr);
+
       this.btnLoading = true;
       await this.$http
         .post(

src/views/modules/base/residentManagement/louzhang/louzhangList.vue

@@ -373,7 +373,7 @@ export default {
     getValiheList () {
 
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', {
+        .post('/actual/base/communityQuarters/listQuartersOptions', {
           gridId: '',
           agencyId: '',
           // agencyId: user.agencyId
@@ -531,6 +531,7 @@ export default {
       const { data, code, msg } = await requestPost(url, {
         pageSize,
         pageNo,
+        agencyId: this.agencyId,
         ...formData,
       });
       this.tableLoading = false;