diff --git a/ruoyi-ui/src/views/szxc/carinfo/index.vue b/ruoyi-ui/src/views/szxc/carinfo/index.vue index ff81f5a..524ca94 100644 --- a/ruoyi-ui/src/views/szxc/carinfo/index.vue +++ b/ruoyi-ui/src/views/szxc/carinfo/index.vue @@ -100,8 +100,6 @@ - - diff --git a/ruoyi-ui/src/views/szxc/jminfo/index.vue b/ruoyi-ui/src/views/szxc/jminfo/index.vue index d1144b4..066982a 100644 --- a/ruoyi-ui/src/views/szxc/jminfo/index.vue +++ b/ruoyi-ui/src/views/szxc/jminfo/index.vue @@ -301,7 +301,6 @@ - @@ -321,10 +320,10 @@ - + @@ -409,8 +408,10 @@ 更多操作 - 人员标签 - 银行卡信息 + 人员标签 + 银行卡信息 + 户主变更 + 车辆信息 @@ -433,9 +434,9 @@ - + @@ -854,6 +855,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 +
+ + + + + + 添加 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 +
+ + @@ -863,6 +1078,8 @@ import { listAddress } from "@/api/szxc/address"; import { listJmtag, addAllJmtag } from "@/api/szxc/jmtag"; import { listTag } from "@/api/szxc/tag"; import { listBankinfo, editDefault, addBankinfo, updateBankinfo, delBankinfo } from "@/api/szxc/bankinfo"; +import { listCarinfo, delCarinfo, addCarinfo, updateCarinfo } from "@/api/szxc/carinfo"; +import { addRecard } from "@/api/szxc/recard"; import { addOffrecard } from "@/api/szxc/offrecard"; import { deptTreeSelect } from "@/api/system/user"; import Treeselect from "@riophae/vue-treeselect"; @@ -872,7 +1089,7 @@ export default { name: "Jminfo", components: { Treeselect }, dicts: ['szxc_hjxz', 'szxc_gj', 'szxc_head', 'szxc_hzgx', 'szxc_yes_no', 'szxc_off', 'szxc_gj', 'sys_user_sex', - 'szxc_brqk', 'szxc_hyzk', 'szxc_xueli', 'szxc_zjxy', 'szxc_jkzk', 'szxc_zzmm'], + 'szxc_brqk', 'szxc_hyzk', 'szxc_xueli', 'szxc_zjxy', 'szxc_jkzk', 'szxc_zzmm', 'szxc_hkbg_reason', 'szxc_cartype'], data() { return { queryMore: false, @@ -1015,6 +1232,8 @@ export default { loading: false, // 总条数 total: 0, + // 选择种类 1、新增居民信息 2、户口变更 + type: 1, // 查询参数 queryParams:{ pageNum: 1, @@ -1083,7 +1302,113 @@ export default { { required: true, message: "注销原因不能为空", trigger: "blur" } ], } - } + }, + // 户主变更 + hzbg: { + visible: false, + form:{ + id: null, + acountNo: null, + jmId: null, + name: null, + idCard: null, + yJmId: null, + yName: null, + yIdCard: null, + bgReason: null, + xJmId: null, + xName: null, + xIdCard: null, + relation: null, + bgTime: null, + hjAddress: null, + jgNature: null, + longLive: null, + remark: null, + createBy: null, + createTime: null, + updateBy: null, + updateTime: null, + deptId: null, + userId: null, + deptName: null + }, + rules: { + name: [ + { required: true, message: "居民姓名不能为空", trigger: "blur" } + ], + idCard: [ + { required: true, message: "居民身份证号不能为空", trigger: "blur" } + ], + yName: [ + { required: true, message: "原户主姓名不能为空", trigger: "blur" } + ], + yIdCard: [ + { required: true, message: "原户主身份证号不能为空", trigger: "blur" } + ], + bgReason: [ + { required: true, message: "变更原因不能为空", trigger: "blur" } + ], + xName: [ + { required: true, message: "新户主姓名不能为空", trigger: "blur" } + ], + xIdCard: [ + { required: true, message: "新户主身份证号不能为空", trigger: "blur" } + ], + acountNo: [ + { required: true, message: "户号不能为空", trigger: "blur" } + ], + deptName: [ + { required: true, message: "所属网格不能为空", trigger: "blur" } + ], + hjAddress: [ + { required: true, message: "户籍地址不能为空", trigger: "blur" } + ], + jgNature: [ + { required: true, message: "户籍性质不能为空", trigger: "blur" } + ], + relation: [ + { required: true, message: "与户主关系不能为空", trigger: "blur" } + ], + longLive: [ + { required: true, message: "是否常住不能为空", trigger: "blur" } + ], + } + }, + // 车辆信息 + clxx: { + visible: false, + // 遮罩层 + loading: false, + // 查询列表 + list: [], + // 弹出层标题 + title: '', + // 添加弹出层 + open: false, + // 表单参数 + form: {}, + // 居民信息 + jminRow: null, + // 表单校验 + rules: { + ownerName: [ + { required: true, message: "车主姓名不能为空", trigger: "blur" } + ], + carNo: [ + { required: true, message: "车牌号不能为空", trigger: "blur" } + ], + carType: [ + { required: true, message: "车类型不能为空", trigger: "change" } + ], + colour: [ + { required: true, message: "颜色不能为空", trigger: "blur" } + ], + deptId: [ + { required: true, message: "所属网格不能为空", trigger: "blur" } + ], + }, + }, }; }, created() { @@ -1101,7 +1426,8 @@ export default { this.form.deptId = node.id; this.form.deptName = node.label; }, - acountNoQuery(){ + acountNoQuery(type){ + this.hzInfo.type = type this.hzInfo.visible = true; this.getlistAddress() }, @@ -1227,6 +1553,17 @@ export default { ...this.queryParams }, `jminfo_${new Date().getTime()}.xlsx`) }, + // 审查 + handleCheck(row){ + this.$modal.confirm('是否确认身份证号【"' + row.cardId + '"】的数据项已核查没问题？').then(()=>{ + const detail = row + detail.hcStatus = '1'; + updateJminfo(detail).then(response => { + this.$modal.msgSuccess("核查成功"); + this.getList(); + }); + }) + }, // 更多操作触发 handleCommand(command, row) { switch (command) { @@ -1236,6 +1573,12 @@ export default { case "handleBankInfo": this.handleBankInfo(row); break; + case "handleHzbg": + this.handleHzbg(row); + break; + case "handleClxx": + this.handleClxx(row); + break; default: break; } @@ -1249,6 +1592,7 @@ export default { this.hzInfo.loading = false; }); }, + // 户主信息查询 hzInfoQuery(){ this.hzInfo.queryParams.pageNum = 1; this.getlistAddress(); @@ -1256,10 +1600,20 @@ export default { // 户主选择 选中数据 hzInfoDblclick(row) { this.hzInfo.selectRow = row; - this.form.acountNo = row.acountNo; - this.form.deptId = row.deptId; - this.form.deptName = row.deptName; - this.form.hjAddress = row.hjAddress; + if(this.hzInfo.type===1){ + this.form.acountNo = row.acountNo; + this.form.deptId = row.deptId; + this.form.deptName = row.deptName; + this.form.hjAddress = row.hjAddress; + }else if(this.hzInfo.type===2){ + this.hzbg.form.acountNo = row.acountNo; + this.hzbg.form.xJmId = row.jmId; + this.hzbg.form.xName = row.name; + this.hzbg.form.xIdCard = row.idCard; + this.hzbg.form.deptId = row.deptId; + this.hzbg.form.deptName = row.deptName; + this.hzbg.form.hjAddress = row.hjAddress; + } this.hzInfo.visible = false }, // 与户主关系 @@ -1336,7 +1690,7 @@ export default { this.bankInfo.visible = true; this.getlistBankinfo(); }, - /** 查询关联人员标签列表 */ + /** 查询银行卡信息列表 */ getlistBankinfo() { listBankinfo({ pageNum: 1, @@ -1432,7 +1786,108 @@ export default { this.zxInfo.visible = false; this.getList(); }); - } + }, + // 户主变更 + handleHzbg(row){ + listAddress({ + pageNum: 1, + pageSize: 10000, + acountNo: row.acountNo + }).then(response => { + this.hzbg.form.acountNo = row.acountNo; + this.hzbg.form.jmId = row.id; + this.hzbg.form.name = row.name; + this.hzbg.form.idCard = row.cardId; + this.hzbg.form.yJmId = response.rows[0].yJmId; + this.hzbg.form.yName = response.rows[0].name; + this.hzbg.form.yIdCard = response.rows[0].idCard; + this.hzbg.visible = true; + }); + }, + // 户主变更提交 + hzbgSubmit(){ + addRecard(this.hzbg.form).then(response => { + this.$modal.msgSuccess("变更成功"); + this.hzbg.visible = false; + this.getList(); + }); + }, + // 车辆信息 + handleClxx(row){ + this.clxx.jminRow = row; + this.clxx.visible = true; + this.getlistClxx(); + }, + /** 查询银行卡信息列表 */ + getlistClxx() { + listCarinfo({ + pageNum: 1, + pageSize: 100000000, + ownerId: this.clxx.jminRow.id + }).then(response => { + this.clxx.list = response.rows + }); + }, + // 添加银行卡 + clxxAdd(){ + this.resetForm("clxxForm"); + this.clxx.form = { + id: null, + ownerId: this.clxx.jminRow.id, + ownerName: this.clxx.jminRow.name, + phone: null, + carNo: null, + carType: null, + colour: null, + carBand: null, + carPicture: null, + createBy: null, + createTime: null, + updateBy: null, + updateTime: null, + deptId: this.clxx.jminRow.deptId, + deptName: this.clxx.jminRow.deptName, + userId: null, + remark: null + }; + this.clxx.title = '添加车辆'; + this.clxx.open = true; + }, + /** 修改按钮操作 */ + clxxUpdate(row) { + this.clxx.form = row; + this.clxx.title = '修改车辆'; + this.clxx.open = true; + }, + /** 删除按钮操作 */ + clxxDelete(row) { + this.$modal.confirm('是否确认删除车辆车牌号为【"' + row.carNo + '"】的数据项？').then(function() { + return delCarinfo(row.id); + }).then(() => { + this.getlistClxx(); + this.$modal.msgSuccess("删除成功"); + }).catch(() => {}); + }, + // 添加提交银行卡 + clxxSubmit(){ + this.$refs["clxxForm"].validate(valid => { + if (valid) { + if (this.clxx.form.id != null) { + updateCarinfo(this.clxx.form).then(response => { + this.$modal.msgSuccess("修改成功"); + this.clxx.open = false; + this.getlistClxx(); + }); + } else { + addCarinfo(this.clxx.form).then(response => { + this.$modal.msgSuccess("新增成功"); + this.clxx.open = false; + this.getlistClxx(); + }); + } + } + }); + }, } }; diff --git a/ruoyi-ui/src/views/szxc/recard/index.vue b/ruoyi-ui/src/views/szxc/recard/index.vue index 5513482..a481055 100644 --- a/ruoyi-ui/src/views/szxc/recard/index.vue +++ b/ruoyi-ui/src/views/szxc/recard/index.vue @@ -1,22 +1,6 @@