diff --git a/src/api/homesteadSurvey/nh.js b/src/api/homesteadSurvey/nh.js index 719c064c..18e1c5c6 100644 --- a/src/api/homesteadSurvey/nh.js +++ b/src/api/homesteadSurvey/nh.js @@ -8,7 +8,13 @@ export function listNh(query) { params: query }) } - +export function queryList(query) { + return request({ + url: '/home/homesteadnh/queryList', + method: 'get', + params: query + }) +} // 导出数据调查-户主信息 export function exportNh(query) { return request({ diff --git a/src/views/homesteadSurvey/add3.vue b/src/views/homesteadSurvey/add3.vue index e8940121..ee2f69bf 100644 --- a/src/views/homesteadSurvey/add3.vue +++ b/src/views/homesteadSurvey/add3.vue @@ -315,7 +315,14 @@ export default { f.push(i.content) } } - console.info(this.uploadImgList); + if(f.length === 0){ + return this.$toast.fail("请上传照片"); + } + this.$toast.loading({ + message: "数据处理中", + forbidClick: true, + duration: 10000000000, + }); let _this = this; let file = { tableId:val, diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue index e51c332e..84fe3089 100644 --- a/src/views/homesteadSurvey/add4.vue +++ b/src/views/homesteadSurvey/add4.vue @@ -98,7 +98,7 @@
-

+

异常标记

@@ -127,13 +127,13 @@ :lineWidth="signature.lineWidth" :lineColor="signature.lineColor" :bgColor.sync="signature.bgColor" - v-if="!signature.resultImg" + v-if="zjdzdxx.surveyStatus == '4' || zjdzdxx.surveyStatus == '2' || !signature.resultImg" />

- - -
+ +
清空画板 保存提交
@@ -242,10 +242,10 @@ export default { this.houseGetDicts("fsss_type").then((response) => { this.fssslxList = response.data; }); + this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem")); this.permission = localStorage.getItem("executePermission"); let businessLevel = this.$store.state.user.businessLevel; - console.info(this.zjdzdxx.surveySign); if(this.zjdzdxx.surveySign != null){ this.signature.resultImg = this.$store.getters.baseRoutingUrl+this.zjdzdxx.surveySign; } @@ -363,8 +363,6 @@ export default { location.reload(); this.showesign = false; }); - - }); }) @@ -574,6 +572,14 @@ export default { f.push(i.content) } } + if(f.length === 0){ + return this.$toast.fail("请上传照片"); + } + this.$toast.loading({ + message: "数据处理中", + forbidClick: true, + duration: 10000000000, + }); let _this = this; let file = { tableId:val, diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 87698915..3a7ac3f0 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -104,7 +104,7 @@ 附件 - 删除 + 删除 @@ -414,6 +414,7 @@ this.loading2 = false this.finished2 = true } + console.info(this.list1); }); }, showUploadList(id){ @@ -428,7 +429,14 @@ f.push(i.content) } } - console.info(this.uploadImgList); + if(f.length === 0){ + return this.$toast.fail("请上传照片"); + } + this.$toast.loading({ + message: "数据处理中", + forbidClick: true, + duration: 10000000000, + }); let _this = this; let file = { tableId:val, @@ -1583,6 +1591,7 @@ }else{ this.finished2 = true } + console.info(this.list1); } }); }else if(this.active === 2){ diff --git a/src/views/homesteadSurvey/nhcyList.vue b/src/views/homesteadSurvey/nhcyList.vue index 38e61c1c..ec216576 100644 --- a/src/views/homesteadSurvey/nhcyList.vue +++ b/src/views/homesteadSurvey/nhcyList.vue @@ -55,7 +55,7 @@

{{item.xm}} - {{formatDict(yhzgxList,item.yhzgx)}} + {{formatDict(yhzgxList,item.yhzgx)}}

证件号码:

diff --git a/src/views/homesteadSurvey/nmfwList.vue b/src/views/homesteadSurvey/nmfwList.vue index 38da0af1..93d58f8f 100644 --- a/src/views/homesteadSurvey/nmfwList.vue +++ b/src/views/homesteadSurvey/nmfwList.vue @@ -278,7 +278,14 @@ export default { f.push(i.content) } } - console.info(this.uploadImgList); + if(f.length === 0){ + return this.$toast.fail("请上传照片"); + } + this.$toast.loading({ + message: "数据处理中", + forbidClick: true, + duration: 10000000000, + }); let _this = this; let file = { tableId:val, diff --git a/src/views/homesteadSurvey/shyqrAdd.vue b/src/views/homesteadSurvey/shyqrAdd.vue index 16c2e5c0..b878e70f 100644 --- a/src/views/homesteadSurvey/shyqrAdd.vue +++ b/src/views/homesteadSurvey/shyqrAdd.vue @@ -63,7 +63,7 @@ label="农户代码" placeholder="请选择" v-model="form.nhdm" - @click="shownhdm = true" + @click="checkNhdmQx" input-align="right" right-icon="arrow-down" /> @@ -91,7 +91,7 @@ label="农民房屋代码" placeholder="请选择" v-model="form.nmfwdm" - @click="shownmfwdm = true" + @click="checkNmfwQx" input-align="right" right-icon="arrow-down" /> @@ -316,7 +316,7 @@ import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzStatus} from "@ import {listNmfw,addNmfw,updateNmfw,delNmfw} from "@/api/homesteadSurvey/nmfw"; import {listSuyqr,addSuyqr,updateSuyqr} from "@/api/homesteadSurvey/suyqr"; import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy"; -import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh"; +import {queryList, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh"; import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss"; import { listTown, getTown } from "@/api/homesteadSurvey/town"; import { listVillage} from "@/api/homesteadSurvey/village"; @@ -392,26 +392,32 @@ export default { }, methods: { getList(){ - listNhhncy({yhzgx:"02"}).then(response => { + queryList({yhzgx:"02",searchValue:"NHDM,HZXM"}).then(response => { this.nhdmDictionaries = response.rows.map(function(item){ - item.nhValue = item.xm + item.nhdm; + item.nhValue = item.hzxm + item.nhdm; return { nhValue:item.nhValue, - hzxm:item.xm, - sqrxb:item.xb, - hzzjhm:item.zjhm, + hzxm:item.hzxm, nhdm:item.nhdm, - hzzjlx:item.zjlx, - lxdh:item.lxdh, - hklx:item.hklx, - sfbjtjjzzcy:item.sfbjtjjzzcy, - deptId:item.deptId, - deptName:item.deptName, }; }); this.newList = this.nhdmDictionaries; }); }, + checkNhdmQx(){ + if(this.form.id != null){ + this.shownhdm = false; + }else{ + this.shownhdm = true; + } + }, + checkNmfwQx(){ + if(this.form.id != null){ + this.shownmfwdm = false; + }else{ + this.shownmfwdm = true; + } + }, /** 模糊查询人员信息 */ remoteTransfereeMethod(query) { if (query !== "") {