From 833aec3e1d507410d6cf52e8f3ee927ebc833a26 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Tue, 8 Mar 2022 17:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/homesteadSurvey/fsss.js   | 12 ++++++++++--
 src/api/homesteadSurvey/zrz.js    | 12 ++++++++++--
 src/views/homesteadSurvey/add.vue | 25 +++++++++++--------------
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/api/homesteadSurvey/fsss.js b/src/api/homesteadSurvey/fsss.js
index 81b90e30..d8ac8aa8 100644
--- a/src/api/homesteadSurvey/fsss.js
+++ b/src/api/homesteadSurvey/fsss.js
@@ -61,9 +61,17 @@ export function getFsssZjdDmList(zjddm) {
 }
 
 // 通过宅基地编码修改附属设施状态
-export function updateFsssZt(zjddm) {
+export function updateFsssZtN(zjddm) {
   return request({
-    url: '/houseSurvey/fsss/updateFsssZt/' + zjddm,
+    url: '/houseSurvey/fsss/updateFsssZtN/' + zjddm,
+    method: 'get'
+  })
+}
+
+// 通过宅基地编码修改附属设施状态
+export function updateFsssZtY(zjddm) {
+  return request({
+    url: '/houseSurvey/fsss/updateFsssZtY/' + zjddm,
     method: 'get'
   })
 }
diff --git a/src/api/homesteadSurvey/zrz.js b/src/api/homesteadSurvey/zrz.js
index f6cce870..3b0a1517 100644
--- a/src/api/homesteadSurvey/zrz.js
+++ b/src/api/homesteadSurvey/zrz.js
@@ -70,9 +70,17 @@ export function getZrzZjdDmList(zjddm) {
 }
 
 // 通过宅基地修改自然幢核查状态
-export function updateZrzZt(zjddm) {
+export function updateZrzZtN(zjddm) {
   return request({
-    url: '/houseSurvey/zrz/updateZrzZt/' + zjddm,
+    url: '/houseSurvey/zrz/updateZrzZtN/' + zjddm,
+    method: 'get'
+  })
+}
+
+// 通过宅基地修改自然幢核查状态
+export function updateZrzZtY(zjddm) {
+  return request({
+    url: '/houseSurvey/zrz/updateZrzZtY/' + zjddm,
     method: 'get'
   })
 }
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 89b71aa3..8af989c0 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -2897,12 +2897,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,updateZrzZt} from "@/api/homesteadSurvey/zrz";
+  import {listZrz,addZrz,updateZrz,getZrzZjdDmList,delZrz,updateZrzZtN,updateZrzZtY} 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,updateFsssZt} from "@/api/homesteadSurvey/fsss";
+  import {listFsss,addFsss,updateFsss,delFsss,getFsssZjdDmList,updateFsssZtN,updateFsssZtY} from "@/api/homesteadSurvey/fsss";
   import { listTown, getTown } from "@/api/homesteadSurvey/town";
   import { listVillage} from "@/api/homesteadSurvey/village";
   import { sysConfig} from "@/api/homesteadSurvey/index";
@@ -5596,17 +5596,6 @@
           .generate() // 使用生成器调用把签字的图片转换成为base64图片格式
           .then((res) => {
             this.resultImg = res;
-            if(this.enterMap ==1){
-              if(this.enterMapZjddm !="" && this.enterMapZjddm !=undefined && this.enterMapZjddm !=null){
-                updateZrzZt(this.enterMapZjddm).then(response => {});
-                updateFsssZt(this.enterMapZjddm).then(response => {});
-              }
-            }else {
-              if(this.$cookies.get("search").zjddm !="" && this.$cookies.get("search").zjddm !=undefined && this.$cookies.get("search").zjddm !=null){
-                updateZrzZt(this.$cookies.get("search").zjddm).then(response => {});
-                updateFsssZt(this.$cookies.get("search").zjddm).then(response => {});
-              }
-            }
           })
           .catch((err) => {
             // 画布没有签字时会执行这里提示一下
@@ -5631,7 +5620,15 @@
           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 => {});
+            }
             if (this.form.id != null) {
+              console.log(this.form);
               updateZjdzd(this.form).then(response => {
                 let _this =this
                 this.$toast({
@@ -5641,7 +5638,7 @@
                   onClose:function(){
                     _this.goBack();
                   }
-                })
+                });
               });
             } else {
               addZjdzd(this.form).then(response => {