diff --git a/src/api/pick/pick.ts b/src/api/pick/pick.ts index 5201270f..8dea9448 100644 --- a/src/api/pick/pick.ts +++ b/src/api/pick/pick.ts @@ -226,20 +226,65 @@ export type PickWaveClaimScanResponse = { waybill_no: string /** 波次下订单总数 */ total_order_count: number - /** 波次下拦截订单数(拦截订单跳过领料,其未打印/未领料状态不阻隔领料与拣货) */ + /** + * 波次下拦截订单数 + * + * 未打印的拦截订单**跳过领料**(其未打印/未领料状态不阻隔领料与拣货); + * 已打印(print_status=fin)的拦截订单面单实物已随波次流出,照常置为领料完成 + */ intercepted_order_count: number - /** 本次置为 fin 的订单数(已全部领单时返回 0) */ + /** 因处于拦截流程且未打印而**跳过领料**的订单数(本次未置 fin) */ + intercept_skipped_order_count: number + /** 本次置为 fin 的订单数(已全部领料时返回 0) */ claimed_order_count: number - /** 操作结果:claimed(整波领单完成)或 already_claimed(波次已领单) */ + /** 本次置为 fin 的**已打印拦截订单**数(已全部领料时返回本人已领的已打印拦截订单数) */ + claimed_intercepted_order_count: number + /** 操作结果:claimed(整波领料完成)或 already_claimed(波次已领料) */ status: string /** 提示文案 */ tip: string } -/** pick.waveClaimScan:扫描面单号领取整波(领单)。按面单号定位订单后反查波次,仅支持大团购(pick_mode=5)与非抓取散单(source=0)整波领单 */ +/** + * pick.waveClaimScan 失败(code≠1,如 400/404)时 `data` 携带的字段 + * + * · 「波次未打印,禁止领料」:wave_id / wave_no / unprinted_order_count / intercepted_order_count + * · 「该波次为抓取波次,无需领料」:no_claim_needed=true / wave_id / wave_no + */ +export type PickWaveClaimScanFailureData = { + /** 波次ID */ + wave_id?: number + /** 波次号 */ + wave_no?: string + /** 波次下未打印订单数(拦截订单除外) */ + unprinted_order_count?: number + /** 波次下拦截订单数 */ + intercepted_order_count?: number + /** 策略抓取波次(source=1/2)无需领料时为 true */ + no_claim_needed?: boolean +} + +/** + * pick.waveClaimScan:扫描面单号领取整波(领料) + * + * 按面单号(运单号)定位待处理订单后反查波次,仅**普通波次**(wms_wave_batch.source=0,含团购/散单)支持整波领料: + * 命中后把波次下全部未领单订单(未打印的拦截订单除外)claim_status 置 fin,并写 ORDER_WAVE_CLAIM 订单操作日志。 + * 失败场景(code≠1,`data` 见 PickWaveClaimScanFailureData): + * · 波次存在未打印订单(拦截订单除外)→ 400「波次未打印,禁止领料」 + * · 策略抓取波次(source=1/2)→ 400「该波次为抓取波次,无需领料」 + * · 面单号查不到订单或订单不在待处理表 → 404 + * 幂等:波次内订单已全部领料时返回 status=already_claimed(claimed_order_count=0), + * 并会在波次 claim_time 为空时补写一次领料时间。 + */ export function pickWaveClaimScan( data: PickWaveClaimScanParams -): Promise }> { +): Promise< + PickWaveClaimScanResponse & { + code?: number + message?: string + data?: Partial & PickWaveClaimScanFailureData + } +> { 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 1eeaabb8..28e26513 100644 --- a/src/api/stock.check/stock.check.ts +++ b/src/api/stock.check/stock.check.ts @@ -50,6 +50,8 @@ export type StockCheckEnvelope = { * report 为**覆盖式**上报——查重维度(同维度重复上报=更新已有记录,不新增): * 已知商品 detail_id + stock_id + location_code(唯一索引 uk_detail_stock_location 保证并发安全) * 未知商品 detail_id + stock_id IS NULL + barcode + location_code(应用层查重兜底) + * **库位一律以 `space_id`(wms_location_space.id)为准**(2026-10-26 文档):report 的 `space_id` **必传**, + * `location`(库位编码)降级为**仅做一致性校验**,服务端不再按编码猜库位;缺失报 400「缺少库位ID(space_id)」。 * 未传/为空的库位归入「无库位」分组(库中 location_code 存**空串** ''), * 而 recordList / result 返回时把空串归一为 **null**(对外口径); * **未知商品** = stock_id 未命中、按 barcode 也匹配不到系统商品 → 记录 stock_id=NULL + @@ -265,6 +267,8 @@ export type StockCheckDetailRow = { stock_id?: number | null /** 库位ID(wms_location_space.id;仅库位行有值) */ location_id?: number | null + /** `location_id` 的同义字段(文档:可直接回传 `stock.check.report` 的 `space_id`) */ + space_id?: number | null /** 库位编码(仅库位行有值) */ location_code?: string | null /** 商品编码(商品快照;库位行为 null) */ @@ -1309,10 +1313,22 @@ export type StockCheckReportParams = { /** 盘点明细ID */ detail_id: number /** - * 库位编码(可空): - * - 商品行(scope_type=goods):未传或为空串均写入「无库位」分组(库中 location_code 存空串) - * - 库位行(scope_type=location):以明细库位为准,**传入时必须与明细库位一致** - * 匹配 space_code 时回填 location_id + * **库位ID(wms_location_space.id)—— 必传**(2026-10-26 文档) + * + * 服务端一律以该 ID 为准落库,不再按库位编码猜库位:缺失/非法 → 400「缺少库位ID(space_id)」; + * 不存在 / 跨仓库 / 所属分区已删除 → 400「上报库位不存在、不属于当前仓库或所属分区已删除」。 + * + * 取值可直接回传接口行上的同义字段:明细行 `space_id` / `location_id`(两者同值); + * 兼容 `spaceId` / `location_id` / `locationId` 写法。 + */ + space_id: number + /** + * 库位编码(**可选,仅做一致性校验**;库位一律以 `space_id` 为准): + * - 商品行(scope_type=goods):传入时必须与 `space_id` 对应库位编码一致, + * 否则 400「上报库位编码与库位ID不一致」 + * - 库位行(scope_type=location):传入时必须与明细库位一致, + * 否则 400「上报库位与盘点明细库位不一致」 + * - 不传时按 `space_id` 对应库位编码落库 */ location?: string /** @@ -1368,6 +1384,7 @@ export type StockCheckReportResponse = { * stock.check.report:盘点作业**覆盖式**上报(同明细 + 同商品 + 同库位重复上报更新已有记录)。 * * 仅 approved/checking 允许;主表 approved 首次上报自动转 checking; + * **库位以 `space_id` 为准(必传)**,`location` 仅做一致性校验(见 StockCheckReportParams); * 主表 start_time 为空时以本次明细写入时间补写(= 盘点开始时间); * 未知商品(stock_id 与 barcode 至少传一项):仅传 barcode 时先按条码匹配系统商品, * 命中回填 stock_id 走已知商品逻辑,未命中记为未知商品(stock_id=NULL)。 diff --git a/src/views/data/packingflow/index.vue b/src/views/data/packingflow/index.vue index 92cc88f8..ed103785 100644 --- a/src/views/data/packingflow/index.vue +++ b/src/views/data/packingflow/index.vue @@ -285,40 +285,82 @@ :video="playingVideo" /> - + - - - {{ operatingRow?.id ?? '—' }} - - - - {{ statusLabel(operatingRow?.status) }} - - - - - - - +
+
+
+

设置结束时间

+

提交后将覆盖该打包任务的结束时间

+
+ +
+ +
+
+
+ 任务 ID + {{ operatingRow?.id ?? '—' }} +
+
+ 当前状态 + + + {{ statusLabel(operatingRow?.status) }} + + +
+
+ 开始时间 + + {{ dayjs(operatingRow.start_time).format('YYYY-MM-DD HH:mm:ss') }} + +
+
+ 结束时间 +
+ +

结束时间不宜早于开始时间,建议与录制实际结束时刻保持一致

+
+
+
+
+ +
+ 提交后不可撤销,请确认时间无误 +
+ 取消 + + 确定 + +
+
+
@@ -974,4 +1016,170 @@ onMounted(() => { font-size: 12px; color: #f56c6c; } + +/* 设置结束时间:面板结构 / 尺寸对齐「批量修改平台信息」(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; + } + } + } + + &__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; + } + } +} + + + diff --git a/src/views/data/returnrecord/components/ReturnReceivedTaskPanel.vue b/src/views/data/returnrecord/components/ReturnReceivedTaskPanel.vue index 3e672c66..d720de0a 100644 --- a/src/views/data/returnrecord/components/ReturnReceivedTaskPanel.vue +++ b/src/views/data/returnrecord/components/ReturnReceivedTaskPanel.vue @@ -99,30 +99,62 @@ - + - - - - - - +
+
+
+

新建退回收件任务

+

创建后可对任务登记收件信息

+
+ +
+ +
+
+
+ 标题 +
+ + +
+
+
+
+ +
+ 标题最多 100 个字符 +
+ 取消 + 确定 +
+
+
@@ -440,7 +472,13 @@ async function handleBatchDelete() { await ElMessageBox.confirm( `确认批量删除选中的 ${ids.length} 个任务?删除后不可恢复。`, '批量删除确认', - { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' } + { + type: 'warning', + confirmButtonText: '删除', + cancelButtonText: '取消', + // 按钮尺寸对齐「批量修改平台信息」表单底部按钮(Element Plus small) + buttonSize: 'small' + } ) } catch { return @@ -509,7 +547,13 @@ async function handleDeleteTask(row: any) { await ElMessageBox.confirm( `确认删除任务「${row?.title || row?.batch_no || id}」?删除后不可恢复。`, '删除确认', - { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' } + { + type: 'warning', + confirmButtonText: '删除', + cancelButtonText: '取消', + // 按钮尺寸对齐「批量修改平台信息」表单底部按钮(Element Plus small) + buttonSize: 'small' + } ) } catch { return @@ -577,4 +621,179 @@ onMounted(() => { 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; + } + + &__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; + } + } + } + + &__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; + } + + /* 按钮尺寸显式对齐「批量修改平台信息」(UpdateOrderMetaForm):Element Plus small 规格 */ + :deep(.el-button--small) { + height: 24px; + min-height: 24px; + padding: 5px 11px; + font-size: 12px; + border-radius: 4px; + } + } +} + + + diff --git a/src/views/express/returnReceived/index.vue b/src/views/express/returnReceived/index.vue index 4efc2d4c..7c6bb198 100644 --- a/src/views/express/returnReceived/index.vue +++ b/src/views/express/returnReceived/index.vue @@ -581,7 +581,13 @@ async function handleDelete(row: any) { await ElMessageBox.confirm( `确认删除登记记录「${row.waybill_code}」?删除后不可恢复。`, '删除确认', - { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' } + { + type: 'warning', + confirmButtonText: '删除', + cancelButtonText: '取消', + // 按钮尺寸对齐「批量修改平台信息」表单底部按钮(Element Plus small) + buttonSize: 'small' + } ) } catch { return diff --git a/src/views/express/returnUnpack/index.vue b/src/views/express/returnUnpack/index.vue index 0579cdf6..63a0a028 100644 --- a/src/views/express/returnUnpack/index.vue +++ b/src/views/express/returnUnpack/index.vue @@ -994,6 +994,8 @@ async function openForceRecordDialog(row: any) { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', + // 按钮尺寸对齐「批量修改平台信息」表单底部按钮(Element Plus small) + buttonSize: 'small', } ) await doForceRecord() diff --git a/src/views/express/returnUnpackwork/index.vue b/src/views/express/returnUnpackwork/index.vue index 1e019ae0..45c87a9d 100644 --- a/src/views/express/returnUnpackwork/index.vue +++ b/src/views/express/returnUnpackwork/index.vue @@ -486,8 +486,8 @@ @@ -529,8 +529,8 @@ @@ -544,8 +544,8 @@ >
确认取消拆包单?取消将硬删除该单及全部明细,不可恢复。
@@ -559,8 +559,8 @@ >
确认提交拆包单?提交后转为已完成终态,不可再录/移除明细。
@@ -574,8 +574,8 @@ >
确认删除拆包单?删除为物理删除(含全部明细),不可恢复。
@@ -589,8 +589,8 @@ >
确认移除该明细(明细ID {{ removeDetailRow?.id ?? '-' }})?移除为物理删除,不可恢复。
diff --git a/src/views/express/returnwaybill/index.vue b/src/views/express/returnwaybill/index.vue index 7657b033..0a670e17 100644 --- a/src/views/express/returnwaybill/index.vue +++ b/src/views/express/returnwaybill/index.vue @@ -168,34 +168,93 @@ - - - - - - - - - - - - - - - - + + +
+
+
+

编辑未退登记

+

保存后将直接更新该登记记录

+
+ +
+ +
+
+
+ 运单号 +
+ +

运单号不能为空,用于匹配对应的退回运单

+
+
+
+ 货主 +
+ + + +
+
+
+ 备注 +
+ +
+
+
+
+ +
+ 提交前请确认运单号与货主无误 +
+ 取消 + 确定 +
+
+
@@ -601,7 +660,13 @@ async function handleDelete(row: any) { await ElMessageBox.confirm( `确认删除登记记录「${row.waybill_code}」?删除为物理删除,不可恢复。`, '删除确认', - { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' } + { + type: 'warning', + confirmButtonText: '删除', + cancelButtonText: '取消', + // 按钮尺寸对齐「批量修改平台信息」表单底部按钮(Element Plus small) + buttonSize: 'small' + } ) } catch { return @@ -668,7 +733,174 @@ onMounted(() => { } } -.full-width { - width: 100%; +/* 编辑未退登记:面板结构 / 尺寸对齐「批量修改平台信息」(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; + } + } +} + + + diff --git a/src/views/order/orderManagement/component/SelectProductDialog.vue b/src/views/order/orderManagement/component/SelectProductDialog.vue index 0f424d10..09594e1d 100644 --- a/src/views/order/orderManagement/component/SelectProductDialog.vue +++ b/src/views/order/orderManagement/component/SelectProductDialog.vue @@ -12,7 +12,7 @@ 货主 ID:{{ storeId }} 全部货主 组合搜索已展开为子商品 - 已选 {{ localSelectedItems.length }} 个 + 已选 {{ localSelectedItems.length }} 个
@@ -22,6 +22,7 @@ 查询 - 默认计划数量 - +
+ 默认计划数量 + +
- - - - + + + + @@ -72,16 +77,27 @@
-
已选商品
+
+ 已选商品({{ localSelectedItems.length }}) + + 清空 + +
- - - + + + - + @@ -427,6 +443,17 @@ function removeSelectedItem(itemCode: string) { }) } +/** 清空已选商品,并同步取消表格勾选 */ +function clearSelectedItems() { + if (!localSelectedItems.value.length) return + localSelectedItems.value = [] + syncingSelection.value = true + void syncSelectionFromLocal().finally(async () => { + await nextTick() + syncingSelection.value = false + }) +} + function handleSearchModeChange() { pagination.currentPage = 1 keyword.value = '' @@ -492,7 +519,8 @@ function handleConfirm() { diff --git a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue index 9be2cd8a..ade8212e 100644 --- a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue +++ b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue @@ -24,7 +24,7 @@ > - - - - - - - - - - - + +
+ 重置后请及时告知使用人新密码 +
+ 取消 + 确认重置 +
+
+
@@ -918,70 +1035,30 @@ const handleUnbindWechat = (row: any) => { color: #909399; } -.form-section { - margin-bottom: 20px; - padding: 24px; - border: 1px solid var(--el-border-color-lighter); - border-radius: 8px; - background-color: var(--el-fill-color-blank); - box-shadow: 0 2px 12px 0 rgba(0,0,0,0.05); - height: 100%; - - &.no-shadow { - box-shadow: none; - border: none; - padding: 20px 0; +/* 工号表单页签:与面板紧凑间距对齐 */ +.account-form-tabs { + :deep(.el-tabs__header) { + margin-bottom: 8px; } - .section-title { - font-size: 16px; - font-weight: 600; - color: var(--el-text-color-primary); - margin-bottom: 24px; - padding-bottom: 12px; - border-bottom: 1px solid var(--el-border-color-lighter); - display: flex; - align-items: center; - gap: 8px; + :deep(.el-tabs__nav-wrap::after) { + display: none; + } - .el-icon { - color: var(--el-color-primary); - } + /* 新增态只有一个页签:隐藏页签头,直接展示基本信息 */ + &.is-single :deep(.el-tabs__header) { + display: none; } } -.avatar-upload-wrapper { +/* 工号头像页签:紧凑卡片容器(ImagesUpload 内部依赖 100% 高度) */ +.avatar-upload-panel { + height: 520px; + min-height: 0; background: #fff; - min-height: 400px; + border: 1px solid #ebeef5; border-radius: 4px; overflow: hidden; - border: 1px dashed var(--el-border-color); - margin-bottom: 12px; - - &.full-width { - min-height: 500px; - } -} - -.upload-tip { - font-size: 12px; - color: var(--el-text-color-secondary); - text-align: center; -} - -.custom-form { - :deep(.el-form-item__label) { - font-weight: 600; - padding-bottom: 4px; - } -} - -:deep(.account-dialog) { - .el-dialog__body { - padding: 16px 20px 8px; - max-height: 70vh; - overflow-y: auto; - } } .bind-wechat-body { @@ -1060,5 +1137,205 @@ const handleUnbindWechat = (row: any) => { } } +/* ================================================================ + 重置密码:面板结构 / 尺寸对齐「批量修改平台信息」(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; + + /* 字段 / 头像页签较多:超出 70vh 时面板内滚动 */ + &--scroll { + max-height: 70vh; + overflow-y: auto; + } + } + + &__form-tip { + margin: 8px 0 0; + padding: 8px 12px; + border-radius: 4px; + background: #f4f4f5; + font-size: 12px; + line-height: 18px; + color: #909399; + } + + &__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; + } + } + } + + &__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; + } +} + + + \ No newline at end of file diff --git a/src/views/system/setting/encoding/components/CourierCodeManagement.vue b/src/views/system/setting/encoding/components/CourierCodeManagement.vue index 72d5df91..300546e8 100644 --- a/src/views/system/setting/encoding/components/CourierCodeManagement.vue +++ b/src/views/system/setting/encoding/components/CourierCodeManagement.vue @@ -69,46 +69,98 @@ + - - - - - - - - - +
+
+

{{ dialogMode === 'create' ? '新增快递编码' : '编辑快递编码' }}

+

{{ dialogMode === 'create' ? '填写业务编码并选择对应快递公司' : '业务编码创建后不可修改' }}

+
+ +
+ +
+ +
+ 业务编码 +
+ + + +

+ {{ dialogMode === 'edit' + ? '业务编码创建后不可修改' + : '业务编码用于对接快递接口,建议使用「快递编码.业务」格式' }} +

+
+
+ +
+ 业务名称 +
+ + + +
+
+ +
+ 快递公司 +
+ + + + + +
+
+
+
+ +
+ 提交后该编码将用于快递下单与面单打印 +
+ 取消 + 保存 +
+
+
@@ -549,4 +601,179 @@ onMounted(async () => { height: 20px; } } + +/* 新增 / 编辑快递编码:面板结构 / 尺寸对齐「批量修改平台信息」(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; + } + } + } + + &__field-label { + font-size: 12px; + line-height: 20px; + color: #606266; + flex-shrink: 0; + + &.is-required::before { + content: '*'; + color: #f56c6c; + margin-right: 4px; + } + } + + &__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/system/setting/encoding/components/PlatformCodeManagement.vue b/src/views/system/setting/encoding/components/PlatformCodeManagement.vue index b9efc373..045346fd 100644 --- a/src/views/system/setting/encoding/components/PlatformCodeManagement.vue +++ b/src/views/system/setting/encoding/components/PlatformCodeManagement.vue @@ -59,41 +59,88 @@ + - - - - - - - - - +
+
+

{{ dialogMode === 'create' ? '新增平台编码' : '编辑平台编码' }}

+

{{ dialogMode === 'create' ? '填写业务编码并选择对应平台' : '修改后立即生效' }}

+
+ +
+ +
+ +
+ 业务编码 +
+ + + +

业务编码用于对接平台接口,建议使用平台简称缩写

+
+
+ +
+ 业务名称 +
+ + + +
+
+ +
+ 平台 +
+ + + + + +
+
+
+
+ +
+ 提交后该编码将用于平台订单同步 +
+ 取消 + 保存 +
+
+
@@ -422,4 +469,179 @@ onMounted(async () => { height: 20px; } } + +/* 新增 / 编辑平台编码:面板结构 / 尺寸对齐「批量修改平台信息」(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; + } + } + } + + &__field-label { + font-size: 12px; + line-height: 20px; + color: #606266; + flex-shrink: 0; + + &.is-required::before { + content: '*'; + color: #f56c6c; + margin-right: 4px; + } + } + + &__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/system/setting/pickcart/index.vue b/src/views/system/setting/pickcart/index.vue index d1c70c20..cca3fdc4 100644 --- a/src/views/system/setting/pickcart/index.vue +++ b/src/views/system/setting/pickcart/index.vue @@ -106,187 +106,390 @@ - + - - - - - - - - - - 启用 - 停用 - - - - {{ codeCheckHint.text }} - - - - +
+
+
+

{{ dialogMode === 'create' ? '新增拣货车' : '编辑拣货车' }}

+

{{ dialogMode === 'create' ? '拣货车编码在当前仓库内需要唯一' : '修改后保存立即生效' }}

+
+ +
- - - - - - - -
- - {{ scanResult.cart_id }} - {{ scanResult.cart_code }} - {{ scanResult.cart_name || '--' }} - - - {{ formatPickCartStatus(scanResult.status).text }} - - - - {{ scanResult.current_task_no || scanResult.current_task_id || '未绑定' }} - - +
+ +
+ 拣货车编码 +
+ + + +

+ {{ codeCheckHint.text }} +

+

支持扫码枪直接录入,编码在当前仓库内不可重复

+
+
+ +
+ 名称 +
+ + + +
+
+ +
+ 状态 + + 启用 + 停用 + +
+
+
+ +
+ 提交前请确认编码与状态无误 +
+ 取消 + 保存 +
+
-
- + + +
+
+
+

扫码查询拣货车

+

输入或扫描编码后回车查询拣货车信息

+
+ +
+ +
+
+
+ 拣货车编码 +
+ +

支持扫码枪直接录入,回车或点「查询」开始查找

+
+
+
+ +
+ + {{ scanResult.cart_id }} + {{ scanResult.cart_code }} + {{ scanResult.cart_name || '--' }} + + + {{ formatPickCartStatus(scanResult.status).text }} + + + + {{ scanResult.current_task_no || scanResult.current_task_id || '未绑定' }} + + +
+
+ +
+ 查询结果仅展示基本信息 +
+ 关闭 + 查询 +
+
+
+
+ + - -
拣货车编码
- - - - -
- - - - 至 - - - +
+
+
+

批量新增拣货车

+

按编码前缀与数字范围批量生成拣货车

- - - - - - 位数 {{ batchForm.code.pad_width }},不足时左侧补 0 - - + +
- +
+ +
拣货车编码
-
拣货车名称
- - - - - - 前缀(如:拣货车01) - 后缀(如:01拣货车) - - +
+ 编码前缀 +
+ + + +
+
- +
+ 数字范围 +
+
+ + + + 至 + + + +
+
+
- - - 启用 - 停用 - - - -
-
将生成 {{ batchPreviewCount }} 条拣货车
- + 数字补零 +
+
+ + + + 位数 {{ batchForm.code.pad_width }},不足时左侧补 0 + +
+
+
+ +
拣货车名称
+ +
+ 名称前缀 +
+ +
+
+ +
+ 位置 +
+ + 前缀(如:拣货车01) + 后缀(如:01拣货车) + +
+
+ +
+ 状态 + + 启用 + 停用 + +
+ +
生成预览
+
+
将生成 {{ batchPreviewCount }} 条拣货车
+ + + + + + 请完善编码前缀与数字范围 +
+
+
+ +
+ 确认后按预览结果批量创建 +
+ 取消 + - - - - - 请完善编码前缀与数字范围 + 确认新增 +
- - - +
+
- + - - - - - - - - - +
+
+
+

绑定拣货任务

+

将拣货车与拣货任务建立绑定关系

+
+ +
+ +
+ +
+ 拣货车 + {{ bindForm.cartLabel || '—' }} +
+ +
+ 任务 ID +
+ + + +
+
+
+ +

若任务已绑定其他拣货车将自动改绑;目标拣货车已绑定其他活动任务时将返回冲突。 - - - - +

+
+ +
+ 提交前请确认任务 ID 无误 +
+ 取消 + 确认绑定 +
+
+
@@ -1004,27 +1207,22 @@ onMounted(() => { margin-bottom: 0; } +.batch-inline-row { + display: flex; + align-items: center; + gap: 8px; + flex-wrap: wrap; +} + .batch-range-sep { color: #606266; font-size: 13px; } .batch-pad-width { - margin-left: 12px; width: 120px; } -.batch-pad-hint { - margin-left: 8px; -} - -.batch-section-title { - margin: 4px 0 10px; - font-size: 14px; - font-weight: 600; - color: #303133; -} - .batch-preview { width: 100%; font-size: 13px; @@ -1035,4 +1233,237 @@ onMounted(() => { .batch-preview-table { margin-top: 8px; } + +/* 新增/编辑拣货车:面板结构 / 尺寸对齐「批量修改平台信息」(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; + + /* 字段较多:超出 64vh 时面板内滚动 */ + &--scroll { + max-height: 64vh; + overflow-y: auto; + } + } + + /* 分组标题(批量新增用) */ + &__section-title { + font-size: 13px; + font-weight: 600; + line-height: 20px; + color: #303133; + + &.is-spaced { + margin-top: 8px; + } + } + + &__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; + } + } + } + + &__field-label { + font-size: 12px; + line-height: 20px; + color: #606266; + flex-shrink: 0; + + &.is-required::before { + content: '*'; + color: #f56c6c; + margin-right: 4px; + } + } + + &__field-control { + flex: 1; + min-width: 0; + } + + /* 静态信息行的值(如:拣货车名称) */ + &__field-value { + font-size: 13px; + font-weight: 500; + color: #303133; + text-align: right; + word-break: break-all; + } + + /* 灰色提示块 */ + &__form-tip { + margin: 8px 0 0; + padding: 8px 12px; + border-radius: 4px; + background: #f4f4f5; + font-size: 12px; + line-height: 18px; + color: #909399; + } + + &__field-tip { + margin: 4px 0 0; + font-size: 12px; + line-height: 18px; + color: #909399; + + /* 编码查重结果提示(对齐 el-text 的语义色) */ + &.is-success { + color: #67c23a; + } + + &.is-warning { + color: #e6a23c; + } + + &.is-danger { + color: #f56c6c; + } + + &.is-info { + 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/system/setting/printcomputer/index.vue b/src/views/system/setting/printcomputer/index.vue index 2d38e012..9a5cf285 100644 --- a/src/views/system/setting/printcomputer/index.vue +++ b/src/views/system/setting/printcomputer/index.vue @@ -228,42 +228,106 @@
- + - - - - - +
+
+
+

{{ dialogTitle }}

+

{{ dialogMode === 'edit' ? '修改后保存立即生效' : '设置录制文件大小上限与保存目录' }}

+
+ +
+ +
+ + + + + +
+ +
+ 提交前请确认参数无误 +
+ 取消 + + {{ dialogMode === 'edit' ? '保存' : '设置录制' }} + +
+
+
@@ -291,6 +355,7 @@ import { tabPages, resolveTabConfig, getTabToolbarButtons, + translate, type TabPageConfig, type DetailTabConfig, type ToolbarButtonConfig, @@ -1005,4 +1070,195 @@ onMounted(() => { font-size: 13px; color: #909399; } + +/* ================================================================ + 8. 编辑打印电脑 / 设置录制:面板结构对齐「批量修改平台信息」 + ================================================================ */ +.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:not(:disabled) { + color: #409eff; + } + + &:disabled { + cursor: not-allowed; + opacity: 0.6; + } + } + + &__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; + } + } + } + + &__field-label { + font-size: 12px; + line-height: 20px; + color: #606266; + flex-shrink: 0; + + &.is-required::before { + content: '*'; + color: #f56c6c; + margin-right: 4px; + } + } + + &__field-control { + flex: 1; + min-width: 0; + } + + /* 静态信息行的值(目标电脑 / 录制状态) */ + &__field-value { + font-size: 13px; + font-weight: 500; + color: #303133; + text-align: right; + word-break: break-all; + } + + &__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; + } + } +} + +/* 录制大小:数值 + 单位同行 */ +.recording-size-row { + display: flex; + align-items: center; + gap: 8px; +} + +.recording-size-input { + flex: 1; + min-width: 0; +} + +.recording-size-unit { + width: 100px; + flex: none; +} + + + diff --git a/src/views/system/setting/shops/index.vue b/src/views/system/setting/shops/index.vue index 52d35e4f..fbc7d924 100644 --- a/src/views/system/setting/shops/index.vue +++ b/src/views/system/setting/shops/index.vue @@ -97,104 +97,215 @@ + - - - +
+
+

{{ dialogMode === 'create' ? '新增店铺' : '编辑店铺' }}

+

+ {{ dialogMode === 'create' + ? '新增后需完成平台授权才能同步店铺数据' + : '修改后需重新授权才能同步平台数据' }} +

+
+ +
+ +
+ +
+ 平台 +
+ + + + + +
+
+ +
+ 自定义名称 +
+ + + +
+
+ + +
+ 平台真实店铺名 +
+ + + +

+ 平台真实店铺名在同一仓库同一平台下不可重复,修改后需重新授权才能同步平台数据 +

+
+
+
+ +

店铺名称由服务端生成待授权占位名,完成平台授权后将自动同步真实店铺名。 - - - - +

+
+ +
+ 提交前请确认平台与店铺名无误 +
+ 取消 + 保存 +
+
+
+ - - - - - - - - - - 去授权 - - - - - - - - - - - - +
+
+
+

店铺授权

+

按平台要求完成授权,完成后自动同步店铺数据

+
+ +
+ +
+ +
+ 店铺 + {{ authForm.shopLabel || '—' }} +
+
+ 平台 + {{ authForm.platform_name || authForm.platformCode || '—' }} +
+
+ 授权 +
+ + 去授权 + +

跳转平台授权页完成授权后,回到本窗口填写下方参数

+
+
+ +
+ 回调地址 +
+ + + +
+
+ + + +
+ VenderID +
+ + + +
+
+
+
+ +
+ 确认授权后将重新拉取平台店铺数据 +
+ 取消 + + 确认授权 + +
+
+
@@ -811,4 +922,189 @@ onMounted(async () => { color: #c0c4cc; } +/* 新增 / 编辑店铺:面板结构 / 尺寸对齐「批量修改平台信息」(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; + } + } + } + + &__field-label { + font-size: 12px; + line-height: 20px; + color: #606266; + flex-shrink: 0; + + &.is-required::before { + content: '*'; + color: #f56c6c; + margin-right: 4px; + } + } + + &__field-control { + flex: 1; + min-width: 0; + } + + &__field-tip { + margin: 4px 0 0; + font-size: 12px; + line-height: 18px; + color: #909399; + } + + &__form-tip { + margin: 8px 0 0; + padding: 8px 12px; + border-radius: 4px; + background: #f4f4f5; + 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/system/setting/workbench2/index.vue b/src/views/system/setting/workbench2/index.vue index c5bbd96e..8a9750a7 100644 --- a/src/views/system/setting/workbench2/index.vue +++ b/src/views/system/setting/workbench2/index.vue @@ -248,46 +248,111 @@ - + - - - - - - - - - {{ barcodeCheckHint.text }} - - - - 启用 - 禁用 - - - - - - - +
+
+
+

{{ dialogMode === 'create' ? '新增工作台' : '编辑工作台' }}

+

{{ dialogMode === 'create' ? '创建后系统自动生成登录码' : '修改后保存立即生效' }}

+
+ +
+ +
+ +
+ 名称 +
+ + + +
+
+ +
+ 条码 +
+ + + +

+ {{ barcodeCheckHint.text }} +

+

用于扫码定位工作台,留空则不启用条码

+
+
+ +
+ 状态 + + 启用 + 禁用 + +
+ +
+ 备注 +
+ +
+
+
+
+ +
+ 提交前请确认名称与状态无误 +
+ 取消 + 保存 +
+
+
@@ -403,37 +468,74 @@ - + - - - - - - -
- 绑定码由工作台设备端生成并显示(6 位大写字母/数字)。确认绑定后,设备端将自动获取访问令牌,原工作台令牌失效。 +
+
+
+

绑定工作台

+

输入设备端显示的工作台绑定码完成关联

- - - + +
+ +
+ +
+ 目标工作台 + {{ bindTargetDesc || '—' }} +
+ +
+ 绑定码 +
+ + + +

绑定码为 6 位大写字母/数字,由工作台设备端生成并显示

+
+
+
+ +

+ 确认绑定后,设备端将自动获取访问令牌,原工作台令牌失效。 +

+
+ +
+ 绑定码区分大小写,请核对后再提交 +
+ 取消 + 确认绑定 +
+
+
@@ -1723,14 +1825,7 @@ onMounted(() => { color: #909399; } -// ─── 绑定工作台 / 重置登录码弹窗 ───────────────────────────────────────────── -.field-tip { - margin-top: 6px; - font-size: 12px; - line-height: 1.6; - color: #909399; -} - +// ─── 重置登录码弹窗 ───────────────────────────────────────────────────────── .reset-login-code-body { .reset-target { margin-top: 16px; @@ -1806,4 +1901,222 @@ onMounted(() => { .login-code-empty { color: #909399; } + +/* 新增 / 编辑工作台:面板结构 / 尺寸对齐「批量修改平台信息」(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; + } + + /* 灰色提示块 */ + &__form-tip { + margin: 8px 0 0; + padding: 8px 12px; + border-radius: 4px; + background: #f4f4f5; + font-size: 12px; + line-height: 18px; + color: #909399; + } + + &__field-control { + flex: 1; + min-width: 0; + } + + &__field-tip { + margin: 4px 0 0; + font-size: 12px; + line-height: 18px; + color: #909399; + + /* 条码查重结果提示(对齐 el-text 的语义色) */ + &.is-success { + color: #67c23a; + } + + &.is-warning { + color: #e6a23c; + } + + &.is-danger { + color: #f56c6c; + } + + &.is-info { + 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/video/newcamara/components/CameraPreviewDialog.vue b/src/views/video/newcamara/components/CameraPreviewDialog.vue index 12f4111d..9fd45671 100644 --- a/src/views/video/newcamara/components/CameraPreviewDialog.vue +++ b/src/views/video/newcamara/components/CameraPreviewDialog.vue @@ -52,8 +52,8 @@
diff --git a/src/views/video/newcamara/components/OperationCellRenderer.vue b/src/views/video/newcamara/components/OperationCellRenderer.vue index 57218b86..41207e74 100644 --- a/src/views/video/newcamara/components/OperationCellRenderer.vue +++ b/src/views/video/newcamara/components/OperationCellRenderer.vue @@ -102,7 +102,9 @@ async function handleActionClick(btn: OperationButtonConfig) { { confirmButtonText: btn.confirmButtonText || '确定', cancelButtonText: '取消', - type: (btn.confirmType || 'warning') as any + type: (btn.confirmType || 'warning') as any, + // 按钮尺寸对齐面板表单底部按钮(Element Plus small) + buttonSize: 'small' } ) } catch { diff --git a/src/views/video/newcamara/index.vue b/src/views/video/newcamara/index.vue index de48db65..b6344e12 100644 --- a/src/views/video/newcamara/index.vue +++ b/src/views/video/newcamara/index.vue @@ -304,8 +304,8 @@
当前坐标:({{ osdForm.x.toFixed(1) }}, {{ osdForm.y.toFixed(1) }})
@@ -634,7 +634,11 @@ async function handleDeleteCamera(row: Record) { if (!row.id) return const name = row.custom_name || row.channel_name || String(row.id) try { - await ElMessageBox.confirm(`确认删除摄像头「${name}」吗?`, '提示', { type: 'warning' }) + await ElMessageBox.confirm(`确认删除摄像头「${name}」吗?`, '提示', { + type: 'warning', + // 按钮尺寸对齐面板表单底部按钮(Element Plus small) + buttonSize: 'small' + }) } catch { return } diff --git a/src/views/video/newcamaraserver/components/OperationCellRenderer.vue b/src/views/video/newcamaraserver/components/OperationCellRenderer.vue index 5b49af9f..2294c1b4 100644 --- a/src/views/video/newcamaraserver/components/OperationCellRenderer.vue +++ b/src/views/video/newcamaraserver/components/OperationCellRenderer.vue @@ -94,7 +94,9 @@ async function handleActionClick(btn: OperationButtonConfig) { { confirmButtonText: btn.confirmButtonText || '确定', cancelButtonText: '取消', - type: (btn.confirmType || 'warning') as any + type: (btn.confirmType || 'warning') as any, + // 按钮尺寸对齐面板表单底部按钮(Element Plus small) + buttonSize: 'small' } ) } catch { diff --git a/src/views/video/newcamaraserver/index.vue b/src/views/video/newcamaraserver/index.vue index c307a064..63cc9c7e 100644 --- a/src/views/video/newcamaraserver/index.vue +++ b/src/views/video/newcamaraserver/index.vue @@ -288,7 +288,11 @@ async function handleDeleteServer(row: Record) { if (!row.id) return const name = row.name || String(row.id) try { - await ElMessageBox.confirm(`确认删除录像服务器「${name}」吗?删除后关联的摄像头将不可用`, '提示', { type: 'warning' }) + await ElMessageBox.confirm(`确认删除录像服务器「${name}」吗?删除后关联的摄像头将不可用`, '提示', { + type: 'warning', + // 按钮尺寸对齐面板表单底部按钮(Element Plus small) + buttonSize: 'small' + }) } catch { return } try { const res: any = await del({ id: row.id }) @@ -322,7 +326,12 @@ async function handleTestConnection(row: Record) { if (!password) { try { const { value } = await ElMessageBox.prompt('请输入录像服务器密码', '连通测试', { - inputType: 'password', confirmButtonText: '开始测试', cancelButtonText: '取消', inputPlaceholder: '请输入密码' + inputType: 'password', + confirmButtonText: '开始测试', + cancelButtonText: '取消', + inputPlaceholder: '请输入密码', + // 按钮尺寸对齐面板表单底部按钮(Element Plus small) + buttonSize: 'small' }) if (!value?.trim()) { ElMessage.warning('密码不能为空'); return } password = value.trim() diff --git a/src/views/video/newcamaraserver/pages/ServerFormDialog.vue b/src/views/video/newcamaraserver/pages/ServerFormDialog.vue index 412ac8fc..95ac2083 100644 --- a/src/views/video/newcamaraserver/pages/ServerFormDialog.vue +++ b/src/views/video/newcamaraserver/pages/ServerFormDialog.vue @@ -1,58 +1,153 @@ @@ -197,12 +292,174 @@ async function submitForm() { + + diff --git a/src/views/warehouses/index.vue b/src/views/warehouses/index.vue index 6227f5d2..7cb7a9d9 100644 --- a/src/views/warehouses/index.vue +++ b/src/views/warehouses/index.vue @@ -259,105 +259,136 @@ - + - +
+
+
+

{{ signDialog.title }}

+

{{ signSubtitle }}

+
+ +
- - +
- + +
+ {{ signFooterHint }} +
+ + + + +
+
+
@@ -430,6 +461,70 @@ + + +
+
+
+

修改备注

+

提交后立即更新该签约仓库的备注名

+
+ +
+ +
+
+
+ 签约仓库 + {{ renameRow?.counterparty_name || '—' }} +
+
+ 仓库 ID + {{ renameRow?.warehouse_id ?? '—' }} +
+
+ 备注名 +
+ +

备注名用于区分同名仓库,不能为空

+
+
+
+
+ +
+ 提交后立即生效,请确认备注名无误 +
+ 取消 + 确定 +
+
+
+
+ (null) +const renameForm = reactive({ remask: '' }) + +/** 打开修改备注面板(替代原 ElMessageBox.prompt,样式对齐批量修改信息表单) */ +function handleRename(row: any) { + renameRow.value = row + renameForm.remask = String(row?.remask ?? '') + renameVisible.value = true +} + +async function submitRename() { + if (renameLoading.value) return + const id = Number(renameRow.value?.id) + if (!Number.isInteger(id) || id <= 0) { + ElMessage.warning('缺少仓库 ID') + return + } + const remask = renameForm.remask.trim() + if (!remask) { + ElMessage.warning('请输入新的备注名') + return + } + renameLoading.value = true try { - const { value } = await ElMessageBox.prompt('请输入新的备注名', '修改备注', { - confirmButtonText: '确定', - cancelButtonText: '取消', - inputValue: row.remask || '', - buttonSize: 'small' - }) - if (value != null) { - await storeWarehouseRename({ id: row.id, remask: value }) - ElMessage.success('备注修改成功') - loadList() - } + await storeWarehouseRename({ id, remask }) + ElMessage.success('备注修改成功') + renameVisible.value = false + loadList() } catch { - // 用户取消 + // 请求层已提示错误 + } finally { + renameLoading.value = false } } @@ -833,6 +947,20 @@ const signForm = reactive({ counterparty_id: undefined as number | undefined }) +/** 发起签约面板副标题(按步骤 / 结果态变化) */ +const signSubtitle = computed(() => { + if (signDialog.step === 1) return '填写对方主体 ID 后预览双方的签约信息' + if (signDialog.signMode === 'preview') return '请确认双方主体信息,确认无误后提交' + return '签约结果如下,可关闭窗口' +}) + +/** 发起签约面板页脚提示 */ +const signFooterHint = computed(() => { + if (signDialog.step === 1) return '对方主体 ID 为仓库方的主体编号' + if (signDialog.signMode === 'preview') return '确认提交后将等待对方确认' + return '签约状态已更新' +}) + function openSignDialog() { signDialog.visible = true signDialog.step = 1 @@ -1270,4 +1398,171 @@ onMounted(() => { flex: 1; } } + +/* 修改备注:面板结构 / 尺寸对齐「批量修改平台信息」(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; + } + } + } + + &__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; + } + } +} + + +