diff --git a/src/views/businessManagement/BusinessManagement.vue b/src/views/businessManagement/BusinessManagement.vue index a2079bd..183331a 100644 --- a/src/views/businessManagement/BusinessManagement.vue +++ b/src/views/businessManagement/BusinessManagement.vue @@ -34,8 +34,8 @@ @change="handleImportExcel" v-has="'company:import'"> 导入 - 导出 - 下载模板 + 导出 + 下载模板 批量删除 diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index 3bbb960..d45afb2 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -36,7 +36,7 @@ @change="handleSignedCompanyChange"> - + { diff --git a/src/views/mailManagement/modules/MailModal.vue b/src/views/mailManagement/modules/MailModal.vue index 2637777..3363de9 100644 --- a/src/views/mailManagement/modules/MailModal.vue +++ b/src/views/mailManagement/modules/MailModal.vue @@ -118,12 +118,16 @@ export default { this.form.resetFields() this.model = Object.assign({}, record) this.visible = true - let date = new Date() - let sendDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() this.$nextTick(() => { - this.form.setFieldsValue({'sendDate': sendDate}) this.form.setFieldsValue(pick(this.model, 'sendMethod', 'sendDate', 'postNo', 'remark')) }) + if (!this.model.sendDate) { + let date = new Date() + let sendDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + this.$nextTick(() => { + this.form.setFieldsValue({'sendDate': sendDate}) + }) + } }, close() { this.$emit('close') diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue index d5de6eb..45ffaf7 100644 --- a/src/views/packManagement/PackProjectMaintenance.vue +++ b/src/views/packManagement/PackProjectMaintenance.vue @@ -65,10 +65,16 @@
打包 - 批量取消打包 - 批量来款 - 批量开票 - 导出 + + 批量取消打包 + + + 批量来款 + + 批量开票 + + 导出 +
@@ -118,9 +124,11 @@ - 来款 + 来款 取消打包 - 开票 + 开票 @@ -163,6 +171,9 @@ :project-type="selectProjectType" :project-name="selectProjectName" @ok="modalFormOk"> + + + @@ -178,6 +189,7 @@ import BatchInvoicingModule from './modules/BatchInvoicingModule' import ArriveStageModule from '../financialManagement/arriveAndInvoicing/modules/ArriveStageModule' import InvoicingStageModule from '../financialManagement/arriveAndInvoicing/modules/InvoicingStageModule' import { getPackCompanyById, batchRemovePackProject, removePackProject } from '../../api/incomePaymentsApi' +import ProjectDetailModal from '../../components/ProjectDetailModal' export default { name: 'PackProjectMaintenance', @@ -189,7 +201,8 @@ export default { BatchIncomePaymentModule, BatchInvoicingModule, ArriveStageModule, - InvoicingStageModule + InvoicingStageModule, + ProjectDetailModal }, mixins: [JeroListMixin], data() { @@ -508,7 +521,7 @@ export default { // 开票 if (operateType === 'invoic') { // 是否存在不需要发票的项目 - if (arr.some(item => item.needInvoice === 0 || Number(item.receivableAmount) === 0)){ + if (arr.some(item => item.needInvoice === 0 || Number(item.receivableAmount) === 0)) { reject('存在不需要发票的项目!') } } diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue index 051fdf7..c01887c 100644 --- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue +++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue @@ -600,13 +600,18 @@ export default { */ validateContact(rule, value, callback) { if (value) { + // 需要联动验证的字段 + let fieldArr = ['contactsIdOne', 'contactsIdTwo', 'contactsIdThree'] + // 去掉当前更改的字段 + fieldArr = fieldArr.filter(tt => tt !== rule.field) const contactObj = this.form.getFieldsValue(['contactsIdOne', 'contactsIdTwo', 'contactsIdThree']) const contactArr = Object.values(contactObj) contactArr.filter(tt => tt !== undefined) - console.log(contactArr) if (isRepeat(contactArr)) { callback('请选择不同的企业联系人') } else { + // 进行其余两个联系人字段的重复校验 + this.form.validateFields(fieldArr) callback() } callback() diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue index f2721fe..8e145f9 100644 --- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue +++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue @@ -250,7 +250,14 @@ export default { ], filters: { id: this.$route.query.workGroupId - } + }, + // 给定当年作为来款年份默认查询条件 + queryParam: { + year: new Date().getFullYear().toString() + }, + lastQueryParam: { + year: new Date().getFullYear().toString() + }, } }, methods: { @@ -309,7 +316,16 @@ export default { }, true ) - } + }, + searchReset() { + this.lastQueryParam = { + year: new Date().getFullYear().toString() + } + this.queryParam = { + year: new Date().getFullYear().toString() + } + this.loadData(1) + }, } }