From 4c0b98922eee4bb1df8e7f9d92e2c74a4536bc89 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Thu, 30 Sep 2021 10:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/common.less                   |  6 ++
 src/components/table/ProjectTable.vue         |  2 +-
 src/mixins/JeroListMixin.js                   |  1 +
 src/views/dataDownload/DataDownload.vue       | 17 +++--
 src/views/mineProject/MineProject.vue         | 69 ++++++++++++-------
 src/views/subBidCommittee/SubBidCommittee.vue |  5 +-
 src/views/workTeam/WorkTeam.vue               | 62 ++++++++++-------
 7 files changed, 107 insertions(+), 55 deletions(-)

diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index d41a24b..e57a8e6 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -101,4 +101,10 @@
   color: #08B6AF;
   background: rgba(8,182,175,0.10);
   border: 1px solid #08b6af;
+}
+
+//页面边距
+.main-box {
+  min-width: 1100px;
+  margin: 12px 12px 0 12px;
 }
\ No newline at end of file
diff --git a/src/components/table/ProjectTable.vue b/src/components/table/ProjectTable.vue
index 5656f4e..30ee2bf 100644
--- a/src/components/table/ProjectTable.vue
+++ b/src/components/table/ProjectTable.vue
@@ -22,7 +22,7 @@
         <div class="table-item-content">
           <a-row>
             <a-col :span="tt.col" v-for="(tt, i) in columnData" :key="i">
-              <slot :name="tt.scopedSlots" :record="item">{{ item[tt.dataIndex] }}</slot>
+              <slot :name="tt.scopedSlots" :record="item" :text="item[tt.dataIndex]">{{ item[tt.dataIndex] }}</slot>
             </a-col>
           </a-row>
         </div>
diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js
index 90f18d4..af7b820 100644
--- a/src/mixins/JeroListMixin.js
+++ b/src/mixins/JeroListMixin.js
@@ -342,6 +342,7 @@ export const JeroListMixin = {
     /* 文件下载 */
     // update--autor:lvdandan-----date:20200630------for：修改下载文件方法名uploadFile改为downloadFile------
     downloadFile(text){
+      console.log(text)
       if(!text){
         this.$message.warning('未知的文件')
         return
diff --git a/src/views/dataDownload/DataDownload.vue b/src/views/dataDownload/DataDownload.vue
index ccb2627..eaa7a8a 100644
--- a/src/views/dataDownload/DataDownload.vue
+++ b/src/views/dataDownload/DataDownload.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="min-width: 1100px">
+  <div class="main-box">
     <a-card :bordered="false">
       <!--查询区域begin-->
       <div class="table-page-search-wrapper">
@@ -23,7 +23,7 @@
 
       <!--    操作按钮区域-->
       <div class="table-operator">
-        <a-button type="primary" @click="batchDistribute">批量下载</a-button>
+        <a-button type="primary" @click="batchDownloadFile">批量下载</a-button>
       </div>
       <!--    操作按钮区域-end-->
 
@@ -53,7 +53,7 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record" >
-            <a @click="handleDistribute(record.id)">批量下载</a>
+            <a @click="downloadFile(record)">下载</a>
           </span>
         </a-table>
       </div>
@@ -62,6 +62,7 @@
 </template>
 <script>
 import { JeroListMixin } from '@/mixins/JeroListMixin'
+import { downloadFile } from '@api/manage'
 
 export default {
   name: 'DataDownload',
@@ -115,7 +116,15 @@ export default {
       }
     }
   },
-  methods: {}
+  methods: {
+    downloadFile(record) {
+      console.log(record.fileId, record.fileName)
+      downloadFile(`sys/common/download/${record.fileId}`, record.fileName)
+    },
+    batchDownloadFile() {
+
+    }
+  }
 }
 </script>
 <style scoped lang="less">
diff --git a/src/views/mineProject/MineProject.vue b/src/views/mineProject/MineProject.vue
index d5c61f4..49d31bc 100644
--- a/src/views/mineProject/MineProject.vue
+++ b/src/views/mineProject/MineProject.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="min-width: 1100px">
+  <div class="main-box">
     <a-card :bordered="false">
       <!--查询区域begin-->
       <div class="table-page-search-wrapper">
@@ -7,19 +7,19 @@
           <a-row :gutter="24">
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
               <a-form-item label="项目名称">
-                <a-input placeholder="请输入项目名称" v-model="queryParam.meetingName"></a-input>
+                <a-input placeholder="请输入项目名称" v-model="queryParam.chargeProject"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
               <a-form-item label="需要发票">
                 <j-dict-select-tag dict-code="invoice_type" placeholder="请选择需要发票"
-                                   v-model="queryParam.meetingType"></j-dict-select-tag>
+                                   v-model="queryParam.needInvoice"></j-dict-select-tag>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
               <a-form-item label="打包项目">
-                <j-dict-select-tag dict-code="un" placeholder="请选择是否打包"
-                                   v-model="queryParam.meetingType"></j-dict-select-tag>
+                <j-dict-select-tag dict-code="yn" placeholder="请选择是否打包"
+                                   v-model="queryParam.pack"></j-dict-select-tag>
               </a-form-item>
             </a-col>
 
@@ -36,18 +36,34 @@
 
       <!--    表格区域-->
       <div>
-        <project-table :column-data="columns" :table-data="dataSource" @change="handlePageChange">
-          <!--          打包、需要发票、到账、开票、邮寄-->
-          <template v-slot:text="{record}">
-            <div @click="d(record)">{{ record.pack }}</div>
-          </template>
-          <!--          项目名称-->
-          <template v-slot:projectName="{record}">
-            <div @click="openDetailModal(record)" class="project-name">
-              {{ record.projectName }}
-            </div>
-          </template>
-        </project-table>
+        <a-spin :spinning="loading">
+          <project-table :column-data="columns" :table-data="dataSource" @change="handlePageChange">
+            <!--          打包、需要发票、到账、开票、邮寄-->
+            <template v-slot:status="{record, text}">
+              <div @click="d(record)">{{ text }}</div>
+            </template>
+            <!--          项目名称-->
+            <template v-slot:projectName="{record}">
+              <a-tooltip>
+                <template slot="title">
+                  {{ record.chargeProject }}
+                </template>
+                <div @click="openDetailModal(record)" class="project-name">
+                  {{ record.chargeProject }}
+                </div>
+              </a-tooltip>
+            </template>
+            <!--          需要tooltip的文本-->
+            <template v-slot:text="{record,text}">
+              <a-tooltip>
+                <template slot="title">
+                  {{ text }}
+                </template>
+                {{ text }}
+              </a-tooltip>
+            </template>
+          </project-table>
+        </a-spin>
       </div>
       <!--    表格区域end-->
     </a-card>
@@ -69,55 +85,59 @@ export default {
       columns: [
         {
           title: '',
-          dataIndex: 'projectName',
+          dataIndex: 'chargeProject',
           scopedSlots: 'projectName',
           col: 3
         }, {
           title: '项目用途',
           dataIndex: 'chargeUse_dictText',
+          scopedSlots: 'text',
           col: 3
         }, {
           title: '应付金额',
           dataIndex: 'receivableAmount',
+          scopedSlots: 'text',
           col: 3
         }, {
           title: '实付金额',
           dataIndex: 'paidAmount',
+          scopedSlots: 'text',
           col: 3
         }, {
           title: '负责人',
           dataIndex: 'principalName',
+          scopedSlots: 'text',
           col: 2
         }, {
           title: '打包',
           dataIndex: 'pack',
-          scopedSlots: 'text',
+          scopedSlots: 'status',
           col: 2
         }, {
           title: '需要发票',
           col: 2,
           dataIndex: 'needInvoice',
-          scopedSlots: 'text',
+          scopedSlots: 'status',
           slot: 'status'
         }, {
           title: '到账',
           dataIndex: 'inAccount',
-          scopedSlots: 'text',
+          scopedSlots: 'status',
           col: 2
         }, {
           title: '开票',
           dataIndex: 'makeInvoice',
-          scopedSlots: 'text',
+          scopedSlots: 'status',
           col: 2
         }, {
           title: '邮寄',
           dataIndex: 'mail',
-          scopedSlots: 'text',
+          scopedSlots: 'status',
           col: 2
         }
       ],
       url: {
-        list: ''
+        list: '/project/payCommonProject/queryCompanyPageList'
       }
     }
   },
