diff --git a/src/api/index/index.ts b/src/api/index/index.ts
index 6054b1e9..953e4b9a 100644
--- a/src/api/index/index.ts
+++ b/src/api/index/index.ts
@@ -308,8 +308,65 @@ export function getShopList(data?: {
} as any)
}
-/** 获取指定店铺可用快递列表 */
-export function getShopExpressList(data?: { shop_id?: string | number; shopId?: string | number }) {
+/** 快递产品类型(非 PDD 平台由服务端按 sys_express_code 匹配 wms_express_product_type 补充;PDD 平台不返回) */
+export type ShopExpressProductType = {
+ code?: string
+ name?: string
+ [key: string]: unknown
+}
+
+/** 店铺可用快递列表项(各平台字段有差异:前端按需取值 + 索引签名兜底) */
+export type ShopExpressListItem = {
+ /** 电子面单快递编码(淘宝系 wp_code;其次 express_code / code) */
+ wp_code?: string
+ wp_name?: string
+ express_code?: string
+ express_name?: string
+ code?: string
+ name?: string
+ label?: string
+ /** 系统快递编码(与本系统 wms_express.express_code 对齐) */
+ sys_express_code?: string
+ /** 快递公司编号(部分平台用 providerid / provider_id / providerId) */
+ providerid?: string | number
+ provider_id?: string | number
+ providerId?: string | number
+ /** 产品类型列表:**非 PDD 平台**服务端会补充;PDD 平台不返回该字段 */
+ product_types?: ShopExpressProductType[]
+ /** 签约网点/账号(含面单余量、地址、增值服务;字段随平台差异) */
+ accounts?: Record[]
+ [key: string]: unknown
+}
+
+/**
+ * index.getShopExpressList 响应
+ *
+ * ⚠️ 该接口响应形如 `{ code, message, data }`(**无 flag / timestamp**),业务数据在 `data` 内。
+ */
+export type ShopExpressListResponse = {
+ /** 业务状态码,成功 200 */
+ code?: number
+ /** 业务提示信息,成功 ok */
+ message?: string
+ data?: {
+ /** 当前店铺ID */
+ shop_id?: number
+ /** 店铺所属平台编码(服务端已转大写) */
+ platform_code?: string
+ /** 服务端按平台收敛后的可用快递列表;未接入的平台返回空数组 */
+ list?: ShopExpressListItem[]
+ }
+}
+
+/**
+ * 获取指定店铺可用快递列表
+ *
+ * 入参 `shop_id` / `shopId` 二选一至少传一个(服务端按 shop_id、shopId 顺序读首个非空值)。
+ */
+export function getShopExpressList(data?: {
+ shop_id?: string | number
+ shopId?: string | number
+}): Promise {
return request({
url: '/system',
method: 'post',
diff --git a/src/api/stock.check/stock.check.ts b/src/api/stock.check/stock.check.ts
index 28e26513..2b840feb 100644
--- a/src/api/stock.check/stock.check.ts
+++ b/src/api/stock.check/stock.check.ts
@@ -79,12 +79,16 @@ export type StockCheckDetailStatus = 'none_checked' | 'partial_checked' | 'all_c
* 盘点范围类型
*
* 明细行形态由 type 决定:
- * all / location → 明细为「库位行」(scope_type=location,一行=一个库位,行内按商品聚合 stocks[])
- * store / goods → 明细为「商品行」(scope_type=goods,一行=一个库存商品)
+ * location → 明细为「库位行」(scope_type=location,一行=一个库位,行内按商品聚合 stocks[])
+ * store / goods → 明细为「商品行」(scope_type=goods,一行=一个库存商品)
+ *
+ * ⚠️ **`all` 已下线**(2026-10-27 文档,与 location 语义重复):create / addDetail 传 `all` 均报 400;
+ * 原「全盘」语义已并入 `location`——按库位盘点添加明细时未传库位/库位ID,
+ * 由后端自动拉取全仓库启用且有效的库位生成盘点范围。
+ * 历史 type=all 的任务仅能查看,**不能再添加明细**。
*/
export type StockCheckType =
- | 'all' // 按库位盘点(缺省):添加明细未传库位时由后端自动拉取全仓库启用库位生成盘点范围
- | 'location' // 按库位盘点(指定库位)
+ | 'location' // 按库位盘点(**缺省**;未传库位时后端自动拉取全仓库启用库位 → 原 all 全盘语义)
| 'store' // 按货主按商品盘点(商品行)
| 'goods' // 按商品盘点(商品行)
@@ -351,15 +355,20 @@ export type StockCheckResultRow = StockCheckDetailRow & {
* 文档最新入参:title / type / mode / store_id / remark(**已无 check_date**,主表也不再返回该字段);
* 盘点时间改由作业流程回填(start_time=首个盘点明细写入时间、end_time=完成盘点时间)。
*
- * mode 口径:按库位盘点(type=all/location)一律盲盘 blind(前端传值被忽略);
+ * mode 口径:按库位盘点(type=location)一律盲盘 blind(前端传值被忽略);
* 按商品盘点(type=store/goods)按传入值(默认明盘 open)。
*/
export type StockCheckCreateParams = {
/** 盘点名称/主题 */
title?: string
- /** 盘点范围类型,缺省 all */
+ /**
+ * 盘点范围类型,**缺省 `location`**(2026-10-27 文档)
+ *
+ * ⚠️ `all` 已下线(与 location 语义重复),**传入返回 400**;
+ * 原「全盘」语义用 `location`:不传库位即由后端拉取全仓库启用库位生成盘点范围。
+ */
type?: StockCheckType
- /** 盘点方式:open=明盘 / blind=盲盘;库位类(all/location)一律 blind */
+ /** 盘点方式:open=明盘 / blind=盲盘;库位类(type=location)一律 blind */
mode?: StockCheckMode
/** 货主ID(type=store 时必填;添加商品明细时商品货主必须与该货主一致) */
store_id?: number
@@ -543,7 +552,10 @@ export type StockCheckListWhere = {
status?: StockCheckWhereCondition
/** 货主筛选:`{ operator: 'eq', value: 100000, type: 'number' }` */
store_id?: StockCheckWhereCondition
- /** 盘点范围筛选(all/location/store/goods):`{ operator: 'eq', value: 'goods', type: 'text' }` */
+ /**
+ * 盘点范围筛选(location/store/goods;已下线的 `all` 不在筛选枚举内,仅历史行可能存在该值):
+ * `{ operator: 'eq', value: 'goods', type: 'text' }`
+ */
type?: StockCheckWhereCondition
/** 盘点方式筛选(open/blind):`{ operator: 'eq', value: 'blind', type: 'text' }` */
mode?: StockCheckWhereCondition
@@ -599,14 +611,15 @@ export function stockCheckList(
* → 前端语义:传 N 个 stock_ids 可能得到 >N 条明细,响应 `added` 是**明细行数**而非商品数。
*
* 维度校验(传错维度后端报 400):
- * - 按库位盘点(type=all/location)传 stock_ids → 「当前盘点类型按库位盘点,请传 locations 或
+ * - 按库位盘点(type=location)传 stock_ids → 「当前盘点类型按库位盘点,请传 locations 或
* location_ids(如需按商品盘点请创建 type=goods 任务)」
* - 按商品盘点(type=store/goods)传 locations → 「当前盘点类型按商品盘点,请传 stock_ids」
* - 按商品盘点传 location_ids → 「当前盘点类型按商品盘点,不能添加库位明细」
*
* 商品判定:商品必须属于本仓库;任务 store_id 非空时商品货主必须与任务货主一致
* (不一致的商品计入 invalid_stock_ids)。
- * 兼容:type=all 且已存在商品明细行(改造前创建的旧任务)时,继续按商品模式接受 stock_ids。
+ * ⚠️ `all` 已下线(2026-10-27):**历史 type=all 的任务添加明细直接返回 400**,
+ * 需新建 type=location 的任务;库位也必须有效(未删除且所属分区 zone 存在,剔除无头库位)。
* 幂等:已存在同盘点项(商品行 stock_id / 库位行 location_code)自动跳过(计入 skipped)。
*/
export type StockCheckAddDetailParams = {
@@ -621,15 +634,15 @@ export type StockCheckAddDetailParams = {
*/
stock_ids?: number[]
/**
- * 库位编码列表(wms_location_space.space_code):type=all/location 按库位盘点时使用,
+ * 库位编码列表(wms_location_space.space_code):type=location 按库位盘点时使用,
* 与 stock_ids 按任务类型二选一;**与 location_ids 同时传入时被忽略(location_ids 优先)**;
- * **type=all 未传库位且未传 location_ids 时由后端自动拉取全仓库启用库位生成盘点范围**
+ * **type=location 未传库位且未传 location_ids 时由后端自动拉取全仓库启用库位生成盘点范围**
*/
locations?: string[]
/** 库位编码列表(兼容别名;locations 优先,两者都传时以 locations 为准) */
location_codes?: string[]
/**
- * 库位ID列表(wms_location_space.id):type=all/location 按库位盘点时使用,
+ * 库位ID列表(wms_location_space.id):type=location 按库位盘点时使用,
* 直接按 id + warehouse_id 查库校验(**不再按编码二次解析**),查不到的 ID 记入
* `invalid_location_ids`(不报错);与 locations 同时传入时 **location_ids 优先、locations 忽略**
*/
@@ -879,7 +892,7 @@ export function stockCheckResult(
*
* ⚠️ 这**不是入参**:`view` 入参已废弃(传了也被忽略)。实际返回哪种结构由
* **任务范围类型 + `is_goods`** 解析:
- * - 任务范围是库位(`type=location/all`)→ **一律 `location`**(库位结构)
+ * - 任务范围是库位(`type=location`;历史 `all` 任务同属库位结构)→ **一律 `location`**(库位结构)
* - 任务范围是商品(`type=goods/store`)→ 默认 **`space`**(聚合库位);
* 仅 `is_goods=true` → **`goods`**(商品结构)
*/
@@ -1101,7 +1114,7 @@ export type StockCheckWorkDataParams = {
/**
* 商品任务是否按商品视图返回(**仅商品任务生效**):
* true → `goods`(商品结构);缺省 false → `space`(聚合库位,按拣货路径)
- * 库位任务(type=location/all)**无视该参数**,一律返回 `location`(库位结构)
+ * 库位任务(type=location,含历史 all 任务)**无视该参数**,一律返回 `location`(库位结构)
*/
is_goods?: boolean
/** 商品视图开关(驼峰别名,兼容写法;is_goods 优先) */
diff --git a/src/components/task-progress/TaskProgressPanel.vue b/src/components/task-progress/TaskProgressPanel.vue
index b53bf80f..82887fb9 100644
--- a/src/components/task-progress/TaskProgressPanel.vue
+++ b/src/components/task-progress/TaskProgressPanel.vue
@@ -480,10 +480,17 @@ const etaLabel = computed(
background: #fafafa;
}
+ /* 标签列固定宽度(含必填星号占位):对齐「手工录入运单号」表单,保证各行标签/值对齐 */
&__field-label {
+ flex: none;
+ width: 88px;
+ padding-left: 10px;
+ box-sizing: border-box;
font-size: 12px;
line-height: 20px;
color: #606266;
+ text-align: left;
+ white-space: nowrap;
}
&__field-value {
diff --git a/src/components/task-progress/UnifiedTaskProgressDialog.vue b/src/components/task-progress/UnifiedTaskProgressDialog.vue
index d16e9d7e..90b6765c 100644
--- a/src/components/task-progress/UnifiedTaskProgressDialog.vue
+++ b/src/components/task-progress/UnifiedTaskProgressDialog.vue
@@ -157,7 +157,15 @@ function close() {
.utp-actions {
display: flex;
- gap: 8px;
+ align-items: center;
+ /* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
+ gap: 6px;
+
+ /* 清掉 el-button 默认 `+ .el-button { margin-left: 12px }`,避免与 gap 叠加成 18px */
+ :deep(.el-button) {
+ margin-left: 0;
+ margin-right: 0;
+ }
}
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 00624119..2f606c40 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -47,3 +47,14 @@
.el-range-separator {
box-sizing: content-box;
}
+
+// ElMessageBox(确认/提示弹窗)底部按钮间距:对齐工具栏按钮组
+// (OrderToolbarButtonGroup gap 6px),覆盖 Element Plus 默认的
+// .el-button + .el-button { margin-left: 12px }
+.el-message-box__btns {
+ gap: 6px;
+
+ .el-button + .el-button {
+ margin-left: 0;
+ }
+}
diff --git a/src/views/afterSale/detail/ClaimDialog.vue b/src/views/afterSale/detail/ClaimDialog.vue
index e97ca116..0eb40e04 100644
--- a/src/views/afterSale/detail/ClaimDialog.vue
+++ b/src/views/afterSale/detail/ClaimDialog.vue
@@ -1,34 +1,139 @@
-
-
-
- 仓库理赔
-
-
-
-
-
-
-
-
-
- 运方理赔
-
-
-
-
-
-
-
-
-
- 操作信息
-
-
-
-
- 取消
- 确认
-
+
+
+
+
+
+
+
登记理赔
+
登记仓库理赔与运方理赔信息,并记录本次操作
+
+
+
+
+
+
+ 仓库理赔
+
+
+ 是否需要
+
+
+
+
+
+
+
+
+
+ 运方理赔
+
+
+ 是否需要
+
+
+
+
+
+
+
+
+
+ 操作信息
+
+
+
+
+
+
+
+
+
@@ -92,3 +197,203 @@ async function submit() {
defineExpose({ open })
+
+
+
+
diff --git a/src/views/afterSale/detail/TransferDialog.vue b/src/views/afterSale/detail/TransferDialog.vue
index d3dcedc8..c7ea4c58 100644
--- a/src/views/afterSale/detail/TransferDialog.vue
+++ b/src/views/afterSale/detail/TransferDialog.vue
@@ -1,19 +1,82 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确认
-
+
+
+
+
+
+
+
转单
+
将当前售后单转交给其他角色组处理
+
+
+
+
+
+
+
+ 售后单 ID
+ {{ afterSaleId || '—' }}
+
+
+
+
+
+
备注
+
+
+
备注将随转单记录保存,便于接收方了解转单原因
+
+
+
+
+
+
+
@@ -57,3 +120,193 @@ async function submit() {
defineExpose({ open })
+
+
+
+
diff --git a/src/views/afterSale/list/index.vue b/src/views/afterSale/list/index.vue
index 7713546e..0da00ea6 100644
--- a/src/views/afterSale/list/index.vue
+++ b/src/views/afterSale/list/index.vue
@@ -163,33 +163,85 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确认转单
-
+
+
+
+
+
+
+ 售后单号
+ {{ transferForm.after_sale_no || '—' }}
+
+
+
+
+
+
转单备注
+
+
+
备注将随转单记录保存,便于接收方了解转单原因
+
+
+
+
+
+
+
@@ -830,4 +882,192 @@ onUnmounted(() => {
color: #909399;
padding: 16px;
}
+
+/* 转单:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) */
+.task-panel {
+ background: #fff;
+ color: #303133;
+
+ &__head {
+ display: flex;
+ align-items: flex-start;
+ gap: 12px;
+ padding: 16px;
+ }
+
+ &__titles {
+ flex: 1;
+ min-width: 0;
+
+ h2 {
+ margin: 0;
+ font-size: 18px;
+ line-height: 24px;
+ font-weight: 400;
+ color: #303133;
+ }
+
+ p {
+ margin: 4px 0 0;
+ font-size: 12px;
+ line-height: 18px;
+ color: #909399;
+ }
+ }
+
+ &__close {
+ width: 24px;
+ height: 24px;
+ flex: none;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ border: none;
+ border-radius: 4px;
+ background: transparent;
+ color: #909399;
+ cursor: pointer;
+ transition: color 0.2s;
+
+ svg {
+ width: 12px;
+ height: 12px;
+ }
+
+ &:hover {
+ color: #409eff;
+ }
+ }
+
+ &__body {
+ padding: 12px 16px 0;
+ }
+
+ &__form {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ }
+
+ &__field {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 16px;
+ min-height: 40px;
+ padding: 8px 12px;
+ border: 1px solid #ebeef5;
+ border-radius: 4px;
+ background: #fafafa;
+
+ /* 输入行:去掉灰色容器,与静态信息行区分 */
+ &--input {
+ align-items: flex-start;
+ min-height: 0;
+ padding: 4px 0 0 12px;
+ border: none;
+ border-radius: 0;
+ background: transparent;
+
+ .task-panel__field-label {
+ padding-top: 7px;
+ }
+ }
+
+ /* 多行文本行:标签与文本域顶部对齐 */
+ &--textarea {
+ padding-top: 8px;
+ }
+ }
+
+ &__field-label {
+ font-size: 12px;
+ line-height: 20px;
+ color: #606266;
+ flex-shrink: 0;
+
+ &.is-required::before {
+ content: '*';
+ color: #f56c6c;
+ margin-right: 4px;
+ }
+ }
+
+ &__field-value {
+ font-size: 13px;
+ font-weight: 500;
+ color: #303133;
+ text-align: right;
+ word-break: break-all;
+ }
+
+ &__field-control {
+ flex: 1;
+ min-width: 0;
+ }
+
+ &__field-tip {
+ margin: 4px 0 0;
+ font-size: 12px;
+ line-height: 18px;
+ color: #909399;
+ }
+
+ &__foot {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 12px;
+ padding: 16px;
+ }
+
+ &__hint {
+ font-size: 12px;
+ color: #909399;
+ }
+
+ &__actions {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+
+ :deep(.el-button) {
+ margin-left: 0;
+ margin-right: 0;
+ }
+ }
+}
+
+/* 面板内嵌 el-form-item:去掉默认间距,错误提示改回文档流内展示 */
+.task-panel__form {
+ :deep(.el-form-item) {
+ margin-bottom: 0;
+ }
+
+ :deep(.el-form-item__content) {
+ margin-left: 0;
+ line-height: 1.4;
+ }
+
+ :deep(.el-form-item__error) {
+ position: static;
+ padding-top: 4px;
+ }
+}
+
+
+
diff --git a/src/views/afterSale/typelist/pages/TypeFormDialog.vue b/src/views/afterSale/typelist/pages/TypeFormDialog.vue
index f26a1093..dd5af8d4 100644
--- a/src/views/afterSale/typelist/pages/TypeFormDialog.vue
+++ b/src/views/afterSale/typelist/pages/TypeFormDialog.vue
@@ -13,84 +13,133 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
状态
+
-
-
- 暂无可选类型,请先在「售后类型」页签新增类型
-
+
+
-
-
-
-
- 仅支持小写字母、数字、下划线,最长 {{ codeMaxLength }} 位;创建后不可修改
-
-
-
-
-
-
-
-
-
-
- 越小越靠前,默认 0
-
-
-
-
-
-
-
+
-
-
- 取消
- 保存
-
@@ -281,24 +330,182 @@ async function submitForm() {
+
+
diff --git a/src/views/inbox/group/index.vue b/src/views/inbox/group/index.vue
index bd0b3fed..7110f936 100644
--- a/src/views/inbox/group/index.vue
+++ b/src/views/inbox/group/index.vue
@@ -113,26 +113,78 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 生成
-
+
+
+
+
+
+
生成绑群码
+
选择货主后生成绑群码,生成后 5 分钟内有效
+
+
+
+
+
+
+
+
@@ -567,7 +619,11 @@ async function handleSubmitEdit() {
async function handleToggleDisable(row: any) {
const action = row.is_blocked ? '启用' : '禁用'
try {
- await ElMessageBox.confirm(`确定要${action}群组「${row.group_name}」吗?`, `${action}确认`, { type: 'warning' })
+ await ElMessageBox.confirm(`确定要${action}群组「${row.group_name}」吗?`, `${action}确认`, {
+ type: 'warning',
+ // 按钮尺寸对齐面板表单底部按钮(Element Plus small)
+ buttonSize: 'small'
+ })
const res: any = await inboxGroupDisable({ id: row.id, isBlocked: row.is_blocked ? 0 : 1 })
if (res && (res.code === 1 || res.code === 200 || res.code === 20000)) {
ElMessage.success(res.data?.message || res.message || `群已${action}`); fetchData()
@@ -582,7 +638,13 @@ async function handleResetGroupConfig(row: any) {
await ElMessageBox.confirm(
`确定要清空群组「${row.group_name}」的群类型配置吗?群类型/子类型/货主/快递接口/系统快递编码将被清空,AI 自动回复与模板消息回复将关闭,仅保留群创建时信息。`,
'清空配置确认',
- { type: 'warning', confirmButtonText: '清空', confirmButtonClass: 'el-button--danger' }
+ {
+ type: 'warning',
+ confirmButtonText: '清空',
+ confirmButtonClass: 'el-button--danger',
+ // 按钮尺寸对齐面板表单底部按钮(Element Plus small)
+ buttonSize: 'small'
+ }
)
const res: any = await inboxGroupReset({ id: row.id })
if (res && (res.code === 1 || res.code === 200 || res.code === 20000)) {
@@ -659,4 +721,192 @@ onMounted(() => { loadStoreList(); fetchData() })
.msg-table-wrapper { margin-bottom: 0; }
.msg-pagination-wrapper { display: flex; justify-content: flex-end; margin-top: 10px; }
.empty-tip { color: #909399; font-size: 13px; padding: 16px; text-align: center; }
+
+/* 生成绑群码:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) */
+.task-panel {
+ background: #fff;
+ color: #303133;
+
+ &__head {
+ display: flex;
+ align-items: flex-start;
+ gap: 12px;
+ padding: 16px;
+ }
+
+ &__titles {
+ flex: 1;
+ min-width: 0;
+
+ h2 {
+ margin: 0;
+ font-size: 18px;
+ line-height: 24px;
+ font-weight: 400;
+ color: #303133;
+ }
+
+ p {
+ margin: 4px 0 0;
+ font-size: 12px;
+ line-height: 18px;
+ color: #909399;
+ }
+ }
+
+ &__close {
+ width: 24px;
+ height: 24px;
+ flex: none;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ border: none;
+ border-radius: 4px;
+ background: transparent;
+ color: #909399;
+ cursor: pointer;
+ transition: color 0.2s;
+
+ svg {
+ width: 12px;
+ height: 12px;
+ }
+
+ &:hover {
+ color: #409eff;
+ }
+ }
+
+ &__body {
+ padding: 12px 16px 0;
+ }
+
+ &__form {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ }
+
+ &__field {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 16px;
+ min-height: 40px;
+ padding: 8px 12px;
+ border: 1px solid #ebeef5;
+ border-radius: 4px;
+ background: #fafafa;
+
+ /* 输入行:去掉灰色容器,与静态信息行区分 */
+ &--input {
+ align-items: flex-start;
+ min-height: 0;
+ padding: 4px 0 0 12px;
+ border: none;
+ border-radius: 0;
+ background: transparent;
+
+ .task-panel__field-label {
+ padding-top: 7px;
+
+ &.is-required::before {
+ top: 7px;
+ }
+ }
+ }
+ }
+
+ /* 标签列固定宽度(含必填星号占位):保证各选项输入框左边缘对齐、长度一致 */
+ &__field-label {
+ position: relative;
+ flex: 0 0 88px;
+ width: 88px;
+ padding-left: 10px;
+ box-sizing: border-box;
+ font-size: 12px;
+ line-height: 20px;
+ color: #606266;
+ text-align: left;
+
+ &.is-required::before {
+ content: '*';
+ position: absolute;
+ left: 0;
+ top: 0;
+ line-height: 20px;
+ color: #f56c6c;
+ }
+ }
+
+ &__field-control {
+ flex: 1;
+ min-width: 0;
+ }
+
+ &__field-tip {
+ margin: 4px 0 0;
+ font-size: 12px;
+ line-height: 18px;
+ color: #909399;
+ }
+
+ &__foot {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 12px;
+ padding: 16px;
+ }
+
+ &__hint {
+ font-size: 12px;
+ color: #909399;
+ }
+
+ &__actions {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+
+ :deep(.el-button) {
+ margin-left: 0;
+ margin-right: 0;
+ }
+ }
+}
+
+/* 面板内嵌 el-form-item:去掉默认间距,错误提示改回文档流内展示 */
+.task-panel__form {
+ :deep(.el-form-item) {
+ margin-bottom: 0;
+ }
+
+ :deep(.el-form-item__content) {
+ margin-left: 0;
+ line-height: 1.4;
+ }
+
+ :deep(.el-form-item__error) {
+ position: static;
+ padding-top: 4px;
+ }
+}
+
+
+
diff --git a/src/views/inbox/message/index.vue b/src/views/inbox/message/index.vue
index 1d606af7..da12633a 100644
--- a/src/views/inbox/message/index.vue
+++ b/src/views/inbox/message/index.vue
@@ -157,39 +157,108 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确认回信
-
+
+
+
+
+
+
+
+
+ 原消息 ID
+ {{ replyForm.parentId || '—' }}
+
+
+
+
+
+
+
+
扩展数据
+
+
+
随回信下发的扩展字段,需为合法 JSON(可留空)
+
+
+
+
+
+
+
+
+
@@ -640,4 +709,198 @@ onMounted(() => {
}
.thread-empty { text-align: center; padding: 40px; color: #909399; }
.empty-tip { color: #909399; font-size: 13px; padding: 16px; }
+
+/* 系统回信:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) */
+.task-panel {
+ background: #fff;
+ color: #303133;
+
+ &__head {
+ display: flex;
+ align-items: flex-start;
+ gap: 12px;
+ padding: 16px;
+ }
+
+ &__titles {
+ flex: 1;
+ min-width: 0;
+
+ h2 {
+ margin: 0;
+ font-size: 18px;
+ line-height: 24px;
+ font-weight: 400;
+ color: #303133;
+ }
+
+ p {
+ margin: 4px 0 0;
+ font-size: 12px;
+ line-height: 18px;
+ color: #909399;
+ }
+ }
+
+ &__close {
+ width: 24px;
+ height: 24px;
+ flex: none;
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ border: none;
+ border-radius: 4px;
+ background: transparent;
+ color: #909399;
+ cursor: pointer;
+ transition: color 0.2s;
+
+ svg {
+ width: 12px;
+ height: 12px;
+ }
+
+ &:hover {
+ color: #409eff;
+ }
+ }
+
+ &__body {
+ padding: 12px 16px 0;
+
+ /* 两个 JSON 文本域较高:超出 64vh 时面板内滚动 */
+ &--scroll {
+ max-height: 64vh;
+ overflow-y: auto;
+ }
+ }
+
+ &__form {
+ display: flex;
+ flex-direction: column;
+ gap: 8px;
+ }
+
+ &__field {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 16px;
+ min-height: 40px;
+ padding: 8px 12px;
+ border: 1px solid #ebeef5;
+ border-radius: 4px;
+ background: #fafafa;
+
+ /* 输入行:去掉灰色容器,与静态信息行区分 */
+ &--input {
+ align-items: flex-start;
+ min-height: 0;
+ padding: 4px 0 0 12px;
+ border: none;
+ border-radius: 0;
+ background: transparent;
+
+ .task-panel__field-label {
+ padding-top: 7px;
+ }
+ }
+
+ /* 多行文本行:标签与文本域顶部对齐 */
+ &--textarea {
+ padding-top: 8px;
+ }
+ }
+
+ &__field-label {
+ font-size: 12px;
+ line-height: 20px;
+ color: #606266;
+ flex-shrink: 0;
+
+ &.is-required::before {
+ content: '*';
+ color: #f56c6c;
+ margin-right: 4px;
+ }
+ }
+
+ &__field-value {
+ font-size: 13px;
+ font-weight: 500;
+ color: #303133;
+ text-align: right;
+ word-break: break-all;
+ }
+
+ &__field-control {
+ flex: 1;
+ min-width: 0;
+ }
+
+ &__field-tip {
+ margin: 4px 0 0;
+ font-size: 12px;
+ line-height: 18px;
+ color: #909399;
+ }
+
+ &__foot {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 12px;
+ padding: 16px;
+ }
+
+ &__hint {
+ font-size: 12px;
+ color: #909399;
+ }
+
+ &__actions {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+
+ :deep(.el-button) {
+ margin-left: 0;
+ margin-right: 0;
+ }
+ }
+}
+
+/* 面板内嵌 el-form-item:去掉默认间距,错误提示改回文档流内展示 */
+.task-panel__form {
+ :deep(.el-form-item) {
+ margin-bottom: 0;
+ }
+
+ :deep(.el-form-item__content) {
+ margin-left: 0;
+ line-height: 1.4;
+ }
+
+ :deep(.el-form-item__error) {
+ position: static;
+ padding-top: 4px;
+ }
+}
+
+
+
diff --git a/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue b/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue
index d37ddc5b..2017d7e1 100644
--- a/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue
+++ b/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue
@@ -61,8 +61,10 @@
- 取消
- 绑定
+
@@ -202,6 +204,18 @@ async function handleSubmit() {
diff --git a/src/views/order/orderManagement/component/SelectProductDialog.vue b/src/views/order/orderManagement/component/SelectProductDialog.vue
index 09594e1d..f4e1d6f4 100644
--- a/src/views/order/orderManagement/component/SelectProductDialog.vue
+++ b/src/views/order/orderManagement/component/SelectProductDialog.vue
@@ -106,8 +106,10 @@
- 取消
- 确定
+
@@ -517,6 +519,18 @@ function handleConfirm() {
diff --git a/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue b/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue
index dd875fb7..c504ebc4 100644
--- a/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue
+++ b/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue
@@ -58,9 +58,10 @@
-
+
子单号数量需为不小于 1 的整数,提交后按填写的数量为该订单分配子单号。
-
-->
+