@@ -46,19 +46,18 @@ export function delOther(id) { | |||||
// 查询其他公开列表 游客 | // 查询其他公开列表 游客 | ||||
export function otherOpenList(query) { | export function otherOpenList(query) { | ||||
return request({ | return request({ | ||||
url: '/open/villageAffairs/public/otherOpenList', | |||||
url: '/open/villageAffairs/public/otherPublicList', | |||||
method: 'get', | method: 'get', | ||||
params: query | params: query | ||||
}) | }) | ||||
} | } | ||||
// 查询其他公开详细 游客 | // 查询其他公开详细 游客 | ||||
export function otherOpenDetail(bookId, id) { | |||||
export function otherOpenDetail(id) { | |||||
return request({ | return request({ | ||||
url: '/open/villageAffairs/public/otherOpenDetail', | |||||
url: '/open/villageAffairs/public/otherPublicDetail', | |||||
method: 'get', | method: 'get', | ||||
params: { | params: { | ||||
bookId, | |||||
id, | id, | ||||
}, | }, | ||||
}) | }) | ||||
@@ -98,7 +98,6 @@ import {bookListByDept} from "@/api/onlineHome/villageAffairs"; | |||||
//账套列表 | //账套列表 | ||||
bookVisbile:false, | bookVisbile:false, | ||||
bookList:[], | bookList:[], | ||||
bookName:"", | |||||
bookId:"", | bookId:"", | ||||
book:"", | book:"", | ||||
@@ -107,19 +107,19 @@ | |||||
intent: null, | intent: null, | ||||
content: '', | content: '', | ||||
otherTypeOptions: [], | otherTypeOptions: [], | ||||
type: null, | |||||
otherType: null, | |||||
title: '综合公开', | title: '综合公开', | ||||
}; | }; | ||||
}, | }, | ||||
created() { | created() { | ||||
this.id = this.$route.query.id; | this.id = this.$route.query.id; | ||||
this.intent = this.$route.query.intent; | this.intent = this.$route.query.intent; | ||||
this.type = this.$route.query.type; | |||||
this.otherType = this.$route.query.otherType; | |||||
if(this.isEdit) | if(this.isEdit) | ||||
this.getDetail(); | this.getDetail(); | ||||
else | else | ||||
{ | { | ||||
this.form.otherType = this.$route.query.type; | |||||
this.form.otherType = this.$route.query.otherType; | |||||
this.getDicts('other_gk_type').then((resp) => { | this.getDicts('other_gk_type').then((resp) => { | ||||
this.otherTypeOptions = resp.data; | this.otherTypeOptions = resp.data; | ||||
const dict = resp.data.find((x) => x.dictValue == this.form.otherType); | const dict = resp.data.find((x) => x.dictValue == this.form.otherType); | ||||
@@ -191,7 +191,7 @@ | |||||
return this.intent === 'edit' ? '编辑' : '新增'; | return this.intent === 'edit' ? '编辑' : '新增'; | ||||
}, | }, | ||||
showTypeSelector() { | showTypeSelector() { | ||||
return this.isAdd && !this.type; | |||||
return this.isAdd && !this.otherType; | |||||
}, | }, | ||||
}, | }, | ||||
} | } | ||||
@@ -93,7 +93,7 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets"; | |||||
}; | }; | ||||
}, | }, | ||||
created() { | created() { | ||||
this.queryParams.otherType = this.$route.query.type || ''; | |||||
this.queryParams.otherType = this.$route.query.otherType || ''; | |||||
this.getDicts('other_gk_type').then((resp) => { | this.getDicts('other_gk_type').then((resp) => { | ||||
let arr = []; | let arr = []; | ||||
arr.push({ | arr.push({ | ||||
@@ -135,28 +135,28 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets"; | |||||
intent: 'view', | intent: 'view', | ||||
}; | }; | ||||
if(this.queryParams.otherType) | if(this.queryParams.otherType) | ||||
parms.type = this.queryParams.otherType; | |||||
parms.otherType = this.queryParams.otherType; | |||||
this.$router.push({ | this.$router.push({ | ||||
name: 'otherOpenDetail', | name: 'otherOpenDetail', | ||||
query: parms, | query: parms, | ||||
}).catch(() => {}); | }).catch(() => {}); | ||||
}, | }, | ||||
viewItem(id){ | viewItem(id){ | ||||
this.$router.replace(`/sunVillage_info/otherOpenIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoViewItem(id), () => this.gotoViewItem(id) ); | |||||
this.$router.replace(`/sunVillage_info/otherOpenIndex?otherType=${this.queryParams.otherType || ''}`, () => this.gotoViewItem(id), () => this.gotoViewItem(id) ); | |||||
}, | }, | ||||
gotoAdd() { | gotoAdd() { | ||||
let parms = { | let parms = { | ||||
intent: 'add', | intent: 'add', | ||||
}; | }; | ||||
if(this.queryParams.otherType) | if(this.queryParams.otherType) | ||||
parms.type = this.queryParams.otherType; | |||||
parms.otherType = this.queryParams.otherType; | |||||
this.$router.push({ | this.$router.push({ | ||||
name: 'otherOpenEdit', | name: 'otherOpenEdit', | ||||
query: parms, | query: parms, | ||||
}).catch(() => {}); | }).catch(() => {}); | ||||
}, | }, | ||||
add() { | add() { | ||||
this.$router.replace(`/sunVillage_info/otherOpenIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoAdd(), () => this.gotoAdd() ); | |||||
this.$router.replace(`/sunVillage_info/otherOpenIndex?otherType=${this.queryParams.otherType || ''}`, () => this.gotoAdd(), () => this.gotoAdd() ); | |||||
}, | }, | ||||
gotoEdit(id) { | gotoEdit(id) { | ||||
let parms = { | let parms = { | ||||
@@ -164,14 +164,14 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets"; | |||||
intent: 'edit', | intent: 'edit', | ||||
}; | }; | ||||
if(this.queryParams.otherType) | if(this.queryParams.otherType) | ||||
parms.type = this.queryParams.otherType; | |||||
parms.otherType = this.queryParams.otherType; | |||||
this.$router.push({ | this.$router.push({ | ||||
name: 'otherOpenEdit', | name: 'otherOpenEdit', | ||||
query: parms, | query: parms, | ||||
}).catch(() => {}); | }).catch(() => {}); | ||||
}, | }, | ||||
edit(id) { | edit(id) { | ||||
this.$router.replace(`/sunVillage_info/otherOpenIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoEdit(id), () => this.gotoEdit(id) ); | |||||
this.$router.replace(`/sunVillage_info/otherOpenIndex?otherType=${this.queryParams.otherType || ''}`, () => this.gotoEdit(id), () => this.gotoEdit(id) ); | |||||
}, | }, | ||||
remove(id) { | remove(id) { | ||||
Dialog.confirm({ | Dialog.confirm({ | ||||
@@ -90,7 +90,7 @@ | |||||
return; | return; | ||||
} | } | ||||
otherOpenDetail(this.bookId, this.id).then((resp) => { | |||||
otherOpenDetail(this.id).then((resp) => { | |||||
this.form = resp.data; | this.form = resp.data; | ||||
this.getDicts('other_gk_type').then((resp) => { | this.getDicts('other_gk_type').then((resp) => { | ||||
const dict = resp.data.find((x) => x.dictValue == this.form.otherType); | const dict = resp.data.find((x) => x.dictValue == this.form.otherType); | ||||
@@ -97,7 +97,7 @@ import Cookies from "js-cookie"; | |||||
return; | return; | ||||
} | } | ||||
this.queryParams.otherType = this.$route.query.type || ''; | |||||
this.queryParams.otherType = this.$route.query.otherType || ''; | |||||
this.getDicts('other_gk_type').then((resp) => { | this.getDicts('other_gk_type').then((resp) => { | ||||
let arr = []; | let arr = []; | ||||
arr.push({ | arr.push({ | ||||
@@ -139,14 +139,14 @@ import Cookies from "js-cookie"; | |||||
intent: 'view', | intent: 'view', | ||||
}; | }; | ||||
if(this.queryParams.otherType) | if(this.queryParams.otherType) | ||||
parms.type = this.queryParams.otherType; | |||||
parms.otherType = this.queryParams.otherType; | |||||
this.$router.push({ | this.$router.push({ | ||||
name: 'otherOpenVisitDetail', | name: 'otherOpenVisitDetail', | ||||
query: parms, | query: parms, | ||||
}).catch(() => {}); | }).catch(() => {}); | ||||
}, | }, | ||||
viewItem(id){ | viewItem(id){ | ||||
this.$router.replace(`/sunVillage_info/otherOpenVisitIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoViewItem(id), () => this.gotoViewItem(id) ); | |||||
this.$router.replace(`/sunVillage_info/otherOpenVisitIndex?otherType=${this.queryParams.otherType || ''}`, () => this.gotoViewItem(id), () => this.gotoViewItem(id) ); | |||||
}, | }, | ||||
back() { | back() { | ||||
this.$router.replace('/sunVillage_info/otherOpenVisitIndex', () => this.$router.back(), () => this.$router.back() ); | this.$router.replace('/sunVillage_info/otherOpenVisitIndex', () => this.$router.back(), () => this.$router.back() ); | ||||