diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue index edd05c9..82398a7 100644 --- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue +++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue @@ -28,17 +28,18 @@ - + - + @@ -287,11 +288,11 @@ export default { rules: [{ required: true, message: '请输入合同名称' }], validateTrigger: 'blur' }, - signedCompany: { - rules: [{ required: true, message: '请选择签订单位' }], - validateTrigger: 'change' + signedCompanyTemporaryName: { + rules: [{ required: true, message: '请输入签订单位' }], + validateTrigger: 'blur' }, - signedContactsId: { + signedContactsTemporaryName: { rules: [{ required: true, message: '请选择签订联系人' }], validateTrigger: 'blur' }, @@ -364,17 +365,17 @@ export default { let record record = res.result // 回显企业 - record.signedCompany = { - id: record.signedCompanyTemporaryId, - companyName: record.signedCompanyTemporaryName - } + // record.signedCompany = { + // id: record.signedCompanyTemporaryId, + // companyName: record.signedCompanyTemporaryName + // } // 回显联系人 - this.selectedCompany = record.signedCompany - record.signedContactsId = record.signedContactsTemporaryId - this.selectedContact = { - id: record.signedContactsTemporaryId, - name: record.signedContactsTemporaryName - } + // this.selectedCompany = record.signedCompany + // record.signedContactsId = record.signedContactsTemporaryId + // this.selectedContact = { + // id: record.signedContactsTemporaryId, + // name: record.signedContactsTemporaryName + // } this.model = Object.assign({}, record) // 回显负责人部门 this.principalChange(this.model.principalId) @@ -383,7 +384,7 @@ export default { // 回显打包年份 this.isPackage = this.model.pack === 1 this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear')) + this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompanyTemporaryName', 'signedContactsTemporaryName', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'outstandingAmount', 'accountStatus', 'contractPaymentTimes', 'pack', 'packYear')) this.confirmLoading = false }) } else { diff --git a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue index ed842e0..a94dd19 100644 --- a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue +++ b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue @@ -87,6 +87,7 @@ import { JeroListMixin } from '../../mixins/JeroListMixin' import PageHeaderTitle from '../../components/layouts/PageHeaderTitle' import WorkGroupFileUploadModal from './modules/WorkGroupFileUploadModal' import WorkGroupDistributeModule from './modules/WorkGroupDistributeModule' +import { downloadFile } from '../../api/manage' export default { name: 'WorkingGroupProjectDataMaintenance', @@ -195,7 +196,18 @@ export default { this.dataId = id this.distributeModalVisible = true this.isBatchDistribute = false - } + }, + handleExportXls(fileName) { + if (!fileName || typeof fileName != 'string') { + fileName = '导出文件' + } + let param = this.getQueryParams() + if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { + param['selections'] = this.selectedRowKeys.join(',') + } + console.log('导出参数', param) + downloadFile(this.url.exportXlsUrl, fileName + '.zip', param) + }, } }