diff --git a/assets/images/zuofei.png b/assets/images/zuofei.png
new file mode 100644
index 0000000..c74edbd
Binary files /dev/null and b/assets/images/zuofei.png differ
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}}
+
+
项目资料
@@ -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;
+}