From f52be8175199c0a4b54a6b74ee067a170e497c58 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 29 Sep 2021 15:40:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js          |   2 +-
 src/components/layouts/TabLayout.vue  |   2 +-
 src/components/table/ProjectTable.vue | 165 ++++++++++++++++++++++++++
 src/views/mineProject/MineProject.vue | 137 ++++++++++++++++++++-
 src/views/system/AccountCenter.vue    |  62 +++++-----
 5 files changed, 333 insertions(+), 35 deletions(-)
 create mode 100644 src/components/table/ProjectTable.vue

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index ae842d7..29a0b93 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -8,7 +8,7 @@ const getSingUpUserInfo = (params) => getAction('/meeting/payMeetingSituation/qu
 // 通过id获取用户信息(联系人)
 const getContactUserInfo = (param) => getAction('/company/payContactsManagement/queryByIdMeeting', param)
 // 编辑用户信息
-const editUserInfo = (param) => postAction('', param)
+const editUserInfo = (param) => postAction('/company/payContactsManagement/companyEdit', param)
 
 export {
   queryCommonProjectById,
diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index 092d87e..882045c 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -18,7 +18,7 @@
         <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
       </a-tab-pane>
     </a-tabs>
-    <div style="margin: 12px 12px 0;">
+    <div style="margin: 12px 12px 0; overflow: auto">
       <!-- update-begin-author:taoyan date:20201221 for:此处删掉transition标签 不知道为什么加上后 页面路由切换的时候即1及菜单切到2及菜单的时候 两个菜单页面会同时出现300-500秒左右 -->
       <keep-alive v-if="multipage">
         <router-view v-if="reloadFlag"/>
diff --git a/src/components/table/ProjectTable.vue b/src/components/table/ProjectTable.vue
new file mode 100644
index 0000000..f4a7578
--- /dev/null
+++ b/src/components/table/ProjectTable.vue
@@ -0,0 +1,165 @@
+<template>
+  <div>
+    <!--    表头-->
+    <div class="column">
+      <a-row>
+        <a-col :span="item.col" v-for="(item, index) in columnData" :key="index">{{ item.title }}</a-col>
+      </a-row>
+    </div>
+
+    <!--    表格内容-->
+    <div v-if="tableData.length > 0">
+      <div v-for="(item, index) in tableData" :key="index" class="table-item">
+        <!--        上面的创建时间和按钮-->
+        <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>
+        </div>
+
+        <!--        数据内容-->
+        <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>
+            </a-col>
+          </a-row>
+        </div>
+      </div>
+    </div>
+
+    <a-empty v-else style="margin: 30px 0"></a-empty>
+
+    <!--    分页-->
+    <div style="float: right; margin-top: 20px">
+      <a-pagination
+        show-quick-jumper
+        showSizeChanger
+        :pageSizeOptions="['10', '20', '30']"
+        :showTotal="(total, range) => {return range[0] + '-' + range[1] + ' 共' + total + '条'}"
+        :default-current="2"
+        :total="tableData.length"
+        @change="handleTabelChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ProjectTable',
+  props: {
+    columnData: {
+      type: Array,
+      required: false,
+      default: () => {
+        return []
+      }
+    },
+    // 表格数据
+    tableData: {
+      type: Array,
+      required: false,
+      default: () => {
+        return []
+      }
+    },
+    // 是否显示跳转会议的按钮
+    showMeetingBtn: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    // 按钮上显示的文字
+    buttonText: {
+      type: String,
+      required: false,
+      default: ''
+    }
+  },
+  data() {
+    return {}
+  },
+  methods: {
+    /**
+     * 分页变化抛出值
+     * @param page
+     * @param pageSize
+     */
+    handleTabelChange(page, pageSize) {
+      let pagination = {
+        current: page,
+        pageSize: pageSize
+      }
+      this.$emit('change', pagination)
+    },
+    /**
+     * 跳转至会议页面
+     */
+    toMeeting() {
+      this.$router.push({
+        path: '/meetingActivity/MeetingActivity'
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.column {
+  height: 50px;
+  background: #f0f1f2;
+
+  .ant-col {
+    text-align: center;
+    line-height: 50px;
+    font-size: 14px;
+    font-family: PingFang SC, PingFang SC-Bold;
+    font-weight: 700;
+    color: #333333;
+    padding: 0 15px;
+    overflow: hidden;
+    word-break: keep-all;
+    text-overflow: ellipsis;
+  }
+}
+
+.table-item {
+  margin-top: 10px;
+  height: 130px;
+  box-sizing: border-box;
+  border: 1px solid #d5d5d5;
+
+  &-title {
+    height: 60px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: #f0f1f2;
+    box-shadow: -1px 0px 0px 0px #e3e3e5;
+    padding: 0 15px;
+  }
+
+  &-content {
+    height: 70px;
+
+    .ant-col:first-child {
+      font-size: 16px;
+      font-family: PingFang SC, PingFang SC-Bold;
+      font-weight: 700;
+      color: #069f99;
+    }
+
+    .ant-col {
+      text-align: center;
+      padding: 0 15px;
+      height: 100%;
+      line-height: 70px;
+      overflow: hidden;
+      word-break: keep-all;
+      text-overflow: ellipsis;
+    }
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/views/mineProject/MineProject.vue b/src/views/mineProject/MineProject.vue
index d215660..40dc92c 100644
--- a/src/views/mineProject/MineProject.vue
+++ b/src/views/mineProject/MineProject.vue
@@ -1,13 +1,144 @@
 <template>
-  <div>我的项目</div>
+  <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.meetingName"></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>
+              </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>
+              </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)">点击</div>
+          </template>
+        </project-table>
+      </div>
+      <!--    表格区域end-->
+
+    </a-card>
+  </div>
 </template>
 <script>
+import { JeroListMixin } from '@/mixins/JeroListMixin'
+import ProjectTable from '@comp/table/ProjectTable'
+
 export default {
   name: 'MineProject',
+  components: { ProjectTable },
+  mixins: [JeroListMixin],
   data() {
-    return {}
+    return {
+      columns: [
+        {
+          title: '',
+          dataIndex: 'projectName',
+          col: 3
+        }, {
+          title: '项目用途',
+          dataIndex: 'chargeUse_dictText',
+          col: 3
+        }, {
+          title: '应付金额',
+          dataIndex: 'receivableAmount',
+          col: 3
+        }, {
+          title: '实付金额',
+          dataIndex: 'paidAmount',
+          col: 3
+        }, {
+          title: '负责人',
+          dataIndex: 'principalName',
+          col: 2
+        }, {
+          title: '打包',
+          dataIndex: 'pack',
+          scopedSlots: 'text',
+          col: 2
+        }, {
+          title: '需要发票',
+          col: 2,
+          dataIndex: 'needInvoice',
+          scopedSlots: 'text',
+          slot: 'status'
+        }, {
+          title: '到账',
+          dataIndex: 'inAccount',
+          scopedSlots: 'text',
+          col: 2
+        }, {
+          title: '开票',
+          dataIndex: 'makeInvoice',
+          scopedSlots: 'text',
+          col: 2
+        }, {
+          title: '邮寄',
+          dataIndex: 'mail',
+          scopedSlots: 'text',
+          col: 2
+        }
+      ],
+      dataSource: [
+        {
+          id: 1,
+          projectName: 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+          chargeUse: '标准所来款',
+          chargeUse_dictText: '展位文字',
+          receivableAmount: '展位文字',
+          paidAmount: '展位文字',
+          principalName: '展位文字',
+          createTime: '2021-09-29 09:26:54',
+          pack: 1,
+          needInvoice: 1,
+          inAccount: 1,
+          makeInvoice: 1,
+          mail: 1
+        }
+      ],
+      url: {
+        list: ''
+      }
+    }
   },
-  methods: {}
+  methods: {
+    /**
+     * 分页变化获取数据
+     * @param pagination
+     */
+    handlePageChange(pagination) {
+      this.ipagination.current = pagination.current
+      this.ipagination.pageSize = pagination.pageSize
+      this.loadData()
+    }
+  }
 }
 </script>
 <style scoped lang="less"></style>
\ No newline at end of file
diff --git a/src/views/system/AccountCenter.vue b/src/views/system/AccountCenter.vue
index 39aad67..7f935e0 100644
--- a/src/views/system/AccountCenter.vue
+++ b/src/views/system/AccountCenter.vue
@@ -1,32 +1,34 @@
 <template>
-  <a-card :bordered="false">
-    <a-spin :spinning="loading">
-      <div class="account-box">
-        <div class="account-container">
-          <div class="top">
-            <div class="title"><span class="title-text">个人中心</span></div>
-            <a-button type="link" @click="handleEdit">
-              编辑
-              <img src="../../assets/imgs/icon/icon-edit.png" class="title-icon">
-            </a-button>
-          </div>
+  <div style="min-width: 1100px">
+    <a-card :bordered="false">
+      <a-spin :spinning="loading">
+        <div class="account-box">
+          <div class="account-container">
+            <div class="top">
+              <div class="title"><span class="title-text">个人中心</span></div>
+              <a-button type="link" @click="handleEdit">
+                编辑
+                <img src="../../assets/imgs/icon/icon-edit.png" class="title-icon">
+              </a-button>
+            </div>
 
-          <div>
-            <table class="table" border="1px">
-              <tr v-for="(items, indexs) in accountColumn" :key="indexs">
-                <template v-for="item in items">
-                  <td class="table-title">{{ item.title }}</td>
-                  <td class="table-content">{{ accountData[item.fieldName] }}</td>
-                </template>
-              </tr>
-            </table>
+            <div>
+              <table class="table" border="1px">
+                <tr v-for="(items, indexs) in accountColumn" :key="indexs">
+                  <template v-for="item in items">
+                    <td class="table-title">{{ item.title }}</td>
+                    <td class="table-content">{{ accountData[item.fieldName] }}</td>
+                  </template>
+                </tr>
+              </table>
+            </div>
           </div>
         </div>
-      </div>
-    </a-spin>
+      </a-spin>
 
-    <account-center-model ref="editAccountDetail" @ok="editOk"></account-center-model>
-  </a-card>
+      <account-center-model ref="editAccountDetail" @ok="editOk"></account-center-model>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -99,15 +101,15 @@ export default {
     }
   },
   created() {
-    // 获取用户id
-    let userId = Vue.ls.get(USER_INFO).id
-    this.initAccountData(userId)
+    this.initAccountData()
   },
   methods: {
     /**
      * 初始化个人信息
      */
-    initAccountData(userId) {
+    initAccountData() {
+      // 获取用户id
+      let userId = Vue.ls.get(USER_INFO).id
       this.loading = true
       let param = {
         id: userId
@@ -127,8 +129,8 @@ export default {
      * 编辑成功后重新获取数据
      * @param id
      */
-    editOk(id) {
-      this.initAccountData(id)
+    editOk() {
+      this.initAccountData()
     }
   }
 }