diff --git a/src/api/sunVillage_info/otherOpen.js b/src/api/sunVillage_info/otherOpen.js index 305363f7..6f46afd1 100644 --- a/src/api/sunVillage_info/otherOpen.js +++ b/src/api/sunVillage_info/otherOpen.js @@ -46,19 +46,18 @@ export function delOther(id) { // 查询其他公开列表 游客 export function otherOpenList(query) { return request({ - url: '/open/villageAffairs/public/otherOpenList', + url: '/open/villageAffairs/public/otherPublicList', method: 'get', params: query }) } // 查询其他公开详细 游客 -export function otherOpenDetail(bookId, id) { +export function otherOpenDetail(id) { return request({ - url: '/open/villageAffairs/public/otherOpenDetail', + url: '/open/villageAffairs/public/otherPublicDetail', method: 'get', params: { - bookId, id, }, }) diff --git a/src/assets/images/sunVillage_info/index_block_zonghegongkai.png b/src/assets/images/sunVillage_info/index_block_zonghegongkai.png new file mode 100644 index 00000000..b12f4364 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_zonghegongkai.png differ diff --git a/src/assets/images/sunVillage_info/index_code_btn_zonghegongkai.png b/src/assets/images/sunVillage_info/index_code_btn_zonghegongkai.png new file mode 100644 index 00000000..9f8bca40 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_code_btn_zonghegongkai.png differ diff --git a/src/views/sunVillage_info/index_code.vue b/src/views/sunVillage_info/index_code.vue index 21f339db..0d2aa9af 100644 --- a/src/views/sunVillage_info/index_code.vue +++ b/src/views/sunVillage_info/index_code.vue @@ -98,7 +98,6 @@ import {bookListByDept} from "@/api/onlineHome/villageAffairs"; //账套列表 bookVisbile:false, bookList:[], - bookName:"", bookId:"", book:"", diff --git a/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue b/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue index 3ec8a69f..0e017ab8 100644 --- a/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue +++ b/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue @@ -107,19 +107,19 @@ intent: null, content: '', otherTypeOptions: [], - type: null, + otherType: null, title: '综合公开', }; }, created() { this.id = this.$route.query.id; this.intent = this.$route.query.intent; - this.type = this.$route.query.type; + this.otherType = this.$route.query.otherType; if(this.isEdit) this.getDetail(); else { - this.form.otherType = this.$route.query.type; + this.form.otherType = this.$route.query.otherType; this.getDicts('other_gk_type').then((resp) => { this.otherTypeOptions = resp.data; const dict = resp.data.find((x) => x.dictValue == this.form.otherType); @@ -191,7 +191,7 @@ return this.intent === 'edit' ? '编辑' : '新增'; }, showTypeSelector() { - return this.isAdd && !this.type; + return this.isAdd && !this.otherType; }, }, } diff --git a/src/views/sunVillage_info/otherOpen/otherOpenList.vue b/src/views/sunVillage_info/otherOpen/otherOpenList.vue index 63bbf5de..84808d1d 100644 --- a/src/views/sunVillage_info/otherOpen/otherOpenList.vue +++ b/src/views/sunVillage_info/otherOpen/otherOpenList.vue @@ -93,7 +93,7 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets"; }; }, created() { - this.queryParams.otherType = this.$route.query.type || ''; + this.queryParams.otherType = this.$route.query.otherType || ''; this.getDicts('other_gk_type').then((resp) => { let arr = []; arr.push({ @@ -135,28 +135,28 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets"; intent: 'view', }; if(this.queryParams.otherType) - parms.type = this.queryParams.otherType; + parms.otherType = this.queryParams.otherType; this.$router.push({ name: 'otherOpenDetail', query: parms, }).catch(() => {}); }, 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() { let parms = { intent: 'add', }; if(this.queryParams.otherType) - parms.type = this.queryParams.otherType; + parms.otherType = this.queryParams.otherType; this.$router.push({ name: 'otherOpenEdit', query: parms, }).catch(() => {}); }, 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) { let parms = { @@ -164,14 +164,14 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets"; intent: 'edit', }; if(this.queryParams.otherType) - parms.type = this.queryParams.otherType; + parms.otherType = this.queryParams.otherType; this.$router.push({ name: 'otherOpenEdit', query: parms, }).catch(() => {}); }, 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) { Dialog.confirm({ diff --git a/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue b/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue index 92bd31b1..f71cefef 100644 --- a/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue +++ b/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue @@ -90,7 +90,7 @@ return; } - otherOpenDetail(this.bookId, this.id).then((resp) => { + otherOpenDetail(this.id).then((resp) => { this.form = resp.data; this.getDicts('other_gk_type').then((resp) => { const dict = resp.data.find((x) => x.dictValue == this.form.otherType); diff --git a/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue b/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue index ac6129ea..36934d60 100644 --- a/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue +++ b/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue @@ -97,7 +97,7 @@ import Cookies from "js-cookie"; return; } - this.queryParams.otherType = this.$route.query.type || ''; + this.queryParams.otherType = this.$route.query.otherType || ''; this.getDicts('other_gk_type').then((resp) => { let arr = []; arr.push({ @@ -139,14 +139,14 @@ import Cookies from "js-cookie"; intent: 'view', }; if(this.queryParams.otherType) - parms.type = this.queryParams.otherType; + parms.otherType = this.queryParams.otherType; this.$router.push({ name: 'otherOpenVisitDetail', query: parms, }).catch(() => {}); }, 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() { this.$router.replace('/sunVillage_info/otherOpenVisitIndex', () => this.$router.back(), () => this.$router.back() );