From c650d900eeed149d6ec912831f20e4f2c5ffc670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E9=AD=81?= <2403457699@qq.com>
Date: Fri, 6 Jan 2023 19:01:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scss/modules/management/list-main.scss | 4 +
src/views/components/resiForm.vue | 211 +++++++--------
src/views/components/resiSearch.vue | 251 +++++++++---------
src/views/modules/base/resi.vue | 165 ++++++------
4 files changed, 307 insertions(+), 324 deletions(-)
diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index 1c9e5fd72..e15232812 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -38,6 +38,10 @@
.u-item-width-communitycascader{
width: 141px;
}
+ // 查询栏人防年龄两个输入框
+ .u-item-width-resiAge{
+ width: 67px;
+ }
.u-item-width-buildcascader{
width: 96px;
}
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index a4df68c01..883faf13d 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -1,7 +1,7 @@
-
-
-
+
@@ -81,8 +81,8 @@
-
-
+
+
@@ -99,7 +99,7 @@
-
@@ -133,17 +133,17 @@
resize="none"
rows="3"
v-model.trim="form[item.formName]"
-
+
>
- handleChangeCheckbox(val,items)"
>
-
+
-
+
-
@@ -195,9 +195,9 @@
:key="items.value"
:label="items.label"
:value="items.value">
-
+
-
+
-
-
-
+
-
+
@@ -303,7 +303,7 @@ export default {
formName:"name",
rules:[{required:true,message:'居民姓名不能为空',trigger:'blur'}],
opction:[
-
+
],
},
{
@@ -311,7 +311,7 @@ export default {
itemType:"input",
formName:"mobile",
opction:[
-
+
],
},
{
@@ -328,7 +328,7 @@ export default {
},trigger:'change' | blur }
],
opction:[
-
+
],
},{
label:"性别",
@@ -366,7 +366,7 @@ export default {
itemType:"select1",
formName:"cultureLevel",
opction:[
-
+
]},
{
label:"备注",
@@ -411,7 +411,7 @@ export default {
itemType:"input1",
formName:"religion",
opction:[
-
+
]},
{
label:"备注",
@@ -485,28 +485,28 @@ export default {
itemType:"select1",
formName:"illnessCode",
opction:[
-
+
]},
{
label:"大病患病时间",
itemType:"datepicker1",
formName:"illnessTime",
opction:[
-
+
]},
{
label:"所患慢性病",
itemType:"select1",
formName:"chronicDiseaseCode",
opction:[
-
+
]},
{
label:"慢病患病时间",
itemType:"datepicker1",
formName:"chronicDiseaseTime",
opction:[
-
+
]},
{
label:"是否参保",
@@ -533,7 +533,7 @@ export default {
itemType:"datepicker1",
formName:"deliveranceTime",
opction:[
-
+
]},
{
label:"享受救助明细序号",
@@ -555,7 +555,7 @@ export default {
itemType:"input1",
formName:"workUnit",
opction:[
-
+
]},
{
label:"职业",
@@ -584,7 +584,7 @@ export default {
itemType:"input1",
formName:"retirementAmount",
opction:[
- ]},
+ ]},
{
label:"月收入",
itemType:"input1",
@@ -600,19 +600,19 @@ export default {
itemType:"input1",
formName:"nativePlace",
opction:[
- ]},
+ ]},
{
label:"户籍所在地",
itemType:"input1",
formName:"placeOfDomicile",
opction:[
- ]},
+ ]},
{
label:"现居住地址",
itemType:"input1",
formName:"currentResidence",
opction:[
- ]},
+ ]},
{
label:"人户状况",
itemType:"select1",
@@ -640,13 +640,13 @@ export default {
itemType:"select1",
formName:"resideSituation",
opction:[
- ]},
+ ]},
{
label:"婚姻状况",
itemType:"select1",
formName:"marriage",
opction:[
- ]},
+ ]},
{
label:"配偶情况",
itemType:"select1",
@@ -693,13 +693,13 @@ export default {
itemType:"datepicker1",
formName:"positiveTime",
opction:[
- ]},
+ ]},
{
label:"所属支部",
itemType:"cascader1",
formName:"branchId",
opction:[
- ]},
+ ]},
{
label:"流动党员",
itemType:"radio1",
@@ -713,7 +713,7 @@ export default {
itemType:"input1",
formName:"flowActNum",
opction:[
-
+
]},
{
label:"职务",
@@ -740,7 +740,7 @@ export default {
itemType:"input1",
formName:"joinBranchName",
opction:[
-
+
]},{
label:"组织关系转入社区时间",
itemType:"datepicker1",
@@ -758,13 +758,13 @@ export default {
},{
id:'ensureHouseDto',
children:[
-
+
{
label:"住房性质",
itemType:"select1",
formName:"housingNature",
opction:[
- ]},
+ ]},
{
label:"保障类型",
itemType:"input1",
@@ -775,13 +775,13 @@ export default {
itemType:"datepicker1",
formName:"certificateDate",
opction:[
- ]},
+ ]},
{
label:"补贴编号",
itemType:"input1",
formName:"subsidyNum",
opction:[
-
+
]},
{
label:"补贴金额 ",
@@ -797,7 +797,7 @@ export default {
label:"原工作单位",
itemType:"input1",
formName:"originWorkUnit",
- },
+ },
{
label:"失业时间",
itemType:"datepicker1",
@@ -810,13 +810,13 @@ export default {
itemType:"input1",
formName:"unemploymentNum",
opction:[
- ]},
+ ]},
{
label:"再就业优惠证号",
itemType:"input1",
formName:"employmentNum",
opction:[
-
+
]},
{
label:"技术特长",
@@ -850,31 +850,31 @@ export default {
itemType:"datepicker1",
formName:"joinArmyTime",
opction:[
- ]},
+ ]},
{
label:"退伍时间",
itemType:"datepicker1",
formName:"leaveArmyTime",
opction:[
- ]},
+ ]},
{
label:"服役单位",
itemType:"input1",
formName:"serviceUnit",
opction:[
- ]},
+ ]},
{
label:"接收单位",
itemType:"input1",
formName:"receiveUnit ",
opction:[
- ]},
+ ]},
{
label:"待安置补助金",
itemType:"input1",
formName:"settlementAmount",
opction:[
-
+
]},
{
label:"培训状况",
@@ -960,7 +960,7 @@ export default {
opction:[]
},]
}
-
+
],
form:{
@@ -1036,37 +1036,37 @@ export default {
},
workInfoDto:{ //工作
workUnit:'',//工作单位
- occupation:'',//职业
- retireTime:'',//离退休时间
- workRemark:'',//备注
+ occupation:'',//职业
+ retireTime:'',//离退休时间
+ workRemark:'',//备注
},
economyDto:{//经济
- retirementAmount:'',//退休金额
+ retirementAmount:'',//退休金额
monthIncome:'',//月收入
},
resideInfoDto:{//居住信息
nativePlace:'',//籍贯
- placeOfDomicile:'',//户籍所在地
- currentResidence:'',//现居住地
+ placeOfDomicile:'',//户籍所在地
+ currentResidence:'',//现居住地
householdSituation:'',//人户情况,字典code
resiRemark:'',//备注
},
familyInfoDto:{//家庭
- houseHolderRel:'',//与户主关系
- resideSituation:'',//居住情况
- marriage:'',//婚姻状况
- spouseSituation:'',//配偶情况
- elderlyFlag:null,//有无赡养人【有:1 无:0】
- elderlyRelation:'',//与赡养人关系【字典表】
- dependantMobile:'',//赡养人联系电话
- familyInfoRemark:'',//备注
+ houseHolderRel:'',//与户主关系
+ resideSituation:'',//居住情况
+ marriage:'',//婚姻状况
+ spouseSituation:'',//配偶情况
+ elderlyFlag:null,//有无赡养人【有:1 无:0】
+ elderlyRelation:'',//与赡养人关系【字典表】
+ dependantMobile:'',//赡养人联系电话
+ familyInfoRemark:'',//备注
},
parymemberInfoDto:{//党员信息
joinTime:'',//入党时间yyyy-MM-dd
- positiveTime:'',//转正时间yyyy-MM-dd
- branchId:'',//所属支部
- flowFlag:null,//是否流动党员:1是,0否
- flowActNum:'',//流动党员活动证号
+ positiveTime:'',//转正时间yyyy-MM-dd
+ branchId:'',//所属支部
+ flowFlag:null,//是否流动党员:1是,0否
+ flowActNum:'',//流动党员活动证号
partyJob:'',//职务,字典code
retiredFlag:null,//是否退休:1是,0否
centerFlag:null,//是否党员中心户:1是,0否
@@ -1076,47 +1076,47 @@ export default {
},
ensureHouseDto:{//保障房信息
housingNature:'',//住房性质,字典code
- securityType:'',//保障类型
+ securityType:'',//保障类型
certificateDate:'',//发证日期yyyy-MM-dd
- subsidyNum:'',//补贴编号
- subsidyAmount:'',//补贴金额
+ subsidyNum:'',//补贴编号
+ subsidyAmount:'',//补贴金额
},
unemployedDto:{//失业信息
originWorkUnit:'',//原工作单位
- unemploymentTime:'',//失业时间yyyy-MM-dd
- unemploymentNum:'',//失业证号
- employmentNum:'',//再就业优惠证号
- specialSkill:'',//技术特长
- unemploymentReason:'',//失业原因【字典表】code
- employmentHardFlag:null,//是否就业困难对象;1是0不是
- employmentWish:'',//劳动能力就业愿望
+ unemploymentTime:'',//失业时间yyyy-MM-dd
+ unemploymentNum:'',//失业证号
+ employmentNum:'',//再就业优惠证号
+ specialSkill:'',//技术特长
+ unemploymentReason:'',//失业原因【字典表】code
+ employmentHardFlag:null,//是否就业困难对象;1是0不是
+ employmentWish:'',//劳动能力就业愿望
},
veteranDto:{//退役军人
joinArmyTime:'',//入伍时间
leaveArmyTime:'',//退伍时间
- serviceUnit:'',//服役单位
- receiveUnit:'',//接收单位
- settlementAmount:'',//待安置补助金
- trainDesc:'',//培训状况
- employmentSituation:'',//现就业情况
- joinWarStartTime:'',//参战时间开始日期yyyy-MM-dd
- joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd
+ serviceUnit:'',//服役单位
+ receiveUnit:'',//接收单位
+ settlementAmount:'',//待安置补助金
+ trainDesc:'',//培训状况
+ employmentSituation:'',//现就业情况
+ joinWarStartTime:'',//参战时间开始日期yyyy-MM-dd
+ joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd
pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否
},
unitedFrontDto:{//统战人员
duty:'',//职务
- visitation:'',//探亲情况
+ visitation:'',//探亲情况
},
- volunteerDto:{//志愿者信息
+ volunteerDto:{//志愿者信息
volunteerCategory:[],//志愿者类别
volunteerRemark:''//备注
},
oldPeopleDto:{
- oldSubsidy:''//高龄补助
+ oldSubsidy:''//高龄补助
},
specialDto:{//特殊人群
- specialCategoryCode:[]//人群类别【字典表】,可多选,以英文逗号隔开;
+ specialCategoryCode:[]//人群类别【字典表】,可多选,以英文逗号隔开;
}
},
rulesForm: {
@@ -1138,7 +1138,7 @@ export default {
watch: {
form:{
handler (val, val2) {
-
+
},
deep:true,
immediate:true
@@ -1146,7 +1146,7 @@ export default {
},
created () {
this.getGridList()
-
+
this.getAllNation()
},
methods: {
@@ -1156,11 +1156,12 @@ export default {
this.$refs.formId.validate(v=>{
this.validateFlag = v
flag = v
-
+
})
if(flag){
return this.form
}
+ console.log(this.form);
return this.form
},
@@ -1221,7 +1222,7 @@ export default {
try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_category_code'})
this.footerInputList.forEach(c => {
-
+
for(let i of c.children){
if(i.formName == 'disabilityCategoryCode'){
i.opction = data.data
@@ -1238,7 +1239,7 @@ export default {
try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_level'})
this.footerInputList.forEach(c => {
-
+
for(let i of c.children){
if(i.formName == 'disabilityLevel'){
i.opction = data.data
@@ -1265,7 +1266,7 @@ export default {
} catch (error) {
console.log(error,'获取所患大病字典');
}
- },
+ },
async getchronicNation(){
try {
const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'chronic_disease_code'})
@@ -1446,10 +1447,10 @@ export default {
if(i != item.id){
this.tabsList = this.tabsList.filter(items=>items.id!=i)
}
- })
+ })
}
}
-
+
},
handleChangeGrid (val) {
console.log('val', val)
@@ -1477,10 +1478,10 @@ export default {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
-
+
if (res.data.isVolunteer == '1') this.form.volunteerFlag = true
else this.form.volunteerFlag = false
-
+
if (res.data.isPartyMember == '1') {
this.form.partyFlag = true
this.isParty = true
@@ -1611,7 +1612,7 @@ export default {
const { data } = await this.$http.post('sys/dict/data/relationship',{formCode: "resi_base_info"})
this.footerInputList.forEach(c => {
for(let i of c.children){
- if(i.formName == 'houseHolderRel' ||i.formName == 'elderlyRelation' ){
+ if(i.formName == 'houseHolderRel' ||i.formName == 'elderlyRelation' ){
i.opction = data.data
}
}
@@ -1627,7 +1628,7 @@ export default {
const { data } = await this.$http.post('resi/partymember/icPartyOrg/branchlist',{formCode: "resi_base_info"})
this.footerInputList.forEach(c => {
for(let i of c.children){
- if(i.formName == 'branchId' ){
+ if(i.formName == 'branchId' ){
i.opction = data.data
}
}
@@ -1652,7 +1653,7 @@ export default {
});
return arr;
},
-
+
async getEducation(){
try {
let { data } = await this.$http.post('sys/dict/data/education',{formCode: "resi_base_info"})
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index f57ab28aa..c1e260710 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -3,7 +3,7 @@
@@ -174,20 +169,20 @@
{{ scope.row.gender == 1 ? "男" : "女" }}
- {{ scope.row.birthday.substr(0, 10) }}
+ {{ scope.row.birthday?scope.row.birthday.substr(0, 10):'' }}
- {{
+ {{scope.row.idNum?
`${scope.row.idNum.substr(0, 11)}` +
"******" +
- `${scope.row.idNum.substr(16, 2)}`
+ `${scope.row.idNum.substr(16, 2)}`:''
}}
- {{
+ {{scope.row.mobile?
`${scope.row.mobile.substr(0, 3)}` +
"******" +
- `${scope.row.mobile.substr(7, 4)}`
+ `${scope.row.mobile.substr(7, 4)}`:''
}}
{{ handleFilterSpan(scope.row, item) }}
@@ -286,6 +281,7 @@
:visible.sync="dialogVisible"
width="986px"
top="5vh"
+ height="750px"
append-to-body
class="dialog-h"
:close-on-click-modal="false"
@@ -297,7 +293,6 @@
ref="baseForm"
:fixed="true"
:form-list="formList"
- :resi-id="editUserId"
@changegroup="handleChangeGroup"
/>