diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index 1da7b83..f4a3a94 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -453,6 +453,12 @@
v-show="record.identity === 1 && record.registerCheckResult !== 0"
v-has:[authorCode.guestsUploadFileFlag]="'attendance:guestsUploadFileFlag'"
>资料状态
+
+ 编辑打包前金额
@@ -468,6 +474,9 @@
+
+
+
@@ -493,6 +502,8 @@ import WasicTopicData from './modules/wasicStaticData'
import { formatMoney } from '@/utils/formatMoney'
import {getPayConfirmList} from '@api/incomePaymentsApi'
import {MeetingTypeEnums} from '@/enums/commonEnums'
+import EditBeforePackMoney from './modules/EditBeforePackMoney'
+
export default {
@@ -510,7 +521,8 @@ export default {
StatusSlot,
PreviewFile,
JImageUpload,
- SetGuessUploadFlagModal
+ SetGuessUploadFlagModal,
+ EditBeforePackMoney
},
data() {
return {
@@ -706,7 +718,8 @@ export default {
delete: 'otherMeetingSituation:delete',
auditRecord: 'otherMeetingSituation:auditCredentials',
auditSignUpInfo: 'otherMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'otherMeetingSituation:guestsUploadFileFlag'
+ guestsUploadFileFlag: 'otherMeetingSituation:guestsUploadFileFlag',
+ editBeforePackMoney: 'otherMeetingSituation:editBeforePackMoney' // 编辑打包前金额
},
// 分标委会议的参会情况权限编码
committeeMeetingCode: {
@@ -718,7 +731,8 @@ export default {
delete: 'committeeMeetingSituation:delete',
auditRecord: 'committeeMeetingSituation:auditCredentials',
auditSignUpInfo: 'committeeMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'committeeMeetingSituation:guestsUploadFileFlag'
+ guestsUploadFileFlag: 'committeeMeetingSituation:guestsUploadFileFlag',
+ editBeforePackMoney: 'committeeMeetingSituation:editBeforePackMoney' // 编辑打包前金额
},
// 工作组会议的参会情况的权限编码
workGroupMeetingCode: {
@@ -731,7 +745,8 @@ export default {
auditRecord: 'workGroupMeetingSituation:auditCredentials',
auditSignUpInfo: 'workGroupMeetingSituation:auditSignUp',
batchAuditSignUpInfo: 'workGroupMeetingSituation:batchAuditSignUp', // 批量审核报名信息
- guestsUploadFileFlag: 'workGroupMeetingSituation:guestsUploadFileFlag'
+ guestsUploadFileFlag: 'workGroupMeetingSituation:guestsUploadFileFlag',
+ editBeforePackMoney: 'workGroupMeetingSituation:editBeforePackMoney' // 编辑打包前金额
},
// 国际研讨会的参会情况的权限编码
internalMeetingCode: {
@@ -743,7 +758,8 @@ export default {
delete: 'internalMeetingSituation:delete',
auditRecord: 'internalMeetingSituation:auditCredentials',
auditSignUpInfo: 'internalMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'internalMeetingSituation:guestsUploadFileFlag'
+ guestsUploadFileFlag: 'internalMeetingSituation:guestsUploadFileFlag',
+ editBeforePackMoney: 'internalMeetingSituation:editBeforePackMoney' // 编辑打包前金额
},
// 标协会议的参会情况的权限编码
standardsMeetingCode: {
@@ -755,7 +771,8 @@ export default {
delete: 'standardsMeetingSituation:delete',
auditRecord: 'standardsMeetingSituation:auditCredentials',
auditSignUpInfo: 'standardsMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'standardsMeetingSituation:guestsUploadFileFlag'
+ guestsUploadFileFlag: 'standardsMeetingSituation:guestsUploadFileFlag',
+ editBeforePackMoney: 'standardsMeetingSituation:editBeforePackMoney' // 编辑打包前金额
},
// 理事会的参会情况的权限编码
councilMeetingCode: {
@@ -767,7 +784,8 @@ export default {
delete: 'councilMeetingSituation:delete',
auditRecord: 'councilMeetingSituation:auditCredentials',
auditSignUpInfo: 'councilMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'councilMeetingSituation:guestsUploadFileFlag'
+ guestsUploadFileFlag: 'councilMeetingSituation:guestsUploadFileFlag',
+ editBeforePackMoney: 'councilMeetingSituation:editBeforePackMoney' // 编辑打包前金额
},
// 起草组会议的参会情况的权限编码
draftGroupMeetingCode: {
@@ -780,7 +798,8 @@ export default {
auditRecord: 'draftGroupMeetingSituation:auditCredentials',
auditSignUpInfo: 'draftGroupMeetingSituation:auditSignUp',
batchAuditSignUpInfo: 'draftGroupMeetingSituation:batchAuditSignUp', // 批量审核报名信息
- guestsUploadFileFlag: 'draftGroupMeetingSituation:guestsUploadFileFlag'
+ guestsUploadFileFlag: 'draftGroupMeetingSituation:guestsUploadFileFlag',
+ editBeforePackMoney: 'draftGroupMeetingSituation:editBeforePackMoney' // 编辑打包前金额
},
// 海外会议的参会情况的权限编码
overseasMeetingCode: {
@@ -792,7 +811,8 @@ export default {
delete: 'overseasMeetingSituation:delete',
auditRecord: 'overseasMeetingSituation:auditCredentials',
auditSignUpInfo: 'overseasMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'overseasMeetingSituation:guestsUploadFileFlag'
+ guestsUploadFileFlag: 'overseasMeetingSituation:guestsUploadFileFlag',
+ editBeforePackMoney: 'overseasMeetingSituation:editBeforePackMoney' // 编辑打包前金额
},
disableMixinCreated: true,
// url: {
@@ -1345,6 +1365,10 @@ export default {
}
})
},
+ // 编辑打包前金额,只要缴费方式为打包的项目才有的操作
+ editBeforePackMoney(record) {
+ this.$refs.editBeforePackMoney.edit(record)
+ }
}
}
diff --git a/src/views/incomePayments/meetManage/modules/EditBeforePackMoney.vue b/src/views/incomePayments/meetManage/modules/EditBeforePackMoney.vue
new file mode 100644
index 0000000..2215852
--- /dev/null
+++ b/src/views/incomePayments/meetManage/modules/EditBeforePackMoney.vue
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+ e.target.value = (e.target.value.replace(/[^0-9-.]/g, '')).trim()">
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/statisticalReport/MeetingPackStatistics.vue b/src/views/statisticalReport/MeetingPackStatistics.vue
index d773b7e..2d49abc 100644
--- a/src/views/statisticalReport/MeetingPackStatistics.vue
+++ b/src/views/statisticalReport/MeetingPackStatistics.vue
@@ -58,6 +58,12 @@
@change="handleTableChange"
:class="dataSource.length === 0 ? 'show-scroll' : ''"
class="j-table-force-nowrap main-table">
+
+
+ {{ text }}
+ {{ text }}
+
+
@@ -119,6 +125,7 @@ import JYearDate from '@/components/jero/JYearDate'
import { getAction } from '@api/manage'
import {formatMoney} from '@/utils/formatMoney'
import { MonthData } from './statisticData'
+import { MeetingTypeEnums } from '../../enums/commonEnums'
const defaultTableColumns = [
{
@@ -126,7 +133,7 @@ const defaultTableColumns = [
align: 'center',
width: 160,
dataIndex: 'meetingName',
- scopedSlots: { customRender: 'text' }
+ scopedSlots: {customRender: 'htmlSlot'},
},
{
title: '会议类型',
@@ -149,6 +156,14 @@ const defaultTableColumns = [
dataIndex: 'companyContactName',
scopedSlots: { customRender: 'projectName' }
},
+ {
+ title: '打包前金额',
+ align: 'center',
+ width: 140,
+ dataIndex: 'beforePackMoney',
+ sorter: true,
+ scopedSlots: {customRender: 'allMoney'}
+ },
{
title: '年度待确收金额',
align: 'center',
@@ -250,7 +265,6 @@ export default {
paymentYear: new Date().getFullYear().toString(),
payMode: 3 // 缴费方式-默认打包
},
- // todo 需要替换掉
url: {
list: '/statistics/meetingPackStatistics/page',
exportXlsUrl: '/statistics/meetingPackStatistics/excelMeetingPackStatistics'
@@ -391,7 +405,29 @@ export default {
if(!this.queryParam.paymentYear) {
this.queryParam.paymentMonth = undefined
}
- }
+ },
+ /*
+ * 参会情况
+ * */
+ toAttendance(record) {
+ let pathMap = new Map()
+ pathMap.set('1','/incomePayments/meetManage/AttendanceWorkGroupMeeting')
+ pathMap.set('2','/incomePayments/meetManage/AttendanceStandardsMeeting')
+ pathMap.set('3','/incomePayments/meetManage/AttendanceInternalMeeting')
+ pathMap.set('4','/incomePayments/meetManage/AttendanceOhterMeeting')
+ pathMap.set('5','/incomePayments/meetManage/AttendanceCommitteeMeeting')
+ pathMap.set('6','/incomePayments/meetManage/AttendanceCouncilMeeting')
+ pathMap.set('7','/incomePayments/meetManage/AttendanceDraftGroupMeeting')
+ pathMap.set(MeetingTypeEnums.overseas.value,'/incomePayments/meetManage/AttendanceOverseasMeeting')
+ this.$router.push({
+ path: pathMap.get(record.meetingType+''),
+ query: {
+ id: record.meetingId,
+ meetingName: record.meetingName,
+ meetingType: record.meetingType
+ }
+ })
+ },
}
}
@@ -441,4 +477,9 @@ export default {
border-left: none;
}
}
+
+.primary-color {
+ color: #069f99;
+ cursor: pointer;
+}
\ No newline at end of file