首页与会议的修改

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'
       }
     }
   },