diff --git a/src/components/company/BusinessSelect.vue b/src/components/company/BusinessSelect.vue index 4998dd8..6217722 100644 --- a/src/components/company/BusinessSelect.vue +++ b/src/components/company/BusinessSelect.vue @@ -201,7 +201,23 @@ export default { resultArr.push(row) } }) - this.selectedCompany = [...this.selectedCompany, ...resultArr] + // 2024-07-25 当前页没有选择的数据 + let unSelectedCompany = [] + this.dataSource.map(tt => { + if(!selectedRowKeys.includes(tt.id)) { + unSelectedCompany.push(tt) + } + }) + + // 获取之前选择的 非本页的标准信息 + let lastSelectedCompany = [] + this.selectedCompany.forEach(row => { + let ele = unSelectedCompany.find(ele => ele.id === row.id) + if(!ele) { + lastSelectedCompany.push(row) + } + }) + this.selectedCompany = [...lastSelectedCompany, ...resultArr] // this.selectedCompany = selectionRows } this.selectedRowKeys = selectedRowKeys diff --git a/src/components/company/CompanySelect.vue b/src/components/company/CompanySelect.vue index a36764a..d0d01a6 100644 --- a/src/components/company/CompanySelect.vue +++ b/src/components/company/CompanySelect.vue @@ -94,7 +94,6 @@ export default { * @param value */ handleOk(value) { - console.log('--------value---------', value) let company = {id: undefined, companyName: undefined} // 多选的时候 全部放在一起,以逗号分隔 if (this.isMultiple) { diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/EditReceivableAmount.vue b/src/views/financialManagement/arriveAndInvoicing/modules/EditReceivableAmount.vue index 3851a5d..f860fde 100644 --- a/src/views/financialManagement/arriveAndInvoicing/modules/EditReceivableAmount.vue +++ b/src/views/financialManagement/arriveAndInvoicing/modules/EditReceivableAmount.vue @@ -79,7 +79,7 @@ export default { form: this.$form.createForm(this), model: {}, url: { - // todo 修改接口名称 + // 接口名称 edit: '/paymentRecord/payPaymentRecord/editReceivableAmount' }, labelCol: { diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentClassificationStatisticsList.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentClassificationStatisticsList.vue index 233e21d..0399e40 100644 --- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentClassificationStatisticsList.vue +++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentClassificationStatisticsList.vue @@ -50,7 +50,7 @@ rowKey="chargeCompanyId" :columns="columns" :dataSource="dataSource" - :pagination="false" + :pagination="ipagination" :loading="loading" :scroll="{x: 1000}" @change="handleTableChange" @@ -304,14 +304,12 @@ export default { this.ipagination.current = 1 } let params = this.getQueryParams()//查询条件 - console.log(params) this.loading = true getAction(this.url.list, params).then((res) => { if (res.success) { // 处理TableColumns 的数据 // let columnsKeys = res.result.columns || [] let syncColumns = this.getColumnsData(res.result.titleList || []) - console.log("-------syncColumns----", syncColumns) this.columns = [firstColumnTop, ...defaultTableColumns, ...syncColumns] this.columnsFooter = [firstColumnFooter, ...defaultTableColumns, ...syncColumns] // this.dataSource = res.result.pageList.records @@ -336,11 +334,11 @@ export default { obj[col.dataIndex] = footerData[col.dataIndex] || '0.00' + '' }) this.footerDataSource = [obj] - // if (res.result.pageList.total) { - // this.ipagination.total = res.result.pageList.total - // } else { - // this.ipagination.total = 0 - // } + if (res.result.page.total) { + this.ipagination.total = res.result.page.total + } else { + this.ipagination.total = 0 + } } if (this.dataSource.length > 0) { this.$nextTick(() => { @@ -387,6 +385,9 @@ export default { // 隐藏主列表的横向滚动条 .main-table { + /deep/ .ant-table-thead th div{ + white-space: pre-wrap; + } /deep/ .ant-table-body { overflow-x: hidden !important; } diff --git a/vue.config.js b/vue.config.js index aff1e1f..8e140f1 100644 --- a/vue.config.js +++ b/vue.config.js @@ -79,7 +79,7 @@ module.exports = { }, devServer: { - port: 3000, + port: 21825, proxy: { /* '/api': { target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统 @@ -91,7 +91,8 @@ module.exports = { },*/ '/jero-boot': { // '' - target: 'http://localhost:8080', //请求本地 jero-boot后台项目 + // target: 'http://10.0.10.78:21824', //请求本地 jero-boot后台项目 + target: "http://localhost:21824", // ws: false, changeOrigin: true },