diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue index 15dfc8d..ef24ff6 100644 --- a/src/views/contractManagement/revenueContract/RevenueContractList.vue +++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue @@ -23,20 +23,30 @@ - + + + + + - + - + @@ -63,23 +73,25 @@
+ ref="table" + size="middle" + bordered + rowKey="id" + :columns="columns" + :scroll="{x: 1500}" + :dataSource="dataSource" + :pagination="ipagination" + :loading="loading" + :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" + :rowClassName="aduitClass" + @change="handleTableChange" + class="j-table-force-nowrap"> @@ -89,9 +101,11 @@ 审核 - 编辑 + 编辑 存档 - 删除 + 删除 已存档 @@ -106,11 +120,13 @@ 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' +import JDate from '../../../components/tools/JDate' +import { RangeDateMixin } from '../../../mixins/RangeDateMixin' export default { name: 'RevenueContractList', - components: { PageHeaderTitle, RevenueContractAduitModule }, - mixins: [JeroListMixin], + components: { PageHeaderTitle, RevenueContractAduitModule, JDate }, + mixins: [JeroListMixin, RangeDateMixin], data() { return { IconImg, @@ -122,6 +138,10 @@ export default { xs: { span: 24 }, sm: { span: 10 } }, + dateKeyObj: { + beginKey: 'startTime', + endKey: 'endTime' + }, // 来款状态checkbox选项 incomePaymentsStatus: [ { @@ -210,7 +230,7 @@ export default { }, methods: { searchQuery() { - this.lastQueryParam = {...this.queryParam} + this.lastQueryParam = { ...this.queryParam } this.loadData(1) }, toRevenueContractDetail(id, contractNum) { @@ -257,6 +277,39 @@ export default { }, aduitOk() { + }, + /** + * 存档 + * @param id + */ + handleArchive(id) { + console.log(id) + let that = this + this.$confirm({ + title: '存档', + content: '确认存档?', + onOk: function () { + that.loading = true + that.loading = false + // getAction(that.url.deleteBatch, {ids: ids}).then((res) => { + // if (res.success) { + // that.$message.success(res.message) + // // 判断当前删除的数据是否是最后一页的全部数据,如果是的话页码减一 + // if (that.ipagination.current > 1 && (that.ipagination.current === Math.ceil(that.ipagination.total / that.ipagination.pageSize)) && + // that.selectedRowKeys.length === that.dataSource.length + // ) { + // that.ipagination.current -= 1 + // } + // that.loadData() + // that.onClearSelected() + // } else { + // that.$message.warning(res.message) + // } + // }).finally(() => { + // that.loading = false + // }) + } + }) } } } @@ -266,7 +319,7 @@ export default { @import '~@assets/less/common.less'; /deep/ .aduit { - color: red!important; + color: red !important; cursor: pointer; } diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue index ef80973..6a64cde 100644 --- a/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue +++ b/src/views/contractManagement/revenueContract/modules/RevenueContractModule.vue @@ -515,7 +515,7 @@ export default { this.$refs.installmentForm.initInstallmentList(record.listInstallment) this.model = Object.assign({}, record) this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'contractNum', 'contractName', 'signedCompany', 'signedContactsId', 'opening', 'principalId', 'departmentName', 'contractAmount', 'rate', 'noTaxAmount', 'contractDate', 'terminationDate', 'contractTimePoints', 'accountsReceivableAmount', 'amountReceived', 'amountReceived', '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 }) })