diff --git a/backend/app.pid b/backend/app.pid
index 94166f8c0..1e8a31f6b 100644
--- a/backend/app.pid
+++ b/backend/app.pid
@@ -1 +1 @@
-4878
+80580
diff --git a/web-admin/src/components/business/pl-plan-delivery-section/index.vue b/web-admin/src/components/business/pl-plan-delivery-section/index.vue
index c3c93c381..c6b3bb913 100644
--- a/web-admin/src/components/business/pl-plan-delivery-section/index.vue
+++ b/web-admin/src/components/business/pl-plan-delivery-section/index.vue
@@ -122,7 +122,7 @@
+
+
+
+
可安排数量
+
+ {{ formatAvailableDisplay(row) }}
+
+ ?
+
+
+
+
+
计划数量*
+
+
+ {{ row.planQty ?? '—' }}
+
+
+ 已超过可安排数量,安排时将被拦截
+
+
+
+ 实际数量
+
+ {{ formatStopQty(resolveStopActualQty(row, stopArchiveMode)) }}
+
+
+
别名
+
{{
row.aliasName || '—'
}}
@@ -86,130 +212,22 @@
-
- {{ formatBrandConstraintLabel(row.brandMode, row.brandName) }}
-
-
-
- 规格型号
- {{ row.model || '—' }}
-
-
- 单位*
-
-
- {{
- resolveDictLabel('crm_product_unit', row.unit)
- }}
-
-
-
-
-
-
-
可安排数量
-
-
{{ formatAvailableDisplay(row) }}
+
-
-
-
计划数量*
-
-
- {{ row.planQty ?? '—' }}
-
-
- 已超过可安排数量,安排时将被拦截
-
-
-
- 包装规格*
-
- {{
- resolveDictLabel('crm_product_gg', row.packageSpec)
- }}
-
-
- 送货方式*
-
- {{
- row.deliveryMethod ? getDeliveryMethodDisplay(row.deliveryMethod) : '—'
- }}
-
-
-
-
-
-
-
-
-
-
- 实际数量
-
- {{ formatStopQty(resolveStopActualQty(row, stopArchiveMode)) }}
+
+ {{ formatBrandConstraintLabel(row.brandMode, row.brandName) }}
@@ -224,6 +242,11 @@
{{ formatStopArchiveAmount(row, stopArchiveMode) }}
+
+
+
+
+
@@ -243,16 +266,6 @@
/>
-
-
- {{ row.aliasName || '—' }}
-
-
-
-
- {{ formatBrandConstraintLabel(row.brandMode, row.brandName) }}
-
-
{{ row.model || '—' }}
@@ -277,6 +290,46 @@
+
+
+ 包装规格*
+
+
+
+
+
+ —
+
+
+
+
+
+ 送货方式*
+
+
+
+
+
+ {{ getDeliveryMethodDisplay(row.deliveryMethod) }}
+
+ —
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.aliasName || '—' }}
+
+
+
+
+ {{ formatBrandConstraintLabel(row.brandMode, row.brandName) }}
+
+
-
-
- 包装规格*
-
-
-
-
-
- —
-
-
-
-
-
- 送货方式*
-
-
-
-
-
- {{ getDeliveryMethodDisplay(row.deliveryMethod) }}
-
- —
-
-
-
-
-
-
-
-
-
()
const sharedEditable = computed(() => !!props.editable && !props.sharedReadonly)
+ /** 共享只读但仍可维护别名/品牌主数据(加号);送货段已放开编辑时走 sharedEditable */
+ const aliasBrandManageable = computed(() => !!props.editable && props.sharedReadonly)
const canRemove = computed(
() => !!props.editable && (props.allowRemove === undefined ? true : props.allowRemove)
)
@@ -755,10 +780,9 @@
}
.pl-stop-product-dual-item__row1,
- .pl-stop-product-dual-item__row2,
- .pl-stop-product-dual-item__row3 {
+ .pl-stop-product-dual-item__row2 {
display: grid;
- /* 上下共用同一套 5 列轨道,保证第一列左右对齐;下行仅 4 个字段占前 4 列 */
+ /* 5 列轨道;字段超出时自动换行到下一行 */
grid-template-columns: repeat(5, minmax(0, 1fr));
gap: 8px 12px;
padding: 10px 12px;
@@ -770,11 +794,7 @@
border-bottom: 1px solid #eef2f0;
}
- .pl-stop-product-dual-item__row3 {
- border-top: 1px solid #eef2f0;
- }
-
- /* 可编辑:末列留给删除按钮(上下同行宽,删除键只在第二行) */
+ /* 可编辑:末列留给删除按钮(固定首行右侧) */
.pl-plan-stop-product-table-wrap.is-compact.is-editable {
.pl-stop-product-dual-item__row1,
.pl-stop-product-dual-item__row2 {
@@ -783,6 +803,7 @@
.pl-stop-product-dual-item__act {
grid-column: 6;
+ grid-row: 1;
}
}