From 15eb7599e51648c9ee9aa15238d7bfd1f61ed7c1 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Fri, 3 Feb 2023 14:14:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/home/HomeApplyUploadComp.vue   | 12 ++--
 .../house/HouseLocationPlanComp.vue           |  2 +-
 .../arbitration/arbitrationDetail.vue         | 17 ++++--
 .../arbitration/arbitrationList.vue           | 11 ++--
 .../homeApplication/applicationList.vue       | 51 ++++++++---------
 .../homeApplication/proposerLite.vue          | 57 ++++++++++++-------
 .../sunVillage_info/paidExit/paidExitList.vue |  3 +-
 .../homestead/supervision/supervisionAdd.vue  |  9 ++-
 8 files changed, 92 insertions(+), 70 deletions(-)

diff --git a/src/components/home/HomeApplyUploadComp.vue b/src/components/home/HomeApplyUploadComp.vue
index 914be449..12320d02 100644
--- a/src/components/home/HomeApplyUploadComp.vue
+++ b/src/components/home/HomeApplyUploadComp.vue
@@ -185,20 +185,18 @@ export default {
         businessType: businessType,
         nodeStatus: houseApplyStatus,
         processKey: processKey,
-        nodeStatusSort: '1,32,2,3,33,31,4,5,34,6,7,8,9,10,'
-          + '12,13,14,15,16,17,28,19,18,'
-          + '20,21,22,23,24,25,30,29,26,27'
-        ,
+        dictTypeSort: 'home_stage_status',
+        nodeStatusSort: '',
       }).then(resp => {
         //console.log(resp);
         try {
           if(!resp.data || resp.data.length === 0)
             return;
-          let rows = resp.data[0].params.children;
+          let rows = resp.data[0].children;
           rows.forEach((value, index) => {
-            if (!value.params.children)
+            if (!value.children)
               return;
-            this.handleResponse(value.params.children, proposerId, houseApplyStatus, tableName);
+            this.handleResponse(value.children, proposerId, houseApplyStatus, tableName);
           });
         }
         catch (e)
diff --git a/src/components/house/HouseLocationPlanComp.vue b/src/components/house/HouseLocationPlanComp.vue
index 79b55d3e..d8e31a9e 100644
--- a/src/components/house/HouseLocationPlanComp.vue
+++ b/src/components/house/HouseLocationPlanComp.vue
@@ -10,8 +10,8 @@
       :before-delete="handleRemove"
       v-model="uploadImg.fileList"
       :after-read="onUploadChanged"
+      :accept="uploadImg.accept"
     >
-<!--      :accept="uploadImg.accept"-->
     </van-uploader>
   </div>
 </template>
diff --git a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue
index 6b236ce6..b342b50e 100644
--- a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue
+++ b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue
@@ -21,7 +21,7 @@
               <div>
                 <p class="main_title">基本信息</p>
                 <div class="main_box">
-                  <van-field v-model="arbitrationData.shyqrdbxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
+                  <van-field v-model="arbitrationData.shyqrdbxm" readonly 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}}
@@ -30,6 +30,7 @@
                   <van-field
                     v-model="arbitrationData.zjddm"
                     label="宅基地代码"
+                    readonly
                     input-align="right"
                   >
                     <template #button>
@@ -44,12 +45,12 @@
                     placeholder="选择证件类型"
                     :rules="[{ required: true }]"
                     required
-                    :readonly="!formEnabled.baseFormEnabled"
+                    readonly
                     remote-url="/system/dict/data/type/zjlx"
                     :on-remote-response="'data'"
                   />
-                  <van-field v-model="arbitrationData.shyqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
-                  <van-field required :readonly="true" v-model="arbitrationData.shyqrdh" label="联系电话" placeholder="联系电话" input-align="right" type="digit" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]"/>
+                  <van-field readonly v-model="arbitrationData.shyqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+                  <van-field required  v-model="arbitrationData.shyqrdh" label="联系电话" placeholder="联系电话" input-align="right" type="digit" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]"/>
                 </div>
               </div>
               <div>
@@ -68,7 +69,7 @@
                   required
                   :readonly="!allowCUD || !formEnabled.baseFormEnabled"
                 />
