宅基地手机端优化

src/api/sunVillage_info/homestead/application.js

@@ -213,9 +213,9 @@ export function getQueryLand(id) {
 }
 
 //查询当前登录账号坐标
-export function getWorkflow() {
+export function getWorkflow(deptId) {
   return request({
-    url: '/home/mobile/workflow',
+    url: '/home/mobile/workflow?deptId='+deptId,
     method: 'get'
   })
 }

src/components/Map/MapGisObtainTc.vue

@@ -38,7 +38,6 @@ export default {
     drawingLyPaceCountryDarw() {
       //加载地图编辑
       var that = this;
-      console.info(this.shqrxm);
       selectHomesteadObligeeMapList({shyqrdbxm:this.shqrxm,landStatus:this.landStatus,deptId:this.deptId}).then((response) => {
         if (response.code == 200) {
 

src/views/sunVillage_info/arbitration/arbitrationList.vue

@@ -97,6 +97,7 @@ import { formatDate } from "element-ui/src/utils/date-util.js"
 import {Dialog, ImagePreview, Notify} from 'vant';
 import onlineHomeIndex from "@/views/onlineHomeIndex";
 import FieldDatePicker from "@/components/form/FieldDatePicker";
+import Cookies from "js-cookie";
 
 export default {
   components: {onlineHomeIndex,FieldDatePicker},
@@ -106,10 +107,12 @@ export default {
     return {
       list: [],
       total: 0,
+      idcard:null,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         orderByColumn: 'createTime',
+        deptId: Cookies.get('deptId'),
         isAsc: 'desc',
         disputeStatus: null,
       },
@@ -128,8 +131,11 @@ export default {
     if(this.$route.query.status === "0"){
       this.$set(this.queryParams, 'status', '0');
       this.cljgShow = true;
-
+    }else{
+      this.idcard = Cookies.get('idcard');
+      this.$set(this.queryParams, "shyqrzjhm", this.idcard);
     }
+
     this.initOptions();
     this.getList();
   },

src/views/sunVillage_info/homeApplication/applicationList.vue

@@ -81,6 +81,7 @@ export default {
       finished: false,
       refreshing: false,
       deptId:null,
+      idcard:null,
       total: 0,
       queryParams:{
         pageNum:1,
@@ -96,6 +97,7 @@ export default {
       this.houseApplyStatus = response.data;
     });
     this.deptId = Cookies.get('deptId')
+    this.idcard = Cookies.get('idcard')
     this.$set(this.queryParams, "deptId", this.deptId);
     this.$set(this.queryParams, "sqhhzsfzh", this.idcard);
     this.getList();

src/views/sunVillage_info/homeApplication/proposerLite.vue

@@ -678,7 +678,7 @@
                   <van-row type="flex" justify="space-between" align="center">
                     <van-col span="5">宅基地<br/>坐落平<br/>面位置图</van-col>
                     <van-col span="19">
-                      <MultiImageUploadComp :value="applicationDetail.ydjfsp.zjdzlpmwzt" :uploadDisabled="wztUpdate" @fileUpdate="fileUpdate"/>
+                      <MultiImageUploadComp :value="applicationDetail.ydjfsp.zjdzlpmwzt" :uploadDisabled="!wztUpdate" @fileUpdate="fileUpdate"/>
                       <van-row>
                         <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zckcryxm" label="踏勘人" placeholder="现场踏勘人员" input-align="left" label-width="auto"/></van-col>
                         <van-col span="12">
@@ -2079,16 +2079,16 @@ export default {
    if(this.type !== "add"){
      getHomeapplyydjfsqStatus(this.id).then(response => {
        this.region = response.data.region;
+       this.deptId = response.data.deptId;
+       console.info(response.data.deptId);
      });
+   }else{
+     this.deptId = this.sysFarmer.deptId;
    }
    if(this.type === "todo" || this.type === "done"){
      this.$set(this.sysFarmer, 'memberName',  this.$store.getters.nickName);
    }else{
      this.sysFarmer = JSON.parse(Cookies.get('user'));
-     listHomeapplytype({deptId:this.sysFarmer.deptId}).then(response => {
-       let _this = this;
-       _this.tytzList = response.rows;
-     });
    }
     console.info( this.sysFarmer);
     this.getFormIntent();
@@ -2120,12 +2120,12 @@ export default {
           this.proposerStatus = PROPOSER_EDIT;
         }
         allInformationWLHT(this.id).then(response => {
-          listHomeapplytype({deptId: response.data.deptId}).then(res => {
+          listHomeapplytype({deptId: response.data.deptId,status:"0"}).then(res => {
             this.tytzList = res.rows;
-            for (let i = 0; i < this.tytzList.length; i++) {
+            for (let i = 0; i < res.rows.length; i++) {
               //_this.infoList[i].push({text: response.rows[i].name, value: response.rows[i].code});
-              if(this.tytzList[i].id = response.data.tyhxt){
-                this.tytzName = this.tytzList[i].name;
+              if(res.rows[i].id === response.data.tyhxt){
+                this.tytzName = res.rows[i].name;
               }
             }
           });
@@ -2134,8 +2134,12 @@ export default {
       }
       else
       {
-        this.init();
-        this.getApplyerDetail(this.sysFarmer);
+        listHomeapplytype({deptId:this.sysFarmer.deptId,status:"0"}).then(response => {
+          let _this = this;
+          this.tytzList = response.rows;
+          this.init();
+          this.getApplyerDetail(this.sysFarmer);
+        });
       }
     },
     // 绘制申请地图
@@ -2143,8 +2147,10 @@ export default {
       this.$nextTick(() => {
         let map = this.$refs.pointDarwMap;
         if(data === null)
-          data = this.applicationDetail.ydjfkg.theGeomJson;
-        this.setMapData(map, data);
+          if(this.applicationDetail.ydjfkg != null){
+            data = this.applicationDetail.ydjfkg.theGeomJson;
+            this.setMapData(map, data);
+          }
       });
     },
     // 绘制验收地图
@@ -2288,6 +2294,7 @@ export default {
           if (this.type == 'done') {
             this.formVisible.editVisible = false;
           }
+          console.info(value);
           this.houseApplyUploadComp.full = true;
           this.houseApplyUploadComp.readonly = true;
           this.$set(this.houseApplyUploadComp, "proposerId", proposerId);
@@ -2481,13 +2488,18 @@ export default {
             if (this.applicationDetail.nsqzjdszn) neighbor.push(this.applicationDetail.nsqzjdszn);
             if (this.applicationDetail.nsqzjdszb) neighbor.push(this.applicationDetail.nsqzjdszb);
             neighbor = neighbor.join('、');
-            console.info(this.form)
-            let defaultVillageOption = this.form.villageOption
-              .replaceAll('{sqhhzxm}', this.applicationDetail.sqhhzxm)
-              .replaceAll('{nsqzjddz}', this.applicationDetail.nsqzjddz)
-              .replaceAll('{isAdvice}', neighbor);
-            this.$set(this.applicationDetail, 'cjxzscyj', defaultVillageOption);
-            this.$set(this.applicationDetail, 'cjxzscsj', handlerTime);
+            if(this.applicationDetail.cjxzscyj != null && this.applicationDetail.cjxzscyj !== "" ){
+              this.$set(this.applicationDetail, 'cjxzscyj', this.applicationDetail.cjxzscyj);
+              this.$set(this.applicationDetail, 'cjxzscsj', this.applicationDetail.cjxzscsj);
+            }else{
+              let defaultVillageOption = this.form.villageOption
+                .replaceAll('{sqhhzxm}', this.applicationDetail.sqhhzxm)
+                .replaceAll('{nsqzjddz}', this.applicationDetail.nsqzjddz)
+                .replaceAll('{isAdvice}', neighbor);
+              this.$set(this.applicationDetail, 'cjxzscyj', defaultVillageOption);
+              this.$set(this.applicationDetail, 'cjxzscsj', handlerTime);
+            }
+
           }
             // 申请-镇级审批
             // else if(this.isProposeStatus(homeApplyStatus, ["19"]))
@@ -2755,8 +2767,8 @@ export default {
             }
           }
           // 禁用/启用
-          this.formEnabled.baseApplyForm.groupFormEnabled = hasGroupLevel && this.isProposeStatus(homeApplyStatus, ['32']) && this.isInRoles(role, 'village_group_leader');
-          this.formEnabled.baseApplyForm.villageFormEnabled = this.isProposeStatus(homeApplyStatus, ["31"]) && this.isInRoles(role, 'village_leader');
+          this.formEnabled.baseApplyForm.groupFormEnabled = hasGroupLevel && this.isProposeStatus(homeApplyStatus, ["12",'32',"72"]) && this.isInRoles(role, 'village_group_leader');
+          this.formEnabled.baseApplyForm.villageFormEnabled = this.isProposeStatus(homeApplyStatus, ["14","34","74"]) && this.isInRoles(role, 'village_leader');
           // //驳回时审批意见及签名清空
           // if(this.formEnabled.baseApplyForm.villageFormEnabled){
           //   this.applicationDetail.tHouseApproveVillageOptions.villageLeader = null;
@@ -2901,18 +2913,18 @@ export default {
           this.houseApplyUploadComp.readonly = false;
           this.houseApplyUploadComp.homeApplyStatus = '11';
           this.houseApplyUploadComp.proposerId = -1;
-
+          this.$nextTick(()=>{
+            getWorkflow(this.sysFarmer.deptId).then((resp) => {
+              this.$set(this.applicationDetail, 'proposerActiveIndex', 0);
+              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);
+            });
+          })
           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;
       }
@@ -3183,6 +3195,7 @@ export default {
     },
     // 初次申请草稿的附件上传
     onUploadFinished(fileIdList) {
+      console.info(fileIdList);
       this.$set(this.applicationDetail, "fileList", fileIdList);
     },
     // 获取申请人信息
@@ -3418,18 +3431,18 @@ export default {
               if (msg) {
                 break;
               }
-
               comment = this.applicationDetail.ydjfsp.nyncbmscyj;
               // if(this.$refs.pictureUploadApplyingTHouseApproveAgriculture && this.$refs.pictureUploadApplyingTHouseApproveAgriculture.isValid()) {
               //   this.submitHouseApproveAgricultureOptions().then(item=>{
                   if (msg) {
                     return;
                   }
-                    saveHomeBaseInfo(_this.applicationDetail).then((response) => {
-                      _this.complete(pass, comment);
+
+                    saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                      this.complete(pass, comment);
                     }).catch(resp => {
-                      _this.notify(msg, 'danger');
-                      _this.notify("保存失败!", 'danger');
+                      this.notify(msg, 'danger');
+                      this.notify("保存失败!", 'danger');
                     });
                 // });
               // } else {
@@ -3445,11 +3458,11 @@ export default {
               // if(this.$refs.pictureUploadApplyingTHouseApproveOther && this.$refs.pictureUploadApplyingTHouseApproveOther.isValid()) {
                 // this.submitHouseApproveOtherOptions().then(item=>{
                 //   setTimeout(() => {
-                    saveHomeBaseInfo(_this.applicationDetail).then((response) => {
-                      _this.complete(pass, comment);
+                    saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                      this.complete(pass, comment);
                     }).catch(resp => {
-                      _this.notify(msg, 'danger');
-                      _this.notify("保存失败!", 'danger');
+                      this.notify(msg, 'danger');
+                      this.notify("保存失败!", 'danger');
                     });
                 //   }, 500);
                 // });
@@ -3470,11 +3483,11 @@ export default {
               this.$set(this.applicationDetail, 'tHouseApproveOtherOptions', null);
               this.$set(this.applicationDetail, 'tHouseApproveAgricultureOptions', null);
               comment = this.applicationDetail.ydjfsp.zrzybmscyj;
-              saveHomeBaseInfo(_this.applicationDetail).then((response) => {
-                      _this.complete(pass, comment);
+              saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                      this.complete(pass, comment);
                     }).catch(resp => {
-                      _this.notify(msg, 'danger');
-                      _this.notify("保存失败!", 'danger');
+                      this.notify(msg, 'danger');
+                      this.notify("保存失败!", 'danger');
                     });
               break;
             case "town_leader":
@@ -3517,18 +3530,18 @@ export default {
                                 // _this.submitHouseApproveLocationplanOptions(pass, comment).then(item5=>{
                                   // _this.submitHouseApproveNatureplanOptions().then(item6=>{
                                   //   setTimeout(() => {
-                                      saveHomeBaseInfo(_this.applicationDetail).then((response) => {
-                                        _this.complete(pass, comment);
+                                      saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                                        this.complete(pass, comment);
                                       }).catch(resp => {
-                                        _this.notify(msg, 'danger');
-                                        _this.notify("保存失败!", 'danger');
+                                        this.notify(msg, 'danger');
+                                        this.notify("保存失败!", 'danger');
                                       });
                                     // }, 500);
                                   // });
                                 // });
                               }else{
-                                  _this.notify("宅基地坐落平面位置图不能为空", 'danger');
-                                  _this.$refs.form.validate().then(() => {}).catch((e)=>{})
+                                this.notify("宅基地坐落平面位置图不能为空", 'danger');
+                                this.$refs.form.validate().then(() => {}).catch((e)=>{})
                               }
                             // });
                           // } else {
@@ -3563,11 +3576,11 @@ export default {
                 return;
               } else {
                   setTimeout(() => {
-                    saveHomeBaseInfo(_this.applicationDetail).then((response) => {
-                      _this.complete(pass, comment);
+                    saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                      this.complete(pass, comment);
                     }).catch(resp => {
-                      _this.notify(msg, 'danger');
-                      _this.notify("保存失败!", 'danger');
+                      this.notify(msg, 'danger');
+                      this.notify("保存失败!", 'danger');
                     });
                   }, 500);
               }
@@ -3607,8 +3620,8 @@ export default {
               break;
           }
           if (msg) {
-            _this.notify(msg, 'danger');
-            _this.$refs.form.validate().then(() => {}).catch((e)=>{})
+            this.notify(msg, 'danger');
+            this.$refs.form.validate().then(() => {}).catch((e)=>{})
             return;
           }
         }
@@ -3625,11 +3638,11 @@ export default {
                 this.applicationDetail.ydjfkg.theGeomJson = this.convertGeom(this.applicationDetail.ydjfkg.theGeom);
               }
             }
-            saveHomeBaseInfo(_this.applicationDetail).then((response) => {
-              _this.complete(pass);
+            saveHomeBaseInfo(this.applicationDetail).then((response) => {
+              this.complete(pass);
             }).catch(resp => {
-              _this.notify(msg, 'danger');
-              _this.notify("保存失败!", 'danger');
+              this.notify(msg, 'danger');
+              this.notify("保存失败!", 'danger');
             });
           }else{
             this.complete(pass);
@@ -3645,11 +3658,11 @@ export default {
               if (msg) {
                 break;
               }
-              comment = _this.applicationDetail.ydjfys.nyncbmysyj;
-                  saveHomeBaseInfo(_this.applicationDetail).then((response) => {
-                    _this.complete(pass, comment);
+              comment = this.applicationDetail.ydjfys.nyncbmysyj;
+                  saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                    this.complete(pass, comment);
                   }).catch(err => {
-                    _this.notify('保存失败', 'danger');
+                    this.notify('保存失败', 'danger');
                   });
 
               break;
@@ -3659,10 +3672,10 @@ export default {
                 break;
               }
               comment = this.applicationDetail.ydjfys.zrzybmysyj;
-              saveHomeBaseInfo(_this.applicationDetail).then((response) => {
-                    _this.complete(pass, comment);
+              saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                    this.complete(pass, comment);
                   }).catch(err => {
-                    _this.notify('保存失败', 'danger');
+                    this.notify('保存失败', 'danger');
                   });
               break;
             case "town_leader":
@@ -3671,11 +3684,11 @@ export default {
                 break;
               }
               comment = this.applicationDetail.ydjfys.xzzfysyj;
-                if (_this.$refs.pictureUploadAccepting && _this.$refs.pictureUploadAccepting.isValid()) {
-                  saveHomeBaseInfo(_this.applicationDetail).then((response) => {
-                        _this.complete(pass, comment);
+                if (this.$refs.pictureUploadAccepting && _this.$refs.pictureUploadAccepting.isValid()) {
+                        saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                        this.complete(pass, comment);
                       }).catch(err => {
-                        _this.notify('保存失败', 'danger');
+                        this.notify('保存失败', 'danger');
                       });
                 }else{
                   if (this.checkString(this.applicationDetail.tHouseApplyEnd.locationPlan)) {
@@ -4036,6 +4049,7 @@ export default {
         params: data,
       }).then((response) => {
         this.notify("操作成功", 'success');
+        this.$router.go(0);
         this.goBack();
       }).catch(e => {
         this.notify("操作失败!", 'danger');
@@ -4165,7 +4179,7 @@ export default {
         })
       }
       else {
-        this.deptId = this.sysFarmer.deptId;
+        console.info(this.deptId);
         getQueryLand(this.deptId).then((response) => {
           if (response.code == 200) {
             let InsertCode = response.data;
@@ -4663,7 +4677,7 @@ export default {
       return false;
     },
     onConfirmTytz(val){
-      this.$set(this.applicationDetail, 'tyhxt', val.value);
+      this.$set(this.applicationDetail, 'tyhxt', val.id);
       this.tytzName = val.name;
       this.showTyt = false;
     },

src/views/sunVillage_info/login_code.vue

@@ -70,6 +70,7 @@
           memberName:'',
           idcard:'',
           bookId:'',
+          deptId:null,
           rememberMe:false
         },
         loading: false,
@@ -83,7 +84,7 @@
     created() {
       this.height = document.body.clientHeight
       this.getCookie();
-      this.formData.bookId = Cookies.get('bookId');
+      this.formData.deptId = Cookies.get('deptId');
     },
     methods: {
       getCookie() {

src/views/sunVillage_info/paidExit/paidExitList.vue

@@ -69,6 +69,7 @@ export default {
       auditStatus:[],
       loading: false,
       finished: false,
+      idcard:null,
       queryParams:{
         pageNum:1,
         pageSize:10,
@@ -92,6 +93,8 @@ export default {
     this.houseGetDicts("tcfs").then((res) => {
       this.tcfsStatus = res.data;
     });
+    this.idcard = Cookies.get('idcard');
+    this.$set(this.queryParams, "sqrzjhm", this.idcard);
     this.houseGetDicts("yctcsp_status").then((res) => {
       // this.auditStatus = res.data;
       let _this = this;

src/views/yinnong/my.vue

@@ -155,9 +155,9 @@
       },
       methods: {
         logout(){
-          logout().then(res => {
+          this.$store.dispatch('LogOut').then(() => {
             this.$router.push({path:"../yinnongLogin"})
-          })
+          });
         },
         sunVillage(){
           this.$router.push({path:"../sunVillage_info/index"})