From 911943610c446303b88836772d70fa6a8fb7a626 Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Thu, 23 Nov 2023 19:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=A1=E6=A0=B8=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add4.vue | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue
index 3de815af..e9ebf875 100644
--- a/src/views/homesteadSurvey/add4.vue
+++ b/src/views/homesteadSurvey/add4.vue
@@ -158,13 +158,13 @@
       <van-form  ref="dcshForm">
         <van-row>
           <van-col span="24">
-            <van-field v-model="zjdzdxx.auditRemark" label="备注" placeholder="审核备注" input-align="right" />
+            <van-field v-model="zjddcsh.auditRemark" label="备注" placeholder="审核备注" input-align="right" />
           </van-col>
           <van-col span="8">
             <p style="margin-left: 10%;color: #646566;    font-size: 0.373333rem;">审核</p>
           </van-col>
           <van-col span="16">
-            <van-radio-group v-model="zjdzdxx.surveyStatus" direction="horizontal">
+            <van-radio-group v-model="zjddcsh.surveyStatus" direction="horizontal">
               <van-radio name="5">通过</van-radio>
               <van-radio name="4">驳回</van-radio>
             </van-radio-group>
@@ -225,6 +225,7 @@ export default {
       jzwqkList:[],
       fssslxList:[],
       zjdzdxx:{surveyStatus:"5"},
+      zjddcsh:{surveyStatus:"5",auditRemark:""},
       fssslist:[],
       //电子签名
       signature: {
@@ -294,11 +295,20 @@ export default {
       $('#canvasTT').css('display', 'none');
     },
     bhyyLook(){
-      Dialog({ type: 'success', message: this.zjdzdxx.auditRemark });
+      if(this.zjdzdxx.auditRemark !== null && this.zjdzdxx.auditRemark !== ''){
+        Dialog({ type: 'success', message: this.zjdzdxx.auditRemark });
+      }else{
+        Dialog({ type: 'success', message: "无"});
+      }
     },
     onBeforeCloseSh(action, done){
       if (action === 'confirm') {
-          updateZjdzd(this.zjdzdxx).then(response => {
+        if(this.zjddcsh.surveyStatus === '4') {
+          let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
+          this.$set(this.zjddcsh, 'surveyId', surveyItem.id);
+        }
+        this.$set(this.zjddcsh, 'id', this.zjdzdxx.id);
+          updateZjdzd(this.zjddcsh).then(response => {
             if(response.code === 200){
               let _this =this
               _this.$toast({