Merge remote-tracking branch 'origin/master'

src/api/homesteadSurvey/index.js

@@ -8,7 +8,14 @@ export function listTask(query) {
     params: query
   })
 }
-
+// 数据调查任务列表（带完成数、调查数）
+export function mobileList(query) {
+  return request({
+    url: '/home/homesteadsurvey/mobileList',
+    method: 'get',
+    params: query
+  })
+}
 // 导出数据调查任务
 export function exportTask(id) {
   return request({

src/components/home/HomeApplyUploadCompTc.vue

@@ -63,6 +63,7 @@ export default {
     },
   },
   created() {
+    console.info(this.businessType);
     if (this.businessType !== null) {
       this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full)
     }

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,8 +792,8 @@ export default {
       showXzyy:false,
       showXzqssj:false,
       showUpload:false,
-      minDate: new Date(1900,0,1),
-      maxDate: new Date(2025, 10, 1),
+      minDate: new Date(1950,1,1),
+      maxDate: new Date(2030, 10, 1),
       form:{}
     };
   },

src/views/homesteadSurvey/add2.vue

@@ -74,11 +74,11 @@
           <p style="flex:1;text-align:right;">{{item.nhdm}}</p>
         </div>
         <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
-          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnh(item)">
-            <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
-            <span style="font-size: 14px;color: #fff;margin-left: 5px;">户主</span>
+          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnh(item)">
+            <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">户主</span>
           </p>
-          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: rgba(34,183,242,0.14);padding: 3px 0;border-radius: 50px;" @click="showPopupsyqr(item)">
+          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupsyqr(item)">
             <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
             <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">使用权人</span>
           </p>
@@ -89,7 +89,7 @@
         </div>
       </div>
       <template #right>
-        <van-button  v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deleteshyqr(item)"/>
+        <van-button  v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deleteshyqr(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
       </template>
     </van-swipe-cell>
     </van-list>
@@ -205,7 +205,7 @@ export default {
       const ids = val.id || this.ids;
       Dialog.confirm({
         title: '系统提示',
-        message: '是否确认删除使用权人标识为"' + val.id + '"的数据项?',
+        message: '是否确认删除使用权人数据项?',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })

src/views/homesteadSurvey/add3.vue

@@ -74,9 +74,9 @@
             <p style="flex:1;text-align:right;">{{item.zcs}}</p>
           </div>
           <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
-            <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
-              <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
-              <span style="font-size: 14px;color: #fff;margin-left: 5px;">自然幢信息</span>
+            <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
+              <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+              <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">自然幢信息</span>
             </p>
             <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="shownmfwlist(item)">
               <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
@@ -85,8 +85,14 @@
           </div>
         </div>
         <template #right>
-          <van-button  v-if="permission == 'true'" square  type="danger" class="delete-button" @click="deletezrz(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
-          <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>自然幢附件</van-button>
+          <van-row>
+            <van-col>
+              <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>附件</van-button>
+            </van-col>
+            <van-col>
+              <van-button  v-if="permission == 'true'" square  type="danger" class="delete-button" @click="deletezrz(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
+            </van-col>
+          </van-row>
         </template>
       </van-swipe-cell>
     </van-list>
@@ -350,7 +356,7 @@ export default {
       const ids = val.id || this.ids;
       Dialog.confirm({
         title: '系统提示',
-        message: '是否确认删除自然幢标识为"' + val.id + '"的数据项?',
+        message: '是否确认删除自然幢号数据项?',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })
@@ -389,6 +395,12 @@ export default {
 >>> .delete-button {
   height: 100%;
 }
+>>> .van-row{
+  height: 100%;
+}
+>>> .van-col{
+  height: 100%;
+}
 >>> .van-swipe-cell__wrapper{
   margin-right:-3px;
 }

src/views/homesteadSurvey/add4.vue

@@ -74,18 +74,21 @@
           <p style="flex:1;text-align:right;">{{ formatDict(jzwqkList, item.jzwqk) }} </p>
         </div>
         <div style="text-align:center;overflow:auto;display: flex;justify-content: center;margin-top: 10px;">
-          <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;"  @click="showUploadList(item.id)">
-            <van-icon  name="photo-o" size=".4rem" color="#FFFFFF"/>
-            <span style="font-size: 14px;color: #fff;margin-left: 5px;">附件</span>
-          </p>
-          <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
-            <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
-            <span style="font-size: 14px;color: #fff;margin-left: 5px;" >查看附属设施信息</span>
+          <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
+            <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;" >查看附属设施信息</span>
           </p>
         </div>
       </div>
       <template #right>
-        <van-button v-show="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletefsss(item)"/>
+        <van-row>
+          <van-col>
+            <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>附件</van-button>
+          </van-col>
+          <van-col>
+            <van-button v-show="permission == 'true'" square type="danger" class="delete-button" @click="deletefsss(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
+          </van-col>
+        </van-row>
       </template>
     </van-swipe-cell>
     </van-list>
@@ -98,22 +101,17 @@
       <p v-if="permission == 'true'" style="width:32%;border: 1px solid transparent;background: #FA5353;padding: 5px 0;border-radius: 50px;">
         <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="ycbj()">异常标记</span>
       </p>
-      <p v-if="permission == 'true'" style="width:32%;border: 1px solid transparent;background: #22B7F2;padding: 5px 0;border-radius: 50px;">
-        <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="qmqr()">签名确认</span>
+      <p v-if="zjdzdxx.surveyStatus == '4'" style="width:32%;border: 1px solid transparent;background: #FFA500;padding: 5px 0;border-radius: 50px;">
+        <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="bhyyLook()">驳回原因</span>
+      </p>
+      <p style="width:32%;border: 1px solid transparent;background: #22B7F2;padding: 5px 0;border-radius: 50px;">
+        <span v-if="permission == 'true'" style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="qmqr()">签名确认</span>
+        <span v-if="permission == 'false'" style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="qmqr()">签名图片</span>
       </p>
       <p v-if = "showDcsh" style="width:32%;border: 1px solid #22B7F2;background: #ffffff;padding: 5px 0;border-radius: 50px;">
         <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%">
@@ -135,16 +133,16 @@
         <img src="../../assets/images/sunVillage_info/signature_icon_10.png" id="canvasTT"  v-if="!signature.resultImg"
              style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%)" alt="">
         <img :src="signature.resultImg" alt="" width="100%" v-if="signature.resultImg"/>
-      <div class="signature-footer"  v-if="!signature.resultImg">
+      <div class="signature-footer"  v-if="!signature.resultImg && permission == 'true'">
           <van-button type="primary" round size="small" @click="handleReset">清空画板</van-button>
           <van-button type="primary" round size="small" @click="handleGenerate">保存提交</van-button>
-        </van-row>
       </div>
     </van-popup>
-    <van-dialog v-model="ycbzShow" title="异常标记" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="confirmn" >
+    <van-dialog v-model="ycbzShow" title="异常标记" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" confirmButtonColor="#323233" :before-close="onBeforeClose" >
+      <van-form  ref="ycbzForm">
       <van-row>
         <van-col span="24">
-          <van-field v-model="zjdzdxx.surveyBz" label="异常备注" placeholder="异常备注" input-align="right" />
+          <van-field v-model="zjdzdxx.surveyBz" label="异常备注" placeholder="异常备注" input-align="right" :rules="[{ required: true }]" required />
         </van-col>
         <van-col span="12">
         <p style="margin-left: 10%;color: #646566;    font-size: 0.373333rem;">备注图片</p>
@@ -153,7 +151,27 @@
           <MultiImageUploadComp :value="zjdzdxx.surveyBztp" :uploadDisabled="false"  @fileUpdate="fileUpdate"/>
         </van-col>
       </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" />
+          </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
@@ -205,7 +223,6 @@ export default {
       ycbz:"",
       jzwqkList:[],
       fssslxList:[],
-      examineData:[{dictLabel:"审批通过",dictValue:"5"},{dictLabel:"审批驳回",dictValue:"4"}],
       zjdzdxx:{surveyStatus:"5"},
       fssslist:[],
       //电子签名
@@ -228,7 +245,7 @@ export default {
     this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem"));
     this.permission = localStorage.getItem("executePermission");
     let businessLevel = this.$store.state.user.businessLevel;
-    console.info(this.zjdzdxx);
+    console.info(this.zjdzdxx.surveySign);
     if(this.zjdzdxx.surveySign != null){
       this.signature.resultImg = this.$store.getters.baseRoutingUrl+this.zjdzdxx.surveySign;
     }
@@ -269,24 +286,29 @@ 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);
+    bhyyLook(){
+      Dialog({ type: 'success', message: this.zjdzdxx.auditRemark });
+    },
+    onBeforeCloseSh(action, done){
+      if (action === 'confirm') {
+          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();
+                }
+              })
+            }
+          });
+      } 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){
@@ -329,15 +351,17 @@ export default {
         .then((res) => {
           this.signature.resultImg = res;
           let wj = this.dataURLtoBlob(res);
+          let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
           let param = new FormData()  // 创建form对象
           param.append('file', wj)  // 通过append向form对象添加数据
+          param.append('id', surveyItem.id)
           param.append('date', this.format(new Date(), 'yyyy-MM-dd'))  // 通过append向form对象添加数据
-          zjddcSign(param, this.zjdzdxx.zjddm).then(response => {
+          zjddcSign(param, this.zjdzdxx.zjddm,surveyItem.id).then(response => {
             this.$notify({type: 'success', message: '签字成功'});
-            this.showesign = false;
             getZjdzd(this.zjdzdxx.id).then((response) => {
               localStorage.setItem("zjdzdxxItem",JSON.stringify(response.data))
               location.reload();
+              this.showesign = false;
             });
 
 
@@ -388,7 +412,7 @@ export default {
       const ids = val.id || this.ids;
       Dialog.confirm({
         title: '系统提示',
-        message: '是否确认删除附属物标识为"' + val.id + '"的数据项?',
+        message: '是否确认删除附属物的数据项?',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })
@@ -400,28 +424,41 @@ export default {
       }).catch(() => {});
     },
     qmqr(){
+      if(this.zjdzdxx.surveySign != null){
+        this.signature.resultImg = this.$store.getters.baseRoutingUrl+this.zjdzdxx.surveySign;
+      }
       this.showesign = true;
     },
     ycbj(){
       this.ycbzShow = true;
     },
-    confirmn(){
-      this.$set(this.zjdzdxx, 'surveyStatus', "2");
-      updateZjdzd(this.zjdzdxx).then(response => {
-        localStorage.setItem("zjdzdxxItem",JSON.stringify(this.zjdzdxx));
-        let _this =this
-        this.$toast({
-          icon: 'success', // 找到自己需要的图标
-          message: '保存成功',
-          duration:"1000",
-          onClose:function(){
-            _this.getList();
-            _this.$router.push({path:'/homesteadSurvey/add4',query: {zjddm: _this.zjdzdxx.zjddm}});
-          }
-        })
-      });
+    // van-dialog 点击confirm事件不自动关闭
+    onBeforeClose(action, done) {
+      if (action === 'confirm') {
+        this.$refs.ycbzForm.validate().then(() => {
+          this.$set(this.zjdzdxx, 'surveyStatus', "2");
+          updateZjdzd(this.zjdzdxx).then(response => {
+            localStorage.setItem("zjdzdxxItem",JSON.stringify(this.zjdzdxx));
+            let _this =this
+            this.$toast({
+              icon: 'success', // 找到自己需要的图标
+              message: '保存成功',
+              duration:"1000",
+              onClose:function(){
+                _this.getList();
+              }
+            })
+            return done(true);
+          });
+        }).catch(() => {
+          return done(false);
+        });
+      } else {
+        return done();
+      }
     },
     dcsh(){
+      this.$set(this.zjdzdxx, 'surveyStatus', "5");
       this.dcshShow = true;
     },
     showUploadList(id){
@@ -584,6 +621,12 @@ export default {
 >>> .delete-button {
   height: 100%;
 }
+>>> .van-row{
+  height: 100%;
+}
+>>> .van-col{
+  height: 100%;
+}
 >>> .van-swipe-cell__wrapper{
   margin-right:-3px;
 }

src/views/homesteadSurvey/hncyList2.vue

@@ -65,8 +65,8 @@
                 <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
                 <span style="line-height: 1;">{{item.xm}}</span>
               </p>
-              <p  style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/add02.png" alt="" style="margin-right: 3px;">成员详情</p>
-              <p  style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;" @click="deletenh(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
+              <p  style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/add02.png" alt="" style="margin-right: 3px;">成员详情</p>
+              <p  style="display: flex;align-items: center;color:#FA5353;font-size:12px;" @click="deletenh(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
 
             </div>
           </template>
@@ -77,9 +77,9 @@
           </template>
         </van-cell>
         <template #right>
-          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleFenHu(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">分户</van-button>
-          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleGuohu(item,index)"><img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 3px;">移户</van-button>
-          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleToHuzhu(item,index)"><img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 3px;">设为户主</van-button>
+          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;height:100%;" @click="handleFenHu(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">分户</van-button>
+          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;" @click="handleGuohu(item,index)"><img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 3px;">移户</van-button>
+          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;" @click="handleToHuzhu(item,index)"><img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 3px;">设为户主</van-button>
         </template>
     </van-swipe-cell>
     <van-dialog v-model="guohuData.visible"  title="成员移户" show-cancel-button  confirmButtonText="确认" cancelButtonText="关闭" @confirm="guohu"  @cancel="show=false">

src/views/homesteadSurvey/index.vue

@@ -84,13 +84,12 @@
         </template>
         <template #default>
           <van-circle
-            v-model="item.reportZrzNumber"
-            :rate="item.reportNhNumber"
+            :current-rate="item.zjdwcsl"
+            rate="item.zjdsl"
             :stroke-width="100"
             :speed="100"
             size="70%"
             layer-color="#ebedf0"
-            :color="chooseColor(item)"
             :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
           />
         </template>
@@ -118,13 +117,12 @@
         <template #default>
 
           <van-circle
-            v-model="item.reportZrzNumber"
-            :rate="item.reportNhNumber"
+            :current-rate="item.zjdwcsl"
+            rate="item.zjdsl"
             :stroke-width="100"
             :speed="100"
             size="70%"
             layer-color="#ebedf0"
-            :color="chooseColor(item)"
             :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
           />
         </template>
@@ -150,13 +148,12 @@
         </template>
         <template #default>
           <van-circle
-            v-model="item.reportZrzNumber"
-            :rate="item.reportNhNumber"
+            :current-rate="item.zjdwcsl"
+            rate="item.zjdsl"
             :stroke-width="100"
             :speed="100"
             size="70%"
             layer-color="#ebedf0"
-            :color="chooseColor(item)"
             :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
           />
         </template>
@@ -172,7 +169,7 @@
 </template>
 
 <script>
-  import {addTask, complete, delTask, exportTask, getTask, listTask,getTownInfo, publish, updateTask, userList} from "@/api/homesteadSurvey/index";
+  import {listTask,mobileList,getTownInfo, publish, updateTask, userList} from "@/api/homesteadSurvey/index";
   import {changeDept} from "@/api/homesteadSurvey/zjdzd";
   import {getInfo} from "../../api/login";
   import CircleProccess from "@/components/circleProccess.vue";
@@ -217,12 +214,6 @@
             rwfbzt:"PUBLISHED",
             rwzxr:null
           },
-          // 切换查询参数
-          switchParams: {
-            rwwczt: null,
-            rwfbzt:"PUBLISHED",
-            rwzxr:null
-          },
           nickName:"",
           text:0,
           isLoadingtask:false,
@@ -246,8 +237,8 @@
             this.$set(this.queryParams, "params", {deptId:100});
             this.getList();
           },1000)
-
         }else{
+
           this.$set(this.queryParams, "rwzxr", null);
           this.getList();
         }
@@ -292,13 +283,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'
@@ -308,8 +295,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)'
@@ -329,6 +316,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":4,
             }
+            if(this.queryParams.rwzxr != null){
+              params.rwzxr = this.queryParams.rwzxr;
+            }
             listTask(params).then((response) => {
               if(response.rows.length>0&&this.totalList.length<response.total){
                 response.rows.map(res => {
@@ -349,6 +339,9 @@
               "pageNum": this.countwhc+1,
               "pageSize":4,
             }
+            if(this.queryParams.rwzxr != null){
+              params.rwzxr = this.queryParams.rwzxr;
+            }
             listTask(params).then((response) => {
               if(response.rows.lenght>0&&this.doneList.length<response.total){
                 response.rows.map(res => {
@@ -369,6 +362,9 @@
               "pageNum": this.countqb+1,
               "pageSize":4,
             }
+            if(this.queryParams.rwzxr != null){
+              params.rwzxr = this.queryParams.rwzxr;
+            }
             listTask(params).then((response) => {
               if(response.rows.length>0&&this.todoList.length<response.total){
                 response.rows.map(res => {
@@ -391,7 +387,6 @@
             this.$set(this.queryParams, "rwzxr", null);
             this.getList();
           }
-          this.queryNum();
         },
         setCookies(item){
        /*   if(this.$cookies.get("upload")==null||this.$cookies.get("upload")==0){
@@ -412,7 +407,7 @@
             this.$cookies.set("item",JSON.stringify(item));
           }*/
           let userId = this.$store.state.user.userId;
-          let businessLevel = this.$store.getters.businessLevel;
+          // let businessLevel = this.$store.getters.businessLevel;
           let status = false;
           if(item.rwzxrIds != null && item.rwzxrIds !== ""){
             let ids = item.rwzxrIds.split(",");
@@ -422,7 +417,7 @@
               }
             });
           }
-          if(businessLevel === "1" && status){
+          if(status){
             localStorage.setItem("surveyItem",JSON.stringify(item));
             this.qiehuan(item.deptId);
           }else{
@@ -442,113 +437,66 @@
         xzChange(val){
           this.deptName = val.deptName;
           this.showDropList = false;
+          this.$set(this.queryParams, "deptId", null);
           if(val.deptId != 100){
             this.$set(this.queryParams, "parentId", val.deptId);
-            this.$set(this.switchParams, "parentId", val.deptId);
+            this.$set(this.queryParams, "params", {deptId:null});
           }else{
             this.$set(this.queryParams, "parentId", null);
-            this.$set(this.switchParams, "parentId", null);
+            this.$set(this.queryParams, "params", {deptId:val.deptId});
           }
           this.getList();
-          this.queryNum();
         },
         checkBadge(){
           this.finished = false;
           this.loading = false;
-          this.countqb = 1;
-          this.countyhc = 1;
-          this.countwhc = 1;
           this.totalList = []
           this.doneList = [];
           this.todoList = [];
           this.getList();
-          this.queryNum();
-        },
-        queryNum(){
-          if(this.checked){
-            let userId = this.$store.state.user.userId;
-            this.$set(this.switchParams, "rwzxr", userId);
-            listTask(this.switchParams).then(response => {
-              this.done = 0;
-              this.todo = 0;
-              this.total = response.total;
-              response.rows.map(res => {
-                if(res.rwwczt == "FINISHED"){
-                  this.done+=1
-                }else{
-                  this.todo+=1
-                }
-                // if(res.rwzxr!=null&&res.rwzxr!=''){
-                //   res.rwzxr = res.rwzxr.split(',')
-              })
-
-            });
-          }else{
-            this.$set(this.switchParams, "rwzxr", null);
-            if(this.switchParams.parentId == null){
-              this.$set(this.switchParams, "params", {deptId:100});
-            }
-            listTask(this.switchParams).then(response => {
-              this.done = 0;
-              this.todo = 0;
-              this.total = response.total;
-              console.info(this.total)
-              response.rows.map(res => {
-                if(res.rwwczt == "FINISHED"){
-                  this.done+=1
-                }else{
-                  this.todo+=1
-                }
-              })
-            });
-          }
         },
         getList() {
           this.totalList = []
           this.doneList = [];
           this.todoList = [];
+          this.countqb = 1;
+          this.countyhc = 1;
+          this.countwhc = 1;
+          this.finished = false;
+          this.loading = false;
           if(this.active==1) {
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
             this.$set(this.queryParams, "rwwczt", null);
             this.$set(this.queryParams, "pageNum",  this.countyhc);
             this.$set(this.queryParams, "pageSize",  4);
+            mobileList(this.queryParams).then(response => {
+              this.done = response.wcs;
+              this.todo = response.dcs;
+              this.total = response.tableDataInfo.total;
+              this.totalList = response.tableDataInfo.rows;
+            });
           }else if(this.active==2) {
             this.$set(this.queryParams, "rwwczt", "FINISHED");
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
             this.$set(this.queryParams, "pageNum",  this.countwhc);
+            mobileList(this.queryParams).then(response => {
+              this.total = response.wcs;
+              this.todo = response.dcs;
+              this.done = response.tableDataInfo.total;
+              this.doneList = response.tableDataInfo.rows;
+            });
           }else{
             this.$set(this.queryParams, "rwwczt", "UNFINISHED");
             this.$set(this.queryParams, "rwfbzt", "PUBLISHED");
             this.$set(this.queryParams, "pageNum",  this.countqb);
+            mobileList(this.queryParams).then(response => {
+              this.total = response.wcs;
+              this.done = response.dcs;
+              this.todo = response.tableDataInfo.total;
+              this.todoList = response.tableDataInfo.rows;
+            });
           }
-          listTask(this.queryParams).then(response => {
-            if(this.active==1) {
-              this.done = 0;
-              this.todo = 0;
-              this.total = response.total;
-            }
-            response.rows.map(res => {
-              console.info(this.active);
-              if(this.active==1) {
-                if(res.rwwczt == "FINISHED"){
-                  this.done+=1
-                  this.doneList.push(res);
-                }else{
-                  this.todo+=1
-                  this.todoList.push(res);
-                }
-                // if(res.rwzxr!=null&&res.rwzxr!=''){
-                //   res.rwzxr = res.rwzxr.split(',')
-                // }
-                this.totalList = response.rows;
-              }else if(this.active==2) {
-                this.doneList.push(res);
-              }else{
-                this.todoList.push(res);
-              }
-            })
 
-          });
         },
         gotoLink(){
           this.$router.push('/homesteadSurvey/settle')

src/views/homesteadSurvey/list.vue

@@ -78,32 +78,37 @@
           :immediate-check="false"
           @load="onRefreshzjd"
         >
-          <van-cell  v-for="(item,index) in list1" :key="index" size="small" :clickable="true"  style="border-radius: 16px;
-          box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;">
-            <template #title>
-              <div style="display: flex;align-items: center;">
-                <p style="display: flex;align-items: center;" >
-                  <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
-                  <span style="line-height: 1;">{{limitWords(item.shyqrdbxm)}}</span>
-                </p>
-                <p v-if="item.surveyStatus == '5' || item.surveyStatus  == '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="queryDetail(item)"><img src="../../assets/images/housesteadSurvey/list06.png" alt="" style="margin-right: 3px;">详情</p>
-<!--                <p v-if="item.zjdAudit=='0'" style="color:#ff976a;background:rgba(255,151,106,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">待审核</p>-->
-<!--                <p v-if="item.zjdAudit=='1'" style="color:#7AC943;background:rgba(122,201,67,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">已审核</p>-->
-<!--                <p v-if="item.zjdAudit=='2'" style="color:#ee0a24;font-size:12px;">已驳回</p>-->
-                <p v-if="item.surveyStatus != '5' && item.surveyStatus != '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="setCookies(item)"><img src="../../assets/images/housesteadSurvey/list07.png" alt="" style="margin-right: 3px;">调查</p>
-                <p style="margin-right: 3%;color:#22B7F2;font-size:12px;" ><van-icon  name="photo-o" size=".4rem" style="bottom: -3px;" color="#000000" @click="showUploadList(item.id)"/> 附件</p>
-                <p style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;"  @click="deleteZjd(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
+            <van-swipe-cell v-for="(item,index) in list1" :key="index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:5px auto 0;background:#fff;">
+              <div style="padding:10px;">
+                <div style="display: flex;align-items: center;">
+                  <p style="display: flex;align-items: center;" >
+                    <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
+                    <span style="line-height: 1;">{{limitWords(item.shyqrdbxm)}}</span>
+                  </p>
+                  <p v-if="item.surveyStatus == '5' || item.surveyStatus  == '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;" @click="queryDetail(item)"><img src="../../assets/images/housesteadSurvey/list06.png" alt="" style="margin-right: 3px;">详情</p>
+  <!--                <p v-if="item.zjdAudit=='0'" style="color:#ff976a;background:rgba(255,151,106,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">待审核</p>-->
+  <!--                <p v-if="item.zjdAudit=='1'" style="color:#7AC943;background:rgba(122,201,67,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">已审核</p>-->
+  <!--                <p v-if="item.zjdAudit=='2'" style="color:#ee0a24;font-size:12px;">已驳回</p>-->
+                  <p v-if="item.surveyStatus != '5' && item.surveyStatus != '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;" @click="setCookies(item)"><img src="../../assets/images/housesteadSurvey/list07.png" alt="" style="margin-right: 3px;">调查</p>
+                </div>
+              <!--<template #default>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
+              </template>-->
+                <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">宅基地代码:  {{item.zjddm}} </p>
+                <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">宗地面积: {{item.zdmj}}㎡<span style="margin-left: auto;color: #333333;" v-if="item.surveyStatus != '1'">调查员：{{item.surveyBy}}</span></p>
               </div>
+            <template #right>
+              <van-row>
+                <van-col>
+                  <van-button square  type="info" class="delete-button" @click="showUploadList(item.id)"><van-icon  name="photo-o" size=".4rem" style="bottom: -3px;" color="#000000" @click="showUploadList(item.id)"/> 附件</van-button>
+                </van-col>
+                <van-col>
+                  <van-button square  type="danger" class="delete-button" @click="showUploadList(item.id)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">  删除</van-button>
+                </van-col>
+              </van-row>
             </template>
-            <!--<template #default>
-              <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
-              <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
-            </template>-->
-            <template #label>
-              <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">宅基地代码:  {{item.zjddm}} </p>
-              <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">宗地面积: {{item.zdmj}}㎡<span style="margin-left: auto;color: #333333;" v-if="item.surveyStatus != '1'">调查员：{{item.surveyBy}}</span></p>
-            </template>
-          </van-cell>
+            </van-swipe-cell>
         </van-list>
         <!--</van-pull-refresh>-->
       </van-tab>
@@ -112,7 +117,7 @@
 </template>
 
 <script>
-    import {rhhcList,getQueryLand,getZjdzd,delZjdzd,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
+    import {rhhcList,getQueryLand,listZjdzd,getZjdzd,delZjdzd,uploadFile,submitUploadImageList} from "@/api/homesteadSurvey/zjdzd";
     import {addNh, delNh, exportNh, getNh, listNh, updateNh,setNhInfo} from "@/api/homesteadSurvey/nh";
     import {addNhhncy, delNhhncy, exportNhhncy, getNhhncy, listNhhncy, updateNhhncy} from "@/api/homesteadSurvey/nhhncy";
     import {listShyqr,setSyqrInfo} from "@/api/homesteadSurvey/shyqr";
@@ -321,18 +326,6 @@
       mounted(){
       },
       created(){
-
-        axios.get('../static/dictyType.json').then(res => {
-          this.dictTypeList = res.data
-          this.zjlxOptions = this.dictTypeList.zjlx;
-          this.suyqxzOptions = this.dictTypeList.qsxz;
-          this.sjlyOptions = this.dictTypeList.sjly;
-          this.hyzkOptions = this.dictTypeList.hyzk;
-          this.occupationOptions = this.dictTypeList.occupation;
-          this.jzqkOptions = this.dictTypeList.living_condition;
-          this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
-          this.cybzOptions = this.dictTypeList.member_remark;
-        })
         this.getDicts("survey_status").then(response => {
           var arr = [];
           response.data.forEach(function (item) {
@@ -346,7 +339,6 @@
           this.surveyStatusOptions = arr;
         });
         this.getList();
-        this.getSyqr();
           // this.getDicts("family_status").then(response => {
           //   var arr = [];
           //   response.data.forEach(function (item) {
@@ -406,23 +398,8 @@
       },
       methods: {
         getList(){
-          let params = {
-            "surveyStatus":"1",
-            "pageNum": 1,
-            "pageSize":10,
-          }
-          rhhcList(params).then(res => {
+          rhhcList({}).then(res => {
             this.list1 =  res.data.zjdzdxxList;
-            if(res.data.zjdzdxxList.length>0&&res.data.zjdzdxxList.length<res.data.zjdzs){
-              this.loading2 = false
-              this.finished2 = false;
-            }else{
-              this.loading2 = false
-              this.finished2 = true
-            }
-
-          });
-          rhhcList({surveyStatus:"1,2,3,4,5"}).then(res => {
             this.whcNums = res.data.wdcs;
             this.hcycNums = res.data.dcycs;
             this.hcwcNums = res.data.dcwcs;
@@ -430,6 +407,13 @@
             this.spbhNums = res.data.dcbhs;
             this.totalH = res.data.zjdzs;
             this.totalR = res.data.shyqrs;
+            if(res.data.zjdzdxxList.length>0&&res.data.zjdzdxxList.length<res.data.zjdzs){
+              this.loading2 = false
+              this.finished2 = false;
+            }else{
+              this.loading2 = false
+              this.finished2 = true
+            }
           });
         },
         showUploadList(id){
@@ -790,9 +774,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-             rhhcList(params).then((response) => {
-                if(response.data.zjdzdxxList.length>0&&this.list2.length<response.data.zjdzs){
-                  response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+                if(response.rows.length>0&&this.list1.length<response.total){
+                  response.rows.map(res => {
                     _this.list1.push(res)
                   })
                   this.countyhc++
@@ -809,9 +793,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-                if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                  response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+                if(response.rows.length>0&&this.list1.length<response.total){
+                  response.rows.map(res => {
                     _this.list1.push(res)
                   })
                   this.countyhc++
@@ -827,9 +811,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+              if(response.rows.length>0&&this.list1.length<response.total){
+                response.rows.map(res => {
                   _this.list1.push(res)
                 })
                 this.countyhc++
@@ -845,9 +829,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+              if(response.rows.length>0&&this.list1.length<response.total){
+                response.rows.map(res => {
                   _this.list1.push(res)
                 })
                 this.countyhc++
@@ -863,9 +847,9 @@
               "pageNum": this.countyhc+1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              if(response.data.zjdzdxxList.length>0&&this.list1.length<response.data.zjdzs){
-                response.data.zjdzdxxList.map(res => {
+            listZjdzd(params).then((response) => {
+              if(response.rows.length>0&&this.list1.length<response.total){
+                response.rows.map(res => {
                   _this.list1.push(res)
                 })
                 this.countyhc++
@@ -880,7 +864,7 @@
           let params = {
             "deptId" : this.item.deptId,
             "pageNum": 1,
-            "pageSize":10,
+            "pageSize":6,
           }
           listNh(params).then((response) => {
             if(response.rows.length>=0){
@@ -899,7 +883,7 @@
           let params = {
             "deptId" : this.item.deptId,
             "pageNum": this.countnh+1,
-            "pageSize":10,
+            "pageSize":6,
           }
           listNh(params).then((response) => {
             if(response.rows.length>0&&this.nhlist.length<response.total){
@@ -941,10 +925,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:"072"}));
+              this.$router.push({name:'homesteadAdd'});
+            }
+          });
+
+
         },
         // 农户信息搜索框新增。
         onClicknh(){
@@ -1265,13 +1258,6 @@
         },
         // 宅基地搜索框
         onSearchzjd(){
-          rhhcList({"shyqrdbxm" : this.zjdvalue,surveyStatus:"1,2,3,4,5"}).then(res => {
-            this.whcNums = res.data.wdcs;
-            this.hcycNums = res.data.dcycs;
-            this.hcwcNums = res.data.dcwcs;
-            this.sptgNums = res.data.dctgs;
-            this.spbhNums = res.data.dcbhs;
-          });
           if(this.active==0){
             let params = {
               "shyqrdbxm" : this.zjdvalue,
@@ -1279,12 +1265,11 @@
               "pageNum": 1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              console.info(this.list2.length);
+            listZjdzd(params).then((response) => {
               if (response.code == 200) {
-                this.list1 =  response.data.zjdzdxxList;
-                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.countyhc++
+                this.list1 =  response.rows;
+                this.whcNums = response.total;
+                if(response.rows.length>0&&response.rows.length<response.total){
                   this.loading2 = false
                   this.finished2 = false;
                 }else{
@@ -1300,12 +1285,11 @@
               "pageNum": 1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              console.info(this.list2.length);
+            listZjdzd(params).then((response) => {
               if (response.code == 200) {
-                this.list1 =  response.data.zjdzdxxList;
-                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.countyhc++
+                this.list1 =  response.rows;
+                this.hcycNums = response.total;
+                if(response.rows.length>0&&response.rows.length<response.total){
                   this.loading2 = false
                   this.finished2 = false;
                 }else{
@@ -1321,12 +1305,11 @@
               "pageNum": 1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              console.info(this.list2.length);
+            listZjdzd(params).then((response) => {
               if (response.code == 200) {
-                this.list1 =  response.data.zjdzdxxList;
-                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.countyhc++
+                this.list1 =  response.rows;
+                this.hcwcNums = response.total;
+                if(response.rows.length>0&&response.rows.length<response.total){
                   this.loading2 = false
                   this.finished2 = false;
                 }else{
@@ -1342,12 +1325,11 @@
               "pageNum": 1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
-              console.info(this.list2.length);
+            listZjdzd(params).then((response) => {
               if (response.code == 200) {
-                this.list1 =  response.data.zjdzdxxList;
-                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.countyhc++
+                this.list1 =  response.rows;
+                this.spbhNums = response.total;
+                if(response.rows.length>0&&response.rows.length<response.total){
                   this.loading2 = false
                   this.finished2 = false;
                 }else{
@@ -1363,11 +1345,11 @@
               "pageNum": 1,
               "pageSize":10,
             }
-            rhhcList(params).then((response) => {
+            listZjdzd(params).then((response) => {
               if (response.code == 200) {
-                this.list1 =  response.data.zjdzdxxList;
-                if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
-                  this.countyhc++
+                this.list1 =  response.rows;
+                this.sptgNums = response.total;
+                if(response.rows.length>0&&response.rows.length<response.total){
                   this.loading2 = false
                   this.finished2 = false;
                 }else{
@@ -1570,12 +1552,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.whcNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.whcNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -1590,12 +1572,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.hcycNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.hcycNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -1610,12 +1592,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.hcwcNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.hcwcNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -1630,12 +1612,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.spbhNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.spbhNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -1650,12 +1632,12 @@
              "pageNum": 1,
              "pageSize":10,
            }
-           rhhcList(params).then((response) => {
+           listZjdzd(params).then((response) => {
              if (response.code == 200) {
-               this.sptgNums = response.data.zjdzs;
-               this.list1 = response.data.zjdzdxxList;
+               this.sptgNums = response.total;
+               this.list1 = response.rows;
                this.loading2 = false
-               if(response.data.zjdzdxxList.length>0&&response.data.zjdzdxxList.length<response.data.zjdzs){
+               if(response.rows.length>0&&response.rows.length<response.total){
                  this.countyhc++
                  this.finished2 = false;
                }else{
@@ -5302,6 +5284,15 @@
   /deep/ .van-swipe-cell__wrapper{
     margin-right:-3px;
   }
+  /deep/ .delete-button {
+    height: 100%;
+  }
+  /deep/ .van-row{
+    height: 100%;
+  }
+  /deep/ .van-col{
+    height: 100%;
+  }
   .hzlxBtn{
     font-size: 0.3rem;
     display: inline-block;

src/views/homesteadSurvey/list2.vue

@@ -68,23 +68,24 @@
       :immediate-check="false"
       @load="onRefreshShyqr"
     >
-    <van-cell  v-for="(item,index) in nhlist" :key="index" size="small" :clickable="true" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;">
-      <template #title>
-        <div style="display: flex;align-items: center;">
-          <p style="display: flex;align-items: center;">
-            <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
-            <span style="line-height: 1;">{{item.xm}}</span>
-          </p>
-          <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">成员</p>
-          <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopupnh(item)"><img src="../../assets/images/housesteadSurvey/list10.png" alt="" style="margin-right: 3px;">户主</p>
-          <p style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;" @click="deletenh(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
+      <van-swipe-cell v-for="(item,index) in nhlist" :key="index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:5px auto 0;background:#fff;">
+        <div style="padding:10px;">
+          <div style="display: flex;align-items: center;">
+            <p style="display: flex;align-items: center;">
+              <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
+              <span style="line-height: 1;">{{item.xm}}</span>
+            </p>
+            <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">成员</p>
+            <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-right: 10px;" @click="showPopupnh(item)"><img src="../../assets/images/housesteadSurvey/list10.png" alt="" style="margin-right: 3px;">户主</p>
+          </div>
+
+          <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">证件号码:<span style="margin-left: auto;">{{item.zjhm}}</span> </p>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">农户代码:<span style="margin-left: auto;">{{item.nhdm}}</span></p>
         </div>
-      </template>
-      <template #label>
-        <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">证件号码:<span style="margin-left: auto;">{{item.zjhm}}</span> </p>
-        <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">农户代码:<span style="margin-left: auto;">{{item.nhdm}}</span></p>
-      </template>
-    </van-cell>
+        <template #right>
+          <van-button square  type="danger" class="delete-button" @click="deletenh(item.id)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt=""> 删除</van-button>
+        </template>
+      </van-swipe-cell>
     </van-list>
     <van-dialog v-model="outsideOpen" title="外村农户"  show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="outsideSubmitForm" @cancel="outsideCancel" >
     <wcnhList  style="height: 600px;overflow: auto;"  ref="wcnh"/>
@@ -5012,6 +5013,9 @@
   /deep/ .van-swipe-cell__wrapper{
     margin-right:-3px;
   }
+  /deep/ .delete-button {
+    height: 100%;
+  }
   .hzlxBtn{
     font-size: 0.3rem;
     display: inline-block;

src/views/homesteadSurvey/list4.vue

@@ -5995,7 +5995,7 @@
               this.$set(this.mapZjdTeAll.mapZjdAData, "qlsdfs","1");
               this.$set(this.mapZjdTeAll.mapZjdAData, "qllx","1");
               this.$set(this.mapZjdTeAll.mapZjdAData, "qlxz","203");
-              this.$set(this.mapZjdTeAll.mapZjdAData, "yt","01");
+              this.$set(this.mapZjdTeAll.mapZjdAData, "yt","072");
               this.$set(this.mapZjdTeAll.mapZjdAData, "dj","1");
 
               //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;

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>
@@ -85,7 +85,7 @@
         </div>
       </div>
       <template #right>
-        <van-button v-if="permission == 'true'"  square text="删除" type="danger" class="delete-button" @click="deletehncy(item.id,index)"/>
+        <van-button v-if="permission == 'true'"  square text="删除" type="danger" class="delete-button" @click="deletehncy(item.id,index)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
       </template>
     </van-swipe-cell>
     <van-dialog v-model="guohuData.visible" title="成员移户" show-cancel-button  confirmButtonText="确认" cancelButtonText="关闭" @confirm="guohu"  @cancel="show=false">

src/views/homesteadSurvey/nmfwAdd.vue

@@ -643,7 +643,7 @@ export default {
       // 当前位置信息
       tGeoOrganizationLat: null,
       tGeoOrganizationLng: null,
-      minDate: new Date(1990, 1, 1),
+      minDate: new Date(1950, 1, 1),
       maxDate: new Date(2030, 10, 1),
       showZgqrzrq:false,
       form:{}

src/views/homesteadSurvey/nmfwList.vue

@@ -64,19 +64,22 @@
           <p style="flex:1;text-align:left;">农户代码:</p>
           <p style="flex:1;text-align:right;">{{item.nhdm}}</p>
         </div>
-        <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
-          <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;"  @click="showUploadList(item.id)">
-            <van-icon  name="photo-o" size=".4rem" color="#FFFFFF"/>
-            <span style="font-size: 14px;color: #fff;margin-left: 5px;">附件</span>
-          </p>
+        <div style="text-align:center;overflow:auto;display: flex;justify-content: center;margin-top: 10px;">
           <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnmfw(item)">
             <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
-            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">详情</span>
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;" >详情</span>
           </p>
         </div>
       </div>
       <template #right>
-        <van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletenmfw(item)"/>
+        <van-row>
+          <van-col>
+            <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>附件</van-button>
+          </van-col>
+          <van-col>
+            <van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletenmfw(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
+          </van-col>
+        </van-row>
       </template>
     </van-swipe-cell>
     <van-popup v-model:show="showImageList" position="bottom" style="height:40vh;padding:50px 10px 0" closeable
@@ -299,7 +302,7 @@ export default {
       const ids = val.id || this.ids;
       Dialog.confirm({
         title: '系统提示',
-        message: '是否确认删除农民房屋标识为"' + val.id + '"的数据项?',
+        message: '是否确认删除农民房屋数据项?',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })
@@ -338,6 +341,12 @@ export default {
 >>> .delete-button {
   height: 100%;
 }
+>>> .van-row{
+  height: 100%;
+}
+>>> .van-col{
+  height: 100%;
+}
 >>> .van-swipe-cell__wrapper{
   margin-right:-3px;
 }

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:{}

src/views/project/projectDetail.vue

@@ -75,7 +75,7 @@
             <van-col span="24"><span>延时周期：</span>{{detail.delayPeriod}}秒</van-col>
           </van-row>
           <van-row v-if="detail.delayPeriod!=0">
-            <van-col span="24"><span>延时周期说明：</span>竞价的最后{{detail.delayPeriod}}秒内，任意方出价，距结束时间将延长{{detail.delayPeriod}}秒，直至无人出价为止</van-col>
+            <van-col span="24"><span>延时说明：</span>竞价的最后{{detail.delayPeriod}}秒内任意方出价，竞价结束时间将延长至此刻的{{detail.delayPeriod}}秒后，直至无人出价为止。</van-col>
           </van-row>
         </div>
       </van-tab>

src/views/sunVillage_info/arbitration/arbitrationDetail.vue

@@ -16,7 +16,6 @@
       <div class="header_main">
         纠纷调解
         <div class="return_btn" @click="onClickLeft"></div>
-        <div class="add_btn" @click="openMenu"></div>
       </div>
 
       <div class="main" style="padding-bottom: 1rem;">
@@ -30,7 +29,7 @@
                   <van-field v-model="arbitrationData.shyqrdbxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
                   <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
                     <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
-                      {{item.sqrxm}}
+                      {{item.shyqrdbxm}}
                     </van-cell>
                   </div>
                   <van-field
@@ -211,11 +210,10 @@ export default {
       landStatus:"1",
       menuVisible: false,
       mapShow:false,
-      sysFarmer:JSON.parse(Cookies.get('user')),
+      sysFarmer:{},
       showDropList:false,
       menuActions: [
-        {name: '调解/冲裁员', route: {name:'arbitrationHandlerList', query: {}}},
-        {name: '处理过程', route: {name:'arbitrationProcessList', query: {}}},
+        {name: '处理过程', route: {name:'arbitrationProcessDetail', query: {}}},
       ]
     };
   },
@@ -223,14 +221,20 @@ export default {
     this.id = this.$route.query.id;
     this.type = this.$route.query.type;
     this.getFormIntent();
-    getShyqrs({shyqrdbzjhm:this.sysFarmer.idcard,status:1}).then((response) => {
-      if (response.code == 200) {
-        this.shyqrdmxmChange(response.rows[0]);
-        this.closeMoule(response.rows[0].zjddm);
-      }
-    });
-    this.getDetail();
-    this.getUserHouseApplyProposer();
+    if(Cookies.get('user')){
+      this.sysFarmer =  JSON.parse(Cookies.get('user'));
+      getShyqrs({shyqrdbzjhm:this.sysFarmer.idcard,status:1}).then((response) => {
+        if (response.code == 200) {
+          if(response.rows.length > 0){
+            this.shyqrdmxmChange(response.rows[0]);
+            this.closeMoule(response.rows[0].zjddm);
+          }
+        }
+      });
+      this.getDetail();
+      this.getUserHouseApplyProposer();
+    }
+
   },
   computed: {
     allowCUD: function () {
@@ -409,21 +413,7 @@ export default {
       if (query !== "") {
         getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
           if (response.code == 200) {
-            this.getObligeeOptions = response.rows.map(function (item) {
-              return {
-                sqrxm:item.shyqrdbxm,
-                sqrxb:item.xb,
-                sqrzjhm:item.shyqrdbzjhm,
-                shyqrdm:item.shyqrdm,
-                sqrzjlx:item.shyqrdbzjlx,
-                zjddm:item.zjddm,
-                sqrdh:item.dh,
-                gyfs:item.gyfs,
-                dz:item.dz,
-                deptId:item.deptId,
-                deptName:item.deptName,
-              }
-            })
+            this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
             //设置模糊查询的下拉框和滚动条
             if (this.getObligeeOptions.length > 0) {
               this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -451,7 +441,7 @@ export default {
     shyqrdmxmChange(val){
       this.$set(this.arbitrationData, "shyqrdbxm", val.shyqrdbxm);
       this.$set(this.arbitrationData, "deptId", val.deptId);
-      this.$set(this.arbitrationData, "deptName", val.deptId);
+      this.$set(this.arbitrationData, "deptName", val.deptName);
       this.$set(this.arbitrationData, "shyqrzjhm", val.shyqrdbzjhm);
       this.$set(this.arbitrationData, "shyqrzjlx", val.shyqrdbzjlx);
       this.$set(this.arbitrationData, "shyqrdm", val.shyqrdm);
@@ -483,7 +473,6 @@ export default {
           this.notify("请标注宅基地位置!", 'danger');
           return;
         }*/
-        console.log("进行保存", this.arbitrationData);
         (this.arbitrationData.id ? editArbitration : addArbitration)(this.arbitrationData).then((response) => {
             this.notify("保存成功", 'success');
             this.goBack();
@@ -531,6 +520,7 @@ export default {
     },
     onActionSelect(a, index) {
       a.route.query.arbitrationId = this.arbitrationData.id;
+      console.info(a);
       this.$router.push(a.route);
     },
   },

src/views/sunVillage_info/assetMapOpen.vue

@@ -280,12 +280,12 @@
     text-overflow: ellipsis; /*超出部分文字以...显示*/
   }
   .plotPremises_right {
-    width: 98%;
+    width: 94%;
     position: fixed;
     z-index: 1001;
     top: 50%;
     transform: translateY(-50%);
-    right: 0;
+    right: 3%;
     display: flex;
   // display: none;
     min-width: 300px;
@@ -308,9 +308,7 @@
   // align-items: center;
   .area_information {
   // margin-bottom: 3%;
-    flex: 1.5;
     position: relative;
-    display: flex;
   .mian {
     background: rgba(25, 29, 24, 0.7);
     /*background: rgba(255, 255, 255, 0.7);*/
@@ -495,6 +493,7 @@
         situationW: 70,
         //地图判断
         openMap: false,
+        showBtn: false,
         mapTheGeomId: null,
         mapTheGeomResourceId: null,
         drawInsert:null,

src/views/sunVillage_info/homeApplication/proposerLite.vue

@@ -2102,7 +2102,11 @@ export default {
    if(this.type === "todo" || this.type === "done"){
      this.$set(this.sysFarmer, 'memberName',  this.$store.getters.nickName);
    }else{
-     this.sysFarmer = JSON.parse(Cookies.get('user'));
+     if(Cookies.get('user')){
+       this.sysFarmer = JSON.parse(Cookies.get('user'));
+     }else{
+       this.$router.push('/sunVillage_info/login_code')
+     }
    }
     this.getFormIntent();
     this.getDetail();

src/views/sunVillage_info/paidExit/paidExitAdd.vue

@@ -24,7 +24,7 @@
         <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
         <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
           <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
-            {{item.sqrxm}}
+            {{item.shyqrdbxm}}
           </van-cell>
         </div>
 <!--        <van-field-->
@@ -283,7 +283,7 @@
 
 <script>
 import {  getShyqrs,dyAdd,zyyctcApply,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
-import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+import HomeApplyUploadComp from "@/components/home/HomeApplyUploadCompTc";
 import FieldSelect from "@/components/form/FieldSelect";
 import FieldDatePicker from "@/components/form/FieldDatePicker";
 import {formatDate} from "element-ui/src/utils/date-util.js";
@@ -311,7 +311,7 @@ export default {
       bcfsDictionaries:[],//补偿方式
       zjdDictionaries:[],//宅基地代码
       getObligeeOptions:[],//下拉框列表
-      sysFarmer:JSON.parse(Cookies.get('user')),
+      sysFarmer:{},
       tcqllx:'整体退出',
       tclx:'有偿退出',
       tcfs:'使用权',
@@ -365,13 +365,20 @@ export default {
     };
   },
   created() {
+    if(Cookies.get('user')){
+      this.sysFarmer =  JSON.parse(Cookies.get('user'));
+      getShyqrs({shyqrdbzjhm:this.sysFarmer.idcard,status:1}).then((response) => {
+        if (response.code == 200) {
+          if(response.rows.length > 0){
+            this.shyqrdmxmChange(response.rows[0]);
+            this.closeMoule(response.rows[0].zjddm);
+          }
+        }
+      });
+    }else{
+      this.$router.push('/sunVillage_info/login_code');
+    }
     this.getDictionaries();
-    getShyqrs({shyqrdbzjhm:this.sysFarmer.idcard,status:1}).then((response) => {
-      if (response.code == 200) {
-        this.shyqrdmxmChange(response.rows[0]);
-        this.closeMoule(response.rows[0].zjddm);
-      }
-    });
   },
   methods: {
     getDictionaries(){
@@ -548,22 +555,10 @@ export default {
     /** 模糊查询人员信息 */
     remoteTransfereeMethod(query) {
       if (query !== "") {
+        let _this = this;
         getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
           if (response.code == 200) {
-            this.getObligeeOptions = response.rows.map(function (item) {
-            return {
-                      sqrxm:item.shyqrdbxm,
-                      sqrxb:item.xb,
-                      sqrzjhm:item.shyqrdbzjhm,
-                      sqrnhdm:item.nhdm,
-                      sqrzjlx:item.shyqrdbzjlx,
-                      sqrdh:item.dh,
-                      gyfs:item.gyfs,
-                      dz:item.dz,
-                      deptId:item.deptId,
-                      deptName:item.deptName,
-                    }
-            })
+            this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
             //设置模糊查询的下拉框和滚动条
             if (this.getObligeeOptions.length > 0) {
               this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -597,19 +592,20 @@ export default {
         });
     },
     shyqrdmxmChange(val){
-      this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
-      this.$set(this.circulation, "deptId", val.deptId);
-      this.$set(this.circulation, "deptName", val.deptName);
-      this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
-      this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
-      this.$set(this.circulation, "sqrnhdm", val.nhdm);
-      this.$set(this.circulation, "gyqk", val.gyfs);
-      this.$set(this.circulation, "xb", val.xb);
-      this.$set(this.circulation, "lxdh", val.dh);
-      this.$set(this.circulation, "hkszd", val.dz);
-      this.$set(this.circulation, "zjddm", val.zjddm);
-      this.getObligeeOptions=[];
-      this.showDropList = false;
+      if(!val.shyqrdbxm.includes("村集体")){
+        this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
+        this.$set(this.circulation, "deptId", val.deptId);
+        this.$set(this.circulation, "deptName", val.deptName);
+        this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
+        this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
+        this.$set(this.circulation, "sqrnhdm", val.nhdm);
+        this.$set(this.circulation, "gyqk", val.gyfs);
+        this.$set(this.circulation, "xb", val.xb);
+        this.$set(this.circulation, "lxdh", val.dh);
+        this.$set(this.circulation, "hkszd", val.dz);
+        this.getObligeeOptions=[];
+        this.showDropList = false;
+      }
     },
     mapLook(){
       this.mapShow = true;

src/views/sunVillage_info/paidExit/paidExitModify.vue

@@ -275,7 +275,7 @@
 
 <script>
   import {  getZyyctc,getShyqrs,zyyctcEdit,zyyctcApply,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
-  import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+  import HomeApplyUploadComp from "@/components/home/HomeApplyUploadCompTc";
   import FieldSelect from "@/components/form/FieldSelect";
   import FieldDatePicker from "@/components/form/FieldDatePicker";
   import {formatDate} from "element-ui/src/utils/date-util.js";
@@ -303,7 +303,7 @@
         bcfsDictionaries:[],//补偿方式
         zjdDictionaries:[],//宅基地代码
         getObligeeOptions:[],//下拉框列表
-        sysFarmer:JSON.parse(Cookies.get('user')),
+        sysFarmer:{},
         tcqllx:'',
         tclx:'',
         tcfs:'',
@@ -330,7 +330,7 @@
         houseApplyUploadComp: {
           businessType: PROPOSER_MODULE,
           proposerId: this.$route.query.id,
-          homeApplyStatus: "11",
+          homeApplyStatus: "0",
           processKey: PROPOSER_STAGE_BASE_APPLY_ACTIVITY,
           tableName: PROPOSER_STAGE_BASE_APPLY_TABLE,
           attachmentList: [],
@@ -340,7 +340,12 @@
       };
     },
     created() {
-      this.getDictionaries();
+      if(Cookies.get('user')){
+        this.getDictionaries();
+      }else{
+        this.$router.push('/sunVillage_info/login_code')
+      }
+
     },
     methods: {
       getDictionaries(){

src/views/yinnong/homestead/freeExit/freeExitAdd.vue

@@ -24,7 +24,7 @@
         <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
         <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
           <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
-            {{item.sqrxm}}
+            {{item.shyqrdbxm}}
           </van-cell>
         </div>
 <!--        <van-field-->
@@ -519,21 +519,7 @@ export default {
       if (query !== "") {
         getShyqrs({shyqrdbxm:query,status:1,deptId:this.sysFarmer.deptId}).then((response) => {
           if (response.code == 200) {
-            this.getObligeeOptions = response.rows.map(function (item) {
-            return {
-                      sqrxm:item.shyqrdbxm,
-                      sqrxb:item.xb,
-                      sqrzjhm:item.shyqrdbzjhm,
-                      sqrnhdm:item.nhdm,
-                      sqrzjlx:item.shyqrdbzjlx,
-                      sqrdh:item.dh,
-                      gyfs:item.gyfs,
-                      dz:item.dz,
-                      deptId:item.deptId,
-                      deptName:item.deptName,
-                      zjddm:item.zjddm,
-                    }
-            })
+            this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
             //设置模糊查询的下拉框和滚动条
             if (this.getObligeeOptions.length > 0) {
               this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -567,19 +553,18 @@ export default {
         });
     },
     shyqrdmxmChange(val){
-      this.$set(this.circulation, "sqrxm", val.sqrxm);
-      this.$set(this.circulation, "deptId", val.deptId);
-      this.$set(this.circulation, "deptName", val.deptName);
-      this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
-      this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
-      this.$set(this.circulation, "sqrnhdm", val.sqrnhdm);
-      this.$set(this.circulation, "gyqk", val.gyfs);
-      this.$set(this.circulation, "xb", val.sqrxb);
-      this.$set(this.circulation, "lxdh", val.sqrdh);
-      this.$set(this.circulation, "hkszd", val.dz);
-      this.$set(this.circulation, "zjddm", val.zjddm);
-      this.getObligeeOptions=[];
-      this.showDropList = false;
+        this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
+        this.$set(this.circulation, "deptId", val.deptId);
+        this.$set(this.circulation, "deptName", val.deptName);
+        this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
+        this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
+        this.$set(this.circulation, "sqrnhdm", val.nhdm);
+        this.$set(this.circulation, "gyqk", val.gyfs);
+        this.$set(this.circulation, "xb", val.xb);
+        this.$set(this.circulation, "lxdh", val.dh);
+        this.$set(this.circulation, "hkszd", val.dz);
+        this.getObligeeOptions=[];
+        this.showDropList = false;
     },
     mapLook(){
       this.mapShow = true;

src/views/yinnong/homestead/freeExit/freeExitModify.vue

@@ -23,7 +23,7 @@
         <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
         <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
           <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
-            {{item.sqrxm}}
+            {{item.shyqrdbxm}}
           </van-cell>
         </div>
         <!--        <van-field-->
@@ -452,19 +452,7 @@
         if (query !== "") {
           getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
             if (response.code == 200) {
-              this.getObligeeOptions = response.rows.map(function (item) {
-                return {
-                  sqrxm:item.shyqrdbxm,
-                  sqrxb:item.xb,
-                  sqrzjhm:item.shyqrdbzjhm,
-                  sqrzjlx:item.shyqrdbzjlx,
-                  sqrdh:item.dh,
-                  gyfs:item.gyfs,
-                  dz:item.dz,
-                  deptId:item.deptId,
-                  deptName:item.deptName,
-                }
-              })
+              this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
               //设置模糊查询的下拉框和滚动条
               if (this.getObligeeOptions.length > 0) {
                 this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -490,15 +478,15 @@
         }
       },
       shyqrdmxmChange(val){
-        console.info(val);
-        this.$set(this.circulation, "sqrxm", val.sqrxm);
+        this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
         this.$set(this.circulation, "deptId", val.deptId);
-        this.$set(this.circulation, "deptName", val.deptId);
-        this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
-        this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
+        this.$set(this.circulation, "deptName", val.deptName);
+        this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
+        this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
+        this.$set(this.circulation, "sqrnhdm", val.nhdm);
         this.$set(this.circulation, "gyqk", val.gyfs);
-        this.$set(this.circulation, "xb", val.sqrxb);
-        this.$set(this.circulation, "lxdh", val.sqrdh);
+        this.$set(this.circulation, "xb", val.xb);
+        this.$set(this.circulation, "lxdh", val.dh);
         this.$set(this.circulation, "hkszd", val.dz);
         this.getObligeeOptions=[];
         this.showDropList = false;

src/views/yinnong/homestead/paidExit/paidExitAdd.vue

@@ -24,7 +24,7 @@
         <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
         <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
           <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
-            {{item.sqrxm}}
+            {{item.shyqrdbxm}}
           </van-cell>
         </div>
 <!--        <van-field-->
@@ -285,7 +285,7 @@
 
 <script>
 import {  getShyqrs,dyAdd,zyyctcApply,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
-import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+import HomeApplyUploadComp from "@/components/home/HomeApplyUploadCompTc";
 import FieldSelect from "@/components/form/FieldSelect";
 import FieldDatePicker from "@/components/form/FieldDatePicker";
 import {formatDate} from "element-ui/src/utils/date-util.js";
@@ -546,20 +546,7 @@ export default {
       if (query !== "") {
         getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
           if (response.code == 200) {
-            this.getObligeeOptions = response.rows.map(function (item) {
-            return {
-                      sqrxm:item.shyqrdbxm,
-                      sqrxb:item.xb,
-                      sqrzjhm:item.shyqrdbzjhm,
-                      sqrnhdm:item.nhdm,
-                      sqrzjlx:item.shyqrdbzjlx,
-                      sqrdh:item.dh,
-                      gyfs:item.gyfs,
-                      dz:item.dz,
-                      deptId:item.deptId,
-                      deptName:item.deptName,
-                    }
-            })
+            this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
             //设置模糊查询的下拉框和滚动条
             if (this.getObligeeOptions.length > 0) {
               this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -593,15 +580,15 @@ export default {
         });
     },
     shyqrdmxmChange(val){
-      this.$set(this.circulation, "sqrxm", val.sqrxm);
+      this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
       this.$set(this.circulation, "deptId", val.deptId);
       this.$set(this.circulation, "deptName", val.deptName);
-      this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
-      this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
-      this.$set(this.circulation, "sqrnhdm", val.sqrnhdm);
+      this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
+      this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
+      this.$set(this.circulation, "sqrnhdm", val.nhdm);
       this.$set(this.circulation, "gyqk", val.gyfs);
-      this.$set(this.circulation, "xb", val.sqrxb);
-      this.$set(this.circulation, "lxdh", val.sqrdh);
+      this.$set(this.circulation, "xb", val.xb);
+      this.$set(this.circulation, "lxdh", val.dh);
       this.$set(this.circulation, "hkszd", val.dz);
       this.getObligeeOptions=[];
       this.showDropList = false;

src/views/yinnong/homestead/paidExit/paidExitModify.vue

@@ -23,7 +23,7 @@
         <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
         <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
           <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
-            {{item.sqrxm}}
+            {{item.shyqrdbxm}}
           </van-cell>
         </div>
         <!--        <van-field-->
@@ -277,7 +277,7 @@
 
 <script>
   import {  getZyyctc,getShyqrs,zyyctcEdit,zyyctcApply,getByLyZjddm,listHomesteadnmfw} from "@/api/sunVillage_info/homestead/paidExit";
-  import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
+  import HomeApplyUploadComp from "@/components/home/HomeApplyUploadCompTc";
   import FieldSelect from "@/components/form/FieldSelect";
   import FieldDatePicker from "@/components/form/FieldDatePicker";
   import {formatDate} from "element-ui/src/utils/date-util.js";
@@ -479,19 +479,7 @@
         if (query !== "") {
           getShyqrs({shyqrdbxm:query,status:1}).then((response) => {
             if (response.code == 200) {
-              this.getObligeeOptions = response.rows.map(function (item) {
-                return {
-                  sqrxm:item.shyqrdbxm,
-                  sqrxb:item.xb,
-                  sqrzjhm:item.shyqrdbzjhm,
-                  sqrzjlx:item.shyqrdbzjlx,
-                  sqrdh:item.dh,
-                  gyfs:item.gyfs,
-                  dz:item.dz,
-                  deptId:item.deptId,
-                  deptName:item.deptName,
-                }
-              })
+              this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); });
               //设置模糊查询的下拉框和滚动条
               if (this.getObligeeOptions.length > 0) {
                 this.showDropList = true;   // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示
@@ -517,15 +505,15 @@
         }
       },
       shyqrdmxmChange(val){
-        console.info(val);
-        this.$set(this.circulation, "sqrxm", val.sqrxm);
+        this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
         this.$set(this.circulation, "deptId", val.deptId);
-        this.$set(this.circulation, "deptName", val.deptId);
-        this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
-        this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
+        this.$set(this.circulation, "deptName", val.deptName);
+        this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
+        this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
+        this.$set(this.circulation, "sqrnhdm", val.nhdm);
         this.$set(this.circulation, "gyqk", val.gyfs);
-        this.$set(this.circulation, "xb", val.sqrxb);
-        this.$set(this.circulation, "lxdh", val.sqrdh);
+        this.$set(this.circulation, "xb", val.xb);
+        this.$set(this.circulation, "lxdh", val.dh);
         this.$set(this.circulation, "hkszd", val.dz);
         this.getObligeeOptions=[];
         this.showDropList = false;