From d913f689494c65f8a78b9357e55afc291a3a8773 Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Wed, 22 Nov 2023 13:47:02 +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=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add.vue      |  4 +-
 src/views/homesteadSurvey/add4.vue     | 76 +++++++++++++++-----------
 src/views/homesteadSurvey/index.vue    | 12 ++--
 src/views/homesteadSurvey/list.vue     | 17 ++++--
 src/views/homesteadSurvey/nhcyList.vue |  2 +-
 src/views/homesteadSurvey/zrzAdd.vue   |  4 +-
 6 files changed, 69 insertions(+), 46 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 97467334..1321ccb8 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -301,6 +301,8 @@
                         <van-datetime-picker
                           :value="new Date"
                           type="date"
+                          :min-date="minDate"
+                          :max-date="maxDate"
                           @confirm="onConfirmzjdqdsj"
                           @cancel="showZjdqdsj = false"
                         />
@@ -790,7 +792,7 @@ export default {
       showXzyy:false,
       showXzqssj:false,
       showUpload:false,
-      minDate: new Date(1950,0,1),
+      minDate: new Date(1950,1,1),
       maxDate: new Date(2030, 10, 1),
       form:{}
     };
diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue
index 80284269..94d852d7 100644
--- a/src/views/homesteadSurvey/add4.vue
+++ b/src/views/homesteadSurvey/add4.vue
@@ -106,15 +106,6 @@
         <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;"  @click="dcsh()">调查审核</span>
       </p>
     </div>
-    <van-popup v-model="dcshShow" position="bottom">
-      <van-picker
-        show-toolbar
-        :columns="examineData"
-        value-key="dictLabel"
-        @confirm="onSurveyStatusChanged"
-        @cancel="dcshShow = false"
-      />
-    </van-popup>
     <van-popup v-model="showesign" closeable position="right" :style="{ height: '100%' }"
                close-icon="close">
       <van-row style="margin:0 10%">
@@ -156,6 +147,26 @@
       </van-row>
       </van-form>
 
+    </van-dialog>
+
+    <van-dialog v-model="dcshShow" title="调查审核" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" confirmButtonColor="#323233" :before-close="onBeforeCloseSh" >
+      <van-form  ref="dcshForm">
+        <van-row>
+          <van-col span="24">
+            <van-field v-model="zjdzdxx.auditRemark" label="备注" placeholder="审核备注" input-align="right" :rules="[{ required: true }]" required />
+          </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 name="5">通过</van-radio>
+              <van-radio name="4">驳回</van-radio>
+            </van-radio-group>
+          </van-col>
+        </van-row>
+      </van-form>
+
     </van-dialog>
     <van-popup v-model:show="showImageList" position="bottom" style="height:40vh;padding:50px 10px 0" closeable
                close-icon="close">
