diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index f49895d9..b7bd6428 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -425,6 +425,15 @@ export function listOddjob(query) { }) } +// 查询零工登记详细 +export function getOddjobDetail(bookId, id) { + return request({ + url: '/open/villageAffairs/public/oddjobDetail', + method: 'get', + params: {bookId, id}, + }) +} + // 新增零工登记 export function addOddjob(data) { return request({ diff --git a/src/permission.js b/src/permission.js index bbae94cc..d3f2d4ce 100644 --- a/src/permission.js +++ b/src/permission.js @@ -95,7 +95,9 @@ const whiteList = [ '/sunVillage_info/list_finance_detail', //详情页 '/sunVillage_info/list_photo_detail', //详情页 '/sunVillage_info/list_finance_ranking', //详情页 - '/sunVillage_info/list_tourists_ranking', //详情页 + '/sunVillage_info/list_tourists_ranking', //零工排行榜 + '/sunVillage_info/list_tourists_ranking_lite', //零工排行榜 + '/sunVillage_info/list_tourists_registration_detail_visitor', //零工详情页 '/sunVillage_info/login_code', //详情页 '/sunVillage_info/index_code_rights', //详情页 '/sunVillage_info/list_vote', //详情页 diff --git a/src/router/index.js b/src/router/index.js index 308f244c..0a49b4fd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3633,7 +3633,7 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_issues_edit'], resolve) }, - { ////阳光村务(新)-- 合同信息 + { ////阳光村务(新)-- 零工公开榜 path: '/sunVillage_info/list_tourists_ranking', name: 'sunVillageInfoListTouristsRanking', meta: { @@ -3642,6 +3642,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_tourists_ranking'], resolve) }, + { ////阳光村务(新)-- 零工公开榜(精简) + path: '/sunVillage_info/list_tourists_ranking_lite', + name: 'sunVillageInfoListTouristsRankingLite', + meta: { + title: '零工公式公布榜', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_tourists_ranking_lite'], resolve) + }, { ////阳光村务(新)-- 零工登记 path: '/sunVillage_info/list_tourists_registration', name: 'sunVillageInfoListTouristsRegistration', @@ -3669,6 +3678,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_tourists_registration_detail'], resolve) }, + { ////阳光村务(新)-- 零工登记详情(游客) + path: '/sunVillage_info/list_tourists_registration_detail_visitor', + name: 'sunVillageInfoListTouristsRegistrationDetailVisitor', + meta: { + title: '查看零工登记', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_tourists_registration_detail_visitor'], resolve) + }, { ////阳光村务(新)-- 零工登记修改 path: '/sunVillage_info/list_tourists_registration_edit', name: 'sunVillageInfoListTouristsRegistrationEdit', diff --git a/src/views/sunVillage_info/list_tourists.vue b/src/views/sunVillage_info/list_tourists.vue index 07f9a5a4..0486bebb 100644 --- a/src/views/sunVillage_info/list_tourists.vue +++ b/src/views/sunVillage_info/list_tourists.vue @@ -102,11 +102,13 @@ showBtn:true, nowYear:new Date().getFullYear(), yearList:[], + visitor: false, }; }, created() { this.queryParams.bookId = Cookies.get('bookId'); this.queryParams.deptId = Cookies.get('deptId'); + this.visitor = this.$route.query.type == 'code'; if (this.$route.query.type == 'code'){ this.showBtn = false; } @@ -187,7 +189,8 @@ this.$router.push({path:'/sunVillage_info/list_tourists_edit',query: {id:id,type:'finance'}}) }, goRanking(id,time){ - this.$router.push({path:'/sunVillage_info/list_tourists_ranking',query: {id:id,time:time}}) + const url = this.visitor ? '/sunVillage_info/list_tourists_ranking_lite' : '/sunVillage_info/list_tourists_ranking'; + this.$router.push({path:url,query: {id:id,time:time}}) }, goRemove(id){ this.$dialog.alert({ diff --git a/src/views/sunVillage_info/list_tourists_ranking.vue b/src/views/sunVillage_info/list_tourists_ranking.vue index 4c1c7ae6..cce95d2f 100644 --- a/src/views/sunVillage_info/list_tourists_ranking.vue +++ b/src/views/sunVillage_info/list_tourists_ranking.vue @@ -121,7 +121,7 @@ }, viewItem(id){ this.$router.push({ - path: "/sunVillage_info/list_tourists_registration_detail", + path: "/sunVillage_info/list_tourists_registration_detail_visitor", query: { id: id, intent: 'view', diff --git a/src/views/sunVillage_info/list_tourists_ranking_lite.vue b/src/views/sunVillage_info/list_tourists_ranking_lite.vue new file mode 100644 index 00000000..49906e35 --- /dev/null +++ b/src/views/sunVillage_info/list_tourists_ranking_lite.vue @@ -0,0 +1,369 @@ + + + + 零工公开榜 + + + + {{deptName}}{{yearMonth[0]}}年{{yearMonth[1]}}月份 + + + + + + + + + {{item.workReason}} + + + + {{item.jobTime}} + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/sunVillage_info/list_tourists_registration_detail.vue b/src/views/sunVillage_info/list_tourists_registration_detail.vue index 109b17a4..b7026d48 100644 --- a/src/views/sunVillage_info/list_tourists_registration_detail.vue +++ b/src/views/sunVillage_info/list_tourists_registration_detail.vue @@ -50,7 +50,7 @@ +
{{deptName}}{{yearMonth[0]}}年{{yearMonth[1]}}月份
{{item.workReason}}