Browse Source

网上家园修复用户登出 宅基地保存并提交功能

wulanhaote
zhao 3 years ago
parent
commit
a89742253c
2 changed files with 11 additions and 6 deletions
  1. +6
    -3
      src/views/onlineHome/homestead/homeApplication/proposerLite.vue
  2. +5
    -3
      src/views/onlineHome/my.vue

+ 6
- 3
src/views/onlineHome/homestead/homeApplication/proposerLite.vue View File

@@ -1085,7 +1085,7 @@ export default {
},
// 通用设置地图数据函数
setMapData(map, data) {
console.log(map, data ? true : false);
//console.log(map, data ? true : false);
if(!map) return;
if(data)
{
@@ -1423,7 +1423,7 @@ export default {
this.formEnabled.baseApplyForm.groupFormEnabled = hasGroupLevel && this.isProposeStatus(houseApplyStatus, ['32']) && this.isInRoles(role, 'village_group_leader');
this.formEnabled.baseApplyForm.villageFormEnabled = this.isProposeStatus(houseApplyStatus, ["31"]) && this.isInRoles(role, 'village_leader');
this.formEnabled.baseApplyForm.townFormEnabled = this.isProposeStatus(houseApplyStatus, ['8']) && this.isInRoles(role, 'town_leader');
console.log(this.isProposeStatus(houseApplyStatus, ['8']) && this.isInRoles(role, 'town_leader')+'11111111');
//console.log(this.isProposeStatus(houseApplyStatus, ['8']) && this.isInRoles(role, 'town_leader')+'11111111');
this.formEnabled.landscopeEnabled = this.isProposeStatus(houseApplyStatus, ['10', '12']);
this.formEnabled.landscopeForm.baseFormEnabled = this.isProposeStatus(houseApplyStatus, ['10', '12']);

@@ -1773,7 +1773,10 @@ export default {
console.log("进行保存", this.applicationDetail);
saveHouseBaseInfo(this.applicationDetail).then((response) => {
if(submit)
{
this.id = response.data;
this.submitApplyProposer();
}
else
{
this.notify("保存成功", 'success');
@@ -2097,7 +2100,7 @@ export default {
{
this.selectedTabName = index;
}
console.log(index, this.active,this.selectedTabName);
//console.log(index, this.active,this.selectedTabName);
},
// 保存开工(是否提交)
startProposerApply(submit) {


+ 5
- 3
src/views/onlineHome/my.vue View File

@@ -97,7 +97,6 @@
<script>
import onlineHomeIndex from "../onlineHomeIndex";
import {getInfo, logout} from "../../api/login";
import request from '@/utils/request'
export default {
components: {
onlineHomeIndex
@@ -124,9 +123,12 @@
},
methods: {
logout(){
logout().then(res => {
/*logout().then(res => {
this.$router.push({path:"../onlineHomeLogin"})
})
})*/
this.$store.dispatch('LogOut').then(() => {
this.$router.push({path:"../onlineHomeLogin"})
});
}
},
}


Loading…
Cancel
Save