From e3b59e29e21e6be248dad3b8e66233d99620ba75 Mon Sep 17 00:00:00 2001 From: zhaodengke Date: Thu, 5 Dec 2024 14:47:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Task=20=E7=BB=BC=E5=90=88=E5=85=AC=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sunVillage_info/otherOpen.js | 45 +++ src/router/index.js | 27 ++ src/views/sunVillage_info/index_code.vue | 32 +- .../list_tourists_registration_add.vue | 6 +- .../list_tourists_registration_edit.vue | 6 +- .../otherOpen/otherOpenDetail.vue | 179 +++++++++ .../otherOpen/otherOpenEdit.vue | 259 ++++++++++++ .../otherOpen/otherOpenList.vue | 379 ++++++++++++++++++ .../registration/registrationEdit.vue | 8 +- 9 files changed, 927 insertions(+), 14 deletions(-) create mode 100644 src/api/sunVillage_info/otherOpen.js create mode 100644 src/views/sunVillage_info/otherOpen/otherOpenDetail.vue create mode 100644 src/views/sunVillage_info/otherOpen/otherOpenEdit.vue create mode 100644 src/views/sunVillage_info/otherOpen/otherOpenList.vue diff --git a/src/api/sunVillage_info/otherOpen.js b/src/api/sunVillage_info/otherOpen.js new file mode 100644 index 00000000..957f0004 --- /dev/null +++ b/src/api/sunVillage_info/otherOpen.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 查询其他公开列表 +export function listOther(query) { + return request({ + url: '/subcontract/other/list', + method: 'get', + params: query + }) +} + +// 查询其他公开详细 +export function getOther(id) { + return request({ + url: '/subcontract/other/get/' + id, + method: 'get' + }) +} + +// 新增其他公开 +export function addOther(data) { + return request({ + url: '/subcontract/other/add', + method: 'post', + data: data + }) +} + +// 修改其他公开 +export function updateOther(data) { + return request({ + url: '/subcontract/other/edit', + method: 'post', + data: data + }) +} + +// 删除其他公开 +export function delOther(id) { + return request({ + url: '/subcontract/other/remove/' + id, + method: 'get' + }) +} + diff --git a/src/router/index.js b/src/router/index.js index 37044daf..447c1b5f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3795,6 +3795,33 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/registration/registrationEdit'], resolve) }, + { ////阳光村务（新）-- 综合公开 + path: '/sunVillage_info/otherOpenIndex', + name: 'otherOpenIndex', + meta: { + title: '综合公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenList'], resolve) + }, + { ////阳光村务（新）-- 综合公开详情 + path: '/sunVillage_info/otherOpenDetail', + name: 'otherOpenDetail', + meta: { + title: '综合公开详情', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenDetail'], resolve) + }, + { ////阳光村务（新）-- 新增/编辑综合公开 + path: '/sunVillage_info/otherOpenEdit', + name: 'otherOpenEdit', + meta: { + title: '编辑综合公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenEdit'], resolve) + }, { ////阳光村务（新）-- 发包方审核 path: '/sunVillage_info/list_employer_process', diff --git a/src/views/sunVillage_info/index_code.vue b/src/views/sunVillage_info/index_code.vue index 33cd32b5..c5bf7fdd 100644 --- a/src/views/sunVillage_info/index_code.vue +++ b/src/views/sunVillage_info/index_code.vue @@ -5,7 +5,10 @@
{{deptName}}
-
{{bookName}}
+
{{bookName}}
+ + +
@@ -65,7 +68,7 @@
diff --git a/src/views/sunVillage_info/list_tourists_registration_add.vue b/src/views/sunVillage_info/list_tourists_registration_add.vue index 6c3c365f..0e6fde90 100644 --- a/src/views/sunVillage_info/list_tourists_registration_add.vue +++ b/src/views/sunVillage_info/list_tourists_registration_add.vue @@ -36,7 +36,7 @@ :border="false" > - + - + - + diff --git a/src/views/sunVillage_info/list_tourists_registration_edit.vue b/src/views/sunVillage_info/list_tourists_registration_edit.vue index 7cb5d01a..b079f517 100644 --- a/src/views/sunVillage_info/list_tourists_registration_edit.vue +++ b/src/views/sunVillage_info/list_tourists_registration_edit.vue @@ -36,7 +36,7 @@ :border="false" > - + - + - + diff --git a/src/views/sunVillage_info/otherOpen/otherOpenDetail.vue b/src/views/sunVillage_info/otherOpen/otherOpenDetail.vue new file mode 100644 index 00000000..193ba420 --- /dev/null +++ b/src/views/sunVillage_info/otherOpen/otherOpenDetail.vue @@ -0,0 +1,179 @@ + + + diff --git a/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue b/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue new file mode 100644 index 00000000..8870c9b0 --- /dev/null +++ b/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue @@ -0,0 +1,259 @@ + + + diff --git a/src/views/sunVillage_info/otherOpen/otherOpenList.vue b/src/views/sunVillage_info/otherOpen/otherOpenList.vue new file mode 100644 index 00000000..656240cf --- /dev/null +++ b/src/views/sunVillage_info/otherOpen/otherOpenList.vue @@ -0,0 +1,379 @@ + + + + + diff --git a/src/views/sunVillage_info/registration/registrationEdit.vue b/src/views/sunVillage_info/registration/registrationEdit.vue index 45264d40..f52ef9c4 100644 --- a/src/views/sunVillage_info/registration/registrationEdit.vue +++ b/src/views/sunVillage_info/registration/registrationEdit.vue @@ -30,7 +30,7 @@ :border="false" > - + - + - + @@ -69,7 +69,7 @@ import FieldDatePicker from "@/components/form/FieldDatePicker.vue"; import {Toast} from "vant"; export default { - name: "registrationDetail", + name: "registrationEdit", components: {FieldDatePicker, CommonUpload}, data() { return { From c2c110b264f7f078e7cb22ace4735a31bca47fdd Mon Sep 17 00:00:00 2001 From: zhaodengke Date: Thu, 5 Dec 2024 15:48:34 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Task=20=E7=BB=BC=E5=90=88=E5=85=AC=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/onlineHome/villageAffairs.js | 11 + src/api/sunVillage_info/otherOpen.js | 21 + src/components/common/PagedList.vue | 13 + src/permission.js | 2 + src/router/index.js | 18 + src/views/sunVillage_info/index_code.vue | 8 +- .../otherOpen/otherOpenDetail.vue | 1 - .../otherOpen/otherOpenList.vue | 35 +- .../otherOpen/otherOpenVisitDetail.vue | 187 +++++++++ .../otherOpen/otherOpenVisitList.vue | 378 ++++++++++++++++++ 10 files changed, 667 insertions(+), 7 deletions(-) create mode 100644 src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue create mode 100644 src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue diff --git a/src/api/onlineHome/villageAffairs.js b/src/api/onlineHome/villageAffairs.js index f52e05c8..6a31ed94 100644 --- a/src/api/onlineHome/villageAffairs.js +++ b/src/api/onlineHome/villageAffairs.js @@ -17,3 +17,14 @@ export function getVillageAffairs(id) { }) } +// 查询地区下的账套列表 +export function bookListByDept(deptId, bookType) { + return request({ + url: '/open/villageAffairs/public/bookList/' + deptId, + method: 'get', + params: { + bookType, + }, + }) +} + diff --git a/src/api/sunVillage_info/otherOpen.js b/src/api/sunVillage_info/otherOpen.js index 957f0004..305363f7 100644 --- a/src/api/sunVillage_info/otherOpen.js +++ b/src/api/sunVillage_info/otherOpen.js @@ -43,3 +43,24 @@ export function delOther(id) { }) } +// 查询其他公开列表 游客 +export function otherOpenList(query) { + return request({ + url: '/open/villageAffairs/public/otherOpenList', + method: 'get', + params: query + }) +} + +// 查询其他公开详细 游客 +export function otherOpenDetail(bookId, id) { + return request({ + url: '/open/villageAffairs/public/otherOpenDetail', + method: 'get', + params: { + bookId, + id, + }, + }) +} + diff --git a/src/components/common/PagedList.vue b/src/components/common/PagedList.vue index fb997fcc..544399db 100644 --- a/src/components/common/PagedList.vue +++ b/src/components/common/PagedList.vue @@ -48,6 +48,10 @@ export default { type: Function, default: null, }, + reload: { // 变更此值为true则重新加载数据 监听 + type: Boolean, + default: false, + }, }, components: { }, @@ -177,6 +181,15 @@ export default { console.log('[PagedList]: ', ...arguments); }, }, + watch: { + reload(newVal) { + if(newVal) + { + this.$emit('update:reload', false); + this.getList(); + } + }, + }, } diff --git a/src/permission.js b/src/permission.js index c39603a8..8d6bd2cf 100644 --- a/src/permission.js +++ b/src/permission.js @@ -140,6 +140,8 @@ const whiteList = [ '/sunVillage_info/list_contract_ranking', '/sunVillage_info/identity_check', '/sunVillage_info/assetMapOpen', + '/sunVillage_info/otherOpenVisitIndex', + '/sunVillage_info/otherOpenVisitDetail', // 新型经营主体 'newBusinessEntity/newsBulletin', //新闻公告 diff --git a/src/router/index.js b/src/router/index.js index 447c1b5f..52364bd5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3822,6 +3822,24 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenEdit'], resolve) }, + { ////阳光村务（新）-- 综合公开 游客 + path: '/sunVillage_info/otherOpenVisitIndex', + name: 'otherOpenVisitIndex', + meta: { + title: '综合公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenVisitList'], resolve) + }, + { ////阳光村务（新）-- 综合公开详情 游客 + path: '/sunVillage_info/otherOpenVisitDetail', + name: 'otherOpenVisitDetail', + meta: { + title: '综合公开详情', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenVisitDetail'], resolve) + }, { ////阳光村务（新）-- 发包方审核 path: '/sunVillage_info/list_employer_process', diff --git a/src/views/sunVillage_info/index_code.vue b/src/views/sunVillage_info/index_code.vue index c5bf7fdd..21f339db 100644 --- a/src/views/sunVillage_info/index_code.vue +++ b/src/views/sunVillage_info/index_code.vue @@ -68,9 +68,10 @@ diff --git a/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue b/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue new file mode 100644 index 00000000..92bd31b1 --- /dev/null +++ b/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue @@ -0,0 +1,187 @@ + + + diff --git a/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue b/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue new file mode 100644 index 00000000..aefffc10 --- /dev/null +++ b/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue @@ -0,0 +1,378 @@ + + + + + From f74cc7873bce0bccd2804456bd351224cd13539c Mon Sep 17 00:00:00 2001 From: zhaodengke Date: Thu, 5 Dec 2024 17:38:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Task=20=E7=BB=BC=E5=90=88=E5=85=AC=E5=BC=80?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/icon/index_header_focus.png | Bin 0 -> 988 bytes src/components/form/FieldSelect.vue | 2 + .../otherOpen/otherOpenEdit.vue | 27 +++- .../otherOpen/otherOpenList.vue | 129 ++++++++++++++---- .../otherOpen/otherOpenVisitList.vue | 97 ++++++++++--- 5 files changed, 207 insertions(+), 48 deletions(-) create mode 100644 src/assets/images/icon/index_header_focus.png diff --git a/src/assets/images/icon/index_header_focus.png b/src/assets/images/icon/index_header_focus.png new file mode 100644 index 0000000000000000000000000000000000000000..cbe5e7687e32fad70bb6e3a353e1e86f65f25951 GIT binary patch literal 988 zcmaJ=O>5LZ7*46QS}hbosETFC3iWF^Y_prL4Vt!WS6nm{V<1$3S<@Rb0WQy?N^cp5nN{gj222 znsH6Gh%1;eMu=RWu{myPI`U1ci7BY#RmW5KZ*Si6z_AtnM%EAwzl0mk+*W{>w&ttW zR@0Jfe)=+)iex6>VrqiOUGqXYQuwy6%+B#OZ8m z1e8UY0=fiJB1%Is4N*FYQnDz?C<{6t&%6cpid@mk9be2+_y(oE3}LI)5?X121gj89 zk_5#ROr??xkqkFIYDP&fOmr1A99n_nQ-^pURy6Bmohm$wbUy{x@5y>$r%bG1Ffx6J z1Tjvj3p9-XLtVFr4rv7+#QRU-u)67ESivD#4=mQWl|<~ymrDUQDG92CtaYon*dUaI z4dR1R37j)b%kg6Se4AhxvhIb{^en7v3eO}2$FXHGQ^=@dUeYqf6hgDbf?6(?b1KT@ z#9|udvt6!6taTTAw9B;*xN2W+JPWSRJZm^`Hn3d|hzr^|%TE7T@_qF>T)TfPg}z+K zf`M^o|LS!2ij7Zv?9DARdXtYmHtqqN>!HujFnbdVx~5j6PxYUBdwVy*!$b8UdW@gh zRmLU%M-%(7qI>H!LPfu6OWrqFJEt*8M|u! cn4GyYz@h6q?{0s;I1#@$eRf`ZQCz @@ -46,6 +47,7 @@ export default { 'remoteUrl', // 远程列表加载地址 String 'onRemoteResponse', // 远程获取到结果的处理回调 String|Function 如果是函数需返回数组, 如果是字符串支持.分割 'clearable', // 点击取消时清空绑定值 + 'size', ], watch: { value: function (newVal, oldVal) { diff --git a/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue b/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue index 8870c9b0..3ec8a69f 100644 --- a/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue +++ b/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue @@ -1,13 +1,25 @@ @@ -78,21 +86,27 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets"; otherType: null, }, yearList: [], - title: '综合公开', reload: false, showTab: false, + otherTypeOptions: [], + showType: false, }; }, created() { - this.queryParams.otherType = this.$route.query.type; - if(this.$route.query.type) - { - this.getDicts('other_gk_type').then((resp) => { - const dict = resp.data.find((x) => x.dictValue == this.$route.query.type); - if(dict) - this.title = dict.dictLabel; + this.queryParams.otherType = this.$route.query.type || ''; + this.getDicts('other_gk_type').then((resp) => { + let arr = []; + arr.push({ + dictValue: '', + dictLabel: '综合公开', + name: '全部', }); - } + resp.data.forEach((x) => { + x.name = x.dictLabel; + arr.push(x); + }); + this.otherTypeOptions = arr; + }); getLoginBook().then((resp) => { let startYear = new Date().getFullYear(); let thisYear = startYear; @@ -115,35 +129,50 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets"; }); }); }, - viewItem(id){ + gotoViewItem(id) { + let parms = { + id: id, + intent: 'view', + }; + if(this.queryParams.otherType) + parms.type = this.queryParams.otherType; this.$router.push({ name: 'otherOpenDetail', - query: { - id: id, - intent: 'view', - type: this.$route.query.type, - }, + query: parms, }).catch(() => {}); }, - add() { + viewItem(id){ + this.$router.replace(`/sunVillage_info/otherOpenIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoViewItem(id), () => this.gotoViewItem(id) ); + }, + gotoAdd() { + let parms = { + intent: 'add', + }; + if(this.queryParams.otherType) + parms.type = this.queryParams.otherType; this.$router.push({ name: 'otherOpenEdit', - query: { - intent: 'add', - type: this.$route.query.type, - }, + query: parms, }).catch(() => {}); }, - edit(id) { + add() { + this.$router.replace(`/sunVillage_info/otherOpenIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoAdd(), () => this.gotoAdd() ); + }, + gotoEdit(id) { + let parms = { + id: id, + intent: 'edit', + }; + if(this.queryParams.otherType) + parms.type = this.queryParams.otherType; this.$router.push({ name: 'otherOpenEdit', - query: { - id: id, - intent: 'edit', - type: this.$route.query.type, - }, + query: parms, }).catch(() => {}); }, + edit(id) { + this.$router.replace(`/sunVillage_info/otherOpenIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoEdit(id), () => this.gotoEdit(id) ); + }, remove(id) { Dialog.confirm({ title: '警告', @@ -164,7 +193,7 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets"; .catch(() => {}); }, back() { - this.$router.back(); + this.$router.replace('/sunVillage_info/otherOpenIndex', () => this.$router.back(), () => this.$router.back() ); }, tabClick(year){ this.queryParams.openYear = year; @@ -173,6 +202,24 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets"; tabShow(){ this.showTab = !this.showTab; }, + openTypeChooser() { + this.showType = true; + }, + changeType(action, index) { + this.queryParams.otherType = action.dictValue; + this.reload = true; + }, + }, + computed: { + title() { + if(this.queryParams.otherType) + { + const dict = this.otherTypeOptions.find((x) => x.dictValue == this.queryParams.otherType); + if(dict) + return dict.dictLabel; + } + return '综合公开'; + }, }, } @@ -213,6 +260,32 @@ import {getLoginBook} from "@/api/sunVillage_info/fixedAssets"; right: 38px; top: 36px; } + + .title { + } + .title::before { + display: inline-block; + width: 24px; + height: 24px; + content: ''; + background-image: url('../../../assets/images/icon/index_header_focus.png'); + background-repeat: no-repeat; + background-size: contain; + margin-right: 0.2rem; + transform: rotate( + 180deg + ); + } + .title::after { + width: 0.32rem; + height: 0.32rem; + display: inline-block; + content: ''; + background-image: url('../../../assets/images/icon/index_header_focus.png'); + background-repeat: no-repeat; + background-size: contain; + margin-left: 0.2rem; + } } .record_main{ padding:30px 22px; diff --git a/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue b/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue index aefffc10..ac6129ea 100644 --- a/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue +++ b/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue @@ -3,7 +3,7 @@
- {{title}} +

{{title}}

@@ -47,6 +47,14 @@
+ + @@ -74,9 +82,10 @@ import Cookies from "js-cookie"; deptId: null, }, yearList: [], - title: '综合公开', reload: false, showTab: false, + otherTypeOptions: [], + showType: false, }; }, created() { @@ -88,15 +97,20 @@ import Cookies from "js-cookie"; return; } - this.queryParams.otherType = this.$route.query.type; - if(this.$route.query.type) - { - this.getDicts('other_gk_type').then((resp) => { - const dict = resp.data.find((x) => x.dictValue == this.$route.query.type); - if(dict) - this.title = dict.dictLabel; + this.queryParams.otherType = this.$route.query.type || ''; + this.getDicts('other_gk_type').then((resp) => { + let arr = []; + arr.push({ + dictValue: '', + dictLabel: '综合公开', + name: '全部', }); - } + resp.data.forEach((x) => { + x.name = x.dictLabel; + arr.push(x); + }); + this.otherTypeOptions = arr; + }); bookInfo(this.queryParams.bookId).then((resp) => { let startYear = new Date().getFullYear(); let thisYear = startYear; @@ -119,18 +133,23 @@ import Cookies from "js-cookie"; }); }); }, - viewItem(id){ + gotoViewItem(id) { + let parms = { + id: id, + intent: 'view', + }; + if(this.queryParams.otherType) + parms.type = this.queryParams.otherType; this.$router.push({ name: 'otherOpenVisitDetail', - query: { - id: id, - intent: 'view', - type: this.$route.query.type, - }, + query: parms, }).catch(() => {}); }, + viewItem(id){ + this.$router.replace(`/sunVillage_info/otherOpenVisitIndex?type=${this.queryParams.otherType || ''}`, () => this.gotoViewItem(id), () => this.gotoViewItem(id) ); + }, back() { - this.$router.back(); + this.$router.replace('/sunVillage_info/otherOpenVisitIndex', () => this.$router.back(), () => this.$router.back() ); }, tabClick(year){ this.queryParams.openYear = year; @@ -139,6 +158,24 @@ import Cookies from "js-cookie"; tabShow(){ this.showTab = !this.showTab; }, + openTypeChooser() { + this.showType = true; + }, + changeType(action, index) { + this.queryParams.otherType = action.dictValue; + this.reload = true; + }, + }, + computed: { + title() { + if(this.queryParams.otherType) + { + const dict = this.otherTypeOptions.find((x) => x.dictValue == this.queryParams.otherType); + if(dict) + return dict.dictLabel; + } + return '综合公开'; + }, }, } @@ -179,6 +216,32 @@ import Cookies from "js-cookie"; right: 38px; top: 36px; } + + .title { + } + .title::before { + display: inline-block; + width: 24px; + height: 24px; + content: ''; + background-image: url('../../../assets/images/icon/index_header_focus.png'); + background-repeat: no-repeat; + background-size: contain; + margin-right: 0.2rem; + transform: rotate( + 180deg + ); + } + .title::after { + width: 0.32rem; + height: 0.32rem; + display: inline-block; + content: ''; + background-image: url('../../../assets/images/icon/index_header_focus.png'); + background-repeat: no-repeat; + background-size: contain; + margin-left: 0.2rem; + } } .record_main{ padding:30px 22px; From d339cd922fcdc92a9ff1024f5ea7257c31a22258 Mon Sep 17 00:00:00 2001 From: zhaodengke Date: Fri, 6 Dec 2024 10:40:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Task=20=E7=BB=BC=E5=90=88=E5=85=AC=E5=BC=80?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sunVillage_info/otherOpen.js | 7 +++---- .../index_block_zonghegongkai.png | Bin 0 -> 3480 bytes .../index_code_btn_zonghegongkai.png | Bin 0 -> 14444 bytes src/views/sunVillage_info/index_code.vue | 1 - .../sunVillage_info/otherOpen/otherOpenEdit.vue | 8 ++++---- .../sunVillage_info/otherOpen/otherOpenList.vue | 14 +++++++------- .../otherOpen/otherOpenVisitDetail.vue | 2 +- .../otherOpen/otherOpenVisitList.vue | 6 +++--- 8 files changed, 18 insertions(+), 20 deletions(-) create mode 100644 src/assets/images/sunVillage_info/index_block_zonghegongkai.png create mode 100644 src/assets/images/sunVillage_info/index_code_btn_zonghegongkai.png 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 0000000000000000000000000000000000000000..b12f4364a3c6b517e6743dc34c9c048681998310 GIT binary patch literal 3480 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 { 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() ); From bfcb240f73f1bbae9ae91409ad18246d32073078 Mon Sep 17 00:00:00 2001 From: zhaodengke Date: Fri, 6 Dec 2024 13:56:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?Task=20=E9=9B=B6=E5=B7=A5=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/finance.js | 21 +++++++++++++++++++ .../sunVillage_info/list_register_add.vue | 12 ++++++++--- .../sunVillage_info/list_register_edit.vue | 11 ++++++++-- .../list_tourists_registration_add.vue | 11 ++++++++-- .../list_tourists_registration_edit.vue | 11 ++++++++-- 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/src/utils/finance.js b/src/utils/finance.js index 8dac27d2..d00466a9 100644 --- a/src/utils/finance.js +++ b/src/utils/finance.js @@ -236,6 +236,27 @@ export const FINANCE = { a = new BigNumber(a, 10); return a.isZero(); }, + sub(a, b) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + if(!(b instanceof BigNumber)) + b = new BigNumber(b, 10); + return a.minus(b, 10); + }, + mul(a, b) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + if(!(b instanceof BigNumber)) + b = new BigNumber(b, 10); + return a.multipliedBy(b, 10); + }, + div(a, b) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + if(!(b instanceof BigNumber)) + b = new BigNumber(b, 10); + return a.div(b, 10); + }, toNumber(a) { if(typeof(a) === 'number') return a; diff --git a/src/views/sunVillage_info/list_register_add.vue b/src/views/sunVillage_info/list_register_add.vue index 559b0fd6..6514591f 100644 --- a/src/views/sunVillage_info/list_register_add.vue +++ b/src/views/sunVillage_info/list_register_add.vue @@ -38,9 +38,9 @@ - + - + @@ -61,6 +61,7 @@ import { addOddjob } from "@/api/sunVillage_info/fixedAssets"; import Cookies from "js-cookie"; import request from '@/utils/request' + import {FINANCE} from "@/utils/finance"; export default { name: "certificateList", data() { @@ -113,7 +114,12 @@ this.jobTime = data; this.showBuildTime = false; }, - + calcMoney() { + if(this.form.workNum > 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, } diff --git a/src/views/sunVillage_info/list_register_edit.vue b/src/views/sunVillage_info/list_register_edit.vue index b08b22ca..a60a4207 100644 --- a/src/views/sunVillage_info/list_register_edit.vue +++ b/src/views/sunVillage_info/list_register_edit.vue @@ -38,9 +38,9 @@ - + - + @@ -61,6 +61,7 @@ import { addOddjob , getOddjob , updateOddjob } from "@/api/sunVillage_info/fixedAssets"; import Cookies from "js-cookie"; import request from '@/utils/request' + import {FINANCE} from "@/utils/finance"; export default { name: "certificateList", data() { @@ -122,6 +123,12 @@ this.jobTime = data; this.showBuildTime = false; }, + calcMoney() { + if(this.form.workNum > 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, } diff --git a/src/views/sunVillage_info/list_tourists_registration_add.vue b/src/views/sunVillage_info/list_tourists_registration_add.vue index 0e6fde90..6782be19 100644 --- a/src/views/sunVillage_info/list_tourists_registration_add.vue +++ b/src/views/sunVillage_info/list_tourists_registration_add.vue @@ -25,8 +25,8 @@ - - + + 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, } diff --git a/src/views/sunVillage_info/list_tourists_registration_edit.vue b/src/views/sunVillage_info/list_tourists_registration_edit.vue index b079f517..5c20d17b 100644 --- a/src/views/sunVillage_info/list_tourists_registration_edit.vue +++ b/src/views/sunVillage_info/list_tourists_registration_edit.vue @@ -25,8 +25,8 @@ - - + + 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, }