From 0fb07019ce1a429365990f951edd52e06209c117 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 29 Sep 2021 19:35:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataMember/DataMember.vue           | 189 +++++++++++-------
 src/views/meetingActivity/MeetingActivity.vue |   1 -
 2 files changed, 117 insertions(+), 73 deletions(-)

diff --git a/src/views/dataMember/DataMember.vue b/src/views/dataMember/DataMember.vue
index d657f60..e35c47e 100644
--- a/src/views/dataMember/DataMember.vue
+++ b/src/views/dataMember/DataMember.vue
@@ -1,102 +1,147 @@
 <template>
-  <div class="data-member">
-    <customize-table
-      :columns="columns"
-      :data-source="dataSource"
-    >
-     <template v-slot:text="record">
-       <div @click="d(record)">点击</div>
-     </template>
-    </customize-table>
+  <div style="min-width: 1100px">
+    <a-card :bordered="false">
+      <!--查询区域begin-->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :xl="6" :lg="8" :md="8" :sm="24">
+              <a-form-item label="项目名称">
+                <a-input placeholder="请输入项目名称" v-model="queryParam.projectName"></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.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.pack"></j-dict-select-tag>
+              </a-form-item>
+            </a-col>
+
+            <a-col :xl="6" :lg="8" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button class="reset-button" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!--查询区域end-->
+
+      <!--    表格区域-->
+      <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>
+      </div>
+      <!--    表格区域end-->
+
+    </a-card>
+
+    <project-detail-modal ref="projectDetail"></project-detail-modal>
   </div>
 </template>
 <script>
-import CustomizeTable from '@comp/CustomizeTable'
+import { JeroListMixin } from '@/mixins/JeroListMixin'
+import ProjectTable from '@comp/table/ProjectTable'
+import ProjectDetailModal from '@views/MessagePage/ProjectDetailModal'
 
 export default {
   name: 'DataMember',
-  components: {
-    CustomizeTable
-  },
+  components: { ProjectTable, ProjectDetailModal },
+  mixins: [JeroListMixin],
   data() {
     return {
       columns: [
         {
+          title: '',
+          dataIndex: 'projectName',
+          scopedSlots: 'projectName',
+          col: 4
+        }, {
           title: '应付金额',
-          dataIndex: 'itemText1',
-          scopedSlots:  'default'
-        },
-        {
+          dataIndex: 'receivableAmount',
+          col: 4
+        }, {
           title: '实付金额',
-          dataIndex: 'itemText2',
-          scopedSlots:  'text'
-        },
-        {
+          dataIndex: 'paidAmount',
+          col: 3
+        }, {
           title: '负责人',
-          dataIndex: 'itemText3',
-          scopedSlots:  'text'
-        },
-        {
+          dataIndex: 'principalName',
+          col: 3
+        }, {
           title: '打包',
-          dataIndex: 'itemText4',
-          scopedSlots:  'text'
-        },
-        {
+          dataIndex: 'pack',
+          scopedSlots: 'text',
+          col: 2
+        }, {
           title: '需要发票',
-          dataIndex: 'itemText5',
-          scopedSlots:  'text'
-        },
-        {
+          col: 2,
+          dataIndex: 'needInvoice',
+          scopedSlots: 'text',
+          slot: 'status'
+        }, {
           title: '到账',
-          dataIndex: 'itemText6',
-          scopedSlots:  'text'
-        },
-        {
+          dataIndex: 'inAccount',
+          scopedSlots: 'text',
+          col: 2
+        }, {
           title: '开票',
-          dataIndex: 'itemText7',
-          scopedSlots:  'text'
-        },
-        {
+          dataIndex: 'makeInvoice',
+          scopedSlots: 'text',
+          col: 2
+        }, {
           title: '邮寄',
-          dataIndex: 'itemText8',
-          scopedSlots:  'text'
-        },
+          dataIndex: 'mail',
+          scopedSlots: 'text',
+          col: 2
+        }
       ],
-      dataSource:[
-        {
-          itemText1:'应收金额1',
-          itemText2:'实付金额1',
-          itemText3:'负责人1',
-          itemText4:'打包1',
-          itemText5:'需要发票1',
-          itemText6:'到账1',
-          itemText7:'开票1',
-          itemText8:'开票18',
-        },
-        {
-          itemText1:'应收金额1',
-          itemText3:'负责人1',
-          itemText4:'打包1',
-          itemText7:'开票1',
-          itemText5:'需要发票1',
-          itemText6:'到账1',
-          itemText2:'实付金额1',
-          itemText8:'开票18',
-        },
-      ]
+      url: {
+        list: ''
+      }
     }
   },
   methods: {
-    d(val){
-      console.log(val)
+    /**
+     * 分页变化获取数据
+     * @param pagination
+     */
+    handlePageChange(pagination) {
+      this.ipagination.current = pagination.current
+      this.ipagination.pageSize = pagination.pageSize
+      this.loadData()
     }
   }
 }
 </script>
 <style scoped lang="less">
-.data-member {
-  padding: 20px;
-  width: 100%;
-  background: #fff;
+@import '~@assets/less/common.less';
+
+.project-name {
+  cursor: pointer;
+  font-size: 16px;
+  font-family: PingFang SC, PingFang SC-Bold;
+  font-weight: 700;
+  color: #069f99;
+  overflow: hidden;
+  word-break: keep-all;
+  text-overflow: ellipsis;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 2330ecb..85e536a 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -289,7 +289,6 @@ export default {
     *  打开会议详情
     * */
     openMeetingDetail(item){
-      debugger
       this.$refs.meetingDetail.open(item)
     }
   }