收入合同关联会员项目

src/views/contractManagement/revenueContract/modules/SelectMemberProjectModule.vue

@@ -9,11 +9,10 @@
            cancelText="关闭">
     <div class="table-page-search-wrapper">
 
-      <a-tabs default-active-key="1" @change="callback">
+      <a-tabs v-model="activeKey" @change="callback">
         <a-tab-pane key="1" tab="会员项目">
           <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>-->
@@ -56,7 +55,8 @@
               class="j-table-force-nowrap">
 
               <template slot="text" slot-scope="text">
-                <j-ellipsis :value="text" :length="18"></j-ellipsis>
+                <j-ellipsis v-if="!!text" :value="text" :length="18"></j-ellipsis>
+                <span v-else></span>
               </template>
 
               <!--        打包、需要发票、到账、开票、邮寄状态-->
@@ -89,7 +89,8 @@
               class="j-table-force-nowrap">
 
               <template slot="text" slot-scope="text">
-                <j-ellipsis :value="text" :length="18"></j-ellipsis>
+                <j-ellipsis v-if="!!text" :value="text" :length="18"></j-ellipsis>
+                <span v-else></span>
               </template>
 
               <!--        打包、需要发票、到账、开票、邮寄状态-->
@@ -153,17 +154,22 @@ export default {
           title: '会员项目',
           align: 'center',
           dataIndex: 'projectName',
-          scopedSlots: {customRender: 'htmlSlot'}
+          width: 200,
+          scopedSlots: {customRender: 'text'},
         },
         {
           title: '负责人',
           align: 'center',
-          dataIndex: 'directorName'
+          dataIndex: 'directorName',
+          scopedSlots: {customRender: 'text'},
+          width: 200,
         },
         {
           title: '创建时间',
           align: 'center',
-          dataIndex: 'createTime'
+          dataIndex: 'createTime',
+          scopedSlots: {customRender: 'text'},
+          width: 200,
         },
       ],
       //标协会员表头
@@ -181,23 +187,22 @@ export default {
         {
           title: '项目名称',
           align: 'center',
-          dataIndex: '',
-          width: 100,
-          // scopedSlots: {customRender: 'text'},
-
+          dataIndex: 'projectName',
+          width: 200,
+          scopedSlots: {customRender: 'text'},
         },
         {
           title: '会员编号',
           align: 'center',
           dataIndex: 'memberNo',
-          width: 160,
+          width: 200,
           scopedSlots: {customRender: 'text'},
         },
         {
           title: '单位名称',
           align: 'center',
           dataIndex: 'companyName',
-          width: 160,
+          width: 200,
           scopedSlots: {customRender: 'text'},
         },
         {
@@ -205,18 +210,21 @@ export default {
           align: 'center',
           dataIndex: 'memberType_dictText',
           width: 80,
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '会员性质',
           align: 'center',
           dataIndex: '',
           width: 80,
+          // scopedSlots: {customRender: 'text'}
         },
         {
           title: '联系人',
           align: 'center',
           dataIndex: 'liaisonMan',
           width: 80,
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '邮箱',
@@ -230,47 +238,49 @@ export default {
           align: 'center',
           dataIndex: 'phone',
           width: 80,
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '会员状态',
           align: 'center',
           dataIndex: 'memberStatus_dictText',
           width: 80,
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '打包',
           align: 'center',
           dataIndex: 'pack',
           scopedSlots: {customRender: 'status-pack'},
-          width: 60,
+          width: 80,
         },
         {
           title: '需要发票',
           align: 'center',
           dataIndex: 'invoiceRequirements',
           scopedSlots: {customRender: 'status-pack'},
-          width: 60,
+          width: 80,
         },
         {
           title: '到账',
           align: 'center',
           dataIndex: 'inAccount',
           scopedSlots: {customRender: 'status'},
-          width: 60,
+          width: 80,
         },
         {
           title: '开票',
           align: 'center',
           dataIndex: 'makeInvoice',
           scopedSlots: {customRender: 'status'},
-          width: 60,
+          width: 80,
         },
         {
           title: '邮寄',
           align: 'center',
           dataIndex: 'mail',
           scopedSlots: {customRender: 'status'},
-          width: 60,
+          width: 80,
         }
       ],
       labelCol: {
@@ -282,15 +292,19 @@ export default {
         sm: {span: 10}
       },
       url: {
-        list: '/jero/memberProject/page',
+        list: '/jero/memberProject/queryListByCompany',
       },
+      // 默认激活的tab页
+      activeKey:'1',
       disableMixinCreated: true,
       // 项目类型 4-会员项目 5-标协会员
       projectType: 4,
       contractId: '', // 收入合同id
       // 打包状态
       pack: '',
-      contractInfo:{}
+      contractInfo:{},
+      // 企业id
+      companyId:''
     }
   },
   methods: {
@@ -300,6 +314,13 @@ export default {
       // 保存合同id 与打包状态
       this.contractId = record.id
       this.pack = record.pack
+      // 保存企业id
+      this.companyId =record.signedCompany.id
+      this.filters = {
+        companyId:this.companyId,
+        contractId:this.contractId,
+        projectType:'4'
+      }
       this.loadData()
       this.visible = true
     },
@@ -333,22 +354,24 @@ export default {
       })
     },
     handleCancel() {
+      this.activeKey = '1'
       this.close()
     },
     /*
     * 切换类型
     * */
     callback(val) {
+      this.activeKey  =val
       // 2是标协会员
       if (val === '2') {
         this.projectType = 5
-        this.url.list = '/member/tbMemberProjectSubitem/page'
+        this.filters.projectType = '5'
         this.loadData(1)
       }
       // 1是会员项目
       if (val === '1') {
-        this.projectType = 5
-        this.url.list = '/jero/memberProject/page'
+        this.projectType = 4
+        this.filters.projectType = '4'
         this.loadData(1)
       }
     },

src/views/incomePayments/meetManage/Attendance.vue

@@ -78,8 +78,8 @@
                                                                                         @click="copy(signUpHerfUrl)">复制</i>
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
-          <label>签到二维码：</label><img class="qr-code" :src="signInQRCode" alt="签到二维码"/><i class="copy primary-color"
-                                                                                        @click="copy(signUpHerfUrl)">复制</i>
+          <label>签到二维码：</label><img class="qr-code" :src="signInQRCode" alt="签到二维码"/>
+<!--          <i class="copy primary-color"  @click="copy(signUpHerfUrl)">复制</i>-->
         </a-col>
         <a-col :xxl="8" :xl="12" :sm="24">
           <label>收款二维码：</label>

src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue

@@ -181,6 +181,24 @@ export default {
           dataIndex: 'registerTime',
           scopedSlots: { customRender: 'text' },
         },
+        {
+          title: '应收金额',
+          align: 'center',
+          dataIndex: 'amountReceivable',
+          scopedSlots: { customRender: 'text' },
+        },
+        {
+          title: '实收金额',
+          align: 'center',
+          dataIndex: 'paidAmount',
+          scopedSlots: { customRender: 'text' },
+        },
+        {
+          title: '注册时间',
+          align: 'center',
+          dataIndex: 'registerTime',
+          scopedSlots: { customRender: 'text' },
+        },
         {
           title: '打包',
           align: 'center',