diff --git a/src/views/incomePayments/meetManage/Attendance.vue b/src/views/incomePayments/meetManage/Attendance.vue
index c4de81f..8b9847f 100644
--- a/src/views/incomePayments/meetManage/Attendance.vue
+++ b/src/views/incomePayments/meetManage/Attendance.vue
@@ -454,12 +454,6 @@
v-show="record.identity === 1 && record.registerCheckResult !== 0"
v-has:[authorCode.guestsUploadFileFlag]="'attendance:guestsUploadFileFlag'"
>资料状态
-
- 编辑打包前金额
@@ -475,9 +469,6 @@
-
-
-
@@ -503,7 +494,6 @@ 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'
@@ -522,8 +512,7 @@ export default {
StatusSlot,
PreviewFile,
JImageUpload,
- SetGuessUploadFlagModal,
- EditBeforePackMoney
+ SetGuessUploadFlagModal
},
data() {
return {
@@ -769,8 +758,7 @@ export default {
delete: 'otherMeetingSituation:delete',
auditRecord: 'otherMeetingSituation:auditCredentials',
auditSignUpInfo: 'otherMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'otherMeetingSituation:guestsUploadFileFlag',
- editBeforePackMoney: 'otherMeetingSituation:editBeforePackMoney' // 编辑打包前金额
+ guestsUploadFileFlag: 'otherMeetingSituation:guestsUploadFileFlag'
},
// 分标委会议的参会情况权限编码
committeeMeetingCode: {
@@ -782,8 +770,7 @@ export default {
delete: 'committeeMeetingSituation:delete',
auditRecord: 'committeeMeetingSituation:auditCredentials',
auditSignUpInfo: 'committeeMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'committeeMeetingSituation:guestsUploadFileFlag',
- editBeforePackMoney: 'committeeMeetingSituation:editBeforePackMoney' // 编辑打包前金额
+ guestsUploadFileFlag: 'committeeMeetingSituation:guestsUploadFileFlag'
},
// 工作组会议的参会情况的权限编码
workGroupMeetingCode: {
@@ -796,8 +783,7 @@ export default {
auditRecord: 'workGroupMeetingSituation:auditCredentials',
auditSignUpInfo: 'workGroupMeetingSituation:auditSignUp',
batchAuditSignUpInfo: 'workGroupMeetingSituation:batchAuditSignUp', // 批量审核报名信息
- guestsUploadFileFlag: 'workGroupMeetingSituation:guestsUploadFileFlag',
- editBeforePackMoney: 'workGroupMeetingSituation:editBeforePackMoney' // 编辑打包前金额
+ guestsUploadFileFlag: 'workGroupMeetingSituation:guestsUploadFileFlag'
},
// 国际研讨会的参会情况的权限编码
internalMeetingCode: {
@@ -809,8 +795,7 @@ export default {
delete: 'internalMeetingSituation:delete',
auditRecord: 'internalMeetingSituation:auditCredentials',
auditSignUpInfo: 'internalMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'internalMeetingSituation:guestsUploadFileFlag',
- editBeforePackMoney: 'internalMeetingSituation:editBeforePackMoney' // 编辑打包前金额
+ guestsUploadFileFlag: 'internalMeetingSituation:guestsUploadFileFlag'
},
// 标协会议的参会情况的权限编码
standardsMeetingCode: {
@@ -822,8 +807,7 @@ export default {
delete: 'standardsMeetingSituation:delete',
auditRecord: 'standardsMeetingSituation:auditCredentials',
auditSignUpInfo: 'standardsMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'standardsMeetingSituation:guestsUploadFileFlag',
- editBeforePackMoney: 'standardsMeetingSituation:editBeforePackMoney' // 编辑打包前金额
+ guestsUploadFileFlag: 'standardsMeetingSituation:guestsUploadFileFlag'
},
// 理事会的参会情况的权限编码
councilMeetingCode: {
@@ -835,8 +819,7 @@ export default {
delete: 'councilMeetingSituation:delete',
auditRecord: 'councilMeetingSituation:auditCredentials',
auditSignUpInfo: 'councilMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'councilMeetingSituation:guestsUploadFileFlag',
- editBeforePackMoney: 'councilMeetingSituation:editBeforePackMoney' // 编辑打包前金额
+ guestsUploadFileFlag: 'councilMeetingSituation:guestsUploadFileFlag'
},
// 起草组会议的参会情况的权限编码
draftGroupMeetingCode: {
@@ -849,8 +832,7 @@ export default {
auditRecord: 'draftGroupMeetingSituation:auditCredentials',
auditSignUpInfo: 'draftGroupMeetingSituation:auditSignUp',
batchAuditSignUpInfo: 'draftGroupMeetingSituation:batchAuditSignUp', // 批量审核报名信息
- guestsUploadFileFlag: 'draftGroupMeetingSituation:guestsUploadFileFlag',
- editBeforePackMoney: 'draftGroupMeetingSituation:editBeforePackMoney' // 编辑打包前金额
+ guestsUploadFileFlag: 'draftGroupMeetingSituation:guestsUploadFileFlag'
},
// 海外会议的参会情况的权限编码
overseasMeetingCode: {
@@ -862,8 +844,7 @@ export default {
delete: 'overseasMeetingSituation:delete',
auditRecord: 'overseasMeetingSituation:auditCredentials',
auditSignUpInfo: 'overseasMeetingSituation:auditSignUp',
- guestsUploadFileFlag: 'overseasMeetingSituation:guestsUploadFileFlag',
- editBeforePackMoney: 'overseasMeetingSituation:editBeforePackMoney' // 编辑打包前金额
+ guestsUploadFileFlag: 'overseasMeetingSituation:guestsUploadFileFlag'
},
// 功能安全中心会议的参会情况的权限编码
safetyCenterMeetingCode: {
@@ -1455,10 +1436,6 @@ export default {
that.$refs.auditModal.open({ batch: true, ids }, true)
}
})
- },
- // 编辑打包前金额,只要缴费方式为打包的项目才有的操作
- 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
deleted file mode 100644
index 2215852..0000000
--- a/src/views/incomePayments/meetManage/modules/EditBeforePackMoney.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
-
-
-
-
- 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 2d49abc..38a121b 100644
--- a/src/views/statisticalReport/MeetingPackStatistics.vue
+++ b/src/views/statisticalReport/MeetingPackStatistics.vue
@@ -13,8 +13,8 @@
-
-
+
+
@@ -156,14 +156,6 @@ const defaultTableColumns = [
dataIndex: 'companyContactName',
scopedSlots: { customRender: 'projectName' }
},
- {
- title: '打包前金额',
- align: 'center',
- width: 140,
- dataIndex: 'beforePackMoney',
- sorter: true,
- scopedSlots: {customRender: 'allMoney'}
- },
{
title: '年度待确收金额',
align: 'center',
@@ -258,11 +250,11 @@ export default {
footerDataSource: [],
// 给定当年作为来款年份默认查询条件
queryParam: {
- paymentYear: new Date().getFullYear().toString(),
+ year: new Date().getFullYear().toString(),
payMode: 3 // 缴费方式-默认打包
},
lastQueryParam: {
- paymentYear: new Date().getFullYear().toString(),
+ year: new Date().getFullYear().toString(),
payMode: 3 // 缴费方式-默认打包
},
url: {
@@ -345,11 +337,11 @@ export default {
},
searchReset() {
this.lastQueryParam = {
- paymentYear: new Date().getFullYear().toString(),
+ year: new Date().getFullYear().toString(),
payMode: 3 // 缴费方式-默认打包
}
this.queryParam = {
- paymentYear: new Date().getFullYear().toString(),
+ year: new Date().getFullYear().toString(),
payMode: 3 // 缴费方式-默认打包
}
this.loadData(1)
@@ -402,7 +394,7 @@ export default {
},
// 确认年份 年份选择器改变的事件
paymentYearChange() {
- if(!this.queryParam.paymentYear) {
+ if(!this.queryParam.year) {
this.queryParam.paymentMonth = undefined
}
},