From acebb5fece0fbd44f785e18b8ca5d1c701e229d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 27 Jul 2026 11:29:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=93=81=E6=B5=81=E7=A8=8BOK?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com_poOrder_DynamicFieldRenderer.vue      |  1 +
 src/views/modules/order/poOrder.vue           | 35 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/order/com_poOrder_DynamicFieldRenderer.vue b/src/views/modules/order/com_poOrder_DynamicFieldRenderer.vue
index a43067f..e91bbc3 100644
--- a/src/views/modules/order/com_poOrder_DynamicFieldRenderer.vue
+++ b/src/views/modules/order/com_poOrder_DynamicFieldRenderer.vue
@@ -31,6 +31,7 @@
     :value="value"
     :dict-type="field.dictType"
     :site="site"
+    :popper-append-to-body="true"
     :disabled="disabled"
     :placeholder="placeholder"
     style="width:100%"
diff --git a/src/views/modules/order/poOrder.vue b/src/views/modules/order/poOrder.vue
index cb3efac..150fa6a 100644
--- a/src/views/modules/order/poOrder.vue
+++ b/src/views/modules/order/poOrder.vue
@@ -461,6 +461,7 @@ import ComPoOrderDynamicFieldRenderer from './com_poOrder_DynamicFieldRenderer.v
 const ADD_CHOOSER_FIELD_CODES = new Set(['supplier_name', 'part_no', 'departure', 'destination', 'ship_via'])
 const ADD_DISPLAY_ONLY_FIELD_CODES = new Set(['short_office', 'short_npc', 'item', 'category_name', 'sku', 'value', 'status', 'crd_ori'])
 const ADD_TEXTAREA_FIELD_CODES = new Set(['remark'])
+const ADD_FULL_ROW_FIELD_CODES = new Set(['remark'])
 const ADD_NUMBER_FIELD_CODES = new Set(['price', 'qty', 'ship_qty', 'sum_price'])
 const ADD_FILTERABLE_SELECT_FIELD_CODES = new Set(['customer', 'buyer'])
 const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = {
@@ -1595,7 +1596,7 @@ export default {
       if (!Array.isArray(this.addFormSchemaFields)) {
         return []
       }
-      return this.addFormSchemaFields
+      const sortedFields = this.addFormSchemaFields
         .filter(f => f && f.visibleFlag === 'Y' && !this.isExtSchemaField(f))
         .slice()
         .sort((a, b) => {
@@ -1605,6 +1606,16 @@ export default {
           const right = Number.isFinite(sb) ? sb : Number.MAX_SAFE_INTEGER
           return left - right
         })
+      const tailFields = []
+      const normalFields = []
+      sortedFields.forEach(field => {
+        if (ADD_FULL_ROW_FIELD_CODES.has(this.getAddFieldCode(field))) {
+          tailFields.push(field)
+          return
+        }
+        normalFields.push(field)
+      })
+      return [...normalFields, ...tailFields]
     },
     uploadColumnMappingEntries () {
       if (!this.uploadColumnMapping || typeof this.uploadColumnMapping !== 'object') {
@@ -1828,6 +1839,9 @@ export default {
       return editorType === 'readonly'
     },
     getAddFieldSpan (field) {
+      if (ADD_FULL_ROW_FIELD_CODES.has(this.getAddFieldCode(field))) {
+        return 24
+      }
       return this.isAddTextareaField(field) ? 12 : 6
     },
     onAddFieldInput (field) {
@@ -3235,10 +3249,23 @@ export default {
 
 <style scoped lang="scss">
 .po-add-form-wrap {
-  max-height: 65vh;
-  overflow-y: auto;
+  max-height: calc(100vh - 210px);
+  overflow-y: scroll;
   overflow-x: hidden;
-  padding: 0 12px;
+  padding: 0 12px 8px;
+}
+
+/* 预留滚动槽位，避免滚动条出现/消失导致表单宽度抖动 */
+@supports (scrollbar-gutter: stable) {
+  .po-add-form-wrap {
+    overflow-y: auto;
+    scrollbar-gutter: stable both-edges;
+  }
+}
+
+/* 防止滚动条切换时标签换行，进一步降低布局抖动 */
+.po-add-form-wrap /deep/ .el-form--label-top .el-form-item__label {
+  white-space: nowrap;
 }
 .el-table /deep/ .cell {
   height: auto;