From 0896b7bfc6be09ea76e0112d1379fe96d340b7ab Mon Sep 17 00:00:00 2001 From: xyq <392009588@qq.com> Date: Thu, 12 Jan 2023 15:28:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homeApplication/proposerLite.vue | 108 ++++++++++-------- 1 file changed, 59 insertions(+), 49 deletions(-) diff --git a/src/views/sunVillage_info/homeApplication/proposerLite.vue b/src/views/sunVillage_info/homeApplication/proposerLite.vue index 8af3121f..e0cfd36c 100644 --- a/src/views/sunVillage_info/homeApplication/proposerLite.vue +++ b/src/views/sunVillage_info/homeApplication/proposerLite.vue @@ -1830,7 +1830,7 @@ export default { jflxColumns:[], zjdzdxxDetailedShow:false, deptId:null, - sysFarmer:JSON.parse(Cookies.get('user')), + sysFarmer:{memberName:"",dept:null}, showZjddm:null, region:null, showZjdzk:false, @@ -2054,8 +2054,7 @@ export default { mapZbNow:"", //当前查看坐标 }; }, - created() { - this.id = this.$route.query.id; + created() { this.id = this.$route.query.id; this.type = this.$route.query.type; this.taskId = this.$route.query.taskId; this.instanceId = this.$route.query.instanceId; @@ -2072,17 +2071,24 @@ export default { this.getDicts("building_type").then(response => { this.jflxColumns = response.data; }); - getHomeapplyydjfsqStatus(this.id).then(response => { - this.region = response.data.region; - }); - listHomeapplytype({deptId: JSON.parse(Cookies.get('user')).deptId}).then(response => { - let _this = this; - _this.tytzList = response.rows; - }); - - this.getDetail(); + if(this.type !== "add"){ + getHomeapplyydjfsqStatus(this.id).then(response => { + this.region = response.data.region; + }); + } + if(this.type === "todo" || this.type === "done"){ + this.$set(this.sysFarmer, 'memberName', this.$store.getters.nickName); + }else{ + this.sysFarmer = JSON.parse(Cookies.get('user')); + listHomeapplytype({deptId:this.sysFarmer.deptId}).then(response => { + let _this = this; + _this.tytzList = response.rows; + }); + } + console.info( this.sysFarmer); this.getFormIntent(); - this.getLandCoord(); + this.getDetail(); + // this.getLandCoord(); }, methods: { guidProduct(){ @@ -2103,17 +2109,20 @@ export default { // 初始化当前数据, 有ID则查询, 否则新增 getDetail(){ this.reset(); + if(this.id) { allInformationWLHT(this.id).then(response => { - console.info(this.region) - this.init(response.data); - for (let i = 0; i < this.tytzList.length; i++) { - //_this.infoList[i].push({text: response.rows[i].name, value: response.rows[i].code}); - if(this.tytzList[i].id = response.data.tyhxt){ - this.tytzName = this.tytzList[i].name; + listHomeapplytype({deptId: response.data.deptId}).then(res => { + this.tytzList = res.rows; + for (let i = 0; i < this.tytzList.length; i++) { + //_this.infoList[i].push({text: response.rows[i].name, value: response.rows[i].code}); + if(this.tytzList[i].id = response.data.tyhxt){ + this.tytzName = this.tytzList[i].name; + } } - } + }); + this.init(response.data); }); } else @@ -2121,15 +2130,14 @@ export default { this.init(); // this.getApplyerDetail(); } - console.info(this.applicationDetail); }, // 绘制申请地图 pointDarw(data) { this.$nextTick(() => { let map = this.$refs.pointDarwMap; - if(data === null) - data = this.applicationDetail.theGeom; - this.setMapData(map, data); + // if(data === null) + // data = this.applicationDetail.theGeom; + // this.setMapData(map, data); }); }, // 绘制验收地图 @@ -2153,16 +2161,16 @@ export default { paintStartNatureMap(data) { this.$nextTick(() => { let map = this.$refs.startNatureMap; - if(data === null) - { - if(this.applicationDetail.tHouseApproveNatureOptions && this.applicationDetail.tHouseApproveNatureOptions.theGeom) - data = this.applicationDetail.tHouseApproveNatureOptions.theGeom; - else { - if(this.applicationDetail.theGeom) - data = this.applicationDetail.theGeom; - } - } - this.setMapData(map, data); + // if(data === null) + // { + // if(this.applicationDetail.tHouseApproveNatureOptions && this.applicationDetail.tHouseApproveNatureOptions.theGeom) + // data = this.applicationDetail.tHouseApproveNatureOptions.theGeom; + // else { + // if(this.applicationDetail.theGeom) + // data = this.applicationDetail.theGeom; + // } + // } + // this.setMapData(map, data); }); }, // 绘制自然资源部门地图 @@ -2201,11 +2209,11 @@ export default { }, // 全局初始化 init(value) { - console.log(this.isYiLong()); + console.log(value); const role = this.$store.getters.roles; this.currentUserRole = role[0]; console.log("当前用户角色: " + role); - console.info(value); + console.info(this.proposerStatus); // 局部变量 let homeApplyStatus = value ? value.homeApplyStatus : -1; let proposerId = value ? value.id : null; @@ -2322,9 +2330,9 @@ export default { //地图查看 this.applicationDetail = value; this.pointDarw(null); - this.pointDarwNature(null); - this.pointWrapAcceptance(null); - this.paintStartNatureMap(null); + // this.pointDarwNature(null); + // this.pointWrapAcceptance(null); + // this.paintStartNatureMap(null); // if(value.homeApplyStage == "1" ){ // if(this.applicationDetail.cjxzscyj !=null && this.applicationDetail.cjxzscyj !=''){ // this.formVisible.baseApplyForm.villageFormVisible = true; @@ -2712,10 +2720,11 @@ export default { //this.formVisible.baseApplyForm.townFormVisible = this.landscopeVisible this.formVisible.acceptingVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74","77", "79", "7C", "7F"]); this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74", "77","79", "7C", "7F"]); - - selectProposerNh({hzzjhm:this.applicationDetail.sqhhzsfzh,deptId:this.sysFarmer.deptId}).then(res => { - 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"])) { @@ -2866,9 +2875,9 @@ export default { //地图编辑 this.pointDarw(null); - this.pointDarwNature(null); - this.pointWrapAcceptance(null); - this.paintStartNatureMap(null); + // this.pointDarwNature(null); + // this.pointWrapAcceptance(null); + // this.paintStartNatureMap(null); break; // 新建 @@ -2925,6 +2934,7 @@ export default { this.processKeyField = PROPOSER_STAGE_BASE_APPLY_ACTIVITY; } } else { + console.info(this.applicationDetail); if (this.isLandscope()) { this.active = PROPOSER_STAGE_START; this.selectedTabName = PROPOSER_STAGE_START; @@ -4960,16 +4970,16 @@ export default { if(newVal == PROPOSER_STAGE_BASE_APPLY) { this.pointDarw(null); - this.pointDarwNature(null); + // this.pointDarwNature(null); this.$refs.pointDarwMap && this.$refs.pointDarwMap.update(); this.$refs.pointDarwNatureMap && this.$refs.pointDarwNatureMap.update(); } else if(newVal == PROPOSER_STAGE_START) { - this.paintStartNatureMap(null); + // this.paintStartNatureMap(null); this.$refs.startNatureMap && this.$refs.startNatureMap.update(); } else if(newVal == PROPOSER_STAGE_END) { - this.pointWrapAcceptance(null); + // this.pointWrapAcceptance(null); this.$refs.pointDarwAcceptanceMap && this.$refs.pointDarwAcceptanceMap.update(); } })