【修改】项目字段修改

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

pages/committee/committee.wxml

@@ -9,6 +9,7 @@
 <view>
 	<view class="item" wx:for="{{list}}" wx:key="item" bindtap="detail" data-committee="{{item}}">
 		<text>{{item.name}}</text>
+		<view>项目负责人:{{item.principal}}</view>
 	</view>
 	<view>
 		<text class="no-data" wx:if="{{list.length == 0}}">暂无数据</text>

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;

pages/committeeDetail/committeeDetail.wxml

@@ -4,6 +4,14 @@
 			<text>项目名称</text>
 			<text>{{name}}</text>
 		</view>
+		<view class="meeting-name">
+			<text>项目负责人</text>
+			<text>{{form.principal}}</text>
+		</view>
+		<view class="remark">
+			<text>目标简介</text>
+			<text>{{form.remarks}}</text>
+		</view>
 		<view style="height: auto !important;">
 			<text>项目资料</text>
 			<view class="info-file" wx:if="{{form.files && form.files.length}}">
@@ -27,3 +35,5 @@
 		<text wx:if="{{meetingList.length == 0}}" class="no-data" style="height: 40px;">暂无会议记录！</text>
 	</view>
 </view>
+
+<view class="tips"> 更多功能和信息请到pc端操作</view>

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;
+}

pages/contractDetail/contractDetail.wxml

@@ -5,7 +5,9 @@
 </view>
 <view class="empty_custom" style="padding-top:{{statusBarHeight}}px"></view><!-- 空view用来填充自定义头部的padding-top -->
 <!-- 自定义头部end -->
-<view>
+<view class="base">
+<!-- 作废的图标 -->
+<image src="../../assets/images/zuofei.png" class="zuofei" wx:if="{{form.status === 6}}"></image>
 	<view class="basic-info">
 		<view class="title">
 			<text>基本信息</text>
@@ -22,10 +24,22 @@
 			<text>负责人</text>
 			<text>{{form.principalName}}</text>
 		</view>
+		<view>
+			<text>签订单位</text>
+			<text>{{form.signedCompanyTemporaryName}}</text>
+		</view>
+		<view>
+			<text>签订联系人</text>
+			<text>{{form.signedContactsTemporaryName}}</text>
+		</view>
 		<view>
 			<text>合同金额</text>
 			<text>{{form.contractAmount ? form.contractAmount + '元' : ''}}</text>
 		</view>
+		<view>
+			<text>创建时间</text>
+			<text>{{form.createTime}}</text>
+		</view>
 		<view>
 			<text>关联项目</text>
 			<view class="ass-project">

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;
+
 }

pages/home/home.wxml

@@ -69,7 +69,7 @@
   <view class="modal-mask" bindtap="hideModal" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
   <view class="modal-dialog" wx:if="{{showModal}}">
     <view class="modal-content">
-    <image src="../../assets/images/msg.png" style="width:200rpx;height:200rpx; position: absolute;top: 50%;left: 50%;transform: translate(-50%,-186%);"></image>
+    <image src="../../assets/images/msg.png" style="width:200rpx;height:200rpx; position: absolute;top: 50%;left: 50%;transform: translate(-50%,-146%);"></image>
       <!-- {{content}} -->
       <view class="title">{{clickItem.currentTarget.dataset.message.titile_dictText}}</view>
       <!-- rich-text 会解析html模板中的html标签 -->

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)
+      })
+    })
+
+  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/project/project.wxml

@@ -38,12 +38,22 @@
 			<text>{{item.chargeProject || item.projectName}}</text>
 			<text>{{item.year || item.particularYear}}年</text>
 		</view>
-		<view class="content-text">
+		<!-- 工作组项目展示begin -->
+		<block>
+			<view class="item-content">项目负责人：{{item.name || item.directorName}}</view>
+			<view class="item-content">负责人电话：{{item.phone}}</view>
+			<view class="item-content">负责人邮箱：{{item.userInfo.email}}</view>
+			<view class="item-content">运行周期：</view>
+			<view class="item-content">缴费凭证:</view>
+		</block>
+		<!-- 工作组项目展示end -->
+		<!-- 应该是不要了 -->
+		<!-- <view class="content-text">
 			<text class="{{item.needInvoice === 0 ? '' : 'all'}}">{{item.needInvoice === 0 ? '不需要发票' : '需要发票'}}</text>
 			<text class="{{item.inAccount === 0 ? '' : item.inAccount === 2 ? 'half' : 'all'}}">到账</text>
 			<text class="{{item.makeInvoice === 0 ? '' : item.makeInvoice === 2 ? 'half' : 'all'}}">开票</text>
 			<text class="{{item.mail === 0 ? '' : 'all'}}">邮寄</text>
-		</view>
+		</view> -->
 	</view>
 </view>
 <view wx:if="{{list.length === 0}}" class="no-data">

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;

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

pages/projectDetail/projectDetail.wxml

@@ -44,6 +44,11 @@
 			<text>打包</text>
 			<text>{{form.pack_dictText}}</text>
 		</view>
+		<!-- 工作组项目展示 -->
+		<view style="height:auto" wx:if="{{type === 'work' }}">
+			<text>任务及目标</text>
+			<text></text>
+		</view>
 		<view>
 			<text>需要发票</text>
 			<text>{{form.needInvoice_dictText}}</text>
@@ -56,7 +61,8 @@
 		<view wx:if="{{form.chargeWay === 2}}">
 			<text>合同</text>
 			<!-- 跳转到合同详情 -->
-			<text class="color-green" bindtap="contractDetail">{{form.contractNum}}</text>
+			<!-- class="color-green" bindtap="contractDetail" 去掉跳转 -->
+			<text>{{form.contractNum}}</text>
 		</view>
 		<!-- 付款方式为收费通知才有 -->
 		<view wx:if="{{form.chargeWay === 3}}">
@@ -99,6 +105,8 @@
 	<view class="basic-info" style="margin-top: 10px;">
 		<view class="title">
 			<text>到账信息</text>
+			<!-- 工作组显示 -->
+			<view class="tip" wx:if="{{type === 'work' || type === 'project' }}">请到pc端进行相关缴费操作</view>
 		</view>
 		<view style="padding: 0 15px;" wx:for="{{form.paymentRecord}}" wx:key="item">
 			<text wx:if="{{form.paymentRecord && form.paymentRecord.length}}">{{item.paymentDate}}到账{{item.amountReceived}}元</text>
@@ -146,3 +154,5 @@
 		<text class="no-data" style="height: 50px;" wx:if="{{!form.mailBill}}">暂无邮寄记录！</text>
 	</view>
 </view>
+<!-- 工作组展示 -->
+<view class="tip" wx:if="{{type === 'work' }}">在研项目和各种分发资料请到pc端查看</view>

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;
+}