✨ 合并毛利分析客户筛选并调整订单号输入高度

This commit is contained in:
caojia
2026-11-04 10:08:03 +08:00
parent f0012ac563
commit c6509fca51
5 changed files with 47 additions and 27 deletions
+8
View File
@@ -11,6 +11,14 @@ function createProfitExport(url, params) {
})
}
export function listProfitCustomerOptions(params) {
return request({
url: '/report/profit/customer-options',
method: 'get',
params
})
}
export function listProfitSummary(params) {
return request({
url: '/report/profit/summary',
+11 -27
View File
@@ -28,27 +28,14 @@
</el-col>
<el-col :xs="24" :sm="12" :lg="8">
<el-form-item label="客户名称" class="filter-item">
<el-input
v-model="query.customerName"
type="textarea"
:rows="3"
resize="vertical"
clearable
placeholder="输入客户名称,多个值请换行"
class="filter-control multi-line-filter"
/>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :lg="8">
<el-form-item label="客户代码" class="filter-item">
<el-input
<customer-select
v-model="query.customerCode"
type="textarea"
:rows="3"
resize="vertical"
clearable
placeholder="输入客户代码,多个值请换行"
class="filter-control multi-line-filter"
:fetch-options="listProfitCustomerOptions"
value-key="customerCode"
remote-search
:page-size="20"
placeholder="请输入客户名称或代码搜索"
class="filter-control"
/>
</el-form-item>
</el-col>
@@ -57,8 +44,8 @@
<el-input
v-model="query.orderNo"
type="textarea"
:rows="3"
resize="vertical"
:rows="1"
resize="none"
clearable
placeholder="输入订单号,多个值请换行"
class="filter-control multi-line-filter"
@@ -315,7 +302,7 @@
</template>
<script setup name="ProfitReport">
import { downloadProfitExport, exportProfitOrders, exportProfitProducts, listProfitExports, listProfitOrders, listProfitProducts, listProfitSummary } from '@/api/report/profit'
import { downloadProfitExport, exportProfitOrders, exportProfitProducts, listProfitCustomerOptions, listProfitExports, listProfitOrders, listProfitProducts, listProfitSummary } from '@/api/report/profit'
// 提成功能暂停使用:import { deleteProfitCommissionRate, listProfitCommissionRates, saveProfitCommissionRate } from '@/api/report/profit'
import { parseTime } from '@/utils/bms'
import { ElMessage } from 'element-plus'
@@ -329,7 +316,6 @@ const arBillStatus = ref('')
const query = reactive({
orderNo: '',
customerCode: '',
customerName: '',
belongSalerCode: '',
productCode: ''
})
@@ -405,9 +391,7 @@ function buildQuery(paged = true, includeArBillStatus = dimension.value === 'ord
function validateMultiValueFilters(showMessage = true) {
const filters = [
['orderNo', '订单号'],
['customerCode', '客户代码'],
['customerName', '客户名称']
['orderNo', '订单号']
]
for (const [key, label] of filters) {
const values = new Set(String(query[key] || '').split(/[\s,,;;]+/).map(value => value.trim()).filter(Boolean))