From 630f62ee159139781d97f5c27912797b1d238fa4 Mon Sep 17 00:00:00 2001 From: yujk <990961482@qq.com> Date: Mon, 28 Feb 2022 20:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homesteadSurvey/add.vue | 50 ++++++++++++++++++++++++++-- src/views/homesteadSurvey/list.vue | 45 +++++++++---------------- src/views/homesteadSurvey/settle.vue | 6 ++-- 3 files changed, 66 insertions(+), 35 deletions(-) diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index 4a00c517..67a6bedb 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -614,14 +614,16 @@ required :rules="[{ required: true, message: '宅基地代码不能为空' }]" /> - + readonly + @click="showsyqrnmfwdm = true" + />--> + + + + + + + + + @@ -2480,6 +2514,8 @@ resultImg: "", // 最终画布生成的base64图片 isCrop: false, // 是否裁剪,在画布设定尺寸基础上裁掉四周空白部分 showdj:false, + shownmfwnhdm:false, + showsyqrnmfwdm:false, showhncysjly:false, showhzsjly:false, showesign:false, @@ -3014,6 +3050,11 @@ this.form5.zjdxctp = this.form5.zjdxctp.replaceAll(url,"") this.form5.zjdxctp = this.form5.zjdxctp.replaceAll(url1,"") }, + // 使用权人农民房屋代码弹出框 + onConfirmsyqrnmfwdm(value){ + this.form1.nmfwdm = value.nmfwdm + this.showsyqrnmfwdm = false + }, // 使用权人农户代码弹出框 onConfirmsyqrnhdmlist(value){ this.form1.nhdm = value.nhdm @@ -3027,6 +3068,11 @@ }) this.showsyqrnhdmlist = false }, + // 农名房屋农户代码弹出框 + onConfirmnmfwnhdm(value){ + this.nmfwform.nhdm = value.nhdm + this.shownmfwnhdm = false + }, // 户内成员数据来源弹出框 onConfirmhncysjly(value){ this.form5.sjlyName = value.dictLabel diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 983dcd18..283f4ff3 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -557,9 +557,8 @@ v-model="nhform.nhdm" name="农户代码" label="农户代码" - placeholder="农户代码" - required - :rules="[{ required: true, message: '农户代码不能为空' }]" + placeholder="自动生成" + disabled /> { - if(res.total>0){ + addNh(this.nhform).then( + response => { + this.totalR+=1 + this.totalH+=1 + let _this =this this.$toast({ - icon: 'error', // 找到自己需要的图标 - message: '保存失败,系统中已存在此农户代码!', - duration:"1000" - }) - }else{ - addNh(this.nhform).then( - response => { - this.totalR+=1 - this.totalH+=1 - let _this =this - this.$toast({ - icon: 'success', // 找到自己需要的图标 - message: '保存成功', - duration:"1000", - onClose:function(){ - _this.shownh = false - _this.getNh() - } - }) + icon: 'success', // 找到自己需要的图标 + message: '保存成功', + duration:"1000", + onClose:function(){ + _this.shownh = false + _this.getNh() } - ); + }) } - }) + ); } }, // 所有权人保存 diff --git a/src/views/homesteadSurvey/settle.vue b/src/views/homesteadSurvey/settle.vue index 757d2283..e32f01f6 100644 --- a/src/views/homesteadSurvey/settle.vue +++ b/src/views/homesteadSurvey/settle.vue @@ -13,18 +13,18 @@ - + - +