From d2a8498a27a88180033544cdc1101919ccfa3151 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 15 Jan 2024 10:58:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=20=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E3=80=81?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BC=9A=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/meeting/meeting.js | 23 +++++++-- pages/project/project.js | 16 +++++-- pages/project/project.wxml | 2 +- pages/projectDetail/projectDetail.js | 50 ++++++++++++++++++-- pages/projectDetail/projectDetail.wxml | 65 ++++++++++++++------------ 5 files changed, 116 insertions(+), 40 deletions(-) diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js index 196190b..a61ccae 100644 --- a/pages/meeting/meeting.js +++ b/pages/meeting/meeting.js @@ -15,7 +15,7 @@ Page({ pageSize: 10, meetingSignUpType: 4, // 可报名：1 全部 0 meetingStatus: '', // 会议状态 可报名: meetingSignUpType==1 未开始：2 进行中：3 已结束4 - meetingType: '', // 工作组会议：1 标协会议 2 国际研讨会 3 其他会议 4 分标委会议 5 + meetingType: '', // 工作组会议：1 标协会议 2 国际研讨会 3 其他会议 4 分标委会议 7起草组会议 5 meetingStartTime: '', // 开始时间 meetingEndTime: '', // 结束时间 // 创建时间倒叙排序 @@ -25,7 +25,7 @@ Page({ // 会议筛选参数 meetingStatus: ['可报名', '未开始', '进行中', '已结束','已报名'], // 会议类型筛选参数 - meetingType: ['工作组会议', '标协会议', '国际研讨会', '其他会议', '分标委会议'], + meetingType: ['工作组会议', '标协会议', '国际研讨会', '其他会议', '分标委会议', '起草组会议'], meetingTypeList:[ {name:'工作组会议',value:'1'}, {name:'国际研讨会',value:'3'}, @@ -34,7 +34,8 @@ Page({ {name:'理事会会议',value:'6'}, {name:'信息交流会',value:'7'}, {name:'培训会',value:'8'}, - {name:'宣贯会',value:'9'} + {name:'宣贯会',value:'9'}, + {name:'起草组会议',value:'10'} ], // 会议列表数据 @@ -177,10 +178,17 @@ Page({ 'searchParams.meetingType': '2', 'searchParams.tbMeetingType':'1' }) + }else if(index === '10' ){ + // 起草组 + this.setData({ + 'searchParams.meetingType': '7', + 'searchParams.tbMeetingType': '' + }) }else{ // 其他类型的会议 this.setData({ - 'searchParams.meetingType': index + 'searchParams.meetingType': index, + 'searchParams.tbMeetingType': '' }) } @@ -329,6 +337,13 @@ Page({ 'searchParams.meetingType': '1', }) } + if (!!options.draftingGroupId) { + // 起草组的更多跳转 + this.setData({ + 'searchParams.draftingGroupId': options.draftingGroupId, + 'searchParams.meetingType': '7', + }) + } if (!!options.caseCommitteeId) { // 分标委的更多跳转 this.setData({ diff --git a/pages/project/project.js b/pages/project/project.js index bb00cd0..a74fc60 100644 --- a/pages/project/project.js +++ b/pages/project/project.js @@ -87,9 +87,19 @@ Page({ }, // 项目详情 projectDetail(e){ - wx.navigateTo({ - url: `../projectDetail/projectDetail?id=${e.currentTarget.dataset.project.id}&type=${this.data.type}&workingGroupId=${e.currentTarget.dataset.project.workingGroupId}`, - }) + // 工作组id + const workingGroupId = e.currentTarget.dataset.project.workingGroupId + // 起草组id + const draftingGroupId = e.currentTarget.dataset.project.draftingGroupId + if (workingGroupId) { + wx.navigateTo({ + url: `../projectDetail/projectDetail?id=${e.currentTarget.dataset.project.id}&type=${this.data.type}&workingGroupId=${workingGroupId}`, + }) + } else if (draftingGroupId) { + wx.navigateTo({ + url: `../projectDetail/projectDetail?id=${e.currentTarget.dataset.project.id}&type=${this.data.type}&draftingGroupId=${draftingGroupId}`, + }) + } }, loadData(){ const that = this diff --git a/pages/project/project.wxml b/pages/project/project.wxml index 7726b4c..e13bacd 100644 --- a/pages/project/project.wxml +++ b/pages/project/project.wxml @@ -44,7 +44,7 @@ 负责人电话：{{item.phone || item.principalPhone}} 负责人邮箱：{{item.email || item.principalEmail}} 运行周期：{{item.operationCycle || ''}} - 缴费凭证:{{item.paymentStatus_dictText || '无'}} + 缴费凭证:{{item.paymentStatus_dictText || '无'}} diff --git a/pages/projectDetail/projectDetail.js b/pages/projectDetail/projectDetail.js index 6d74a6d..17621a9 100644 --- a/pages/projectDetail/projectDetail.js +++ b/pages/projectDetail/projectDetail.js @@ -9,10 +9,11 @@ Page({ */ data: { statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'], - type:'',//区别是哪个项目的项目详情 work工作组 + type:'',//区别是哪个项目的项目详情 work工作组 draft起草组 form: {}, - id: '', // 在工作组id,项目id + id: '', // 在工作组id,项目id,起草组id workingGroupId: '', //工作组id + draftingGroupId: '', //起草组id showMeeting: false, // 会议信息的显隐 showProjectData:true, // 项目资料的显示隐藏 projectFileList: [], // 项目资料文件 @@ -34,8 +35,17 @@ Page({ }, // 获取更多会议信息数据 goMoreMeeting() { + let params = '' + switch(this.data.type) { + case 'work': + params = `workingGroupId=${this.data.workingGroupId}` + break + case 'draft': + params = `draftingGroupId=${this.data.draftingGroupId}` + break + } wx.navigateTo({ - url: `../meeting/meeting?workingGroupId=${this.data.workingGroupId}`, + url: `../meeting/meeting?` + params, }) }, // 会议详情 @@ -120,6 +130,7 @@ Page({ } this.data.id = options.id this.data.workingGroupId = options.workingGroupId + this.data.draftingGroupId = options.draftingGroupId if (options.type == 'work') { // 工作组项目有会议详情 this.setData({ showMeeting: true, @@ -127,6 +138,39 @@ Page({ }) MeetingApi.meetingList({ workingGroupProjectId: this.data.id, + meetingType: 1, // 工作组会议 + meetingSignUpType: 0, // 显示所有会议 + column: 'createTime', + order: 'desc' + }).then(res => { + if (res.success) { + if (res.result.records && res.result.records.length <= 2) { + this.setData({ + meetingList: res.result.records + }) + } else if (res.result.records && res.result.records.length > 2) { + this.setData({ + meetingList: res.result.records.slice(0, 2) + }) + } + } + }).catch(err => { + wx.showToast({ + title: '加载失败', + icon: 'none', + duration: 2000 + }) + }) + } else if (options.type === 'draft') { + // 起草组项目有会议详情 + this.setData({ + showMeeting: true, + pageTitle:'起草组详情' + }) + MeetingApi.meetingList({ + draftingGroupProjectId: this.data.id, + meetingType: 7, // 起草组会议 + meetingSignUpType: 0, // 显示所有会议 column: 'createTime', order: 'desc' }).then(res => { diff --git a/pages/projectDetail/projectDetail.wxml b/pages/projectDetail/projectDetail.wxml index ed81ce8..18915e9 100644 --- a/pages/projectDetail/projectDetail.wxml +++ b/pages/projectDetail/projectDetail.wxml @@ -11,7 +11,7 @@ 项目名称 {{form.chargeProject}} - + 款项用途 {{form.chargeUse_dictText}} @@ -24,39 +24,45 @@ 项目负责人 {{form.principalName}} - - 应付金额 - {{form.receivableAmount ? form.receivableAmount + '元' : ''}} - - - 实付金额 - {{form.paidAmount ? form.paidAmount + '元' : ''}} - + + + 应付金额 + {{form.receivableAmount ? form.receivableAmount + '元' : ''}} + + + 实付金额 + {{form.paidAmount ? form.paidAmount + '元' : ''}} + + 企业联系人 {{form.contactsTemporaryName}} - - 邮寄联系人 - {{form.mailContactsTemporaryName}} - - - 打包 - {{form.pack_dictText}} - + + + 邮寄联系人 + {{form.mailContactsTemporaryName}} + + + 打包 + {{form.pack_dictText}} + + - + 任务及目标 {{form.missionAndObjectives || ''}} - - 需要发票 - {{form.needInvoice_dictText}} - - - 付款方式 - {{form.chargeWay_dictText}} - + + + 需要发票 + {{form.needInvoice_dictText}} + + + 付款方式 + {{form.chargeWay_dictText}} + + 合同 @@ -113,7 +119,8 @@ 暂无到账记录！ - + + 开票邮寄信息 @@ -154,5 +161,5 @@ 暂无邮寄记录！ - -在研项目和各种分发资料请到pc端查看 + +在研项目和各种分发资料请到pc端查看