宅基地调查

src/api/homesteadSurvey/fsss.js

@@ -60,18 +60,11 @@ export function getFsssZjdDmList(zjddm) {
   })
 }
 
-// 通过宅基地编码修改附属设施状态
-export function updateFsssZtN(zjddm) {
-  return request({
-    url: '/houseSurvey/fsss/updateFsssZtN/' + zjddm,
-    method: 'get'
-  })
-}
-
-// 通过宅基地编码修改附属设施状态
-export function updateFsssZtY(zjddm) {
+// 修改数据调查-附属设施
+export function updateFsssStatus(data) {
   return request({
-    url: '/houseSurvey/fsss/updateFsssZtY/' + zjddm,
-    method: 'get'
+    url: '/houseSurvey/fsss/updateFsssStatus',
+    method: 'post',
+    data: data
   })
 }

src/api/homesteadSurvey/zrz.js

@@ -69,19 +69,11 @@ export function getZrzZjdDmList(zjddm) {
   })
 }
 
-// 通过宅基地修改自然幢核查状态
-export function updateZrzZtN(zjddm) {
-  return request({
-    url: '/houseSurvey/zrz/updateZrzZtN/' + zjddm,
-    method: 'get'
-  })
-}
-
-// 通过宅基地修改自然幢核查状态
-export function updateZrzZtY(zjddm) {
+// 修改数据调查-自然幢
+export function updateZrzStatus(data) {
   return request({
-    url: '/houseSurvey/zrz/updateZrzZtY/' + zjddm,
-    method: 'get'
+    url: '/houseSurvey/zrz/updateZrzStatus',
+    method: 'post',
+    data: data
   })
 }
-

src/views/homesteadSurvey/add.vue

@@ -48,7 +48,7 @@
         <van-col span="2">
           <div style=" height: 2px; border: 2px dashed #b5b4b4;margin-top: 40px;"></div>
         </van-col>
-        <van-col span="4" style="text-align:center;" @click="active=4,getFsssList()">
+        <van-col span="4" style="text-align:center;" @click="active=4,getFsssList(),showPic()">
           <van-icon :name="require('../../assets/images/housesteadSurvey/fsss'+(active==4?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
           <p :style="{color:(active==4?'rgb(34, 183, 242)':'#000')}">附属物</p>
         </van-col>
@@ -446,35 +446,9 @@
             placeholder="备注"
             maxlength="200"
           />
-          <van-field
-          autocomplete="off"
-          input-align="right"
-          v-model="form.ycms"
-          name="异常描述"
-          label="异常描述"
-          placeholder="异常描述"
-          maxlength="200"
-          rows="1"
-          autosize
-          type="textarea"
-          disabled
-        />
-          <van-field
-            autocomplete="off"
-            input-align="right"
-            v-model="form.auditRemark"
-            name="审核描述"
-            label="审核描述"
-            placeholder="审核描述"
-            maxlength="200"
-            rows="1"
-            autosize
-            type="textarea"
-            disabled
-          />
           <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div  style="margin: 16px;">
-            <van-button v-if="isFinished" round  color="#7AC943" style="width:70%;vertical-align:bottom;" native-type="submit">保存</van-button>
+            <van-button v-if="isFinished" round  color="#7AC943" style="width:100%" native-type="submit">保存</van-button>
           </div>
         </van-form>
       </div>
@@ -607,10 +581,18 @@
           <p style="color:#22B7F2;font-size:20px;line-height:30px;" @click="showPopupfsss('')"><van-icon name="plus" color="#22b7f2" size="20" style="margin-right:10px;"/>添加附属设施信息</p>
         </div>
       </div>
+      <!--<div v-if="!isFinished&&showsh">
+        <div style="margin:20px;">
+          <p class="title" style="position:relative;padding-left:20px;line-height:32px;">电子签名</p>
+        </div>
+        <van-row style="margin: 0 5% 5% 5%;border:1px solid #BFBFBF">
+          <img :src="resultImg" alt="" width="100%" height="100%"/>
+        </van-row>
+      </div>-->
       <div style="position:fixed;bottom:0;left:5%;width:90%;text-align:center;display:flex;">
-        <van-button round color="#ee0a24" v-if="isFinished" style="width:30%;flex:1;" @click="showycbjinfo">异常标记</van-button>
-        <van-button round color="#7AC943" v-if="isFinished" style="width:30%;flex:1;" @click="searchCommit">签名确认</van-button>
-        <van-button round color="#ff976a" v-if="!isFinished" style="width:30%;flex:1;" @click="showdcshinfo">调查审核</van-button>
+        <van-button round color="#ee0a24"  style="flex:1;" @click="showycbjinfo">异常标记</van-button>
+        <van-button round color="#7AC943"  style="flex:1;" @click="searchCommit">签名确认</van-button>
+        <van-button round color="#ff976a" v-if="!isFinished&&showsh" style="flex:1;" @click="showdcshinfo">调查审核</van-button>
       </div>
     </div>
     <van-popup v-model="showsyqr" style="height:100%;width:100%;">
@@ -2757,9 +2739,9 @@
         />
         <img :src="resultImg" alt="" width="100%" height="100%" v-if="resultImg"/>
       </van-row>
-      <van-row type="flex" justify="center" style="margin-bottom:20px;">
+      <van-row type="flex" justify="center" style="margin-bottom:20px;" v-if="isFinished">
         <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleReset">清空画板</van-button></van-col>
-        <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleGenerate">保存确认</van-button></van-col>
+        <van-col span="6" style="text-align:center;"><van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button></van-col>
       </van-row>
     </van-popup>
     <van-popup v-model="showycbj" position="bottom"
@@ -2778,8 +2760,8 @@
           <van-uploader v-model="fileListyc" :after-read="beforeReadyc" multiple @delete="deleteFileyc" :max-count="8"></van-uploader>
         </template>
       </van-field>
-      <div style="margin: 16px;">
-        <van-button round block type="info" @click="saveyc">关闭</van-button>
+      <div style="margin: 16px;" v-if="isFinished">
+        <van-button round block type="info" @click="saveyc">保存</van-button>
       </div>
     </van-popup>
     <van-popup v-model="showdcsh" position="bottom"
@@ -2935,12 +2917,12 @@
   import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
   import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand} from "@/api/homesteadSurvey/zjdzd";
   import MapGisDrawing from "@/components/Map/MapGisDrawing";
