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/api/sunVillage_info/subcontract.js b/src/api/sunVillage_info/subcontract.js new file mode 100644 index 00000000..91ac0f9d --- /dev/null +++ b/src/api/sunVillage_info/subcontract.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 查询零工事项列表 +export function registrationList(query) { + return request({ + url: '/open/villageAffairs/public/registrationList', + method: 'get', + params: query + }) +} + +// 查询零工事项详细 +export function registrationDetail(bookId, id) { + return request({ + url: '/open/villageAffairs/public/registrationDetail', + method: 'get', + params: {bookId, id}, + }) +} diff --git a/src/components/form/CommonUpload.vue b/src/components/form/CommonUpload.vue new file mode 100644 index 00000000..4fdbd0ab --- /dev/null +++ b/src/components/form/CommonUpload.vue @@ -0,0 +1,160 @@ + + + + + + + diff --git a/src/components/form/FieldDatePicker.vue b/src/components/form/FieldDatePicker.vue index 5ed1cbfb..f1c76d61 100644 --- a/src/components/form/FieldDatePicker.vue +++ b/src/components/form/FieldDatePicker.vue @@ -41,6 +41,8 @@ :type="type || 'date'" :readonly="readonly" :title="label || ''" + :min-date="minDate" + :max-date="maxDate" @confirm="onConfirm" @cancel="onCancel" @change="onChanged" @@ -62,6 +64,7 @@ export default { 'formatter', // value的格式化 String|Function|undefined 字符串为格式字符串, 函数则必须有返回 undefined则不转换 'clearable', // 点击取消时清空绑定值 'yearRangeLength', // type === 'year' 时生成的年份数量范围 [YEAR - yearRangeLength, YEAR + yearRangeLength] + 'minDate', 'maxDate' ], watch: { value: function (newVal, oldVal) { 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 3b52ab05..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', @@ -3660,6 +3669,33 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_tourists_registration_add'], resolve) }, + { ////阳光村务(新)-- 零工登记详情 + path: '/sunVillage_info/list_tourists_registration_detail', + name: 'sunVillageInfoListTouristsRegistrationDetail', + meta: { + title: '查看零工登记', + hidden: true, + }, + 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', + meta: { + title: '修改零工登记', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_tourists_registration_edit'], resolve) + }, { ////阳光村务(新)-- 合同信息 path: '/sunVillage_info/list_register', name: 'sunVillageInfoListRegister', diff --git a/src/utils/request.js b/src/utils/request.js index 023805bc..278e298e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -69,7 +69,7 @@ if(responseInterceptor === undefined){ // 获取错误信息 const msg = errorCode[code] || res.data.msg || errorCode['default'] // console.info(gqnum); && gqnum === 0 - console.log(code) + // console.log(code) if (code === 401) { // gqnum++; Dialog.confirm({ diff --git a/src/views/project/signUp.vue b/src/views/project/signUp.vue index 8e3142fc..76dc8739 100644 --- a/src/views/project/signUp.vue +++ b/src/views/project/signUp.vue @@ -29,9 +29,9 @@

1.竞买人条件确认

· 已阅读并知晓: - 《乳山市农村产权交易项目报名服务协议》 + 《农村产权交易项目报名服务协议》

