宅基地调查

src/api/homesteadSurvey/zjdzd.js

@@ -95,3 +95,12 @@ export function submitUploadImageList(data) {
     data: data
   })
 }
+
+// 数据审核-宅基地宗地
+export function submitOnly(data) {
+  return request({
+    url: '/houseSurvey/zjdzd/submitOnly',
+    method: 'post',
+    data: data
+  })
+}

src/views/homesteadSurvey/add.vue

@@ -2917,7 +2917,7 @@
 
 <script>
   import {listShyqr,addShyqr,updateShyqr,delShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
-  import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand} from "@/api/homesteadSurvey/zjdzd";
+  import {listZjdzd,getZjdzd,updateZjdzd,addZjdzd,uploadFile,getQueryLand,submitOnly} from "@/api/homesteadSurvey/zjdzd";
   import MapGisDrawing from "@/components/Map/MapGisDrawing";
   import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzStatus} from "@/api/homesteadSurvey/zrz";
   import {listNmfw,addNmfw,updateNmfw,delNmfw} from "@/api/homesteadSurvey/nmfw";
@@ -4279,12 +4279,6 @@
         this.showPickerxzkssj= false
       },
       goBack(){
-        // if(this.enterMap ==1){
-        //   this.$cookies.set("item",this.backMap);
-        //   this.$router.push({name:'homesteadList'});
-        // } else {
-        //this.enterMap="";
-        //this.$cookies.set("item","");
         if(this.ztMap && this.enterMap ==1){
           if(this.form.id == null){
             this.backMap.backMapZjdAData.theGeom= "";
@@ -5973,7 +5967,7 @@
               updateZrzStatus(param).then(res => {})
               updateFsssStatus(param).then(res => {})
               if (this.form.id != null) {
-                updateZjdzd(this.form).then(response => {
+                submitOnly(this.form).then(response => {
                   let _this =this
                   this.$toast({
                     icon: 'success', // 找到自己需要的图标
@@ -6008,7 +6002,7 @@
           }
           updateZrzStatus(param).then(res => {})
           updateFsssStatus(param).then(res => {})
-          updateZjdzd(this.form).then(response => {
+          submitOnly(this.form).then(response => {
             let _this =this
             this.$toast({
               icon: 'success', // 找到自己需要的图标

src/views/homesteadSurvey/list.vue

@@ -83,10 +83,13 @@
           <van-cell  v-for="(item,index) in list" :key="index" size="small"  :clickable="true"  style="border-radius: 16px;
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
-              <p v-if="item.syqr!=null&&item.syqr!=''" style="color:#22B7F2">{{limitWords(item.syqr)}}
-                  <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">查看详情</van-button>
-                  <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">开始调查</van-button>
-                  <van-button plain round color="#FA5353" size="mini" v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
+              <p  style="color:#22B7F2">{{limitWords(item.syqr)}}
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">查看</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">调查</van-button>
+                <van-button plain round color="#FA5353" size="mini" v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
+                <span v-if="item.houseDataConfirmStatus=='CONFIRMED'&&item.zjdAudit=='0'" style="color:#ff976a;float:right;font-size:12px;margin-right:10px;">待审核</span>
+                <span v-if="item.houseDataConfirmStatus=='CONFIRMED'&&item.zjdAudit=='1'" style="color:#07c160;float:right;font-size:12px;margin-right:10px;">已审核</span>
+                <span v-if="item.houseDataConfirmStatus=='CONFIRMED'&&item.zjdAudit=='2'" style="color:#ee0a24;float:right;font-size:12px;margin-right:10px;">已驳回</span>
               </p>
             </template>
             <!--<template #default>
@@ -95,9 +98,7 @@
             <template #label>
               <p>宅基地代码:  {{item.zjddm}} </p>
               <p>宗地面积: {{item.zdmj}}㎡
-                <span v-if="item.houseDataConfirmStatus=='CONFIRMED'&&item.zjdAudit=='0'" style="color:#ff976a;float:right;">待审核</span>
-                <span v-if="item.houseDataConfirmStatus=='CONFIRMED'&&item.zjdAudit=='1'" style="color:#07c160;float:right;">已审核</span>
-                <span v-if="item.houseDataConfirmStatus=='CONFIRMED'&&item.zjdAudit=='2'" style="color:#ee0a24;float:right;">已驳回</span>
+                <span  style="color:#22B7F2;float:right;">{{item.updateBy}}</span>
               </p>
             </template>
             <template #icon>
@@ -121,7 +122,10 @@
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
               <p style="color:#22B7F2">{{limitWords(item.syqr)}}
-                <van-button  plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">查看详情</van-button>
+                <van-button  plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">查看</van-button>
+                <span v-if="item.zjdAudit=='0'" style="color:#ff976a;float:right;font-size:12px;margin-right:10px;">待审核</span>
+                <span v-if="item.zjdAudit=='1'" style="color:#07c160;float:right;font-size:12px;margin-right:10px;">已审核</span>
+                <span v-if="item.zjdAudit=='2'" style="color:#ee0a24;float:right;font-size:12px;margin-right:10px;">已驳回</span>
                 <!--<van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'" plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">开始调查</van-button>
                 <van-button plain round color="#FA5353" size="mini" v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>-->
               </p>
@@ -133,9 +137,7 @@
             <template #label>
               <p>宅基地代码:  {{item.zjddm}} </p>
               <p>宗地面积: {{item.zdmj}}㎡
-                <span v-if="item.zjdAudit=='0'" style="color:#ff976a;float:right;">待审核</span>
-                <span v-if="item.zjdAudit=='1'" style="color:#07c160;float:right;">已审核</span>
-                <span v-if="item.zjdAudit=='2'" style="color:#ee0a24;float:right;">已驳回</span>
+                <span  style="color:#22B7F2;float:right;">{{item.updateBy}}</span>
               </p>
             </template>
             <template #icon>
@@ -159,8 +161,8 @@
           box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px">
             <template #title>
               <p style="color:#22B7F2">{{limitWords(item.syqr)}}
-                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">开始调查</van-button>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">查看</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" @click="setCookies(item)">调查</van-button>
                 <van-button plain round color="#FA5353" size="mini" v-if="item.houseDataConfirmStatus!='CONFIRMED'" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
               </p>
             </template>
@@ -171,7 +173,8 @@
             <template #label>
               <p>宅基地代码:  {{item.zjddm}} </p>
               <p>宗地面积: {{item.zdmj}}㎡
-                <span v-if="item.zjdAudit=='2'" style="color:#ee0a24;float:right;">已驳回</span>
+
+                <span  style="color:#22B7F2;float:right;">{{item.updateBy}}</span>
               </p>
             </template>
             <template #icon>

src/views/homesteadSurvey/settle.vue

@@ -29,7 +29,7 @@
         <van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
       </template>
     </van-cell>
-    <van-cell title="退出软件" is-link to="/homesteadLogin" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
+    <van-cell title="退出软件" @click="logout"  style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
       <template #icon>
         <van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
       </template>
@@ -56,6 +56,7 @@
 
 <script>
     import {updateUserPwd} from "../../api/onlineHome/my";
+    import {logout} from "../../api/login";
 
     export default {
         name: "homesteadSettle",
@@ -69,6 +70,11 @@
             showUpload:false,
         }},
       methods:{
+         logout() {
+          logout().then(res => {
+           this.$router.push({path:"../homesteadLogin"})
+          })
+        },
         changeUpload(){
           if(this.checked){
             this.$cookies.set("upload",1)