From d58b4e4aa687e31a054748f3e990b7e1c3892222 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 10 Mar 2022 21:31:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add.vue   | 63 +++++++++++++++++++++--------
 src/views/homesteadSurvey/index.vue |  1 +
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 9478f988..a863e611 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -48,7 +48,7 @@
         <van-col span="2">
           <div style=" height: 2px; border: 2px dashed #b5b4b4;margin-top: 40px;"></div>
         </van-col>
-        <van-col span="4" style="text-align:center;" @click="active=4,getFsssList()">
+        <van-col span="4" style="text-align:center;" @click="active=4,getFsssList(),showPic()">
           <van-icon :name="require('../../assets/images/housesteadSurvey/fsss'+(active==4?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
           <p :style="{color:(active==4?'rgb(34, 183, 242)':'#000')}">附属物</p>
         </van-col>
@@ -451,30 +451,36 @@
           input-align="right"
           v-model="form.ycms"
           name="异常描述"
-          label="异常描述"
           placeholder="异常描述"
           maxlength="200"
           rows="1"
           autosize
           type="textarea"
           disabled
-        />
+          >
+            <template #label>
+              <p style="color:#ee0a24">异常描述</p>
+            </template>
+          </van-field>
           <van-field
             autocomplete="off"
             input-align="right"
             v-model="form.auditRemark"
             name="审核描述"
-            label="审核描述"
             placeholder="审核描述"
             maxlength="200"
             rows="1"
             autosize
             type="textarea"
             disabled
-          />
+          >
+            <template #label>
+              <p style="color:#ee0a24">审核描述</p>
+            </template>
+          </van-field>
           <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div  style="margin: 16px;">
-            <van-button v-if="isFinished" round  color="#7AC943" style="width:70%;vertical-align:bottom;" native-type="submit">保存</van-button>
+            <van-button v-if="isFinished" round  color="#7AC943" style="width:100%" native-type="submit">保存</van-button>
           </div>
         </van-form>
       </div>
@@ -607,10 +613,18 @@
           <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 v-if="!isFinished&&showsh">
+        <div style="margin:20px;">
+          <p class="title" style="position:relative;padding-left:20px;line-height:32px;">电子签名</p>
+        </div>
+        <van-row style="margin: 0 5% 5% 5%;border:1px solid #BFBFBF">
+          <img :src="resultImg" alt="" width="100%" height="100%"/>
+        </van-row>
+      </div>
       <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>
+        <van-button round color="#ee0a24" v-if="isFinished" style="flex:1;" @click="showycbjinfo">异常标记</van-button>
+        <van-button round color="#7AC943" v-if="isFinished" style="flex:1;" @click="searchCommit">签名确认</van-button>
+        <van-button round color="#ff976a" v-if="!isFinished&&showsh" style="flex:1;" @click="showdcshinfo">调查审核</van-button>
       </div>
     </div>
     <van-popup v-model="showsyqr" style="height:100%;width:100%;">
@@ -2759,7 +2773,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"
@@ -2779,7 +2793,7 @@
         </template>
       </van-field>
       <div style="margin: 16px;">
-        <van-button round block type="info" @click="saveyc">关闭</van-button>
+        <van-button round block type="info" @click="saveyc">保存</van-button>
       </div>
     </van-popup>
     <van-popup v-model="showdcsh" position="bottom"
@@ -2950,6 +2964,7 @@
     components: { MapGisDrawing,},
     data() {
       return {
+        showsh:false,
         showdcsh:false,
         zjdAudit:'1',
         auditRemark:"",
@@ -3173,7 +3188,6 @@
       };
     },
     created(){
-      console.log(this.$cookies.get("search"));
       if(this.$cookies.get("search")){
         if(this.$cookies.get("search").active!=null){
           this.cookiesInfo = this.$cookies.get("search")
@@ -3352,6 +3366,16 @@
         // }
     },
     methods: {
+      showPic(){
+        if(this.form.dzqm!=null&&this.form.dzqm!=""){
+          this.resultImg = this.baseUrl+this.form.dzqm
+        }
+        if(this.$cookies.get("businessLevel")=='2'){
+          this.showsh = true
+        }else{
+          this.showsh = false
+        }
+      },
       validatorIdcard(val){
         if(this.form1.shyqrdbzjlx=='01'){
           if(this.vcheckID(val)){
@@ -3472,7 +3496,6 @@
         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({
@@ -3502,6 +3525,17 @@
         this.showycbj = false
         this.form.isyc = this.isyc
         this.form.ycms = this.ycms
+        updateZjdzd(this.form).then(response => {
+          let _this =this
+          this.$toast({
+            icon: 'success', // 找到自己需要的图标
+            message: '保存成功',
+            duration:"1000",
+            onClose:function(){
+              _this.showycbj = false
+            }
+          })
+        });
       },
       // 图片上传前
       beforeReadyc(file){
@@ -5899,9 +5933,6 @@
       },
       searchCommit(){
         this.showesign = true
-        if(this.form.dzqm!=null&&this.form.dzqm!=""){
-          this.resultImg = this.baseUrl+this.form.dzqm
-        }
       },
       searchCommit1(){
         this.form.houseDataConfirmStatus = "CONFIRMED"
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index a374335b..75e66486 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -226,6 +226,7 @@
         getInfo().then(response => {
           this.nickName = response.user.nickName
           this.businessLevel = response.user.businessLevel
+          this.$cookies.set("businessLevel",this.businessLevel)
           this.queryParams.taskExecutor = response.user.userName
           this.getList();
         });