From 349091f54dab47b15ca81613f02765490a2ce7d0 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 11 九月 2025 10:50:36 +0800
Subject: [PATCH] 修改买家中心卖家中心产品类型等条件查询问题
---
src/views/tradeManage/buyer/index.vue | 257 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 162 insertions(+), 95 deletions(-)
diff --git a/src/views/tradeManage/buyer/index.vue b/src/views/tradeManage/buyer/index.vue
index 4c67314..a483ff1 100644
--- a/src/views/tradeManage/buyer/index.vue
+++ b/src/views/tradeManage/buyer/index.vue
@@ -14,9 +14,25 @@
</el-select>
</el-form-item>
<el-form-item label="" class="col-17">
- <el-select v-model="query.unitProject" placeholder="璇烽�夋嫨鍗曚綅宸ョ▼" clearable style="width: 100%">
- <el-option v-for="item in unitProjectOptions" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
+<!-- <el-select v-model="query.unitProject" placeholder="璇烽�夋嫨鍗曚綅宸ョ▼" clearable style="width: 100%">-->
+<!-- <el-option v-for="item in unitProjectOptions" :key="item.value" :label="item.label" :value="item.value" />-->
+<!-- </el-select>-->
+ <el-tree-select
+ ref="areaIdTreeRef"
+ v-model="query.unitProject"
+ :data="unitProjectOptions"
+ placeholder="璇烽�夋嫨鍗曚綅宸ョ▼"
+ multiple
+ collapse-tags
+ collapse-tags-tooltip
+ clearable
+ :default-expand-all="true"
+ :render-after-expand="false"
+ show-checkbox
+ style="width: 170px;"
+ @change="importantAreaCh"
+ @clear="importantAreaClear"
+ />
</el-form-item>
<el-form-item label="浜ゆ槗鐘舵��" class="col-30">
<el-select v-model="query.status" placeholder="鍏ㄩ儴" style="width: 100%">
@@ -35,11 +51,11 @@
<el-option v-for="item in productTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
- <el-form-item label="" class="col-17">
- <el-select v-model="query.productSubType" placeholder="璇烽�夋嫨浜у搧绫诲瀷瀛愮骇" clearable style="width: 100%">
- <el-option v-for="item in productSubTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
- </el-select>
- </el-form-item>
+<!-- <el-form-item label="" class="col-17">-->
+<!-- <el-select v-model="query.productSubType" placeholder="璇烽�夋嫨浜у搧绫诲瀷瀛愮骇" clearable style="width: 100%">-->
+<!-- <el-option v-for="item in productSubTypeOptions" :key="item.value" :label="item.label" :value="item.value" />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item label="鐢宠鏃堕棿" class="col-30">
<el-date-picker
v-model="query.dateRange"
@@ -57,8 +73,8 @@
<!-- 绗笁琛岋細鎿嶄綔鎸夐挳锛堝彸瀵归綈锛� -->
<div class="form-row actions">
<el-form-item class="row-actions">
- <el-button type="primary" @click="handleSearch" :icon="Search">鏌ヨ</el-button>
- <el-button @click="reset" :icon="Refresh">閲嶇疆</el-button>
+ <el-button type="primary" @click="handleSearch" icon="Search">鏌ヨ</el-button>
+ <el-button @click="reset" icon="Refresh">閲嶇疆</el-button>
</el-form-item>
</div>
</el-form>
@@ -74,7 +90,7 @@
<template #default="{ row }">
<div v-if="row.isMainOrder" class="main-order-info">
<div class="order-header">
-
+
<div class="order-item">
<span class="label">鐢宠鏃堕棿:</span>
<span class="value">{{ row.applyTime }}</span>
@@ -103,7 +119,7 @@
</template>
</el-table-column>
</el-table-column>
-
+
<!-- 璐拱鏂瑰紡 -->
<el-table-column label="璐拱鏂瑰紡" align="center">
<el-table-column label="閿�鍞舰寮�/璐︽埛鏁伴噺" width="150">
@@ -137,7 +153,7 @@
</template>
</el-table-column>
</el-table-column>
-
+
<!-- 鎬讳环 -->
<el-table-column label="鎬讳环" align="center">
<el-table-column label="鍗曚环" prop="unitPrice" width="90">
@@ -166,7 +182,7 @@
</template>
</el-table-column>
</el-table-column>
-
+
<!-- 鏈熼檺(骞�) -->
<el-table-column label="鏈熼檺(骞�)" align="center" width="80">
<el-table-column label="" prop="period" width="80">
@@ -179,7 +195,7 @@
</template>
</el-table-column>
</el-table-column>
-
+
<!-- 鎿嶄綔 -->
<el-table-column label="鎿嶄綔" align="center" width="120" class="operation-column">
<el-table-column label="" width="120">
@@ -190,56 +206,56 @@
<div class="action-item">
<div class="action-buttons">
<template v-for="action in getAvailableActions(row.parentOrder)" :key="action.type">
- <el-button
+ <el-button
v-if="action.type === ActionType.VIEW"
- type="primary"
- link
- size="small"
+ type="primary"
+ link
+ size="small"
@click="handleAction(action, row.parentOrder)"
>
鏌ョ湅
</el-button>
- <el-button
+ <el-button
v-else-if="action.type === ActionType.TRACK"
- type="primary"
- link
- size="small"
+ type="primary"
+ link
+ size="small"
@click="handleAction(action, row.parentOrder)"
>
杩借釜
</el-button>
- <el-button
+ <el-button
v-else-if="action.type === ActionType.UPLOAD_FILE"
- type="primary"
- link
- size="small"
+ type="primary"
+ link
+ size="small"
@click="handleAction(action, row.parentOrder)"
>
鎻愪氦鏂囦欢
</el-button>
- <el-button
+ <el-button
v-else-if="action.type === ActionType.CONFIRM_TRADE"
- type="primary"
- link
- size="small"
+ type="primary"
+ link
+ size="small"
@click="handleAction(action, row.parentOrder)"
>
浜ゆ槗纭
</el-button>
- <el-button
- v-else-if="action.type === ActionType.EVALUATE"
- type="primary"
- link
- size="small"
+ <el-button
+ v-else-if="action.type === ActionType.EVALUATE && row.parentOrder.isEvaluate === '鏈瘎浠�'"
+ type="primary"
+ link
+ size="small"
@click="handleAction(action, row.parentOrder)"
>
璇勪环
</el-button>
- <el-button
+ <el-button
v-else-if="action.type === ActionType.CANCEL_ORDER"
- type="danger"
- link
- size="small"
+ type="danger"
+ link
+ size="small"
@click="handleAction(action, row.parentOrder)"
>
鍙栨秷璁㈠崟
@@ -268,11 +284,11 @@
/>
</div>
</el-card>
-
+
<!-- 璁㈠崟鐘舵�佸璇濇 -->
- <!-- <ProductOrderStatusDialog
- v-model="orderStatusDialogVisible"
- :order-id="currentOrderId"
+ <!-- <ProductOrderStatusDialog
+ v-model="orderStatusDialogVisible"
+ :order-id="currentOrderId"
/> -->
</div>
</template>
@@ -280,17 +296,17 @@
<script setup lang="ts">
import { onMounted, reactive, ref } from 'vue'
import { useRouter } from 'vue-router'
-import { Search, Refresh } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import orderApi from '@/api/orderApi'
import productApi from '@/api/productApi'
import { useUserInfo } from '@/stores/modules/userInfo'
-import ProductOrderStatusDialog from '@/views/productManage/productOrderStatusDialog/index.vue'
import { OrderWorkflowController, OrderStatus, ActionType, PageType, StatusMapper } from '@/utils/orderWorkflow'
import { queryUserDetail } from '@/api/userInfo'
const router = useRouter()
const userStore = useUserInfo()
+
+const areaIdTreeRef=ref()
// 鐘舵�侀�夐」锛堟洿鏂颁负鏂扮殑宸ヤ綔娴佺▼鐘舵�侊級
const statusOptions = [
@@ -312,9 +328,10 @@
const query = reactive({
productName: '',
industry: '',
- unitProject: '',
+ unitProject: [],
productType: '',
productSubType: '',
+ importantDistrictIdList: [],
orderNo: '',
status: '',
dateRange: [],
@@ -345,6 +362,7 @@
[OrderStatus.WAIT_CONFIRM]: 'WAIT_CONFIRM',
[OrderStatus.COMPLETED]: 'COMPLETED',
[OrderStatus.EVALUATED]: 'EVALUATED',
+ [OrderStatus.CANCELED]: 'CANCELED'
}
const formatDateTime = (val?: string) => {
@@ -359,6 +377,25 @@
if (/(鍗忚|agreement)/i.test(s)) return 'agreement'
if (/(鍏嶈垂|free)/i.test(s)) return 'free'
return 'currency'
+}
+
+
+const importantAreaCh=()=>{
+ let checkedKeys = areaIdTreeRef.value!.getCheckedNodes(false, true)
+ if(checkedKeys&&checkedKeys.length>0&& query.unitProject.length>0){
+ query.importantDistrictIdList=[]
+ checkedKeys.forEach((item:any)=>{
+ if(item.children&&item.children.length>0){
+ query.importantDistrictIdList.push(item.value)
+ }
+ })
+ }
+}
+
+const importantAreaClear=()=>{
+ query.unitProject = []
+ query.importantDistrictIdList = []
+ areaIdTreeRef.value.setCheckedKeys([])
}
// 鑾峰彇琛屼笟棰嗗煙閫夐」
@@ -379,7 +416,8 @@
// 鑾峰彇浜у搧绫诲瀷閫夐」
const getProductTypeOptions = async () => {
try {
- const res = await productApi.getCategoryByParent({ parentCode: 'product_type' })
+ // product_type
+ const res = await productApi.getCategoryByParent({ parentCode: 'ProductTechnologyType' })
if (res?.code === 200 && res.data) {
productTypeOptions.value = res.data.map((item: any) => ({
label: item.name,
@@ -400,14 +438,40 @@
try {
const res = await productApi.getCategoryByParent({ parentId: industryCode })
if (res?.code === 200 && res.data) {
- unitProjectOptions.value = res.data.map((item: any) => ({
- label: item.name,
- value: item.id
- }))
+ unitProjectOptions.value = handleIndustryData(res.data)
}
} catch (error) {
console.error('鑾峰彇鍗曚綅宸ョ▼閫夐」澶辫触:', error)
unitProjectOptions.value = []
+ }
+}
+
+const handleIndustryData=(list:any)=>{
+ if(list&& list.length>0){
+ let data=list.map((item:any)=>{
+ return {
+ label:item.name,
+ value:item.id,
+ parentId:item.parentId,
+ parentName:item.parentName,
+ children:item.childrenList?handleIndustryChildData(item,item.childrenList):[]
+ }
+ })
+ return data
+ }
+}
+const handleIndustryChildData=(parentItem:any,childList:any)=>{
+ if(childList&& childList.length>0){
+ let data=childList.map((item:any)=>{
+ return {
+ parentId:parentItem.id,
+ parentName:parentItem.name,
+ label:item.name,
+ value:item.id,
+ children:item.childrenList?handleIndustryChildData(item,item.childrenList):[]
+ }
+ })
+ return data
}
}
@@ -444,7 +508,7 @@
// 娓呯┖浜у搧瀛愮骇閫夋嫨
query.productSubType = ''
// 鑾峰彇瀵瑰簲鐨勪骇鍝佸瓙绾ч�夐」
- await getProductSubTypeOptions(value)
+ // await getProductSubTypeOptions(value)
}
// 鑾峰彇鐘舵�佺被鍨�
@@ -455,6 +519,7 @@
WAIT_CONFIRM: 'warning',
COMPLETED: 'success',
EVALUATED: 'success',
+ CANCELED: 'danger'
}
return statusMap[status] || 'info'
}
@@ -552,17 +617,18 @@
payload.applyTimeStart = query.dateRange[0]
payload.applyTimeEnd = query.dateRange[1]
}
-
+
// 娣诲姞浜у搧鏉′欢鏌ヨ
if (query.industry) payload.industryId = query.industry
- if (query.unitProject) payload.unitProjectId = query.unitProject
+ if (query.unitProject.length > 0) payload.unitProjectId = query.unitProject
+ if (query.importantDistrictIdList.length > 0) payload.importantDistrictId = query.importantDistrictIdList
if (query.productType) payload.productTypeId = query.productType
if (query.productSubType) payload.productSubTypeId = query.productSubType
// 鏍规嵁鏄惁鏈変骇鍝佹潯浠堕�夋嫨涓嶅悓鐨凙PI
- const hasProductConditions = query.industry || query.unitProject || query.productType || query.productSubType
+ const hasProductConditions = query.industry || query.unitProject.length > 0 || query.productType || query.productSubType
const apiMethod = hasProductConditions ? orderApi.getBuyerOrderPageWithProductConditions : orderApi.getBuyerOrderPage
-
+
const res = (await apiMethod(payload)) as any
const pageData = res?.data
const list: any[] = Array.isArray(pageData?.list) ? pageData.list : []
@@ -581,7 +647,8 @@
status: uiStatus,
statusName: order.orderStatus || '',
orderStatus: StatusMapper.toUIStatus(order.orderStatus), // 杞崲涓烘爣鍑嗙姸鎬佹灇涓�
- workFlowId: order.workflowId || ''
+ workFlowId: order.workflowId || '',
+ isEvaluate: order.isEvaluate || ''
}
const subOrders: any[] = Array.isArray(order?.orderDetails)
? order.orderDetails.map((d: any, i: number) => ({
@@ -690,9 +757,9 @@
type: 'warning',
confirmButtonClass: 'el-button--danger'
})
-
+
const res = await orderApi.cancelOrder(order.id)
-
+
if (res && res.code === 200) {
ElMessage.success('璁㈠崟鍙栨秷鎴愬姛')
handleSearch() // 鍒锋柊鍒楄〃
@@ -724,13 +791,13 @@
return
}
}
-
+
// 鑾峰彇鍒濆閫夐」鏁版嵁
await Promise.all([
getIndustryOptions(),
getProductTypeOptions()
])
-
+
// 鎵ц鎼滅储
handleSearch()
})
@@ -768,7 +835,7 @@
border-bottom: 2px solid #e4e7ed; // 涓庡垎闅旇涓�鑷寸殑涓嬭竟妗�
}
}
-
+
// 璋冩暣琛ㄥご楂樺害
tr:first-child {
th {
@@ -785,18 +852,18 @@
.search-card {
margin-bottom: 20px;
-
+
.query-form {
.form-row {
display: flex;
gap: 0;
width: 100%;
margin-bottom: 8px;
-
+
&.actions {
justify-content: flex-end;
}
-
+
.el-form-item { margin-right: 0 !important; }
> .el-form-item { padding-right: 8px; }
> .el-form-item:last-child { padding-right: 0; }
@@ -810,7 +877,7 @@
.el-form-item {
margin-bottom: 16px;
margin-right: 20px;
-
+
&:last-child {
margin-right: 0;
}
@@ -821,7 +888,7 @@
.table-container {
position: relative;
z-index: 1;
-
+
.custom-table {
// 琛ㄥご绗簩琛屾枃瀛楀ぇ灏忚皟鏁�
.el-table__header-wrapper {
@@ -834,7 +901,7 @@
}
}
}
-
+
// 纭繚琛ㄥご鎵�鏈夎鐨勬枃瀛楀ぇ灏忎竴鑷�
.el-table__header {
th {
@@ -844,23 +911,23 @@
}
}
}
-
+
.el-table {
position: relative;
z-index: 1;
-
+
.main-order-row {
background-color: #f8f9fa;
font-weight: 600;
-
+
td {
border-bottom: 2px solid #e4e7ed;
}
}
-
+
.sub-order-row {
background-color: #ffffff;
-
+
td {
border-bottom: 1px solid #ebeef5;
}
@@ -886,14 +953,14 @@
gap: 8px;
flex-shrink: 0;
flex: 1;
-
+
.label {
color: #909399;
font-size: 12px;
min-width: 60px;
flex-shrink: 0;
}
-
+
.value {
color: #303133;
font-size: 12px;
@@ -908,22 +975,22 @@
.price-info {
font-size: 12px;
-
+
.price-points {
color: #e6a23c;
font-weight: 500;
}
-
+
.price-currency {
color: #67c23a;
font-weight: 500;
}
-
+
.price-agreement {
color: #409eff;
font-weight: 500;
}
-
+
.price-free {
color: #909399;
font-style: italic;
@@ -935,7 +1002,7 @@
align-items: center;
gap: 8px;
font-size: 12px;
-
+
.permanent {
color: #909399;
font-size: 12px;
@@ -967,18 +1034,18 @@
display: flex;
align-items: center;
margin-bottom: 4px;
-
+
&:last-child {
margin-bottom: 0;
}
-
+
.label {
color: #909399;
font-size: 12px;
min-width: 60px;
flex-shrink: 0;
}
-
+
.value {
color: #303133;
font-size: 12px;
@@ -999,7 +1066,7 @@
color: #303133;
text-align: center;
line-height: 1.4;
-
+
.all-actions {
display: flex;
flex-direction: column;
@@ -1007,10 +1074,10 @@
justify-content: center;
gap: 6px;
width: 100%;
-
+
.action-item {
width: 100%;
-
+
.action-buttons {
display: flex;
flex-direction: column;
@@ -1018,7 +1085,7 @@
align-items: center;
justify-content: center;
width: 100%;
-
+
.el-button {
width: 100%;
text-align: center;
@@ -1030,7 +1097,7 @@
height: auto;
line-height: 1.2;
}
-
+
.op-text {
margin: 4px 0;
text-align: center;
@@ -1050,12 +1117,12 @@
flex-wrap: wrap;
}
-.op-text {
- color: #606266;
+.op-text {
+ color: #606266;
font-size: 12px;
}
-.op-text.warning {
- color: #f59e0b;
+.op-text.warning {
+ color: #f59e0b;
font-size: 12px;
}
@@ -1076,11 +1143,11 @@
.el-table__fixed-right {
z-index: 2 !important;
}
-
+
.el-table__fixed-right-patch {
z-index: 2 !important;
}
-
+
// 鎿嶄綔鍒楁牱寮忎紭鍖�
.operation-column {
.cell {
--
Gitblit v1.8.0