From b3fedd4221b807a07058be9d5d5d8ba8998adbcb Mon Sep 17 00:00:00 2001
From: Bang Hu <hu_bang@hotmail.com>
Date: 星期四, 11 九月 2025 21:35:31 +0800
Subject: [PATCH] Bug修改代码提交
---
src/views/tradeManage/buyer/index.vue | 64 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/src/views/tradeManage/buyer/index.vue b/src/views/tradeManage/buyer/index.vue
index a483ff1..596a765 100644
--- a/src/views/tradeManage/buyer/index.vue
+++ b/src/views/tradeManage/buyer/index.vue
@@ -154,28 +154,9 @@
</el-table-column>
</el-table-column>
- <!-- 鎬讳环 -->
- <el-table-column label="鎬讳环" align="center">
- <el-table-column label="鍗曚环" prop="unitPrice" width="90">
- <template #default="{ row }">
- <div v-if="row.isSpacer" class="spacer-cell"></div>
- <div v-else-if="!row.isMainOrder" class="price-info">
- <span v-if="row.priceType === 'points'" class="price-points">
- 绉垎 {{ row.unitPrice }}
- </span>
- <span v-else-if="row.priceType === 'currency'" class="price-currency">
- 璐у竵 {{ row.unitPrice }}
- </span>
- <span v-else-if="row.priceType === 'agreement'" class="price-agreement">
- 鍗忚
- </span>
- <span v-else-if="row.priceType === 'free'" class="price-free">
- 鍏嶈垂
- </span>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="鏁伴噺" prop="quantity" width="50">
+ <!-- 鏁伴噺 -->
+ <el-table-column label="鏁伴噺" align="center" width="80">
+ <el-table-column label="" prop="quantity" width="80" align="center">
<template #default="{ row }">
<div v-if="row.isSpacer" class="spacer-cell"></div>
<div v-else-if="!row.isMainOrder" class="quantity">{{ row.quantity }}</div>
@@ -185,7 +166,7 @@
<!-- 鏈熼檺(骞�) -->
<el-table-column label="鏈熼檺(骞�)" align="center" width="80">
- <el-table-column label="" prop="period" width="80">
+ <el-table-column label="" prop="period" width="80" align="center">
<template #default="{ row }">
<div v-if="row.isSpacer" class="spacer-cell"></div>
<div v-else-if="!row.isMainOrder" class="period-info">
@@ -325,7 +306,19 @@
const productSubTypeOptions = ref<any[]>([])
// 鏌ヨ鏉′欢
-const query = reactive({
+type BuyerQuery = {
+ productName: string
+ industry: string
+ unitProject: string[]
+ productType: string
+ productSubType: string
+ importantDistrictIdList: string[]
+ orderNo: string
+ status: string
+ dateRange: string[]
+}
+
+const query = reactive<BuyerQuery>({
productName: '',
industry: '',
unitProject: [],
@@ -498,7 +491,8 @@
// 澶勭悊琛屼笟棰嗗煙鍙樺寲
const handleIndustryChange = async (value: string) => {
// 娓呯┖鍗曚綅宸ョ▼閫夋嫨
- query.unitProject = ''
+ query.unitProject = []
+ query.importantDistrictIdList = []
// 鑾峰彇瀵瑰簲鐨勫崟浣嶅伐绋嬮�夐」
await getUnitProjectOptions(value)
}
@@ -542,7 +536,7 @@
// 涓昏鍗曡锛屽悎骞舵墍鏈夊垪鏄剧ず璁㈠崟淇℃伅
if (columnIndex === 0) { // 绗竴鍒楋紝鍚堝苟鎵�鏈夊垪
return {
- colspan: 8, // 鎬诲叡8鍒楋細璁㈠崟淇℃伅2鍒� + 璐拱鏂瑰紡2鍒� + 鎬讳环2鍒� + 鏈熼檺1鍒� + 鎿嶄綔1鍒�
+ colspan: 7, // 鎬诲叡7鍒楋細璁㈠崟淇℃伅2鍒� + 璐拱鏂瑰紡2鍒� + 鏁伴噺1鍒� + 鏈熼檺1鍒� + 鎿嶄綔1鍒�
rowspan: 1
}
} else {
@@ -574,7 +568,7 @@
}
}
}
- } else if (columnIndex === 7) { // 鎿嶄綔鍒楋紙绗�8鍒楋級
+ } else if (columnIndex === 6) { // 鎿嶄綔鍒楋紙绗�7鍒楋級
// 鎵惧埌褰撳墠瀛愯鍗曟墍灞炵殑涓昏鍗�
const parentOrder = row.parentOrder
if (parentOrder && parentOrder.subOrders) {
@@ -605,6 +599,7 @@
// 鎼滅储澶勭悊锛堟帴鍏ョ湡瀹炲悗绔級
const handleSearch = async () => {
+ const filterEvaluated = query.status === 'EVALUATED'
const payload: any = {
pageNum: page.current,
pageSize: page.size,
@@ -612,7 +607,9 @@
orderId: query.orderNo || undefined,
userId: userStore.getUserId ? userStore.getUserId : undefined,
}
- if (query.status) payload.orderStatus = statusUiToServer[query.status]
+ if (query.status) {
+ payload.orderStatus = filterEvaluated ? OrderStatus.COMPLETED : statusUiToServer[query.status]
+ }
if (Array.isArray(query.dateRange) && query.dateRange.length === 2) {
payload.applyTimeStart = query.dateRange[0]
payload.applyTimeEnd = query.dateRange[1]
@@ -631,7 +628,11 @@
const res = (await apiMethod(payload)) as any
const pageData = res?.data
- const list: any[] = Array.isArray(pageData?.list) ? pageData.list : []
+ let list: any[] = Array.isArray(pageData?.list) ? pageData.list : []
+ // 鑻ョ瓫閫夆�滃凡璇勪环鈥濓紝鍏堜互宸插畬鎴愭煡璇紝鍐嶅湪鍓嶇鎸夊凡璇勪环杩囨护
+ if (filterEvaluated) {
+ list = list.filter((order: any) => order?.isEvaluate === '宸茶瘎浠�')
+ }
page.total = Number(pageData?.total || 0)
const flatData: any[] = []
@@ -682,9 +683,10 @@
Object.assign(query, {
productName: '',
industry: '',
- unitProject: '',
+ unitProject: [],
productType: '',
productSubType: '',
+ importantDistrictIdList: [],
orderNo: '',
status: '',
dateRange: [],
@@ -1000,6 +1002,7 @@
.period-info {
display: flex;
align-items: center;
+ justify-content: center;
gap: 8px;
font-size: 12px;
@@ -1130,6 +1133,7 @@
font-size: 12px;
color: #303133;
font-weight: 500;
+ text-align: center;
}
.pagination-container {
--
Gitblit v1.8.0