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

会议详情样式修改，bug修改

Browse Source
This commit is contained in:
zhaoxiao
2021-10-19 16:15:15 +08:00
parent 97e6a76001
commit b0a50b19e1
6 changed files with 263 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/ProjectDetailModal.vue
+1 -1
View File
@@ -227,7 +227,7 @@ const columns = [
{ {
title: '邮寄人', title: '邮寄人',
align: 'center', align: 'center',
dataIndex: 'contactName' dataIndex: 'mailName'
}, },
{ {
title: '快递', title: '快递',
src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue
+26 -18
View File
@@ -35,7 +35,8 @@
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="运行年份"> <a-form-item label="运行年份">
<j-year-date style="width: 100%" placeholder="请选择运行年份" v-model="queryParam.particularYear"></j-year-date> <j-year-date style="width: 100%" placeholder="请选择运行年份" v-model="queryParam.particularYear"
@change="dateChange"></j-year-date>
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -72,8 +73,7 @@
class="j-table-force-nowrap"> class="j-table-force-nowrap">
<template slot="text" slot-scope="text"> <template slot="text" slot-scope="text">
<j-ellipsis v-if="text && text.length > 0" :value="text" :length="18"></j-ellipsis> <j-ellipsis :value="text" :length="18"></j-ellipsis>
<span v-else></span>
</template> </template>
<!-- 打包、需要发票、到账、开票、邮寄状态--> <!-- 打包、需要发票、到账、开票、邮寄状态-->
@@ -157,42 +157,44 @@ export default {
title: '来款用途', title: '来款用途',
align: 'center', align: 'center',
dataIndex: 'chargeUse', dataIndex: 'chargeUse',
width: 80, width: 200,
customRender: () => {return '会务费'} customRender: () => {
return '会务费'
}
}, },
{ {
title: '参会人员', title: '参会人员',
align: 'center', align: 'center',
dataIndex: 'companyContactName', dataIndex: 'companyContactName',
width: 80, width: 260,
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ {
title: '应收金额', title: '应收金额',
align: 'center', align: 'center',
dataIndex: 'amountReceivable', dataIndex: 'amountReceivable',
width: 80, width: 200,
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ {
title: '实收金额', title: '实收金额',
align: 'center', align: 'center',
dataIndex: 'paidAmount', dataIndex: 'paidAmount',
width: 80, width: 200,
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ {
title: '缴费方式', title: '缴费方式',
align: 'center', align: 'center',
dataIndex: 'payMode_dictText', dataIndex: 'payMode_dictText',
width: 80, width: 150,
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ {
title: '负责人', title: '负责人',
align: 'center', align: 'center',
dataIndex: 'directorName', dataIndex: 'directorName',
width: 80, width: 200,
scopedSlots: { customRender: 'text' } scopedSlots: { customRender: 'text' }
}, },
{ {
@@ -207,39 +209,39 @@ export default {
align: 'center', align: 'center',
dataIndex: 'needInvoice', dataIndex: 'needInvoice',
scopedSlots: { customRender: 'status-pack' }, scopedSlots: { customRender: 'status-pack' },
width: 80, width: 80
}, },
{ {
title: '到账', title: '到账',
align: 'center', align: 'center',
dataIndex: 'inAccount', dataIndex: 'inAccount',
scopedSlots: { customRender: 'status' }, scopedSlots: { customRender: 'status' },
width: 80, width: 80
}, },
{ {
title: '开票', title: '开票',
align: 'center', align: 'center',
dataIndex: 'makeInvoice', dataIndex: 'makeInvoice',
scopedSlots: { customRender: 'status' }, scopedSlots: { customRender: 'status' },
width: 80, width: 80
}, },
{ {
title: '邮寄', title: '邮寄',
align: 'center', align: 'center',
dataIndex: 'mail', dataIndex: 'mail',
scopedSlots: { customRender: 'status' }, scopedSlots: { customRender: 'status' },
width: 80, width: 80
}, },
{ {
title: '创建时间', title: '创建时间',
align: 'center', align: 'center',
dataIndex: 'createTime', dataIndex: 'createTime',
width: 160, width: 160,
scopedSlots: {customRender: 'text'}, scopedSlots: { customRender: 'text' }
}, }
], ],
url: { url: {
list: '/meeting/payMeetingSituation/contractPage', list: '/meeting/payMeetingSituation/contractPage'
}, },
disableMixinCreated: true, disableMixinCreated: true,
contractId: '', // 收入合同id contractId: '', // 收入合同id
@@ -251,6 +253,12 @@ export default {
}, },
methods: { methods: {
moment, moment,
/**
* 运行年份变化
*/
dateChange() {
this.$forceUpdate()
},
open(record) { open(record) {
this.contranctInfo = Object.assign({}, record) this.contranctInfo = Object.assign({}, record)
console.log(record, 'meetingPerson') console.log(record, 'meetingPerson')
@@ -345,7 +353,7 @@ export default {
particularYear: new Date().getFullYear().toString() particularYear: new Date().getFullYear().toString()
} }
this.loadData(1) this.loadData(1)
}, }
} }
} }
</script> </script>
src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue
+29 -7
View File
@@ -20,6 +20,7 @@
v-model="queryParam.departId" v-model="queryParam.departId"
placeholder="请选择科室" placeholder="请选择科室"
:disabled="pack === 0" :disabled="pack === 0"
allowClear
@change="departChange"> @change="departChange">
</a-tree-select> </a-tree-select>
</a-form-item> </a-form-item>
@@ -28,16 +29,24 @@
<a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select v-model="queryParam.principalId" <a-select v-model="queryParam.principalId"
show-search show-search
allowClear
placeholder="请选择负责人" placeholder="请选择负责人"
option-filter-prop="children" option-filter-prop="children"
@change="principalChange"
:filter-option="filterOption"> :filter-option="filterOption">
<a-select-option v-for="item in userList" :key="item.id" :value="item.id">{{ item.realname }}</a-select-option> <a-select-option v-for="item in userList" :key="item.id" :value="item.id">
{{ item.realname }}
</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date> <j-year-date style="width:100%"
placeholder="请选择运行年份"
allowClear
v-model="queryParam.year"
@change="dateChange"></j-year-date>
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -133,7 +142,7 @@ export default {
contractId: { contractId: {
type: String, type: String,
requird: false, requird: false,
default: null, default: null
}, },
// 项目类型，1--普通项目；2--工作组项目；3--会议项目；4--会员项目 // 项目类型，1--普通项目；2--工作组项目；3--会议项目；4--会员项目
projectType: { projectType: {
@@ -248,10 +257,23 @@ export default {
} }
], ],
treeDepartData: [], // 部门列表 treeDepartData: [], // 部门列表
userList: [], // 用户列表 userList: [] // 用户列表
} }
}, },
methods: { methods: {
/**
* 运行年份变化
*/
dateChange() {
this.$forceUpdate()
},
/**
* 负责人变化
*/
principalChange() {
this.$forceUpdate()
},
open() { open() {
// 运行年份默认为当年 // 运行年份默认为当年
this.queryParam.year = new Date().getFullYear().toString() this.queryParam.year = new Date().getFullYear().toString()
@@ -357,13 +379,13 @@ export default {
* 重置 * 重置
*/ */
searchReset() { searchReset() {
this.lastQueryParam = {}
let obj = { let obj = {
departId: this.departId, departId: this.departId,
principalId: undefined, principalId: this.principal,
year: undefined, year: new Date().getFullYear().toString(),
} }
this.queryParam = Object.assign(this.queryParam, obj) this.queryParam = Object.assign(this.queryParam, obj)
this.lastQueryParam = Object.assign(this.lastQueryParam, obj)
this.loadData(1) this.loadData(1)
}, },
/** /**
src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue
+22 -1
View File
@@ -18,7 +18,7 @@
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date> <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year" @change="dateChange"></j-year-date>
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -163,7 +163,16 @@ export default {
} }
}, },
methods: { methods: {
/**
* 运行年份变化
*/
dateChange() {
this.$forceUpdate()
},
open() { open() {
// 运行年份默认为当年
this.queryParam.year = new Date().getFullYear().toString()
this.lastQueryParam.year = new Date().getFullYear().toString()
this.loadData() this.loadData()
this.visible = true this.visible = true
}, },
@@ -230,7 +239,19 @@ export default {
addOk() { addOk() {
this.close() this.close()
this.$emit('ok') this.$emit('ok')
},
/**
* 重置
*/
searchReset() {
this.lastQueryParam = {
year: new Date().getFullYear().toString()
} }
this.queryParam = {
year: new Date().getFullYear().toString()
}
this.loadData(1)
},
} }
} }
</script> </script>
src/views/incomePayments/meetManage/Attendance.vue
+88 -34
View File
@@ -5,7 +5,7 @@
<div class="part-title"> <div class="part-title">
<div class="part-title-text">会议信息</div> <div class="part-title-text">会议信息</div>
</div> </div>
<a-row> <a-row class="meeting-info flex-col">
<a-col :xxl="8" :xl="12" :sm="24"> <a-col :xxl="8" :xl="12" :sm="24">
<label class="label">会议名称：</label><span>{{ currentMeetingInfo.meetingName }}</span> <label class="label">会议名称：</label><span>{{ currentMeetingInfo.meetingName }}</span>
</a-col> </a-col>
@@ -66,10 +66,24 @@
<a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' "> <a-col :xxl="8" :xl="12" :sm="24" v-show="currentMeetingInfo.meetingType ==='3' ">
<label>合作伙伴邀请码：</label><span>{{ currentMeetingInfo.cooperativeInvitationCode }}</span> <label>合作伙伴邀请码：</label><span>{{ currentMeetingInfo.cooperativeInvitationCode }}</span>
</a-col> </a-col>
<a-col :xxl="8" :xl="12" :sm="24"> </a-row>
<label>会议通知：</label><span v-if="currentMeetingInfo.meetingFiles"><preview-file <a-row class="flex-col">
<a-col>
<label class="label">会议通知：</label><span v-if="currentMeetingInfo.meetingFiles"><preview-file
:file-id="currentMeetingInfo.meetingFiles"></preview-file></span> :file-id="currentMeetingInfo.meetingFiles"></preview-file></span>
</a-col> </a-col>
</a-row>
<a-row class="meeting-textarea flex-col">
<label class="label">会议内容：</label><span class="content">{{ currentMeetingInfo.meetingContent }}</span>
</a-row>
<a-row class="meeting-textarea flex-col">
<label class="label">备注：</label><span class="content">{{ currentMeetingInfo.remark }}</span>
</a-row>
<div class="part-title">
<div class="part-title-text">报名信息</div>
</div>
<a-row class="flex-col">
<a-col :xxl="8" :xl="12" :sm="24"> <a-col :xxl="8" :xl="12" :sm="24">
<label>报名链接：</label><span>{{ signUpHerfUrl }}</span> <label>报名链接：</label><span>{{ signUpHerfUrl }}</span>
</a-col> </a-col>
@@ -87,18 +101,12 @@
v-model="currentMeetingInfo.paymentQrCode" disabled></j-image-upload> v-model="currentMeetingInfo.paymentQrCode" disabled></j-image-upload>
</a-col> </a-col>
</a-row> </a-row>
<a-row v-show="currentMeetingInfo.meetingType === '2' "> <a-row v-show="currentMeetingInfo.meetingType === '2' " class="flex-col">
<label class="label">酒店联系人及手机号：</label><span class="content" <label class="label">酒店联系人及手机号：</label>
<span class="content"
v-for="(item,index) of currentMeetingInfo.hotelContactsList" v-for="(item,index) of currentMeetingInfo.hotelContactsList"
:key="index">{{ :key="index">
item.hotelContacts + ':' + item.hotelContactsPhone + ' ' {{ item.hotelContacts + ':' + item.hotelContactsPhone + ' ' }}</span>
}}</span>
</a-row>
<a-row>
<label class="label">会议内容：</label><span class="content">{{ currentMeetingInfo.meetingContent }}</span>
</a-row>
<a-row>
<label class="label">备注：</label><span class="content">{{ currentMeetingInfo.remark }}</span>
</a-row> </a-row>
<div class="part-title"> <div class="part-title">
<div class="part-title-text">参会人员信息</div> <div class="part-title-text">参会人员信息</div>
@@ -160,7 +168,8 @@
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search" v-has:[authorCode.search]="'attendance:search'">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search"
v-has:[authorCode.search]="'attendance:search'">查询</a-button>
<a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button> <a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
</span> </span>
</a-col> </a-col>
@@ -173,10 +182,14 @@
<div class="table-operator"> <div class="table-operator">
<!-- 变更去掉了此功能 暂时注释 2021-09-16 --> <!-- 变更去掉了此功能 暂时注释 2021-09-16 -->
<!-- <a-button type="primary" icon="import" @click="importParticipant">导入参会人</a-button>--> <!-- <a-button type="primary" icon="import" @click="importParticipant">导入参会人</a-button>-->
<a-button type="primary" icon="plus" @click="addParticipant" v-has:[authorCode.add]="'attendance:add'">添加参会人</a-button> <a-button type="primary" icon="plus" @click="addParticipant" v-has:[authorCode.add]="'attendance:add'">添加参会人
<a-button type="primary" icon="download" @click="handleExportXls('会员项目')" v-has:[authorCode.export]="'attendance:export'">导出 </a-button>
<a-button type="primary" icon="download" @click="handleExportXls('会员项目')"
v-has:[authorCode.export]="'attendance:export'">导出
</a-button>
<a-button type="danger" icon="delete" @click="batchDel" v-has:[authorCode.batchDel]="'attendance:batchDel'">
批量删除
</a-button> </a-button>
<a-button type="danger" icon="delete" @click="batchDel" v-has:[authorCode.batchDel]="'attendance:batchDel'">批量删除</a-button>
<!--当会议费用为0不需要合并开票 --> <!--当会议费用为0不需要合并开票 -->
<!-- 变更将此功能添加到到账开票了 暂时注释 2021-09-16 --> <!-- 变更将此功能添加到到账开票了 暂时注释 2021-09-16 -->
<!-- <a-button type="primary" @click="batchInvoice" v-show="currentMeetingInfo.meetingCosts !== 0">合并开票</a-button>--> <!-- <a-button type="primary" @click="batchInvoice" v-show="currentMeetingInfo.meetingCosts !== 0">合并开票</a-button>-->
@@ -326,7 +339,7 @@ export default {
align: 'center', align: 'center',
dataIndex: 'companyContactName', dataIndex: 'companyContactName',
width: 160, width: 160,
scopedSlots: {customRender: 'person'}, scopedSlots: { customRender: 'person' }
}, },
{ {
title: '应收金额', title: '应收金额',
@@ -401,9 +414,7 @@ export default {
} }
], ],
// 权限编码 // 权限编码
authorCode:{ authorCode: {},
},
// 其他会议的参会情况的权限编码 // 其他会议的参会情况的权限编码
otherMeetingCode: { otherMeetingCode: {
search: 'otherMeetingSituation:search', search: 'otherMeetingSituation:search',
@@ -446,7 +457,7 @@ export default {
edit: 'internalMeetingSituation:edit', edit: 'internalMeetingSituation:edit',
delete: 'internalMeetingSituation:delete', delete: 'internalMeetingSituation:delete',
auditRecord: 'internalMeetingSituation:auditCredentials', auditRecord: 'internalMeetingSituation:auditCredentials',
auditSignUpInfo:'internalMeetingSituation:auditSignUp', auditSignUpInfo: 'internalMeetingSituation:auditSignUp'
}, },
// 标协会议的参会情况的权限编码 // 标协会议的参会情况的权限编码
standardsMeetingCode: { standardsMeetingCode: {
@@ -591,11 +602,16 @@ export default {
// eslint-disable-next-line // eslint-disable-next-line
url() { url() {
switch (this.$route.query.meetingType) { switch (this.$route.query.meetingType) {
case '1': return this.workGroupMeetingUrl case '1':
case '2': return this.standardsMeetingUrl return this.workGroupMeetingUrl
case '3': return this.internalMeetingUrl case '2':
case '4': return this.otherMeetingUrl return this.standardsMeetingUrl
case '5': return this.committeeMeetingUrl case '3':
return this.internalMeetingUrl
case '4':
return this.otherMeetingUrl
case '5':
return this.committeeMeetingUrl
} }
}, },
// 报名链接 // 报名链接
@@ -759,7 +775,7 @@ export default {
toSignUpDetail(record) { toSignUpDetail(record) {
this.$router.push({ this.$router.push({
path: '/incomePayments/meetManage/SignUpInfoDetail', path: '/incomePayments/meetManage/SignUpInfoDetail',
query: {id: record.id, meetingType: this.currentMeetingInfo.meetingType,} query: { id: record.id, meetingType: this.currentMeetingInfo.meetingType }
}) })
}, },
/* /*
@@ -791,11 +807,21 @@ export default {
* */ * */
setCodeByMeetingType(type) { setCodeByMeetingType(type) {
switch (type) { switch (type) {
case '1':this.authorCode = Object.assign({},this.workGroupMeetingCode);break case '1':
case '2':this.authorCode = Object.assign({},this.standardsMeetingCode);break this.authorCode = Object.assign({}, this.workGroupMeetingCode)
case '3':this.authorCode = Object.assign({},this.internalMeetingCode);break break
case '4':this.authorCode = Object.assign({},this.otherMeetingCode);break case '2':
case '5':this.authorCode = Object.assign({},this.committeeMeetingCode);break this.authorCode = Object.assign({}, this.standardsMeetingCode)
break
case '3':
this.authorCode = Object.assign({}, this.internalMeetingCode)
break
case '4':
this.authorCode = Object.assign({}, this.otherMeetingCode)
break
case '5':
this.authorCode = Object.assign({}, this.committeeMeetingCode)
break
} }
} }
} }
@@ -805,10 +831,38 @@ export default {
<style scoped lang="less"> <style scoped lang="less">
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.meeting-info {
.ant-col {
span {
display: inline-block;
word-break: keep-all;
white-space: nowrap;
max-width: calc(100% - 100px);
overflow: hidden;
text-overflow: ellipsis;
}
}
}
//会议内容、备注的样式
.meeting-textarea {
display: flex;
label {
flex-shrink: 0;
}
}
.flex-col {
.ant-col {
display: flex;
}
}
.ant-row { .ant-row {
line-height: 3; line-height: 3;
.ant-col { .ant-col {
label { label {
color: #999; color: #999;
} }
src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+10
View File
@@ -96,6 +96,16 @@
</a-radio-group> </a-radio-group>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 收入合同处新增工作组项目需要显示默认的来款用途，在工作组新增的时候为后端写死-->
<a-col :xl="12" :sm="24" v-if="defaultChargeWay === 2">
<a-form-item label="来款用途" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-decorator="['chargeUse', {initialValue: 1}]"
:triggerChange="true"
:disabled="true"
placeholder="请选择来款用途"
dictCode="payment_charge_use"/>
</a-form-item>
</a-col>
<a-col :xl="12" :sm="24" v-if="chargeWayType === 3"> <a-col :xl="12" :sm="24" v-if="chargeWayType === 3">
<a-form-item label="收费通知号" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="收费通知号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-radio-group <a-radio-group