diff --git a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
index 82398a7..edd05c9 100644
--- a/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
+++ b/src/views/contractManagement/expenditureContract/modules/ExpenditureContractModule.vue
@@ -28,18 +28,17 @@
- {e.target.value = (e.target.value + '').trim()}">
+
- {e.target.value = (e.target.value + '').trim()}">
+
@@ -288,11 +287,11 @@ export default {
rules: [{ required: true, message: '请输入合同名称' }],
validateTrigger: 'blur'
},
- signedCompanyTemporaryName: {
- rules: [{ required: true, message: '请输入签订单位' }],
- validateTrigger: 'blur'
+ signedCompany: {
+ rules: [{ required: true, message: '请选择签订单位' }],
+ validateTrigger: 'change'
},
- signedContactsTemporaryName: {
+ signedContactsId: {
rules: [{ required: true, message: '请选择签订联系人' }],
validateTrigger: 'blur'
},
@@ -365,17 +364,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)
@@ -384,7 +383,7 @@ export default {
// 回显打包年份
this.isPackage = this.model.pack === 1
this.$nextTick(() => {
- 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.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.confirmLoading = false
})
} else {
diff --git a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue
index a94dd19..ed842e0 100644
--- a/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue
+++ b/src/views/projectManagement/WorkingGroupProjectDataMaintenance.vue
@@ -87,7 +87,6 @@ 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',
@@ -196,18 +195,7 @@ 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)
- },
+ }
}
}