LK/income_payments_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

参会情况修改接口及参数

Browse Source
This commit is contained in:
fengachen
2021-09-09 16:45:29 +08:00
parent f9e0317c89
commit 2a0f4b1931
8 changed files with 99 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/incomeMeetingApi.js
+3 -1
View File
@@ -6,10 +6,12 @@ const getUserInfo = (params) => getAction('/sys/user/queryById',params)
const getMeetInfoById = (params) => getAction('/meeting/payMeeting/queryById',params)
// 获取所有工作组项目
const getAllWorkProjects = () => getAction('/project/payWorkingGroup/listAll')
// 通过id获取参会人详细信息
const getSingUpUserInfo = (params) => getAction('/meeting/payMeetingSituation/queryById',params)
export {
getUserInfo,
getMeetInfoById,
getAllWorkProjects,
getSingUpUserInfo
}
src/views/incomePayments/meetManage/Attendance.vue
+70 -33
View File
@@ -47,7 +47,7 @@
<a-col :xxl="8" :xl="12" :sm="24">
<label>预计参加人数:</label><span> {{ currentMeetingInfo.estimatedNumber }}</span>
</a-col>
<a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType === '2' ">
<a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType === '2' ">
<label>酒店名称:</label><span> {{ currentMeetingInfo.hotelName }}</span>
</a-col>
<a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType === '2' ">
@@ -79,8 +79,12 @@
<label>签到二维码:</label><img alt="签到二维码"/>
</a-col>
</a-row>
<a-row v-show="currentMeetingInfo.meetingType === '2' ">
<label class="label">酒店联系人及手机号: </label><span class="content" v-for="(item,index) of currentMeetingInfo.hotelContactsList" :key="index">{{item.hotelContacts+':' + item.hotelContactsPhone + ' '}}</span>
<a-row v-show="currentMeetingInfo.meetingType === '2' ">
<label class="label">酒店联系人及手机号: </label><span class="content"
v-for="(item,index) of currentMeetingInfo.hotelContactsList"
:key="index">{{
item.hotelContacts + ':' + item.hotelContactsPhone + ' '
}}</span>
</a-row>
<a-row>
<label class="label">会议内容: </label><span class="content"> {{ currentMeetingInfo.meetingContent }}</span>
@@ -97,12 +101,12 @@
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="参会单位">
<a-input placeholder="请输入参会单位" v-model="queryParam.projectName"></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">
<a-form-item label="参会人">
<a-input placeholder="请输入参会人" v-model="queryParam.projectName"></a-input>
<a-input placeholder="请输入参会人" v-model="queryParam.companyContactName"></a-input>
</a-form-item>
</a-col>
@@ -115,7 +119,7 @@
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="签到">
<j-dict-select-tag v-model="queryParam.audit" placeholder="请选择"
<j-dict-select-tag v-model="queryParam.checkIn" placeholder="请选择"
dictCode="signin_status"/>
</a-form-item>
</a-col>
@@ -127,21 +131,21 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="身份">
<j-dict-select-tag v-model="queryParam.identify" placeholder="请选择身份"
<j-dict-select-tag v-model="queryParam.identity" placeholder="请选择身份"
dictCode="meet_identify_type"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24" v-if="queryParam.identify === '1' ">
<a-form-item label="嘉宾类型">
<j-dict-select-tag v-model="queryParam.guest" placeholder="请选择身份"
<j-dict-select-tag v-model="queryParam.guestType" placeholder="请选择身份"
dictCode="guest_type"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :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 type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
@@ -175,13 +179,23 @@
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text,record">
<div class="primary-color" @click="openDetailModal(record)">参会单位</div>
<div class="primary-color" @click="openDetailModal(record)">{{ 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="handleAudit(record)">审核</a>
<a @click="handleEdit(record)">编辑</a>
@@ -189,10 +203,15 @@
</span>
</a-table>
</div>
<!-- 导入参会人-->
<import-participant-modal ref="importParticipantModal" @ok="modalFormOk"></import-participant-modal>
<!-- 批量开票-->
<batch-invocie-modal ref="batchInvoiceModal" @ok="modalFormOk"></batch-invocie-modal>
<!--设置对接人-->
<batch-set-docker-modal ref="batchSetDockerModal" @ok="modalFormOk"></batch-set-docker-modal>
<!--详情-->
<project-detail-modal ref="projectDetailModal"></project-detail-modal>
<!--审核-->
<audit-modal ref="auditModal" @ok="modalFormOk"></audit-modal>
</a-card>
</div>
@@ -210,6 +229,7 @@ import BatchSetDockerModal from '@views/incomePayments/meetManage/modules/BatchS
import ProjectDetailModal from '@comp/ProjectDetailModal'
import AuditModal from '@views/incomePayments/meetManage/modules/AuditModal'
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
import StatusSlot from '@comp/tools/StatusSlot'
export default {
@@ -223,7 +243,8 @@ export default {
BatchSetDockerModal,
ProjectDetailModal,
AuditModal,
PageHeaderTitle
PageHeaderTitle,
StatusSlot
},
data() {
return {
@@ -253,52 +274,57 @@ export default {
{
title: '应收金额',
align: 'center',
dataIndex: ''
dataIndex: 'amountReceivable'
},
{
title: '实收金额',
align: 'center',
dataIndex: ''
dataIndex: 'paidAmount'
},
{
title: '缴费方式',
align: 'center',
dataIndex: ''
dataIndex: 'payMode_dictText'
},
{
title: '是否签到',
align: 'center',
dataIndex: ''
dataIndex: 'checkIn'
},
{
title: '打包',
align: 'center',
dataIndex: 'pack'
dataIndex: 'pack',
scopedSlots: {customRender: 'status-pack'}
},
{
title: '需要发票',
align: 'center',
dataIndex: 'needInvoice'
dataIndex: 'needInvoice',
scopedSlots: {customRender: 'status-pack'}
},
{
title: '到账',
align: 'center',
dataIndex: 'inAccount'
dataIndex: 'inAccount',
scopedSlots: {customRender: 'status'}
},
{
title: '开票',
align: 'center',
dataIndex: 'makeInvoice'
dataIndex: 'makeInvoice',
scopedSlots: {customRender: 'status'}
},
{
title: '邮寄',
align: 'center',
dataIndex: ''
dataIndex: 'mail',
scopedSlots: {customRender: 'status'}
},
{
title: '对接人',
align: 'center',
dataIndex: 'mail'
dataIndex: 'dockName'
},
{
title: '操作',
@@ -307,11 +333,11 @@ export default {
},
],
url: {
list: '/jero/memberProject/page',
delete: '/jero/memberProject/delete',
deleteBatch: '/jero/memberProject/deleteBatch',
exportXlsUrl: '/jero/memberProject/exportXls',
importExcelUrl: 'jero/memberProject/importExcel',
list: '/meeting/payMeetingSituation/page',
delete: '/meeting/payMeetingSituation/delete',
deleteBatch: '/meeting/payMeetingSituation/deleteBatch',
exportXlsUrl: '/meeting/payMeetingSituation/exportXls',
importExcelUrl: '/meeting/payMeetingSituation/importExcel',
},
// 当前的会议信息详情
currentMeetingInfo: {},
@@ -332,14 +358,14 @@ export default {
}
})
},
computed:{
computed: {
tbMeetingType() {
if(this.currentMeetingInfo.tbMeetingType === '1'){
if (this.currentMeetingInfo.tbMeetingType === '1') {
return '标准宣贯'
}
if(this.currentMeetingInfo.tbMeetingType === '2'){
if (this.currentMeetingInfo.tbMeetingType === '2') {
return '学习培训'
}else {
} else {
return ''
}
}
@@ -364,9 +390,20 @@ export default {
addParticipant() {
this.$router.push({
path: '/incomePayments/meetManage/SignUpInfoEdit',
query:{
meetingType:this.currentMeetingInfo.meetingType,
meetingId:this.$route.query.id
query: {
meetingType: this.currentMeetingInfo.meetingType,
meetingId: this.$route.query.id
}
})
},
/*
* 编辑参会人
* */
handleEdit(record){
this.$router.push({
path: '/incomePayments/meetManage/SignUpInfoEdit',
query: {
id:record.id
}
})
},
src/views/incomePayments/meetManage/SignUpInfoEdit.vue
+10
View File
@@ -127,6 +127,7 @@ import SeminarVipForm from '@views/incomePayments/meetManage/modules/SeminarVipF
import SeminarPartnerForm from '@views/incomePayments/meetManage/modules/SeminarPartnerForm'
import AddMeetingCompany from '@comp/company/AddMeetingCompany'
import {getContactsById} from '@api/api'
import {getSingUpUserInfo} from '@api/incomeMeetingApi'
import {httpAction} from '@api/manage'
import pick from 'lodash.pick'
@@ -205,6 +206,15 @@ export default {
},
created() {
this.meetingType = this.$route.query.meetingType
if(this.$route.query.id){
// 通过id获取参会人信息
getSingUpUserInfo({id:this.$route.query}).then(res => {
if(res.success){
console.log(res.result)
}
})
}
},
methods: {
addContactsOk() {
src/views/incomePayments/meetManage/SignUpInfoList.vue
+2 -5
View File
@@ -72,9 +72,6 @@
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text,record">
<div class="primary-color">会议名称</div>
</template>
<template slot="text" slot-scope="text">
<j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
@@ -83,7 +80,7 @@
<span slot="action" slot-scope="text, record" class="action-span-cell">
<a @click="handleEdit(record)">编辑</a>
<a @click="handleDelete(record.id)">删除</a>
<a @click="">详情</a>
<!-- <a @click="">详情</a>-->
</span>
</a-table>
</div>
@@ -166,7 +163,7 @@ export default {
sm: {span: 18}
},
url: {
list: '/meeting/payMeetingSituation/add/page',
list: '/jero/memberProject/page',
delete: '/jero/memberProject/delete',
deleteBatch: '/jero/memberProject/deleteBatch',
exportXlsUrl: '/jero/memberProject/exportXls',
src/views/incomePayments/memberManage/MemberProjectList.vue
+4 -3
View File
@@ -20,7 +20,7 @@
<a-col :xl="6" :lg="7" :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 @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
@@ -47,6 +47,7 @@
size="middle"
bordered
rowKey="id"
:scroll="{x:true}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -82,6 +83,7 @@ import JYearDate from '@comp/jero/JYearDate'
import MemberProjectModal from '@views/incomePayments/memberManage/modules/MemberProjectModal'
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
import IconImg from '@/assets/imgs/icon/icon_company_management.png'
import '@/assets/less/TableExpand.less'
export default {
mixins: [JeroListMixin, mixinDevice],
@@ -100,7 +102,6 @@ export default {
title: '序号',
dataIndex: '',
key: 'rowIndex',
width: 60,
align: 'center',
customRender: function (t, r, index) {
return parseInt(index) + 1
@@ -121,7 +122,7 @@ export default {
{
title: '负责人',
align: 'center',
dataIndex: 'directorName'
dataIndex: 'directorName',
},
{
title: '操作',
src/views/incomePayments/memberManage/SafeguardMemberList.vue
+1 -1
View File
@@ -50,7 +50,7 @@
<a-col :xl="6" :lg="7" :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 @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>
src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
+8 -1
View File
@@ -24,6 +24,7 @@
>
<a-button
@click="searchReset"
class="reset-button"
icon="reload"
style="margin-left: 8px"
>重置</a-button
@@ -136,6 +137,7 @@ export default {
title: '会员编号',
align: 'center',
dataIndex: 'memberNo',
scopedSlots: { customRender: 'text' },
},
{
title: '企业名称',
@@ -147,32 +149,37 @@ export default {
title: '会员类型',
align: 'center',
dataIndex: 'memberType_dictText',
scopedSlots: { customRender: 'text' },
},
{
title: '联系人',
align: 'center',
dataIndex: 'liaisonMan',
scopedSlots: { customRender: 'text' },
},
{
title: '邮箱',
align: 'center',
dataIndex: 'email',
scopedSlots: { customRender: 'text' },
},
{
title: '手机',
align: 'center',
dataIndex: 'mobile',
scopedSlots: { customRender: 'text' },
},
{
title: '会员状态',
align: 'center',
dataIndex: 'memberStatus_dictText',
scopedSlots: { customRender: 'text' },
},
{
title: '注册时间',
align: 'center',
dataIndex: 'registerTime',
scopedSlots: { customRender: 'htmlSlot' },
scopedSlots: { customRender: 'text' },
},
{
title: '打包',
src/views/incomePayments/memberManage/StardsMemberProjectList.vue
+1 -1
View File
@@ -14,7 +14,7 @@
<a-col :xl="6" :lg="7" :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 @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
</span>
</a-col>
</a-row>