关联项目会议项目

This commit is contained in:
fengachen
2021-09-09 19:53:20 +08:00
parent 2bd07a3397
commit a94d43bc3e
5 changed files with 764 additions and 14 deletions
+192
View File
@@ -0,0 +1,192 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
:confirmLoading="confirmLoading"
switchFullscreen
@ok="handleOk"
@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="会议名称">
<a-input placeholder="请输入会议名称" v-model="queryParam.meetingName"></a-input>
</a-form-item>
</a-col>
<a-col :xl="10" :lg="11" :md="12" :sm="24">
<a-form-item label="会议时间">
<j-date
placeholder="请选择开始日期"
class="query-group-cust"
v-model="queryParam.meetingStartTime"
:disabled-date="disabledStartDate">
</j-date>
<span class="query-group-split-cust"></span>
<j-date
placeholder="请选择结束日期"
class="query-group-cust"
v-model="queryParam.meetingEndTime"
:disabled-date="disabledEndDate">
</j-date>
</a-form-item>
</a-col>
<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" class="reset-button">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<div>
<a-table
ref="table"
size="middle"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio'}"
@change="handleTableChange"
class="j-table-force-nowrap">
<template slot="text" slot-scope="text">
<j-ellipsis v-if="text && text.length > 0" :value="text" :length="30"></j-ellipsis>
<span v-else></span>
</template>
</a-table>
</div>
</j-modal>
</template>
<script>
import {JeroListMixin} from '@/mixins/JeroListMixin'
import {RangeDateMixin} from '@/mixins/RangeDateMixin'
import JDate from '@comp/tools/JDate'
import JEllipsis from '@comp/jero/JEllipsis'
export default {
name: 'MeetingListModal',
components: {
JDate,
JEllipsis
},
mixins: [JeroListMixin, RangeDateMixin],
data() {
return {
title: '选择会议',
width: 1200,
visible: false,
confirmLoading: false,
url: {
list: '/meeting/payMeeting/page',
},
dateKeyObj: {
beginKey: 'meetingStartTime',
endKey: 'meetingEndTime'
},
selectedCompany: {},
selectedRowKeys: [],
columns: [
{
title: '序号',
dataIndex: '',
key: 'rowIndex',
width: 60,
align: 'center',
customRender: function (t, r, index) {
return parseInt(index) + 1
}
},
{
title: '会议名称',
align: 'center',
dataIndex: 'meetingName',
scopedSlots: {customRender: 'text'},
width: 160,
},
{
title: '会议类型',
align: 'center',
dataIndex: 'meetingType_dictText',
scopedSlots: {customRender: 'text'},
width: 100,
},
{
title: '负责人',
align: 'center',
dataIndex: 'directorName',
scopedSlots: {customRender: 'text'},
width: 160,
},
{
title: '召开时间',
align: 'center',
dataIndex: 'startTime',
width: 160,
customRender: function (text, record) {
return `${record.startTime}~${record.endTime}`
}
},
{
title: '召开地点',
align: 'center',
dataIndex: 'venue',
width: 160,
customRender: function (text, record) {
return text + '/' + record.address
}
},
{
title: '会议费用',
align: 'center',
dataIndex: 'meetingCosts',
},
{
title: '创建时间',
align: 'center',
dataIndex: 'createTime',
scopedSlots: {customRender: 'text'},
}
],
dataSource: []
}
},
methods: {
handleOk() {
this.$emit('ok', this.selectedCompany)
this.close()
},
handleCancel() {
this.close()
},
close() {
this.visible = false
},
onSelectChange(selectedRowKeys, selectionRows) {
this.selectedCompany = selectionRows[0]
this.selectedRowKeys = selectedRowKeys
},
/*
* 修改查询条件
* */
searchQuery() {
this.queryParam.meetingStartTime = this.queryParam.meetingStartTime ? this.queryParam.meetingStartTime + ' ' + '00:00:00' : undefined
this.queryParam.meetingEndTime = this.queryParam.meetingEndTime ? this.queryParam.meetingEndTime + ' ' + '23:59:59' : undefined
this.queryParam.createTime_begin = this.queryParam.createTime_begin ? this.queryParam.createTime_begin + ' ' + '00:00:00' : undefined
this.queryParam.createTime_end = this.queryParam.createTime_end ? this.queryParam.createTime_end + ' ' + '23:59:59' : undefined
this.lastQueryParam = {...this.queryParam}
this.loadData(1)
},
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>
+60
View File
@@ -0,0 +1,60 @@
<template>
<div class="company-select">
<a-input @click="chooseBusiness" autocomplete="off" :value="value[valueKey]" v-bind="$attrs" :readOnly="true"></a-input>
<meeting-list-modal ref="meetingList" @ok="handleOk" v-bind="$attrs"></meeting-list-modal>
</div>
</template>
<script>
import MeetingListModal from '@comp/company/MeetingListModal'
export default {
name: 'MeetingSelect',
components:{
MeetingListModal
},
props: {
// 是否可以选择
isCompanyDisabled: {
type: Boolean,
required: false,
default: false
},
value: {
type: [Object],
default: () => {
return {}
}
},
// 回显数据的key
valueKey: {
type: String,
default: 'meetingName'
}
},
methods:{
/**
* 打开选择会议的的模态框,如果父级传参为true则点击不弹模态框
*/
chooseBusiness() {
if (this.isCompanyDisabled) {
return
}
this.$refs.meetingList.searchReset()
this.$refs.meetingList.visible = true
},
handleOk(value) {
this.$emit('change', value)
}
},
model: {
prop: 'value',
event: 'change'
}
}
</script>
<style scoped lang="less">
a-input:hover {
cursor: pointer;
}
</style>
@@ -0,0 +1,317 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
:confirmLoading="confirmLoading"
switchFullscreen
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row :gutter="24">
<a-col :xl="24" :sm="24">
<a-form-item label="会议名称" :labelCol=" {xs: {span: 24},sm: {span: 3}}"
:wrapperCol="{ xs: {span: 24},sm: {span: 21}}">
<meeting-select @change="selectMeeting" placeholder="请选择会议" v-decorator="['meetingId',validatorRules.meetingId]"></meeting-select>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :xl="24" :sm="24">
<a-form-item label="参会单位" :labelCol=" {xs: {span: 24},sm: {span: 3}}"
:wrapperCol="{ xs: {span: 24},sm: {span: 21}}">
<company-select placeholder="请选择参会单位" disabled v-decorator="['companyId',validatorRules.companyId]"></company-select>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :xl="12" :sm="24">
<a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
<select-contacts placeholder="请选择参会人"
:selected-company="contractInfo.companyId"
:init-contacts="selectContact"
v-decorator="['companyContactId',validatorRules.companyContactId]"></select-contacts>
</a-form-item>
</a-col>
<a-col :xl="12" :sm="24">
<a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入手机号"
v-decorator="['phone',validatorRules.phone]"
disabled=""
:maxLength='11'
></a-input>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :xl="12" :sm="24">
<a-form-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-decorator="['identity',validatorRules.identity]" disabled >
<a-radio :value="1">嘉宾</a-radio>
<a-radio :value="2">参会人</a-radio>
<a-radio :value="3">内部企业</a-radio>
</a-radio-group>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :xl="12" :sm="24">
<a-form-item label="邮寄人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<select-contacts placeholder="请选择邮寄人"
:selected-company="contractInfo.companyId"
:init-contacts="selectContact"
v-decorator="['postContactId',validatorRules.postContactId]"></select-contacts>
</a-form-item>
</a-col>
<a-col :xl="12" :sm="24">
<a-form-item label="邮寄地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入邮寄地址"
v-decorator="['postAddress',validatorRules.postAddress]"
@change="event => event.target.value = event.target.value.trim()" :maxLength="50"
></a-input>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :xl="12" :sm="24">
<a-form-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入邮编"
v-decorator="['postCode',validatorRules.postCode]"
@change="event => event.target.value = event.target.value.trim()" :maxLength="50"
></a-input>
</a-form-item>
</a-col>
<a-col :xl="12" :sm="24">
<a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group v-decorator="['payMode',validatorRules.payMode]">
<a-radio :value="1">汇款</a-radio>
<a-radio :value="2">现场</a-radio>
<a-radio :value="2" disabled>打包</a-radio>
</a-radio-group>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :xl="12" :sm="24">
<a-form-item label="需要发票" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag style="width: 100%" dict-code="invoice_type"
v-decorator="['needInvoice',validatorRules.needInvoice]"
:trigger-change="true"
placeholder="请选择发票类型"></j-dict-select-tag>
</a-form-item>
</a-col>
<a-col :xl="12" :sm="24">
<a-form-item label="抵达日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择抵达日期" style="width: 100%;" v-decorator="['arrivalTime']" :trigger-change="true"
date-format="YYYY-MM-DD"/>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :xl="12" :sm="24">
<a-form-item label="离开日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择离开日期" style="width: 100%;" v-decorator="['arrivalTime']" :trigger-change="true"
date-format="YYYY-MM-DD"/>
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :xl="12" :sm="24">
<a-form-item label="是否入住协议住店" :labelCol="{xs: {span: 24},sm: {span: 8} }" :wrapperCol="{xs: {span: 24},sm: {span: 16} }">
<a-radio-group v-decorator="['checkInHotel']">
<a-radio :value="1"></a-radio>
<a-radio :value="0"></a-radio>
</a-radio-group>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :xl="12" :sm="24">
<a-form-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
<span>{{meetingCosts}}</span>
</a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
</j-modal>
</template>
<script>
// import pick from 'lodash.pick'
import {httpAction} from '@api/manage'
import SelectContacts from '@comp/company/SelectContacts'
import JDictSelectTag from '@comp/dict/JDictSelectTag'
import CompanySelect from '@comp/company/CompanySelect'
import MeetingSelect from '@comp/company/MeetingSelect'
import JDate from '@comp/tools/JDate'
import pick from 'lodash.pick'
export default {
name: 'AddMeetingPerson',
components: {
SelectContacts,
JDictSelectTag,
CompanySelect,
JDate,
MeetingSelect
},
data() {
return {
title:'新增参会人',
width:800,
visible:false,
confirmLoading:false,
form: this.$form.createForm(this),
model: {},
labelCol: {
xs: {span: 24},
sm: {span: 6}
},
wrapperCol: {
xs: {span: 24},
sm: {span: 18}
},
remarksLabelCol: {
xs: {span: 24},
sm: {span: 3}
},
remarksWrapperCol: {
xs: {span: 24},
sm: {span: 21}
},
validatorRules: {
meetingId: {
rules: [{required: true, message: '请选择会议'}],
validateTrigger: 'change'
},
postCode: {
rules: [{required: true, message: '请输入邮寄地址'}],
validateTrigger: 'blur'
},
postAddress: {
rules: [{required: true, message: '请输入邮编'}],
validateTrigger: 'blur'
},
payMode:{
rules: [{required: true, message: '请选择来款方式'}],
validateTrigger: 'change'
},
companyId:{
rules: [{required: true, message: '请选择参会单位'}],
validateTrigger: 'change'
},
companyContactId:{
rules: [{required: true, message: '请选择参会人'}],
validateTrigger: 'change'
},
postContactId:{
rules: [{required: true, message: '请选择邮寄联系人'}],
validateTrigger: 'change'
},
needInvoice:{
rules: [{required: true, message: '请选择发票类型'}],
validateTrigger: 'change'
},
identity:{
rules: [{required: true, message: '请选择身份'}],
validateTrigger: 'change',
initialValue:2
},
phone:{
rules: [{required: true, message: '请输入手机号'}],
validateTrigger: 'blur'
},
},
url: {
add: '',
edit: '',
},
// 合同信息
contractInfo:{},
// 联系人回显
selectContact:null,
// 会议金额
meetingCosts:'',
}
},
methods:{
open(record){
this.meetingCosts =''
this.form.resetFields()
this.visible = true
this.contractInfo = Object.assign({},record)
// 参会单位的默认显示
this.contractInfo.companyId = record.signedCompany
// 姓名的默认显示
this.contractInfo.companyContactId = record.signedContactsTemporaryId
// 邮寄联系人显示
this.contractInfo.postContactId = record.signedContactsTemporaryId
// 合同编号显示
this.contractInfo.contractNum = record.contractNum
// 身份默认选择参会人
this.contractInfo.identify = 1
this.selectContact = {
id:record.signedContactsTemporaryId,
name:record.signedContactsTemporaryName
}
this.$nextTick( () => {
this.form.setFieldsValue(pick(this.contractInfo,'companyId','companyContactId','identify','postContactId'))
})
},
close(){
this.visible = false
},
handleOk(){
const that = this
this.form.validateFields((err, values) => {
if(!err){
that.confirmLoading = true
let method = 'post'
let url = this.url.add
const formData = Object.assign({},values)
httpAction(url,formData,method).then(res => {
if(res.success){
that.$message.success(res.message)
that.$emit('ok')
that.handleCancel()
that.confirmLoading = false
}else {
this.$message.warn(res.message)
}
}).finally( () => {
that.confirmLoading = false
})
}
})
},
handleCancel(){
this.close()
},
/*
* 选择会议
* */
selectMeeting(val){
console.log(val)
if(val.meetingCosts){
this.meetingCosts = val.meetingCosts
if(val.meetingCostsVip){
this.meetingCosts = val.meetingCosts + val.meetingCostsVip
}
}
}
}
}
</script>
<style scoped lang="less">
</style>
@@ -739,11 +739,12 @@ export default {
break
// 会议项目
case 3:
this.$refs.selectMeetingProjectModule.open()
// 传入合同信息
this.$refs.selectMeetingProjectModule.open(this.model)
break
// 会员项目
case 4:
// 传入合同id与打包状态
// 传入合同信息
this.$refs.selectMemberProjectModule.open(this.model)
break
}
@@ -10,22 +10,39 @@
<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 label="会议名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入会议名称" v-model="queryParam.workingGroupProject"></a-input>
</a-form-item>
</a-col>
<a-col :xl="12" :lg="11" :md="12" :sm="24">
<a-form-item label="会议时间">
<j-date
placeholder="请选择开始日期"
class="query-group-cust"
v-model="queryParam.startTime"
:disabled-date="disabledStartCreateDate">
</j-date>
<span class="query-group-split-cust"></span>
<j-date
placeholder="请选择结束日期"
class="query-group-cust"
v-model="queryParam.endTime"
:disabled-date="disabledEndCreateDate">
</j-date>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="年份">
<j-year-date style="width: 100%" placeholder="请选择年份" v-model="queryParam.particularYear"></j-year-date>
</a-form-item>
</a-col>
<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>
<a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
</span>
</a-col>
</a-row>
@@ -55,7 +72,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 && text.length > 0" :value="text" :length="18"></j-ellipsis>
<span v-else></span>
</template>
<!-- 打包需要发票到账开票邮寄状态-->
@@ -69,23 +87,38 @@
</a-table>
</div>
<!-- /表格区域-->
<!-- 添加会议参会人-->
<add-meeting-person ref="modalForm" @ok="modalFormOk"></add-meeting-person>
</j-modal>
</template>
<script>
import { JeroListMixin } from '../../../../mixins/JeroListMixin'
import { associatedProject } from '../../../../api/incomePaymentsApi'
import JDate from '@comp/tools/JDate'
import JYearDate from '@comp/jero/JYearDate'
import JEllipsis from '@comp/jero/JEllipsis'
import StatusSlot from '@comp/tools/StatusSlot'
import AddMeetingPerson from '@views/contractManagement/revenueContract/modules/AddMeetingPerson'
import moment from 'moment'
import '@/assets/less/TableExpand.less'
export default {
name: 'SelectMeetingProjectModule',
mixins: [JeroListMixin],
components:{
JDate,
JYearDate,
StatusSlot,
JEllipsis,
AddMeetingPerson
},
data() {
return {
title: '会议项目列表',
width: 1200,
visible: false,
confirmLoading: false,
columns: [],
labelCol: {
xs: { span: 24 },
sm: { span: 5 }
@@ -94,15 +127,135 @@ export default {
xs: { span: 24 },
sm: { span: 10 }
},
columns: [
{
title: '序号',
dataIndex: '',
key: 'rowIndex',
width: 60,
align: 'center',
customRender: function (t, r, index) {
return parseInt(index) + 1
}
},
{
title: '会议名称',
align: 'center',
dataIndex: 'meetingName',
width: 160,
scopedSlots: {customRender: 'text'}
},
{
title: '参会单位',
align: 'center',
dataIndex: 'companyName',
width: 260,
scopedSlots: {customRender: 'text'}
},
{
title: '来款用途',
align: 'center',
dataIndex: '',
width: 80,
// scopedSlots: {customRender: 'text'}
},
{
title: '参会人员',
align: 'center',
dataIndex: 'companyContactName',
width: 80,
scopedSlots: {customRender: 'text'}
},
{
title: '应收金额',
align: 'center',
dataIndex: 'amountReceivable',
width: 80,
scopedSlots: {customRender: 'text'}
},
{
title: '实收金额',
align: 'center',
dataIndex: 'paidAmount',
width: 80,
scopedSlots: {customRender: 'text'}
},
{
title: '缴费方式',
align: 'center',
dataIndex: 'payMode_dictText',
width: 80,
scopedSlots: {customRender: 'text'}
},
{
title: '负责人',
align: 'center',
dataIndex: '',
width: 80,
// scopedSlots: {customRender: 'text'}
},
{
title: '打包',
align: 'center',
dataIndex: 'pack',
width: 80,
scopedSlots: {customRender: 'status-pack'}
},
{
title: '需要发票',
align: 'center',
dataIndex: 'needInvoice',
scopedSlots: {customRender: 'status-pack'},
width: 80,
},
{
title: '到账',
align: 'center',
dataIndex: 'inAccount',
scopedSlots: {customRender: 'status'},
width: 80,
},
{
title: '开票',
align: 'center',
dataIndex: 'makeInvoice',
scopedSlots: {customRender: 'status'},
width: 80,
},
{
title: '邮寄',
align: 'center',
dataIndex: 'mail',
scopedSlots: {customRender: 'status'},
width: 80,
},
{
title: '创建时间',
align: 'center',
dataIndex: 'createTime',
width: 160,
scopedSlots: {customRender: 'text'},
},
],
url: {
list: ''
list: '/meeting/payMeetingSituation/page',
},
disableMixinCreated: true,
contractId: '', // 收入合同id
// 合同信息
contranctInfo:{},
// 打包状态
pack:''
}
},
methods: {
open() {
moment,
open(record) {
this.contranctInfo =Object.assign({},record)
//记录合同id
this.contractId = this.contranctInfo.id
// 记录打包状态
this.pack = this.contranctInfo.pack
this.loadData()
this.visible = true
},
@@ -137,11 +290,38 @@ export default {
},
handleCancel() {
this.close()
},
/*
* 打开新增会议参会人员
* */
handleAdd(){
// 传进去一些需要的默认值
this.$refs.modalForm.open(this.contranctInfo)
},
/*
* 创建时间开始禁用
* */
disabledStartCreateDate(startValue) {
const endValue = this.queryParam.endTime && moment(this.queryParam.endTime, 'YYYY-MM-DD')
if (!startValue || !endValue) {
return false
}
return startValue.valueOf() > endValue.valueOf()
},
/*
* 创建时间结束禁用
* */
disabledEndCreateDate(endValue) {
const startValue = this.queryParam.startTime && moment(this.queryParam.startTime, 'YYYY-MM-DD')
if (!endValue || !startValue) {
return false
}
return startValue.valueOf() > endValue.valueOf()
}
}
}
</script>
<style scoped>
<style scoped lang="less">
@import '~@assets/less/common.less';
</style>