From 06b5ac09db9527dc0cfd4ef88b25f79a7df9fce6 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 19 Oct 2021 16:02:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98=E7=9A=84?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/http/userApi.js  |  4 +++-
 pages/home/home.js         |  2 +-
 pages/project/project.js   | 38 ++++++++++++++++++++++++++++++++++----
 pages/project/project.wxml |  4 ++--
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/assets/js/http/userApi.js b/assets/js/http/userApi.js
index 9d6f4c9..43d6850 100644
--- a/assets/js/http/userApi.js
+++ b/assets/js/http/userApi.js
@@ -69,6 +69,8 @@ const UserApi = {
   committeeList: (params) => http.get(`${URL_CONFIG}payCaseCommittee/payCaseCommittee/list`, params),
   // 分标委详情
   committeeDetail: (params) => http.get(`${URL_CONFIG}payCaseCommittee/payCaseCommittee/detail`, params),
+  // 资料网员分页接口
+  queryDataMemberList: (params) => http.get(`${URL_CONFIG}jero/memberProjectSubitem/pageCompany`, params),
 }
 
-export default UserApi
+export default UserApi
\ No newline at end of file
diff --git a/pages/home/home.js b/pages/home/home.js
index 227a1de..8addc5c 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -83,7 +83,7 @@ Page({
       url = '../meeting/meeting'
     } else{ // 资料网员
       // url = '../data/data'
-      url = '../project/project'
+      url = '../project/project?type=ziliao'
     }
     wx.navigateTo({
       url,
diff --git a/pages/project/project.js b/pages/project/project.js
index 96056b1..d989121 100644
--- a/pages/project/project.js
+++ b/pages/project/project.js
@@ -6,7 +6,7 @@ Page({
    */
   data: {
     index: 0,
-    type: '', // project 是来款项目 work 是工作组
+    type: '', // project 是来款项目 work 是工作组 ziliao是资料网员
     list: [], // 项目列表
     searchParams: {
       pageNo: 1,
@@ -14,6 +14,7 @@ Page({
       needInvoice: '', // 是否需要发票 0 4
       pack: '', // 是否打包 0 1
       year: '', // 运行年份
+      particularYear:'',// 资料网元的运行年份
     }
   },
   // 发票改变
@@ -47,9 +48,16 @@ Page({
   },
   bindDateChange(e){
     this.data.searchParams.pageNo = 1
-    this.setData({
-      "searchParams.year": e.detail.value
-    })
+    // 资料网员的年份查询字段与其他的不一样
+    if(this.data.type === 'ziliao'){
+      this.setData({
+        "searchParams.particularYear": e.detail.value
+      })
+    }else{
+      this.setData({
+        "searchParams.year": e.detail.value
+      })
+    }
     this.loadData()
   },
   // 项目详情
@@ -108,6 +116,28 @@ Page({
           duration: 2000
         })
       })
+    }else if(this.data.type == 'ziliao'){
+      UserApi.queryDataMemberList(this.data.searchParams).then(res=>{
+        if(res.success){
+          // 搜索时，把原数据清空，重新筛选
+          if(this.data.searchParams.pageNo === 1) {
+            this.setData({
+              list: []
+            })
+          }
+          if(res.result.records && res.result.records.length){
+            this.setData({
+              list: [...this.data.list, ...res.result.records]
+            })
+          }
+        }
+      }).catch(err=>{
+        wx.showToast({
+          title: '加载失败',
+          icon: 'fail',
+          duration: 2000
+        })
+      })
     }
   },
   /**
diff --git a/pages/project/project.wxml b/pages/project/project.wxml
index 444bba9..20915bf 100644
--- a/pages/project/project.wxml
+++ b/pages/project/project.wxml
@@ -28,8 +28,8 @@
 <view class="list">
 	<view class="list-item" wx:for="{{list}}" bindtap="projectDetail" wx:key="item" data-project="{{item}}">
 		<view class="title">
-			<text>{{item.chargeProject}}</text>
-			<text>{{item.year}}年</text>
+			<text>{{item.chargeProject || item.projectName}}</text>
+			<text>{{item.year || item.particularYear}}年</text>
 		</view>
 		<view class="content-text">
 			<text class="{{item.needInvoice === 0 ? '' : 'all'}}">{{item.needInvoice === 0 ? '不需要发票' : '需要发票'}}</text>