diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index 6612742e..cba748a0 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -67,6 +67,7 @@ :rules="[{ required: true, message: '' }]" />--> - + - + - + - + - + - + @@ -300,6 +319,7 @@ type="number" />
上一项 - 完成 + 签名确认
@@ -559,6 +592,7 @@

使用权人

- + - + - - - + --> @@ -1116,17 +1207,20 @@ readonly /> - + - + - + - + - + - + - + - + - + - + @@ -1830,10 +1957,12 @@
- + - + - + - + - - + - + - + - + - + @@ -2230,9 +2390,10 @@ :lineWidth="lineWidth" :lineColor="lineColor" :bgColor.sync="bgColor" + v-if="!resultImg" /> + - 清空画板 保存签名 @@ -2483,6 +2644,7 @@ created(){ if(this.$cookies.get("search")){ this.item = this.$cookies.get("search"); + console.log(this.$cookies.get("search")) }else{ this.$set(this.item,"deptId",this.$cookies.get("item").deptId) } @@ -2765,6 +2927,7 @@ const data2 = new FormData(); data2.append("file", new Blob([new Uint8Array(d)],{type:'image/jpeg'})); uploadFile(data2).then(res => { + console.log(res) if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""){ this.form.zjdxctp = this.form.zjdxctp + "," + res.fileName }else{ @@ -3160,7 +3323,7 @@ listZjdzd(params).then(response => { this.form = response.rows[0]; this.fileListzjd = [] - if(this.form.zjdxctp!=null&&this.form.zjdxctp.length>0){ + if(this.form.zjdxctp!=null&&this.form.zjdxctp!=""&&this.form.zjdxctp.length>0){ let li = this.form.zjdxctp.split(","); li.map(res => { this.fileListzjd.push({"url":location.protocol+"//"+location.host+process.env.VUE_APP_BASE_API+res,"baseUrl":res}) @@ -3621,7 +3784,6 @@ }else{ this.showfw = true; if(item==""){ - this.nmfwform={ pzdw : '1', sfkjgj : 'Y', @@ -3645,7 +3807,7 @@ sfcf:'N', sffz:'Y', isCommon:'N', - fwzt:'1', + fwzt:'01', fwztName:'正常', isMortgage:'Y', sjly:'04', @@ -3673,6 +3835,11 @@ this.nmfwform.hxjgName = res.dictLabel } }) + this.hxOptions.map(res => { + if(res.dictValue == item.hx){ + this.nmfwform.hxName = res.dictLabel + } + }) this.fwjgOptions.map(res => { if(res.dictValue == item.fwjg){ this.nmfwform.fwjgName = res.dictLabel @@ -3749,10 +3916,10 @@ zjddm:this.item.zjddm, fssslx:'11', fssslxName:'畜厩', - qsly:'', + qsly:'99', qslyName:'其他', - fwzt:'', - fwztName:'', + fwzt:'01', + fwztName:'正常', sfsp:'N', sffz:'N', jglx:'2', @@ -3830,7 +3997,10 @@ }, // 清空画板 handleReset() { - this.$refs.esign.reset(); + this.resultImg = null + if(this.$refs.esign){ + this.$refs.esign.reset(); + } }, // 图片上传前 beforeRead(file){ @@ -3934,6 +4104,7 @@ }, searchCommit(){ this.showesign = true + this.resultImg = location.protocol+"//"+location.host+process.env.VUE_APP_BASE_API+this.form.dzqm }, searchCommit1(){ this.form.houseDataConfirmStatus = "CONFIRMED" diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 903a4505..ce57faed 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -154,6 +154,7 @@
@@ -202,6 +207,7 @@ /> - + @@ -388,6 +413,7 @@ />
- 全选 + 全选
@@ -513,6 +539,7 @@
- + - + - + - + - + - - + - + - + - + - + @@ -1214,7 +1275,7 @@ coordinate:"", checked:[], checkAllFlag: false,//全选判断标识 - CheckedAllArr: [],//全选数组 + CheckedAllArr: false,//全选数组 sx:"", dataList:[], //搜索---start @@ -1333,11 +1394,11 @@ let params = { "deptId" : this.item.deptId, "houseDataConfirmStatus" : "UNCONFIRMED", - "pageNum": this.countywhc+1, + "pageNum": this.countwhc+1, "pageSize":10, } listZjdzd(params).then((response) => { - if(response.rows.lenght>0&&this.list2.length0&&this.list2.length { this.list2.unshift(res) }) @@ -1549,6 +1610,8 @@ }else{ addNh(this.nhform).then( response => { + this.totalR+=1 + this.totalH+=1 let _this =this this.$toast({ icon: 'success', // 找到自己需要的图标 @@ -1833,6 +1896,28 @@ this.list = response.rows } }); + let params1 = { + "deptId" : this.item.deptId, + "houseDataConfirmStatus" : "CONFIRMED", + "pageNum": 1, + "pageSize":10, + } + listZjdzd(params1).then((response) => { + if (response.code == 200) { + this.yhcNums = response.total + } + }); + let params2 = { + "deptId" : this.item.deptId, + "houseDataConfirmStatus" : "UNCONFIRMED", + "pageNum": 1, + "pageSize":10, + } + listZjdzd(params2).then((response) => { + if (response.code == 200) { + this.whcNums = response.total + } + }); } }, onConfirm(){}, @@ -3386,7 +3471,7 @@ if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zjdzd") { that.mapHasDateStatus = 2; let obj = {}; - let trs = $("#info .featureInfo").find("tr:eq(1)"); + let trs = $("#info .featureInfo").find("tr:eq(1)"); let zjdXq = trs.find("td").eq(0).text(); let zjdIdNum = zjdXq.replace("t_house_survey_zjdzd.", ""); obj.id = zjdIdNum; // 主键id