Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

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/add2.vue

@@ -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

@@ -350,7 +350,7 @@ export default {
       const ids = val.id || this.ids;
       Dialog.confirm({
         title: '系统提示',
-        message: '是否确认删除自然幢标识为"' + val.id + '"的数据项?',
+        message: '是否确认删除自然幢号数据项?',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })

src/views/homesteadSurvey/add4.vue

@@ -388,7 +388,7 @@ export default {
       const ids = val.id || this.ids;
       Dialog.confirm({
         title: '系统提示',
-        message: '是否确认删除附属物标识为"' + val.id + '"的数据项?',
+        message: '是否确认删除附属物的数据项?',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })

src/views/homesteadSurvey/nmfwList.vue

@@ -299,7 +299,7 @@ export default {
       const ids = val.id || this.ids;
       Dialog.confirm({
         title: '系统提示',
-        message: '是否确认删除农民房屋标识为"' + val.id + '"的数据项?',
+        message: '是否确认删除农民房屋数据项?',
         confirmButtonText: '确定',
         cancelButtonText: '取消'
       })

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;