From df40f4492fe12b96345c99b57a4c5bde6e6bcbda Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Thu, 2 Sep 2021 11:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E5=8D=8F=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E6=88=90=E5=91=98=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SafeguardStardsMemberList.vue             | 43 +++++++++++--------
 .../memberManage/StardsMemberProjectList.vue  |  4 +-
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
index 36390e8..7e3d873 100644
--- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="企业名称">
-              <a-input placeholder="请输入企业名称" v-model="queryParam.tableName"></a-input>
+              <a-input placeholder="请输入企业名称" v-model="queryParam.companyName"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -47,18 +47,24 @@
           class="j-table-force-nowrap"
           @change="handleTableChange">
 
-        <template slot="htmlSlot" slot-scope="text,record">
-          <div class="primary-color" @click="handleSafeguardMember(record)" v-html="text"></div>
-        </template>
 
         <template slot="detail" slot-scope="text,record">
-          <div @click="openDetailModal(record)" class="color-blue">企业名称</div>
+          <div @click="openDetailModal(record)" class="color-blue">{{ text }}</div>
         </template>
 
         <template slot="text" slot-scope="text">
           <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
           <span v-else></span>
         </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>
+
         <span slot="action" slot-scope="text, record" class="action-span-cell">
           <a @click="handleEdit(record)">编辑</a>
           <a @click="handleDelete(record.id)">删除</a>
@@ -74,12 +80,15 @@
 import {mixinDevice} from '@/utils/mixin'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
 import ProjectDetailModal from "@comp/ProjectDetailModal";
+import "@/assets/less/TableExpand.less";
+import StatusSlot from "@comp/tools/StatusSlot";
 
 export default {
   name: "SafeguardStardsMemberList",
   mixins: [JeroListMixin, mixinDevice],
   components:{
     ProjectDetailModal,
+    StatusSlot
   },
   data() {
     return {
@@ -108,32 +117,27 @@ export default {
         {
           title: '会员类型',
           align: "center",
-          dataIndex: 'memberType',
-          scopedSlots: {customRender: 'htmlSlot'}
+          dataIndex: 'memberType_dictText',
         },
         {
           title: '联系人',
           align: "center",
           dataIndex: 'liaisonMan',
-          scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '邮箱',
           align: "center",
           dataIndex: 'email',
-          scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '手机',
           align: "center",
           dataIndex: 'mobile',
-          scopedSlots: {customRender: 'htmlSlot'}
         },
         {
           title: '会员状态',
           align: "center",
-          dataIndex: 'memberStatus',
-          scopedSlots: {customRender: 'htmlSlot'}
+          dataIndex: 'memberStatus_dictText',
         },
         {
           title: '注册时间',
@@ -145,38 +149,43 @@ export default {
           title: '打包',
           align: "center",
           dataIndex: 'pack',
-          scopedSlots: {customRender: 'htmlSlot'}
+          scopedSlots: {customRender: 'status-pack'}
         },
         {
           title: '需要发票',
           align: "center",
           dataIndex: 'invoiceRequirements',
-          scopedSlots: {customRender: 'htmlSlot'}
+          scopedSlots: {customRender: 'status-pack'}
         },
         {
           title: '到账',
           align: "center",
           dataIndex: 'inAccount',
-          scopedSlots: {customRender: 'htmlSlot'}
+          scopedSlots: {customRender: 'status'}
         },
         {
           title: '开票',
           align: "center",
           dataIndex: 'makeInvoice',
-          scopedSlots: {customRender: 'htmlSlot'}
+          scopedSlots: {customRender: 'status'}
         },
         {
           title: '邮寄',
           align: "center",
           dataIndex: 'mail',
-          scopedSlots: {customRender: 'htmlSlot'}
+          scopedSlots: {customRender: 'status'}
         },
       ],
+      disableMixinCreated: true,
       url: {
         list: "/member/tbMemberProjectSubitem/page",
         exportXlsUrl: "/member/tbMemberProjectSubitem/exportXls",
       },
     }
+  },
+  created() {
+    this.filters.projectId = this.$route.query.id
+    this.loadData(1)
   }
 }
 </script>
diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
index 9542315..dea0006 100644
--- a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
@@ -115,7 +115,9 @@ export default {
       console.log(1)
       this.$router.push({
         path: '/incomePayments/memberManage/SafeguardStardsMemberList',
-        query: {}
+        query: {
+          id:record.id
+        }
       })
     }
   }