From 284fd5f687b36fc800b595b09fe601461dcdd6b9 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Sat, 9 Oct 2021 13:48:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B8=8E=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/GlobalHeader.vue          | 11 +++-
 src/components/table/ProjectTable.vue         |  8 +--
 src/views/dashboard/Analysis.vue              | 38 ++++++++++++--
 src/views/dataMember/DataMember.vue           | 50 +++++++++++++------
 src/views/subBidCommittee/SubBidCommittee.vue | 16 +++++-
 src/views/workTeam/WorkTeam.vue               | 13 +++++
 6 files changed, 111 insertions(+), 25 deletions(-)

diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index 409651e..5024e7c 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- , width: fixedHeader ? `calc(100% - ${sidebarOpened ? 256 : 80}px)` : '100%'  -->
   <a-layout-header
-    v-if="!headerBarFixed"
+    v-if="!headerBarFixed && !isIndexBool"
     :class="[fixedHeader && 'ant-header-fixedHeader', sidebarOpened ? 'ant-header-side-opened' : 'ant-header-side-closed', ]"
     :style="{ padding: '0' }">
 
@@ -99,8 +99,13 @@
           topSmenuStyle: {}
         },
         chatStatus: '',
+        isIndexBool:true,
       }
     },
+    created() {
+      // 防止刷新页面 上面导航栏不存在
+      this.isIndexBool = this.$route.path === '/dashboard/analysis'
+    },
     watch: {
       /** 监听设备变化 */
       device() {
@@ -113,6 +118,10 @@
         if (newVal === 'topmenu') {
           this.buildTopMenuStyle()
         }
+      },
+      /** 监听是否是首页 */
+      $route(val){
+        this.isIndexBool = val.path === '/dashboard/analysis'
       }
     },
     //update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
diff --git a/src/components/table/ProjectTable.vue b/src/components/table/ProjectTable.vue
index eac9b8e..5f4c89b 100644
--- a/src/components/table/ProjectTable.vue
+++ b/src/components/table/ProjectTable.vue
@@ -13,9 +13,11 @@
         <!--        上面的创建时间和按钮-->
         <div class="table-item-title">
           <span>{{ item.createTime }}</span>
-          <a-button type="primary" v-if="showMeetingBtn" @click="toMeeting">{{ buttonText }}
-            <a-icon type="right"></a-icon>
-          </a-button>
+          <slot name="meeting">
+            <a-button type="primary" v-if="showMeetingBtn" @click="toMeeting">{{ buttonText }}
+              <a-icon type="right"></a-icon>
+            </a-button>
+          </slot>
         </div>
 
         <!--        数据内容-->
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 5c6aa2a..7ee1b52 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -13,16 +13,25 @@
       </div>
       <div class="message-list">
         <div class="message-list-content">
-          <div class="message-list-title">
+          <div class="message-list-title" style="margin-bottom: 10px;">
             <img src="../../assets/indexImgs/file.png" />
             <span class="my-notice">我的消息</span>
             <span class="query-list" @click="toUserAnnouncementList">查看更多></span>
           </div>
           <div >
             <div class="message-list-item" v-for="item of dataMessageList" :key="item.id">
-              <div>【{{item.titile_dictText}}】<span v-html="item.msgContent"></span></div>
+              <div style="display: flex">
+                <div>【{{item.titile_dictText}}】</div>
+                <a-tooltip>
+                  <template slot="title">
+                    <span v-html="item.msgContent" class="ellipsis-span"></span>
+                  </template>
+                  <span v-html="myEllipsis(item.msgContent,30)" class="ellipsis-span"></span>
+                </a-tooltip>
+              </div>
+<!--              <span v-html="item.msgContent"></span>-->
               <span>{{item.sendTime}}</span>
-              <span>操作</span>
+              <span class="operate">操作</span>
             </div>
           </div>
         </div>
@@ -71,7 +80,19 @@ export default {
       this.$router.push({
         path:'/system/userAnnouncementList'
       })
-    }
+    },
+    /*
+     * 字符串截取
+     * * */
+    myEllipsis(value, vlength = 25) {
+      if (!value) {
+        return value
+      }
+      if (value.length > vlength) {
+        return value.slice(0, vlength) + '...'
+      }
+      return value
+    },
   }
 }
 </script>
@@ -81,7 +102,7 @@ export default {
   position: relative;
   width: 100%;
   min-width: 1100px;
-  height: calc(100vh - 59px);
+  height: 100vh;
 }
 
 .index-bgimg {
@@ -157,10 +178,17 @@ export default {
     }
     &-item{
       display: flex;
+      justify-content: space-between;
+      font-size: 14px;
+      color: #FFF;
+      font-weight: 500;
     }
   }
 }
 .center {
   text-align: center;
 }
+.operate {
+  //width: 150px;
+}
 </style>
diff --git a/src/views/dataMember/DataMember.vue b/src/views/dataMember/DataMember.vue
index e35c47e..9a6e077 100644
--- a/src/views/dataMember/DataMember.vue
+++ b/src/views/dataMember/DataMember.vue
@@ -18,7 +18,7 @@
             </a-col>
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
               <a-form-item label="打包项目">
-                <j-dict-select-tag dict-code="un" placeholder="请选择是否打包"
+                <j-dict-select-tag dict-code="yn" placeholder="请选择是否打包"
                                    v-model="queryParam.pack"></j-dict-select-tag>
               </a-form-item>
             </a-col>
