From b9ec065e68c535ea2e534189738626f8d1ff276a Mon Sep 17 00:00:00 2001
From: seatonwan9
Date: 星期四, 28 八月 2025 14:30:54 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage into master

---
 src/views/tradeManage/buyer/index.vue |  219 ++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 160 insertions(+), 59 deletions(-)

diff --git a/src/views/tradeManage/buyer/index.vue b/src/views/tradeManage/buyer/index.vue
index dc072b9..4c67314 100644
--- a/src/views/tradeManage/buyer/index.vue
+++ b/src/views/tradeManage/buyer/index.vue
@@ -9,7 +9,7 @@
             <el-input v-model="query.productName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" clearable style="width: 100%" />
           </el-form-item>
           <el-form-item label="琛屼笟棰嗗煙" class="col-25">
-            <el-select v-model="query.industry" placeholder="璇烽�夋嫨琛屼笟棰嗗煙" clearable style="width: 100%">
+            <el-select v-model="query.industry" placeholder="璇烽�夋嫨琛屼笟棰嗗煙" clearable style="width: 100%" @change="handleIndustryChange">
               <el-option v-for="item in industryOptions" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -31,7 +31,7 @@
             <el-input v-model="query.orderNo" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" clearable style="width: 100%" />
           </el-form-item>
           <el-form-item label="浜у搧绫诲瀷" class="col-25">
-            <el-select v-model="query.productType" placeholder="璇烽�夋嫨浜у搧绫诲瀷" clearable style="width: 100%">
+            <el-select v-model="query.productType" placeholder="璇烽�夋嫨浜у搧绫诲瀷" clearable style="width: 100%" @change="handleProductTypeChange">
               <el-option v-for="item in productTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -74,9 +74,7 @@
               <template #default="{ row }">
                 <div v-if="row.isMainOrder" class="main-order-info">
                   <div class="order-header">
-                    <div class="order-item status-item">
-                      <el-tag :type="getStatusType(row.status)" size="small">{{ row.statusName }}</el-tag>
-                    </div>
+                    
                     <div class="order-item">
                       <span class="label">鐢宠鏃堕棿:</span>
                       <span class="value">{{ row.applyTime }}</span>
@@ -88,6 +86,9 @@
                     <div class="order-item">
                       <span class="label">渚涘簲鏂�:</span>
                       <span class="value">{{ row.supplySide }}</span>
+                    </div>
+                    <div class="order-item status-item">
+                      <el-tag :type="getStatusType(row.status)" size="small">{{ row.statusName }}</el-tag>
                     </div>
                   </div>
                 </div>
@@ -269,10 +270,10 @@
     </el-card>
     
     <!-- 璁㈠崟鐘舵�佸璇濇 -->
-    <ProductOrderStatusDialog 
+    <!-- <ProductOrderStatusDialog 
       v-model="orderStatusDialogVisible" 
       :order-id="currentOrderId" 
-    />
+    /> -->
   </div>
 </template>
 
@@ -282,9 +283,11 @@
 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()
@@ -299,35 +302,11 @@
   { label: '宸茶瘎浠�', value: 'EVALUATED' },
 ]
 