-                <van-field :readonly="!allowCUD || !formEnabled.baseFormEnabled" v-model="arbitrationData.disputeAddress" label="事件地址" placeholder="事件地址" input-align="right" required :rules="[{ required: true }]"/>
+                <van-field :readonly="!allowCUD || !formEnabled.baseFormEnabled" v-model="arbitrationData.disputeAddress" label="事件地址" placeholder="事件地址" input-align="right"/>
                 <van-field
                   rows="3"
                   autosize
@@ -76,6 +77,8 @@
                   type="textarea"
                   placeholder="事件描述"
                   input-align="right"
+                  required
+                  :rules="[{ required: true }]"
                   v-model="arbitrationData.disputeRemark"
                   :readonly="!allowCUD || !formEnabled.baseFormEnabled"
                 />
@@ -83,7 +86,7 @@
               <div v-if="cljgInfoShow">
                 <p class="main_title"><span style="color: red;">*</span>处理结果</p>
                 <van-field   :readonly="!allowCUD || !formEnabled.baseFormEnabled" v-model="arbitrationData.handleBy" label="处理人" placeholder="处理人" input-align="right" required :rules="[{ required: true }]"/>
-                <van-field   :readonly="!allowCUD || !formEnabled.baseFormEnabled" required v-model="arbitrationData.handlePhone" label="处理人电话" placeholder="处理人电话" input-align="right" type="digit" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]"/>
+                <van-field   :readonly="!allowCUD || !formEnabled.baseFormEnabled"  v-model="arbitrationData.handlePhone" label="处理人电话" placeholder="处理人电话" input-align="right" type="digit"/>
                 <field-date-picker
                   v-model="arbitrationData.handleAt"
                   label="处理时间"
@@ -99,6 +102,8 @@
                   label="处理结果"
                   type="textarea"
                   placeholder="处理结果"
+                  required
+                  :rules="[{ required: true }]"
                   input-align="right"
                   v-model="arbitrationData.handleRemark"
                   :readonly="!allowCUD || !formEnabled.baseFormEnabled"
diff --git a/src/views/sunVillage_info/arbitration/arbitrationList.vue b/src/views/sunVillage_info/arbitration/arbitrationList.vue
index 2863e76a..38a1972f 100644
--- a/src/views/sunVillage_info/arbitration/arbitrationList.vue
+++ b/src/views/sunVillage_info/arbitration/arbitrationList.vue
@@ -8,7 +8,7 @@
       @click-left="$router.back()"
     >
       <template #right>
-        <van-icon name="add" size="20" @click="addArbitration" v-if="allowCUD"/>
+        <van-icon name="add"  @click="addArbitration" v-if="allowCUD"/>
       </template>
     </van-nav-bar>
 
@@ -54,9 +54,9 @@
       </van-list>
     </van-pull-refresh>
 
-    <van-dialog v-model="cljgInfoShow" title="处理结果" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="confirmn" @cancel="cancel">
+    <van-dialog v-model="cljgInfoShow" title="处理结果" show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="confirmn" >
       <van-field :readonly="!allowCUD" v-model="arbitrationData.handleBy" label="处理人" placeholder="处理人" input-align="right" required :rules="[{ required: true }]"/>
-      <van-field required v-model="arbitrationData.handlePhone" label="处理人电话" placeholder="处理人电话" input-align="right" type="digit" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]"/>
+      <van-field v-model="arbitrationData.handlePhone" label="处理人电话" placeholder="处理人电话" input-align="right" type="digit" />
       <field-date-picker
         v-model="arbitrationData.handleAt"
         label="处理时间"
@@ -73,6 +73,8 @@
         type="textarea"
         placeholder="处理结果"
         input-align="right"
+        :rules="[{ required: true }]"
+        required
         v-model="arbitrationData.handleRemark"
         :readonly="!allowCUD"
       />
