From 1498eff8df14d0c4963fa32745ecb2a495eac3cb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 04 八月 2026 09:38:26 +0800
Subject: [PATCH] refactor(srm): 重构供应商证书字段命名并修复表单依赖逻辑
---
src/api/srm/supplierCertificate/index.ts | 6 +++---
src/views/crm/receivable/plan/components/detail-list.vue | 2 +-
src/views/srm/tender/data.ts | 18 +++++++++---------
src/views/srm/supplierCertificate/data.ts | 8 ++++----
src/views/crm/receivable/modules/form.vue | 4 ++++
src/views/crm/receivable/plan/modules/form.vue | 4 ++++
6 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/api/srm/supplierCertificate/index.ts b/src/api/srm/supplierCertificate/index.ts
index 3b775cf..9908b1c 100644
--- a/src/api/srm/supplierCertificate/index.ts
+++ b/src/api/srm/supplierCertificate/index.ts
@@ -11,9 +11,9 @@
certificateNo?: string;
certificateType: number;
issuingAuthority?: string;
- issueDate: string;
- expireDate: string;
- expireStatus?: number;
+ validStartDate: string;
+ validEndDate: string;
+ status?: number;
remark?: string;
createTime?: string;
}
diff --git a/src/views/crm/receivable/modules/form.vue b/src/views/crm/receivable/modules/form.vue
index d04f2a9..e826402 100644
--- a/src/views/crm/receivable/modules/form.vue
+++ b/src/views/crm/receivable/modules/form.vue
@@ -84,6 +84,10 @@
modalApi.lock();
// 鎻愪氦琛ㄥ崟
const data = (await formApi.getValues()) as CrmReceivableApi.Receivable;
+ // 缂栬緫鏃堕渶瑕佹妸 id 琛ュ洖鎻愪氦鏁版嵁锛堣〃鍗� schema 涓嶅惈 id 瀛楁锛�
+ if (formData.value?.id) {
+ data.id = formData.value.id;
+ }
try {
await (formData.value?.id
? updateReceivable(data)
diff --git a/src/views/crm/receivable/plan/components/detail-list.vue b/src/views/crm/receivable/plan/components/detail-list.vue
index 1faa4f2..e20931f 100644
--- a/src/views/crm/receivable/plan/components/detail-list.vue
+++ b/src/views/crm/receivable/plan/components/detail-list.vue
@@ -44,7 +44,7 @@
/** 缂栬緫鍥炴璁″垝 */
function handleEdit(row: CrmReceivablePlanApi.Plan) {
- formModalApi.setData({ receivablePlan: row }).open();
+ formModalApi.setData(row).open();
}
/** 鍒犻櫎鍥炴璁″垝 */
diff --git a/src/views/crm/receivable/plan/modules/form.vue b/src/views/crm/receivable/plan/modules/form.vue
index 69e420b..882f313 100644
--- a/src/views/crm/receivable/plan/modules/form.vue
+++ b/src/views/crm/receivable/plan/modules/form.vue
@@ -45,6 +45,10 @@
modalApi.lock();
// 鎻愪氦琛ㄥ崟
const data = (await formApi.getValues()) as CrmReceivablePlanApi.Plan;
+ // 缂栬緫鏃堕渶瑕佹妸 id 琛ュ洖鎻愪氦鏁版嵁锛堣〃鍗� schema 涓嶅惈 id 瀛楁锛�
+ if (formData.value?.id) {
+ data.id = formData.value.id;
+ }
try {
await (formData.value?.id
? updateReceivablePlan(data)
diff --git a/src/views/srm/supplierCertificate/data.ts b/src/views/srm/supplierCertificate/data.ts
index 34a7cde..1472c53 100644
--- a/src/views/srm/supplierCertificate/data.ts
+++ b/src/views/srm/supplierCertificate/data.ts
@@ -60,7 +60,7 @@
componentProps: { placeholder: '璇疯緭鍏ラ鍙戞満鏋�' },
},
{
- fieldName: 'issueDate',
+ fieldName: 'validStartDate',
label: '棰佸彂鏃ユ湡',
component: 'DatePicker',
componentProps: {
@@ -71,7 +71,7 @@
},
},
{
- fieldName: 'expireDate',
+ fieldName: 'validEndDate',
label: '鍒版湡鏃ユ湡',
component: 'DatePicker',
componentProps: {
@@ -140,8 +140,8 @@
cellRender: { name: 'CellTag', props: CERTIFICATE_TYPE_CELLTAG },
},
{ field: 'issuingAuthority', title: '棰佸彂鏈烘瀯', minWidth: 120 },
- { field: 'issueDate', title: '棰佸彂鏃ユ湡', minWidth: 120 },
- { field: 'expireDate', title: '鍒版湡鏃ユ湡', minWidth: 120 },
+ { field: 'validStartDate', title: '棰佸彂鏃ユ湡', minWidth: 120 },
+ { field: 'validEndDate', title: '鍒版湡鏃ユ湡', minWidth: 120 },
{ field: 'createTime', title: '鍒涘缓鏃堕棿', minWidth: 160 },
{
title: '鎿嶄綔',
diff --git a/src/views/srm/tender/data.ts b/src/views/srm/tender/data.ts
index c75f017..c06e4dd 100644
--- a/src/views/srm/tender/data.ts
+++ b/src/views/srm/tender/data.ts
@@ -35,7 +35,7 @@
componentProps: { placeholder: '璇疯緭鍏ユ嫑鏍囩紪鍙�' },
dependencies: {
triggerFields: ['_partial'],
- show: (partial: boolean) => !partial,
+ show: (values) => !values._partial,
},
},
{
@@ -46,7 +46,7 @@
componentProps: { placeholder: '璇疯緭鍏ユ嫑鏍囬」鐩悕绉�' },
dependencies: {
triggerFields: ['_partial'],
- show: (partial: boolean) => !partial,
+ show: (values) => !values._partial,
},
},
{
@@ -60,7 +60,7 @@
},
dependencies: {
triggerFields: ['_partial'],
- show: (partial: boolean) => !partial,
+ show: (values) => !values._partial,
},
},
{
@@ -70,7 +70,7 @@
componentProps: { placeholder: '璇疯緭鍏ラ噰璐粍缁�' },
dependencies: {
triggerFields: ['_partial'],
- show: (partial: boolean) => !partial,
+ show: (values) => !values._partial,
},
},
{
@@ -80,7 +80,7 @@
componentProps: { placeholder: '璇疯緭鍏ラ」鐩礋璐ｄ汉' },
dependencies: {
triggerFields: ['_partial'],
- show: (partial: boolean) => !partial,
+ show: (values) => !values._partial,
},
},
{
@@ -94,7 +94,7 @@
},
dependencies: {
triggerFields: ['_partial'],
- show: (partial: boolean) => !partial,
+ show: (values) => !values._partial,
},
},
{
@@ -110,7 +110,7 @@
},
dependencies: {
triggerFields: ['_partial'],
- show: (partial: boolean) => !partial,
+ show: (values) => !values._partial,
},
},
{
@@ -126,7 +126,7 @@
},
dependencies: {
triggerFields: ['_partial'],
- show: (partial: boolean) => !partial,
+ show: (values) => !values._partial,
},
},
{
@@ -142,7 +142,7 @@
},
dependencies: {
triggerFields: ['_partial'],
- show: (partial: boolean) => !partial,
+ show: (values) => !values._partial,
},
},
{
--
Gitblit v1.9.3