-// 琛屼笟棰嗗煙閫夐」
-const industryOptions = [
-  { label: '寤虹瓚宸ョ▼', value: 'construction' },
-  { label: '浜ら�氬伐绋�', value: 'transportation' },
-  { label: '姘村埄宸ョ▼', value: 'water' },
-  { label: '鐢靛姏宸ョ▼', value: 'power' },
-]
-
-// 鍗曚綅宸ョ▼閫夐」
-const unitProjectOptions = [
-  { label: '鍦熷缓宸ョ▼', value: 'civil' },
-  { label: '瀹夎宸ョ▼', value: 'installation' },
-  { label: '瑁呴グ宸ョ▼', value: 'decoration' },
-]
-
-// 浜у搧绫诲瀷閫夐」
-const productTypeOptions = [
-  { label: '浼佷笟绉佹湁SaaS鐗堣鍙�', value: 'enterprise_private' },
-  { label: '浼佷笟鍏湁SaaS鐗堣鍙�', value: 'enterprise_public' },
-  { label: '椤圭洰鍏湁SaaS鐗堣鍙�', value: 'project_public' },
-  { label: '涓汉鍏湁SaaS鐗堣鍙�', value: 'personal_public' },
-]
-
-// 浜у搧绫诲瀷瀛愮骇閫夐」
-const productSubTypeOptions = [
-  { label: '鍩虹鐗�', value: 'basic' },
-  { label: '鏍囧噯鐗�', value: 'standard' },
-  { label: '楂樼骇鐗�', value: 'premium' },
-]
+// 鍔ㄦ�侀�夐」鏁版嵁
+const industryOptions = ref<any[]>([])
+const unitProjectOptions = ref<any[]>([])
+const productTypeOptions = ref<any[]>([])
+const productSubTypeOptions = ref<any[]>([])
 
 // 鏌ヨ鏉′欢
 const query = reactive({
@@ -380,6 +359,92 @@
   if (/(鍗忚|agreement)/i.test(s)) return 'agreement'
   if (/(鍏嶈垂|free)/i.test(s)) return 'free'
   return 'currency'
+}
+
+// 鑾峰彇琛屼笟棰嗗煙閫夐」
+const getIndustryOptions = async () => {
+  try {
+    const res = await productApi.getCategoryByParent({ parentCode: 'business_direction' })
+    if (res?.code === 200 && res.data) {
+      industryOptions.value = res.data.map((item: any) => ({
+        label: item.name,
+        value: item.id
+      }))
+    }
+  } catch (error) {
+    console.error('鑾峰彇琛屼笟棰嗗煙閫夐」澶辫触:', error)
+  }
+}
+
+// 鑾峰彇浜у搧绫诲瀷閫夐」
+const getProductTypeOptions = async () => {
+  try {
+    const res = await productApi.getCategoryByParent({ parentCode: 'product_type' })
+    if (res?.code === 200 && res.data) {
+      productTypeOptions.value = res.data.map((item: any) => ({
+        label: item.name,
+        value: item.id
+      }))
+    }
+  } catch (error) {
+    console.error('鑾峰彇浜у搧绫诲瀷閫夐」澶辫触:', error)
+  }
+}
+
+// 鏍规嵁琛屼笟棰嗗煙鑾峰彇鍗曚綅宸ョ▼閫夐」
+const getUnitProjectOptions = async (industryCode: string) => {
+  if (!industryCode) {
+    unitProjectOptions.value = []
+    return
+  }
+  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
+      }))
+    }
+  } catch (error) {
+    console.error('鑾峰彇鍗曚綅宸ョ▼閫夐」澶辫触:', error)
+    unitProjectOptions.value = []
+  }
+}
+
+// 鏍规嵁浜у搧绫诲瀷鑾峰彇浜у搧瀛愮骇閫夐」
+const getProductSubTypeOptions = async (productTypeCode: string) => {
+  if (!productTypeCode) {
+    productSubTypeOptions.value = []
+    return
+  }
+  try {
+    const res = await productApi.getCategoryByParent({ parentId: productTypeCode })
+    if (res?.code === 200 && res.data) {
+      productSubTypeOptions.value = res.data.map((item: any) => ({
+        label: item.name,
+        value: item.id
+      }))
+    }
+  } catch (error) {
+    console.error('鑾峰彇浜у搧瀛愮骇閫夐」澶辫触:', error)
+    productSubTypeOptions.value = []
+  }
+}
+
+// 澶勭悊琛屼笟棰嗗煙鍙樺寲
+const handleIndustryChange = async (value: string) => {
+  // 娓呯┖鍗曚綅宸ョ▼閫夋嫨
+  query.unitProject = ''
+  // 鑾峰彇瀵瑰簲鐨勫崟浣嶅伐绋嬮�夐」
+  await getUnitProjectOptions(value)
+}
+
+// 澶勭悊浜у搧绫诲瀷鍙樺寲
+const handleProductTypeChange = async (value: string) => {
+  // 娓呯┖浜у搧瀛愮骇閫夋嫨
+  query.productSubType = ''
+  // 鑾峰彇瀵瑰簲鐨勪骇鍝佸瓙绾ч�夐」
+  await getProductSubTypeOptions(value)
 }
 
 // 鑾峰彇鐘舵�佺被鍨�
@@ -480,33 +545,31 @@
     pageSize: page.size,
     productName: query.productName || undefined,
     orderId: query.orderNo || undefined,
-    userId: userStore.getUserId ? Number(userStore.getUserId) : undefined,
+    userId: userStore.getUserId ? userStore.getUserId : undefined,
   }
   if (query.status) payload.orderStatus = statusUiToServer[query.status]
   if (Array.isArray(query.dateRange) && query.dateRange.length === 2) {
     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.productType) payload.productTypeId = query.productType
+  if (query.productSubType) payload.productSubTypeId = query.productSubType
 
-  const res = (await orderApi.getBuyerOrderPage(payload)) as any
+  // 鏍规嵁鏄惁鏈変骇鍝佹潯浠堕�夋嫨涓嶅悓鐨凙PI
+  const hasProductConditions = query.industry || query.unitProject || 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 : []
   page.total = Number(pageData?.total || 0)
 
