From fb8f109405a1dafdde9acbfffbb9c5054f76a433 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 8 Sep 2021 20:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/SelectMemberProjectModule.vue     | 154 +++++++++++-------
 1 file changed, 99 insertions(+), 55 deletions(-)

diff --git a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue
index 16a9afb..07f931f 100644
--- a/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue
+++ b/src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue
@@ -8,84 +8,122 @@
            @cancel="handleCancel"
            cancelText="关闭">
     <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row>
 
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="会员项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入工作组项目" v-model="queryParam.workingGroupProject"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+      <a-tabs default-active-key="1" @change="callback">
+        <a-tab-pane key="1" tab="会员项目">
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row>
 
-            </a-form-item>
-          </a-col>
+<!--              <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
+<!--                <a-form-item label="会员项目" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--                  <a-input placeholder="请输入会员项目" v-model="queryParam.workingGroupProject"></a-input>-->
+<!--                </a-form-item>-->
+<!--              </a-col>-->
+              <a-col :xl="6" :lg="7" :md="8" :sm="24">
+                <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <j-year-date placeholder="请选择运行年份" v-model="queryParam.particularYear"></j-year-date>
+                </a-form-item>
+              </a-col>
 
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
               <a-button icon="reload" @click="searchReset">重置</a-button>
             </span>
-          </a-col>
-        </a-row>
-      </a-form>
+              </a-col>
+            </a-row>
+          </a-form>
+          <!--    操作按钮区域-->
+          <div class="table-operator">
+            <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
+          </div>
+          <!--    操作按钮区域-end-->
+
+          <!--    表格区域-->
+          <div>
+            <a-table
+              ref="table"
+              size="middle"
+              bordered
+              rowKey="id"
+              :scroll="{x: 800}"
+              :columns="columns"
+              :dataSource="dataSource"
+              :pagination="false"
+              :loading="loading"
+              :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+              @change="handleTableChange"
+              class="j-table-force-nowrap">
+
+              <template slot="text" slot-scope="text">
+                <j-ellipsis :value="text" :length="18"></j-ellipsis>
+              </template>
+
+              <!--        打包、需要发票、到账、开票、邮寄状态-->
+              <template slot="status" slot-scope="text,record">
+                <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+              </template>
+
+              <template slot="status-pack" slot-scope="text,record">
+                <status-slot :statu-obj="record" :status-no="text"></status-slot>
+              </template>
+            </a-table>
+          </div>
+          <!--    /表格区域-->
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="标协会员" force-render>
+        </a-tab-pane>
+      </a-tabs>
     </div>
 
-    <!--    操作按钮区域-->
-    <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
-    </div>
-    <!--    操作按钮区域-end-->
-
-    <!--    表格区域-->
-    <div>
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x: 800}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="false"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange"
-        class="j-table-force-nowrap">
-
-        <template slot="text" slot-scope="text">
-          <j-ellipsis :value="text" :length="18"></j-ellipsis>
-        </template>
-
-        <!--        打包、需要发票、到账、开票、邮寄状态-->
-        <template slot="status" slot-scope="text,record">
-          <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
-        </template>
-
-        <template slot="status-pack" slot-scope="text,record">
-          <status-slot :statu-obj="record" :status-no="text"></status-slot>
-        </template>
-      </a-table>
-    </div>
-    <!--    /表格区域-->
   </j-modal>
 </template>
 
 <script>
 import { associatedProject } from '../../../../api/incomePaymentsApi'
 import { JeroListMixin } from '../../../../mixins/JeroListMixin'
+import JYearDate from '@comp/jero/JYearDate'
 
 export default {
   name: 'SelectMemberProjectModule',
   mixins: [JeroListMixin],
+  components:{
+    JYearDate
+  },
   data() {
     return {
-      title: '会议项目列表',
+      title: '会员项目列表',
       width: 1200,
       visible: false,
       confirmLoading: false,
-      columns: [],
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '会员项目',
+          align: 'center',
+          dataIndex: 'projectName',
+          scopedSlots: {customRender: 'htmlSlot'}
+        },
+        {
+          title: '负责人',
+          align: 'center',
+          dataIndex: 'directorName'
+        },
+        {
+          title: '创建时间',
+          align: 'center',
+          dataIndex: 'createTime'
+        },
+      ],
       labelCol: {
         xs: { span: 24 },
         sm: { span: 5 }
@@ -95,7 +133,7 @@ export default {
         sm: { span: 10 }
       },
       url: {
-        list: ''
+        list: '/jero/memberProject/page',
       },
       disableMixinCreated: true,
       contractId: '', // 收入合同id
@@ -137,6 +175,12 @@ export default {
     },
     handleCancel() {
       this.close()
+    },
+    /*
+    * 切换类型
+    * */
+    callback(){
+
     }
   }
 }