- +
diff --git a/src/views/sunVillage_info/list_tourists.vue b/src/views/sunVillage_info/list_tourists.vue index a49e15f7..0486bebb 100644 --- a/src/views/sunVillage_info/list_tourists.vue +++ b/src/views/sunVillage_info/list_tourists.vue @@ -53,6 +53,14 @@ +
+
+ +
+
+ +
+
@@ -93,12 +101,14 @@ projectIndex:'', showBtn:true, nowYear:new Date().getFullYear(), - yearList:[] + 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; } @@ -179,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({ @@ -190,6 +201,7 @@ .then(() => { tempWorkerOpenRemove(id).then(response => { this.$notify({ type: 'success', message: '删除成功' }); + this.applicationList = []; this.getList() }); }) diff --git a/src/views/sunVillage_info/list_tourists_add.vue b/src/views/sunVillage_info/list_tourists_add.vue index 943f8338..17e5ac2e 100644 --- a/src/views/sunVillage_info/list_tourists_add.vue +++ b/src/views/sunVillage_info/list_tourists_add.vue @@ -107,7 +107,6 @@ }, openPic:[], fileList:[], - fileList1:[], openNy:new Date(), type:'', openFile:[], @@ -170,7 +169,6 @@ // 此时可以自行将文件上传至服务器 if (file instanceof Array){//判断是否为数组,单张图片为array,多张为数组,数组返回true否则为false file.map(res=>{ - this.openPic.push(res.file); let params1 = new FormData(); params1.append("file", res.file); commonUpload(params1).then((r1) => { @@ -178,7 +176,6 @@ }) }) }else{ - this.openPic.push(file); let params1 = new FormData(); params1.append("file", file.file); commonUpload(params1).then((r1) => { diff --git a/src/views/sunVillage_info/list_tourists_detail.vue b/src/views/sunVillage_info/list_tourists_detail.vue index ed98aa51..a8607721 100644 --- a/src/views/sunVillage_info/list_tourists_detail.vue +++ b/src/views/sunVillage_info/list_tourists_detail.vue @@ -144,7 +144,6 @@ this.openPic.push({url:'/api'+rrr}) }) } - this.form = res.data; }) }, diff --git a/src/views/sunVillage_info/list_tourists_edit.vue b/src/views/sunVillage_info/list_tourists_edit.vue index 6344b23c..ed93f4ee 100644 --- a/src/views/sunVillage_info/list_tourists_edit.vue +++ b/src/views/sunVillage_info/list_tourists_edit.vue @@ -183,7 +183,7 @@ this.showBuildTime = false; }, deleteFile1(file,detail){ - console.log(detail) + //console.log(detail) this.openPic2.splice(detail.index,1) }, deleteWord(index){ diff --git a/src/views/sunVillage_info/list_tourists_ranking.vue b/src/views/sunVillage_info/list_tourists_ranking.vue index 64d38268..4c1c7ae6 100644 --- a/src/views/sunVillage_info/list_tourists_ranking.vue +++ b/src/views/sunVillage_info/list_tourists_ranking.vue @@ -25,7 +25,7 @@ 姓名 - + {{item.workerName}}
@@ -41,7 +41,7 @@ 工日值 金额(元)
- + {{item.workReason}} {{item.workerNote}} {{item.workNum}} @@ -80,7 +80,7 @@ queryParams:{ pageNum:1, pageSize:10, - orderByColumn:'openNy', + orderByColumn:'jobNy', isAsc:'desc', year:'', }, @@ -104,7 +104,7 @@ getList(){ var _this = this; setTimeout(() => { - console.log(_this.queryParams) + //console.log(_this.queryParams) listOddjob(_this.queryParams).then(response => { _this.listLength = response.total; _this.applicationList = response.rows; @@ -119,6 +119,15 @@ }); }, 1000); }, + viewItem(id){ + this.$router.push({ + path: "/sunVillage_info/list_tourists_registration_detail", + query: { + id: id, + intent: 'view', + }, + }).catch(() => {}); + }, }, } @@ -378,6 +387,7 @@ height: 100%; position: absolute; top: 0; + pointer-events: none; } .name_icon{ position: absolute; 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..6dbb7a22 --- /dev/null +++ b/src/views/sunVillage_info/list_tourists_ranking_lite.vue @@ -0,0 +1,369 @@ + + + + + diff --git a/src/views/sunVillage_info/list_tourists_registration.vue b/src/views/sunVillage_info/list_tourists_registration.vue index b412e1b3..11de4b7a 100644 --- a/src/views/sunVillage_info/list_tourists_registration.vue +++ b/src/views/sunVillage_info/list_tourists_registration.vue @@ -30,7 +30,7 @@ 姓名 - {{item.workerName}} + {{item.workerName}}
@@ -43,7 +43,7 @@ 出工事由 出工数
- + {{item.jobTime}} {{item.workReason}} {{item.workNum}} @@ -54,12 +54,43 @@
+ + + + + + + + + + + + + @@ -440,6 +534,7 @@ height: 100%; position: absolute; top: 0; + pointer-events: none; } .name_icon{ position: absolute; @@ -501,4 +596,43 @@ .clear{ clear: both; } +.menu_btn{ + width: 52px; + height: 52px; + border-radius: 50%; + display: flex; + align-items: center; + justify-content:center; + + &.delete{ + background:#df0707; + .icon{ + width: 22px; + height: 29px; + background: url('../../assets/images/sunVillage_info/list_icon_7.png') no-repeat; + background-size: 100% 100%; + display: block; + } + } + &.edit{ + background: #79cf13; + .icon { + width: 26px; + height: 25px; + background: url('../../assets/images/sunVillage_info/list_icon_6.png') no-repeat; + background-size: 100% 100%; + display: block; + } + } + &.view{ + background: #3494ff; + .icon { + width: 29px; + height: 21px; + background: url('../../assets/images/sunVillage_info/list_icon_3.png') no-repeat; + background-size: 100% 100%; + display: block; + } + } +} diff --git a/src/views/sunVillage_info/list_tourists_registration_add.vue b/src/views/sunVillage_info/list_tourists_registration_add.vue index 75368e19..6c3c365f 100644 --- a/src/views/sunVillage_info/list_tourists_registration_add.vue +++ b/src/views/sunVillage_info/list_tourists_registration_add.vue @@ -2,7 +2,7 @@
零工登记 -
+
@@ -11,38 +11,51 @@

添加零工

- - - - - - - + + + + + + + + + + + + + + + +
@@ -57,16 +70,38 @@ diff --git a/src/views/sunVillage_info/list_tourists_registration_detail.vue b/src/views/sunVillage_info/list_tourists_registration_detail.vue new file mode 100644 index 00000000..b7026d48 --- /dev/null +++ b/src/views/sunVillage_info/list_tourists_registration_detail.vue @@ -0,0 +1,188 @@ + + + diff --git a/src/views/sunVillage_info/list_tourists_registration_detail_visitor.vue b/src/views/sunVillage_info/list_tourists_registration_detail_visitor.vue new file mode 100644 index 00000000..3f590887 --- /dev/null +++ b/src/views/sunVillage_info/list_tourists_registration_detail_visitor.vue @@ -0,0 +1,191 @@ + + + diff --git a/src/views/sunVillage_info/list_tourists_registration_edit.vue b/src/views/sunVillage_info/list_tourists_registration_edit.vue new file mode 100644 index 00000000..7cb5d01a --- /dev/null +++ b/src/views/sunVillage_info/list_tourists_registration_edit.vue @@ -0,0 +1,230 @@ + + +