宅基地调查

src/views/homesteadSurvey/add.vue

@@ -446,15 +446,34 @@
             placeholder="备注"
             maxlength="200"
           />
+          <van-field
+          autocomplete="off"
+          input-align="right"
+          v-model="form.ycms"
+          name="异常描述"
+          label="异常描述"
+          placeholder="异常描述"
+          maxlength="200"
+          rows="1"
+          autosize
+          type="textarea"
+          readonly
+        />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="form.auditRemark"
+            name="审核描述"
+            label="审核描述"
+            placeholder="审核描述"
+            maxlength="200"
+            rows="1"
+            autosize
+            type="textarea"
+            readonly
+          />
           <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div  style="margin: 16px;">
-            <div style="width:20%;display:inline-block;text-align:center;">
-              <van-tag color="#ff976a" v-if="form.zjdAudit=='0'" size="medium" round>待核查</van-tag>
-              <van-tag color="#07c160" v-if="form.zjdAudit=='1'" size="medium" round>已核查</van-tag>
-              <van-tag color="#ee0a24" v-if="form.zjdAudit=='2'" size="medium" round>已驳回</van-tag>
-              <van-tag v-if="form.isyc=='Y'" type="danger" size="medium" round style="margin-top:3px;">有异常</van-tag>
-              <van-tag v-if="form.isyc=='N'||form.isyc==''||form.isyc==null" color="#07c160" size="medium" round style="margin-top:3px;">无异常</van-tag>
-            </div>
             <van-button v-if="isFinished" round  color="#7AC943" style="width:70%;vertical-align:bottom;" native-type="submit">保存</van-button>
           </div>
         </van-form>
@@ -588,10 +607,10 @@
           <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 style="position:fixed;bottom:0;left:5%;width:90%;text-align:center;">
-        <van-button round color="#ee0a24" style="width:30%" @click="showycbjinfo">异常标记</van-button>
-        <van-button round color="#7AC943" style="width:30%" @click="searchCommit">签名确认</van-button>
-        <van-button round color="#ff976a" style="width:30%" @click="showdcshinfo">调查审核</van-button>
+      <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>
       </div>
     </div>
     <van-popup v-model="showsyqr" style="height:100%;width:100%;">
@@ -2740,7 +2759,7 @@
       </van-row>
       <van-row type="flex" justify="center" style="margin-bottom:20px;">
         <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"
@@ -3442,9 +3461,35 @@
         }
       },
       savesh(){
-        this.showdcsh = false
         this.form.zjdAudit = this.zjdAudit
-        this.form.zuditRemark = this.zuditRemark
+        this.form.auditRemark = this.auditRemark
+        if(this.form.zjdAudit=='2'){
+          this.form.houseDataConfirmStatus = 'UNCONFIRMED'
+          this.form.dzqm = ''
+          updateZjdzd(this.form).then(response => {
+            let _this =this
+            this.$toast({
+              icon: 'success', // 找到自己需要的图标
+              message: '审核成功',
+              duration:"1000",
+              onClose:function(){
+                _this.showdcsh = false
+              }
+            })
+          });
+        }else{
+          updateZjdzd(this.form).then(response => {
+            let _this =this
+            this.$toast({
+              icon: 'success', // 找到自己需要的图标
+              message: '审核成功',
+              duration:"1000",
+              onClose:function(){
+                _this.showdcsh = false
+              }
+            })
+          });
+        }
       },
       saveyc(){
         this.showycbj = false

src/views/homesteadSurvey/index.vue

@@ -224,7 +224,6 @@
           this.taskExecutortions = response.data
         })
         getInfo().then(response => {
-          console.log(response)
           this.nickName = response.user.nickName
           this.businessLevel = response.user.businessLevel
           this.queryParams.taskExecutor = response.user.userName

src/views/homesteadSurvey/list.vue

@@ -69,12 +69,12 @@
               <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;" :to="{name:'homesteadAdd'}" >查看详情</van-button>
                   <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}" >开始调查</van-button>
-                  <van-button plain round color="#FA5353" size="mini" v-if="!isFinished" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</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>
               <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
                 <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}" >查看详情</van-button>
                 <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}" >开始调查</van-button>
-                <van-button plain round color="#FA5353" size="mini" v-if="!isFinished" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</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>
             <!--<template #default>
@@ -110,13 +110,13 @@
               <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;" :to="{name:'homesteadAdd'}">查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</van-button>
-                <van-button plain round color="#FA5353" size="mini" v-if="!isFinished" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'" plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</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>
               <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
                 <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">查看详情</van-button>
-                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</van-button>
-                <van-button plain round color="#FA5353" size="mini" v-if="!isFinished" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'" plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</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>
             <!--<template #default>
@@ -153,12 +153,12 @@
               <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;" :to="{name:'homesteadAdd'}">查看详情</van-button>
                 <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</van-button>
-                <van-button plain round color="#FA5353" size="mini" v-if="!isFinished" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</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>
               <p v-if="item.syqr==null||item.syqr==''" style="color:#878787">无
                 <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">查看详情</van-button>
                 <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;float:right;" :to="{name:'homesteadAdd'}">开始调查</van-button>
-                <van-button plain round color="#FA5353" size="mini" v-if="!isFinished" style="vertical-align:middle;float:right;margin-right:10px" @click="deleteZjd(item,index)">删除</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>
             <!--<template #default>