-  import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzZtN,updateZrzZtY} from "@/api/homesteadSurvey/zrz";
+  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";
   import {listNhhncy,addNhhncy,updateNhhncy,delNhhncy} from "@/api/homesteadSurvey/nhhncy";
   import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
-  import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssZtN,updateFsssZtY} from "@/api/homesteadSurvey/fsss";
+  import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
   import { listTown, getTown } from "@/api/homesteadSurvey/town";
   import { listVillage} from "@/api/homesteadSurvey/village";
   import { sysConfig} from "@/api/homesteadSurvey/index";
@@ -2950,6 +2932,7 @@
     components: { MapGisDrawing,},
     data() {
       return {
+        showsh:false,
         showdcsh:false,
         zjdAudit:'1',
         auditRemark:"",
@@ -3159,7 +3142,6 @@
           deptId:"",
           zjddm:"",
         },
-        ztMap: true,
         //记录是否从地图进入
         enterMap: "",
         //记录从地图进入宅基地代码
@@ -3174,13 +3156,6 @@
       };
     },
     created(){
-      console.log(this.$cookies.get("search"));
-      if(this.$cookies.get("search") !=null &&this.$cookies.get("search").zjddm !="" && this.$cookies.get("search").zjddm !=undefined && this.$cookies.get("search").zjddm !=null){
-        this.ztMap =false;
-        this.$cookies.set("item",this.$cookies.get("search"));
-      }else {
-        this.ztMap =true;
-      }
       if(this.$cookies.get("search")){
         if(this.$cookies.get("search").active!=null){
           this.cookiesInfo = this.$cookies.get("search")
@@ -3191,9 +3166,7 @@
           this.backMap.backMapZjdAData = this.cookiesInfo.mapZjdAData;
           this.backMap.deptId = this.cookiesInfo.mapZjdAData.deptId;
           this.backMap.zjddm = this.cookiesInfo.mapZjdAData.zjddm;
-          if(this.ztMap){
-            this.$cookies.set("item",this.backMap);
-          }
+          this.$cookies.set("item",this.backMap);
           this.form.theGeom = this.cookiesInfo.mapZjdAData.theGeom;
           //this.enterMapZjddm = this.cookiesInfo.mapZjdAData.zjddm;
           //返回地图值记录----end
@@ -3203,18 +3176,16 @@
             this.isFinished = true
           }
           this.form = this.cookiesInfo.mapZjdAData;
-          //this.mapClickLoading();
+          this.mapClickLoading();
           let zrz = this.cookiesInfo.mapZrzAData;
           let fsss = this.cookiesInfo.mapFsssAData;
-
-          // this.getnhdmlist();
-          // this.getBaseUrl();
-          // this.getZjd();
+          this.getnhdmlist();
+          this.getBaseUrl();
+          this.getZjd();
           if(this.cookiesInfo.active=="3"){
-            this.showzrz= true
-            //this.form3 =  this.cookiesInfo.mapZrzAData;
+            this.showzrz = true
+            this.form3 = this.cookiesInfo.mapZrzAData
             this.form3.theGeom = this.cookiesInfo.mapZrzAData.theGeom;
-            this.form3.zjddm = this.form.zjddm;
             this.getZrzList()
             setTimeout(() => {
               this.showPopupzrz(zrz)
@@ -3222,8 +3193,8 @@
 
           }else if(this.cookiesInfo.active=="4"){
             this.showfsss= true
-            //this.form4.theGeom = this.cookiesInfo.mapFsssAData.theGeom;
-            this.form4.zjddm = this.form.zjddm;
+            this.form4 = this.cookiesInfo.mapFsssAData
+            this.form4.theGeom = this.cookiesInfo.mapFsssAData.theGeom;
             this.getFsssList()
             setTimeout(() => {
               this.showPopupfsss(fsss)
@@ -3357,6 +3328,7 @@
       if(this.active ==1){
         //this.form.theGeom = this.item.theGeom;
         this.message = this.form.theGeom;
+        console.log(this.message);
         //this.$refs.drewingClickLoading = this.form.theGeom;
         this.mapClickLoading();
       }
@@ -3365,6 +3337,16 @@
 
     },
     methods: {
+      showPic(){
+        if(this.form.dzqm!=null&&this.form.dzqm!=""){
+          this.resultImg = this.baseUrl+this.form.dzqm
+        }
+        if(this.$cookies.get("businessLevel")=='2'){
+          this.showsh = true
+        }else{
+          this.showsh = false
+        }
+      },
       validatorIdcard(val){
         if(this.form1.shyqrdbzjlx=='01'){
           if(this.vcheckID(val)){
@@ -3485,7 +3467,17 @@
         this.form.auditRemark = this.auditRemark
         if(this.form.zjdAudit=='2'){
           this.form.houseDataConfirmStatus = 'UNCONFIRMED'
-          this.form.dzqm = ''
+          let params = {
+            houseDataConfirmStatus : 'UNCONFIRMED',
+            zjddm : this.form.zjddm,
+            zjdAudit : "0"
+          }
+          updateZrzStatus(params).then(res => {
+            console.log(res)
+          })
+          updateFsssStatus(params).then(res => {
+            console.log(res)
+          })
           updateZjdzd(this.form).then(response => {
             let _this =this
             this.$toast({
@@ -3497,7 +3489,19 @@
               }
             })
           });
+
         }else{
+          let params = {
+            houseDataConfirmStatus : 'CONFIRMED',
+            zjddm : this.form.zjddm,
+            zjdAudit : "1"
+          }
+          updateZrzStatus(params).then(res => {
+            console.log(res)
+          })
+          updateFsssStatus(params).then(res => {
+            console.log(res)
+          })
           updateZjdzd(this.form).then(response => {
             let _this =this
             this.$toast({
@@ -3509,12 +3513,30 @@
               }
             })
           });
+
         }
       },
       saveyc(){
         this.showycbj = false
         this.form.isyc = this.isyc
         this.form.ycms = this.ycms
+        let params = {
+          zjddm : this.form.zjddm,
+          isyc : this.form.isyc
+        }
+        updateZrzStatus(params).then(res => {})
+        updateFsssStatus(params).then(res => {})
+        updateZjdzd(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.showycbj = false
+            }
+          })
+        });
       },
       // 图片上传前
       beforeReadyc(file){
@@ -3586,6 +3608,7 @@
           configKey: "system.attachment.url"}
         sysConfig(params).then(response => {
           this.baseUrl = response.rows[0].configValue
+          console.log(this.baseUrl)
         })
       },
       // 验证
@@ -5861,13 +5884,13 @@
             uploadFile(data2).then(res => {
               this.form.dzqm = res.fileName
               this.form.houseDataConfirmStatus = "CONFIRMED"
-              if(this.form.zjddm !="" && this.form.zjddm !=undefined && this.form.zjddm !=null && this.form.isyc =="N"){
-                updateZrzZtN(this.form.zjddm).then(response => {});
-                updateFsssZtN(this.form.zjddm).then(response => {});
-              }else {
-                updateZrzZtY(this.form.zjddm).then(response => {});
-                updateFsssZtY(this.form.zjddm).then(response => {});
+              this.form.zjdAudit = '0'
+              let param ={
+                zjddm : this.item.zjddm,
+                houseDataConfirmStatus : "CONFIRMED"
               }
+              updateZrzStatus(param).then(res => {})
+              updateFsssStatus(param).then(res => {})
               if (this.form.id != null) {
                 updateZjdzd(this.form).then(response => {
                   let _this =this
@@ -5896,6 +5919,8 @@
             })
           }, 200);
         }else{
+          this.form.houseDataConfirmStatus = "CONFIRMED"
+          this.form.zjdAudit = '0'
           updateZjdzd(this.form).then(response => {
             let _this =this
             this.$toast({
@@ -5912,9 +5937,6 @@
       },
       searchCommit(){
         this.showesign = true
-        if(this.form.dzqm!=null&&this.form.dzqm!=""){
-          this.resultImg = this.baseUrl+this.form.dzqm
-        }
       },
       searchCommit1(){
         this.form.houseDataConfirmStatus = "CONFIRMED"