From 804fe3cafa04089ae8aff1d1b882a9f522145532 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Mon, 6 Sep 2021 16:52:32 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C?= =?UTF-8?q?=E3=80=81eslint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/api_address_config.js | 2 +- src/api/incomePaymentsApi.js | 10 +- src/components/company/SelectContacts.vue | 7 +- src/components/form/InstallmentForm.vue | 11 +- .../revenueContract/RevenueContractList.vue | 52 +- .../modules/RevenueContractAduitModule.vue | 111 +++ .../modules/RevenueContractDetail.vue | 70 +- .../modules/RevenueContractModule.vue | 648 +++++++++++------- .../WorkingGroupMemberUnitMaintenance.vue | 4 +- .../modules/GeneralProjectModule.vue | 2 +- 10 files changed, 638 insertions(+), 279 deletions(-) create mode 100644 src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue diff --git a/public/api_address_config.js b/public/api_address_config.js index 51df226..089904f 100644 --- a/public/api_address_config.js +++ b/public/api_address_config.js @@ -9,4 +9,4 @@ window._CONFIG["staticDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/d window._CONFIG["pdfDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/pdf/pdfPreviewIframe"; window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; // 预览文件地址 -window._CONFIG["onlinePreviewDomainURL"] = "http://127.0.0.1:8012/onlinePreview"; +window._CONFIG["onlinePreviewDomainURL"] = "http://localhost:8012/onlinePreview"; diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index 5f6f4cd..506db19 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -1,11 +1,17 @@ -import { getAction } from '@api/manage' +import { getAction, postAction } from '@api/manage' // 通过id获取工作组详情 const getWorkingGroupById = (params) => getAction('/project/payWorkingGroup/queryById', params) // 判断工作组成员是否设置来款通知 const getChargeNotice = (param) => getAction('/project/payWorkingGroupSubitem/getCharge', param) +// 通过id获取收入合同信息 +const getRevenueContractById = (param) => getAction('/contract/payIncomeContract/queryById', param) +// 收入合同审核 +const aduitRevenueContract = (param) => postAction('/contract/payIncomeContract/audit', param) export { getWorkingGroupById, - getChargeNotice + getChargeNotice, + getRevenueContractById, + aduitRevenueContract } \ No newline at end of file diff --git a/src/components/company/SelectContacts.vue b/src/components/company/SelectContacts.vue index 2414e65..fd00b57 100644 --- a/src/components/company/SelectContacts.vue +++ b/src/components/company/SelectContacts.vue @@ -91,15 +91,16 @@ export default { * 获取联系人数据 */ getContactsList() { - if (this.selectedCompany && this.selectedCompany.hasOwnProperty('id')) { + if (this.selectedCompany && this.selectedCompany.hasOwnProperty.call(this.selectedCompany, 'id')) { const params = { companyId: this.selectedCompany.id } getContactsByCompany(params).then(res => { this.contactsList = res.result - if (this.initContacts && this.initContacts.hasOwnProperty('id')) { + if (this.initContacts && this.initContacts.hasOwnProperty.call(this.initContacts, 'id')) { this.contactsList.push(this.initContacts) } + console.log(this.contactsList) }) } }, @@ -127,7 +128,7 @@ export default { ) }, handleDropdownOpen() { - if (this.isFirstOpen && this.initContacts && this.initContacts.hasOwnProperty('id')) { + if (this.isFirstOpen && this.initContacts && this.initContacts.hasOwnProperty.call(this.initContacts, 'id')) { this.contactsList.forEach((item, index) => { if (item.id === this.initContacts.id) { this.$emit('change', undefined) diff --git a/src/components/form/InstallmentForm.vue b/src/components/form/InstallmentForm.vue index bcfe83d..0fee983 100644 --- a/src/components/form/InstallmentForm.vue +++ b/src/components/form/InstallmentForm.vue @@ -116,13 +116,14 @@ export default { */ initInstallmentList(record) { // 判断是否为编辑 - if (record.installmentList && record.installmentList.length > 0) { - this.installmentList = record.installmentList + if (record && record.length > 0) { + this.installmentList = record } else { - record.installmentList = [this.defaultFormData] + record = [this.defaultFormData] } - this.model = Object({}, record) - this.installmentList = record.installmentList + let obj = {} + obj.installmentList = record + this.model = Object.assign({}, obj) this.$nextTick(() => { this.form.setFieldsValue(pick(this.model, 'installmentList')) }) diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue index 90730fb..41f9609 100644 --- a/src/views/contractManagement/revenueContract/RevenueContractList.vue +++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue @@ -8,17 +8,17 @@ - + - + - + @@ -27,12 +27,13 @@ format="YYYY-MM-DD HH:mm:00" :show-time="{ format: 'HH:mm' }" :trigger-change="true" + v-model="queryParam.createTime" style="width: 100%"/> - + @@ -78,8 +79,8 @@ - 编辑 - 删除 + 审核 + 编辑 + 存档 + 删除 + 已存档 + @@ -100,10 +105,11 @@ import IconImg from '@assets/imgs/icon/icon_revenue_contract.png' import PageHeaderTitle from '../../../components/layouts/PageHeaderTitle' import { JeroListMixin } from '../../../mixins/JeroListMixin' +import RevenueContractAduitModule from './modules/RevenueContractAduitModule' export default { name: 'RevenueContractList', - components: { PageHeaderTitle }, + components: { PageHeaderTitle, RevenueContractAduitModule }, mixins: [JeroListMixin], data() { return { @@ -127,9 +133,10 @@ export default { } ], url: { - list: '', - delete: '', - deleteBatch: '' + list: '/contract/payIncomeContract/list', + exportXlsUrl: '/contract/payIncomeContract/exportXls', + delete: '/contract/payIncomeContract/delete', + deleteBatch: '/contract/payIncomeContract/deleteBatch' }, columns: [ { @@ -187,7 +194,7 @@ export default { dataIndex: 'action', align: 'center', fixed: 'right', - width: 180, + width: 200, scopedSlots: { customRender: 'action' } } ], @@ -202,6 +209,10 @@ export default { } }, methods: { + searchQuery() { + this.lastQueryParam = {...this.queryParam} + this.loadData(1) + }, toRevenueContractDetail(id, contractNum) { this.$router.push({ path: '/contractManagement/RevenueContractDetail', @@ -231,12 +242,21 @@ export default { * @returns {string} */ aduitClass(record) { - console.log(record) - if (record.status === 1) { - console.log(1) + if (record.status === 2 || record.status === 4) { return 'aduit' } return '' + }, + /** + * 审核 + * @param id + */ + handleAudit(id) { + this.$refs.aduitForm.contractId = id + this.$refs.aduitForm.open() + }, + aduitOk() { + } } } diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue new file mode 100644 index 0000000..fc2f9ff --- /dev/null +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractAduitModule.vue @@ -0,0 +1,111 @@ + + + + + \ No newline at end of file diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue index 07dac7f..9f2016a 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractDetail.vue @@ -11,7 +11,7 @@