refactor: update dialog components for consistent styling and button sizes

- Adjusted button sizes in CameraPreviewDialog and OperationCellRenderer for uniformity.
- Enhanced the layout and structure of ServerFormDialog and sign dialog to improve user experience.
- Implemented a new task panel design for better alignment and readability in various dialogs.
- Added computed properties for dynamic subtitles and footers in the sign dialog.
- Replaced ElMessageBox.prompt with a custom rename remark dialog for better styling consistency.
This commit is contained in:
yin 2026-10-26 17:59:21 +08:00
parent ad15972f20
commit bb92c720fd
29 changed files with 4567 additions and 898 deletions

View File

@ -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<PickWaveClaimScanResponse & { code?: number; message?: string; data?: Partial<PickWaveClaimScanResponse> }> {
): Promise<
PickWaveClaimScanResponse & {
code?: number
message?: string
data?: Partial<PickWaveClaimScanResponse> & PickWaveClaimScanFailureData
}
> {
return request({
url: '/system',
method: 'post',

View File

@ -50,6 +50,8 @@ export type StockCheckEnvelope<T> = {
* 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)。

View File

@ -285,40 +285,82 @@
:video="playingVideo"
/>
<!-- 设置结束时间弹窗 -->
<!-- 设置结束时间弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="setEndTimeVisible"
title="设置结束时间"
width="420px"
:close-on-click-modal="false"
class="set-end-time-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
:close-on-click-modal="false"
>
<el-form :model="setEndTimeForm" label-width="100px" size="small">
<el-form-item label="任务ID">
<span>{{ operatingRow?.id ?? '—' }}</span>
</el-form-item>
<el-form-item label="当前状态">
<el-tag :type="statusTagType(operatingRow?.status)" size="small">
{{ statusLabel(operatingRow?.status) }}
</el-tag>
</el-form-item>
<el-form-item label="结束时间" required>
<el-date-picker
v-model="setEndTimeForm.end_time"
type="datetime"
placeholder="选择结束时间"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
/>
</el-form-item>
</el-form>
<template #footer>
<el-button size="small" @click="setEndTimeVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="setEndTimeLoading" @click="handleSetEndTime">
确定
</el-button>
</template>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>设置结束时间</h2>
<p>提交后将覆盖该打包任务的结束时间</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="setEndTimeVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<div class="task-panel__form">
<div class="task-panel__field">
<span class="task-panel__field-label">任务 ID</span>
<strong class="task-panel__field-value">{{ operatingRow?.id ?? '—' }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">当前状态</span>
<strong class="task-panel__field-value">
<el-tag :type="statusTagType(operatingRow?.status)" size="small">
{{ statusLabel(operatingRow?.status) }}
</el-tag>
</strong>
</div>
<div v-if="operatingRow?.start_time" class="task-panel__field">
<span class="task-panel__field-label">开始时间</span>
<strong class="task-panel__field-value">
{{ dayjs(operatingRow.start_time).format('YYYY-MM-DD HH:mm:ss') }}
</strong>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">结束时间</span>
<div class="task-panel__field-control">
<el-date-picker
v-model="setEndTimeForm.end_time"
type="datetime"
size="default"
placeholder="选择结束时间"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
style="width: 100%"
/>
<p class="task-panel__field-tip">结束时间不宜早于开始时间,建议与录制实际结束时刻保持一致</p>
</div>
</div>
</div>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交后不可撤销,请确认时间无误</span>
<div class="task-panel__actions">
<el-button size="small" @click="setEndTimeVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="setEndTimeLoading" @click="handleSetEndTime">
确定
</el-button>
</div>
</footer>
</div>
</el-dialog>
<!-- 打包任务导出进度(order.packing.export + order.packing.exportTaskProgress) -->
@ -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;
}
}
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.set-end-time-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -99,30 +99,62 @@
</div>
</div>
<!-- ========== 新建任务弹窗 ========== -->
<!-- ========== 新建任务弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) ========== -->
<el-dialog
v-model="createVisible"
title="新建退回收件任务"
width="440px"
class="create-task-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
:close-on-click-modal="false"
>
<el-form :model="createForm" label-width="72px" @submit.prevent>
<el-form-item label="标题">
<el-input
v-model="createForm.title"
maxlength="100"
show-word-limit
placeholder="请输入任务标题(可选)"
clearable
@keyup.enter="handleCreate"
/>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="createVisible = false">取消</el-button>
<el-button type="primary" :loading="createLoading" @click="handleCreate">确定</el-button>
</template>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>新建退回收件任务</h2>
<p>创建后可对任务登记收件信息</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="createVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<div class="task-panel__form">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">标题</span>
<div class="task-panel__field-control">
<el-input
v-model="createForm.title"
size="default"
maxlength="100"
show-word-limit
placeholder="请输入任务标题(可选)"
clearable
@keyup.enter="handleCreate"
/>
<!-- <p class="task-panel__field-tip">可选,用于区分不同批次的收件任务</p> -->
</div>
</div>
</div>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">标题最多 100 个字符</span>
<div class="task-panel__actions">
<el-button size="small" @click="createVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="createLoading" @click="handleCreate">确定</el-button>
</div>
</footer>
</div>
</el-dialog>
</div>
</template>
@ -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;
}
}
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.create-task-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -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

View File

@ -994,6 +994,8 @@ async function openForceRecordDialog(row: any) {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
// 按钮尺寸对齐「批量修改平台信息」表单底部按钮(Element Plus small)
buttonSize: 'small',
}
)
await doForceRecord()

View File

@ -486,8 +486,8 @@
<el-empty v-if="!allCameras.length && !cameraListLoading" description="暂无摄像头" :image-size="60" />
</div>
<template #footer>
<el-button @click="cameraSettingsVisible = false">取消</el-button>
<el-button type="primary" @click="saveCameraSettings">保存</el-button>
<el-button size="small" @click="cameraSettingsVisible = false">取消</el-button>
<el-button size="small" type="primary" @click="saveCameraSettings">保存</el-button>
</template>
</el-dialog>
@ -529,8 +529,8 @@
</el-form-item>
</el-form>
<template #footer>
<el-button @click="detailFormVisible = false">取消</el-button>
<el-button type="primary" :loading="detailFormLoading" @click="submitDetailForm">确定</el-button>
<el-button size="small" @click="detailFormVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="detailFormLoading" @click="submitDetailForm">确定</el-button>
</template>
</el-dialog>
@ -544,8 +544,8 @@
>
<div class="cancel-confirm-tip">确认取消拆包单?取消将硬删除该单及全部明细,不可恢复。</div>
<template #footer>
<el-button @click="cancelConfirmVisible = false">返回</el-button>
<el-button type="warning" :loading="cancelLoading" @click="confirmCancel">取消拆包</el-button>
<el-button size="small" @click="cancelConfirmVisible = false">返回</el-button>
<el-button size="small" type="warning" :loading="cancelLoading" @click="confirmCancel">取消拆包</el-button>
</template>
</el-dialog>
@ -559,8 +559,8 @@
>
<div class="cancel-confirm-tip">确认提交拆包单?提交后转为已完成终态,不可再录/移除明细。</div>
<template #footer>
<el-button @click="submitConfirmVisible = false">取消</el-button>
<el-button type="primary" :loading="submitLoading" @click="confirmSubmit">提交</el-button>
<el-button size="small" @click="submitConfirmVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitLoading" @click="confirmSubmit">提交</el-button>
</template>
</el-dialog>
@ -574,8 +574,8 @@
>
<div class="cancel-confirm-tip">确认删除拆包单?删除为物理删除(含全部明细),不可恢复。</div>
<template #footer>
<el-button @click="deleteConfirmVisible = false">取消</el-button>
<el-button type="danger" :loading="deleteLoading" @click="confirmDelete">删除</el-button>
<el-button size="small" @click="deleteConfirmVisible = false">取消</el-button>
<el-button size="small" type="danger" :loading="deleteLoading" @click="confirmDelete">删除</el-button>
</template>
</el-dialog>
@ -589,8 +589,8 @@
>
<div class="cancel-confirm-tip">确认移除该明细(明细ID {{ removeDetailRow?.id ?? '-' }})?移除为物理删除,不可恢复。</div>
<template #footer>
<el-button @click="removeDetailConfirmVisible = false">取消</el-button>
<el-button type="danger" :loading="removingDetailLoading" @click="confirmRemoveDetail">移除</el-button>
<el-button size="small" @click="removeDetailConfirmVisible = false">取消</el-button>
<el-button size="small" type="danger" :loading="removingDetailLoading" @click="confirmRemoveDetail">移除</el-button>
</template>
</el-dialog>

View File