-  // 骞跺彂鑾峰彇姣忎釜璁㈠崟鐨勮鎯咃紙鐢ㄤ簬鏋勯�犲瓙璁㈠崟琛岋級
-  const detailsArr = await Promise.all(
-    list.map(async (order: any) => {
-      try {
-        const detailRes = (await orderApi.getOrderDetail(order.orderId)) as any
-        return detailRes?.data
-      } catch (e) {
-        return null
-      }
-    })
-  )
-
   const flatData: any[] = []
-  list.forEach((order: any, idx: number) => {
+  list.forEach((order: any) => {
     const uiStatus = statusServerToUi[order.orderStatus] || 'WAIT_UPLOAD'
     const mainRow: any = {
       id: order.orderId,
@@ -518,11 +581,10 @@
       status: uiStatus,
       statusName: order.orderStatus || '',
       orderStatus: StatusMapper.toUIStatus(order.orderStatus), // 杞崲涓烘爣鍑嗙姸鎬佹灇涓�
+      workFlowId: order.workflowId || ''
     }
-
-    const detail = detailsArr[idx]
-    const subOrders: any[] = Array.isArray(detail?.orderDetails)
-      ? detail.orderDetails.map((d: any, i: number) => ({
+    const subOrders: any[] = Array.isArray(order?.orderDetails)
+      ? order.orderDetails.map((d: any, i: number) => ({
           id: `${order.orderId}-${i + 1}`,
           isMainOrder: false,
           productName: order.productName || '',
@@ -560,6 +622,9 @@
     status: '',
     dateRange: [],
   })
+  // 娓呯┖鍔ㄦ�侀�夐」
+  unitProjectOptions.value = []
+  productSubTypeOptions.value = []
   page.current = 1
   handleSearch()
 }
@@ -569,7 +634,13 @@
 const toUpload = (row: any) => router.push({ name: 'tradeOrderUpload', params: { id: row.id } })
 const toConfirm = (row: any) => router.push({ name: 'tradeOrderConfirm', params: { id: row.id } })
 const toEvaluate = (row: any) => router.push({ name: 'tradeOrderEvaluate', params: { id: row.id } })
-const toTrack = (row: any) => router.push({ name: 'tradeTrack', params: { id: row.id } })
+const toTrack = (row: any) => {
+  if (!row.workFlowId) {
+    ElMessage.warning('璇ヨ鍗曟殏鏃犲伐浣滄祦淇℃伅')
+    return
+  }
+  router.push({ name: 'tradeTrack', params: { id: row.workFlowId } })
+}
 
 // 杩借釜璁㈠崟 - 鏄剧ず璁㈠崟鐘舵�佸璇濇
 const showOrderTrack = (row: any) => {
@@ -590,7 +661,8 @@
       toDetail(order)
       break
     case ActionType.TRACK:
-      showOrderTrack(order)
+      // showOrderTrack(order)
+      toTrack(order)
       break
     case ActionType.UPLOAD_FILE:
       toUpload(order)
@@ -635,7 +707,33 @@
   }
 }
 
-onMounted(handleSearch)
+onMounted(async ()=>{
+  // 鑾峰彇鐢ㄦ埛淇℃伅
+  if (!userStore.getUserId) {
+    try {
+      const res: any = await queryUserDetail()
+      if (res?.code === 200 && res.data) {
+        userStore.updateUserDetail(res.data)
+      } else {
+        ElMessage.error(res?.msg || '鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅锛岃鍏堢櫥褰�')
+        return
+      }
+    } catch (e) {
+      console.error('鑾峰彇鐢ㄦ埛璇︽儏澶辫触:', e)
+      ElMessage.error('鑾峰彇鐢ㄦ埛淇℃伅澶辫触锛岃绋嶅悗閲嶈瘯')
+      return
+    }
+  }
+  
+  // 鑾峰彇鍒濆閫夐」鏁版嵁
+  await Promise.all([
+    getIndustryOptions(),
+    getProductTypeOptions()
+  ])
+  
+  // 鎵ц鎼滅储
+  handleSearch()
+})
 </script>
 
 <style scoped lang="scss">
@@ -779,12 +877,15 @@
     gap: 20px;
     align-items: center;
     overflow: hidden;
-    
+    .status-item{
+      flex-direction: row-reverse;
+    }
     .order-item {
       display: flex;
       align-items: center;
       gap: 8px;
       flex-shrink: 0;
+      flex: 1;
       
       .label {
         color: #909399;

--
Gitblit v1.8.0