diff --git a/src/components/home/HomeApplyUploadComp.vue b/src/components/home/HomeApplyUploadComp.vue index 5f550ee8..914be449 100644 --- a/src/components/home/HomeApplyUploadComp.vue +++ b/src/components/home/HomeApplyUploadComp.vue @@ -63,7 +63,7 @@ export default { }, }, created() { - if (this.businessType !== null) { + if (this.businessType !== null && this.proposerId == -1) { this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full) } }, diff --git a/src/views/sunVillage_info/homeApplication/proposerLite.vue b/src/views/sunVillage_info/homeApplication/proposerLite.vue index e0cfd36c..695e3c06 100644 --- a/src/views/sunVillage_info/homeApplication/proposerLite.vue +++ b/src/views/sunVillage_info/homeApplication/proposerLite.vue @@ -680,22 +680,22 @@ - - - - - - - - - - - - - - - + + + + + + + { - if(res.rows.length > 0){ - this.getMemberCurrentSituation(res.rows[0].id); - } - }); + // selectProposerNh({hzzjhm:this.applicationDetail.sqhhzsfzh,deptId:value.deptId}).then(res => { + // if(res.rows.length > 0){ + // this.getMemberCurrentSituation(res.rows[0].id); + // } + // }); (this.isProposeStatus(homeApplyStatus, ["79", "7C","7F"])) { @@ -2867,7 +2869,7 @@ export default { this.uploadImgEndZhenPlan.proposerId = value.id; // 初始化申请平面图 this.applicationDetail.tHouseApproveLocationplanOptions = value.tHouseApproveLocationplanOptions; - this.uploadImg.fileList = value.tHouseApproveLocationplanOptions ? value.tHouseApproveLocationplanOptions.locationPlan : ''; + this.uploadImg.fileList = value.ydjfsp ? value.ydjfsp.zjdzlpmwzt : ''; this.uploadImg.proposerId = this.applicationDetail.id; this.uploadImgAccepting.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.locationPlan : ''; @@ -3186,8 +3188,8 @@ export default { this.$set(this.applicationDetail, 'nsqzjddldm', "10"); this.$set(this.applicationDetail, 'sfzqxlqlryj', "1"); this.$set(this.applicationDetail, 'xzjdczqk', "1"); - this.$set(this.applicationDetail, 'suyqrdm', this.sysFarmer.suyqrdm); - this.$set(this.applicationDetail, 'deptName', this.sysFarmer.deptName); + this.$set(this.applicationDetail, 'suyqrdm', val.suyqrdm); + this.$set(this.applicationDetail, 'deptName', val.deptName); this.$set(this.applicationDetail, 'createBy', this.sysFarmer.memberName); if(!this.applicationDetail.sfyyzjd) this.applicationDetail.sfyyzjd = 'N'; @@ -3919,7 +3921,7 @@ export default { }, // 带平面图附件上传的镇级申请审批 submitHouseApproveLocationplanOptions(pass, commentText) { - this.applicationDetail.tHouseApproveLocationplanOptions.locationPlan = null; + this.applicationDetail.ydjfsp.zjdzlpmwzt = null; return this.$refs.pictureUploadApplying.updatePlanFiles().then((x) => { let list = []; x.data.forEach((f) => { @@ -3933,7 +3935,7 @@ export default { }; list.push(item); }); - this.applicationDetail.tHouseApproveLocationplanOptions.locationPlan = JSON.stringify(list); + this.applicationDetail.ydjfsp.zjdzlpmwzt = JSON.stringify(list); }).catch((x) => { this.notify("上传宅基地坐落平面位置图失败!", 'danger'); }); diff --git a/src/views/yinnong/homestead/supervision/supervisionAdd.vue b/src/views/yinnong/homestead/supervision/supervisionAdd.vue index bfa94a25..e0127d63 100644 --- a/src/views/yinnong/homestead/supervision/supervisionAdd.vue +++ b/src/views/yinnong/homestead/supervision/supervisionAdd.vue @@ -39,54 +39,89 @@ /> - -

违法信息

-
- - - 执法情况

+ + + + + + + + +
+

违法信息

+
+ - - - - - - - - + + + + + + + - - - - + + + +
+
@@ -106,10 +141,11 @@ import { jgAdd,getShyqrs } from "@/api/onlineHome/homestead/reporting"; import FieldSelect from "@/components/form/FieldSelect"; import MapGisObtainTc from "@/components/Map/MapGisObtainTc"; - import Cookies from "js-cookie"; + import FieldDatePicker from "@/components/form/FieldDatePicker"; + import {formatDate} from "element-ui/src/utils/date-util.js"; export default { name: "supervisionAdd", - components: { MapGisObtainTc,FieldSelect }, + components: { MapGisObtainTc,FieldSelect,FieldDatePicker }, data() { return { showSys:false, @@ -119,12 +155,13 @@ showwfydlx:false, showReformDeadline:false, showDropList:false, + wfxxShow:false, mapShow:false, landStatus:"1", minDate: new Date(), maxDate: new Date(2025, 10, 1), currentDate: new Date(), - sysFarmer:JSON.parse(Cookies.get('user')), + deptId:this.$store.state.user.loginDeptId, jgList:{}, getObligeeOptions:[], sfzjjzw:'', @@ -172,7 +209,7 @@ sqrxm:item.shyqrdbxm, sqrxb:item.xb, sqrzjhm:item.shyqrdbzjhm, - sqrnhdm:item.nhdm, + shyqrdm:item.shyqrdm, sqrzjlx:item.shyqrdbzjlx, sqrdh:item.dh, gyfs:item.gyfs, @@ -206,17 +243,12 @@ } }, shyqrdmxmChange(val){ - console.info(val); - this.$set(this.jgList, "sqrxm", val.sqrxm); + this.$set(this.jgList, "shyqrdbxm", val.sqrxm); this.$set(this.jgList, "deptId", val.deptId); this.$set(this.jgList, "deptName", val.deptId); - this.$set(this.jgList, "sqrzjhm", val.sqrzjhm); - this.$set(this.jgList, "sqrzjlx", val.sqrzjlx); - this.$set(this.jgList, "sqrnhdm", val.sqrnhdm); - this.$set(this.jgList, "gyqk", val.gyfs); - this.$set(this.jgList, "xb", val.sqrxb); - this.$set(this.jgList, "lxdh", val.sqrdh); - this.$set(this.jgList, "hkszd", val.dz); + this.$set(this.jgList, "shyqrzjhm", val.sqrzjhm); + this.$set(this.jgList, "shyqrzjlx", val.sqrzjlx); + this.$set(this.jgList, "shyqrdm", val.shyqrdm); this.getObligeeOptions=[]; this.showDropList = false; }, @@ -229,6 +261,10 @@ this.$set(this.jgList, "pzrq", handlerTime); this.$set(this.jgList, "barq", handlerTime); }, + // 获取日期, yyyy-MM-dd + getDate(d) { + return formatDate(d ? d : new Date(), 'yyyy-MM-dd'); + }, mapLook(){ this.mapShow = true; setTimeout(() => { diff --git a/src/views/yinnong/homestead/supervision/supervisionList.vue b/src/views/yinnong/homestead/supervision/supervisionList.vue index 68057eac..da9c3bf6 100644 --- a/src/views/yinnong/homestead/supervision/supervisionList.vue +++ b/src/views/yinnong/homestead/supervision/supervisionList.vue @@ -32,7 +32,7 @@