Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/api/homesteadSurvey/zjdzd.js

@@ -107,21 +107,10 @@ export function delZjdzdInfo(query) {
     params: query
   })
 }
-
-// 提交照片-宅基地宗地
-export function submitUploadImageList(data) {
-  return request({
-    url: '/houseSurvey/zjdzd/submitUploadImageList',
-    method: 'post',
-    data: data
-  })
-}
-
-// 数据审核-宅基地宗地
-export function submitOnly(data) {
+// 数据检查
+export function surveyInspectByZjddm(zjddm) {
   return request({
-    url: '/houseSurvey/zjdzd/submitOnly',
-    method: 'post',
-    data: data
+    url: '/home/homesteadzjdzdxx/surveyInspectByZjddm/' + zjddm,
+    method: 'get'
   })
 }

src/views/homesteadSurvey/add4.vue

@@ -98,7 +98,7 @@
       </div>
     </div>
     <div  style="width:95%;margin:20px auto;text-align:center;overflow:auto;display: flex;justify-content: space-around;">
-      <p v-if="permission == 'true' && zjdzdxx.surveyStatus != '3' && zjdzdxx.surveyStatus != '5'" style="width:32%;border: 1px solid transparent;background: #FA5353;padding: 5px 0;border-radius: 50px;">
+      <p v-if="showYcbj" style="width:32%;border: 1px solid transparent;background: #FA5353;padding: 5px 0;border-radius: 50px;">
         <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="ycbj()">异常标记</span>
       </p>
       <p v-if="zjdzdxx.surveyStatus == '4'" style="width:32%;border: 1px solid transparent;background: #FFA500;padding: 5px 0;border-radius: 50px;">
@@ -111,6 +111,11 @@
         <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;"  @click="dcsh()">调查审核</span>
       </p>
     </div>
+    <div v-if = "showHd"  style="width:95%;margin:20px auto;text-align:center;overflow:auto;display: flex;justify-content: space-around;">
+      <p  style="width:82%;border: 1px solid #22B7F2;background: #ffffff;padding: 5px 0;border-radius: 50px;">
+        <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;"  @click="zcxd()">自查校对</span>
+      </p>
+    </div>
     <van-popup v-model="showesign" closeable position="right" :style="{ height: '100%' }"
                close-icon="close">
       <van-row style="margin:0 10%">
@@ -173,6 +178,20 @@
       </van-form>
 
     </van-dialog>
+      <div class="gl_main" v-if="zcxdShow">
+        <div class="headers">
+          <div class="flex4">检查事项</div>
+          <img width="20px" style="left: 15px;" @click="onCloseMessage"  src="../../assets/images/homestead/searchBar_close_gray.png" alt="">
+        </div>
+        <div class="desc_main">
+          <ul class="analysisTable_list">
+            <!--1-->
+            <li v-for="(item,index) in inspectDataList"  class="flex_item">
+              <div class="flex4" >{{(index+1)+'、'+item}}</div>
+            </li>
+          </ul>
+        </div>
+      </div>
     <van-popup v-model:show="showImageList" position="bottom" style="height:40vh;padding:50px 10px 0" closeable
                close-icon="close">
       <p style="color:#000;position:absolute;top:0.426667rem;left:0.426667rem">图片上传</p>
@@ -190,7 +209,7 @@
 
 <script>
 import {attach} from "@/api/onlineHome/homestead/application";
-import {getZjdzd,updateZjdzd,zjddcSign} from "@/api/homesteadSurvey/zjdzd";
+import {getZjdzd,updateZjdzd,zjddcSign,surveyInspectByZjddm} from "@/api/homesteadSurvey/zjdzd";
 import MapGisDrawing from "@/components/Map/MapGisDrawing";
 import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssStatus} from "@/api/homesteadSurvey/fsss";
 import MultiImageUploadComp from "@/components/house/MultiImageUploadComp"
@@ -213,6 +232,9 @@ export default {
       showSh:false,
       loading:false,
       finished:false,
+      zcxdShow:false,
+      showYcbj:false,
+      showHd:false,
       countyhc:1,
       ycbzShow:false,
       permission:false,
@@ -220,6 +242,7 @@ export default {
       zjdId:null,
       uploadImgList:[],
       uploadImgList1:[],
+      inspectDataList:[],
       bztp:"",
       ycbz:"",
       jzwqkList:[],
@@ -256,6 +279,12 @@ export default {
         if(response.data.surveyStatus === "3"  && businessLevel === "2"){
           this.showDcsh =  true;
         }
+        if(response.data.surveyStatus === "3"){
+          this.showHd =  true;
+        }
+        if(this.permission ==='true' && response.data.surveyStatus !== "3" && response.data.surveyStatus !== '5'){
+          this.showYcbj =  true;
+        }
         if(response.data.surveyStatus === '5' || response.data.surveyStatus === '3'){
           this.qzqr = "签名图片";
         }else{
@@ -351,6 +380,9 @@ export default {
     goRightBack(){
       this.$router.push({path:'/homesteadSurvey/list'});
     },
+    onCloseMessage(){
+      this.zcxdShow = false;
+    },
     // 清空画板
     handleReset() {
       this.resultImg = null
@@ -445,6 +477,19 @@ export default {
     ycbj(){
       this.ycbzShow = true;
     },
+    //自查校对
+    zcxd(){
+      this.$toast.loading({
+        message: "数据校对中",
+        forbidClick: true,
+        duration: 100000,
+      });
+      surveyInspectByZjddm(this.zjdzdxx.zjddm).then(response => {
+        this.inspectDataList = response.data;
+        this.$toast.clear();
+        this.zcxdShow = true;
+      });
+    },
     // van-dialog 点击confirm事件不自动关闭
     onBeforeClose(action, done) {
       if (action === 'confirm') {
@@ -618,7 +663,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped >
 >>> .bannerBg{
   width: 100%;
   color:#fff;
@@ -662,4 +707,54 @@ export default {
 .clearBtn {
   margin-left: 15px;
 }
+
+.flex4 {
+  flex: 1;
+  margin-left: 10px;
+  overflow: hidden; /*超出部分隐藏*/
+  white-space: nowrap; /*不换行*/
+  text-overflow: ellipsis; /*超出部分文字以...显示*/
+}
+.gl_main{
+  margin-top: .8vh;
+  height: 48.15vh;
+  background-color: #fff;
+}
+.gl_main .headers {
+  position: relative;
+  height: 3.24vh;
+  color: #515a6e;
+  font-weight: bold;
+  text-align: left;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: #D3D3D3;
+  padding-right: 0.53vw;
+  margin-bottom: 1vh;
+}
+.gl_main  .desc_main{
+  height: 45.5vh;
+  overflow-y: scroll;
+  padding-right: 0.3vw;
+  box-sizing:border-box;
+}
+.gl_main  .desc_main   {
+  margin: 0;
+  padding: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+.gl_main .desc_main .analysisTable_list .flex_item {
+  height: 3.77vh;
+  list-style: none;
+  margin: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  text-align: left;
+  color: #000000;
+  position: relative;
+}
 </style>