From 2bfeded6617e0700330d504690ba85dff23cffc5 Mon Sep 17 00:00:00 2001 From: fengachen <373943794@qq.com> Date: Wed, 15 Dec 2021 16:12:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/images/zuofei.png | Bin 0 -> 9669 bytes assets/js/http/userApi.js | 6 +-- pages/committee/committee.wxml | 1 + pages/committee/committee.wxss | 2 +- pages/committeeDetail/committeeDetail.wxml | 10 +++++ pages/committeeDetail/committeeDetail.wxss | 13 ++++++ pages/contractDetail/contractDetail.wxml | 16 +++++++- pages/contractDetail/contractDetail.wxss | 14 +++++++ pages/home/home.wxml | 2 +- pages/project/project.js | 44 +++++++++++++++++---- pages/project/project.wxml | 14 ++++++- pages/project/project.wxss | 8 +++- pages/projectDetail/projectDetail.js | 6 +++ pages/projectDetail/projectDetail.wxml | 12 +++++- pages/projectDetail/projectDetail.wxss | 7 ++++ 15 files changed, 137 insertions(+), 18 deletions(-) create mode 100644 assets/images/zuofei.png diff --git a/assets/images/zuofei.png b/assets/images/zuofei.png new file mode 100644 index 0000000000000000000000000000000000000000..c74edbd580209f40f6ef270c6a00fa0c6f73d640 GIT binary patch literal 9669 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 Hu0mjfl+fJ4 literal 0 HcmV?d00001 diff --git a/assets/js/http/userApi.js b/assets/js/http/userApi.js index c8d0a89..2106377 100644 --- a/assets/js/http/userApi.js +++ b/assets/js/http/userApi.js @@ -60,15 +60,15 @@ const UserApi = { // 工作组分页 workList: (params) => http.get(`${URL_CONFIG}project/payWorkingGroupSubitem/queryCompanyPageList`, params), // 分标委列表 - committeeList: (params) => http.get(`${URL_CONFIG}payCaseCommittee/payCaseCommittee/list`, params), + committeeList: (params) => http.get(`${URL_CONFIG}payCaseCommitteeSubitem/payCaseCommitteeSubitem/findTwo`, params), // 分标委详情 committeeDetail: (params) => http.get(`${URL_CONFIG}payCaseCommittee/payCaseCommittee/detail`, params), // 资料网员分页接口 queryDataMemberList: (params) => http.get(`${URL_CONFIG}jero/memberProjectSubitem/pageCompany`, params), // 获取用户的信息 - getUserInfo: (params) => http.get(`${URL_CONFIG}/sys/user/queryById`, params), + getUserInfo: (params) => http.get(`${URL_CONFIG}sys/user/queryById`, params), // 注册 - registerUser: (params) => http.post(`${URL_CONFIG}/sys/user/register`, params), + registerUser: (params) => http.post(`${URL_CONFIG}sys/user/register`, params), } export default UserApi diff --git a/pages/committee/committee.wxml b/pages/committee/committee.wxml index 510c022..955ad3c 100644 --- a/pages/committee/committee.wxml +++ b/pages/committee/committee.wxml @@ -9,6 +9,7 @@ {{item.name}} + 项目负责人:{{item.principal}} 暂无数据 diff --git a/pages/committee/committee.wxss b/pages/committee/committee.wxss index ffc36a6..45bd3dc 100644 --- a/pages/committee/committee.wxss +++ b/pages/committee/committee.wxss @@ -8,7 +8,7 @@ page{ box-sizing: border-box; padding: 0 15px; width: 100%; - height: 40px; + height: 80px; line-height: 40px; background-color: #fff; border-radius: 10px; diff --git a/pages/committeeDetail/committeeDetail.wxml b/pages/committeeDetail/committeeDetail.wxml index c5f63b5..ca3c746 100644 --- a/pages/committeeDetail/committeeDetail.wxml +++ b/pages/committeeDetail/committeeDetail.wxml @@ -4,6 +4,14 @@ 项目名称 {{name}} + + 项目负责人 + {{form.principal}} + + + 目标简介 + {{form.remarks}} + 项目资料 @@ -27,3 +35,5 @@ 暂无会议记录! + + 更多功能和信息请到pc端操作 diff --git a/pages/committeeDetail/committeeDetail.wxss b/pages/committeeDetail/committeeDetail.wxss index 0d3fcfb..14d2037 100644 --- a/pages/committeeDetail/committeeDetail.wxss +++ b/pages/committeeDetail/committeeDetail.wxss @@ -274,3 +274,16 @@ page{ text-align: center; line-height: 40px; } + +.remark { + height: auto!important; + margin-bottom: 10px; +} + +.tips { + margin-top: 20px; + color: #000; + font-weight: 700; + font-size: 14px; + text-align: center; +} diff --git a/pages/contractDetail/contractDetail.wxml b/pages/contractDetail/contractDetail.wxml index 9429d06..424be3e 100644 --- a/pages/contractDetail/contractDetail.wxml +++ b/pages/contractDetail/contractDetail.wxml @@ -5,7 +5,9 @@ - + + + 基本信息 @@ -22,10 +24,22 @@ 负责人 {{form.principalName}} + + 签订单位 + {{form.signedCompanyTemporaryName}} + + + 签订联系人 + {{form.signedContactsTemporaryName}} + 合同金额 {{form.contractAmount ? form.contractAmount + '元' : ''}} + + 创建时间 + {{form.createTime}} + 关联项目 diff --git a/pages/contractDetail/contractDetail.wxss b/pages/contractDetail/contractDetail.wxss index 442a517..89e1351 100644 --- a/pages/contractDetail/contractDetail.wxss +++ b/pages/contractDetail/contractDetail.wxss @@ -1,6 +1,9 @@ page{ box-sizing: border-box; } +.base { + position: relative; +} .basic-info .title{ height: 40px; } @@ -74,4 +77,15 @@ page{ display: block; line-height: 25px; margin: 0 !important; +} +/* 作废的图标 */ +.zuofei { + position: absolute; + width: 70rpx; + height: 60rpx; + transform: scale(1.5); + top: 6%; + right: 20%; + z-index: 2; + } \ No newline at end of file diff --git a/pages/home/home.wxml b/pages/home/home.wxml index f283a5b..2232ea7 100644 --- a/pages/home/home.wxml +++ b/pages/home/home.wxml @@ -69,7 +69,7 @@ - + {{clickItem.currentTarget.dataset.message.titile_dictText}} diff --git a/pages/project/project.js b/pages/project/project.js index e4c60de..0c8dbb6 100644 --- a/pages/project/project.js +++ b/pages/project/project.js @@ -74,6 +74,7 @@ Page({ }) }, loadData(){ + const that = this wx.showToast({ title: '加载中...', icon: 'loading' @@ -82,14 +83,14 @@ Page({ UserApi.projectList(this.data.searchParams).then(res=>{ if(res.success){ // 搜索时,把原数据清空,重新筛选 - if(this.data.searchParams.pageNo === 1) { - this.setData({ + if(that.data.searchParams.pageNo === 1) { + that.setData({ list: [] }) } if(res.result.records && res.result.records.length){ - this.setData({ - list: [...this.data.list, ...res.result.records] + that.setData({ + list: [...that.data.list, ...res.result.records] }) } } @@ -103,17 +104,27 @@ Page({ }else if(this.data.type == 'work'){ UserApi.workList(this.data.searchParams).then(res=>{ if(res.success){ + // 这里没有返回负责人的id + // 后端直接返回 + // res.result.records.map(async tt => { + // // tt.principalIdA + // let userInfo = await this.getUserInfoById('1432214744864772098') + // tt.userInfo = userInfo + // tt.name = userInfo.username + // }) + console.log(res.result.records); // 搜索时,把原数据清空,重新筛选 - if(this.data.searchParams.pageNo === 1) { - this.setData({ + if(that.data.searchParams.pageNo === 1) { + that.setData({ list: [] }) } if(res.result.records && res.result.records.length){ - this.setData({ - list: [...this.data.list, ...res.result.records] + that.setData({ + list: [...that.data.list, ...res.result.records] }) } + console.log(that.data.list,'this.data.list'); } }).catch(err=>{ wx.showToast({ @@ -146,6 +157,23 @@ Page({ }) } }, + /** + * @description 通过用户id获取用户信息 + * @param: id 用户id + */ + getUserInfoById(id){ + return new Promise(resolve => { + let result = {} + UserApi.getUserInfoNolimit({id:id}).then(res => { + if(res.success){ + result = res.result + } + }).finally( () => { + resolve(result) + }) + }) + + }, /** * 生命周期函数--监听页面加载 */ diff --git a/pages/project/project.wxml b/pages/project/project.wxml index 8a6d161..f47f2ce 100644 --- a/pages/project/project.wxml +++ b/pages/project/project.wxml @@ -38,12 +38,22 @@ {{item.chargeProject || item.projectName}} {{item.year || item.particularYear}}年 - + + + 项目负责人:{{item.name || item.directorName}} + 负责人电话:{{item.phone}} + 负责人邮箱:{{item.userInfo.email}} + 运行周期: + 缴费凭证: + + + + diff --git a/pages/project/project.wxss b/pages/project/project.wxss index d36c073..8301e15 100644 --- a/pages/project/project.wxss +++ b/pages/project/project.wxss @@ -30,7 +30,7 @@ page { padding: 15px; } .list-item{ - height: 90px; + height: auto; background-color: #fff; border-radius: 5px; padding: 10px 15px; @@ -63,6 +63,12 @@ page { text-align: right; flex-shrink: 0; } +.item-content { + width: 100%; + padding: 10rpx 0; + box-sizing: border-box; + font-size: 14px; +} .content-text{ width: 100%; color: #999; diff --git a/pages/projectDetail/projectDetail.js b/pages/projectDetail/projectDetail.js index 5c912f1..a6d59de 100644 --- a/pages/projectDetail/projectDetail.js +++ b/pages/projectDetail/projectDetail.js @@ -9,6 +9,7 @@ Page({ */ data: { statusBarHeight: wx.getSystemInfoSync()['statusBarHeight'], + type:'',//区别是哪个项目的项目详情 work工作组 form: {}, id: '', // 在工作组id,项目id workingGroupId: '', //工作组id @@ -105,6 +106,11 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + if(options.type){ + this.setData({ + type:options.type + }) + } if(options.type === 'ziliao'){ this.setData({ showProjectData:false diff --git a/pages/projectDetail/projectDetail.wxml b/pages/projectDetail/projectDetail.wxml index 33940b5..f2d9997 100644 --- a/pages/projectDetail/projectDetail.wxml +++ b/pages/projectDetail/projectDetail.wxml @@ -44,6 +44,11 @@ 打包 {{form.pack_dictText}} + + + 任务及目标 + + 需要发票 {{form.needInvoice_dictText}} @@ -56,7 +61,8 @@ 合同 - {{form.contractNum}} + + {{form.contractNum}} @@ -99,6 +105,8 @@ 到账信息 + + 请到pc端进行相关缴费操作 {{item.paymentDate}}到账{{item.amountReceived}}元 @@ -146,3 +154,5 @@ 暂无邮寄记录! + +在研项目和各种分发资料请到pc端查看 diff --git a/pages/projectDetail/projectDetail.wxss b/pages/projectDetail/projectDetail.wxss index ee34c74..14794eb 100644 --- a/pages/projectDetail/projectDetail.wxss +++ b/pages/projectDetail/projectDetail.wxss @@ -298,3 +298,10 @@ page{ text-align: center; line-height: 40px; } + +.tip { + font-size: 14px; + font-weight: 700; + color: #000; + text-align: center; +}