@@ -136,6 +156,7 @@ export default {
 </script>
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+
 .project-name {
   cursor: pointer;
   font-size: 16px;
diff --git a/src/views/subBidCommittee/SubBidCommittee.vue b/src/views/subBidCommittee/SubBidCommittee.vue
index 5411109..5182bf7 100644
--- a/src/views/subBidCommittee/SubBidCommittee.vue
+++ b/src/views/subBidCommittee/SubBidCommittee.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="min-width: 1100px">
+  <div class="main-box">
     <a-card :bordered="false">
       <!--查询区域begin-->
       <div class="table-page-search-wrapper">
@@ -38,7 +38,7 @@
           </template>
 
           <!--          跳转分标委会议-->
-          <span slot="action" class="action-span-cell" slot-scope="text, record">
+          <span slot="action" class="action-span-cell" slot-scope="record">
             <a-button type="primary">分标委会议<a-icon type="right"/></a-button>
           </span>
         </a-table>
@@ -104,4 +104,5 @@ export default {
   word-break: keep-all;
   text-overflow: ellipsis;
 }
+
 </style>
\ No newline at end of file
diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue
index 2bc40ee..314f144 100644
--- a/src/views/workTeam/WorkTeam.vue
+++ b/src/views/workTeam/WorkTeam.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="min-width: 1100px">
+  <div class="main-box">
     <a-card :bordered="false">
       <!--查询区域begin-->
       <div class="table-page-search-wrapper">
@@ -7,19 +7,19 @@
           <a-row :gutter="24">
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
               <a-form-item label="项目名称">
-                <a-input placeholder="请输入项目名称" v-model="queryParam.meetingName"></a-input>
+                <a-input placeholder="请输入项目名称" v-model="queryParam.chargeProject"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
               <a-form-item label="需要发票">
                 <j-dict-select-tag dict-code="invoice_type" placeholder="请选择需要发票"
-                                   v-model="queryParam.meetingType"></j-dict-select-tag>
+                                   v-model="queryParam.needInvoice"></j-dict-select-tag>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="8" :md="8" :sm="24">
               <a-form-item label="打包项目">
-                <j-dict-select-tag dict-code="un" placeholder="请选择是否打包"
-                                   v-model="queryParam.meetingType"></j-dict-select-tag>
+                <j-dict-select-tag dict-code="yn" placeholder="请选择是否打包"
+                                   v-model="queryParam.pack"></j-dict-select-tag>
               </a-form-item>
             </a-col>
 
@@ -36,18 +36,29 @@
 
       <!--    表格区域-->
       <div>
-        <project-table :column-data="columns" :table-data="dataSource" @change="handlePageChange">
-          <!--          打包、需要发票、到账、开票、邮寄-->
-          <template v-slot:text="{record}">
-            <div @click="d(record)">{{ record.pack }}</div>
-          </template>
-          <!--          项目名称-->
-          <template v-slot:projectName="{record}">
-            <div @click="openDetailModal(record)" class="project-name">
-              {{ record.projectName }}
-            </div>
-          </template>
-        </project-table>
+        <a-spin :spinning="loading">
+          <project-table :column-data="columns" :table-data="dataSource" @change="handlePageChange">
+            <!--          打包、需要发票、到账、开票、邮寄-->
+            <template v-slot:status="{record, text}">
+              <div @click="d(record)">{{ text }}</div>
+            </template>
+            <!--          项目名称-->
+            <template v-slot:projectName="{record}">
+              <div @click="openDetailModal(record)" class="project-name">
+                {{ record.chargeProject }}
+              </div>
+            </template>
+            <!--          需要tooltip的文本-->
+            <template v-slot:text="{record,text}">
+              <a-tooltip>
+                <template slot="title">
+                  {{ text }}
+                </template>
+                {{ text }}
+              </a-tooltip>
+            </template>
+          </project-table>
+        </a-spin>
       </div>
       <!--    表格区域end-->
 
@@ -70,20 +81,23 @@ export default {
       columns: [
         {
           title: '',
-          dataIndex: 'projectName',
+          dataIndex: 'chargeProject',
           scopedSlots: 'projectName',
           col: 4
         }, {
           title: '应付金额',
           dataIndex: 'receivableAmount',
+          scopedSlots: 'text',
           col: 4
         }, {
           title: '实付金额',
           dataIndex: 'paidAmount',
+          scopedSlots: 'text',
           col: 3
         }, {
           title: '负责人',
-          dataIndex: 'principalName',
+          dataIndex: '',
+          scopedSlots: 'text',
           col: 3
         }, {
           title: '打包',
@@ -94,27 +108,27 @@ export default {
           title: '需要发票',
           col: 2,
           dataIndex: 'needInvoice',
-          scopedSlots: 'text',
+          scopedSlots: 'status',
           slot: 'status'
         }, {
           title: '到账',
           dataIndex: 'inAccount',
-          scopedSlots: 'text',
+          scopedSlots: 'status',
           col: 2
         }, {
           title: '开票',
           dataIndex: 'makeInvoice',
-          scopedSlots: 'text',
+          scopedSlots: 'status',
           col: 2
         }, {
           title: '邮寄',
           dataIndex: 'mail',
-          scopedSlots: 'text',
+          scopedSlots: 'status',
           col: 2
         }
       ],
       url: {
-        list: ''
+        list: '/project/payWorkingGroupSubitem/queryCompanyPageList'
       }
     }
   },