宅基地调查优化

src/api/homesteadSurvey/zjdzd.js

@@ -50,7 +50,7 @@ export function getZjdzd(id) {
 // 新增数据调查-宅基地宗地
 export function addZjdzd(data) {
   return request({
-    url: '/houseSurvey/zjdzd/add',
+    url: '/home/homesteadzjdzdxx/add',
     method: 'post',
     data: data
   })

src/components/Map/MapGisDrawing.vue

@@ -144,7 +144,7 @@ export default {
           var cql_filter_guoyou = "ZLDWDM='" + res.data.orgCode + "0000000'";
           var guoyouTc = new ol.layer.Image({
             source: new ol.source.ImageWMS({
-              url: that.mapGeoServerUrl + "/geoserver/zjd_gydl/wms",
+              url: that.mapGeoServerUrl + "/wms",
               params: {
                 LAYERS: 'zjd_gydl:DLTB',
                 TILED: true,
@@ -162,7 +162,7 @@ export default {
         var cql_filter_all = "zjddm='" +this.zjddm + "'";
         zjdTc= new ol.layer.Image({
           source: new ol.source.ImageWMS({
-            url: that.mapGeoServerUrl +"/geoserver/nsgk_wulanhaote/wms",
+            url: that.mapGeoServerUrl +"/wms",
             params: {
               LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx',
               TILED: true,
@@ -177,7 +177,7 @@ export default {
         //自然幢图层查询开始 ------------------start
         zrzTc= new ol.layer.Image({
           source: new ol.source.ImageWMS({
-            url: that.mapGeoServerUrl+"/geoserver/nsgk_wulanhaote/wms",
+            url: that.mapGeoServerUrl+"/wms",
             params: {
               LAYERS: 'nsgk_wulanhaote:t_homespace_zrz',
               TILED: true,
@@ -193,7 +193,7 @@ export default {
         //附属设施图层查询开始 ------------------start
         fsssTc= new ol.layer.Image({
           source: new ol.source.ImageWMS({
-            url: that.mapGeoServerUrl+"/geoserver/nsgk_wulanhaote/wms",
+            url: that.mapGeoServerUrl+"/wms",
             params: {
               LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
               TILED: true,
@@ -588,9 +588,9 @@ export default {
         console.log(cql_filter);
         var cunTc= new ol.layer.Image({
           source: new ol.source.ImageWMS({
-            url: that.mapGeoServerUrl +"/geoserver/zjd_dc/wms",
+            url: that.mapGeoServerUrl +"/wms",
             params: {
-              LAYERS: 'zjd_dc:t_house_survey_border_village',
+              LAYERS: 'nsgk_wulanhaote:t_homespace_cjqy',
               TILED: true,
               cql_filter: cql_filter,
               SRID: 3857,
@@ -604,7 +604,7 @@ export default {
           service: "WFS",
           version: "1.0.0",
           request: "GetFeature",
-          typename: "zjd_dc:t_house_survey_border_village",
+          typename: "nsgk_wulanhaote:t_homespace_cjqy",
           //featureNS: 'nsgk_hc',//命名空间 URI
           cql_filter: cql_filter,
           //featurePrefix: 'nationalwater',//工作区名称
@@ -612,7 +612,7 @@ export default {
           outputFormat: "application/json",
           //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名，后者是对应值
         };
-        let url_dw = that.mapGeoServerUrl +"/geoserver/zjd_dc/wfs"; //wfsurl;
+        let url_dw = that.mapGeoServerUrl +"/wfs"; //wfsurl;
         url_dw = url_dw + "?";
         for (let key in param_dw) {
           url_dw = url_dw + key + "=" + param_dw[key] + "&";
@@ -649,9 +649,9 @@ export default {
           var cql_filter_guoyou = "ZLDWDM='" + res.data.orgCode + "0000000'";
           var guoyouTc = new ol.layer.Image({
             source: new ol.source.ImageWMS({
-              url: that.mapGeoServerUrl + "/geoserver/zjd_gydl/wms",
+              url: that.mapGeoServerUrl + "/wms",
               params: {
-                LAYERS: 'zjd_gydl:DLTB',
+                LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx',
                 TILED: true,
                 cql_filter: cql_filter_guoyou,
                 SRID: 3857,
@@ -666,9 +666,9 @@ export default {
         //var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
         var zjdTc= new ol.layer.Image({
           source: new ol.source.ImageWMS({
-            url: that.mapGeoServerUrl+"/geoserver/zjd_dc/wms",
+            url: that.mapGeoServerUrl+"/wms",
             params: {
-              LAYERS: 'zjd_dc:t_house_survey_zjdzd',
+              LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx',
               TILED: true,
               cql_filter: cql_filter,
               SRID: 3857,

src/views/homesteadSurvey/add.vue

@@ -71,7 +71,6 @@
           label="坐落单位代码"
           placeholder="坐落单位代码"
           input-align="right"
-          v-show="false"
           required
           :rules="[{ required: true}]"
         />
@@ -81,7 +80,7 @@
           v-model="form.zddm"
           name="宗地代码"
           label="宗地代码"
-          placeholder="自动生成"
+          placeholder="宗地代码"
         />
         <van-field
           autocomplete="off"
@@ -144,7 +143,7 @@
           maxlength="15"
         />
         <field-select
-          v-model="form.dj"
+          v-model="form.qllx"
           label="权利类型"
           value-key="dictLabel"
           data-key="dictValue"
@@ -153,11 +152,11 @@
           :on-remote-response="'data'"
         />
         <field-select
-          v-model="form.dj"
-          label="权利类型方式"
+          v-model="form.qlsdfs"
+          label="权利设定方式"
           value-key="dictLabel"
           data-key="dictValue"
-          placeholder="选择权利类型方式"
+          placeholder="选择权利设定方式"
           remote-url="/system/dict/data/type/right_setting_mode"
           :on-remote-response="'data'"
         />
@@ -269,6 +268,14 @@
           :rules="[{ required: true}]"
         />
         <p class="title" style="position:relative;padding-left:10px;line-height:20px;font-size: 16px;margin-left: 3%;margin-bottom: 5px;">属性信息</p>
+        <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.shyqrdbxm"
+          name="权利人名称"
+          label="权利人名称"
+          placeholder="权利人名称"
+        />
         <field-select
           v-model="form.zjdqdfs"
           label="取得方式"
@@ -399,6 +406,8 @@
         placeholder="选择使用状态"
         remote-url="/system/dict/data/type/land_status"
         :on-remote-response="'data'"
+        required
+        :rules="[{ required: true}]"
       />
         <field-select
           v-model="form.zjdlyzk"
@@ -409,6 +418,8 @@
           remote-url="/system/dict/data/type/zjdlyzk"
           :on-remote-response="'data'"
           @change="onZjdlyzkChanged"
+          required
+          :rules="[{ required: true}]"
         />
         <van-field
           v-if="showXzyy"
@@ -779,6 +790,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;
     }
@@ -803,6 +815,19 @@ export default {
     },
     submitzjd(){
       this.$refs.form.validate().then(() => {
+        if(this.form.id == null){
+          addZjdzd(this.form).then(response => {
+            let _this =this
+            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
             this.$toast({
@@ -814,6 +839,8 @@ export default {
               }
             })
           });
+        }
+
       }).catch((e) => {
         Dialog({ type: 'danger', message: '请填写完整的表单项' });
       });
@@ -858,7 +885,7 @@ export default {
     },
     /**宅基地利用状态处理*/
     onZjdlyzkChanged(val){
-      if(val.dictValue === '1'){
+      if(val === '1'){
         this.showXzyy = false;
       }else{
         this.showXzyy = true;

src/views/homesteadSurvey/add4.vue

@@ -87,7 +87,7 @@
       <p style="width:32%;border: 1px solid transparent;background: #22B7F2;padding: 5px 0;border-radius: 50px;">
         <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="qmqr()">签名确认</span>
       </p>
-      <p style="width:32%;border: 1px solid #22B7F2;background: #ffffff;padding: 5px 0;border-radius: 50px;">
+      <p v-if = "showDcsh" style="width:32%;border: 1px solid #22B7F2;background: #ffffff;padding: 5px 0;border-radius: 50px;">
         <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;"  @click="dcsh()">调查审核</span>
       </p>
     </div>
@@ -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(){

src/views/homesteadSurvey/list.vue

@@ -233,7 +233,7 @@
           // 户主列表
           hzform:{},
           // 权利人列表
-          qlrform:[],
+          qlrform:{},
           // 权利人性质弹出框
           showsuyqxz:false,
           // 代理人证件类型弹出框
@@ -357,6 +357,7 @@
           this.cybzOptions = this.dictTypeList.member_remark;
         })
         this.getList();
+        this.getSyqr();
           // this.getDicts("family_status").then(response => {
           //   var arr = [];
           //   response.data.forEach(function (item) {
@@ -420,6 +421,10 @@
             this.list1 = res.data.zjdzdxxList;
             this.totalH = res.data.zjdzs;
             this.totalR = res.data.shyqrs;
+            this.yhcNums = res.data.shyqrs;
+          });
+          rhhcList({surveyStatus:"1"}).then(res => {
+            this.whcNums = res.data.shyqrs;
           });
         },
         showUploadList(){
@@ -875,11 +880,17 @@
           //   _this.$router.push({name:'homesteadAdd'});
           // },1000)
 
-          this.$router.push({path:'/homesteadSurvey/add',query: {res: item}});
+          getZjdzd(item.id).then((response) => {
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data));
+            this.$router.push({path:'/homesteadSurvey/add'});
+          });
         },
         // 入户核查搜索框新增。
         onClickzjd(){
           this.$cookies.remove("search");
+          localStorage.setItem("zjdzdxxItem",JSON.stringify({suyqrdm:this.qlrform.suyqrdm,zjdlyzk:"1",landStatus:"1"
+                                                              ,houseOwnership:"2",landPhms:"10",isMore:"0",sffz:"0",sfcz:"0"
+                                                              ,zjdqdfs:"01",sjly:"01",qlsdfs:"1",qllx:"1",dj:"1",yt:"01"}));
           this.$router.push({name:'homesteadAdd'});
         },
         // 农户信息搜索框新增。
@@ -1214,17 +1225,6 @@
                 this.totalR = response.data.shyqrs;
               }
             });
-          }else if(this.active==2){
-            let params = {
-              "deptId" : this.item.deptId,
-              "houseDataConfirmStatus" : "UNCONFIRMED",
-              "syqr" : this.zjdvalue
-            }
-            listZjdzd(params).then((response) => {
-              if (response.code == 200) {
-                this.list2 = response.rows
-              }
-            });
           }else{
             let params = {
               "shyqrdbxm" : this.zjdvalue,

src/views/homesteadSurvey/list2.vue

@@ -1118,7 +1118,7 @@
         onSearchnh(){
           let params = {
             "deptId" : this.item.deptId,
-            "yhzgx" : "01",
+            "yhzgx" : "02",
             "nhValue" : this.nhvalue
           }
           listNhhncy(params).then((response) => {