| @@ -325,13 +325,7 @@ | |||
| <!-- </template>--> | |||
| </div> | |||
| <!-- <div class="mapBox">--> | |||
| <!-- <common-map ref="pointDarwMap" style="height:200px;"--> | |||
| <!-- :allowDraw="formEnabled.baseApplyForm.baseFormEnabled"--> | |||
| <!-- @drawReseted="onMapDrawReseted"--> | |||
| <!-- @drawFinished="onMapDrawFinished"--> | |||
| <!-- >--> | |||
| <!-- </common-map>--> | |||
| <!-- </div>--> | |||
| </div> | |||
| <div v-if="applicationDetail"> | |||
| @@ -986,7 +980,12 @@ | |||
| <!-- </van-row>--> | |||
| <!-- </div>--> | |||
| <!-- </template>--> | |||
| <common-map ref="pointDarwMap" style="height:200px;" | |||
| :allowDraw="formVisible.landscopeForm.nature_resourceFormEnabled" | |||
| @drawReseted="onMapDrawReseted" | |||
| @drawFinished="onMapDrawFinished" | |||
| > | |||
| </common-map> | |||
| <!-- <!– 申请::自然资源部门 –>--> | |||
| <!-- <template v-if="formVisible.baseApplyForm.nature_resourceFormVisible">--> | |||
| <!-- <div class="main_box examine_box">--> | |||
| @@ -1858,6 +1857,7 @@ export default { | |||
| landscopeVisible: false, | |||
| landscopeForm: { | |||
| baseFormVisible: false, | |||
| nature_resourceFormVisible: false, | |||
| }, | |||
| acceptingVisible: false, | |||
| acceptingForm: { | |||
| @@ -1887,6 +1887,7 @@ export default { | |||
| landscopeEnabled: false, | |||
| landscopeForm: { | |||
| baseFormEnabled: false, | |||
| nature_resourceFormEnabled: false, | |||
| }, | |||
| acceptingEnabled: false, | |||
| acceptingForm: { | |||
| @@ -2134,9 +2135,9 @@ export default { | |||
| 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.ydjfkg.theGeomJson; | |||
| this.setMapData(map, data); | |||
| }); | |||
| }, | |||
| // 绘制验收地图 | |||
| @@ -2262,21 +2263,22 @@ export default { | |||
| // 查看 | |||
| case PROPOSER_VIEW: | |||
| this.formVisible.baseApplyForm.groupFormVisible = hasGroupLevel && this.isNotProposeStatus(homeApplyStatus, ["12", '13']); | |||
| this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","14"]); | |||
| this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", "19", this.isInRoles(role, 'town_leader') ? -99 : '7', this.isInRoles(role, 'town_leader') ? -99 : '8']); | |||
| this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']); | |||
| this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", this.isInRoles(role, ['town_leader', 'building']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']); | |||
| this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']); | |||
| this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "14"]); | |||
| this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", "19", this.isInRoles(role, 'town_leader') ? -99 : '7', this.isInRoles(role, 'town_leader') ? -99 : '8']); | |||
| this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']); | |||
| this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", this.isInRoles(role, ['town_leader', 'building']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']); | |||
| this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']); | |||
| this.formVisible.landscopeVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", "19", "1C", "1D", "1F"]); | |||
| this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", "19", "1C", "1D", "1F"]); | |||
| this.formVisible.landscopeVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", "19", "1C", "1D", "1F"]); | |||
| this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11", "12", "13", "14", "15", "17", "19", "1C", "1D", "1F"]); | |||
| 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"]); | |||
| this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(homeApplyStatus, [ "7C", "7F"]);; | |||
| this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(homeApplyStatus, [ "79", "7C", "7F"]); | |||
| this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(homeApplyStatus, [ "79", "7C", "7F"]); | |||
| if(this.type =='done') { | |||
| 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"]); | |||
| this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(homeApplyStatus, ["7C", "7F"]); | |||
| ; | |||
| this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(homeApplyStatus, ["79", "7C", "7F"]); | |||
| this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(homeApplyStatus, ["79", "7C", "7F"]); | |||
| if (this.type == 'done') { | |||
| this.formVisible.editVisible = false; | |||
| } | |||
| this.houseApplyUploadComp.full = true; | |||
| @@ -2291,7 +2293,7 @@ export default { | |||
| this.houseApplyUploadCompEnd.readonly = true; | |||
| this.houseApplyUploadCompEnd.proposerId = proposerId; | |||
| this.houseApplyUploadCompEnd.houseApplyStatus = homeApplyStatus; | |||
| console.info( this.houseApplyUploadComp); | |||
| console.info(this.houseApplyUploadComp); | |||
| // // 初始化自然资源审批现场图 | |||
| // this.uploadImgNature.fileList = value.tHouseApproveNatureOptions ? value.tHouseApproveNatureOptions.naturePlan : ''; | |||
| // this.uploadImgNature.proposerId = value.tHouseApplyProposer.id; | |||
| @@ -2374,243 +2376,234 @@ export default { | |||
| let handlerName = this.$store.getters.nickName; | |||
| let handlerTime = this.getDate(); | |||
| this.applicationDetail = value; | |||
| console.info(1111) | |||
| if(this.type === "todo"){ | |||
| if(this.isProposeStatus(homeApplyStatus, ["14"])){ | |||
| if(this.$route.query.electronicSignature != null){ | |||
| if (this.type === "todo") { | |||
| if (this.isProposeStatus(homeApplyStatus, ["14"])) { | |||
| if (this.$route.query.electronicSignature != null) { | |||
| this.$set(this.applicationDetail, "cjxzscr", this.$route.query.electronicSignature); | |||
| }else{ | |||
| } else { | |||
| this.$set(this.applicationDetail, "cjxzscr", this.$route.query.nickName); | |||
| } | |||
| }else if(this.isProposeStatus(homeApplyStatus, ["19"]) && this.isInRoles(role, ['nature_resource'])){ | |||
| if(this.$route.query.electronicSignature != null){ | |||
| } else if (this.isProposeStatus(homeApplyStatus, ["19"]) && this.isInRoles(role, ['nature_resource'])) { | |||
| if (this.$route.query.electronicSignature != null) { | |||
| this.$set(this.applicationDetail.ydjfsp, "zrzybmscrxm", this.$route.query.electronicSignature); | |||
| }else{ | |||
| } else { | |||
| this.$set(this.applicationDetail.ydjfsp, "zrzybmscrxm", this.$route.query.nickName); | |||
| } | |||
| }else if(this.isProposeStatus(homeApplyStatus, ["19"]) && this.isInRoles(role, ['agriculture'])){ | |||
| if(this.$route.query.electronicSignature != null){ | |||
| } else if (this.isProposeStatus(homeApplyStatus, ["19"]) && this.isInRoles(role, ['agriculture'])) { | |||
| if (this.$route.query.electronicSignature != null) { | |||
| this.$set(this.applicationDetail.ydjfsp, "nyncbmscrxm", this.$route.query.electronicSignature); | |||
| }else{ | |||
| } else { | |||
| this.$set(this.applicationDetail.ydjfsp, "nyncbmscrxm", this.$route.query.nickName); | |||
| } | |||
| }else if(this.isProposeStatus(homeApplyStatus, ["19"]) && this.isInRoles(role, ['building'])){ | |||
| if(this.$route.query.electronicSignature != null){ | |||
| } else if (this.isProposeStatus(homeApplyStatus, ["19"]) && this.isInRoles(role, ['building'])) { | |||
| if (this.$route.query.electronicSignature != null) { | |||
| this.$set(this.applicationDetail.ydjfsp, "zfcxjsbmscrxm", this.$route.query.electronicSignature); | |||
| }else{ | |||
| } else { | |||
| this.$set(this.applicationDetail.ydjfsp, "zfcxjsbmscrxm", this.$route.query.nickName); | |||
| } | |||
| }else if(this.isProposeStatus(homeApplyStatus, ["1C"]) && this.isInRoles(role, ['town_leader'])){ | |||
| if(this.$route.query.electronicSignature != null){ | |||
| } else if (this.isProposeStatus(homeApplyStatus, ["1C"]) && this.isInRoles(role, ['town_leader'])) { | |||
| if (this.$route.query.electronicSignature != null) { | |||
| this.$set(this.applicationDetail.ydjfsp, "xzzfshpzrxm", this.$route.query.electronicSignature); | |||
| }else{ | |||
| } else { | |||
| this.$set(this.applicationDetail.ydjfsp, "xzzfshpzrxm", this.$route.query.nickName); | |||
| } | |||
| }else if(this.isProposeStatus(homeApplyStatus, ["79"]) && this.isInRoles(role, ['nature_resource'])){ | |||
| if(this.$route.query.electronicSignature != null){ | |||
| } else if (this.isProposeStatus(homeApplyStatus, ["79"]) && this.isInRoles(role, ['nature_resource'])) { | |||
| if (this.$route.query.electronicSignature != null) { | |||
| this.$set(this.applicationDetail.ydjfys, "zrzybmysjbrxm", this.$route.query.electronicSignature); | |||
| }else{ | |||
| } else { | |||
| this.$set(this.applicationDetail.ydjfys, "zrzybmysjbrxm", this.$route.query.nickName); | |||
| } | |||
| }else if(this.isProposeStatus(homeApplyStatus, ["79"]) && this.isInRoles(role, ['agriculture'])){ | |||
| if(this.$route.query.electronicSignature != null){ | |||
| } else if (this.isProposeStatus(homeApplyStatus, ["79"]) && this.isInRoles(role, ['agriculture'])) { | |||
| if (this.$route.query.electronicSignature != null) { | |||
| this.$set(this.applicationDetail.ydjfys, "nyncbmysjbrxm", this.$route.query.electronicSignature); | |||
| }else{ | |||
| } else { | |||
| this.$set(this.applicationDetail.ydjfys, "nyncbmysjbrxm", this.$route.query.nickName); | |||
| } | |||
| }else if(this.isProposeStatus(homeApplyStatus, ["79"]) && this.isInRoles(role, ['building'])){ | |||
| if(this.$route.query.electronicSignature != null){ | |||
| } else if (this.isProposeStatus(homeApplyStatus, ["79"]) && this.isInRoles(role, ['building'])) { | |||
| if (this.$route.query.electronicSignature != null) { | |||
| this.$set(this.applicationDetail.ydjfys, "zfcxjsbmysjbrxm", this.$route.query.electronicSignature); | |||
| }else{ | |||
| } else { | |||
| this.$set(this.applicationDetail.ydjfys, "zfcxjsbmysjbrxm", this.$route.query.nickName); | |||
| } | |||
| }else if(this.isProposeStatus(homeApplyStatus, ["7C"]) && this.isInRoles(role, ['town_leader'])){ | |||
| if(this.$route.query.electronicSignature != null){ | |||
| } else if (this.isProposeStatus(homeApplyStatus, ["7C"]) && this.isInRoles(role, ['town_leader'])) { | |||
| if (this.$route.query.electronicSignature != null) { | |||
| this.$set(this.applicationDetail.ydjfys, "xzzfysjbrxm", this.$route.query.electronicSignature); | |||
| }else{ | |||
| } else { | |||
| this.$set(this.applicationDetail.ydjfys, "xzzfysjbrxm", this.$route.query.nickName); | |||
| } | |||
| } | |||
| } | |||
| if(this.isProposeStatus(homeApplyStatus, ["71","72","74",'77',"79","7C"])){ | |||
| if (this.isProposeStatus(homeApplyStatus, ["71", "72", "74", '77', "79", "7C"])) { | |||
| this.formEnabled.ysnrEnable = true; | |||
| } | |||
| this.formVisible.auditVisible = this.type === 'done' || this.type === 'todo'; | |||
| // 申请-组级审批 初始化表单 | |||
| if(hasGroupLevel) | |||
| { | |||
| if(this.isProposeStatus(homeApplyStatus, ["32"])) | |||
| { | |||
| if (hasGroupLevel) { | |||
| if (this.isProposeStatus(homeApplyStatus, ["32"])) { | |||
| let defaultGroupOption = this.form.groupOption | |||
| .replaceAll('{memberName}', this.applicationDetail.sqhhzxm) | |||
| ; | |||
| if(!value.tHouseApproveVillageOptions) | |||
| { | |||
| if (!value.tHouseApproveVillageOptions) { | |||
| this.$set(this.applicationDetail, 'tHouseApproveVillageOptions', { | |||
| groupLeader: handlerName, | |||
| groupTime: handlerTime, | |||
| groupOption: defaultGroupOption | |||
| }); | |||
| } | |||
| else { | |||
| if(!this.applicationDetail.tHouseApproveVillageOptions.groupLeader) | |||
| } else { | |||
| if (!this.applicationDetail.tHouseApproveVillageOptions.groupLeader) | |||
| this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'groupLeader', handlerName); | |||
| if(!this.applicationDetail.tHouseApproveVillageOptions.groupTime) | |||
| if (!this.applicationDetail.tHouseApproveVillageOptions.groupTime) | |||
| this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'groupTime', handlerTime); | |||
| if(!this.applicationDetail.tHouseApproveVillageOptions.groupOption) | |||
| if (!this.applicationDetail.tHouseApproveVillageOptions.groupOption) | |||
| this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'groupOption', defaultGroupOption); | |||
| } | |||
| } | |||
| } | |||
| // 申请-草稿 | |||
| if(this.isProposeStatus(homeApplyStatus, ["11"])) | |||
| { | |||
| if (this.isProposeStatus(homeApplyStatus, ["11"])) { | |||
| this.formEnabled.baseApplyForm.baseFormEnabled = true; | |||
| this.formEnabled.baseApplyEnabled = true; | |||
| this.formEnabled.submitEnabled = true; | |||
| this.formVisible.editVisible = true; | |||
| } | |||
| // 申请-村级审核 | |||
| else if(this.isProposeStatus(homeApplyStatus, ["14","15","17","19"])) | |||
| { | |||
| else if (this.isProposeStatus(homeApplyStatus, ["14", "15", "17", "19"])) { | |||
| let neighbor = []; | |||
| if(this.applicationDetail.nsqzjdszd) neighbor.push(this.applicationDetail.nsqzjdszd); | |||
| if(this.applicationDetail.nsqzjdszx) neighbor.push(this.applicationDetail.nsqzjdszx); | |||
| if(this.applicationDetail.nsqzjdszn) neighbor.push(this.applicationDetail.nsqzjdszn); | |||
| if(this.applicationDetail.nsqzjdszb) neighbor.push(this.applicationDetail.nsqzjdszb); | |||
| if (this.applicationDetail.nsqzjdszd) neighbor.push(this.applicationDetail.nsqzjdszd); | |||
| if (this.applicationDetail.nsqzjdszx) neighbor.push(this.applicationDetail.nsqzjdszx); | |||
| if (this.applicationDetail.nsqzjdszn) neighbor.push(this.applicationDetail.nsqzjdszn); | |||
| if (this.applicationDetail.nsqzjdszb) neighbor.push(this.applicationDetail.nsqzjdszb); | |||
| neighbor = neighbor.join('、'); | |||
| console.info(this.form) | |||
| let defaultVillageOption = this.form.villageOption | |||
| .replaceAll('{sqhhzxm}', this.applicationDetail.sqhhzxm) | |||
| .replaceAll('{nsqzjddz}', this.applicationDetail.nsqzjddz) | |||
| .replaceAll('{isAdvice}', neighbor); | |||
| this.$set(this.applicationDetail, 'cjxzscyj',defaultVillageOption); | |||
| this.$set(this.applicationDetail, 'cjxzscsj',handlerTime); | |||
| this.$set(this.applicationDetail, 'cjxzscyj', defaultVillageOption); | |||
| this.$set(this.applicationDetail, 'cjxzscsj', handlerTime); | |||
| } | |||
| // 申请-镇级审批 | |||
| // else if(this.isProposeStatus(homeApplyStatus, ["19"])) | |||
| // { | |||
| // // 自然资源部门 | |||
| // if(!value.tHouseApproveNatureOptions) | |||
| // { | |||
| // this.$set(this.applicationDetail, "tHouseApproveNatureOptions", { | |||
| // landArea: null, | |||
| // rightsType: null, | |||
| // east: null, // 东至 | |||
| // west: null, // 西至 | |||
| // south: null, // 南至 | |||
| // north: null, // 北至 | |||
| // //approveLeader: handlerName, | |||
| // approveLeader: null, | |||
| // approveOption: null, | |||
| // approveTime: handlerTime, | |||
| // theGeom: value.tHouseApplyProposedSituation.theGeom, | |||
| // naturePlan: null, //现场拍照 | |||
| // theGeomPoint: null, //现场坐标点 | |||
| // }); | |||
| // } | |||
| // else { | |||
| // if(!this.applicationDetail.tHouseApproveNatureOptions.approveLeader) | |||
| // // this.$set(this.applicationDetail.tHouseApproveNatureOptions, 'approveLeader', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveNatureOptions.approveTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveNatureOptions, 'approveTime', handlerTime); | |||
| // } | |||
| // // 农村农业部门 | |||
| // if(!value.tHouseApproveAgricultureOptions) | |||
| // { | |||
| // this.$set(this.applicationDetail, "tHouseApproveAgricultureOptions", { | |||
| // isMembership: null, | |||
| // isOnehouse: null, | |||
| // isReviewmaterials: null, | |||
| // //approveLeader: handlerName, | |||
| // approveLeader: null, | |||
| // approveOption: null, | |||
| // approveTime: handlerTime, | |||
| // agriculturePlan: null, //现场拍照 | |||
| // theGeomPoint: null, //现场坐标点 | |||
| // }); | |||
| // } | |||
| // else { | |||
| // if(!this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader) | |||
| // //this.$set(this.applicationDetail.tHouseApproveAgricultureOptions, 'approveLeader', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveAgricultureOptions.approveTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveAgricultureOptions, 'approveTime', handlerTime); | |||
| // } | |||
| // // 住建部 | |||
| // if(!value.tHouseApproveOtherOptions) | |||
| // { | |||
| // this.$set(this.applicationDetail, "tHouseApproveOtherOptions", { | |||
| // buildingType: null, | |||
| // buildingArea: null, | |||
| // buildingFloors: null, | |||
| // buildingHight: null, | |||
| // buildingLandArea: null, | |||
| // designPaper: "1", | |||
| // east: null, // 东至 | |||
| // west: null, // 西至 | |||
| // south: null, // 南至 | |||
| // north: null, // 北至 | |||
| // //approveLeader: handlerName, | |||
| // approveLeader: null, | |||
| // approveOption: null, | |||
| // approveTime: handlerTime, | |||
| // otherPlan: null, //现场拍照 | |||
| // theGeomPoint: null, //现场坐标点 | |||
| // }); | |||
| // } | |||
| // else { | |||
| // if(!this.applicationDetail.tHouseApproveOtherOptions.approveLeader) | |||
| // // this.$set(this.applicationDetail.tHouseApproveOtherOptions, 'approveLeader', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveOtherOptions.approveTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveOtherOptions, 'approveTime', handlerTime); | |||
| // } | |||
| // // 镇政府 | |||
| // if(!value.tHouseApproveTownOptions) | |||
| // { | |||
| // this.$set(this.applicationDetail, 'tHouseApproveTownOptions', { | |||
| // //approveLeader: handlerName, | |||
| // approveLeader: null, | |||
| // approveTime: handlerTime, | |||
| // townPlan: null, //现场拍照 | |||
| // theGeomPoint: null, //现场坐标点 | |||
| // }); | |||
| // } | |||
| // else { | |||
| // if(!this.applicationDetail.tHouseApproveTownOptions.approveLeader) | |||
| // // this.$set(this.applicationDetail.tHouseApproveTownOptions, 'approveLeader', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveTownOptions.approveTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveTownOptions, 'approveTime', handlerTime); | |||
| // } | |||
| // // 勘察 | |||
| // if(!value.tHouseApproveLocationplanOptions) | |||
| // { | |||
| // this.$set(this.applicationDetail, 'tHouseApproveLocationplanOptions', { | |||
| // locationPlan: null, | |||
| // cartographicUnit: null, | |||
| // surveyPersonnel: handlerName, | |||
| // suveyTime: handlerTime, | |||
| // cartographer: handlerName, | |||
| // cartographicTime: handlerTime, | |||
| // }); | |||
| // } | |||
| // else { | |||
| // if(!this.applicationDetail.tHouseApproveLocationplanOptions.surveyPersonnel) | |||
| // this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'surveyPersonnel', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveLocationplanOptions.suveyTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'suveyTime', handlerTime); | |||
| // if(!this.applicationDetail.tHouseApproveLocationplanOptions.cartographer) | |||
| // this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'cartographer', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveLocationplanOptions.cartographicTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'cartographicTime', handlerTime); | |||
| // } | |||
| // console.info(this.formVisible.auditVisible); | |||
| // } | |||
| // 申请-镇级审批 | |||
| // else if(this.isProposeStatus(homeApplyStatus, ["19"])) | |||
| // { | |||
| // // 自然资源部门 | |||
| // if(!value.tHouseApproveNatureOptions) | |||
| // { | |||
| // this.$set(this.applicationDetail, "tHouseApproveNatureOptions", { | |||
| // landArea: null, | |||
| // rightsType: null, | |||
| // east: null, // 东至 | |||
| // west: null, // 西至 | |||
| // south: null, // 南至 | |||
| // north: null, // 北至 | |||
| // //approveLeader: handlerName, | |||
| // approveLeader: null, | |||
| // approveOption: null, | |||
| // approveTime: handlerTime, | |||
| // theGeom: value.tHouseApplyProposedSituation.theGeom, | |||
| // naturePlan: null, //现场拍照 | |||
| // theGeomPoint: null, //现场坐标点 | |||
| // }); | |||
| // } | |||
| // else { | |||
| // if(!this.applicationDetail.tHouseApproveNatureOptions.approveLeader) | |||
| // // this.$set(this.applicationDetail.tHouseApproveNatureOptions, 'approveLeader', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveNatureOptions.approveTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveNatureOptions, 'approveTime', handlerTime); | |||
| // } | |||
| // // 农村农业部门 | |||
| // if(!value.tHouseApproveAgricultureOptions) | |||
| // { | |||
| // this.$set(this.applicationDetail, "tHouseApproveAgricultureOptions", { | |||
| // isMembership: null, | |||
| // isOnehouse: null, | |||
| // isReviewmaterials: null, | |||
| // //approveLeader: handlerName, | |||
| // approveLeader: null, | |||
| // approveOption: null, | |||
| // approveTime: handlerTime, | |||
| // agriculturePlan: null, //现场拍照 | |||
| // theGeomPoint: null, //现场坐标点 | |||
| // }); | |||
| // } | |||
| // else { | |||
| // if(!this.applicationDetail.tHouseApproveAgricultureOptions.approveLeader) | |||
| // //this.$set(this.applicationDetail.tHouseApproveAgricultureOptions, 'approveLeader', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveAgricultureOptions.approveTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveAgricultureOptions, 'approveTime', handlerTime); | |||
| // } | |||
| // // 住建部 | |||
| // if(!value.tHouseApproveOtherOptions) | |||
| // { | |||
| // this.$set(this.applicationDetail, "tHouseApproveOtherOptions", { | |||
| // buildingType: null, | |||
| // buildingArea: null, | |||
| // buildingFloors: null, | |||
| // buildingHight: null, | |||
| // buildingLandArea: null, | |||
| // designPaper: "1", | |||
| // east: null, // 东至 | |||
| // west: null, // 西至 | |||
| // south: null, // 南至 | |||
| // north: null, // 北至 | |||
| // //approveLeader: handlerName, | |||
| // approveLeader: null, | |||
| // approveOption: null, | |||
| // approveTime: handlerTime, | |||
| // otherPlan: null, //现场拍照 | |||
| // theGeomPoint: null, //现场坐标点 | |||
| // }); | |||
| // } | |||
| // else { | |||
| // if(!this.applicationDetail.tHouseApproveOtherOptions.approveLeader) | |||
| // // this.$set(this.applicationDetail.tHouseApproveOtherOptions, 'approveLeader', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveOtherOptions.approveTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveOtherOptions, 'approveTime', handlerTime); | |||
| // } | |||
| // // 镇政府 | |||
| // if(!value.tHouseApproveTownOptions) | |||
| // { | |||
| // this.$set(this.applicationDetail, 'tHouseApproveTownOptions', { | |||
| // //approveLeader: handlerName, | |||
| // approveLeader: null, | |||
| // approveTime: handlerTime, | |||
| // townPlan: null, //现场拍照 | |||
| // theGeomPoint: null, //现场坐标点 | |||
| // }); | |||
| // } | |||
| // else { | |||
| // if(!this.applicationDetail.tHouseApproveTownOptions.approveLeader) | |||
| // // this.$set(this.applicationDetail.tHouseApproveTownOptions, 'approveLeader', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveTownOptions.approveTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveTownOptions, 'approveTime', handlerTime); | |||
| // } | |||
| // // 勘察 | |||
| // if(!value.tHouseApproveLocationplanOptions) | |||
| // { | |||
| // this.$set(this.applicationDetail, 'tHouseApproveLocationplanOptions', { | |||
| // locationPlan: null, | |||
| // cartographicUnit: null, | |||
| // surveyPersonnel: handlerName, | |||
| // suveyTime: handlerTime, | |||
| // cartographer: handlerName, | |||
| // cartographicTime: handlerTime, | |||
| // }); | |||
| // } | |||
| // else { | |||
| // if(!this.applicationDetail.tHouseApproveLocationplanOptions.surveyPersonnel) | |||
| // this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'surveyPersonnel', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveLocationplanOptions.suveyTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'suveyTime', handlerTime); | |||
| // if(!this.applicationDetail.tHouseApproveLocationplanOptions.cartographer) | |||
| // this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'cartographer', handlerName); | |||
| // if(!this.applicationDetail.tHouseApproveLocationplanOptions.cartographicTime) | |||
| // this.$set(this.applicationDetail.tHouseApproveLocationplanOptions, 'cartographicTime', handlerTime); | |||
| // } | |||
| // console.info(this.formVisible.auditVisible); | |||
| // } | |||
| // 开工申请 | |||
| else if(this.isProposeStatus(homeApplyStatus, ["10"])) | |||
| { | |||
| if(!this.applicationDetail.tHouseApplyStart) | |||
| { | |||
| else if (this.isProposeStatus(homeApplyStatus, ["10"])) { | |||
| if (!this.applicationDetail.tHouseApplyStart) { | |||
| this.$set(this.applicationDetail, 'tHouseApplyStart', { | |||
| startDate: null, | |||
| endDate: null, | |||
| @@ -2618,18 +2611,27 @@ export default { | |||
| } | |||
| } | |||
| // 验收 | |||
| // else if(this.isProposeStatus(homeApplyStatus, ["71"])) | |||
| // { | |||
| // if(!this.applicationDetail.tHouseApplyEnd) | |||
| // { | |||
| // this.$set(this.applicationDetail, 'tHouseApplyEnd', { | |||
| // //TODO: 开工结束时后台必定生成 | |||
| // }); | |||
| // } | |||
| // if(this.applicationDetail.tHouseApplyEnd.oldHouseStatus == '0') | |||
| // this.applicationDetail.tHouseApplyEnd.oldHouseStatus = null; | |||
| // } | |||
| // 验收 | |||
| // else if(this.isProposeStatus(homeApplyStatus, ["71"])) | |||
| // { | |||
| // if(!this.applicationDetail.tHouseApplyEnd) | |||
| // { | |||
| // this.$set(this.applicationDetail, 'tHouseApplyEnd', { | |||
| // //TODO: 开工结束时后台必定生成 | |||
| // }); | |||
| // } | |||
| // if(this.applicationDetail.tHouseApplyEnd.oldHouseStatus == '0') | |||
| // this.applicationDetail.tHouseApplyEnd.oldHouseStatus = null; | |||
| // } | |||
| // 开工二道场审批 | |||
| else if (this.isProposeStatus(homeApplyStatus, ["39"])){ | |||
| if(this.isInRoles(role, ['nature_resource'])) | |||
| { | |||
| this.formVisible.landscopeForm.nature_resourceFormEnabled = true; | |||
| console.info(this.formVisible.landscopeForm.nature_resourceFormEnabled); | |||
| } | |||
| } | |||
| // 验收镇级审批 | |||
| else if(this.isProposeStatus(homeApplyStatus, ["79","7C","7F"])) | |||
| { | |||
| @@ -3116,14 +3118,15 @@ export default { | |||
| }, | |||
| // 当地图绘制完成时 | |||
| onMapDrawFinished(data) { | |||
| console.info(data); | |||
| this.drawInsert = data; | |||
| }, | |||
| // 当申请地图被重置时 | |||
| onMapDrawReseted() { | |||
| this.drawInsert = null; | |||
| if(this.applicationDetail.tHouseApplyProposedSituation.theGeom) | |||
| if(this.applicationDetail.ydjfkg.theGeomJson) | |||
| { | |||
| let lastData = JSON.parse(this.applicationDetail.tHouseApplyProposedSituation.theGeom); | |||
| let lastData = JSON.parse(this.applicationDetail.ydjfkg.theGeomJson); | |||
| if(lastData.hasOwnProperty('coordinates')) // 从后台获取的 | |||
| this.drawInsert = lastData.coordinates; | |||
| } | |||
| @@ -3225,17 +3228,17 @@ export default { | |||
| this.notify(msg, 'danger'); | |||
| return; | |||
| } | |||
| //地图判断 | |||
| if (this.drawInsert != null) { | |||
| this.applicationDetail.theGeom = JSON.stringify(this.drawInsert); | |||
| } | |||
| else | |||
| { | |||
| if(this.applicationDetail.sfyyzjd === 'Y' && this.applicationDetail.theGeom) // 新增时 && 已有宅基地时 && 重新画过图且被清理掉 | |||
| { | |||
| this.applicationDetail.theGeom = this.convertGeom(this.applicationDetail.theGeom); | |||
| } | |||
| } | |||
| // //地图判断 | |||
| // if (this.drawInsert != null) { | |||
| // this.applicationDetail.theGeom = JSON.stringify(this.drawInsert); | |||
| // } | |||
| // else | |||
| // { | |||
| // if(this.applicationDetail.sfyyzjd === 'Y' && this.applicationDetail.theGeom) // 新增时 && 已有宅基地时 && 重新画过图且被清理掉 | |||
| // { | |||
| // this.applicationDetail.theGeom = this.convertGeom(this.applicationDetail.theGeom); | |||
| // } | |||
| // } | |||
| console.log("进行保存", this.applicationDetail); | |||
| this.$set(this.applicationDetail, 'applyUserId', this.sysFarmer.id); | |||
| @@ -3408,6 +3411,7 @@ export default { | |||
| if (msg) { | |||
| break; | |||
| } | |||
| comment = this.applicationDetail.ydjfsp.nyncbmscyj; | |||
| // if(this.$refs.pictureUploadApplyingTHouseApproveAgriculture && this.$refs.pictureUploadApplyingTHouseApproveAgriculture.isValid()) { | |||
| // this.submitHouseApproveAgricultureOptions().then(item=>{ | |||
| @@ -3430,9 +3434,6 @@ export default { | |||
| break; | |||
| case "building": | |||
| msg = this.validateBuildingForm(pass); | |||
| if (msg) { | |||
| break; | |||
| } | |||
| comment = this.applicationDetail.ydjfsp.zfcxjsbmscyj; | |||
| // if(this.$refs.pictureUploadApplyingTHouseApproveOther && this.$refs.pictureUploadApplyingTHouseApproveOther.isValid()) { | |||
| // this.submitHouseApproveOtherOptions().then(item=>{ | |||
| @@ -3606,7 +3607,26 @@ export default { | |||
| } | |||
| break; | |||
| case PROPOSER_STAGE_START_ACTIVITY: | |||
| this.complete(pass); | |||
| let _this = this; | |||
| const role = this.$store.getters.roles[0]; | |||
| if(role === "nature_resource"){ | |||
| if (this.drawInsert != null) { | |||
| this.applicationDetail.ydjfkg.theGeomJson = JSON.stringify(this.drawInsert); | |||
| } | |||
| else { | |||
| if(this.applicationDetail.ydjfkg.theGeomJson == null){ | |||
| this.applicationDetail.ydjfkg.theGeomJson = this.convertGeom(this.applicationDetail.ydjfkg.theGeom); | |||
| } | |||
| } | |||
| saveHomeBaseInfo(_this.applicationDetail).then((response) => { | |||
| _this.complete(pass); | |||
| }).catch(resp => { | |||
| _this.notify(msg, 'danger'); | |||
| _this.notify("保存失败!", 'danger'); | |||
| }); | |||
| }else{ | |||
| this.complete(pass); | |||
| } | |||
| break; | |||
| case PROPOSER_STAGE_END_ACTIVITY : { | |||
| let comment; | |||
| @@ -4831,30 +4851,8 @@ export default { | |||
| this.mapShow =true; | |||
| var zb; | |||
| //定位坐标点查看 | |||
| if(data == 'tHouseApproveVillage'){ | |||
| zb = this.applicationDetail.tHouseApproveVillageOptions.theGeom; | |||
| } | |||
| if (data == 'tHouseApproveNature'){ | |||
| zb = this.applicationDetail.tHouseApproveNatureOptions.theGeomPoint; | |||
| } | |||
| if(data == 'tHouseApproveAgriculture'){ | |||
| zb = this.applicationDetail.tHouseApproveAgricultureOptions.theGeomPoint; | |||
| } | |||
| if(data == 'tHouseApproveOther'){ | |||
| zb = this.applicationDetail.tHouseApproveOtherOptions.theGeomPoint; | |||
| } | |||
| if(data == 'tHouseApproveTown'){ | |||
| zb = this.applicationDetail.tHouseApproveTownOptions.theGeomPoint; | |||
| } | |||
| //验收申请定位 | |||
| if(data == 'tHouseApplyEndNongye'){ | |||
| zb = this.applicationDetail.tHouseApplyEnd.nongyeGeom; | |||
| } | |||
| if(data == 'tHouseApplyEndNature'){ | |||
| zb = this.applicationDetail.tHouseApplyEnd.natureGeom; | |||
| } | |||
| if(data == 'tHouseApplyEndZhen'){ | |||
| zb = this.applicationDetail.tHouseApplyEnd.zhenGeom; | |||
| if(data == 'tHomeapplyYdjfkg'){ | |||
| zb = this.applicationDetail.ydjfkg.theGeomJson; | |||
| } | |||
| setTimeout(() => { | |||
| var zbCl = zb.replace("POINT(","").replace(")","").replace(" ",","); | |||