diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue index 8395b26..eef544e 100644 --- a/src/components/ProjectDetailModal.vue +++ b/src/components/ProjectDetailModal.vue @@ -227,7 +227,7 @@ const columns = [ { title: '邮寄人', align: 'center', - dataIndex: 'contactName' + dataIndex: 'mailName' }, { title: '快递', diff --git a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue index 672a71f..e3e847b 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectMeetingProjectModule.vue @@ -35,7 +35,8 @@ - + @@ -72,8 +73,7 @@ class="j-table-force-nowrap"> @@ -87,7 +87,7 @@ - + @@ -106,7 +106,7 @@ import '@/assets/less/TableExpand.less' export default { name: 'SelectMeetingProjectModule', mixins: [JeroListMixin], - components:{ + components: { JDate, JYearDate, StatusSlot, @@ -143,117 +143,125 @@ export default { align: 'center', dataIndex: 'meetingName', width: 160, - scopedSlots: {customRender: 'text'} + scopedSlots: { customRender: 'text' } }, { title: '参会单位', align: 'center', dataIndex: 'companyName', width: 260, - scopedSlots: {customRender: 'text'} + scopedSlots: { customRender: 'text' } }, // 合同里来款用途固定为会务费 { title: '来款用途', align: 'center', dataIndex: 'chargeUse', - width: 80, - customRender: () => {return '会务费'} + width: 200, + customRender: () => { + return '会务费' + } }, { title: '参会人员', align: 'center', dataIndex: 'companyContactName', - width: 80, - scopedSlots: {customRender: 'text'} + width: 260, + scopedSlots: { customRender: 'text' } }, { title: '应收金额', align: 'center', dataIndex: 'amountReceivable', - width: 80, - scopedSlots: {customRender: 'text'} + width: 200, + scopedSlots: { customRender: 'text' } }, { title: '实收金额', align: 'center', dataIndex: 'paidAmount', - width: 80, - scopedSlots: {customRender: 'text'} + width: 200, + scopedSlots: { customRender: 'text' } }, { title: '缴费方式', align: 'center', dataIndex: 'payMode_dictText', - width: 80, - scopedSlots: {customRender: 'text'} + width: 150, + scopedSlots: { customRender: 'text' } }, { title: '负责人', align: 'center', dataIndex: 'directorName', - width: 80, - scopedSlots: {customRender: 'text'} + width: 200, + scopedSlots: { customRender: 'text' } }, { title: '打包', align: 'center', dataIndex: 'pack', width: 80, - scopedSlots: {customRender: 'status-pack'} + scopedSlots: { customRender: 'status-pack' } }, { title: '需要发票', align: 'center', dataIndex: 'needInvoice', - scopedSlots: {customRender: 'status-pack'}, - width: 80, + scopedSlots: { customRender: 'status-pack' }, + width: 80 }, { title: '到账', align: 'center', dataIndex: 'inAccount', - scopedSlots: {customRender: 'status'}, - width: 80, + scopedSlots: { customRender: 'status' }, + width: 80 }, { title: '开票', align: 'center', dataIndex: 'makeInvoice', - scopedSlots: {customRender: 'status'}, - width: 80, + scopedSlots: { customRender: 'status' }, + width: 80 }, { title: '邮寄', align: 'center', dataIndex: 'mail', - scopedSlots: {customRender: 'status'}, - width: 80, + scopedSlots: { customRender: 'status' }, + width: 80 }, { title: '创建时间', align: 'center', dataIndex: 'createTime', width: 160, - scopedSlots: {customRender: 'text'}, - }, + scopedSlots: { customRender: 'text' } + } ], url: { - list: '/meeting/payMeetingSituation/contractPage', + list: '/meeting/payMeetingSituation/contractPage' }, disableMixinCreated: true, contractId: '', // 收入合同id // 合同信息 - contranctInfo:{}, + contranctInfo: {}, // 打包状态 - pack:'' + pack: '' } }, methods: { moment, + /** + * 运行年份变化 + */ + dateChange() { + this.$forceUpdate() + }, open(record) { - this.contranctInfo =Object.assign({},record) - console.log(record,'meetingPerson') + this.contranctInfo = Object.assign({}, record) + console.log(record, 'meetingPerson') this.filters.companyId = record.signedCompanyId // 列表查询加入打包年份 this.filters.packYear = record.packYear @@ -313,7 +321,7 @@ export default { /* * 打开新增会议参会人员 * */ - handleAdd(){ + handleAdd() { // 传进去一些需要的默认值 this.$refs.modalForm.open(this.contranctInfo) }, @@ -345,7 +353,7 @@ export default { particularYear: new Date().getFullYear().toString() } this.loadData(1) - }, + } } } diff --git a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue index 1e6ef79..2d228aa 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectProjectModule.vue @@ -20,6 +20,7 @@ v-model="queryParam.departId" placeholder="请选择科室" :disabled="pack === 0" + allowClear @change="departChange"> @@ -28,16 +29,24 @@ - {{ item.realname }} + + {{ item.realname }} + - + @@ -133,7 +142,7 @@ export default { contractId: { type: String, requird: false, - default: null, + default: null }, // 项目类型,1--普通项目;2--工作组项目;3--会议项目;4--会员项目 projectType: { @@ -248,10 +257,23 @@ export default { } ], treeDepartData: [], // 部门列表 - userList: [], // 用户列表 + userList: [] // 用户列表 } }, methods: { + + /** + * 运行年份变化 + */ + dateChange() { + this.$forceUpdate() + }, + /** + * 负责人变化 + */ + principalChange() { + this.$forceUpdate() + }, open() { // 运行年份默认为当年 this.queryParam.year = new Date().getFullYear().toString() @@ -357,13 +379,13 @@ export default { * 重置 */ searchReset() { - this.lastQueryParam = {} let obj = { departId: this.departId, - principalId: undefined, - year: undefined, + principalId: this.principal, + year: new Date().getFullYear().toString(), } this.queryParam = Object.assign(this.queryParam, obj) + this.lastQueryParam = Object.assign(this.lastQueryParam, obj) this.loadData(1) }, /** diff --git a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue index fcde150..8431244 100644 --- a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue +++ b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue @@ -18,7 +18,7 @@ - + @@ -163,7 +163,16 @@ export default { } }, methods: { + /** + * 运行年份变化 + */ + dateChange() { + this.$forceUpdate() + }, open() { + // 运行年份默认为当年 + this.queryParam.year = new Date().getFullYear().toString() + this.lastQueryParam.year = new Date().getFullYear().toString() this.loadData() this.visible = true }, @@ -230,7 +239,19 @@ export default { addOk() { this.close() this.$emit('ok') - } + }, + /** + * 重置 + */ + searchReset() { + this.lastQueryParam = { + year: new Date().getFullYear().toString() + } + this.queryParam = { + year: new Date().getFullYear().toString() + } + this.loadData(1) + }, } } diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue index 409f2ea..8e8ad14 100644 --- a/src/views/incomePayments/meetManage/Attendance.vue +++ b/src/views/incomePayments/meetManage/Attendance.vue @@ -5,7 +5,7 @@
会议信息
- + {{ currentMeetingInfo.meetingName }} @@ -66,10 +66,24 @@ {{ currentMeetingInfo.cooperativeInvitationCode }} - - + + + + + + {{ currentMeetingInfo.meetingContent }} + + + {{ currentMeetingInfo.remark }} + + +
+
报名信息
+
+ {{ signUpHerfUrl }} @@ -87,18 +101,12 @@ v-model="currentMeetingInfo.paymentQrCode" disabled>
- - {{ - item.hotelContacts + ':' + item.hotelContactsPhone + ' ' - }} - - - {{ currentMeetingInfo.meetingContent }} - - - {{ currentMeetingInfo.remark }} + + + + {{ item.hotelContacts + ':' + item.hotelContactsPhone + ' ' }}
参会人员信息
@@ -160,7 +168,8 @@ - 查询 + 查询 重置 @@ -173,10 +182,14 @@
- 添加参会人 - 导出 + 添加参会人 + + 导出 + + + 批量删除 - 批量删除 @@ -268,9 +281,9 @@