@@ -206,7 +217,6 @@ export default {
       ycbz:"",
       jzwqkList:[],
       fssslxList:[],
-      examineData:[{dictLabel:"审批通过",dictValue:"5"},{dictLabel:"审批驳回",dictValue:"4"}],
       zjdzdxx:{surveyStatus:"5"},
       fssslist:[],
       //电子签名
@@ -270,24 +280,31 @@ export default {
     canvasTTdown() {
       $('#canvasTT').css('display', 'none');
     },
-    onSurveyStatusChanged(val){
-      this.$set(this.zjdzdxx, 'surveyStatus', val.dictValue);
-      if(val.dictValue === "5"){
-        let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
-        this.$set(this.zjdzdxx, 'surveyId', surveyItem.id);
+    onBeforeCloseSh(action, done){
+      if (action === 'confirm') {
+        this.$refs.dcshForm.validate().then(() => {
+          updateZjdzd(this.zjdzdxx).then(response => {
+            if(response.code === 200){
+              let _this =this
+              _this.$toast({
+                icon: 'success', // 找到自己需要的图标
+                message: '保存成功',
+                duration:"1000",
+                onClose:function(){
+                  _this.dcshShow = false;
+                  _this.goRightBack();
+                }
+              })
+            }
+
+          });
+        }).catch(() => {
+          return done(false);
+        });
+      } else {
+        return done();
       }
-      updateZjdzd(this.zjdzdxx).then(response => {
-        let _this =this
-        _this.$toast({
-          icon: 'success', // 找到自己需要的图标
-          message: '保存成功',
-          duration:"1000",
-          onClose:function(){
-            _this.dcshShow = false;
-            _this.goRightBack();
-          }
-        })
-      });
+
     },
     onRefreshFsss(){
       if(this.loading){
@@ -435,12 +452,9 @@ export default {
       } else {
         return done();
       }
-    },
-     confirmn(){
-      console.info(111)
-
     },
     dcsh(){
+      this.$set(this.zjdzdxx, 'surveyStatus', "5");
       this.dcshShow = true;
     },
     showUploadList(id){
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index 16c6e649..189a79c0 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -286,13 +286,9 @@
             this.$router.push({name:'homesteadList'})
           });
         },
-        chooseValue(item){
-            let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
-          return a
-        },
         chooseColor(item){
-          let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
-            if(a < 50){
+          let a = ((item.zjdwcsl/item.zjdsl)*100).toFixed()
+            if(a === "NaN" || a < 50){
               return  '#FA5353'
             }else if(a < 100){
               return '#22B7F2'
@@ -302,8 +298,8 @@
           return  '#FA5353'
         },
         chooseColor2(item){
-          let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
-            if(a < 50){
+          let a = ((item.zjdwcsl/item.zjdsl)*100).toFixed()
+          if(a === "NaN" || a < 50){
               return  'rgba(250,83,83,0.22)'
             }else if(a < 100){
               return 'rgba(34,183,242,0.22)'
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index aaecf8e0..e27d855a 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -920,10 +920,19 @@
         // 入户核查搜索框新增。
         onClickzjd(){
           this.$cookies.remove("search");
-          localStorage.setItem("zjdzdxxItem",JSON.stringify({suyqrdm:this.qlrform.suyqrdm,zjddm:null,zjdlyzk:"1",landStatus:"1"
-                                                              ,houseOwnership:"2",landPhms:"10",isMore:"0",sffz:"0",sfcz:"0"
-                                                              ,zjdqdfs:"01",sjly:"01",qlsdfs:"1",qllx:"1",qlxz:"203",dj:"1",yt:"01"}));
-          this.$router.push({name:'homesteadAdd'});
+          let params = {
+            "deptId" : this.$store.state.user.loginDeptId
+          }
+          listSuyqr(params).then((response) => {
+            if(response.rows.length>0){
+              localStorage.setItem("zjdzdxxItem",JSON.stringify({suyqrdm:response.rows[0].suyqrdm,zjddm:null,zjdlyzk:"1",landStatus:"1"
+                ,houseOwnership:"2",landPhms:"10",isMore:"0",sffz:"0",sfcz:"0"
+                ,zjdqdfs:"01",sjly:"01",qlsdfs:"1",qllx:"1",qlxz:"203",dj:"1",yt:"01"}));
+              this.$router.push({name:'homesteadAdd'});
+            }
+          });
+
+
         },
         // 农户信息搜索框新增。
         onClicknh(){
diff --git a/src/views/homesteadSurvey/nhcyList.vue b/src/views/homesteadSurvey/nhcyList.vue
index 3d57b578..99471c8c 100644
--- a/src/views/homesteadSurvey/nhcyList.vue
+++ b/src/views/homesteadSurvey/nhcyList.vue
@@ -55,7 +55,7 @@
         <p style="display: flex;align-items: center;">
           <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
           <span style="line-height: 1;font-size: 16px;">{{item.xm}}</span>
-          <span style="line-height: 1;font-size: 16px;margin-left: 70%;">{{formatDict(yhzgxList,item.yhzgx)}}</span>
+          <span style="line-height: 1;font-size: 16px;margin-left: 68%;">{{formatDict(yhzgxList,item.yhzgx)}}</span>
         </p>
         <div style="display:flex;line-height:20px;margin-top: 15px;font-size: 14px;color: #999999;">
           <p style="flex:1;text-align:left;">证件号码:</p>
diff --git a/src/views/homesteadSurvey/zrzAdd.vue b/src/views/homesteadSurvey/zrzAdd.vue
index 9213441b..694bbb17 100644
--- a/src/views/homesteadSurvey/zrzAdd.vue
+++ b/src/views/homesteadSurvey/zrzAdd.vue
@@ -97,6 +97,8 @@
           <van-datetime-picker
             type="date"
             :value="new Date"
+            :min-date="minDate"
+            :max-date="maxDate"
             @confirm="onConfirmZgqrzrq"
             @cancel="showZgqrzrq = false"
           />
@@ -233,7 +235,7 @@ export default {
       // 当前位置信息
       tGeoOrganizationLat: null,
       tGeoOrganizationLng: null,
-      minDate: new Date(),
+      minDate: new Date(1950,1,1),
       maxDate: new Date(2025, 10, 1),
       showZgqrzrq:false,
       form:{}