@ -168,34 +168,93 @@
</el-descriptions>
</div>
<template #footer>
<el-button @click="detailVisible = false">关闭</el-button>
<el-button size="small" @click="detailVisible = false">关闭</el-button>
</template>
</el-dialog>
<!-- ========== 编辑弹窗 ========== -->
<el-dialog v-model="editVisible" title="编辑未退登记" width="480px" destroy-on-close align-center>
<el-form :model="editForm" label-width="80px" size="small">
<el-form-item label="运单号">
<el-input v-model="editForm.waybillCode" placeholder="运单号" clearable />
</el-form-item>
<el-form-item label="货主">
<el-select v-model="editForm.storeId" placeholder="请选择货主" filterable clearable class="full-width">
<el-option
v-for="item in storeOptions"
:key="String(item.value)"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="editForm.remark" type="textarea" :rows="2" maxlength="500" show-word-limit placeholder="备注(可选)" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="editVisible = false">取消</el-button>
<el-button type="primary" :loading="editLoading" @click="handleEditSubmit">确定</el-button>
</template>
<!-- ========== 编辑弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) ========== -->
<el-dialog
v-model="editVisible"
class="edit-return-waybill-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
destroy-on-close
:close-on-click-modal="false"
>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>编辑未退登记</h2>
<p>保存后将直接更新该登记记录</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="editVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<div class="task-panel__form">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">运单号</span>
<div class="task-panel__field-control">
<el-input v-model="editForm.waybillCode" size="default" placeholder="请输入运单号" clearable />
<p class="task-panel__field-tip">运单号不能为空,用于匹配对应的退回运单</p>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">货主</span>
<div class="task-panel__field-control">
<el-select
v-model="editForm.storeId"
size="default"
placeholder="请选择货主"
filterable
clearable
style="width: 100%"
>
<el-option
v-for="item in storeOptions"
:key="String(item.value)"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
</div>
<div class="task-panel__field task-panel__field--input task-panel__field--textarea">
<span class="task-panel__field-label">备注</span>
<div class="task-panel__field-control">
<el-input
v-model="editForm.remark"
type="textarea"
:rows="3"
resize="none"
maxlength="500"
show-word-limit
placeholder="备注(可选)"
/>
</div>
</div>
</div>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交前请确认运单号与货主无误</span>
<div class="task-panel__actions">
<el-button size="small" @click="editVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="editLoading" @click="handleEditSubmit">确定</el-button>
</div>
</footer>
</div>
</el-dialog>
</div>
</template>
@ -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;
}
}
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.edit-return-waybill-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -12,7 +12,7 @@
<span v-if="storeId">货主 ID:{{ storeId }}</span>
<span v-else>全部货主</span>
<span v-if="searchMode === 'combo'" class="select-product-meta-hint">组合搜索已展开为子商品</span>
<span>已选 {{ localSelectedItems.length }} 个</span>
<span class="select-product-meta-count">已选 <em>{{ localSelectedItems.length }}</em> 个</span>
</div>
<div class="select-product-toolbar">
@ -22,6 +22,7 @@
</el-radio-group>
<el-input
v-model="keyword"
class="select-product-keyword"
:placeholder="searchMode === 'combo' ? '组合编码 / 名称 / 自定义编码,多个用逗号分隔' : '支持多个查询使用逗号分隔'"
clearable
size="small"
@ -31,8 +32,10 @@
<el-button type="primary" size="small" :loading="loading" @click="handleSearch">
查询
</el-button>
<span class="default-qty-label">默认计划数量</span>
<el-input v-model="defaultPlanQty" size="small" class="default-qty-input" />
<div class="select-product-qty">
<span class="default-qty-label">默认计划数量</span>
<el-input v-model="defaultPlanQty" size="small" class="default-qty-input" />
</div>
</div>
<el-table
@ -46,15 +49,17 @@
empty-text="暂无商品"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="46" :reserve-selection="true" />
<el-table-column prop="item_code" label="商品编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="item_name" label="商品名称" min-width="130" show-overflow-tooltip />
<el-table-column prop="barcode" label="条码" min-width="100" show-overflow-tooltip />
<el-table-column type="selection" width="48" align="center" header-align="center" :reserve-selection="true" />
<el-table-column prop="item_code" label="商品编码" min-width="120" align="center" header-align="center" show-overflow-tooltip />
<el-table-column prop="item_name" label="商品名称" min-width="130" align="center" header-align="center" show-overflow-tooltip />
<el-table-column prop="barcode" label="条码" min-width="100" align="center" header-align="center" show-overflow-tooltip />
<el-table-column
v-if="searchMode === 'combo'"
prop="source_combo_code"
label="来源组合"
min-width="120"
align="center"
header-align="center"
show-overflow-tooltip
/>
</el-table>
@ -72,16 +77,27 @@
</div>
<div class="selected-items-panel">
<div class="selected-items-title">已选商品</div>
<div class="selected-items-head">
<span class="selected-items-title">已选商品({{ localSelectedItems.length }})</span>
<el-button
v-if="localSelectedItems.length"
type="danger"
link
size="small"
@click="clearSelectedItems"
>
清空
</el-button>
</div>
<el-table :data="localSelectedItems" border size="small" max-height="160" empty-text="未选择商品">
<el-table-column prop="item_code" label="编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="item_name" label="名称" min-width="110" show-overflow-tooltip />
<el-table-column label="计划数量" width="100">
<el-table-column prop="item_code" label="编码" min-width="100" align="center" header-align="center" show-overflow-tooltip />
<el-table-column prop="item_name" label="名称" min-width="110" align="center" header-align="center" show-overflow-tooltip />
<el-table-column label="计划数量" width="120" align="center" header-align="center">
<template #default="{ row: item }">
<el-input v-model="item.plan_qty" size="small" />
<el-input v-model="item.plan_qty" size="small" class="selected-qty-input" />
</template>
</el-table-column>
<el-table-column label="操作" width="60">
<el-table-column label="操作" width="80" align="center" header-align="center">
<template #default="{ row: item }">
<el-button type="danger" link size="small" @click="removeSelectedItem(item.item_code)">移除</el-button>
</template>
@ -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() {
<style scoped lang="scss">
.select-product-meta {
display: flex;
justify-content: space-between;
align-items: center;
gap: 12px;
margin-bottom: 10px;
font-size: 12px;
color: #606266;
@ -507,6 +535,19 @@ function handleConfirm() {
color: #e6a23c;
}
/* 已选数量:靠右并以蓝色数字强调 */
.select-product-meta-count {
margin-left: auto;
color: #909399;
em {
margin: 0 2px;
font-style: normal;
font-weight: 600;
color: #409eff;
}
}
.select-product-toolbar {
display: flex;
align-items: center;
@ -515,6 +556,20 @@ function handleConfirm() {
margin-bottom: 10px;
}
/* 关键字输入自适应宽度,默认计划数量靠右成组 */
.select-product-keyword {
flex: 1 1 220px;
min-width: 180px;
}
.select-product-qty {
display: flex;
align-items: center;
gap: 6px;
margin-left: auto;
flex: none;
}
.default-qty-label {
font-size: 12px;
color: #606266;
@ -526,7 +581,7 @@ function handleConfirm() {
}
.select-product-pagination {
margin: 8px 0;
margin: 8px 0 10px;
display: flex;
justify-content: flex-end;
}
@ -536,10 +591,37 @@ function handleConfirm() {
padding-top: 8px;
}
.selected-items-head {
display: flex;
align-items: center;
justify-content: space-between;
gap: 8px;
margin-bottom: 6px;
}
.selected-items-title {
font-size: 13px;
font-weight: 600;
color: #303133;
margin-bottom: 6px;
}
.selected-items-head :deep(.el-button) {
margin: 0;
}
/* 计划数量输入框:居中显示 */
.selected-qty-input {
width: 76px;
:deep(.el-input__inner) {
text-align: center;
}
}
/* 勾选列:勾选框与表头统一居中(Element Plus 选中列默认偏左) */
:deep(.el-table-column--selection .cell) {
display: flex;
align-items: center;
justify-content: center;
}
</style>

View File

@ -24,7 +24,7 @@
>
<!-- 已选订单 ID:让提交前能核对具体写哪几条订单 -->
<template #form-extra>
<div v-if="normalizedOrderIds.length || invalidOrderCount > 0" class="sync-ids">
<!-- <div v-if="normalizedOrderIds.length || invalidOrderCount > 0" class="sync-ids">
<div class="sync-ids__head">
<span class="sync-ids__title">订单 ID<em>{{ normalizedOrderIds.length }}</em></span>
<span class="sync-ids__ops">
@ -57,7 +57,7 @@
<p v-if="invalidOrderCount > 0" class="sync-ids__warn">
有 {{ invalidOrderCount }} 条选中行缺少有效订单 ID,不会被同步
</p>
</div>
</div> -->
</template>
<template #footer>
<!-- 页脚按钮间距对齐顶部工具栏(OrderToolbarButtonGroup:gap 6px) -->

View File

@ -367,6 +367,7 @@
:row-key="groupOrderRowKey"
show-selection
table-size="small"
default-align="center"
:pagination="groupOrderPagination"
:show-pagination="false"
:query-time="groupOrderQueryTime"

View File

@ -451,8 +451,8 @@ export const waveBatchColumns = applyWaveListCopyActions([
export const waveGroupOrderColumns = [
{ prop: 'item_detail', label: '商品结构', minWidth: 260, showOverflowTooltip: true },
{ prop: 'logistics_name', label: '快递', minWidth: 130, showOverflowTooltip: true },
{ prop: 'group_count', label: '同组订单数', minWidth: 100, align: 'right' },
{ prop: 'items_total', label: '商品总数', minWidth: 100, align: 'right' },
{ prop: 'group_count', label: '同组订单数', minWidth: 100 },
{ prop: 'items_total', label: '商品总数', minWidth: 100 },
{ prop: 'store_name', label: '货主', minWidth: 110 },
{ prop: 'status_summary', label: '状态汇总', minWidth: 240 },
{ prop: 'item_snapshot_text', label: '商品快照', minWidth: 280 },

View File

@ -15,6 +15,8 @@
(result 的 stocks[] 平铺)+ **未知商品各一行**(unknown_items 平铺,带「未知」标记);
行级合计不单独展示(只展示明细),所以平铺不会重复
2. 盘点作业:行内上报(stock.check.report,**覆盖式**:同明细+同商品+同库位重复上报为更新)
· **库位以 `space_id` 为准且必传**(2026-10-26 文档):取明细行 `space_id` / `location_id`,
`location`(编码)仅做一致性校验,缺失 space_id 时前端直接拦下(服务端会 400)
· 行内「上报」→ CheckReportDialog 弹窗(可填实盘数量与「未匹配条码」):
填了条码 → 后端按条码匹配系统商品,命中=已知商品;未命中记**未知商品**(无账面,实盘>0 即盘盈)
· 批量上报(仅商品类,行内数量列):逐行串行提交,不走弹窗
@ -118,13 +120,13 @@
<template #column-spec="{ row }">{{ row.spec || '—' }}</template>
<template #column-batch_no="{ row }">{{ row.batch_no || '—' }}</template>
<template #column-location="{ row }">
<!-- 库位行:库位以明细自身库位为准,只读(同明细的行合并单元格);商品行可填库位 -->
<!-- 库位行:库位以明细自身库位为准,只读(同明细的行合并单元格);商品行仅展示/校验绑定库位 -->
<span v-if="isLocationTask">{{ formatLocationCodes(row) }}</span>
<el-input
v-else-if="canReport"
v-model="locationMap[row.item.id]"
size="small"
placeholder="库位编码(可留空=无库位)"
placeholder="库位编码(默认=明细库位)"
/>
<span v-else>{{ formatLocationCodes(row) }}</span>
</template>
@ -207,6 +209,7 @@
:detail="reportTarget?.item ?? null"
:stock="reportTarget?.stock ?? null"
:location="reportTarget?.location ?? ''"
:space-id="reportTarget?.spaceId ?? null"
:default-quantity="reportTarget?.quantity ?? null"
@success="handleReportSuccess"
/>
@ -568,19 +571,35 @@ async function loadItems() {
}
}
/** 明细自身的库位编码(库位行 rows[].location_code;商品行与「无库位」分组为空) */
/** 明细自身的库位编码快照(rows[].location_code;「无库位」分组为空) */
function ownLocationCode(item: Record<string, any>): string {
const code = item?.location_code
return code === null || code === undefined || String(code).trim() === '' ? '' : String(code)
}
/**
* 上报用的库位ID(`space_id`,**必传**)
*
* 2026-10-26 文档:report 的库位一律以 `space_id`(wms_location_space.id)为准,
* `location`(库位编码)降级为**仅做一致性校验**;缺失直接 400「缺少库位ID(space_id)」。
* 取值:明细行同义字段 `space_id` / `location_id`(两者同值)。
*/
function resolveReportSpaceId(item: Record<string, any> | null | undefined): number | null {
const raw = item?.space_id ?? item?.location_id
const id = Number(raw)
return Number.isFinite(id) && id > 0 ? id : null
}
/**
* 明细库位编码集合
*
* - 结果行(stock.check.result):取 location_codes,其次 locations 兜底
* - 未开始作业阶段的范围行(result 同样返回):无聚合字段,**库位行**(scope_type=location)
* 取自身 location_code(否则库位列显示「—」,此时行上只带 location_code)
* 「无库位」分组的空串/null 一律剔除;商品行不掺入自身预设库位
* - 未开始作业阶段的范围行(result 同样返回):无聚合字段,取明细自身 `location_code` 快照
* (否则库位列显示「—」)
* 「无库位」分组的空串/null 一律剔除。
*
* 2026-10-26:商品明细行已按「商品+库位」拆行(每条明细都绑定库位快照),
* 故**两类行都掺入自身 location_code**(原来只掺库位行 → 商品行库位列/上报库位不预填)。
*/
function resolveLocationCodes(item: Record<string, any>): string[] {
const raw = Array.isArray(item?.location_codes) && item.location_codes.length
@ -592,7 +611,7 @@ function resolveLocationCodes(item: Record<string, any>): string[] {
.filter((code: unknown) => code !== null && code !== undefined && String(code).trim() !== '')
.map((code: any) => String(code))
const own = item?.scope_type === 'location' ? ownLocationCode(item) : ''
const own = ownLocationCode(item)
if (own && !codes.includes(own)) codes.push(own)
return [...new Set(codes)]
@ -664,21 +683,37 @@ async function doReport(target: ReportTarget, silent = false): Promise<boolean>
return false
}
// 库位ID(space_id)**必传**:服务端以它为准落库,缺失会 400「缺少库位ID(space_id)」
const spaceId = resolveReportSpaceId(item)
if (!spaceId) {
if (!silent) ElMessage.warning('该明细未绑定库位(缺少 space_id),无法上报')
return false
}
const payload: StockCheckReportParams = {
id: taskId.value,
detail_id: Number(item.id),
space_id: spaceId,
quantity
}
if (stock) {
// 库位行:stock_id 必填,库位以明细库位为准(传入必须一致)
// 库位行:stock_id 必填,库位以明细库位为准(location 仅做一致性校验)
payload.stock_id = Number(stock.stock_id)
const loc = resolveLocationCodes(item)[0]
const loc = ownLocationCode(item) || resolveLocationCodes(item)[0]
if (loc) payload.location = loc
} else {
// 商品行:stock_id 可选(传入必须与明细商品一致)
const stockId = Number(item.stock_id)
if (Number.isFinite(stockId) && stockId > 0) payload.stock_id = stockId
// 商品行库位以 space_id 为准,location 仅做一致性校验 → 仅在一致时下发
const location = String(locationMap[String(item.id)] ?? '').trim()
const own = ownLocationCode(item)
if (location && own && location !== own) {
if (!silent) {
ElMessage.warning(`库位编码「${location}」与明细库位「${own}」不一致,请按明细库位上报`)
}
return false
}
if (location) payload.location = location
}
@ -715,6 +750,7 @@ const reportTarget = ref<{
item: Record<string, any>
stock: Record<string, any> | null
location: string
spaceId: number | null
quantity: number | null
} | null>(null)
@ -728,9 +764,14 @@ const reportTarget = ref<{
function openReportDialog(row: Record<string, any>) {
const item = row?.item
if (!item) return
const spaceId = resolveReportSpaceId(item)
if (!spaceId) {
ElMessage.warning('该明细未绑定库位(缺少 space_id),无法上报')
return
}
const stock = row?.stock ?? null
const location = stock
? (resolveLocationCodes(item)[0] ?? '')
? (ownLocationCode(item) || resolveLocationCodes(item)[0] || '')
: String(locationMap[String(item.id)] ?? '').trim()
const rawQuantity = stock
? stockQuantityMap[stockKey(item.id, stock.stock_id)]
@ -743,6 +784,7 @@ function openReportDialog(row: Record<string, any>) {
item,
stock,
location,
spaceId,
quantity: Number.isFinite(Number(quantity)) ? Number(quantity) : null
}
reportDialogVisible.value = true
@ -820,13 +862,17 @@ async function reportSelected() {
ElMessage.warning('请先勾选要上报的盘点明细')
return
}
const ready = targets.filter((target) => resolveQuantity(target) !== null)
const ready = targets.filter(
(target) => resolveQuantity(target) !== null && resolveReportSpaceId(target.item) !== null
)
if (!ready.length) {
ElMessage.warning('请先填写已勾选明细的实盘数量')
ElMessage.warning('请先填写已勾选明细的实盘数量(且明细需绑定库位)')
return
}
if (ready.length < targets.length) {
ElMessage.warning(`已勾选 ${targets.length} 行,其中 ${targets.length - ready.length} 行未填写实盘数量,将跳过`)
ElMessage.warning(
`已勾选 ${targets.length} 行,其中 ${targets.length - ready.length} 行未填写实盘数量或缺库位ID,将跳过`
)
}
reporting.value = true
let success = 0

View File

@ -11,6 +11,9 @@
未填条码时走原有逻辑(商品行按明细商品;库位行按所选商品 stock_id)
覆盖式口径:同明细 + 同商品 + 同库位重复上报=更新已有记录(不新增)。
库位口径(2026-10-26 文档):`space_id`(wms_location_space.id)**必传**,服务端以它为准落库;
`location`(库位编码)降级为**仅做一致性校验**(与 space_id 对应编码不一致则 400)。
-->
<template>
<el-dialog
@ -129,8 +132,10 @@ const props = withDefaults(
detail?: Record<string, any> | null
/** 库位行的目标商品聚合(商品行为 null) */
stock?: Record<string, any> | null
/** 上报库位(库位行=明细库位;商品行=行内填写值) */
/** 上报库位(库位行=明细库位;商品行=行内填写值)——仅做一致性校验 */
location?: string
/** 上报库位ID(space_id,**必传**:服务端以它为准落库) */
spaceId?: number | null
/** 实盘数量默认值(行内已填数量) */
defaultQuantity?: number | null
}>(),
@ -139,6 +144,7 @@ const props = withDefaults(
detail: null,
stock: null,
location: '',
spaceId: null,
defaultQuantity: null
}
)
@ -218,11 +224,18 @@ async function handleSubmit() {
ElMessage.warning('请输入不小于 0 的实盘数量')
return
}
// 库位ID(space_id)**必传**:服务端以它为准落库,缺失会 400「缺少库位ID(space_id)」
const spaceId = Number(props.spaceId)
if (!Number.isFinite(spaceId) || spaceId <= 0) {
ElMessage.error('缺少库位ID(space_id),无法上报')
return
}
const barcode = form.barcode.trim()
const payload: StockCheckReportParams = {
id: taskId,
detail_id: detailId,
space_id: spaceId,
quantity: Math.trunc(quantity)
}
if (barcode) {

View File

@ -393,57 +393,90 @@
<el-dialog
v-model="updateExpressDialogVisible"
title="更新快递公司与运单号"
width="520px"
class="update-express-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
destroy-on-close
:close-on-click-modal="false"
>
<div class="update-express-dialog">
<!-- <el-alert
type="info"
:closable="false"
show-icon
:title="`更新出库单「${updateExpressTargetRow?.stockout_order_code || updateExpressTargetRow?.id || ''}」的运单号。`"
style="margin-bottom: 16px;"
/> -->
<el-form :model="updateExpressForm" label-width="100px" size="small">
<el-form-item label="快递公司">
<el-select
v-model="updateExpressForm.express_code"
placeholder="选择快递公司编码(如 SF/STO/ZT)"
clearable
filterable
allow-create
default-first-option
style="width: 100%"
>
<el-option
v-for="opt in updateInfoExpressOptions"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
<div class="update-express-tip">传编码即可,后端自动解析快递名称;清空表示置空</div>
</el-form-item>
<el-form-item label="运单号">
<el-input
v-model="updateExpressForm.waybill_codes"
type="textarea"
:rows="3"
placeholder="支持一单多运单,多个运单号用逗号、分号或换行分隔(可选)"
/>
<div class="update-express-tip">清空后提交空数组,将清空原有运单号</div>
</el-form-item>
</el-form>
</div>
<!-- 面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>更新快递公司与运单号</h2>
<p>提交后按出库单更新快递编码与运单号</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="updateExpressDialogVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<template #footer>
<el-button size="small" @click="updateExpressDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="updateExpressLoading" @click="handleUpdateExpressSubmit">确认更新</el-button>
</template>
<div class="task-panel__body">
<div class="task-panel__form">
<div class="task-panel__field">
<span class="task-panel__field-label">出库单号</span>
<strong class="task-panel__field-value">
{{ updateExpressTargetRow?.stockout_order_code || updateExpressTargetRow?.id || '—' }}
</strong>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">快递公司编码</span>
<div class="task-panel__field-control">
<el-select
v-model="updateExpressForm.express_code"
size="default"
placeholder="请选择或输入快递公司编码(如 SF/STO/ZT)"
clearable
filterable
allow-create
default-first-option
style="width: 100%"
>
<el-option
v-for="opt in updateInfoExpressOptions"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
<!-- <p class="task-panel__field-tip">传编码即可,后端自动解析快递名称;清空表示置空</p> -->
</div>
</div>
<div class="task-panel__field task-panel__field--input task-panel__field--textarea">
<span class="task-panel__field-label">运单号</span>
<div class="task-panel__field-control">
<el-input
v-model="updateExpressForm.waybill_codes"
type="textarea"
:rows="3"
resize="none"
placeholder="支持一单多运单,多个运单号用逗号、分号或换行分隔(可选)"
/>
<p class="task-panel__field-tip">清空后提交空数组,将清空原有运单号</p>
</div>
</div>
</div>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交前请确认快递编码与运单号无误</span>
<div class="task-panel__actions">
<el-button size="small" @click="updateExpressDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="updateExpressLoading" @click="handleUpdateExpressSubmit">
确认更新
</el-button>
</div>
</footer>
</div>
</el-dialog>
</div>
</template>
@ -1433,10 +1466,168 @@ function handleImport() {
font-size: 14px;
}
.update-express-tip {
margin-top: 4px;
font-size: 12px;
line-height: 18px;
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;
}
&__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;
}
}
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.update-express-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -97,90 +97,161 @@
</div>
</div>
<!-- 新增/编辑弹窗 -->
<el-dialog :title="textMap[dialogStatus]" v-model="dialogFormVisible" width="1000px" align-center class="account-dialog" @close="handleDialogClose">
<el-form ref="dataForm" :rules="rules" :model="temp" label-position="top" class="custom-form" size="small">
<el-tabs v-model="activeTab" class="form-tabs">
<el-tab-pane label="基本信息" name="base">
<div class="form-section no-shadow">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="手机号" prop="phone">
<el-input v-model="temp.phone" :disabled="dialogStatus==='update'" placeholder="请输入手机号" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="姓名" prop="real_name">
<el-input v-model="temp.real_name" placeholder="请输入工号姓名" />
</el-form-item>
</el-col>
</el-row>
<!-- 新增/编辑工号弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="dialogFormVisible"
class="account-form-dialog"
:width="activeTab === 'avatar'
? 'min(1000px, 96vw)'
: (dialogStatus === 'create' ? 'min(560px, 92vw)' : 'min(760px, 94vw)')"
align-center
append-to-body
:show-close="false"
@close="handleDialogClose"
>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>{{ textMap[dialogStatus] }}</h2>
<p>
{{ dialogStatus === 'create'
? '填写账号信息并分配角色,密码默认 111111'
: '可修改基本资料,或在「工号头像」页签更新头像' }}
</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="dialogFormVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<el-row :gutter="20" v-if="dialogStatus === 'create'">
<el-col :span="12">
<el-form-item label="用户名" prop="username">
<el-input v-model="temp.username" placeholder="系统自动生成" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="密码" prop="password">
<el-input v-model="temp.password" type="password" show-password placeholder="默认 111111" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="temp.email" placeholder="请输入邮箱" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="角色配置" prop="role_ids">
<el-select
v-model="temp.role_ids"
multiple
collapse-tags
collapse-tags-tooltip
placeholder="请选择角色(必填)"
style="width:100%"
v-loading="rolesForFormLoading"
<div class="task-panel__body task-panel__body--scroll">
<el-form ref="dataForm" :rules="rules" :model="temp" class="task-panel__form">
<el-tabs v-model="activeTab" class="account-form-tabs" :class="{ 'is-single': dialogStatus === 'create' }">
<el-tab-pane label="基本信息" name="base">
<div class="task-panel__form">
<div class="task-panel__field task-panel__field--input">
<span
class="task-panel__field-label"
:class="{ 'is-required': dialogStatus === 'create' }"
>
<el-option
v-for="r in availableRoles"
:key="r.role_id"
:label="r.role_name"
:value="r.role_id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div>
</el-tab-pane>
手机号
</span>
<div class="task-panel__field-control">
<el-form-item prop="phone">
<el-input
v-model="temp.phone"
size="default"
:disabled="dialogStatus === 'update'"
placeholder="请输入手机号"
/>
</el-form-item>
</div>
</div>
<el-tab-pane v-if="dialogStatus === 'update'" label="工号头像" name="avatar">
<div class="form-section no-shadow">
<div class="avatar-upload-wrapper full-width">
<images-upload
v-if="temp.employee_id"
ref="imagesUploadRef"
:id="temp.employee_id"
type="avatar"
@refresh="getList"
/>
</div>
<div class="upload-tip">支持本地上传及摄像头拍摄</div>
</div>
</el-tab-pane>
</el-tabs>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button size="small" @click="dialogFormVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="listLoading" @click="dialogStatus==='create'?createData():updateData()">确认保存</el-button>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">姓名</span>
<div class="task-panel__field-control">
<el-form-item prop="real_name">
<el-input v-model="temp.real_name" size="default" placeholder="请输入工号姓名" />
</el-form-item>
</div>
</div>
<template v-if="dialogStatus === 'create'">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">用户名</span>
<div class="task-panel__field-control">
<el-form-item prop="username">
<el-input v-model="temp.username" size="default" placeholder="系统自动生成" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">密码</span>
<div class="task-panel__field-control">
<el-form-item prop="password">
<el-input
v-model="temp.password"
type="password"
size="default"
show-password
placeholder="默认 111111"
/>
</el-form-item>
</div>
</div>
</template>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">邮箱</span>
<div class="task-panel__field-control">
<el-form-item prop="email">
<el-input v-model="temp.email" size="default" placeholder="请输入邮箱" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">角色配置</span>
<div class="task-panel__field-control">
<el-form-item prop="role_ids">
<el-select
v-model="temp.role_ids"
size="default"
multiple
collapse-tags
collapse-tags-tooltip
placeholder="请选择角色(必填)"
style="width: 100%"
v-loading="rolesForFormLoading"
>
<el-option
v-for="r in availableRoles"
:key="r.role_id"
:label="r.role_name"
:value="r.role_id"
/>
</el-select>
</el-form-item>
</div>
</div>
</div>
</el-tab-pane>
<el-tab-pane v-if="dialogStatus === 'update'" label="工号头像" name="avatar">
<div class="avatar-upload-panel">
<images-upload
v-if="temp.employee_id"
ref="imagesUploadRef"
:id="temp.employee_id"
type="avatar"
@refresh="getList"
/>
</div>
<p class="task-panel__form-tip">
支持本地上传及摄像头拍摄,单张不超过 10MB;头像保存后即时生效,无需再点「确认保存」
</p>
</el-tab-pane>
</el-tabs>
</el-form>
</div>
</template>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交前请确认手机号与角色无误</span>
<div class="task-panel__actions">
<el-button size="small" @click="dialogFormVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="listLoading" @click="dialogStatus==='create'?createData():updateData()">确认保存</el-button>
</div>
</footer>
</div>
</el-dialog>
<!-- 角色分配弹窗 -->
@ -230,26 +301,72 @@
</template>
</el-dialog>
<!-- 重置密码弹窗 -->
<el-dialog title="重置密码" v-model="resetPwdDialogVisible" width="400px" align-center>
<el-form ref="resetPwdFormRef" :model="resetPwdTemp" label-width="80px" size="small">
<el-form-item label="工号" >
<el-input :value="resetPwdTemp.real_name || resetPwdTemp.phone" disabled />
</el-form-item>
<el-form-item
label="新密码"
prop="password"
:rules="[{ required: true, message: '请输入新密码', trigger: 'blur' }, { min: 6, message: '密码至少6位', trigger: 'blur' }]"
>
<el-input v-model="resetPwdTemp.password" type="password" show-password placeholder="请输入新密码(至少6位)" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button size="small" @click="resetPwdDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="resetPwdSubmitting" @click="submitResetPassword">确认重置</el-button>
<!-- 重置密码弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="resetPwdDialogVisible"
class="reset-password-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
:close-on-click-modal="false"
>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>重置密码</h2>
<p>提交后该账号将立即使用新密码登录</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="resetPwdDialogVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<el-form ref="resetPwdFormRef" :model="resetPwdTemp" class="task-panel__form">
<div class="task-panel__field">
<span class="task-panel__field-label">工号</span>
<strong class="task-panel__field-value">
{{ resetPwdTemp.real_name || resetPwdTemp.phone || '—' }}
</strong>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">新密码</span>
<div class="task-panel__field-control">
<el-form-item
prop="password"
:rules="[{ required: true, message: '请输入新密码', trigger: 'blur' }, { min: 6, message: '密码至少6位', trigger: 'blur' }]"
>
<el-input
v-model="resetPwdTemp.password"
type="password"
size="default"
show-password
placeholder="请输入新密码(至少6位)"
/>
</el-form-item>
<p class="task-panel__field-tip">密码至少 6 位,建议包含字母与数字</p>
</div>
</div>
</el-form>
</div>
</template>
<footer class="task-panel__foot">
<span class="task-panel__hint">重置后请及时告知使用人新密码</span>
<div class="task-panel__actions">
<el-button size="small" @click="resetPwdDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="resetPwdSubmitting" @click="submitResetPassword">确认重置</el-button>
</div>
</footer>
</div>
</el-dialog>
<!-- 绑定微信弹窗 -->
@ -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;
}
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.reset-password-dialog,
.el-dialog.account-form-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -69,46 +69,98 @@
</div>
</div>
<!-- 新增 / 编辑快递编码:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="dialogVisible"
:title="dialogMode === 'create' ? '新增快递编码' : '编辑快递编码'"
width="560px"
class="courier-code-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
@close="resetForm"
>
<el-form ref="formRef" :model="formData" :rules="rules" label-width="110px" size="small">
<el-form-item label="业务编码" prop="code">
<el-input
v-model="formData.code"
placeholder="如 SF.KY"
:disabled="dialogMode === 'edit'"
@blur="validateCodeUnique"
/>
</el-form-item>
<el-form-item label="业务名称" prop="name">
<el-input v-model="formData.name" placeholder="如 顺丰空运产品" />
</el-form-item>
<el-form-item label="快递公司" prop="express_code">
<el-select
v-model="formData.express_code"
placeholder="请选择快递公司"
filterable
style="width: 100%"
@change="handleExpressChange"
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>{{ dialogMode === 'create' ? '新增快递编码' : '编辑快递编码' }}</h2>
<p>{{ dialogMode === 'create' ? '填写业务编码并选择对应快递公司' : '业务编码创建后不可修改' }}</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="dialogVisible = false"
>
<el-option
v-for="item in expressOptions"
:key="item.code"
:label="item.label || item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
</template>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<el-form ref="formRef" :model="formData" :rules="rules" class="task-panel__form">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">业务编码</span>
<div class="task-panel__field-control">
<el-form-item prop="code">
<el-input
v-model="formData.code"
size="default"
placeholder="如 SF.KY"
:disabled="dialogMode === 'edit'"
@blur="validateCodeUnique"
/>
</el-form-item>
<p class="task-panel__field-tip">
{{ dialogMode === 'edit'
? '业务编码创建后不可修改'
: '业务编码用于对接快递接口,建议使用「快递编码.业务」格式' }}
</p>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">业务名称</span>
<div class="task-panel__field-control">
<el-form-item prop="name">
<el-input v-model="formData.name" size="default" placeholder="如 顺丰空运产品" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">快递公司</span>
<div class="task-panel__field-control">
<el-form-item prop="express_code">
<el-select
v-model="formData.express_code"
size="default"
placeholder="请选择快递公司"
filterable
style="width: 100%"
@change="handleExpressChange"
>
<el-option
v-for="item in expressOptions"
:key="item.code"
:label="item.label || item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
</div>
</div>
</el-form>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交后该编码将用于快递下单与面单打印</span>
<div class="task-panel__actions">
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
</div>
</footer>
</div>
</el-dialog>
</div>
</template>
@ -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;
}
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.courier-code-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -59,41 +59,88 @@
</div>
</div>
<!-- 新增 / 编辑平台编码:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="dialogVisible"
:title="dialogMode === 'create' ? '新增平台编码' : '编辑平台编码'"
width="560px"
class="platform-code-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
@close="resetForm"
>
<el-form ref="formRef" :model="formData" :rules="rules" label-width="110px" size="small">
<el-form-item label="业务编码" prop="code">
<el-input v-model="formData.code" placeholder="如 DY" />
</el-form-item>
<el-form-item label="业务名称" prop="name">
<el-input v-model="formData.name" placeholder="如 抖音(仓管家映射)" />
</el-form-item>
<el-form-item label="平台" prop="platform_code">
<el-select
v-model="formData.platform_code"
placeholder="请选择平台"
filterable
style="width: 100%"
@change="handlePlatformChange"
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>{{ dialogMode === 'create' ? '新增平台编码' : '编辑平台编码' }}</h2>
<p>{{ dialogMode === 'create' ? '填写业务编码并选择对应平台' : '修改后立即生效' }}</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="dialogVisible = false"
>
<el-option
v-for="item in platformOptions"
:key="item.code"
:label="item.label || item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
</template>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<el-form ref="formRef" :model="formData" :rules="rules" class="task-panel__form">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">业务编码</span>
<div class="task-panel__field-control">
<el-form-item prop="code">
<el-input v-model="formData.code" size="default" placeholder="如 DY" />
</el-form-item>
<p class="task-panel__field-tip">业务编码用于对接平台接口,建议使用平台简称缩写</p>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">业务名称</span>
<div class="task-panel__field-control">
<el-form-item prop="name">
<el-input v-model="formData.name" size="default" placeholder="如 抖音(仓管家映射)" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">平台</span>
<div class="task-panel__field-control">
<el-form-item prop="platform_code">
<el-select
v-model="formData.platform_code"
size="default"
placeholder="请选择平台"
filterable
style="width: 100%"
@change="handlePlatformChange"
>
<el-option
v-for="item in platformOptions"
:key="item.code"
:label="item.label || item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
</div>
</div>
</el-form>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交后该编码将用于平台订单同步</span>
<div class="task-panel__actions">
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
</div>
</footer>
</div>
</el-dialog>
</div>
</template>
@ -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;
}
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.platform-code-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -106,187 +106,390 @@
</div>
</div>
<!-- 新增/编辑 -->
<!-- 新增/编辑拣货车:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="dialogVisible"
:title="dialogMode === 'create' ? '新增拣货车' : '编辑拣货车'"
width="520px"
class="pickcart-form-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
@close="resetForm"
>
<el-form ref="formRef" :model="formData" :rules="rules" label-width="110px" size="small">
<el-form-item label="拣货车编码" prop="cart_code">
<el-input
v-model="formData.cart_code"
placeholder="当前仓库内唯一"
maxlength="64"
show-word-limit
@blur="handleCodeBlur"
/>
</el-form-item>
<el-form-item label="名称" prop="cart_name">
<el-input v-model="formData.cart_name" placeholder="可选" maxlength="100" show-word-limit />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="codeCheckHint">
<el-text :type="codeCheckHint.type" size="small">{{ codeCheckHint.text }}</el-text>
</el-form-item>
</el-form>
<template #footer>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
</template>
</el-dialog>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>{{ dialogMode === 'create' ? '新增拣货车' : '编辑拣货车' }}</h2>
<p>{{ dialogMode === 'create' ? '拣货车编码在当前仓库内需要唯一' : '修改后保存立即生效' }}</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="dialogVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<!-- 扫码查询 -->
<el-dialog v-model="scanDialogVisible" title="扫码查询拣货车" width="520px" align-center @close="resetScan">
<el-form label-width="110px" size="small" @submit.prevent="submitScan">
<el-form-item label="拣货车编码">
<el-input
v-model="scanForm.cart_code"
placeholder="输入或扫描条码后回车"
clearable
@keyup.enter="submitScan"
/>
</el-form-item>
</el-form>
<div v-if="scanResult" class="scan-result">
<el-descriptions :column="1" border size="small">
<el-descriptions-item label="ID">{{ scanResult.cart_id }}</el-descriptions-item>
<el-descriptions-item label="编码">{{ scanResult.cart_code }}</el-descriptions-item>
<el-descriptions-item label="名称">{{ scanResult.cart_name || '--' }}</el-descriptions-item>
<el-descriptions-item label="状态">
<span :class="getStatusTextClass(formatPickCartStatus(scanResult.status).type)">
{{ formatPickCartStatus(scanResult.status).text }}
</span>
</el-descriptions-item>
<el-descriptions-item label="绑定任务">
{{ scanResult.current_task_no || scanResult.current_task_id || '未绑定' }}
</el-descriptions-item>
</el-descriptions>
<div class="task-panel__body">
<el-form ref="formRef" :model="formData" :rules="rules" class="task-panel__form">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">拣货车编码</span>
<div class="task-panel__field-control">
<el-form-item prop="cart_code">
<el-input
v-model="formData.cart_code"
size="default"
placeholder="当前仓库内唯一"
maxlength="64"
show-word-limit
@blur="handleCodeBlur"
/>
</el-form-item>
<p
v-if="codeCheckHint"
class="task-panel__field-tip"
:class="`is-${codeCheckHint.type}`"
>
{{ codeCheckHint.text }}
</p>
<p v-else class="task-panel__field-tip">支持扫码枪直接录入,编码在当前仓库内不可重复</p>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">名称</span>
<div class="task-panel__field-control">
<el-form-item prop="cart_name">
<el-input
v-model="formData.cart_name"
size="default"
placeholder="可选"
maxlength="100"
show-word-limit
/>
</el-form-item>
</div>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label is-required">状态</span>
<el-radio-group v-model="formData.status">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
</div>
</el-form>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交前请确认编码与状态无误</span>
<div class="task-panel__actions">
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
</div>
</footer>
</div>
<template #footer>
<el-button size="small" @click="scanDialogVisible = false">关闭</el-button>
<el-button size="small" type="primary" :loading="scanLoading" @click="submitScan">查询</el-button>
</template>
</el-dialog>
<!-- 批量新增 -->
<!-- 扫码查询:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="scanDialogVisible"
class="pickcart-scan-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
@close="resetScan"
>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>扫码查询拣货车</h2>
<p>输入或扫描编码后回车查询拣货车信息</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="scanDialogVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<div class="task-panel__form">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">拣货车编码</span>
<div class="task-panel__field-control">
<el-input
v-model="scanForm.cart_code"
size="default"
placeholder="输入或扫描条码后回车"
clearable
@keyup.enter="submitScan"
/>
<p class="task-panel__field-tip">支持扫码枪直接录入,回车或点「查询」开始查找</p>
</div>
</div>
</div>
<div v-if="scanResult" class="scan-result">
<el-descriptions :column="1" border size="small">
<el-descriptions-item label="ID">{{ scanResult.cart_id }}</el-descriptions-item>
<el-descriptions-item label="编码">{{ scanResult.cart_code }}</el-descriptions-item>
<el-descriptions-item label="名称">{{ scanResult.cart_name || '--' }}</el-descriptions-item>
<el-descriptions-item label="状态">
<span :class="getStatusTextClass(formatPickCartStatus(scanResult.status).type)">
{{ formatPickCartStatus(scanResult.status).text }}
</span>
</el-descriptions-item>
<el-descriptions-item label="绑定任务">
{{ scanResult.current_task_no || scanResult.current_task_id || '未绑定' }}
</el-descriptions-item>
</el-descriptions>
</div>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">查询结果仅展示基本信息</span>
<div class="task-panel__actions">
<el-button size="small" @click="scanDialogVisible = false">关闭</el-button>
<el-button size="small" type="primary" :loading="scanLoading" @click="submitScan">查询</el-button>
</div>
</footer>
</div>
</el-dialog>
<!-- 批量新增:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="batchDialogVisible"
title="批量新增拣货车"
width="760px"
class="pickcart-batch-dialog"
width="min(760px, 94vw)"
align-center
append-to-body
:show-close="false"
@close="resetBatchForm"
>
<el-form ref="batchFormRef" :model="batchForm" :rules="batchRules" label-width="110px" size="small">
<div class="batch-section-title">拣货车编码</div>
<el-form-item label="编码前缀" prop="code.prefix">
<el-input v-model="batchForm.code.prefix" placeholder="如 CART-" maxlength="32" show-word-limit />
</el-form-item>
<el-form-item label="数字范围" required>
<div class="batch-range-row">
<el-form-item prop="code.start_num" class="batch-range-item">
<el-input-number v-model="batchForm.code.start_num" :min="0" :max="999999" controls-position="right" />
</el-form-item>
<span class="batch-range-sep">至</span>
<el-form-item prop="code.end_num" class="batch-range-item">
<el-input-number v-model="batchForm.code.end_num" :min="0" :max="999999" controls-position="right" />
</el-form-item>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>批量新增拣货车</h2>
<p>按编码前缀与数字范围批量生成拣货车</p>
</div>
</el-form-item>
<el-form-item label="数字补零">
<el-switch v-model="batchForm.code.pad_zero" />
<el-input-number
v-if="batchForm.code.pad_zero"
v-model="batchForm.code.pad_width"
:min="1"
:max="8"
controls-position="right"
class="batch-pad-width"
/>
<el-text v-if="batchForm.code.pad_zero" type="info" size="small" class="batch-pad-hint">
位数 {{ batchForm.code.pad_width }},不足时左侧补 0
</el-text>
</el-form-item>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="batchDialogVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<el-divider />
<div class="task-panel__body task-panel__body--scroll">
<el-form ref="batchFormRef" :model="batchForm" :rules="batchRules" class="task-panel__form">
<div class="task-panel__section-title">拣货车编码</div>
<div class="batch-section-title">拣货车名称</div>
<el-form-item label="名称前缀">
<el-input v-model="batchForm.namePrefix" placeholder="留空则不生成名称,序号与编码共用" maxlength="64" show-word-limit />
</el-form-item>
<el-form-item v-if="batchForm.namePrefix.trim()" label="位置">
<el-radio-group v-model="batchForm.namePosition">
<el-radio value="prefix">前缀(如:拣货车01)</el-radio>
<el-radio value="suffix">后缀(如:01拣货车)</el-radio>
</el-radio-group>
</el-form-item>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">编码前缀</span>
<div class="task-panel__field-control">
<el-form-item prop="code.prefix">
<el-input v-model="batchForm.code.prefix" size="default" placeholder="如 CART-" maxlength="32" show-word-limit />
</el-form-item>
</div>
</div>
<el-divider />
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">数字范围</span>
<div class="task-panel__field-control">
<div class="batch-range-row">
<el-form-item prop="code.start_num" class="batch-range-item">
<el-input-number
v-model="batchForm.code.start_num"
size="default"
:min="0"
:max="999999"
controls-position="right"
/>
</el-form-item>
<span class="batch-range-sep">至</span>
<el-form-item prop="code.end_num" class="batch-range-item">
<el-input-number
v-model="batchForm.code.end_num"
size="default"
:min="0"
:max="999999"
controls-position="right"
/>
</el-form-item>
</div>
</div>
</div>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="batchForm.status">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="生成预览">
<div class="batch-preview">
<div>将生成 <strong>{{ batchPreviewCount }}</strong> 条拣货车</div>
<el-table
v-if="batchPreviewItems.length"
:data="batchPreviewTableRows"
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">数字补零</span>
<div class="task-panel__field-control">
<div class="batch-inline-row">
<el-switch v-model="batchForm.code.pad_zero" />
<el-input-number
v-if="batchForm.code.pad_zero"
v-model="batchForm.code.pad_width"
size="default"
:min="1"
:max="8"
controls-position="right"
class="batch-pad-width"
/>
<el-text v-if="batchForm.code.pad_zero" type="info" size="small">
位数 {{ batchForm.code.pad_width }},不足时左侧补 0
</el-text>
</div>
</div>
</div>
<div class="task-panel__section-title is-spaced">拣货车名称</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">名称前缀</span>
<div class="task-panel__field-control">
<el-input
v-model="batchForm.namePrefix"
size="default"
placeholder="留空则不生成名称,序号与编码共用"
maxlength="64"
show-word-limit
/>
</div>
</div>
<div v-if="batchForm.namePrefix.trim()" class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">位置</span>
<div class="task-panel__field-control">
<el-radio-group v-model="batchForm.namePosition">
<el-radio value="prefix">前缀(如:拣货车01)</el-radio>
<el-radio value="suffix">后缀(如:01拣货车)</el-radio>
</el-radio-group>
</div>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label is-required">状态</span>
<el-radio-group v-model="batchForm.status">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">停用</el-radio>
</el-radio-group>
</div>
<div class="task-panel__section-title is-spaced">生成预览</div>
<div class="batch-preview">
<div>将生成 <strong>{{ batchPreviewCount }}</strong> 条拣货车</div>
<el-table
v-if="batchPreviewItems.length"
:data="batchPreviewTableRows"
size="small"
border
class="batch-preview-table"
>
<el-table-column prop="index" label="序号" width="70" align="center" />
<el-table-column prop="cart_code" label="拣货车编码" min-width="160" align="center" show-overflow-tooltip />
<el-table-column prop="cart_name" label="拣货车名称" min-width="160" align="center" show-overflow-tooltip />
</el-table>
<el-text v-else type="warning" size="small">请完善编码前缀与数字范围</el-text>
</div>
</el-form>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">确认后按预览结果批量创建</span>
<div class="task-panel__actions">
<el-button size="small" @click="batchDialogVisible = false">取消</el-button>
<el-button
size="small"
border
class="batch-preview-table"
type="primary"
:loading="batchSaving"
:disabled="batchPreviewCount <= 0"
@click="submitBatchCreate"
>
<el-table-column prop="index" label="序号" width="70" align="center" />
<el-table-column prop="cart_code" label="拣货车编码" min-width="160" show-overflow-tooltip />
<el-table-column prop="cart_name" label="拣货车名称" min-width="160" show-overflow-tooltip />
</el-table>
<el-text v-else type="warning" size="small">请完善编码前缀与数字范围</el-text>
确认新增
</el-button>
</div>
</el-form-item>
</el-form>
<template #footer>
<el-button size="small" @click="batchDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="batchSaving" :disabled="batchPreviewCount <= 0" @click="submitBatchCreate">
确认新增
</el-button>
</template>
</footer>
</div>
</el-dialog>
<!-- 绑定任务 -->
<!-- 绑定任务:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="bindDialogVisible"
title="绑定拣货任务"
width="520px"
class="pickcart-bind-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
@close="resetBindForm"
>
<el-form ref="bindFormRef" :model="bindForm" :rules="bindRules" label-width="110px" size="small">
<el-form-item label="拣货车">
<el-input :model-value="bindForm.cartLabel" disabled />
</el-form-item>
<el-form-item label="任务ID" prop="task_id">
<el-input-number v-model="bindForm.task_id" :min="1" :controls="true" style="width: 100%" />
</el-form-item>
<el-form-item>
<el-text type="info" size="small">
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>绑定拣货任务</h2>
<p>将拣货车与拣货任务建立绑定关系</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="bindDialogVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<el-form ref="bindFormRef" :model="bindForm" :rules="bindRules" class="task-panel__form">
<div class="task-panel__field">
<span class="task-panel__field-label">拣货车</span>
<strong class="task-panel__field-value">{{ bindForm.cartLabel || '—' }}</strong>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">任务 ID</span>
<div class="task-panel__field-control">
<el-form-item prop="task_id">
<el-input-number
v-model="bindForm.task_id"
size="default"
:min="1"
:controls="true"
style="width: 100%"
/>
</el-form-item>
</div>
</div>
</el-form>
<p class="task-panel__form-tip">
若任务已绑定其他拣货车将自动改绑;目标拣货车已绑定其他活动任务时将返回冲突。
</el-text>
</el-form-item>
</el-form>
<template #footer>
<el-button size="small" @click="bindDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="bindLoading" @click="submitBind">确认绑定</el-button>
</template>
</p>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交前请确认任务 ID 无误</span>
<div class="task-panel__actions">
<el-button size="small" @click="bindDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="bindLoading" @click="submitBind">确认绑定</el-button>
</div>
</footer>
</div>
</el-dialog>
</div>
</template>
@ -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;
}
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.pickcart-form-dialog,
.el-dialog.pickcart-batch-dialog,
.el-dialog.pickcart-bind-dialog,
.el-dialog.pickcart-scan-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -228,42 +228,106 @@
</div>
</div>
<!-- ===== 编辑/设置录制弹窗 ===== -->
<!-- ===== 编辑/设置录制弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) ===== -->
<el-dialog
v-model="dialogVisible"
:title="dialogTitle"
width="520px"
class="print-computer-dialog"
width="min(560px, 92vw)"
:close-on-click-modal="false"
destroy-on-close
align-center
append-to-body
:show-close="false"
>
<el-form label-width="120px" label-position="right" size="small" :disabled="submitting">
<template v-if="dialogMode === 'edit'">
<el-form-item label="电脑名称" required>
<el-input v-model="formData.name" placeholder="请输入电脑名称" clearable />
</el-form-item>
</template>
<template v-if="dialogMode === 'recording'">
<el-form-item label="录制大小" required>
<el-input v-model.number="formData.recording_size_value" placeholder="请输入数值" style="width: 160px" />
<el-select v-model="formData.recording_size_unit" placeholder="单位" style="width: 100px; margin-left: 8px">
<el-option label="KB" value="KB" />
<el-option label="MB" value="MB" />
<el-option label="GB" value="GB" />
<el-option label="TB" value="TB" />
</el-select>
</el-form-item>
<el-form-item label="录制目录" required>
<el-input v-model="formData.recording_directory" placeholder="如 D:/record" />
</el-form-item>
</template>
</el-form>
<template #footer>
<el-button size="small" @click="dialogVisible = false" :disabled="submitting">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="handleDialogSubmit">
{{ dialogMode === 'edit' ? '保存' : '设置录制' }}
</el-button>
</template>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>{{ dialogTitle }}</h2>
<p>{{ dialogMode === 'edit' ? '修改后保存立即生效' : '设置录制文件大小上限与保存目录' }}</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
:disabled="submitting"
@click="dialogVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<el-form :disabled="submitting" class="task-panel__form">
<template v-if="dialogMode === 'edit'">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">电脑名称</span>
<div class="task-panel__field-control">
<el-input v-model="formData.name" size="default" placeholder="请输入电脑名称" clearable />
</div>
</div>
</template>
<template v-if="dialogMode === 'recording'">
<div class="task-panel__field">
<span class="task-panel__field-label">目标电脑</span>
<strong class="task-panel__field-value">{{ currentEditRow?.name || '—' }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">当前录制状态</span>
<strong class="task-panel__field-value">
{{ translate('recording_status', currentEditRow?.recording_status) }}
</strong>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">录制大小</span>
<div class="task-panel__field-control">
<div class="recording-size-row">
<el-input
v-model.number="formData.recording_size_value"
size="default"
placeholder="请输入数值"
class="recording-size-input"
/>
<el-select v-model="formData.recording_size_unit" size="default" placeholder="单位" class="recording-size-unit">
<el-option label="KB" value="KB" />
<el-option label="MB" value="MB" />
<el-option label="GB" value="GB" />
<el-option label="TB" value="TB" />
</el-select>
</div>
<p class="task-panel__field-tip">单个录制文件的大小上限,超出后自动分片</p>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">录制目录</span>
<div class="task-panel__field-control">
<el-input
v-model="formData.recording_directory"
size="default"
placeholder="如 D:/record"
/>
<p class="task-panel__field-tip">需为录制电脑本地可写入的绝对路径</p>
</div>
</div>
</template>
</el-form>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交前请确认参数无误</span>
<div class="task-panel__actions">
<el-button size="small" @click="dialogVisible = false" :disabled="submitting">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="handleDialogSubmit">
{{ dialogMode === 'edit' ? '保存' : '设置录制' }}
</el-button>
</div>
</footer>
</div>
</el-dialog>
</div>
</template>
@ -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;
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.print-computer-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -97,104 +97,215 @@
</div>
</div>
<!-- 新增 / 编辑店铺:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="dialogVisible"
:title="dialogMode === 'create' ? '新增店铺' : '编辑店铺'"
width="560px"
class="shop-form-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
@close="resetForm"
>
<el-form ref="formRef" :model="formData" :rules="rules" label-width="110px" size="small">
<el-form-item label="平台" prop="platform_code">
<el-select
v-model="formData.platform_code"
placeholder="请选择平台"
filterable
style="width: 100%"
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>{{ dialogMode === 'create' ? '新增店铺' : '编辑店铺' }}</h2>
<p>
{{ dialogMode === 'create'
? '新增后需完成平台授权才能同步店铺数据'
: '修改后需重新授权才能同步平台数据' }}
</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="dialogVisible = false"
>
<el-option
v-for="item in platformOptions"
:key="item.code"
:label="item.label || item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item label="自定义名称" prop="custom_name">
<el-input v-model="formData.custom_name" placeholder="最大 100 字符" maxlength="100" show-word-limit />
</el-form-item>
<!-- 平台真实店铺名:新增时由服务端生成待授权占位名,仅编辑态可改(shops.edit 支持 shop_name) -->
<el-form-item v-if="dialogMode === 'edit'" label="平台真实店铺名" prop="shop_name">
<el-input
v-model="formData.shop_name"
placeholder="与平台后台店铺名保持一致,最大 100 字符"
maxlength="100"
show-word-limit
clearable
/>
</el-form-item>
<el-form-item v-if="dialogMode === 'edit'">
<el-text type="info" size="small">
平台真实店铺名在同一仓库同一平台下不可重复,修改后需重新授权才能同步平台数据。
</el-text>
</el-form-item>
<el-form-item v-if="dialogMode === 'create'">
<el-text type="info" size="small">
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<el-form ref="formRef" :model="formData" :rules="rules" class="task-panel__form">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">平台</span>
<div class="task-panel__field-control">
<el-form-item prop="platform_code">
<el-select
v-model="formData.platform_code"
size="default"
placeholder="请选择平台"
filterable
style="width: 100%"
>
<el-option
v-for="item in platformOptions"
:key="item.code"
:label="item.label || item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">自定义名称</span>
<div class="task-panel__field-control">
<el-form-item prop="custom_name">
<el-input
v-model="formData.custom_name"
size="default"
placeholder="最大 100 字符"
maxlength="100"
show-word-limit
/>
</el-form-item>
</div>
</div>
<!-- 平台真实店铺名:新增时由服务端生成待授权占位名,仅编辑态可改(shops.edit 支持 shop_name) -->
<div v-if="dialogMode === 'edit'" class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">平台真实店铺名</span>
<div class="task-panel__field-control">
<el-form-item prop="shop_name">
<el-input
v-model="formData.shop_name"
size="default"
placeholder="与平台后台店铺名保持一致,最大 100 字符"
maxlength="100"
show-word-limit
clearable
/>
</el-form-item>
<p class="task-panel__field-tip">
平台真实店铺名在同一仓库同一平台下不可重复,修改后需重新授权才能同步平台数据
</p>
</div>
</div>
</el-form>
<p v-if="dialogMode === 'create'" class="task-panel__form-tip">
店铺名称由服务端生成待授权占位名,完成平台授权后将自动同步真实店铺名。
</el-text>
</el-form-item>
</el-form>
<template #footer>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
</template>
</p>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交前请确认平台与店铺名无误</span>
<div class="task-panel__actions">
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
</div>
</footer>
</div>
</el-dialog>
<!-- 店铺授权:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="authDialogVisible"
title="店铺授权"
width="560px"
class="shop-auth-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
@close="resetAuthForm"
>
<el-form ref="authFormRef" :model="authForm" :rules="authRules" label-width="110px" size="small">
<el-form-item label="店铺">
<el-input :model-value="authForm.shopLabel" disabled />
</el-form-item>
<el-form-item label="平台">
<el-input :model-value="authForm.platform_name || authForm.platformCode || '--'" disabled />
</el-form-item>
<el-form-item label="授权">
<el-button size="small" type="primary" plain :loading="authLinkLoading" @click="handleOpenAuthorizeLink">
去授权
</el-button>
</el-form-item>
<el-form-item v-if="!isWechatChannel" label="回调地址" prop="callbackurl">
<el-input
v-model="authForm.callbackurl"
placeholder="请输入授权完成后的回调 URL"
clearable
/>
</el-form-item>
<template v-if="isWechatChannel">
<el-form-item label="appId" prop="appId">
<el-input v-model="authForm.appId" placeholder="请输入视频号 appId" clearable />
</el-form-item>
<el-form-item label="toUserName" prop="toUserName">
<el-input v-model="authForm.toUserName" placeholder="请输入视频号 toUserName" clearable />
</el-form-item>
</template>
<el-form-item v-if="isJingdong" label="VenderID" prop="venderId">
<el-input v-model="authForm.venderId" placeholder="请输入京东商家 VenderID" clearable />
</el-form-item>
</el-form>
<template #footer>
<el-button size="small" @click="authDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="authConfirmLoading" @click="submitConfirmAuthorize">
确认授权
</el-button>
</template>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>店铺授权</h2>
<p>按平台要求完成授权,完成后自动同步店铺数据</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="authDialogVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<el-form ref="authFormRef" :model="authForm" :rules="authRules" class="task-panel__form">
<div class="task-panel__field">
<span class="task-panel__field-label">店铺</span>
<strong class="task-panel__field-value">{{ authForm.shopLabel || '—' }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">平台</span>
<strong class="task-panel__field-value">{{ authForm.platform_name || authForm.platformCode || '—' }}</strong>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">授权</span>
<div class="task-panel__field-control">
<el-button size="small" type="primary" plain :loading="authLinkLoading" @click="handleOpenAuthorizeLink">
去授权
</el-button>
<p class="task-panel__field-tip">跳转平台授权页完成授权后,回到本窗口填写下方参数</p>
</div>
</div>
<div v-if="!isWechatChannel" class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">回调地址</span>
<div class="task-panel__field-control">
<el-form-item prop="callbackurl">
<el-input
v-model="authForm.callbackurl"
size="default"
placeholder="请输入授权完成后的回调 URL"
clearable
/>
</el-form-item>
</div>
</div>
<template v-if="isWechatChannel">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">appId</span>
<div class="task-panel__field-control">
<el-form-item prop="appId">
<el-input v-model="authForm.appId" size="default" placeholder="请输入视频号 appId" clearable />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">toUserName</span>
<div class="task-panel__field-control">
<el-form-item prop="toUserName">
<el-input v-model="authForm.toUserName" size="default" placeholder="请输入视频号 toUserName" clearable />
</el-form-item>
</div>
</div>
</template>
<div v-if="isJingdong" class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">VenderID</span>
<div class="task-panel__field-control">
<el-form-item prop="venderId">
<el-input v-model="authForm.venderId" size="default" placeholder="请输入京东商家 VenderID" clearable />
</el-form-item>
</div>
</div>
</el-form>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">确认授权后将重新拉取平台店铺数据</span>
<div class="task-panel__actions">
<el-button size="small" @click="authDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="authConfirmLoading" @click="submitConfirmAuthorize">
确认授权
</el-button>
</div>
</footer>
</div>
</el-dialog>
</div>
</template>
@ -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;
}
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.shop-form-dialog,
.el-dialog.shop-auth-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -248,46 +248,111 @@
</div>
</div>
<!-- ===== 新增 / 编辑工作台弹窗 ===== -->
<!-- ===== 新增 / 编辑工作台弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) ===== -->
<el-dialog
v-model="dialogVisible"
:title="dialogMode === 'create' ? '新增工作台' : '编辑工作台'"
width="520px"
class="workbench-form-dialog"
width="min(560px, 92vw)"
align-center
destroy-on-close
append-to-body
:show-close="false"
:close-on-click-modal="false"
@close="resetForm"
>
<el-form ref="formRef" :model="formData" :rules="rules" label-width="100px" size="small">
<el-form-item label="名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入工作台名称" maxlength="100" show-word-limit />
</el-form-item>
<el-form-item label="条码" prop="barcode">
<el-input
v-model="formData.barcode"
placeholder="仓库内唯一,可选"
maxlength="64"
show-word-limit
@blur="handleBarcodeBlur"
/>
</el-form-item>
<el-form-item v-if="barcodeCheckHint">
<el-text :type="barcodeCheckHint.type" size="small">{{ barcodeCheckHint.text }}</el-text>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">禁用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="formData.remark" type="textarea" :rows="3" placeholder="可选" maxlength="200" show-word-limit />
</el-form-item>
</el-form>
<template #footer>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
</template>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>{{ dialogMode === 'create' ? '新增工作台' : '编辑工作台' }}</h2>
<p>{{ dialogMode === 'create' ? '创建后系统自动生成登录码' : '修改后保存立即生效' }}</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="dialogVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<el-form ref="formRef" :model="formData" :rules="rules" class="task-panel__form">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">名称</span>
<div class="task-panel__field-control">
<el-form-item prop="name">
<el-input
v-model="formData.name"
size="default"
placeholder="请输入工作台名称"
maxlength="100"
show-word-limit
/>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">条码</span>
<div class="task-panel__field-control">
<el-form-item prop="barcode">
<el-input
v-model="formData.barcode"
size="default"
placeholder="仓库内唯一,可选"
maxlength="64"
show-word-limit
@blur="handleBarcodeBlur"
/>
</el-form-item>
<p
v-if="barcodeCheckHint"
class="task-panel__field-tip"
:class="`is-${barcodeCheckHint.type}`"
>
{{ barcodeCheckHint.text }}
</p>
<p v-else class="task-panel__field-tip">用于扫码定位工作台,留空则不启用条码</p>
</div>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label is-required">状态</span>
<el-radio-group v-model="formData.status">
<el-radio :label="1">启用</el-radio>
<el-radio :label="0">禁用</el-radio>
</el-radio-group>
</div>
<div class="task-panel__field task-panel__field--input task-panel__field--textarea">
<span class="task-panel__field-label">备注</span>
<div class="task-panel__field-control">
<el-input
v-model="formData.remark"
type="textarea"
:rows="3"
resize="none"
size="default"
placeholder="可选"
maxlength="200"
show-word-limit
/>
</div>
</div>
</el-form>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交前请确认名称与状态无误</span>
<div class="task-panel__actions">
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
</div>
</footer>
</div>
</el-dialog>
<!-- ===== 新增成功弹窗(workbench.create):展示接口自动生成的登录码 ===== -->
@ -403,37 +468,74 @@
</template>
</el-dialog>
<!-- ===== 绑定工作台弹窗(workbench.bind):输入设备端绑定码完成关联 ===== -->
<!-- ===== 绑定工作台弹窗(workbench.bind):面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) ===== -->
<el-dialog
v-model="bindVisible"
title="绑定工作台"
width="460px"
class="workbench-bind-dialog"
width="min(560px, 92vw)"
align-center
destroy-on-close
append-to-body
:show-close="false"
:close-on-click-modal="false"
@close="resetBind"
>
<el-form ref="bindFormRef" :model="bindForm" :rules="bindRules" label-width="96px" size="small">
<el-form-item label="目标工作台">
<el-input :model-value="bindTargetDesc" disabled />
</el-form-item>
<el-form-item label="绑定码" prop="code">
<el-input
v-model="bindForm.code"
placeholder="请输入工作台屏幕上显示的 6 位绑定码"
maxlength="6"
clearable
@input="handleBindCodeInput"
/>
<div class="field-tip">
绑定码由工作台设备端生成并显示(6 位大写字母/数字)。确认绑定后,设备端将自动获取访问令牌,原工作台令牌失效。
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>绑定工作台</h2>
<p>输入设备端显示的工作台绑定码完成关联</p>
</div>
</el-form-item>
</el-form>
<template #footer>
<el-button size="small" @click="bindVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="bindSaving" @click="submitBind">确认绑定</el-button>
</template>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="bindVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<el-form ref="bindFormRef" :model="bindForm" :rules="bindRules" class="task-panel__form">
<div class="task-panel__field">
<span class="task-panel__field-label">目标工作台</span>
<strong class="task-panel__field-value">{{ bindTargetDesc || '—' }}</strong>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">绑定码</span>
<div class="task-panel__field-control">
<el-form-item prop="code">
<el-input
v-model="bindForm.code"
size="default"
placeholder="请输入工作台屏幕上显示的 6 位绑定码"
maxlength="6"
clearable
@input="handleBindCodeInput"
/>
</el-form-item>
<p class="task-panel__field-tip">绑定码为 6 位大写字母/数字,由工作台设备端生成并显示</p>
</div>
</div>
</el-form>
<p class="task-panel__form-tip">
确认绑定后,设备端将自动获取访问令牌,原工作台令牌失效。
</p>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">绑定码区分大小写,请核对后再提交</span>
<div class="task-panel__actions">
<el-button size="small" @click="bindVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="bindSaving" @click="submitBind">确认绑定</el-button>
</div>
</footer>
</div>
</el-dialog>
<!-- ===== 重置登录码弹窗(workbench.resetLoginCode):重新生成 64 位登录码 ===== -->
@ -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;
}
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.workbench-form-dialog,
.el-dialog.workbench-bind-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -52,8 +52,8 @@
<CameraPtzPanel v-if="streamReady && cameraRow?.id" :camera-id="cameraRow.id" />
</div>
<template #footer>
<el-button @click="onDialogVisibleChange(false)">关闭</el-button>
<el-button type="primary" :loading="loading" @click="reloadStream">刷新</el-button>
<el-button size="small" @click="onDialogVisibleChange(false)">关闭</el-button>
<el-button size="small" type="primary" :loading="loading" @click="reloadStream">刷新</el-button>
</template>
</el-dialog>
</template>

