From 809355178cdd17d4bf66a4eb443c56b563b68dd9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 14 八月 2026 13:39:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/srm/tender/data.ts |   68 +++++++++++++++++++++++++++++----
 1 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/views/srm/tender/data.ts b/src/views/srm/tender/data.ts
index c75f017..475eae7 100644
--- a/src/views/srm/tender/data.ts
+++ b/src/views/srm/tender/data.ts
@@ -2,6 +2,8 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import {
+  BIDDING_MODE_MAP,
+  BIDDING_MODE_OPTIONS,
   TENDER_STATUS_CELLTAG,
   TENDER_STATUS_OPTIONS,
   TENDER_TYPE_CELLTAG,
@@ -35,7 +37,7 @@
       componentProps: { placeholder: '璇疯緭鍏ユ嫑鏍囩紪鍙�' },
       dependencies: {
         triggerFields: ['_partial'],
-        show: (partial: boolean) => !partial,
+        show: (values) => !values._partial,
       },
     },
     {
@@ -46,7 +48,7 @@
       componentProps: { placeholder: '璇疯緭鍏ユ嫑鏍囬」鐩悕绉�' },
       dependencies: {
         triggerFields: ['_partial'],
-        show: (partial: boolean) => !partial,
+        show: (values) => !values._partial,
       },
     },
     {
@@ -60,7 +62,7 @@
       },
       dependencies: {
         triggerFields: ['_partial'],
-        show: (partial: boolean) => !partial,
+        show: (values) => !values._partial,
       },
     },
     {
@@ -70,7 +72,7 @@
       componentProps: { placeholder: '璇疯緭鍏ラ噰璐粍缁�' },
       dependencies: {
         triggerFields: ['_partial'],
-        show: (partial: boolean) => !partial,
+        show: (values) => !values._partial,
       },
     },
     {
@@ -80,7 +82,7 @@
       componentProps: { placeholder: '璇疯緭鍏ラ」鐩礋璐ｄ汉' },
       dependencies: {
         triggerFields: ['_partial'],
-        show: (partial: boolean) => !partial,
+        show: (values) => !values._partial,
       },
     },
     {
@@ -94,7 +96,7 @@
       },
       dependencies: {
         triggerFields: ['_partial'],
-        show: (partial: boolean) => !partial,
+        show: (values) => !values._partial,
       },
     },
     {
@@ -110,7 +112,7 @@
       },
       dependencies: {
         triggerFields: ['_partial'],
-        show: (partial: boolean) => !partial,
+        show: (values) => !values._partial,
       },
     },
     {
@@ -126,7 +128,7 @@
       },
       dependencies: {
         triggerFields: ['_partial'],
-        show: (partial: boolean) => !partial,
+        show: (values) => !values._partial,
       },
     },
     {
@@ -142,7 +144,26 @@
       },
       dependencies: {
         triggerFields: ['_partial'],
-        show: (partial: boolean) => !partial,
+        show: (values) => !values._partial,
+      },
+    },
+    {
+      fieldName: 'biddingMode',
+      label: '鎷涙姇鏍囨ā寮�',
+      component: 'Select',
+      rules: 'required',
+      componentProps: {
+        placeholder: '璇烽�夋嫨鎷涙姇鏍囨ā寮�',
+        options: BIDDING_MODE_OPTIONS,
+      },
+      dependencies: {
+        triggerFields: ['_partial', 'id'],
+        show: (values) => !values._partial,
+        componentProps: (values) => ({
+          disabled: !!values.id,
+          placeholder: '璇烽�夋嫨鎷涙姇鏍囨ā寮�',
+          options: BIDDING_MODE_OPTIONS,
+        }),
       },
     },
     {
@@ -157,6 +178,19 @@
       label: '璧勮川瑕佹眰',
       component: 'Textarea',
       componentProps: { placeholder: '璇疯緭鍏ヨ祫璐ㄨ姹�', rows: 3 },
+      formItemClass: 'col-span-2',
+    },
+    {
+      fieldName: 'blobIds',
+      label: '璧勮川瑕佹眰闄勪欢',
+      component: 'FileUpload',
+      componentProps: {
+        valueKey: 'id',
+        maxNumber: 10,
+        multiple: true,
+        accept: ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx'],
+        helpText: '鏀寔jpg銆乯peg銆乸ng銆乸df銆乨oc銆乨ocx鏍煎紡锛屽崟涓枃浠朵笉瓒呰繃2MB',
+      },
       formItemClass: 'col-span-2',
     },
   ];
@@ -197,6 +231,16 @@
         options: TENDER_STATUS_OPTIONS,
       },
     },
+    {
+      fieldName: 'biddingMode',
+      label: '鎷涙姇鏍囨ā寮�',
+      component: 'Select',
+      componentProps: {
+        placeholder: '璇烽�夋嫨鎷涙姇鏍囨ā寮�',
+        allowClear: true,
+        options: BIDDING_MODE_OPTIONS,
+      },
+    },
   ];
 }
 
@@ -217,6 +261,12 @@
       minWidth: 100,
       cellRender: { name: 'CellTag', props: TENDER_STATUS_CELLTAG },
     },
+    {
+      field: 'biddingMode',
+      title: '鎷涙爣妯″紡',
+      minWidth: 100,
+      formatter: ({ cellValue }) => BIDDING_MODE_MAP[cellValue] || cellValue,
+    },
     { field: 'budgetAmount', title: '棰勭畻閲戦', minWidth: 120 },
     { field: 'purchaseOrg', title: '閲囪喘缁勭粐', minWidth: 100 },
     { field: 'startTime', title: '寮�濮嬫椂闂�', minWidth: 160 },

--
Gitblit v1.9.3