From 60e3e60ef25ae9ef8a4f5d4fd99add6f5ddd5e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com>
Date: Thu, 30 Oct 2025 17:17:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tree/src/Tree.vue      | 2 +-
 src/views/mdm/CountryRegion/index.vue | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/Tree/src/Tree.vue b/src/components/Tree/src/Tree.vue
index e49a583..6bc1df7 100644
--- a/src/components/Tree/src/Tree.vue
+++ b/src/components/Tree/src/Tree.vue
@@ -382,7 +382,7 @@
             return () => {
                 const { title, helpMessage, toolbar, search, checkable } = props;
                 const showTitle = title || toolbar || search || slots.headerTitle;
-                const scrollStyle: CSSProperties = { height: 'calc(100% - 51px)' };
+                const scrollStyle: CSSProperties = { height: 'calc(100% - 100px)' };
                 const inputslots = { prefix: () => <Icon icon="gg:search" size="18" color="#ccc" /> };
                 return (
                     <div class={[bem(), 'h-full', attrs.class]}>
diff --git a/src/views/mdm/CountryRegion/index.vue b/src/views/mdm/CountryRegion/index.vue
index 01db807..5ca86f2 100644
--- a/src/views/mdm/CountryRegion/index.vue
+++ b/src/views/mdm/CountryRegion/index.vue
@@ -411,6 +411,9 @@
   .cusFormStyleArea .ant-col-8{
     max-width: 200px;
   }
+  .cusFormStyleArea .scrollbar__bar.is-vertical{
+    top:inherit;
+  }
 </style>
 <style lang="less" scoped>
   :deep(.ant-table-selection-col) {

From a1702e138cb327cdffd84d401708a34752dad08d Mon Sep 17 00:00:00 2001
From: "t-aonan.gu" <t-aonan.gu@egreatwall.com>
Date: Thu, 30 Oct 2025 17:22:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B8=AF=E5=8F=A3=E3=80=81=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6=E3=80=81=E5=93=81?=
 =?UTF-8?q?=E7=A7=8D=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mdm/Category/components/config.ts |  6 +++---
 src/views/mdm/Category/index.vue            |  2 +-
 src/views/mdm/Currency/index.vue            |  2 +-
 src/views/mdm/DocCp/components/Form.vue     | 14 ++++++++------
 src/views/mdm/DocCp/components/config.ts    |  6 +++---
 src/views/mdm/DocCp/index.vue               |  2 +-
 src/views/mdm/LNGStation/index.vue          |  2 +-
 src/views/mdm/Port/components/config.ts     |  2 --
 src/views/mdm/Port/index.vue                |  2 +-
 src/views/mdm/PriceTerms/index.vue          |  2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/mdm/Category/components/config.ts b/src/views/mdm/Category/components/config.ts
index 948f26a..1f83a82 100644
--- a/src/views/mdm/Category/components/config.ts
+++ b/src/views/mdm/Category/components/config.ts
@@ -247,7 +247,7 @@ export const formProps: FormProps = {
                 showSearch: false,
                 clearable: false,
                 disabled: false,
-                mode: 'multiple',
+                mode: '',
                 staticOptions: [
                     { key: 1, label: 'Option 1', value: 'Option 1' },
                     { key: 2, label: 'Option 2', value: 'Option 2' },
@@ -355,8 +355,8 @@ export const formProps: FormProps = {
                 showLabel: true,
                 showSearch: false,
                 clearable: false,
-                disabled: false,
-                mode: 'multiple',
+                disabled: true,
+                mode: '',
                 staticOptions: [
                     { key: 1, label: 'Option 1', value: 'Option 1' },
                     { key: 2, label: 'Option 2', value: 'Option 2' },
diff --git a/src/views/mdm/Category/index.vue b/src/views/mdm/Category/index.vue
index 53df6a9..e17b06d 100644
--- a/src/views/mdm/Category/index.vue
+++ b/src/views/mdm/Category/index.vue
@@ -109,7 +109,7 @@
             },
             schemas: customSearchFormSchema,
             fieldMapToTime: [],
-            showResetButton: false
+            showResetButton: true
         },
         beforeFetch: (params) => {
             return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
diff --git a/src/views/mdm/Currency/index.vue b/src/views/mdm/Currency/index.vue
index 38b3bf0..f8f9156 100644
--- a/src/views/mdm/Currency/index.vue
+++ b/src/views/mdm/Currency/index.vue
@@ -108,7 +108,7 @@
             },
             schemas: customSearchFormSchema,
             fieldMapToTime: [],
-            showResetButton: false
+            showResetButton: true
         },
         beforeFetch: (params) => {
             return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
diff --git a/src/views/mdm/DocCp/components/Form.vue b/src/views/mdm/DocCp/components/Form.vue
index dc44d9b..42e339d 100644
--- a/src/views/mdm/DocCp/components/Form.vue
+++ b/src/views/mdm/DocCp/components/Form.vue
@@ -187,15 +187,17 @@
         (val) => {
             let suNecSignProps = data.formDataProps.schemas?.filter((item) => item.field === 'suNecSign')[0];
             let cuNecSignProps = data.formDataProps.schemas?.filter((item) => item.field === 'cuNecSign')[0];
-            if (val.suSign === 'Y') {
-                suNecSignProps.componentProps.required = true;
+            if (val.suSign === 'N') {
+                val.suNecSign = 'N';
+                suNecSignProps.componentProps.disabled = true;
             } else {
-                suNecSignProps.componentProps.required = false;
+                suNecSignProps.componentProps.disabled = false;
             }
-            if (val.cuSign === 'Y') {
-                cuNecSignProps.componentProps.required = true;
+            if (val.cuSign === 'N') {
+                val.cuNecSign = 'N';
+                cuNecSignProps.componentProps.disabled = true;
             } else {
-                cuNecSignProps.componentProps.required = false;
+                cuNecSignProps.componentProps.disabled = false;
             }
         },
         {
diff --git a/src/views/mdm/DocCp/components/config.ts b/src/views/mdm/DocCp/components/config.ts
index b31ca3e..41a39b0 100644
--- a/src/views/mdm/DocCp/components/config.ts
+++ b/src/views/mdm/DocCp/components/config.ts
@@ -74,7 +74,7 @@ export const columns: BasicColumn[] = [
 
     {
         dataIndex: 'cuNecSign',
-        title: '供应商必须提供',
+        title: '客户必须提供',
         componentType: 'select',
         align: 'left',
 
@@ -385,7 +385,7 @@ export const formProps: FormProps = {
                 labelFixWidth: 150,
                 responsive: false,
                 respNewRow: false,
-                placeholder: '请选择供应商必须提供',
+                placeholder: '请选择客户必须提供',
                 sepTextField: '',
                 showLabel: true,
                 showSearch: false,
@@ -408,7 +408,7 @@ export const formProps: FormProps = {
                     apiId: '93d735dcb7364a0f8102188ec4d77ac7'
                 },
                 dicOptions: [],
-                required: false,
+                required: true,
                 rules: [],
                 events: {},
                 isShow: true,
diff --git a/src/views/mdm/DocCp/index.vue b/src/views/mdm/DocCp/index.vue
index 517c760..d63fb82 100644
--- a/src/views/mdm/DocCp/index.vue
+++ b/src/views/mdm/DocCp/index.vue
@@ -108,7 +108,7 @@
             },
             schemas: customSearchFormSchema,
             fieldMapToTime: [],
-            showResetButton: false
+            showResetButton: true
         },
         beforeFetch: (params) => {
             return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
diff --git a/src/views/mdm/LNGStation/index.vue b/src/views/mdm/LNGStation/index.vue
index d252360..8e08c47 100644
--- a/src/views/mdm/LNGStation/index.vue
+++ b/src/views/mdm/LNGStation/index.vue
@@ -109,7 +109,7 @@
             },
             schemas: customSearchFormSchema,
             fieldMapToTime: [],
-            showResetButton: false
+            showResetButton: true
         },
         beforeFetch: (params) => {
             return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
diff --git a/src/views/mdm/Port/components/config.ts b/src/views/mdm/Port/components/config.ts
index e891fb7..261389f 100644
--- a/src/views/mdm/Port/components/config.ts
+++ b/src/views/mdm/Port/components/config.ts
@@ -349,7 +349,6 @@ export const formProps: FormProps = {
                 min: null,
                 max: null,
                 step: 0.01,
-                maxlength: 2,
                 disabled: false,
                 showLabel: true,
                 controls: true,
@@ -381,7 +380,6 @@ export const formProps: FormProps = {
                 min: null,
                 max: null,
                 step: 0.01,
-                maxlength: 2,
                 disabled: false,
                 showLabel: true,
                 controls: true,
diff --git a/src/views/mdm/Port/index.vue b/src/views/mdm/Port/index.vue
index 66dbe10..da09b21 100644
--- a/src/views/mdm/Port/index.vue
+++ b/src/views/mdm/Port/index.vue
@@ -108,7 +108,7 @@
             },
             schemas: customSearchFormSchema,
             fieldMapToTime: [],
-            showResetButton: false
+            showResetButton: true
         },
         beforeFetch: (params) => {
             return { ...params, FormId: formIdComputedRef.value, PK: 'id' };
diff --git a/src/views/mdm/PriceTerms/index.vue b/src/views/mdm/PriceTerms/index.vue
index 1d1afec..09d8925 100644
--- a/src/views/mdm/PriceTerms/index.vue
+++ b/src/views/mdm/PriceTerms/index.vue
@@ -107,7 +107,7 @@
             },
             schemas: customSearchFormSchema,
             fieldMapToTime: [],
-            showResetButton: false
+            showResetButton: true
         },
         beforeFetch: (params) => {
             return { ...params, FormId: formIdComputedRef.value, PK: 'id' };