保存
@@ -739,7 +754,7 @@ import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homeste
import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand,submitOnly} from "@/api/homesteadSurvey/zjdzd";
import FieldSelect from "@/components/form/FieldSelect";
import FieldRadio from "@/components/form/FieldRadio";
-import MapGisDrawing from "@/components/Map/MapGisDrawing";
+import CommonMap from "@/components/house/CommonMap";
import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzStatus} from "@/api/homesteadSurvey/zrz";
import {listNmfw,addNmfw,updateNmfw,delNmfw} from "@/api/homesteadSurvey/nmfw";
import {listSuyqr,addSuyqr,updateSuyqr} from "@/api/homesteadSurvey/suyqr";
@@ -753,7 +768,7 @@ import { Notify, Dialog, Toast } from 'vant';
import axios from "axios";
export default {
name: "homesteadAdd",
- components: { MapGisDrawing,FieldSelect, FieldRadio},
+ components: { CommonMap,FieldSelect, FieldRadio},
data() {
return {
active:1,
@@ -765,6 +780,11 @@ export default {
nhdm :'777888999',
}
],
+ // 地图绘制
+ drawInsert: null,
+ // 当前位置信息
+ tGeoOrganizationLat: null,
+ tGeoOrganizationLng: null,
showZjdqdsj:false,
showCzmj:false,
showFzxx:false,
@@ -779,6 +799,7 @@ export default {
created(){
let data = this.$route.query.res;
this.form = JSON.parse(localStorage.getItem("zjdzdxxItem"));
+ console.info( this.form);
if(this.form.sfcz === "1"){
this.showCzmj = true;
}
@@ -790,21 +811,36 @@ export default {
if(this.form.zjdlyzk !== "1"){
this.showXzyy = true;
}
- this.onSubmitzjd();
+ this.$nextTick(() => {
+
+ this.pointDarw(null);
+ // this.pointDarwNature(null);
+ this.$refs.pointDarwMap && this.$refs.pointDarwMap.update();
+ })
},
mounted(){
},
methods: {
- onSubmitzjd(){
- setTimeout(() => {
- this.$refs.zjdProductResh.drawingPaceCountryDarw();
- }, 500);
- },
submitzjd(){
this.$refs.form.validate().then(() => {
+ if(this.form.id == null){
+ addZjdzd(this.form).then(response => {
+ let _this =this;
+ localStorage.setItem("zjdzdxxItem",JSON.stringify(this.form));
+ this.$toast({
+ icon: 'success', // 找到自己需要的图标
+ message: '保存成功',
+ duration:"1000",
+ onClose:function(){
+ _this.$router.push({path:'/homesteadSurvey/add2',query: {zjddm: _this.form.zjddm}});
+ }
+ })
+ });
+ }else{
updateZjdzd(this.form).then(response => {
- let _this =this
+ let _this =this;
+ localStorage.setItem("zjdzdxxItem",JSON.stringify(this.form));
this.$toast({
icon: 'success', // 找到自己需要的图标
message: '保存成功',
@@ -814,6 +850,8 @@ export default {
}
})
});
+ }
+
}).catch((e) => {
Dialog({ type: 'danger', message: '请填写完整的表单项' });
});
@@ -858,12 +896,53 @@ export default {
},
/**宅基地利用状态处理*/
onZjdlyzkChanged(val){
+ console.info(val);
if(val.dictValue === '1'){
this.showXzyy = false;
}else{
this.showXzyy = true;
}
},
+ // 绘制申请地图
+ pointDarw(data) {
+ this.$nextTick(() => {
+ let map = this.$refs.pointDarwMap;
+ if(data == null)
+ data = this.form.theGeomJson;
+ this.setMapData(map, data);
+
+ });
+ },
+ // 通用设置地图数据函数
+ setMapData(map, data) {
+ //console.log(map, data ? true : false);
+ if(!map) return;
+ if(data)
+ {
+ map.setLayer('pointDarwLayer', data);
+ }
+ else {
+ this.getLandCoord((lng, lat) => {
+ map.setCoord(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+ });
+ }
+ },
+ // 当地图绘制完成时
+ onMapDrawFinished(data) {
+ console.info(data);
+ this.drawInsert = data;
+ this.form.theGeomJson = JSON.stringify(this.drawInsert);
+ },
+ // 当申请地图被重置时
+ onMapDrawReseted() {
+ this.drawInsert = null;
+ if(this.form.theGeomJson)
+ {
+ let lastData = JSON.parse(this.form.theGeomJson);
+ if(lastData.hasOwnProperty('coordinates')) // 从后台获取的
+ this.drawInsert = lastData.coordinates;
+ }
+ },
goBack(){
if(this.ztMap && this.enterMap ==1){
if(this.form.id == null){
diff --git a/src/views/homesteadSurvey/add3.vue b/src/views/homesteadSurvey/add3.vue
index b00f1313..7b0a6735 100644
--- a/src/views/homesteadSurvey/add3.vue
+++ b/src/views/homesteadSurvey/add3.vue
@@ -143,8 +143,7 @@ export default {
this.$router.push({name:'zrzAdd',query:val});
},
showPopupAddzrz(){
- console.info(this.zrzlist[0].zjddm);
- this.$router.push({name:'zrzAdd',query:{zjddm:this.zrzlist[0].zjddm}});
+ this.$router.push({name:'zrzAdd',query:{zjddm:this.zjdzdxx.zjddm}});
},
shownmfwlist(val){
this.$router.push({name:'nmfwList',query:val});
diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue
index ff46aed7..d4588b63 100644
--- a/src/views/homesteadSurvey/add4.vue
+++ b/src/views/homesteadSurvey/add4.vue
@@ -87,7 +87,7 @@
签名确认
-
+
调查审核
@@ -149,6 +149,7 @@ export default {
active:4,
dcshShow:false,
showesign:false,
+ showDcsh:false,
examineData:[{dictLabel:"审批通过",dictValue:"5"},{dictLabel:"审批驳回",dictValue:"4"}],
zjdzdxx:{surveyStatus:"5"},
fssslist:[],
@@ -167,6 +168,11 @@ export default {
if(this.zjdzdxx.surveySign != null){
this.signature.resultImg = "http://localhost/api/"+this.zjdzdxx.surveySign;
}
+ getZjdzd(this.zjdzdxx.id).then((response) => {
+ if(response.data.surveyStatus !== "1"){
+ this.showDcsh = true;
+ }
+ });
this.getList();
},
mounted(){
diff --git a/src/views/homesteadSurvey/hncyDetails.vue b/src/views/homesteadSurvey/hncyDetails.vue
index bce7bc35..4d48c402 100644
--- a/src/views/homesteadSurvey/hncyDetails.vue
+++ b/src/views/homesteadSurvey/hncyDetails.vue
@@ -233,7 +233,7 @@
import {ref} from "vue";
import axios from "axios";
export default {
- name: "hncyList2",
+ name: "hncyDetails",
components: {FieldSelect, FieldRadio},
data() {
return {
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 2a7842f0..85f8eb2c 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -115,6 +115,7 @@
:finished="finished3"
finished-text="没有更多了"
:immediate-check="false"
+ @load="onRefreshzjd"
>