@@ -36,18 +36,38 @@
 
       <!--    表格区域-->
       <div>
+        <a-spin :spinning="loading">
         <project-table :column-data="columns" :table-data="dataSource" @change="handlePageChange">
-          <!--          打包、需要发票、到账、开票、邮寄-->
-          <template v-slot:text="{record}">
-            <div @click="d(record)">{{ record.pack }}</div>
+          <!--          打包、需要发票-->
+          <template v-slot:status-pack="{record, text}">
+            <status-slot :statu-obj="record" :status-no="text"></status-slot>
+          </template>
+          <!--            到账-->
+          <template v-slot:status="{record, text}">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+          </template>
+          <!--            开票-->
+          <template v-slot:status-bill="{record, text}">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="bill"></status-slot>
+          </template>
+          <!--            邮寄-->
+          <template v-slot:status-mail="{record, text}">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true" status-key="mail"></status-slot>
           </template>
           <!--          项目名称-->
           <template v-slot:projectName="{record}">
             <div @click="openDetailModal(record)" class="project-name">
-              {{ record.projectName }}
+              {{ record.chargeProject }}
+            </div>
+          </template>
+          <!--          项目名称-->
+          <template v-slot:projectName="{record}">
+            <div @click="openDetailModal(record)" class="project-name">
+              {{ record.companyName }}
             </div>
           </template>
         </project-table>
+        </a-spin>
       </div>
       <!--    表格区域end-->
 
@@ -60,22 +80,23 @@
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import ProjectTable from '@comp/table/ProjectTable'
 import ProjectDetailModal from '@views/MessagePage/ProjectDetailModal'
+import StatusSlot from '@comp/tools/StatusSlot'
 
 export default {
   name: 'DataMember',
-  components: { ProjectTable, ProjectDetailModal },
+  components: { ProjectTable, ProjectDetailModal,StatusSlot },
   mixins: [JeroListMixin],
   data() {
     return {
       columns: [
         {
           title: '',
-          dataIndex: 'projectName',
+          dataIndex: 'companyName',
           scopedSlots: 'projectName',
           col: 4
         }, {
           title: '应付金额',
-          dataIndex: 'receivableAmount',
+          dataIndex: 'amountReceivable',
           col: 4
         }, {
           title: '实付金额',
@@ -88,33 +109,34 @@ export default {
         }, {
           title: '打包',
           dataIndex: 'pack',
-          scopedSlots: 'text',
+          scopedSlots: 'status-pack',
           col: 2
         }, {
           title: '需要发票',
           col: 2,
           dataIndex: 'needInvoice',
-          scopedSlots: 'text',
+          scopedSlots: 'status-pack',
           slot: 'status'
         }, {
           title: '到账',
           dataIndex: 'inAccount',
-          scopedSlots: 'text',
+          scopedSlots: 'status',
           col: 2
         }, {
           title: '开票',
           dataIndex: 'makeInvoice',
-          scopedSlots: 'text',
+          scopedSlots: 'status-bill',
           col: 2
         }, {
           title: '邮寄',
           dataIndex: 'mail',
-          scopedSlots: 'text',
+          scopedSlots: 'status-mail',
           col: 2
         }
       ],
+      loading:false,
       url: {
-        list: ''
+        list: '/jero/memberProjectSubitem/pageCompany'
       }
     }
   },
diff --git a/src/views/subBidCommittee/SubBidCommittee.vue b/src/views/subBidCommittee/SubBidCommittee.vue
index 5182bf7..0778225 100644
--- a/src/views/subBidCommittee/SubBidCommittee.vue
+++ b/src/views/subBidCommittee/SubBidCommittee.vue
@@ -38,8 +38,8 @@
           </template>
 
           <!--          跳转分标委会议-->
-          <span slot="action" class="action-span-cell" slot-scope="record">
-            <a-button type="primary">分标委会议<a-icon type="right"/></a-button>
+          <span slot="action" class="action-span-cell" slot-scope="text,record">
+            <a-button type="primary" @click="toCommitteeMeeting(record)">分标委会议<a-icon type="right"/></a-button>
           </span>
         </a-table>
       </div>
@@ -87,6 +87,18 @@ export default {
     openDetail(record) {
       this.$refs.detail.committeeId = record.id
       this.$refs.detail.open()
+    },
+    /*
+    * 分标委会议
+    * */
+    toCommitteeMeeting(record){
+      this.$router.push({
+        path:'/meetingActivity/MeetingActivity',
+        query:{
+          meetingType:'5',
+          id:record.id
+        }
+      })
     }
   }
 }
diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue
index d528cc2..df51f3b 100644
--- a/src/views/workTeam/WorkTeam.vue
+++ b/src/views/workTeam/WorkTeam.vue
@@ -69,6 +69,11 @@
                 {{ text }}
               </a-tooltip>
             </template>
+            <template v-slot:meeting>
+              <a-button type="primary" @click="toMeeting">工作组会议
+                <a-icon type="right"></a-icon>
+              </a-button>
+            </template>
           </project-table>
         </a-spin>
       </div>
@@ -154,6 +159,14 @@ export default {
       this.ipagination.current = pagination.current
       this.ipagination.pageSize = pagination.pageSize
       this.loadData()
+    },
+    toMeeting() {
+      this.$router.push({
+        path: '/meetingActivity/MeetingActivity',
+        query:{
+          meetingType:'1'
+        }
+      })
     }
   }
 }