From 76334ae38d9bd9f5576a4cae54d2df429a565d85 Mon Sep 17 00:00:00 2001
From: "liu.xiaofeng@ebiz-digits.com" <liu.xiaofeng@ebiz-digits.com>
Date: Wed, 27 Dec 2023 16:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=B1=95=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=90=8E?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E5=B0=8F=E7=BB=84?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/GBC/GBC.js            |  9 +++++++
 src/views/GBC/home.vue        |  7 ++++-
 src/views/GBC/projectList.vue | 50 +++++++++++++----------------------
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/api/GBC/GBC.js b/src/api/GBC/GBC.js
index 54876917a..b35f66e8f 100644
--- a/src/api/GBC/GBC.js
+++ b/src/api/GBC/GBC.js
@@ -45,5 +45,14 @@ export function getDepartmentByProjectNo(data) {
   })
 }
 
+// 按年份查询登录人所属项目列表
+export function getGBCprojectlistByYear(data) {
+  return request({
+    url: getUrl('/agent/gbc/project/listByYear', 1),
+    method: 'post',
+    data
+  })
+}
+
 
 
diff --git a/src/views/GBC/home.vue b/src/views/GBC/home.vue
index 01ca36aac..df1cbeed9 100644
--- a/src/views/GBC/home.vue
+++ b/src/views/GBC/home.vue
@@ -46,7 +46,12 @@
       <div class="chooseProjectDialog" style="padding: 20px 30px 30px;font-size: 14px;">
         <van-radio-group v-model="chooseProjectCode">
           <van-radio v-for="(item,index) in projectList" :key="index" :name="item.projectCode" style="margin: 10px;">
-            <span style="margin-left: 20px;">{{item.projectName}}</span>
+            <span style="margin-left: 20px;">
+              {{item.projectName}}
+              <span v-if="item.teamName" style="margin-left: 10px;color: #a7a7a7;">
+                ({{item.teamName}})
+              </span>
+            </span>
           </van-radio>
         </van-radio-group>
       </div>
diff --git a/src/views/GBC/projectList.vue b/src/views/GBC/projectList.vue
index 9a86e2d2f..622a43b17 100644
--- a/src/views/GBC/projectList.vue
+++ b/src/views/GBC/projectList.vue
@@ -4,7 +4,7 @@
     <div style="padding: 10px;">
       <van-collapse v-for="item in yearList" :key="item.year" v-model="activeNames" style="margin-top: 10px;border-radius: 5px;">
         <van-collapse-item :title="item.year" :name="item.year">
-          <div v-for="(ii,iis) in item.projectList" @click="goprojectDetail(ii)" :key="iis" style="display: flex;justify-content: space-between;align-items: center;padding: 10px;border-bottom: 1px solid #eee;">
+          <div v-for="(ii,iis) in item.projects" @click="goprojectDetail(ii)" :key="iis" style="display: flex;justify-content: space-between;align-items: center;padding: 10px;border-bottom: 1px solid #eee;">
             <div>
               <p style="color:#323233;margin-bottom: 10px;">{{ii.projectName}}</p>
               <p v-if="ii.enable == '1'">服务起止日期<span style="margin-left: 10px;">{{ii.startDate}}至{{ii.endDate}}</span></p>
@@ -20,6 +20,7 @@
 
 <script>
 import { Search, Collapse, CollapseItem, Icon } from 'vant'
+import { getGBCprojectlistByYear } from '@/api/GBC/GBC'
 
 export default {
   components: {
@@ -32,44 +33,31 @@ export default {
     return {
       searchvalue:'',
       activeNames: [],
-      yearList:[
-        {
-          year:'2023年项目',
-          projectList:[
-            {projectName:'国富人寿AA项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'1'},
-            {projectName:'国富人寿BB项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'1'},
-            {projectName:'国富人寿CC项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'1'},
-            {projectName:'国富人寿DD项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'0'},
-          ],
-        },
-        {
-          year:'2022年项目',
-          projectList:[
-            {projectName:'国富人寿AA项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'1'},
-            {projectName:'国富人寿BB项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'1'},
-            {projectName:'国富人寿CC项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'1'},
-            {projectName:'国富人寿DD项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'0'},
-          ],
-        },
-        {
-          year:'2021年项目',
-          projectList:[
-            {projectName:'国富人寿AA项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'1'},
-            {projectName:'国富人寿BB项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'1'},
-            {projectName:'国富人寿CC项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'1'},
-            {projectName:'国富人寿DD项目',projectCode:'PID0000000',startDate:'2023-12-30',endDate:'2024-02-28',enable:'0'},
-          ],
-        },
-      ],
+      yearList:[],
     }
   },
   created() {
 
   },
   mounted(){
-
+    this.getGBCprojectlistByYear()
   },
   methods: {
+    getGBCprojectlistByYear(){
+      let params = {
+
+      }
+      getGBCprojectlistByYear(params).then(res=>{
+        if(res.result == '0') {
+          this.yearList = []
+          if(res.content && res.content.length != 0) {
+            this.yearList = res.content
+          }
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
+    },
     goprojectDetail(data){
       this.$router.push({
         path:'/GBC/projectDetail',