View File

@ -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 {

View File

@ -304,8 +304,8 @@
<div class="osd-preview-pos">当前坐标:({{ osdForm.x.toFixed(1) }}, {{ osdForm.y.toFixed(1) }})</div>
</div>
<template #footer>
<el-button @click="osdVisible = false">取消</el-button>
<el-button type="primary" :loading="osdSaving" @click="submitOsd">
<el-button size="small" @click="osdVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="osdSaving" @click="submitOsd">
应用 OSD
</el-button>
</template>
@ -634,7 +634,11 @@ async function handleDeleteCamera(row: Record<string, any>) {
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
}

View File

@ -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 {

View File

@ -288,7 +288,11 @@ async function handleDeleteServer(row: Record<string, any>) {
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<string, any>) {
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()

View File

@ -1,58 +1,153 @@
<!--
ServerFormDialog — 录像服务器新增/编辑表单弹窗
面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm)
-->
<template>
<el-dialog
:model-value="visible"
:title="isEdit ? '编辑录像服务器' : '新增录像服务器'"
width="560px"
class="server-form-dialog"
width="min(560px, 92vw)"
align-center
destroy-on-close
:show-close="false"
:close-on-click-modal="false"
append-to-body
@closed="handleClosed"
>
<div class="form-body">
<el-form ref="formRef" :model="form" :rules="rules" label-width="100px" size="small">
<el-form-item label="服务器名称" prop="name">
<el-input v-model="form.name" placeholder="请输入服务器名称" maxlength="100" show-word-limit />
</el-form-item>
<el-form-item label="公网IP" prop="public_ip">
<div class="ip-port-row">
<el-input v-model="form.public_ip" placeholder="请输入公网IP" maxlength="50" class="ip-input" />
<el-input-number v-model="form.public_port" :min="1" :max="65535" placeholder="端口" class="port-input" controls-position="right" />
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>{{ isEdit ? '编辑录像服务器' : '新增录像服务器' }}</h2>
<p>{{ isEdit ? '修改后保存立即生效' : '填写服务器地址与账号信息后保存' }}</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="handleClosed"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<el-form ref="formRef" :model="form" :rules="rules" class="task-panel__form">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">服务器名称</span>
<div class="task-panel__field-control">
<el-form-item prop="name">
<el-input v-model="form.name" size="default" placeholder="请输入服务器名称" maxlength="100" show-word-limit />
</el-form-item>
</div>
</div>
</el-form-item>
<el-form-item label="内网IP" prop="internal_ip">
<div class="ip-port-row">
<el-input v-model="form.internal_ip" placeholder="请输入内网IP" maxlength="50" class="ip-input" />
<el-input-number v-model="form.internal_port" :min="1" :max="65535" placeholder="端口" class="port-input" controls-position="right" />
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">公网 IP</span>
<div class="task-panel__field-control">
<el-form-item prop="public_ip">
<div class="ip-port-row">
<el-input v-model="form.public_ip" size="default" placeholder="请输入公网IP" maxlength="50" class="ip-input" />
<el-input-number
v-model="form.public_port"
size="default"
:min="1"
:max="65535"
placeholder="端口"
class="port-input"
controls-position="right"
/>
</div>
</el-form-item>
<p class="task-panel__field-tip">公网 IP 与端口用于外部访问,端口留空使用默认端口</p>
</div>
</div>
</el-form-item>
<el-form-item label="用户名" prop="username">
<el-input v-model="form.username" placeholder="请输入用户名" maxlength="50" />
</el-form-item>
<el-form-item label="密码" prop="password">
<el-input v-model="form.password" type="password" placeholder="请输入密码" maxlength="50" show-password />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-switch
v-model="form.status"
:active-value="1"
:inactive-value="0"
active-text="启用"
inactive-text="禁用"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" maxlength="200" show-word-limit />
</el-form-item>
</el-form>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">内网 IP</span>
<div class="task-panel__field-control">
<el-form-item prop="internal_ip">
<div class="ip-port-row">
<el-input v-model="form.internal_ip" size="default" placeholder="请输入内网IP" maxlength="50" class="ip-input" />
<el-input-number
v-model="form.internal_port"
size="default"
:min="1"
:max="65535"
placeholder="端口"
class="port-input"
controls-position="right"
/>
</div>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">用户名</span>
<div class="task-panel__field-control">
<el-form-item prop="username">
<el-input v-model="form.username" size="default" placeholder="请输入用户名" maxlength="50" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">密码</span>
<div class="task-panel__field-control">
<el-form-item prop="password">
<el-input
v-model="form.password"
type="password"
size="default"
placeholder="请输入密码"
maxlength="50"
show-password
/>
</el-form-item>
</div>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">状态</span>
<el-switch
v-model="form.status"
:active-value="1"
:inactive-value="0"
active-text="启用"
inactive-text="禁用"
/>
</div>
<div class="task-panel__field task-panel__field--input task-panel__field--textarea">
<span class="task-panel__field-label">备注</span>
<div class="task-panel__field-control">
<el-form-item prop="remark">
<el-input
v-model="form.remark"
type="textarea"
:rows="3"
resize="none"
size="default"
placeholder="请输入备注"
maxlength="200"
show-word-limit
/>
</el-form-item>
</div>
</div>
</el-form>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交前请确认服务器地址与账号无误</span>
<div class="task-panel__actions">
<el-button size="small" @click="handleClosed">取消</el-button>
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
</div>
</footer>
</div>
<template #footer>
<el-button @click="handleClosed">取消</el-button>
<el-button type="primary" :loading="saving" @click="submitForm">保存</el-button>
</template>
</el-dialog>
</template>
@ -197,12 +292,174 @@ async function submitForm() {
</script>
<style lang="scss" scoped>
.form-body {
max-height: 60vh;
overflow-y: auto;
padding-right: 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;
}
}
/* 字段较多:超出 60vh 时面板内滚动 */
&__body {
padding: 12px 16px 0;
max-height: 60vh;
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-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;
}
}
/* IP + 端口:同一行,输入框自适应,端口固定宽度 */
.ip-port-row {
display: flex;
gap: 8px;
@ -219,3 +476,19 @@ async function submitForm() {
flex-shrink: 0;
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.server-form-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>

View File

@ -259,105 +259,136 @@
</div>
</div>
<!-- 发起签约弹窗 -->
<!-- 发起签约弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="signDialog.visible"
:title="signDialog.title"
width="480px"
class="sign-panel-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
:close-on-click-modal="false"
@close="resetSignDialog"
>
<template v-if="signDialog.step === 1">
<el-form :model="signForm" label-width="100px" size="small">
<el-form-item label="对方主体ID" required>
<el-input-number v-model.number="signForm.counterparty_id" placeholder="请输入对方主体ID" style="width: 100%" :controls="false" />
</el-form-item>
</el-form>
</template>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>{{ signDialog.title }}</h2>
<p>{{ signSubtitle }}</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="signDialog.visible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<!-- 预览结果 / 提交结果 -->
<template v-else-if="signDialog.step === 2">
<div class="sign-preview">
<!-- 预览模式:展示双方主体信息 -->
<template v-if="signDialog.signMode === 'preview'">
<el-descriptions :column="1" border size="small">
<el-descriptions-item label="己方(货主)">
{{ signDialog.currentSubject?.company_name || '—' }}
<el-tag size="small" type="warning" effect="plain" style="margin-left:6px">货主方</el-tag>
</el-descriptions-item>
<el-descriptions-item label="对方(仓库)">
{{ signDialog.counterparty?.company_name || '—' }}
<el-tag size="small" type="primary" effect="plain" style="margin-left:6px">仓库方</el-tag>
</el-descriptions-item>
</el-descriptions>
<div class="sign-tip">
<el-alert type="info" :closable="false" show-icon>
<template #default>请确认签约信息,确认无误后点击「确认提交」。</template>
</el-alert>
<div class="task-panel__body">
<!-- Step 1:填写对方主体 -->
<div v-if="signDialog.step === 1" class="task-panel__form">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">对方主体 ID</span>
<div class="task-panel__field-control">
<el-input-number
v-model.number="signForm.counterparty_id"
size="default"
placeholder="请输入对方主体ID"
style="width: 100%"
:controls="false"
/>
<p class="task-panel__field-tip">填写对方(仓库方)的主体 ID,预览确认无误后再提交</p>
</div>
</div>
</template>
<!-- 提交后:展示合同信息 -->
<template v-else>
<el-descriptions :column="2" border size="small">
<el-descriptions-item label="签约ID">{{ signDialog.contract?.id || '—' }}</el-descriptions-item>
<el-descriptions-item label="签约状态">
<el-tag size="small" :type="getAuthStatusType(signDialog.contract?.auth_status)">
{{ signDialog.contract?.auth_status_label || '—' }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="仓库">{{ signDialog.contract?.warehouse_name || signDialog.contract?.counterparty_name || '—' }}</el-descriptions-item>
<el-descriptions-item label="货主">{{ signDialog.contract?.store_name || '—' }}</el-descriptions-item>
<el-descriptions-item label="备注">{{ signDialog.contract?.remask || '—' }}</el-descriptions-item>
<el-descriptions-item label="面单余额">{{ signDialog.contract?.print_quantity ?? '—' }}</el-descriptions-item>
</el-descriptions>
<div class="sign-tip">
<el-alert
v-if="signDialog.signMode === 'initiate'"
type="info" :closable="false" show-icon
>
<template #default>已提交申请,等待对方确认。</template>
</el-alert>
<el-alert
v-else-if="signDialog.signMode === 'already_exists'"
type="warning" :closable="false" show-icon
>
<template #default>对方已发起签约申请,等待处理。</template>
</el-alert>
<el-alert
v-else-if="signDialog.signMode === 'already_confirmed'"
type="success" :closable="false" show-icon
>
<template #default>该签约已完成,无需重复提交。</template>
</el-alert>
</div>
</template>
</div>
</template>
</div>
<template #footer>
<div class="dialog-footer">
<!-- Step 1: 填写信息 -->
<template v-if="signDialog.step === 1">
<el-button size="small" @click="signDialog.visible = false">取消</el-button>
<el-button size="small" type="primary" :loading="signDialog.loading" @click="doPreviewSign">
预览
</el-button>
</template>
<!-- Step 2: 预览结果 -->
<template v-else-if="signDialog.step === 2">
<el-button size="small" @click="goBackToStep1">返回</el-button>
<el-button
v-if="signDialog.signMode === 'preview'"
size="small"
type="primary"
:loading="signDialog.loading"
@click="doSubmitSign"
>确认提交</el-button>
<el-button v-else size="small" @click="signDialog.visible = false">关闭</el-button>
</template>
<!-- Step 2:预览结果 / 提交结果 -->
<div v-else-if="signDialog.step === 2" class="sign-preview">
<!-- 预览模式:展示双方主体信息 -->
<template v-if="signDialog.signMode === 'preview'">
<el-descriptions :column="1" border size="small">
<el-descriptions-item label="己方(货主)">
{{ signDialog.currentSubject?.company_name || '—' }}
<el-tag size="small" type="warning" effect="plain" style="margin-left:6px">货主方</el-tag>
</el-descriptions-item>
<el-descriptions-item label="对方(仓库)">
{{ signDialog.counterparty?.company_name || '—' }}
<el-tag size="small" type="primary" effect="plain" style="margin-left:6px">仓库方</el-tag>
</el-descriptions-item>
</el-descriptions>
<div class="sign-tip">
<el-alert type="info" :closable="false" show-icon>
<template #default>请确认签约信息,确认无误后点击「确认提交」。</template>
</el-alert>
</div>
</template>
<!-- 提交后:展示合同信息 -->
<template v-else>
<el-descriptions :column="2" border size="small">
<el-descriptions-item label="签约ID">{{ signDialog.contract?.id || '—' }}</el-descriptions-item>
<el-descriptions-item label="签约状态">
<el-tag size="small" :type="getAuthStatusType(signDialog.contract?.auth_status)">
{{ signDialog.contract?.auth_status_label || '—' }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="仓库">{{ signDialog.contract?.warehouse_name || signDialog.contract?.counterparty_name || '—' }}</el-descriptions-item>
<el-descriptions-item label="货主">{{ signDialog.contract?.store_name || '—' }}</el-descriptions-item>
<el-descriptions-item label="备注">{{ signDialog.contract?.remask || '—' }}</el-descriptions-item>
<el-descriptions-item label="面单余额">{{ signDialog.contract?.print_quantity ?? '—' }}</el-descriptions-item>
</el-descriptions>
<div class="sign-tip">
<el-alert
v-if="signDialog.signMode === 'initiate'"
type="info" :closable="false" show-icon
>
<template #default>已提交申请,等待对方确认。</template>
</el-alert>
<el-alert
v-else-if="signDialog.signMode === 'already_exists'"
type="warning" :closable="false" show-icon
>
<template #default>对方已发起签约申请,等待处理。</template>
</el-alert>
<el-alert
v-else-if="signDialog.signMode === 'already_confirmed'"
type="success" :closable="false" show-icon
>
<template #default>该签约已完成,无需重复提交。</template>
</el-alert>
</div>
</template>
</div>
</div>
</template>
<footer class="task-panel__foot">
<span class="task-panel__hint">{{ signFooterHint }}</span>
<div class="task-panel__actions">
<!-- Step 1: 填写信息 -->
<template v-if="signDialog.step === 1">
<el-button size="small" @click="signDialog.visible = false">取消</el-button>
<el-button size="small" type="primary" :loading="signDialog.loading" @click="doPreviewSign">
预览
</el-button>
</template>
<!-- Step 2: 预览结果 -->
<template v-else-if="signDialog.step === 2">
<el-button size="small" @click="goBackToStep1">返回</el-button>
<el-button
v-if="signDialog.signMode === 'preview'"
size="small"
type="primary"
:loading="signDialog.loading"
@click="doSubmitSign"
>确认提交</el-button>
<el-button v-else size="small" @click="signDialog.visible = false">关闭</el-button>
</template>
</div>
</footer>
</div>
</el-dialog>
<!-- 奇门接口配置查看弹窗 -->
@ -430,6 +461,70 @@
</template>
</el-dialog>
<!-- 修改备注:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
<el-dialog
v-model="renameVisible"
class="rename-remark-dialog"
width="min(560px, 92vw)"
align-center
append-to-body
:show-close="false"
:close-on-click-modal="false"
>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2>修改备注</h2>
<p>提交后立即更新该签约仓库的备注名</p>
</div>
<button
class="task-panel__close"
type="button"
aria-label="关闭"
@click="renameVisible = false"
>
<svg viewBox="0 0 12 12" fill="none">
<path d="M1 1L11 11M11 1L1 11" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" />
</svg>
</button>
</header>
<div class="task-panel__body">
<div class="task-panel__form">
<div class="task-panel__field">
<span class="task-panel__field-label">签约仓库</span>
<strong class="task-panel__field-value">{{ renameRow?.counterparty_name || '—' }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">仓库 ID</span>
<strong class="task-panel__field-value">{{ renameRow?.warehouse_id ?? '—' }}</strong>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">备注名</span>
<div class="task-panel__field-control">
<el-input
v-model="renameForm.remask"
size="default"
placeholder="请输入新的备注名"
clearable
@keyup.enter="submitRename"
/>
<p class="task-panel__field-tip">备注名用于区分同名仓库,不能为空</p>
</div>
</div>
</div>
</div>
<footer class="task-panel__foot">
<span class="task-panel__hint">提交后立即生效,请确认备注名无误</span>
<div class="task-panel__actions">
<el-button size="small" @click="renameVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="renameLoading" @click="submitRename">确定</el-button>
</div>
</footer>
</div>
</el-dialog>
<AsyncExportProgressDialog
v-model:visible="exportDialogVisible"
title="面单日志导出"
@ -798,21 +893,40 @@ async function handleUnbind(row: any, targetStatus: number) {
}
// ─── 修改备注 ──────────────────────────────────────────────────────────────
async function handleRename(row: any) {
const renameVisible = ref(false)
const renameLoading = ref(false)
const renameRow = ref<any>(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;
}
}
}
</style>
<style lang="scss">
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
.el-dialog.rename-remark-dialog,
.el-dialog.sign-panel-dialog {
padding: 0;
overflow: hidden;
.el-dialog__header {
display: none;
}
.el-dialog__body {
padding: 0;
}
}
</style>