@@ -127,7 +129,7 @@ export default {
   },
   computed: {
     allowCUD: function () {
-      return this.$store.getters.businessLevel == '2' || true;
+      return this.$route.query.status !== "0";
     },
   },
   methods: {
@@ -215,6 +217,7 @@ export default {
       editArbitration(this.arbitrationData).then((response) => {
         this.notify("保存成功", 'success');
         this.cljgInfoShow = false;
+        this.getList();
       }).catch((e) => {
         this.notify("保存失败!", 'danger');
         this.cljgInfoShow = false;
diff --git a/src/views/sunVillage_info/homeApplication/applicationList.vue b/src/views/sunVillage_info/homeApplication/applicationList.vue
index 2a675cc3..919c0bcb 100644
--- a/src/views/sunVillage_info/homeApplication/applicationList.vue
+++ b/src/views/sunVillage_info/homeApplication/applicationList.vue
@@ -91,6 +91,7 @@ export default {
     });
     this.deptId = Cookies.get('deptId')
     this.$set(this.queryParams, "deptId", this.deptId);
+    this.$set(this.queryParams, "sqhhzsfzh", this.idcard);
     this.getList();
   },
   methods: {
@@ -184,33 +185,29 @@ export default {
       this.finished = false;
     },
     submitApplyProposer(item) {
-      this.$dialog.confirm({
-        message: '您确认提交申请草稿？',
-      }).then(() => {
-        if(item.homeApplyStatus === '11'){
-          customSubmitWLHT(item.id).then((resp) => {
-            this.$toast.success("提交成功");
-            this.refresh();
-          }).catch((e) => {
-            this.$toast.fail("提交失败!");
-          });
-        }else if(item.homeApplyStatus === '31'){
-          submitStartWLHT(item.id).then((resp) => {
-            this.$toast.success("提交成功");
-            this.refresh();
-          }).catch((e) => {
-            this.$toast.fail("提交失败!");
-          });
-        }else if(item.homeApplyStatus === '71'){
-          submitEndWLHT(item.id).then((resp) => {
-            this.$toast.success("提交成功");
-            this.refresh();
-          }).catch((e) => {
-            this.$toast.fail("提交失败!");
-          });
-        }
-
-      }).catch(() => {});
+        this.$router.push({name:'sunVillageInfoProposerLite',query:{type:"edit",id:item.id}})
+        // if(item.homeApplyStatus === '11'){
+        //   customSubmitWLHT(item.id).then((resp) => {
+        //     this.$toast.success("提交成功");
+        //     this.refresh();
+        //   }).catch((e) => {
+        //     this.$toast.fail("提交失败!");
+        //   });
+        // }else if(item.homeApplyStatus === '31'){
+        //   submitStartWLHT(item.id).then((resp) => {
+        //     this.$toast.success("提交成功");
+        //     this.refresh();
+        //   }).catch((e) => {
+        //     this.$toast.fail("提交失败!");
+        //   });
+        // }else if(item.homeApplyStatus === '71'){
+        //   submitEndWLHT(item.id).then((resp) => {
+        //     this.$toast.success("提交成功");
+        //     this.refresh();
+        //   }).catch((e) => {
+        //     this.$toast.fail("提交失败!");
+        //   });
+        // }
     },
   },
 }
diff --git a/src/views/sunVillage_info/homeApplication/proposerLite.vue b/src/views/sunVillage_info/homeApplication/proposerLite.vue
index a36534cf..dbc7a613 100644
--- a/src/views/sunVillage_info/homeApplication/proposerLite.vue
+++ b/src/views/sunVillage_info/homeApplication/proposerLite.vue
@@ -133,7 +133,7 @@
                               :on-remote-response="'data'"
                             />
                             <van-field required v-model="item.sfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateMemberInfo(index)"/>
-                            <van-field required v-model="item.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
+                            <van-field required v-model="applicationDetail.sqhhzhkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
                           </div>
                         </div>
                       </van-tab>
@@ -299,7 +299,7 @@
                         :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
                         clickable
                         required
-                        :rules="[{ required: applicationDetail.sjtz == '2' , message:'请选择资金支出类别' }]"
+                        :rules="[{ required: applicationDetail.sjtz == '2' , message:'请选择选通用图' }]"
                         label="选通用图"
                         placeholder="选通用图"
                         v-model="tytzName"
@@ -1320,10 +1320,8 @@
                       <van-col span="5">竣工<br/>平面<br/>简图<br/>
                         (标注<br/>长宽<br/>及四至)</van-col>
                       <van-col span="19">
-                        <house-location-plan-comp ref="pictureUploadAccepting" :uploadDisabled="!formEnabled.acceptingForm.townFormEnabled" :jsonData="uploadImgAccepting.fileList" :proposer-id="uploadImgAccepting.proposerId" tableName="t_homeapply_ydjfys"
-                                                  @uploadFileChanged="(x) => {this.uploadImgAccepting.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgAccepting.removeFileList = x;}"
-                        />
-                        <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.ydjfys.jgpmjtjbr"  placeholder="经办人" label="经办人" input-align="left" :rules="[{ required: true }]"/>
+                        <MultiImageUploadComp :value="applicationDetail.ydjfys.jgpmjt" :uploadDisabled="!formEnabled.acceptingForm.baseFormEnabled" @fileUpdate="fileUpdatePmt"/>
+                        <van-field required :readonly="!this.formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.jgpmjtjbr"  placeholder="经办人" label="经办人" input-align="left" :rules="[{ required: true }]"/>
                       </van-col>
                     </van-row>
                   </div>
@@ -1400,7 +1398,7 @@
                       <van-row type="flex" justify="space-between" align="center">
                         <van-col span="5">承揽人<br/>（姓名/<br/>单位/<br/>职务）</van-col>
                         <van-col span="19">
-                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.clr" label="签字" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.clr" label="签字" placeholder="承揽人签字" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
                           <!--                    </van-cell>-->
                           <field-date-picker
                             v-model="applicationDetail.ydjfys.qtysnr.clrsj"
@@ -1418,7 +1416,7 @@
                       <van-row type="flex" justify="space-between" align="center">
                         <van-col span="5">第三服务方</van-col>
                         <van-col span="19">
-                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.dsfwf" label="签字" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.dsfwf" label="签字" placeholder="第三服务方签字" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
                           <!--                    </van-cell>-->
                           <field-date-picker
                             v-model="applicationDetail.ydjfys.qtysnr.dsfwfsj"
@@ -1436,7 +1434,7 @@
                       <van-row type="flex" justify="space-between" align="center">
                         <van-col span="5">专业技<br/>术人员）</van-col>
                         <van-col span="19">
-                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.zyjsry" label="签字" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.zyjsry" label="签字" placeholder="专业技术人员签字" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
                           <!--                    </van-cell>-->
                           <field-date-picker
                             v-model="applicationDetail.ydjfys.qtysnr.zyjsrysj"
@@ -2058,7 +2056,6 @@ export default {
     this.type = this.$route.query.type;
     this.taskId = this.$route.query.taskId;
     this.instanceId = this.$route.query.instanceId;
-    console.log(this.$cookies)
     this.getDicts("family_status").then(response => {
       let arr = [];
       response.data.forEach(function (item) {
@@ -2111,6 +2108,9 @@ export default {
       this.reset();
       if(this.id)
       {
+        if(this.type === "edit"){
+          this.proposerStatus = PROPOSER_EDIT;
+        }
         allInformationWLHT(this.id).then(response => {
           listHomeapplytype({deptId: response.data.deptId}).then(res => {
             this.tytzList = res.rows;
@@ -2219,9 +2219,6 @@ export default {
       let hasGroupLevel = false; //value.tHouseApplyProposer.hasOwnProperty('hasGroupLevel') ? value.tHouseApplyProposer.hasGroupLevel : this.isGroupLevel;
 
       console.log("当前申请状态: " + homeApplyStatus);
-      // 默认状态
-      this.formVisible.baseApplyForm.homesteadFormVisible = value ? value.sfyyzjd ==='Y' : false;
-
       this.formVisible.editVisible = false;
 
       this.formVisible.baseApplyForm.groupFormVisible = false;
@@ -2322,10 +2319,10 @@ export default {
           // 初始化申请平面图
           this.uploadImg.fileList = value.ydjfsp ? value.ydjfsp.zjdzlpmwzt : '';
           this.uploadImg.proposerId = this.applicationDetail.id;
-          // // 初始化验收平面图
-          // this.uploadImgAccepting.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.locationPlan : '';
-          // this.uploadImgAccepting.proposerId = value.tHouseApplyProposer.id;
-
+          // 初始化验收平面图
+          this.uploadImgAccepting.fileList = value.ydjfys ? value.ydjfys.jgpmjt : '';
+          this.uploadImgAccepting.proposerId = this.applicationDetail.id;
+          console.info(this.uploadImgAccepting);
           //地图查看
           this.applicationDetail = value;
           this.pointDarw(null);
@@ -2377,6 +2374,7 @@ export default {
           let handlerName = this.$store.getters.nickName;
           let handlerTime = this.getDate();
           this.applicationDetail = value;
+          console.info(1111)
           if(this.type === "todo"){
             if(this.isProposeStatus(homeApplyStatus, ["14"])){
               if(this.$route.query.electronicSignature != null){
@@ -2872,9 +2870,10 @@ export default {
           this.uploadImg.fileList = value.ydjfsp ? value.ydjfsp.zjdzlpmwzt : '';
           this.uploadImg.proposerId = this.applicationDetail.id;
 
-          this.uploadImgAccepting.fileList = value.tHouseApplyEnd ? value.tHouseApplyEnd.locationPlan : '';
+          this.uploadImgAccepting.fileList = value.ydjfys ? value.ydjfys.jgpmjt : '';
           this.uploadImgAccepting.proposerId = this.applicationDetail.id;
 
+
           //地图编辑
           this.pointDarw(null);
           // this.pointDarwNature(null);
@@ -2896,12 +2895,14 @@ export default {
 
           this.pointDarw();
           getWorkflow().then((resp) => {
+
             this.$set(this.applicationDetail, 'proposerActiveIndex', -1);
             this.$set(this.applicationDetail, 'startActiveIndex', -1);
             this.$set(this.applicationDetail, 'endActiveIndex', -1);
             this.$set(this.applicationDetail, 'applyStepList', resp.data.applyStepList.name);
             this.$set(this.applicationDetail, 'startStepList', resp.data.startStepList.name);
             this.$set(this.applicationDetail, 'endStepList', resp.data.endStepList.name);
+            console.info(this.applicationDetail);
           });
           //this.initData();
           break;
@@ -3181,8 +3182,6 @@ export default {
         if(res.data)
         {
           this.applicationDetail = res.data;
-          this.$set(this.applicationDetail, 'sqhhzhkszd',  val.sqhhzhkszd);
-          this.$set(this.applicationDetail, 'sqhjtzz',  val.sqhjtzz);
           this.$set(this.applicationDetail, 'jflx',  "4");
           this.$set(this.applicationDetail, 'projectName',  "分户新建");
           this.$set(this.applicationDetail, 'nsqzjddldm',  "10");
@@ -3240,6 +3239,7 @@ export default {
 
         console.log("进行保存", this.applicationDetail);
         this.$set(this.applicationDetail, 'applyUserId',  this.sysFarmer.id);
+        this.$set(this.applicationDetail, 'auditStatus',  "0");
         saveHomeBaseInfo(this.applicationDetail).then((response) => {
           if(submit)
           {
@@ -3248,7 +3248,6 @@ export default {
           }
           else
           {
-            this.$set(this.applicationDetail, 'auditStatus',  "0");
             this.notify("保存成功", 'success');
             this.goBack();
           }
@@ -3309,9 +3308,12 @@ export default {
                 this.$set(this.zjdzdxxDetailed, 'zdszn',  resp.data.zjdzdxxList[0].zdszn);
                 this.$set(this.zjdzdxxDetailed, 'zdszx',  resp.data.zjdzdxxList[0].zdszx);
                 this.$set(this.zjdzdxxDetailed, 'zdszb',  resp.data.zjdzdxxList[0].zdszb);
+                this.$set(this.applicationDetail, 'sfyyzjd',  "Y");
                 resp.data.zjdzdxxList.forEach(function(item){
                   _this.zjddmColumns.push({text:item.zjddm,value:item.zjddm});
                 })
+              }else{
+                this.$set(this.applicationDetail, 'sfyyzjd',  "N");
               }
 
               // this.applicationDetail.tHouseApplyCurrentSituation.landPerArea= (resp.data.zdmj/(this.applicationDetail.tHouseApplyProposer.members +1)); //人均宅基地面积
@@ -3952,6 +3954,18 @@ export default {
         this.$set(this.applicationDetail.ydjfsp, 'zjdzlpmwzt',resp.fileUrl);
       });
     },
+    fileUpdatePmt(val){
+      console.info(val)
+      const params = new FormData();
+      params.append("tableId", this.applicationDetail.ydjfys.id);
+      params.append("tableName", "t_homeapply_ydjfsq");
+      params.append("bizPath", "upload");
+      params.append("fileType", "0");
+      params.append('file', val.file);
+      attach(params).then((resp) => {
+        this.$set(this.applicationDetail.ydjfys, 'jgpmjt',resp.fileUrl);
+      });
+    },
     // 带平面图附件上传的镇级验收审批
     submitHouseApplyEndLocationplanOptions(pass, commentText) {
       return this.$refs.pictureUploadAccepting.updatePlanFiles()
@@ -4087,6 +4101,7 @@ export default {
         //     this.applicationDetail.tHouseApplyEnd.theGeom = this.convertGeom(this.applicationDetail.tHouseApproveNatureOptions.theGeom);
         //   }
         // }
+      console.info(this.applicationDetail);
         saveHomeBaseInfo(this.applicationDetail).then(resp => {
           if(submit)
           {
diff --git a/src/views/sunVillage_info/paidExit/paidExitList.vue b/src/views/sunVillage_info/paidExit/paidExitList.vue
index 5c82d4ce..02e924d9 100644
--- a/src/views/sunVillage_info/paidExit/paidExitList.vue
+++ b/src/views/sunVillage_info/paidExit/paidExitList.vue
@@ -49,6 +49,7 @@
 
 <script>
 import { getList, removeList, zyyctcApply } from "@/api/sunVillage_info/homestead/paidExit";
+import Cookies from "js-cookie";
 export default {
   name: "paidExit",
   data() {
@@ -64,6 +65,7 @@ export default {
       queryParams:{
         pageNum:1,
         pageSize:10,
+        deptId: Cookies.get('deptId'),
         orderByColumn:'createTime',
         isAsc:'desc',
         // 申请类型  1-宅基地退出
@@ -103,7 +105,6 @@ export default {
     getList(){
       setTimeout(() => {
         getList(this.queryParams).then(response => {
-          console.log(response)
           for (var i = 0; i < response.rows.length; i++) {
             response.rows[i].tclx = this.selectDictLabel(this.tcqllxStatus, response.rows[i].tclx)
             response.rows[i].tclx = this.selectDictLabel(this.tclxStatus, response.rows[i].tclx)
diff --git a/src/views/yinnong/homestead/supervision/supervisionAdd.vue b/src/views/yinnong/homestead/supervision/supervisionAdd.vue
index ea447237..fec7c600 100644
--- a/src/views/yinnong/homestead/supervision/supervisionAdd.vue
+++ b/src/views/yinnong/homestead/supervision/supervisionAdd.vue
@@ -213,6 +213,7 @@
                   sqrzjlx:item.shyqrdbzjlx,
                   sqrdh:item.dh,
                   gyfs:item.gyfs,
+                  zjddm:item.zjddm,
                   dz:item.dz,
                   deptId:item.deptId,
                   deptName:item.deptName,
@@ -243,12 +244,14 @@
         }
       },
       shyqrdmxmChange(val){
-        this.$set(this.jgList, "shyqrdbxm", val.shyqrdbxm);
+        console.info(val)
+        this.$set(this.jgList, "shyqrdbxm", val.sqrxm);
         this.$set(this.jgList, "deptId", val.deptId);
         this.$set(this.jgList, "deptName", val.deptId);
-        this.$set(this.jgList, "shyqrzjhm", val.shyqrdbzjhm);
-        this.$set(this.jgList, "shyqrzjlx", val.shyqrdbzjlx);
+        this.$set(this.jgList, "shyqrzjhm", val.sqrzjhm);
+        this.$set(this.jgList, "shyqrzjlx", val.sqrzjlx);
         this.$set(this.jgList, "shyqrdm", val.shyqrdm);
+        this.$set(this.jgList, "zjddm", val.zjddm);
         this.getObligeeOptions=[];
         this.showDropList = false;
       },