refactor(ui): 统一各模块弹窗为 task-panel 风格并完善交互细节
将 20+ 处 el-dialog 统一为自定义头部(标题 + 说明 + 关闭按钮)的 task-panel 布局,宽度改为 min(px, vw) 自适应,表单单列/双列栅格化,补齐底部提示与 滚动区域,移除冗余的 title/footer 默认样式;并顺带移除部分弹窗中已失效的 提示文案。 包含范围: - 系统设置:角色/权限/账号/工作台/打印电脑/拣货车、基础管理(报表定义、 应用、配送计划、详情面板) - 订单:波次策略、绑定包材、面单面板、售后退货相关弹窗 - 仓储:收货建单、出库转单、盘点(表单/记录)、库存明细、组合商品 - 消息/售后/物料/装箱流水/自动回复等模块的表单与详情弹窗 feat(video): 新增录像播放失败原因诊断 - 新增 utils/videoDiagnose.ts:结合 <video> error.code 与源地址探测 (HEAD,失败回退 Range GET)区分证书失效 / 断网 / CORS / 404 / 超时 / 编码不支持,给出可读原因与排查建议 - packingflow、returnUnpack 的 VideoPlayerDialog 与 VideoListDialog 接入, 错误态展示原因、建议与录像地址,异步结果按序号丢弃过期响应 feat(stock-check): 支持静态盘点拣货完成标记 - stock.check.ts 补充 picking_completed / locked_quantity / detail_id / location_id / snapshot_quantity 等字段类型与口径注释 - 盘点记录面板对 picking_completed=0 的商品展示「拣货中」标签(仅提示, 不拦截上报) feat(wave): 波次策略快速扫描成功后 1.5 秒自动关闭弹窗 - 失败保持打开以便查看错误;同步更新《进度条弹窗-使用清单》
This commit is contained in:
parent
60e7b4d132
commit
c2b8a9fe5e
161
.tmp-def-form.txt
Normal file
161
.tmp-def-form.txt
Normal file
@ -0,0 +1,161 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="visible"
|
||||
class="definition-form-dialog"
|
||||
width="min(680px, 94vw)"
|
||||
align-center
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
@closed="handleClosed"
|
||||
>
|
||||
<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>
|
||||
<el-form-item prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入报表名称(≤100 字符)" maxlength="100" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">报表类型</span>
|
||||
<el-form-item prop="type">
|
||||
<el-select
|
||||
v-model="form.type"
|
||||
:disabled="isEdit"
|
||||
placeholder="请选择报表类型"
|
||||
style="width: 100%"
|
||||
@change="handleTypeChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="opt in typeOptions"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">导出文件名</span>
|
||||
<el-form-item prop="file_name">
|
||||
<el-input
|
||||
v-model="form.file_name"
|
||||
placeholder="导出文件名模板,支持 {date}/{time}/{datetime}/{timestamp} 占位(≤200 字符)"
|
||||
maxlength="200"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">勾选字段</span>
|
||||
<el-form-item prop="fields">
|
||||
<div class="field-picker">
|
||||
<el-checkbox-group v-model="form.fields" class="field-checkbox-group">
|
||||
<el-checkbox
|
||||
v-for="f in currentTypeFields"
|
||||
:key="f.key"
|
||||
:label="f.key"
|
||||
>
|
||||
{{ f.label }}
|
||||
<span v-if="f.computed" class="field-computed">(预计算)</span>
|
||||
<span v-else-if="f.asText" class="field-astext">(文本)</span>
|
||||
<span v-if="f.children?.length" class="field-array">(含子字段 {{ f.children.length }} 项)</span>
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
|
||||
<div v-if="!currentTypeFields.length" class="field-empty">
|
||||
{{ isEdit ? '未找到该类型的字段清单' : '请先选择报表类型' }}
|
||||
</div>
|
||||
|
||||
<div v-if="form.fields.length" class="field-order">
|
||||
<div class="field-order__title">
|
||||
字段顺序(自上而下即导出表格列顺序)
|
||||
<span class="field-order__tip">已选 {{ form.fields.length }} 项,可拖动手柄或使用按钮调整</span>
|
||||
</div>
|
||||
<div ref="orderListRef" class="field-order__list">
|
||||
<div
|
||||
v-for="(key, idx) in form.fields"
|
||||
:key="key"
|
||||
class="field-order__item"
|
||||
>
|
||||
<el-icon class="field-order__drag" :size="14"><Rank /></el-icon>
|
||||
<span class="field-order__idx">{{ idx + 1 }}</span>
|
||||
<span class="field-order__label" :title="key">{{ fieldLabel(key) }}</span>
|
||||
<span class="field-order__key">{{ key }}</span>
|
||||
<span class="field-order__actions">
|
||||
<el-button link size="small" :disabled="idx === 0" @click="moveField(idx, -1)">
|
||||
上移
|
||||
</el-button>
|
||||
<el-button link size="small" :disabled="idx === form.fields.length - 1" @click="moveField(idx, 1)">
|
||||
下移
|
||||
</el-button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">启用状态</span>
|
||||
<div class="task-panel__field-control">
|
||||
<el-form-item prop="is_enabled">
|
||||
<el-switch v-model="form.is_enabled" :active-value="1" :inactive-value="0" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--textarea">
|
||||
<span class="task-panel__field-label">备注</span>
|
||||
<el-form-item prop="remark">
|
||||
<el-input
|
||||
v-model="form.remark"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
resize="none"
|
||||
maxlength="500"
|
||||
placeholder="最长 500 字符"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
<template v-if="isEdit">报表类型一经创建不可更改;</template>
|
||||
导出文件名支持 {date} 数据日期、{time} 生成时刻 HHmmss、{datetime} 数据日期_生成时刻、{timestamp} 毫秒时间戳;勾选字段的顺序即导出表格的列顺序。
|
||||
</p>
|
||||
</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="submitting" @click="handleSubmit">确认</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
@ -7,6 +7,7 @@
|
||||
> `components/task-progress/UnifiedTaskProgressDialog.vue`(猎豹进度条)渲染,
|
||||
> 组件名与页面调用方式保持不变。
|
||||
> 任务完成后弹窗保持打开并展示完成状态,由用户手动关闭(导出、抓取、波次批量任务同样)。
|
||||
> **例外**:波次策略快速扫描弹窗扫描成功后 **1.5 秒自动关闭**(失败保持打开,见下方第 4 项)。
|
||||
>
|
||||
> 示例入口:`order/waveOrder?tab=sandanFallbackOrders` → 「不符合波次策略订单列表」→ 工具栏「快速扫描」→ 波次策略快速扫描进度弹窗。
|
||||
|
||||
@ -75,6 +76,7 @@
|
||||
- `views/order/waveOrder/GroupWaveBatchListPanel.vue` ← `tab=groupWave` 团购波次
|
||||
- 触发:工具栏「快速扫描」(`wave-config.ts` 中 `label: '快速扫描'`)
|
||||
- 已改为基于 `UnifiedTaskProgressDialog` 渲染(猎豹进度条);扫描中可「后台运行」关闭弹窗,轮询继续,任务结束后刷新列表。
|
||||
- **扫描成功后 1.5 秒自动关闭弹窗**(`AUTO_CLOSE_DELAY = 1500`,与导出进度弹窗一致);失败(failed / not_found)不自动关闭,便于查看错误信息。
|
||||
|
||||
### 5. `views/order/waveOrder/component/WaveFetchTaskProgressDialog.vue`
|
||||
- 标题:`抓取任务`
|
||||
|
||||
@ -35,6 +35,12 @@ export type StockCheckEnvelope<T> = {
|
||||
* is_static=1 的任务在 approved/checking 期间锁定其商品范围内的 stock_id,
|
||||
* 完成/取消后解除 —— 库存操作(移库 / 分配储位等)前置判断可调 stockCheckStaticLockList。
|
||||
*
|
||||
* 静态盘点拣货完成标记(2026-10-29 文档新增 `picking_completed`):
|
||||
* 静态盘点任务(is_static=1)中,商品须「仓库内锁定数量为 0(拣货完成)」才允许上报,
|
||||
* 否则 report 返回 400「商品尚未完成拣货,不满足静态盘点要求…」。
|
||||
* 前端可提前读取该标记给提示:workData 的 space 视图 `rows[].goods[].picking_completed`、
|
||||
* workDataDetail 商品钻取 `data.picking_completed`(另有顶层 `locked_quantity` 锁定量合计)。
|
||||
*
|
||||
* 作业数据(workData 家族,2026-10-07 文档更新):
|
||||
* · workData —— 三视图(location/goods/space),服务端分页,新增 keyword / only_abnormal 入参,
|
||||
* **不再返回 check**(任务信息请调 detail)
|
||||
@ -1010,14 +1016,27 @@ export type StockCheckWorkLocationRow = {
|
||||
export type StockCheckWorkGoodsLocation = {
|
||||
/** 空库位归 location_code=null 组 */
|
||||
location_code?: string | null
|
||||
/**
|
||||
* 该库位盘点明细ID(wms_stock_check_detail.id,无明细快照的库位为 null)
|
||||
*
|
||||
* 📌 文档 `workData` goods 视图 locations 显式列出(可直接回传 `stock.check.report`)
|
||||
*/
|
||||
detail_id?: number | null
|
||||
checked_at?: string | null
|
||||
checker_name?: string | null
|
||||
/** 该库位该商品全部作业记录 ID(按记录 id 升序,供编辑/移除单条记录) */
|
||||
record_ids?: number[]
|
||||
/** 该库位该商品全部作业照片(扁平去重) */
|
||||
images?: StockCheckWorkImage[]
|
||||
/** 该库位账面数量(=可用+锁定;仅明盘) */
|
||||
/**
|
||||
* 该库位账面数量(仅明盘)
|
||||
*
|
||||
* ⚠️ 口径 = **可用数量**(wms_storage `SUM(available_quantity)`),
|
||||
* **不含锁定**;无库存记录的库位为 0。
|
||||
*/
|
||||
system_quantity?: number | null
|
||||
/** 该库位账面**快照**(盘点开始时的账面;仅明盘) */
|
||||
snapshot_quantity?: number | null
|
||||
/** 该库位锁定数量(仅明盘) */
|
||||
locked_quantity?: number | null
|
||||
/** 该库位实盘数量(未盘库位 0;仅明盘) */
|
||||
@ -1075,6 +1094,16 @@ export type StockCheckWorkSpaceGoods = {
|
||||
checked_quantity?: number | null
|
||||
/** 该库位该商品全部作业记录 ID(2026-10-07 文档新增) */
|
||||
record_ids?: number[]
|
||||
/**
|
||||
* 该商品是否**已完成拣货**(📌 2026-10-29 文档新增;**仅静态盘点 `is_static=1` 返回**,明盘/盲盘均返回)
|
||||
*
|
||||
* 1=已完成 / 0=未完成;口径=仓库内该商品 `wms_storage SUM(locked_quantity)` 是否为 0,
|
||||
* 按商品维度判定(同一商品各库位行取值一致)。
|
||||
*
|
||||
* ⚠️ 为 0 时该商品**不可上报**:`stock.check.report` 会返回 400
|
||||
* 「商品尚未完成拣货,不满足静态盘点要求,请先等待该商品完全完成拣货」。
|
||||
*/
|
||||
picking_completed?: 0 | 1 | number | boolean | null
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
@ -1098,6 +1127,13 @@ export type StockCheckWorkSpaceRow = {
|
||||
custom_barcode?: string | null
|
||||
/** 库位自定义名称(空为 null,不兜底 space_code) */
|
||||
custom_name?: string | null
|
||||
/**
|
||||
* `id` 同义字段(库位ID wms_location_space.id)
|
||||
*
|
||||
* 📌 文档显式输出:便于与 location/goods 视图、recordList、result 统一命名,
|
||||
* 并可直接回传 `stock.check.report`(其库位参数就叫 `space_id` / `location_id`)
|
||||
*/
|
||||
location_id?: number | null
|
||||
/** 该库位下的任务商品 */
|
||||
goods?: StockCheckWorkSpaceGoods[]
|
||||
[key: string]: unknown
|
||||
@ -1263,7 +1299,7 @@ export type StockCheckWorkDetailGoodsRow = {
|
||||
/** 作业记录照片 */
|
||||
images?: StockCheckWorkImage[]
|
||||
/**
|
||||
* 该库位**当前**账面(wms_storage 可用+锁定;仅明盘)
|
||||
* 该库位**当前账面数量**(wms_storage 可用数量;仅明盘)
|
||||
*
|
||||
* ⚠️ 静态盘点(is_static=1)时**不参与差异计算**,参与计算的是 `snapshot_quantity`。
|
||||
*/
|
||||
@ -1306,6 +1342,9 @@ export type StockCheckWorkDetailGoodsSummary = {
|
||||
* · is_static=0(普通盘点)→ `system_quantity` 取**当前** wms_storage 账面 SUM(available_quantity+locked_quantity)
|
||||
* 两种口径都会额外输出 `storage_quantity`(当前 storage 账面)与 `snapshot_quantity`(明细快照)供对照,
|
||||
* `system_quantity` 始终是参与差异计算的那个账面;`book_source` 标识来源(snapshot|storage)。
|
||||
*
|
||||
* 📌 2026-10-29 文档新增:静态盘点(is_static=1)时顶层另返回
|
||||
* `picking_completed`(1=已完成拣货 / 0=未完成)与 `locked_quantity`(该商品仓库内锁定量合计,仅明盘)。
|
||||
*/
|
||||
export type StockCheckWorkDetailGoods = {
|
||||
/** 盘点任务ID */
|
||||
@ -1324,6 +1363,21 @@ export type StockCheckWorkDetailGoods = {
|
||||
is_static?: boolean | number | null
|
||||
/** 账面来源:snapshot=取明细快照 / storage=取当前 storage 账面 */
|
||||
book_source?: 'snapshot' | 'storage' | string
|
||||
/**
|
||||
* 该商品是否**已完成拣货**(📌 2026-10-29 文档新增;**仅静态盘点 `is_static=1` 返回**)
|
||||
*
|
||||
* 1=已完成 / 0=未完成;口径=仓库内该商品 `wms_storage SUM(locked_quantity)` 是否为 0。
|
||||
* ⚠️ 为 0 时该商品**不可上报**(`stock.check.report` 返回 400「商品尚未完成拣货…」),
|
||||
* 前端可在商品钻取视图据此给「拣货中」提示,避免直接提交被拒。
|
||||
*/
|
||||
picking_completed?: 0 | 1 | number | boolean | null
|
||||
/**
|
||||
* 该商品**仓库内锁定量合计**(`wms_storage SUM(locked_quantity)`;**仅明盘**返回)
|
||||
*
|
||||
* 📌 2026-10-29 文档新增(静态盘点商品钻取顶层);> 0 即存在在途出库未拣完,
|
||||
* 与 `picking_completed=0` 同源。
|
||||
*/
|
||||
locked_quantity?: number | null
|
||||
/** 商品级汇总(**仅明盘**;盲盘不返回 summary 与任何数量字段) */
|
||||
summary?: StockCheckWorkDetailGoodsSummary
|
||||
/** 按库位分行(顺序与 workData goods 视图 locations 一致) */
|
||||
@ -1388,6 +1442,8 @@ export type StockCheckWorkDataDetailParams =
|
||||
* · 库位明细(scope_type=location)→ 结构同 workData 的 location 视图单行
|
||||
* · 商品钻取(id + stock_id,或 detail_id 指向商品范围行)→ `StockCheckWorkDetailGoods`
|
||||
* (商品级汇总 summary + 按库位分行 rows;账面口径随任务 is_static 区分,见该类型注释)
|
||||
* - 静态盘点(is_static=1)商品钻取顶层另含 `picking_completed`(1=已完成拣货/0=未完成)
|
||||
* 与 `locked_quantity`(商品仓库内锁定量合计,仅明盘)—— 2026-10-29 文档新增
|
||||
* - 仅任务 `approved`(待盘点)/ `checking`(盘点中)可拉取(与 workData 同口径)
|
||||
*/
|
||||
export function stockCheckWorkDataDetail(
|
||||
|
||||
129
src/utils/videoDiagnose.ts
Normal file
129
src/utils/videoDiagnose.ts
Normal file
@ -0,0 +1,129 @@
|
||||
/**
|
||||
* 录像播放失败原因诊断
|
||||
*
|
||||
* `<video>` 的 `error.code` 只有 4 个粗分类,资源根本加载不下来时一律是
|
||||
* 4(MEDIA_ERR_SRC_NOT_SUPPORTED)。而下面这些原因**全都**会落到 4:
|
||||
* - HTTPS 证书过期 / 域名不匹配(`net::ERR_CERT_DATE_INVALID` 等)
|
||||
* - 域名解析不到、断网、被防火墙拦
|
||||
* - 存储桶 CORS 未放行(跨域拦截)
|
||||
* - 文件已被删除 / 签名过期 → 403、404
|
||||
* - 真正的编码格式不支持
|
||||
*
|
||||
* 直接显示「视频格式不支持或文件不存在」会把排查方向带偏(曾把「CDN 证书过期」
|
||||
* 误判成文件/格式问题),因此报错后再对源地址做一次轻量探测,把原因区分出来。
|
||||
*
|
||||
* 探测手段:先 `HEAD`,失败再用 `Range: bytes=0-1` 的 `GET`(有些存储桶 CORS 只放行 GET)。
|
||||
* 注意:浏览器出于安全限制不暴露 TLS 细节,证书类错误在 JS 里只能表现为
|
||||
* `fetch` 直接 reject,因此与「断网 / 跨域」合并成同一类提示,并在 hint 里给出
|
||||
* 「新标签页打开该地址」的排查动作。
|
||||
*/
|
||||
|
||||
/** 探测结果 */
|
||||
type ProbeResult =
|
||||
| { kind: 'ok' }
|
||||
| { kind: 'http'; status: number }
|
||||
| { kind: 'timeout' }
|
||||
/** 网络层失败:证书失效 / DNS / 断网 / 跨域拦截 */
|
||||
| { kind: 'blocked' }
|
||||
|
||||
/** 诊断结果 */
|
||||
export type VideoErrorInfo = {
|
||||
/** 主文案:失败原因 */
|
||||
message: string
|
||||
/** 建议:给现场人员 / 运维的排查方向 */
|
||||
hint: string
|
||||
}
|
||||
|
||||
/** 探测超时(毫秒),避免证书/网络卡死时弹窗一直"诊断中" */
|
||||
const PROBE_TIMEOUT = 8000
|
||||
|
||||
/** 探测完成前先展示的基础文案,避免空白 */
|
||||
export function videoErrorBaseText(code?: number | null): string {
|
||||
switch (code) {
|
||||
case 1:
|
||||
return '视频加载被中止'
|
||||
case 2:
|
||||
return '网络错误,无法加载视频'
|
||||
case 3:
|
||||
return '视频解码失败(编码格式不支持)'
|
||||
default:
|
||||
return '视频加载失败'
|
||||
}
|
||||
}
|
||||
|
||||
async function probeOnce(url: string, method: 'HEAD' | 'GET'): Promise<ProbeResult> {
|
||||
const controller = new AbortController()
|
||||
const timer = setTimeout(() => controller.abort(), PROBE_TIMEOUT)
|
||||
try {
|
||||
const init: RequestInit = {
|
||||
method,
|
||||
mode: 'cors',
|
||||
cache: 'no-store',
|
||||
signal: controller.signal
|
||||
}
|
||||
// 只要 2 个字节,既能验证可访问性,又不至于把整个录像拉下来
|
||||
if (method === 'GET') init.headers = { Range: 'bytes=0-1' }
|
||||
const res = await fetch(url, init)
|
||||
return res.ok ? { kind: 'ok' } : { kind: 'http', status: res.status }
|
||||
} catch {
|
||||
return controller.signal.aborted ? { kind: 'timeout' } : { kind: 'blocked' }
|
||||
} finally {
|
||||
clearTimeout(timer)
|
||||
}
|
||||
}
|
||||
|
||||
async function probeVideoUrl(url: string): Promise<ProbeResult> {
|
||||
const head = await probeOnce(url, 'HEAD')
|
||||
// HEAD 被 CORS 拦(部分存储桶只放行 GET)时,再用带 Range 的 GET 复核一次
|
||||
if (head.kind !== 'blocked') return head
|
||||
return probeOnce(url, 'GET')
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据 `<video>` 的 error.code + 源地址探测结果,给出可读的失败原因。
|
||||
* 无异步副作用以外的行为,调用方可直接用返回值覆盖提示文案。
|
||||
*/
|
||||
export async function diagnoseVideoError(
|
||||
url: string | undefined | null,
|
||||
code?: number | null
|
||||
): Promise<VideoErrorInfo> {
|
||||
if (code === 1) {
|
||||
return { message: '视频加载被中止', hint: '可点击「重试」重新加载' }
|
||||
}
|
||||
if (code === 3) {
|
||||
return {
|
||||
message: '视频解码失败(编码格式不支持)',
|
||||
hint: '录制文件需为 H.264 视频 + AAC 音频的 MP4,请确认录制参数'
|
||||
}
|
||||
}
|
||||
if (!url) {
|
||||
return { message: '录像地址为空', hint: '请检查该录像的上传状态,或重新触发录制' }
|
||||
}
|
||||
|
||||
const result = await probeVideoUrl(url)
|
||||
if (result.kind === 'ok') {
|
||||
return {
|
||||
message: '录像地址可访问,但浏览器无法播放',
|
||||
hint: '文件大概率是编码格式不受支持(需 H.264/AAC 的 MP4),请检查录制参数'
|
||||
}
|
||||
}
|
||||
if (result.kind === 'http') {
|
||||
return {
|
||||
message: `录像文件不可用(HTTP ${result.status})`,
|
||||
hint:
|
||||
result.status === 404
|
||||
? '录像文件不存在或已被清理,请确认存储桶里的文件是否还在'
|
||||
: '录像文件无访问权限(防盗链/签名过期/存储桶权限),请让运维检查'
|
||||
}
|
||||
}
|
||||
if (result.kind === 'timeout') {
|
||||
return {
|
||||
message: '录像地址访问超时',
|
||||
hint: '录像服务/存储桶网络异常,请检查服务端与 CDN 状态'
|
||||
}
|
||||
}
|
||||
return {
|
||||
message: '无法访问录像地址(HTTPS 证书失效 / 断网 / 跨域被拦)',
|
||||
hint: '把该地址复制到浏览器新标签打开:若提示「您的连接不是私密连接」或 NET::ERR_CERT_DATE_INVALID,说明域名证书已过期,需运维续签'
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
<!--
|
||||
售后明细 - 登记理赔弹窗
|
||||
面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm)
|
||||
面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm)
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
@ -36,9 +36,11 @@
|
||||
<el-form ref="formRef" :model="form" :rules="rules" class="task-panel__form">
|
||||
<div class="task-panel__section-title">仓库理赔</div>
|
||||
|
||||
<div class="task-panel__field">
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">是否需要</span>
|
||||
<el-switch v-model="form.claim_needed" :active-value="1" :inactive-value="0" />
|
||||
<div class="task-panel__field-control">
|
||||
<el-switch v-model="form.claim_needed" :active-value="1" :inactive-value="0" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template v-if="form.claim_needed">
|
||||
@ -51,7 +53,7 @@
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
style="width: 180px"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@ -59,7 +61,7 @@
|
||||
<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="form.claim_status" size="default" placeholder="请选择理赔状态" style="width: 180px">
|
||||
<el-select v-model="form.claim_status" size="default" placeholder="请选择理赔状态" style="width: 100%">
|
||||
<el-option v-for="(l, v) in claimStatusOptions" :key="v" :label="l" :value="v" />
|
||||
</el-select>
|
||||
</div>
|
||||
@ -68,9 +70,11 @@
|
||||
|
||||
<div class="task-panel__section-title is-spaced">运方理赔</div>
|
||||
|
||||
<div class="task-panel__field">
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">是否需要</span>
|
||||
<el-switch v-model="form.carrier_claim_needed" :active-value="1" :inactive-value="0" />
|
||||
<div class="task-panel__field-control">
|
||||
<el-switch v-model="form.carrier_claim_needed" :active-value="1" :inactive-value="0" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template v-if="form.carrier_claim_needed">
|
||||
@ -83,7 +87,7 @@
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
style="width: 180px"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
@ -91,7 +95,7 @@
|
||||
<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="form.carrier_claim_status" size="default" placeholder="请选择理赔状态" style="width: 180px">
|
||||
<el-select v-model="form.carrier_claim_status" size="default" placeholder="请选择理赔状态" style="width: 100%">
|
||||
<el-option v-for="(l, v) in claimStatusOptions" :key="v" :label="l" :value="v" />
|
||||
</el-select>
|
||||
</div>
|
||||
@ -120,10 +124,14 @@
|
||||
size="default"
|
||||
placeholder="请输入备注(可选)"
|
||||
/>
|
||||
<p class="task-panel__field-tip">操作动作与备注将记入售后单处理记录</p>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
操作动作与备注将记入售后单处理记录;提交后仓库理赔与运方理赔信息会更新到售后单。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
@ -199,7 +207,7 @@ defineExpose({ open })
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
/* 面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) */
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.task-panel {
|
||||
background: #fff;
|
||||
color: #303133;
|
||||
@ -267,10 +275,11 @@ defineExpose({ open })
|
||||
|
||||
/* 分组标题(仓库理赔 / 运方理赔 / 操作信息) */
|
||||
&__section-title {
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
font-size: 12px;
|
||||
font-weight: 400;
|
||||
line-height: 20px;
|
||||
color: #303133;
|
||||
color: #606266;
|
||||
padding-left: 2px;
|
||||
|
||||
&.is-spaced {
|
||||
margin-top: 8px;
|
||||
@ -305,6 +314,34 @@ defineExpose({ open })
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(开关):与输入行同尺寸,去掉灰色容器 */
|
||||
&--control {
|
||||
align-items: flex-start;
|
||||
min-height: 36px;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__field-control {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -314,16 +351,26 @@ defineExpose({ open })
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
flex-shrink: 0;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -332,8 +379,11 @@ defineExpose({ open })
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__field-tip {
|
||||
margin: 4px 0 0;
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f5;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
@ -355,7 +405,8 @@ defineExpose({ open })
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!--
|
||||
售后明细 - 转单弹窗
|
||||
面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm)
|
||||
面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm)
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
@ -63,10 +63,14 @@
|
||||
size="default"
|
||||
placeholder="请输入转单备注(可选)"
|
||||
/>
|
||||
<p class="task-panel__field-tip">备注将随转单记录保存,便于接收方了解转单原因</p>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
备注将随转单记录保存,便于接收方了解转单原因;提交后该售后单将由目标角色组接手。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
@ -122,7 +126,7 @@ defineExpose({ open })
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
/* 面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) */
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.task-panel {
|
||||
background: #fff;
|
||||
color: #303133;
|
||||
@ -210,6 +214,10 @@ defineExpose({ open })
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -219,16 +227,26 @@ defineExpose({ open })
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
flex-shrink: 0;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -245,8 +263,11 @@ defineExpose({ open })
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__field-tip {
|
||||
margin: 4px 0 0;
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f5;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
@ -268,7 +289,8 @@ defineExpose({ open })
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
|
||||
@ -163,7 +163,7 @@
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 转单弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
|
||||
<!-- 转单弹窗:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="transferDialogVisible"
|
||||
class="after-sale-transfer-dialog"
|
||||
@ -228,10 +228,14 @@
|
||||
size="default"
|
||||
placeholder="请输入转单备注(可选)"
|
||||
/>
|
||||
<p class="task-panel__field-tip">备注将随转单记录保存,便于接收方了解转单原因</p>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
备注将随转单记录保存,便于接收方了解转单原因;提交后该售后单将由目标角色组接手。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
@ -971,6 +975,10 @@ onUnmounted(() => {
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -980,16 +988,26 @@ onUnmounted(() => {
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
flex-shrink: 0;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1006,8 +1024,11 @@ onUnmounted(() => {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__field-tip {
|
||||
margin: 4px 0 0;
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f5;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
@ -1029,7 +1050,8 @@ onUnmounted(() => {
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
|
||||
@ -67,9 +67,6 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<p v-if="!typeOptions.length" class="task-panel__field-tip is-warning">
|
||||
暂无可选类型,请先在「售后类型」页签新增类型
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -87,9 +84,6 @@
|
||||
show-word-limit
|
||||
/>
|
||||
</el-form-item>
|
||||
<p class="task-panel__field-tip">
|
||||
仅支持小写字母、数字、下划线,最长 {{ codeMaxLength }} 位;创建后不可修改
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -113,23 +107,35 @@
|
||||
:max="99999"
|
||||
:precision="0"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<p class="task-panel__field-tip">越小越靠前,默认 0</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field">
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">状态</span>
|
||||
<el-switch
|
||||
v-model="form.is_enabled"
|
||||
:active-value="1"
|
||||
:inactive-value="0"
|
||||
active-text="启用"
|
||||
inactive-text="停用"
|
||||
/>
|
||||
<div class="task-panel__field-control">
|
||||
<el-switch
|
||||
v-model="form.is_enabled"
|
||||
:active-value="1"
|
||||
:inactive-value="0"
|
||||
active-text="启用"
|
||||
inactive-text="停用"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip" :class="{ 'task-panel__form-tip--warning': isSubType && !typeOptions.length }">
|
||||
<template v-if="isSubType && !typeOptions.length">
|
||||
暂无可选类型,请先在「售后类型」页签新增类型(子类型的所属类型必须已存在且启用)。
|
||||
</template>
|
||||
<template v-else>
|
||||
编码仅支持小写字母、数字、下划线,最长 {{ codeMaxLength }} 位且创建后不可修改;排序值越小越靠前(默认 0)。
|
||||
</template>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
@ -418,20 +424,58 @@ async function submitForm() {
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(开关):与输入行同尺寸,去掉灰色容器 */
|
||||
&--control {
|
||||
align-items: flex-start;
|
||||
min-height: 36px;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__field-control {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
flex-shrink: 0;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -440,13 +484,18 @@ async function submitForm() {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__field-tip {
|
||||
margin: 4px 0 0;
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f5;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
|
||||
&.is-warning {
|
||||
/* 不可操作类提示(如暂无可用类型) */
|
||||
&--warning {
|
||||
background: #fdf6ec;
|
||||
color: #e6a23c;
|
||||
}
|
||||
}
|
||||
@ -467,7 +516,8 @@ async function submitForm() {
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
|
||||
@ -99,6 +99,8 @@
|
||||
<div v-else-if="errorMsg" class="player-overlay">
|
||||
<el-icon size="26"><WarningFilled /></el-icon>
|
||||
<span class="error-text">{{ errorMsg }}</span>
|
||||
<span v-if="errorHint" class="error-hint">{{ errorHint }}</span>
|
||||
<span v-if="errorUrl" class="error-url" :title="errorUrl">{{ errorUrl }}</span>
|
||||
<el-button size="small" type="primary" @click="retry">重试</el-button>
|
||||
</div>
|
||||
</div>
|
||||
@ -136,6 +138,7 @@ import { Loading, VideoCameraFilled, VideoPlay, WarningFilled } from '@element-p
|
||||
import type { VideoItem } from './VideoButton.vue'
|
||||
import type { PackingTaskItem } from '@/api/order.packing/packing'
|
||||
import { getWaybill } from '../packingflow-config'
|
||||
import { diagnoseVideoError, videoErrorBaseText } from '@/utils/videoDiagnose'
|
||||
|
||||
const props = defineProps<{
|
||||
visible: boolean
|
||||
@ -153,6 +156,12 @@ const videoRef = ref<HTMLVideoElement | null>(null)
|
||||
const activeIndex = ref(-1)
|
||||
const loading = ref(false)
|
||||
const errorMsg = ref('')
|
||||
/** 失败原因建议(诊断结果) */
|
||||
const errorHint = ref('')
|
||||
/** 出错的录像地址,便于现场复制到浏览器新标签排查 */
|
||||
const errorUrl = ref('')
|
||||
/** 诊断序号:切换录像/关闭弹窗后丢弃过期的诊断结果 */
|
||||
let errorSeq = 0
|
||||
|
||||
const videoList = computed<VideoItem[]>(() => props.videos || [])
|
||||
const activeVideo = computed<VideoItem | null>(() =>
|
||||
@ -166,7 +175,10 @@ function firstPlayableIndex(): number {
|
||||
}
|
||||
|
||||
function resetPlayer() {
|
||||
errorSeq += 1
|
||||
errorMsg.value = ''
|
||||
errorHint.value = ''
|
||||
errorUrl.value = ''
|
||||
loading.value = !!activeVideo.value?.video_url
|
||||
}
|
||||
|
||||
@ -181,6 +193,7 @@ function reloadVideo() {
|
||||
}
|
||||
|
||||
function stopVideo() {
|
||||
errorSeq += 1
|
||||
const el = videoRef.value
|
||||
if (el) {
|
||||
el.pause()
|
||||
@ -189,6 +202,8 @@ function stopVideo() {
|
||||
}
|
||||
loading.value = false
|
||||
errorMsg.value = ''
|
||||
errorHint.value = ''
|
||||
errorUrl.value = ''
|
||||
}
|
||||
|
||||
/** 打开时自动选中第一条可播放录像 */
|
||||
@ -225,17 +240,24 @@ function selectVideo(video: VideoItem, index: number) {
|
||||
reloadVideo()
|
||||
}
|
||||
|
||||
function handleVideoError(e: Event) {
|
||||
/**
|
||||
* `code 4` 同时覆盖证书失效、404、CORS、编码不支持等情况,
|
||||
* 先给出基础文案,再异步探测地址给出具体原因(见 utils/videoDiagnose)
|
||||
*/
|
||||
async function handleVideoError(e: Event) {
|
||||
loading.value = false
|
||||
const el = e.target as HTMLVideoElement
|
||||
const code = el?.error?.code
|
||||
const msgMap: Record<number, string> = {
|
||||
1: '视频加载被中止',
|
||||
2: '网络错误,无法加载视频',
|
||||
3: '视频解码失败',
|
||||
4: '视频格式不支持或文件不存在'
|
||||
}
|
||||
errorMsg.value = msgMap[code ?? 4] || '视频播放失败'
|
||||
const code = el?.error?.code ?? 4
|
||||
const url = activeVideo.value?.video_url || el?.currentSrc || ''
|
||||
const seq = ++errorSeq
|
||||
errorMsg.value = videoErrorBaseText(code)
|
||||
errorHint.value = '正在诊断失败原因…'
|
||||
errorUrl.value = url
|
||||
|
||||
const info = await diagnoseVideoError(url, code)
|
||||
if (seq !== errorSeq) return // 已切换录像或关闭弹窗
|
||||
errorMsg.value = info.message
|
||||
errorHint.value = info.hint
|
||||
}
|
||||
|
||||
function retry() {
|
||||
@ -475,6 +497,24 @@ function statusTagType(status?: string): 'success' | 'danger' | 'info' {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.error-hint {
|
||||
max-width: 340px;
|
||||
text-align: center;
|
||||
line-height: 1.5;
|
||||
color: #e6a23c;
|
||||
}
|
||||
|
||||
.error-url {
|
||||
max-width: 90%;
|
||||
font-family: Consolas, Menlo, monospace;
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
user-select: all;
|
||||
}
|
||||
|
||||
.player-info-bar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
@ -20,6 +20,8 @@
|
||||
<div v-else-if="errorMsg" class="player-overlay">
|
||||
<el-icon size="32"><WarningFilled /></el-icon>
|
||||
<span class="error-text">{{ errorMsg }}</span>
|
||||
<span v-if="errorHint" class="error-hint">{{ errorHint }}</span>
|
||||
<span v-if="errorUrl" class="error-url" :title="errorUrl">{{ errorUrl }}</span>
|
||||
<el-button size="small" type="primary" @click="retry">重试</el-button>
|
||||
</div>
|
||||
|
||||
@ -56,6 +58,7 @@
|
||||
import { ref, watch, nextTick } from 'vue'
|
||||
import { Loading, WarningFilled } from '@element-plus/icons-vue'
|
||||
import type { VideoItem } from './VideoButton.vue'
|
||||
import { diagnoseVideoError, videoErrorBaseText } from '@/utils/videoDiagnose'
|
||||
|
||||
const props = defineProps<{
|
||||
visible: boolean
|
||||
@ -69,12 +72,25 @@ const emit = defineEmits<{
|
||||
const videoRef = ref<HTMLVideoElement | null>(null)
|
||||
const loading = ref(true)
|
||||
const errorMsg = ref('')
|
||||
/** 失败原因建议(诊断结果) */
|
||||
const errorHint = ref('')
|
||||
/** 出错的录像地址,便于现场复制到浏览器新标签排查 */
|
||||
const errorUrl = ref('')
|
||||
/** 诊断序号:关闭弹窗后丢弃过期的诊断结果 */
|
||||
let errorSeq = 0
|
||||
|
||||
function clearError() {
|
||||
errorSeq += 1
|
||||
errorMsg.value = ''
|
||||
errorHint.value = ''
|
||||
errorUrl.value = ''
|
||||
}
|
||||
|
||||
// 打开时重置状态
|
||||
watch(() => props.visible, (val) => {
|
||||
if (val) {
|
||||
loading.value = true
|
||||
errorMsg.value = ''
|
||||
clearError()
|
||||
nextTick(() => {
|
||||
if (videoRef.value) {
|
||||
videoRef.value.load()
|
||||
@ -83,17 +99,24 @@ watch(() => props.visible, (val) => {
|
||||
}
|
||||
})
|
||||
|
||||
function handleVideoError(e: Event) {
|
||||
/**
|
||||
* `code 4` 同时覆盖证书失效、404、CORS、编码不支持等情况,
|
||||
* 先给出基础文案,再异步探测地址给出具体原因(见 utils/videoDiagnose)
|
||||
*/
|
||||
async function handleVideoError(e: Event) {
|
||||
loading.value = false
|
||||
const el = e.target as HTMLVideoElement
|
||||
const code = el?.error?.code
|
||||
const msgMap: Record<number, string> = {
|
||||
1: '视频加载被中止',
|
||||
2: '网络错误,无法加载视频',
|
||||
3: '视频解码失败',
|
||||
4: '视频格式不支持或文件不存在'
|
||||
}
|
||||
errorMsg.value = msgMap[code ?? 4] || '视频播放失败'
|
||||
const code = el?.error?.code ?? 4
|
||||
const url = props.video?.video_url || el?.currentSrc || ''
|
||||
const seq = ++errorSeq
|
||||
errorMsg.value = videoErrorBaseText(code)
|
||||
errorHint.value = '正在诊断失败原因…'
|
||||
errorUrl.value = url
|
||||
|
||||
const info = await diagnoseVideoError(url, code)
|
||||
if (seq !== errorSeq) return // 已关闭弹窗
|
||||
errorMsg.value = info.message
|
||||
errorHint.value = info.hint
|
||||
}
|
||||
|
||||
function handleEnded() {
|
||||
@ -102,7 +125,7 @@ function handleEnded() {
|
||||
|
||||
function retry() {
|
||||
loading.value = true
|
||||
errorMsg.value = ''
|
||||
clearError()
|
||||
nextTick(() => {
|
||||
if (videoRef.value) {
|
||||
videoRef.value.load()
|
||||
@ -117,7 +140,7 @@ function handleClosed() {
|
||||
videoRef.value.load()
|
||||
}
|
||||
loading.value = true
|
||||
errorMsg.value = ''
|
||||
clearError()
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -156,6 +179,24 @@ function handleClosed() {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.error-hint {
|
||||
max-width: 340px;
|
||||
text-align: center;
|
||||
line-height: 1.5;
|
||||
color: #e6a23c;
|
||||
}
|
||||
|
||||
.error-url {
|
||||
max-width: 90%;
|
||||
font-family: Consolas, Menlo, monospace;
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
user-select: all;
|
||||
}
|
||||
|
||||
.video-info-bar {
|
||||
margin-top: 10px;
|
||||
padding: 6px 0;
|
||||
|
||||
@ -20,6 +20,8 @@
|
||||
<div v-else-if="errorMsg" class="player-overlay">
|
||||
<el-icon size="32"><WarningFilled /></el-icon>
|
||||
<span class="error-text">{{ errorMsg }}</span>
|
||||
<span v-if="errorHint" class="error-hint">{{ errorHint }}</span>
|
||||
<span v-if="errorUrl" class="error-url" :title="errorUrl">{{ errorUrl }}</span>
|
||||
<el-button size="small" type="primary" @click="retry">重试</el-button>
|
||||
</div>
|
||||
|
||||
@ -56,6 +58,7 @@
|
||||
import { ref, watch, nextTick } from 'vue'
|
||||
import { Loading, WarningFilled } from '@element-plus/icons-vue'
|
||||
import type { VideoItem } from './VideoButton.vue'
|
||||
import { diagnoseVideoError, videoErrorBaseText } from '@/utils/videoDiagnose'
|
||||
|
||||
const props = defineProps<{
|
||||
visible: boolean
|
||||
@ -69,12 +72,25 @@ const emit = defineEmits<{
|
||||
const videoRef = ref<HTMLVideoElement | null>(null)
|
||||
const loading = ref(true)
|
||||
const errorMsg = ref('')
|
||||
/** 失败原因建议(诊断结果) */
|
||||
const errorHint = ref('')
|
||||
/** 出错的录像地址,便于现场复制到浏览器新标签排查 */
|
||||
const errorUrl = ref('')
|
||||
/** 诊断序号:关闭弹窗后丢弃过期的诊断结果 */
|
||||
let errorSeq = 0
|
||||
|
||||
function clearError() {
|
||||
errorSeq += 1
|
||||
errorMsg.value = ''
|
||||
errorHint.value = ''
|
||||
errorUrl.value = ''
|
||||
}
|
||||
|
||||
// 打开时重置状态
|
||||
watch(() => props.visible, (val) => {
|
||||
if (val) {
|
||||
loading.value = true
|
||||
errorMsg.value = ''
|
||||
clearError()
|
||||
nextTick(() => {
|
||||
if (videoRef.value) {
|
||||
videoRef.value.load()
|
||||
@ -83,17 +99,24 @@ watch(() => props.visible, (val) => {
|
||||
}
|
||||
})
|
||||
|
||||
function handleVideoError(e: Event) {
|
||||
/**
|
||||
* `code 4` 同时覆盖证书失效、404、CORS、编码不支持等情况,
|
||||
* 先给出基础文案,再异步探测地址给出具体原因(见 utils/videoDiagnose)
|
||||
*/
|
||||
async function handleVideoError(e: Event) {
|
||||
loading.value = false
|
||||
const el = e.target as HTMLVideoElement
|
||||
const code = el?.error?.code
|
||||
const msgMap: Record<number, string> = {
|
||||
1: '视频加载被中止',
|
||||
2: '网络错误,无法加载视频',
|
||||
3: '视频解码失败',
|
||||
4: '视频格式不支持或文件不存在'
|
||||
}
|
||||
errorMsg.value = msgMap[code ?? 4] || '视频播放失败'
|
||||
const code = el?.error?.code ?? 4
|
||||
const url = props.video?.video_url || el?.currentSrc || ''
|
||||
const seq = ++errorSeq
|
||||
errorMsg.value = videoErrorBaseText(code)
|
||||
errorHint.value = '正在诊断失败原因…'
|
||||
errorUrl.value = url
|
||||
|
||||
const info = await diagnoseVideoError(url, code)
|
||||
if (seq !== errorSeq) return // 已关闭弹窗
|
||||
errorMsg.value = info.message
|
||||
errorHint.value = info.hint
|
||||
}
|
||||
|
||||
function handleEnded() {
|
||||
@ -102,7 +125,7 @@ function handleEnded() {
|
||||
|
||||
function retry() {
|
||||
loading.value = true
|
||||
errorMsg.value = ''
|
||||
clearError()
|
||||
nextTick(() => {
|
||||
if (videoRef.value) {
|
||||
videoRef.value.load()
|
||||
@ -117,7 +140,7 @@ function handleClosed() {
|
||||
videoRef.value.load()
|
||||
}
|
||||
loading.value = true
|
||||
errorMsg.value = ''
|
||||
clearError()
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -156,6 +179,24 @@ function handleClosed() {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.error-hint {
|
||||
max-width: 340px;
|
||||
text-align: center;
|
||||
line-height: 1.5;
|
||||
color: #e6a23c;
|
||||
}
|
||||
|
||||
.error-url {
|
||||
max-width: 90%;
|
||||
font-family: Consolas, Menlo, monospace;
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
user-select: all;
|
||||
}
|
||||
|
||||
.video-info-bar {
|
||||
margin-top: 10px;
|
||||
padding: 6px 0;
|
||||
|
||||
@ -1,47 +1,93 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
v-model="visible"
|
||||
:title="mode === 'create' ? '新增子类型' : '编辑子类型'"
|
||||
width="480px"
|
||||
class="sub-type-form-dialog"
|
||||
width="min(560px, 92vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
@closed="handleClosed"
|
||||
>
|
||||
<el-form ref="formRef" :model="form" :rules="rules" label-width="110px" size="small">
|
||||
<el-form-item label="所属类型">
|
||||
<el-input :model-value="`${typeName || typeCode}(${typeCode})`" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item label="子类型编码" prop="subType">
|
||||
<el-input
|
||||
v-model="form.subType"
|
||||
placeholder="如 after_sales,≤50 字符"
|
||||
maxlength="50"
|
||||
show-word-limit
|
||||
:disabled="mode === 'edit'"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="子类型名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="如 售后处理" maxlength="50" show-word-limit />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="mode === 'edit'" label="启用状态">
|
||||
<el-switch v-model="form.isEnabled" :active-value="1" :inactive-value="0" active-text="启用" inactive-text="停用" />
|
||||
</el-form-item>
|
||||
<el-form-item label="排序值">
|
||||
<el-input-number v-model="form.sortOrder" :min="0" :max="9999" controls-position="right" />
|
||||
<span class="ar-form-tip">数值越小越靠前</span>
|
||||
</el-form-item>
|
||||
<el-alert
|
||||
type="info"
|
||||
:closable="false"
|
||||
show-icon
|
||||
title="子类型编码在「该类型 + 本仓库」内唯一"
|
||||
/>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button size="small" :disabled="submitting" @click="visible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">保存</el-button>
|
||||
</template>
|
||||
<!-- 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<div class="task-panel">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>{{ mode === 'create' ? '新增子类型' : '编辑子类型' }}</h2>
|
||||
<p>{{ mode === 'create' ? '在某类型下新建自动回复子类型' : '调整子类型名称、排序与启用状态' }}</p>
|
||||
</div>
|
||||
<button class="task-panel__close" type="button" aria-label="关闭" @click="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>
|
||||
|
||||
<div class="task-panel__body">
|
||||
<el-form ref="formRef" :model="form" :rules="rules" class="task-panel__form" @submit.prevent>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">所属类型</span>
|
||||
<strong class="task-panel__field-value">{{ typeName || typeCode || '—' }}({{ typeCode || '—' }})</strong>
|
||||
</div>
|
||||
|
||||
<!-- 编辑态:子类型编码不可修改,用静态信息行展示 -->
|
||||
<div v-if="mode === 'edit'" class="task-panel__field">
|
||||
<span class="task-panel__field-label">子类型编码</span>
|
||||
<strong class="task-panel__field-value">{{ form.subType || '—' }}</strong>
|
||||
</div>
|
||||
<div v-else class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">子类型编码</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="subType">
|
||||
<el-input
|
||||
v-model="form.subType"
|
||||
size="default"
|
||||
placeholder="如 after_sales,≤ 50 字符"
|
||||
maxlength="50"
|
||||
show-word-limit
|
||||
/>
|
||||
</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-form">
|
||||
<el-form-item prop="name">
|
||||
<el-input v-model="form.name" size="default" placeholder="如 售后处理" maxlength="50" show-word-limit />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="mode === 'edit'" class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">启用状态</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-switch v-model="form.isEnabled" :active-value="1" :inactive-value="0" active-text="启用" inactive-text="停用" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">排序值</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-input-number v-model="form.sortOrder" :min="0" :max="9999" controls-position="right" />
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
子类型编码在「该类型 + 本仓库」内唯一{{ mode === 'edit' ? ',创建后不可修改' : ',仅支持字母、数字、下划线、中划线' }};排序值越小越靠前(取值 0 ~ 9999)。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认子类型编码与名称无误</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" :disabled="submitting" @click="visible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">保存</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@ -161,3 +207,241 @@ function handleClosed() {
|
||||
formRef.value?.clearValidate()
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.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;
|
||||
|
||||
/* 输入行标签整体下移 7px,星号同步下移以保持与文字基线对齐 */
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 开关 / 数字输入等控件行:高度与输入框对齐(32px) */
|
||||
&--control {
|
||||
align-items: center;
|
||||
min-height: 0;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度(含必填星号占位):各行列、控件左边缘严格对齐 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
|
||||
/* 必填星号绝对定位在标签左侧,不占用标签宽度 */
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
color: #f56c6c;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 输入控件容器:占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
:deep(.el-input) {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* 控件行:开关 / 数字输入左对齐,行高与输入框(32px)一致 */
|
||||
&--row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
min-height: 32px;
|
||||
|
||||
:deep(.el-input-number) {
|
||||
width: 160px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 表单下方统一提示条(代替原有 el-alert) */
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.sub-type-form-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,38 +1,88 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
v-model="visible"
|
||||
:title="mode === 'create' ? '新增类型' : '编辑类型'"
|
||||
width="480px"
|
||||
class="type-form-dialog"
|
||||
width="min(560px, 92vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
@closed="handleClosed"
|
||||
>
|
||||
<el-form ref="formRef" :model="form" :rules="rules" label-width="100px" size="small">
|
||||
<el-form-item label="类型编码" prop="type">
|
||||
<el-input
|
||||
v-model="form.type"
|
||||
placeholder="如 order / receiving,≤20 字符"
|
||||
maxlength="20"
|
||||
show-word-limit
|
||||
:disabled="mode === 'edit'"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="如 订单售后" maxlength="50" show-word-limit />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="mode === 'edit'" label="启用状态">
|
||||
<el-switch v-model="form.isEnabled" :active-value="1" :inactive-value="0" active-text="启用" inactive-text="停用" />
|
||||
</el-form-item>
|
||||
<el-form-item label="排序值">
|
||||
<el-input-number v-model="form.sortOrder" :min="0" :max="9999" controls-position="right" />
|
||||
<span class="ar-form-tip">数值越小越靠前</span>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button size="small" :disabled="submitting" @click="visible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">保存</el-button>
|
||||
</template>
|
||||
<!-- 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<div class="task-panel">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>{{ mode === 'create' ? '新增类型' : '编辑类型' }}</h2>
|
||||
<p>{{ mode === 'create' ? '为自动回复定义新的消息类型' : '调整类型名称、排序与启用状态' }}</p>
|
||||
</div>
|
||||
<button class="task-panel__close" type="button" aria-label="关闭" @click="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>
|
||||
|
||||
<div class="task-panel__body">
|
||||
<el-form ref="formRef" :model="form" :rules="rules" class="task-panel__form" @submit.prevent>
|
||||
<!-- 编辑态:类型编码不可修改,用静态信息行展示 -->
|
||||
<div v-if="mode === 'edit'" class="task-panel__field">
|
||||
<span class="task-panel__field-label">类型编码</span>
|
||||
<strong class="task-panel__field-value">{{ form.type || '—' }}</strong>
|
||||
</div>
|
||||
<div v-else class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">类型编码</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="type">
|
||||
<el-input
|
||||
v-model="form.type"
|
||||
size="default"
|
||||
placeholder="如 order / receiving,≤ 20 字符"
|
||||
maxlength="20"
|
||||
show-word-limit
|
||||
/>
|
||||
</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-form">
|
||||
<el-form-item prop="name">
|
||||
<el-input v-model="form.name" size="default" placeholder="如 订单售后" maxlength="50" show-word-limit />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="mode === 'edit'" class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">启用状态</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-switch v-model="form.isEnabled" :active-value="1" :inactive-value="0" active-text="启用" inactive-text="停用" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">排序值</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-input-number v-model="form.sortOrder" :min="0" :max="9999" controls-position="right" />
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
{{ mode === 'edit' ? '类型编码创建后不可修改;' : '类型编码仅支持字母、数字、下划线、中划线;' }}排序值越小越靠前(取值 0 ~ 9999)。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认类型编码与名称无误</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" :disabled="submitting" @click="visible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">保存</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@ -147,3 +197,241 @@ function handleClosed() {
|
||||
formRef.value?.clearValidate()
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.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;
|
||||
|
||||
/* 输入行标签整体下移 7px,星号同步下移以保持与文字基线对齐 */
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 开关 / 数字输入等控件行:高度与输入框对齐(32px) */
|
||||
&--control {
|
||||
align-items: center;
|
||||
min-height: 0;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度(含必填星号占位):各行列、控件左边缘严格对齐 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
|
||||
/* 必填星号绝对定位在标签左侧,不占用标签宽度 */
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
color: #f56c6c;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 输入控件容器:占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
:deep(.el-input) {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* 控件行:开关 / 数字输入左对齐,行高与输入框(32px)一致 */
|
||||
&--row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
min-height: 32px;
|
||||
|
||||
:deep(.el-input-number) {
|
||||
width: 160px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 表单下方统一提示条 */
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.type-form-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -113,7 +113,7 @@
|
||||
|
||||
<!-- ========== 弹窗 ========== -->
|
||||
|
||||
<!-- 生成绑群码弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
|
||||
<!-- 生成绑群码弹窗:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="bindDialogVisible"
|
||||
class="bind-code-dialog"
|
||||
@ -171,10 +171,14 @@
|
||||
<el-option label="财务" value="finance" />
|
||||
<el-option label="收货" value="receiving" />
|
||||
</el-select>
|
||||
<p class="task-panel__field-tip">不选则生成通用绑群码</p>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
子类型不选则生成通用绑群码;绑群码 5 分钟内有效且仅可使用一次,过期需重新生成。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
@ -201,93 +205,261 @@
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 编辑群信息弹窗 -->
|
||||
<el-dialog v-model="editDialogVisible" align-center title="编辑群信息" width="600px" destroy-on-close @closed="resetEditForm">
|
||||
<el-form ref="editFormRef" :model="editForm" :rules="editRules" label-width="110px" size="small">
|
||||
<el-form-item label="群ID"><el-input :model-value="editForm.groupId" disabled /></el-form-item>
|
||||
<el-form-item label="群名称"><el-input :model-value="editForm.groupName" disabled /></el-form-item>
|
||||
<el-form-item label="群类型" prop="groupType">
|
||||
<el-select v-model="editForm.groupType" style="width: 100%" @change="onEditGroupTypeChange">
|
||||
<el-option label="货主群" value="store" />
|
||||
<el-option label="仓库群" value="warehouse" />
|
||||
<el-option label="快递群" value="express" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="editForm.groupType" label="子类型">
|
||||
<el-select v-model="editForm.subType" placeholder="可选" clearable style="width: 100%">
|
||||
<el-option
|
||||
v-for="opt in getSubTypeOptions(editForm.groupType)"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="editForm.groupType === 'store'" label="关联货主" prop="storeId">
|
||||
<el-select v-model="editForm.storeId" placeholder="请选择货主" filterable clearable style="width: 100%" :loading="storeLoading">
|
||||
<el-option v-for="store in storeList" :key="store.value" :label="store.label" :value="store.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="editForm.groupType === 'express'" label="系统快递编码" prop="systemExpressCode">
|
||||
<el-select v-model="editForm.systemExpressCode" placeholder="请选择系统快递编码" filterable clearable style="width: 100%" :loading="expressLoading" @change="onSystemExpressCodeChange">
|
||||
<el-option v-for="item in expressCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="editForm.groupType === 'express'" label="快递接口" prop="expressInterfaces">
|
||||
<el-select v-model="editForm.expressInterfaces" placeholder="请选择快递接口(空=全部)" multiple filterable style="width: 100%" :loading="expressLoading">
|
||||
<el-option v-for="item in expressInterfaceOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="AI 自动回复">
|
||||
<el-switch v-model="editForm.aiEnabled" :active-value="1" :inactive-value="0" active-text="开" inactive-text="关" />
|
||||
</el-form-item>
|
||||
<el-form-item label="模板消息回复">
|
||||
<el-switch v-model="editForm.templateReplyEnabled" :active-value="1" :inactive-value="0" active-text="开" inactive-text="关" />
|
||||
<span class="form-tip">开启后命中处理以模板消息形式回复(独立于 AI 自动回复)</span>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button size="small" @click="editDialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" size="small" :loading="editLoading" @click="handleSubmitEdit">保存</el-button>
|
||||
</template>
|
||||
<!-- 编辑群信息弹窗:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="editDialogVisible"
|
||||
class="edit-group-dialog"
|
||||
align-center
|
||||
width="min(600px, 94vw)"
|
||||
append-to-body
|
||||
destroy-on-close
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
@closed="resetEditForm"
|
||||
>
|
||||
<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="editDialogVisible = 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="editFormRef" :model="editForm" :rules="editRules" class="task-panel__form">
|
||||
<!-- 静态信息行:群 ID / 群名称 -->
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">群ID</span>
|
||||
<strong class="task-panel__field-value">{{ editForm.groupId || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">群名称</span>
|
||||
<strong class="task-panel__field-value">{{ editForm.groupName || '—' }}</strong>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">群类型</span>
|
||||
<el-form-item prop="groupType">
|
||||
<el-select v-model="editForm.groupType" style="width: 100%" @change="onEditGroupTypeChange">
|
||||
<el-option label="货主群" value="store" />
|
||||
<el-option label="仓库群" value="warehouse" />
|
||||
<el-option label="快递群" value="express" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div v-if="editForm.groupType" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">子类型</span>
|
||||
<el-form-item>
|
||||
<el-select v-model="editForm.subType" placeholder="可选" clearable style="width: 100%">
|
||||
<el-option
|
||||
v-for="opt in getSubTypeOptions(editForm.groupType)"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div v-if="editForm.groupType === 'store'" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">关联货主</span>
|
||||
<el-form-item prop="storeId">
|
||||
<el-select
|
||||
v-model="editForm.storeId"
|
||||
placeholder="请选择货主"
|
||||
filterable
|
||||
clearable
|
||||
style="width: 100%"
|
||||
:loading="storeLoading"
|
||||
>
|
||||
<el-option v-for="store in storeList" :key="store.value" :label="store.label" :value="store.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div v-if="editForm.groupType === 'express'" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">系统快递编码</span>
|
||||
<el-form-item prop="systemExpressCode">
|
||||
<el-select
|
||||
v-model="editForm.systemExpressCode"
|
||||
placeholder="请选择系统快递编码"
|
||||
filterable
|
||||
clearable
|
||||
style="width: 100%"
|
||||
:loading="expressLoading"
|
||||
@change="onSystemExpressCodeChange"
|
||||
>
|
||||
<el-option v-for="item in expressCodeOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div v-if="editForm.groupType === 'express'" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">快递接口</span>
|
||||
<el-form-item prop="expressInterfaces">
|
||||
<el-select
|
||||
v-model="editForm.expressInterfaces"
|
||||
placeholder="请选择快递接口(空=全部)"
|
||||
multiple
|
||||
filterable
|
||||
style="width: 100%"
|
||||
:loading="expressLoading"
|
||||
>
|
||||
<el-option v-for="item in expressInterfaceOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">AI 自动回复</span>
|
||||
<div class="task-panel__field-control">
|
||||
<el-switch v-model="editForm.aiEnabled" :active-value="1" :inactive-value="0" active-text="开" inactive-text="关" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">模板消息回复</span>
|
||||
<div class="task-panel__field-control">
|
||||
<el-switch
|
||||
v-model="editForm.templateReplyEnabled"
|
||||
:active-value="1"
|
||||
:inactive-value="0"
|
||||
active-text="开"
|
||||
inactive-text="关"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
子类型不选表示通用;模板消息回复开启后,命中处理将以模板消息形式回复(独立于 AI 自动回复)。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认群类型与关联对象无误</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="editDialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" size="small" :loading="editLoading" @click="handleSubmitEdit">保存</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 群消息弹窗 -->
|
||||
<el-dialog v-model="messagesDialogVisible" align-center :title="`群消息 - ${currentGroupName}`" width="900px" destroy-on-close>
|
||||
<div class="msg-filter-bar">
|
||||
<el-select v-model="msgFilter.direction" placeholder="消息方向" clearable size="small" style="width: 120px" @change="fetchGroupMessages">
|
||||
<el-option label="入站" value="inbound" />
|
||||
<el-option label="出站" value="outbound" />
|
||||
</el-select>
|
||||
<el-input v-model="msgFilter.keyword" placeholder="搜索 ext_id / content" clearable size="small" style="width: 200px; margin-left: 8px" @keyup.enter="fetchGroupMessages" @clear="fetchGroupMessages" />
|
||||
<el-button size="small" style="margin-left: 8px" @click="fetchGroupMessages">查询</el-button>
|
||||
<!-- 群消息弹窗:面板结构 / 尺寸对齐 storage/receiving「批量导入商品」 -->
|
||||
<el-dialog
|
||||
v-model="messagesDialogVisible"
|
||||
class="group-messages-dialog"
|
||||
align-center
|
||||
width="min(1000px, 96vw)"
|
||||
append-to-body
|
||||
destroy-on-close
|
||||
: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>{{ currentGroupName ? `群:${currentGroupName}` : '查看该群的消息收发记录' }}</p>
|
||||
</div>
|
||||
<button
|
||||
class="task-panel__close"
|
||||
type="button"
|
||||
aria-label="关闭"
|
||||
@click="messagesDialogVisible = 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__toolbar">
|
||||
<div class="task-panel__toolbar-main">
|
||||
<el-select
|
||||
v-model="msgFilter.direction"
|
||||
placeholder="消息方向"
|
||||
clearable
|
||||
size="small"
|
||||
style="width: 120px"
|
||||
@change="fetchGroupMessages"
|
||||
>
|
||||
<el-option label="入站" value="inbound" />
|
||||
<el-option label="出站" value="outbound" />
|
||||
</el-select>
|
||||
<el-input
|
||||
v-model="msgFilter.keyword"
|
||||
placeholder="搜索 ext_id / 内容"
|
||||
clearable
|
||||
size="small"
|
||||
style="width: 220px"
|
||||
@keyup.enter="fetchGroupMessages"
|
||||
@clear="fetchGroupMessages"
|
||||
/>
|
||||
<el-button size="small" type="primary" plain @click="fetchGroupMessages">查询</el-button>
|
||||
</div>
|
||||
<span class="task-panel__meta">共 {{ msgPagination.total }} 条</span>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__section">
|
||||
<div class="msg-table-wrapper">
|
||||
<el-table
|
||||
:data="msgTableData"
|
||||
v-loading="msgLoading"
|
||||
border
|
||||
size="small"
|
||||
style="width: 100%"
|
||||
max-height="420"
|
||||
empty-text="暂无消息"
|
||||
>
|
||||
<el-table-column prop="id" label="ID" width="70" align="center" header-align="center" />
|
||||
<el-table-column prop="ext_id" label="外部ID" min-width="140" align="center" header-align="center" show-overflow-tooltip />
|
||||
<el-table-column prop="direction" label="方向" width="80" align="center" header-align="center">
|
||||
<template #default="{ row: r }">
|
||||
<span :class="getStatusTextClass(r.direction === 'inbound' ? 'primary' : 'success')">
|
||||
{{ r.direction === 'inbound' ? '入站' : '出站' }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="content" label="内容" min-width="200" align="center" header-align="center" show-overflow-tooltip />
|
||||
<el-table-column prop="created_at" label="时间" width="170" align="center" header-align="center" show-overflow-tooltip />
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<div class="task-panel__actions">
|
||||
<el-pagination
|
||||
v-model:current-page="msgPagination.currentPage"
|
||||
v-model:page-size="msgPagination.pageSize"
|
||||
:total="msgPagination.total"
|
||||
:page-sizes="[20, 50, 100, 200]"
|
||||
layout="total, sizes, prev, pager, next"
|
||||
background
|
||||
size="small"
|
||||
class="msg-pagination"
|
||||
@size-change="onMsgPageSizeChange"
|
||||
@current-change="onMsgPageChange"
|
||||
/>
|
||||
<el-button size="small" @click="messagesDialogVisible = false">关闭</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
<div v-loading="msgLoading" class="msg-table-wrapper">
|
||||
<el-table :data="msgTableData" border stripe size="small" style="width: 100%" max-height="400">
|
||||
<el-table-column prop="id" label="ID" width="70" align="center" />
|
||||
<el-table-column prop="ext_id" label="外部ID" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column prop="direction" label="方向" width="80" align="center">
|
||||
<template #default="{ row: r }">
|
||||
<span :class="getStatusTextClass(r.direction === 'inbound' ? 'primary' : 'success')">
|
||||
{{ r.direction === 'inbound' ? '入站' : '出站' }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="content" label="内容" min-width="200" show-overflow-tooltip />
|
||||
<el-table-column prop="created_at" label="时间" width="170" show-overflow-tooltip />
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="msg-pagination-wrapper">
|
||||
<el-pagination
|
||||
v-model:current-page="msgPagination.currentPage" v-model:page-size="msgPagination.pageSize"
|
||||
:total="msgPagination.total" :page-sizes="[20, 50, 100, 200]"
|
||||
layout="total, sizes, prev, pager, next, jumper" size="small"
|
||||
@size-change="onMsgPageSizeChange" @current-change="onMsgPageChange"
|
||||
/>
|
||||
</div>
|
||||
<template #footer>
|
||||
<el-button size="small" @click="messagesDialogVisible = false">关闭</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
@ -717,13 +889,16 @@ onMounted(() => { loadStoreList(); fetchData() })
|
||||
|
||||
.form-tip { margin-left: 10px; font-size: 12px; color: #909399; line-height: 1.4; }
|
||||
|
||||
.msg-filter-bar { display: flex; align-items: center; margin-bottom: 12px; padding-bottom: 12px; border-bottom: 1px solid #ebeef5; }
|
||||
/* 群消息:表格容器与分页(对齐「批量导入商品」) */
|
||||
.msg-table-wrapper { margin-bottom: 0; }
|
||||
.msg-pagination-wrapper { display: flex; justify-content: flex-end; margin-top: 10px; }
|
||||
.msg-pagination { margin-right: 0; }
|
||||
.empty-tip { color: #909399; font-size: 13px; padding: 16px; text-align: center; }
|
||||
|
||||
/* 生成绑群码:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) */
|
||||
/* 生成绑群码:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.task-panel {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
max-height: calc(100vh - 96px);
|
||||
background: #fff;
|
||||
color: #303133;
|
||||
|
||||
@ -731,7 +906,8 @@ onMounted(() => { loadStoreList(); fetchData() })
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 12px;
|
||||
padding: 16px;
|
||||
padding: 16px 16px 8px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
&__titles {
|
||||
@ -779,7 +955,49 @@ onMounted(() => { loadStoreList(); fetchData() })
|
||||
}
|
||||
|
||||
&__body {
|
||||
padding: 12px 16px 0;
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
padding: 6px 16px 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
/* 工具栏:筛选控件 + 统计文案(对齐「批量导入商品」) */
|
||||
&__toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
flex-shrink: 0;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
&__toolbar-main {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
flex-wrap: wrap;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
|
||||
&__meta {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
/* 列表区(表格容器) */
|
||||
&__section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
min-height: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
&__form {
|
||||
@ -816,6 +1034,39 @@ onMounted(() => { loadStoreList(); fetchData() })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(开关):与输入行同尺寸,去掉灰色容器 */
|
||||
&--control {
|
||||
align-items: flex-start;
|
||||
min-height: 36px;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__field-control {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 静态信息行的值(群 ID / 群名称) */
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 标签列固定宽度(含必填星号占位):保证各选项输入框左边缘对齐、长度一致 */
|
||||
@ -829,6 +1080,7 @@ onMounted(() => { loadStoreList(); fetchData() })
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
@ -845,8 +1097,11 @@ onMounted(() => { loadStoreList(); fetchData() })
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__field-tip {
|
||||
margin: 4px 0 0;
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f5;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
@ -857,7 +1112,8 @@ onMounted(() => { loadStoreList(); fetchData() })
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
padding: 16px;
|
||||
padding: 12px 16px 16px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
&__hint {
|
||||
@ -868,7 +1124,10 @@ onMounted(() => { loadStoreList(); fetchData() })
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
justify-content: flex-end;
|
||||
width: 100%;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
@ -877,14 +1136,18 @@ onMounted(() => { loadStoreList(); fetchData() })
|
||||
}
|
||||
}
|
||||
|
||||
/* 面板内嵌 el-form-item:去掉默认间距,错误提示改回文档流内展示 */
|
||||
/* 面板内嵌 el-form-item:占满剩余宽度,去掉默认间距,错误提示改回文档流内展示 */
|
||||
.task-panel__form {
|
||||
:deep(.el-form-item) {
|
||||
/* 关键:行内布局下必须撑满剩余宽度,否则下拉框会收缩到内容宽度、右侧对不齐 */
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0;
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
@ -897,7 +1160,9 @@ onMounted(() => { loadStoreList(); fetchData() })
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.bind-code-dialog {
|
||||
.el-dialog.bind-code-dialog,
|
||||
.el-dialog.edit-group-dialog,
|
||||
.el-dialog.group-messages-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
|
||||
@ -196,7 +196,7 @@
|
||||
|
||||
<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="task-panel__field-form">
|
||||
<el-form-item prop="targetChannel">
|
||||
<el-select v-model="replyForm.targetChannel" size="default" placeholder="请选择目标渠道" style="width: 100%">
|
||||
<el-option label="企业微信" value="wecom" />
|
||||
@ -211,7 +211,7 @@
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">目标类型</span>
|
||||
<div class="task-panel__field-control">
|
||||
<div class="task-panel__field-form">
|
||||
<el-select v-model="replyForm.targetType" size="default" placeholder="可选" clearable style="width: 100%">
|
||||
<el-option label="IM" value="im" />
|
||||
<el-option label="API" value="api" />
|
||||
@ -222,7 +222,7 @@
|
||||
|
||||
<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">
|
||||
<div class="task-panel__field-form">
|
||||
<el-input
|
||||
v-model="replyForm.extDataJson"
|
||||
type="textarea"
|
||||
@ -231,13 +231,12 @@
|
||||
size="default"
|
||||
placeholder="JSON 格式"
|
||||
/>
|
||||
<p class="task-panel__field-tip">随回信下发的扩展字段,需为合法 JSON(可留空)</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">
|
||||
<div class="task-panel__field-form">
|
||||
<el-input
|
||||
v-model="replyForm.flagsJson"
|
||||
type="textarea"
|
||||
@ -249,6 +248,10 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
目标渠道必填;扩展数据与处理标记需为合法 JSON(可留空),提交后立即推送到所选渠道。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
@ -710,7 +713,7 @@ onMounted(() => {
|
||||
.thread-empty { text-align: center; padding: 40px; color: #909399; }
|
||||
.empty-tip { color: #909399; font-size: 13px; padding: 16px; }
|
||||
|
||||
/* 系统回信:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) */
|
||||
/* 系统回信:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.task-panel {
|
||||
background: #fff;
|
||||
color: #303133;
|
||||
@ -804,6 +807,11 @@ onMounted(() => {
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
/* 输入行标签整体下移 7px,星号同步下移以保持与文字基线对齐 */
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -814,15 +822,24 @@ onMounted(() => {
|
||||
}
|
||||
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
flex-shrink: 0;
|
||||
text-align: left;
|
||||
|
||||
/* 必填星号绝对定位在标签左侧,不占用标签宽度,保证各行列对齐 */
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
color: #f56c6c;
|
||||
margin-right: 4px;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -834,13 +851,42 @@ onMounted(() => {
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
&__field-control {
|
||||
/* 输入控件容器:占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
:deep(.el-select),
|
||||
:deep(.el-input) {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-tip {
|
||||
margin: 4px 0 0;
|
||||
/* 表单下方统一提示条(表单内不再逐行挂提示) */
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f5;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
@ -862,7 +908,8 @@ onMounted(() => {
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
@ -874,11 +921,14 @@ onMounted(() => {
|
||||
/* 面板内嵌 el-form-item:去掉默认间距,错误提示改回文档流内展示 */
|
||||
.task-panel__form {
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0;
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
|
||||
@ -85,109 +85,185 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 新增/编辑包材:面板结构 / 双列栅格对齐「新建波次策略」 -->
|
||||
<el-dialog
|
||||
v-model="dialogVisible"
|
||||
:title="dialogMode === 'create' ? '新增包材' : '编辑包材'"
|
||||
width="720px"
|
||||
class="package-material-dialog"
|
||||
width="min(720px, 96vw)"
|
||||
align-center
|
||||
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-row :gutter="16">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="包材编码" prop="material_code">
|
||||
<el-input
|
||||
v-model="formData.material_code"
|
||||
placeholder="大写字母/数字,仓库内唯一"
|
||||
:disabled="dialogMode === 'edit'"
|
||||
@blur="normalizeMaterialCode"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="包材名称" prop="material_name">
|
||||
<el-input v-model="formData.material_name" placeholder="请输入包材名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="包材类型" prop="material_type">
|
||||
<el-input v-model="formData.material_type" placeholder="如 纸箱、气泡袋" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="规格" prop="spec">
|
||||
<el-input v-model="formData.spec" placeholder="如 60×40×30cm" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="长度" prop="length">
|
||||
<el-input-number
|
||||
v-model="formData.length"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="宽度" prop="width">
|
||||
<el-input-number
|
||||
v-model="formData.width"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="高度" prop="height">
|
||||
<el-input-number
|
||||
v-model="formData.height"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="重量(g)" prop="weight">
|
||||
<el-input-number
|
||||
v-model="formData.weight"
|
||||
:min="0"
|
||||
:precision="3"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="成本价" prop="cost_price">
|
||||
<el-input-number
|
||||
v-model="formData.cost_price"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<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-col>
|
||||
</el-row>
|
||||
</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>维护包材编码、尺寸规格与成本信息,带 * 为必填项</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 task-panel__body--scroll">
|
||||
<el-form ref="formRef" :model="formData" :rules="rules" class="task-panel__form" @submit.prevent>
|
||||
<!-- 编辑态:包材编码不可修改,用静态信息行展示 -->
|
||||
<div v-if="dialogMode === 'edit'" class="task-panel__field">
|
||||
<span class="task-panel__field-label">包材编码</span>
|
||||
<strong class="task-panel__field-value">{{ formData.material_code || '—' }}</strong>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__grid">
|
||||
<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-form">
|
||||
<el-form-item prop="material_code">
|
||||
<el-input
|
||||
v-model="formData.material_code"
|
||||
size="default"
|
||||
placeholder="大写字母/数字,仓库内唯一"
|
||||
@blur="normalizeMaterialCode"
|
||||
/>
|
||||
</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-form">
|
||||
<el-form-item prop="material_name">
|
||||
<el-input v-model="formData.material_name" 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-form">
|
||||
<el-form-item prop="material_type">
|
||||
<el-input v-model="formData.material_type" size="default" placeholder="如 纸箱、气泡袋" clearable />
|
||||
</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-form">
|
||||
<el-form-item prop="spec">
|
||||
<el-input v-model="formData.spec" size="default" placeholder="如 60×40×30cm" clearable />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">长度</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="length">
|
||||
<el-input-number
|
||||
v-model="formData.length"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
placeholder="单位 cm,如 60"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">宽度</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="width">
|
||||
<el-input-number
|
||||
v-model="formData.width"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
placeholder="单位 cm,如 40"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">高度</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="height">
|
||||
<el-input-number
|
||||
v-model="formData.height"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
placeholder="单位 cm,如 30"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">重量(g)</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="weight">
|
||||
<el-input-number
|
||||
v-model="formData.weight"
|
||||
:min="0"
|
||||
:precision="3"
|
||||
controls-position="right"
|
||||
placeholder="单位 g,如 500"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">成本价</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="cost_price">
|
||||
<el-input-number
|
||||
v-model="formData.cost_price"
|
||||
:min="0"
|
||||
:precision="2"
|
||||
controls-position="right"
|
||||
placeholder="如 1.20"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">状态</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-radio-group v-model="formData.status">
|
||||
<el-radio :label="1">启用</el-radio>
|
||||
<el-radio :label="0">停用</el-radio>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
包材编码仓库内唯一{{ dialogMode === 'edit' ? ',创建后不可修改' : '(自动转大写)' }};长 / 宽 / 高单位为 cm,重量单位为 g,成本价保留 2 位小数。
|
||||
</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>
|
||||
|
||||
<BatchImportDialog v-model="batchImportVisible" @success="onBatchImportSuccess" />
|
||||
@ -627,6 +703,244 @@ onMounted(() => {
|
||||
<style scoped lang="scss">
|
||||
@use "../../order/orderManagement/styles/order-sub.scss";
|
||||
|
||||
/* 新增/编辑包材:面板结构 / 双列栅格对齐「新建波次策略」 */
|
||||
.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;
|
||||
|
||||
/* 字段较多时面板内滚动(对齐新建波次策略) */
|
||||
&--scroll {
|
||||
max-height: 64vh;
|
||||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
|
||||
&__form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
/* 双列栅格:每格一个「标签 + 控件」行,窄屏自动降为单列 */
|
||||
&__grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
column-gap: 16px;
|
||||
row-gap: 8px;
|
||||
|
||||
@media (max-width: 640px) {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
}
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 左 12px 与上方标签对齐;右 0 让输入框右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
/* 输入行标签整体下移 7px,星号同步下移以保持与文字基线对齐 */
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 开关 / 数字输入 / 单选等控件行:与输入行同构,行高对齐 32px */
|
||||
&--control {
|
||||
align-items: center;
|
||||
min-height: 0;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度(含必填星号占位):各行列、控件左边缘严格对齐 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
/* 必填星号绝对定位在标签左侧,不占用标签宽度 */
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
color: #f56c6c;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 输入控件容器:占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
:deep(.el-input),
|
||||
:deep(.el-select),
|
||||
:deep(.el-input-number) {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* 控件行:数字输入 / 单选组左对齐,行高与输入框(32px)一致 */
|
||||
&--row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 表单下方统一提示条 */
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.empty-tip {
|
||||
text-align: center;
|
||||
font-size: 13px;
|
||||
@ -634,3 +948,19 @@ onMounted(() => {
|
||||
padding: 16px;
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.package-material-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,151 +1,211 @@
|
||||
<template>
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="visible"
|
||||
title="发起售后单"
|
||||
width="780px"
|
||||
class="create-after-sale-dialog"
|
||||
width="min(640px, 96vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
@update:model-value="$emit('update:visible', $event)"
|
||||
@closed="resetForm"
|
||||
>
|
||||
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="110px" size="small">
|
||||
<el-form-item label="售后类型" prop="type">
|
||||
<el-select v-model="formData.type" placeholder="请选择售后类型" style="width: 100%" @change="onTypeChange">
|
||||
<el-option v-for="(label, value) in typeOptions" :key="value" :label="label" :value="value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="问题子类型" prop="sub_type">
|
||||
<el-select v-model="formData.sub_type" placeholder="请选择问题子类型" style="width: 100%">
|
||||
<el-option v-for="(label, value) in currentSubTypeOptions" :key="value" :label="label" :value="value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="标题" prop="title">
|
||||
<el-input v-model="formData.title" placeholder="简要描述售后原因" maxlength="200" show-word-limit />
|
||||
</el-form-item>
|
||||
<el-form-item label="详细描述">
|
||||
<el-input v-model="formData.description" type="textarea" :rows="3" placeholder="详细描述(选填)" maxlength="1000" show-word-limit />
|
||||
</el-form-item>
|
||||
<el-form-item label="优先级">
|
||||
<el-input-number v-model="formData.priority" :min="0" :max="10" style="width: 120px" />
|
||||
<span class="form-tip">0-10,默认0(普通),数值越大越紧急</span>
|
||||
</el-form-item>
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="关联货主">
|
||||
<el-select v-model="formData.store_id" placeholder="选择货主" clearable filterable style="width: 100%">
|
||||
<el-option v-for="s in storeOptions" :key="s.value" :label="s.label" :value="s.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<!-- 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<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="handleClose">
|
||||
<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 content-position="left">关联单据(选填)</el-divider>
|
||||
<div class="task-panel__body task-panel__body--scroll">
|
||||
<el-form ref="formRef" :model="formData" :rules="formRules" class="task-panel__form" @submit.prevent>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">售后类型</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="type">
|
||||
<el-select v-model="formData.type" size="default" placeholder="请选择售后类型" style="width: 100%" @change="onTypeChange">
|
||||
<el-option v-for="(label, value) in typeOptions" :key="value" :label="label" :value="value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- order 订单 → 关联订单(按运单号/外部订单号搜索) -->
|
||||
<template v-if="formData.type === 'order'">
|
||||
<el-form-item label="关联订单">
|
||||
<DocSearchPicker
|
||||
v-model="formData.order_delivery_no"
|
||||
title="选择订单"
|
||||
placeholder="输入运单号或外部订单号搜索"
|
||||
search-field-label="运单号/订单号"
|
||||
search-field="keyword"
|
||||
value-field="waybill_code"
|
||||
:columns="[
|
||||
{ prop: 'delivery_order_code', label: '外部订单号', minWidth: '150' },
|
||||
{ prop: 'waybill_code', label: '运单号', minWidth: '130' },
|
||||
{ prop: 'source_order_codes', label: '平台订单号', minWidth: '150' },
|
||||
{ prop: 'store_remask', label: '货主', width: '80' },
|
||||
{ prop: 'logistics_name', label: '物流', width: '70' },
|
||||
{ prop: 'logistics_interface_name', label: '物流接口', minWidth: '110' },
|
||||
{ prop: 'is_back', label: '退回', width: '60', align: 'center', formatter: (_r: any, _c: any, v: any) => v === 'Y' ? '<span style=background:#fef0f0;color:#f56c6c;padding:0 6px;border-radius:3px;font-size:12px>退回</span>' : '<span style=color:#c0c4cc>否</span>' },
|
||||
{ prop: 'is_intercept', label: '拦截', width: '60', align: 'center', formatter: (_r: any, _c: any, v: any) => v === 'Y' ? '<span style=background:#fdf6ec;color:#e6a23c;padding:0 6px;border-radius:3px;font-size:12px>拦截</span>' : '<span style=color:#c0c4cc>否</span>' },
|
||||
{ prop: 'is_galaxy_receive', label: '揽收', width: '60', align: 'center', formatter: (_r: any, _c: any, v: any) => v === 'Y' ? '<span style=background:#f0f9eb;color:#67c23a;padding:0 6px;border-radius:3px;font-size:12px>揽收</span>' : '<span style=color:#c0c4cc>否</span>' },
|
||||
]"
|
||||
:fetch-fn="orderSearchFetchFn"
|
||||
:extract-list="(res: any) => res?.data?.list ?? res?.list ?? []"
|
||||
:extract-total="(res: any) => (res?.data?.list ?? res?.list ?? []).length"
|
||||
@select="onOrderSelected"
|
||||
/>
|
||||
</el-form-item>
|
||||
</template>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">问题子类型</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="sub_type">
|
||||
<el-select v-model="formData.sub_type" size="default" placeholder="请选择问题子类型" style="width: 100%">
|
||||
<el-option v-for="(label, value) in currentSubTypeOptions" :key="value" :label="label" :value="value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- receiving 收货单 → 收货单号 -->
|
||||
<template v-if="formData.type === 'receiving'">
|
||||
<el-form-item label="收货单号">
|
||||
<DocSearchPicker
|
||||
v-model="formData.receiving_no"
|
||||
title="选择收货单"
|
||||
placeholder="搜索收货单号"
|
||||
search-field-label="收货单号"
|
||||
search-field="keyword"
|
||||
value-field="receiving_code"
|
||||
:columns="[
|
||||
{ prop: 'receiving_code', label: '收货单号', minWidth: '180' },
|
||||
{ prop: 'store_remark_name', label: '货主', width: '120' },
|
||||
{ prop: 'status_text', label: '状态', width: '80' },
|
||||
{ prop: 'created_at', label: '创建时间', width: '150' },
|
||||
]"
|
||||
:fetch-fn="receivingFetchFn"
|
||||
:extract-list="(res: any) => res?.list ?? res?.data?.list ?? []"
|
||||
:extract-total="(res: any) => res?.pagination?.total ?? res?.data?.total ?? 0"
|
||||
/>
|
||||
</el-form-item>
|
||||
</template>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">标题</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="title">
|
||||
<el-input v-model="formData.title" size="default" placeholder="简要描述售后原因" maxlength="200" show-word-limit />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- entry 入库单 → 入库单号 -->
|
||||
<template v-if="formData.type === 'entry'">
|
||||
<el-form-item label="入库单号">
|
||||
<DocSearchPicker
|
||||
v-model="formData.entry_order_no"
|
||||
title="选择入库单"
|
||||
placeholder="搜索入库单号"
|
||||
search-field-label="入库单号"
|
||||
search-field="keyword"
|
||||
value-field="entry_order_code"
|
||||
:columns="[
|
||||
{ prop: 'entry_order_code', label: '入库单号', minWidth: '180' },
|
||||
{ prop: 'store_remark_name', label: '货主', width: '120' },
|
||||
{ prop: 'status_text', label: '状态', width: '80' },
|
||||
{ prop: 'created_at', label: '创建时间', width: '150' },
|
||||
]"
|
||||
:fetch-fn="entryFetchFn"
|
||||
:extract-list="(res: any) => res?.list ?? res?.data?.list ?? []"
|
||||
:extract-total="(res: any) => res?.pagination?.total ?? res?.data?.total ?? 0"
|
||||
/>
|
||||
</el-form-item>
|
||||
</template>
|
||||
<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-form">
|
||||
<el-input
|
||||
v-model="formData.description"
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
size="default"
|
||||
placeholder="详细描述(选填)"
|
||||
maxlength="1000"
|
||||
show-word-limit
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- stockout 出库单 → 出库单号 -->
|
||||
<template v-if="formData.type === 'stockout'">
|
||||
<el-form-item label="出库单号">
|
||||
<DocSearchPicker
|
||||
v-model="formData.order_stockout_no"
|
||||
title="选择出库单"
|
||||
placeholder="搜索出库单号"
|
||||
search-field-label="出库单号"
|
||||
search-field="keyword"
|
||||
value-field="stockout_order_code"
|
||||
:columns="[
|
||||
{ prop: 'stockout_order_code', label: '出库单号', minWidth: '180' },
|
||||
{ prop: 'store_remark_name', label: '货主', width: '120' },
|
||||
{ prop: 'status_text', label: '状态', width: '80' },
|
||||
{ prop: 'created_at', label: '创建时间', width: '150' },
|
||||
]"
|
||||
:fetch-fn="stockoutFetchFn"
|
||||
:extract-list="(res: any) => res?.list ?? res?.data?.list ?? []"
|
||||
:extract-total="(res: any) => res?.pagination?.total ?? res?.data?.total ?? 0"
|
||||
/>
|
||||
</el-form-item>
|
||||
</template>
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">优先级</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-input-number v-model="formData.priority" :min="0" :max="10" controls-position="right" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button size="small" @click="handleClose">取消</el-button>
|
||||
<el-button type="primary" size="small" :loading="loading" @click="handleSubmit">
|
||||
确认创建
|
||||
</el-button>
|
||||
</template>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">关联货主</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-select v-model="formData.store_id" size="default" placeholder="选择货主(用于缩小单据搜索范围)" clearable filterable style="width: 100%">
|
||||
<el-option v-for="s in storeOptions" :key="s.value" :label="s.label" :value="s.value" />
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- order 订单 → 关联订单(按运单号/外部订单号搜索) -->
|
||||
<div v-if="formData.type === 'order'" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">关联订单</span>
|
||||
<div class="task-panel__field-form">
|
||||
<DocSearchPicker
|
||||
v-model="formData.order_delivery_no"
|
||||
title="选择订单"
|
||||
placeholder="输入运单号或外部订单号搜索"
|
||||
search-field-label="运单号/订单号"
|
||||
search-field="keyword"
|
||||
value-field="waybill_code"
|
||||
:columns="[
|
||||
{ prop: 'delivery_order_code', label: '外部订单号', minWidth: '150' },
|
||||
{ prop: 'waybill_code', label: '运单号', minWidth: '130' },
|
||||
{ prop: 'source_order_codes', label: '平台订单号', minWidth: '150' },
|
||||
{ prop: 'store_remask', label: '货主', width: '80' },
|
||||
{ prop: 'logistics_name', label: '物流', width: '70' },
|
||||
{ prop: 'logistics_interface_name', label: '物流接口', minWidth: '110' },
|
||||
{ prop: 'is_back', label: '退回', width: '60', align: 'center', formatter: (_r: any, _c: any, v: any) => v === 'Y' ? '<span style=background:#fef0f0;color:#f56c6c;padding:0 6px;border-radius:3px;font-size:12px>退回</span>' : '<span style=color:#c0c4cc>否</span>' },
|
||||
{ prop: 'is_intercept', label: '拦截', width: '60', align: 'center', formatter: (_r: any, _c: any, v: any) => v === 'Y' ? '<span style=background:#fdf6ec;color:#e6a23c;padding:0 6px;border-radius:3px;font-size:12px>拦截</span>' : '<span style=color:#c0c4cc>否</span>' },
|
||||
{ prop: 'is_galaxy_receive', label: '揽收', width: '60', align: 'center', formatter: (_r: any, _c: any, v: any) => v === 'Y' ? '<span style=background:#f0f9eb;color:#67c23a;padding:0 6px;border-radius:3px;font-size:12px>揽收</span>' : '<span style=color:#c0c4cc>否</span>' },
|
||||
]"
|
||||
:fetch-fn="orderSearchFetchFn"
|
||||
:extract-list="(res: any) => res?.data?.list ?? res?.list ?? []"
|
||||
:extract-total="(res: any) => (res?.data?.list ?? res?.list ?? []).length"
|
||||
@select="onOrderSelected"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- receiving 收货单 → 收货单号 -->
|
||||
<div v-if="formData.type === 'receiving'" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">收货单号</span>
|
||||
<div class="task-panel__field-form">
|
||||
<DocSearchPicker
|
||||
v-model="formData.receiving_no"
|
||||
title="选择收货单"
|
||||
placeholder="搜索收货单号"
|
||||
search-field-label="收货单号"
|
||||
search-field="keyword"
|
||||
value-field="receiving_code"
|
||||
:columns="[
|
||||
{ prop: 'receiving_code', label: '收货单号', minWidth: '180' },
|
||||
{ prop: 'store_remark_name', label: '货主', width: '120' },
|
||||
{ prop: 'status_text', label: '状态', width: '80' },
|
||||
{ prop: 'created_at', label: '创建时间', width: '150' },
|
||||
]"
|
||||
:fetch-fn="receivingFetchFn"
|
||||
:extract-list="(res: any) => res?.list ?? res?.data?.list ?? []"
|
||||
:extract-total="(res: any) => res?.pagination?.total ?? res?.data?.total ?? 0"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- entry 入库单 → 入库单号 -->
|
||||
<div v-if="formData.type === 'entry'" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">入库单号</span>
|
||||
<div class="task-panel__field-form">
|
||||
<DocSearchPicker
|
||||
v-model="formData.entry_order_no"
|
||||
title="选择入库单"
|
||||
placeholder="搜索入库单号"
|
||||
search-field-label="入库单号"
|
||||
search-field="keyword"
|
||||
value-field="entry_order_code"
|
||||
:columns="[
|
||||
{ prop: 'entry_order_code', label: '入库单号', minWidth: '180' },
|
||||
{ prop: 'store_remark_name', label: '货主', width: '120' },
|
||||
{ prop: 'status_text', label: '状态', width: '80' },
|
||||
{ prop: 'created_at', label: '创建时间', width: '150' },
|
||||
]"
|
||||
:fetch-fn="entryFetchFn"
|
||||
:extract-list="(res: any) => res?.list ?? res?.data?.list ?? []"
|
||||
:extract-total="(res: any) => res?.pagination?.total ?? res?.data?.total ?? 0"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- stockout 出库单 → 出库单号 -->
|
||||
<div v-if="formData.type === 'stockout'" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">出库单号</span>
|
||||
<div class="task-panel__field-form">
|
||||
<DocSearchPicker
|
||||
v-model="formData.order_stockout_no"
|
||||
title="选择出库单"
|
||||
placeholder="搜索出库单号"
|
||||
search-field-label="出库单号"
|
||||
search-field="keyword"
|
||||
value-field="stockout_order_code"
|
||||
:columns="[
|
||||
{ prop: 'stockout_order_code', label: '出库单号', minWidth: '180' },
|
||||
{ prop: 'store_remark_name', label: '货主', width: '120' },
|
||||
{ prop: 'status_text', label: '状态', width: '80' },
|
||||
{ prop: 'created_at', label: '创建时间', width: '150' },
|
||||
]"
|
||||
:fetch-fn="stockoutFetchFn"
|
||||
:extract-list="(res: any) => res?.list ?? res?.data?.list ?? []"
|
||||
:extract-total="(res: any) => res?.pagination?.total ?? res?.data?.total ?? 0"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
优先级 0 ~ 10,默认 0(普通),数值越大越紧急;关联货主与关联单据均选填,关联单据便于售后定位问题来源。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认售后类型与关联单据无误</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="handleClose">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="loading" @click="handleSubmit">确认创建</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@ -382,10 +442,252 @@ function resetForm() {
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.form-tip {
|
||||
margin-left: 10px;
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
<style scoped lang="scss">
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.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;
|
||||
|
||||
/* 字段较多(含关联单据搜索):超出 62vh 时面板内滚动 */
|
||||
&--scroll {
|
||||
max-height: 62vh;
|
||||
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;
|
||||
|
||||
/* 输入行标签整体下移 7px,星号同步下移以保持与文字基线对齐 */
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 开关 / 数字输入等控件行:高度与输入框对齐(32px) */
|
||||
&--control {
|
||||
align-items: center;
|
||||
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 {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
|
||||
/* 必填星号绝对定位在标签左侧,不占用标签宽度 */
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
color: #f56c6c;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 输入控件容器:占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
:deep(.el-input),
|
||||
:deep(.el-select) {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* 控件行:开关 / 数字输入左对齐,行高与输入框(32px)一致 */
|
||||
&--row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
min-height: 32px;
|
||||
|
||||
:deep(.el-input-number) {
|
||||
width: 140px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 表单下方统一提示条 */
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.create-after-sale-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,71 +1,114 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="modelValue"
|
||||
title="按运单号绑定包材"
|
||||
width="520px"
|
||||
class="bind-material-by-waybill-dialog"
|
||||
width="min(560px, 92vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
@close="handleClose"
|
||||
@closed="resetForm"
|
||||
>
|
||||
<!-- <el-alert
|
||||
type="info"
|
||||
:closable="false"
|
||||
show-icon
|
||||
style="margin-bottom: 12px"
|
||||
title="仅需运单号与包材,系统自动反查订单运单记录并绑定包材,无需订单 ID。"
|
||||
/> -->
|
||||
<!-- 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<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="handleClose">
|
||||
<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-form ref="formRef" :model="form" :rules="rules" label-width="96px" @submit.prevent>
|
||||
<el-form-item label="运单号" prop="waybill_code">
|
||||
<el-input
|
||||
v-model.trim="form.waybill_code"
|
||||
placeholder="请输入运单号"
|
||||
clearable
|
||||
@keyup.enter="focusMaterialSelect"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="包材" prop="package_material_id">
|
||||
<el-select
|
||||
ref="materialSelectRef"
|
||||
v-model="form.package_material_id"
|
||||
filterable
|
||||
remote
|
||||
clearable
|
||||
reserve-keyword
|
||||
placeholder="输入编码/名称搜索"
|
||||
:remote-method="searchPackageMaterials"
|
||||
:loading="materialLoading"
|
||||
style="width: 100%"
|
||||
@keyup.enter="handleSubmit"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in materialOptions"
|
||||
:key="item.id"
|
||||
:label="`${item.material_code} / ${item.material_name}`"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="task-panel__body">
|
||||
<el-form ref="formRef" :model="form" :rules="rules" class="task-panel__form" @submit.prevent>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">运单号</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="waybill_code">
|
||||
<el-input
|
||||
v-model.trim="form.waybill_code"
|
||||
size="default"
|
||||
placeholder="请输入运单号"
|
||||
clearable
|
||||
@keyup.enter="focusMaterialSelect"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="lastResult" class="bind-result">
|
||||
<el-divider content-position="left">绑定结果</el-divider>
|
||||
<el-descriptions :column="1" size="small" border>
|
||||
<el-descriptions-item label="订单 ID">{{ lastResult.order_id }}</el-descriptions-item>
|
||||
<el-descriptions-item label="运单号">{{ lastResult.waybill_code }}</el-descriptions-item>
|
||||
<el-descriptions-item label="包材 ID">{{ lastResult.package_material_id }}</el-descriptions-item>
|
||||
<el-descriptions-item label="包材编码">{{ lastResult.package_material_code }}</el-descriptions-item>
|
||||
<el-descriptions-item label="包材名称">{{ lastResult.package_material_name_snapshot }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">包材</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="package_material_id">
|
||||
<el-select
|
||||
ref="materialSelectRef"
|
||||
v-model="form.package_material_id"
|
||||
size="default"
|
||||
filterable
|
||||
remote
|
||||
clearable
|
||||
reserve-keyword
|
||||
placeholder="输入编码/名称搜索"
|
||||
:remote-method="searchPackageMaterials"
|
||||
:loading="materialLoading"
|
||||
style="width: 100%"
|
||||
@keyup.enter="handleSubmit"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in materialOptions"
|
||||
:key="item.id"
|
||||
:label="`${item.material_code} / ${item.material_name}`"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<template #footer>
|
||||
<div class="dialog-footer-actions">
|
||||
<el-button size="small" @click="handleClose">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">绑定</el-button>
|
||||
<p class="task-panel__form-tip">
|
||||
系统会根据运单号自动反查订单运单记录并绑定包材,无需订单 ID;绑定成功后下方展示反查结果。
|
||||
</p>
|
||||
|
||||
<!-- 绑定结果:静态信息行展示(与上方输入行拉开层次) -->
|
||||
<div v-if="lastResult" class="task-panel__form task-panel__result">
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">订单 ID</span>
|
||||
<strong class="task-panel__field-value">{{ lastResult.order_id ?? '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">运单号</span>
|
||||
<strong class="task-panel__field-value">{{ lastResult.waybill_code || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">包材 ID</span>
|
||||
<strong class="task-panel__field-value">{{ lastResult.package_material_id ?? '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">包材编码</span>
|
||||
<strong class="task-panel__field-value">{{ lastResult.package_material_code || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">包材名称</span>
|
||||
<strong class="task-panel__field-value">{{ lastResult.package_material_name_snapshot || '—' }}</strong>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认运单号与包材无误</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="handleClose">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">绑定</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@ -204,19 +247,220 @@ async function handleSubmit() {
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
/* 弹窗底部按钮间距:对齐工具栏按钮组(OrderToolbarButtonGroup)gap 6px */
|
||||
.dialog-footer-actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 6px;
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.task-panel {
|
||||
background: #fff;
|
||||
color: #303133;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
&__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;
|
||||
/* 左 12px 与上方标签对齐;右 0 让输入框右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
/* 输入行标签整体下移 7px,星号同步下移以保持与文字基线对齐 */
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度(含必填星号占位):输入框左边缘与上方静态信息行的标签列对齐 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
|
||||
/* 必填星号绝对定位在标签左侧,不占用标签宽度 */
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
color: #f56c6c;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 输入控件容器:占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
:deep(.el-input),
|
||||
:deep(.el-select) {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
/* 表单下方统一提示条 */
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f5;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
/* 绑定结果:与上方表单行保持 8px 间距 */
|
||||
&__result {
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
.bind-result {
|
||||
margin-top: 4px;
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.bind-material-by-waybill-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -42,28 +42,64 @@
|
||||
</template>
|
||||
<div v-else class="empty-tip">请从上方列表中选择订单</div>
|
||||
|
||||
<el-dialog v-model="weighingDialogVisible" title="更新运单称重" width="420px" align-center @closed="resetWeighingForm">
|
||||
<el-form label-width="96px">
|
||||
<el-form-item label="运单号">
|
||||
<el-input :model-value="weighingForm.waybill_code" disabled />
|
||||
</el-form-item>
|
||||
<el-form-item label="称重(g)">
|
||||
<el-input-number
|
||||
v-model="weighingForm.weighing_weight"
|
||||
:min="0.001"
|
||||
:precision="3"
|
||||
:step="0.1"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<div class="dialog-footer-actions">
|
||||
<el-button size="small" @click="weighingDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="weighingSaving" @click="submitWeighing">保存</el-button>
|
||||
<!-- 更新运单称重:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="weighingDialogVisible"
|
||||
class="weighing-dialog"
|
||||
width="min(560px, 92vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
@closed="resetWeighingForm"
|
||||
>
|
||||
<div class="task-panel">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>更新运单称重</h2>
|
||||
<p>为该运单录入称重重量,单位克(g)</p>
|
||||
</div>
|
||||
<button class="task-panel__close" type="button" aria-label="关闭" @click="weighingDialogVisible = 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">{{ weighingForm.waybill_code || '—' }}</strong>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">称重(g)</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-input-number
|
||||
v-model="weighingForm.weighing_weight"
|
||||
:min="0.001"
|
||||
:precision="3"
|
||||
:step="0.1"
|
||||
controls-position="right"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
称重单位为克(g),支持 3 位小数,需大于 0;保存后立即更新该运单的称重重量。
|
||||
</p>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认称重重量无误</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="weighingDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="weighingSaving" @click="submitWeighing">保存</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<BindPackageMaterialByWaybillDialog
|
||||
@ -243,15 +279,182 @@ watch(
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
/* 弹窗底部按钮间距:对齐工具栏按钮组(OrderToolbarButtonGroup)gap 6px */
|
||||
.dialog-footer-actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 6px;
|
||||
/* 更新运单称重:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.task-panel {
|
||||
background: #fff;
|
||||
color: #303133;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
&__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;
|
||||
|
||||
/* 控件行:去掉灰色容器,与上方静态信息行拉开层次 */
|
||||
&--control {
|
||||
align-items: center;
|
||||
min-height: 0;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度:各行列、控件左边缘严格对齐 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
|
||||
/* 必填星号绝对定位在标签左侧,不占用标签宽度 */
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
color: #f56c6c;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 控件容器:占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
/* 控件行:数字输入左对齐,行高与输入框(32px)一致 */
|
||||
&--row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
min-height: 32px;
|
||||
|
||||
:deep(.el-input-number) {
|
||||
width: 180px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 表单下方统一提示条 */
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -280,3 +483,19 @@ watch(
|
||||
font-size: 13px;
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.weighing-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -182,215 +182,361 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 新建/编辑波次策略:面板结构对齐「手工录入运单号」,「双列栅格降低表单长度」 -->
|
||||
<el-dialog
|
||||
v-model="waveStrategyFormDialogVisible"
|
||||
:title="waveStrategyFormMode === 'create' ? '新建波次策略' : '编辑波次策略'"
|
||||
width="720px"
|
||||
class="wave-strategy-form-dialog"
|
||||
width="min(880px, 96vw)"
|
||||
align-center
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<div class="form-body">
|
||||
<el-form
|
||||
ref="waveStrategyFormRef"
|
||||
:model="waveStrategyFormModel"
|
||||
:rules="waveStrategyActiveFormRules"
|
||||
label-width="110px"
|
||||
size="small"
|
||||
@submit.prevent
|
||||
>
|
||||
<el-form-item label="策略名称" prop="strategy_name">
|
||||
<el-input
|
||||
v-model="waveStrategyFormModel.strategy_name"
|
||||
clearable
|
||||
placeholder="请输入策略名称"
|
||||
maxlength="80"
|
||||
show-word-limit
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<div class="form-grid-2">
|
||||
<el-form-item label="波次前缀" prop="wave_prefix">
|
||||
<el-input
|
||||
v-model="waveStrategyFormModel.wave_prefix"
|
||||
clearable
|
||||
placeholder="如 D、B、A"
|
||||
maxlength="5"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="策略类型" prop="strategy_type">
|
||||
<el-select v-model="waveStrategyFormModel.strategy_type" clearable placeholder="请选择策略类型">
|
||||
<el-option :value="1" label="散单" />
|
||||
<el-option :value="2" label="团购" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item v-if="waveStrategyFormModel.strategy_type !== 2" label="批次模式" prop="batch_mode">
|
||||
<el-select v-model="waveStrategyFormModel.batch_mode" clearable placeholder="请选择批次模式">
|
||||
<el-option :value="1" label="单品单件" />
|
||||
<el-option :value="2" label="先拣后分" />
|
||||
<el-option :value="3" label="边拣边分" />
|
||||
<el-option :value="4" label="边拣边分H型" />
|
||||
<el-option :value="5" label="播种墙" />
|
||||
<el-option :value="6" label="流利架" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-select v-model="waveStrategyFormModel.status" clearable placeholder="请选择状态">
|
||||
<el-option :value="1" label="启用" />
|
||||
<el-option :value="0" label="停用" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<div class="task-panel">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>{{ waveStrategyFormMode === 'create' ? '新建波次策略' : '编辑波次策略' }}</h2>
|
||||
<p>配置拆单条件、批次模式与准入限制,保存后立即生效</p>
|
||||
</div>
|
||||
<button
|
||||
class="task-panel__close"
|
||||
type="button"
|
||||
aria-label="关闭"
|
||||
@click="waveStrategyFormDialogVisible = 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="form-grid-2">
|
||||
<el-form-item label="最小SKU数" prop="order_min_sku">
|
||||
<el-input-number v-model="waveStrategyFormModel.order_min_sku" :min="0" :precision="0" controls-position="right" placeholder="不限" />
|
||||
</el-form-item>
|
||||
<el-form-item label="最大SKU数" prop="order_max_sku">
|
||||
<el-input-number v-model="waveStrategyFormModel.order_max_sku" :min="0" :precision="0" controls-position="right" placeholder="不限" />
|
||||
</el-form-item>
|
||||
<el-form-item label="最小件数" prop="order_min_qty">
|
||||
<el-input-number v-model="waveStrategyFormModel.order_min_qty" :min="0" :precision="0" controls-position="right" placeholder="不限" />
|
||||
</el-form-item>
|
||||
<el-form-item label="最大件数" prop="order_max_qty">
|
||||
<el-input-number v-model="waveStrategyFormModel.order_max_qty" :min="0" :precision="0" controls-position="right" placeholder="不限" />
|
||||
</el-form-item>
|
||||
<el-form-item label="同结构最小数" prop="min_same_structure">
|
||||
<el-input-number v-model="waveStrategyFormModel.min_same_structure" :min="0" :precision="0" controls-position="right" placeholder="不限" />
|
||||
</el-form-item>
|
||||
<el-form-item label="同结构最大数" prop="max_same_structure">
|
||||
<el-input-number v-model="waveStrategyFormModel.max_same_structure" :min="0" :precision="0" controls-position="right" placeholder="不限" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
<div class="task-panel__body task-panel__body--scroll">
|
||||
<el-form
|
||||
ref="waveStrategyFormRef"
|
||||
:model="waveStrategyFormModel"
|
||||
:rules="waveStrategyActiveFormRules"
|
||||
class="task-panel__form"
|
||||
@submit.prevent
|
||||
>
|
||||
<!-- 基础信息 -->
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--full">
|
||||
<span class="task-panel__field-label is-required">策略名称</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="strategy_name">
|
||||
<el-input
|
||||
v-model="waveStrategyFormModel.strategy_name"
|
||||
size="default"
|
||||
clearable
|
||||
placeholder="请输入策略名称"
|
||||
maxlength="80"
|
||||
show-word-limit
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-grid-2">
|
||||
<el-form-item label="单波最大订单" prop="batch_max_orders">
|
||||
<el-input-number v-model="waveStrategyFormModel.batch_max_orders" :min="0" :precision="0" controls-position="right" placeholder="不限" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="waveStrategyFormModel.batch_mode === 2" label="单波最大SKU" prop="batch_max_skus">
|
||||
<el-input-number v-model="waveStrategyFormModel.batch_max_skus" :min="1" :precision="0" controls-position="right" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="waveStrategyFormModel.strategy_type === 2" label="团购单波最大" prop="group_batch_max_orders">
|
||||
<el-input-number v-model="waveStrategyFormModel.group_batch_max_orders" :min="0" :precision="0" controls-position="right" placeholder="不限" />
|
||||
</el-form-item>
|
||||
<el-form-item label="要求同快递" prop="require_same_express">
|
||||
<el-select v-model="waveStrategyFormModel.require_same_express" clearable placeholder="请选择">
|
||||
<el-option
|
||||
v-for="option in waveBooleanOptions"
|
||||
:key="String(option.value)"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许跨货主" prop="allow_cross_owner">
|
||||
<el-select v-model="waveStrategyFormModel.allow_cross_owner" clearable placeholder="请选择">
|
||||
<el-option
|
||||
v-for="option in waveBooleanOptions"
|
||||
:key="String(option.value)"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
<div class="task-panel__grid">
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">波次前缀</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="wave_prefix">
|
||||
<el-input v-model="waveStrategyFormModel.wave_prefix" size="default" clearable placeholder="如 D、B、A" maxlength="5" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-form-item label="允许货主">
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_owners"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="请选择允许货主"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyOwnerOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许快递编码">
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_expresses"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="请选择允许快递编码"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyExpressOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许省份">
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_provinces"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="请选择允许省份"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyProvinceOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="允许平台">
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_platforms"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
placeholder="请选择允许平台"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyPlatformOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">策略类型</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="strategy_type">
|
||||
<el-select v-model="waveStrategyFormModel.strategy_type" size="default" clearable placeholder="请选择策略类型" style="width: 100%">
|
||||
<el-option :value="1" label="散单" />
|
||||
<el-option :value="2" label="团购" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-form-item label="说明" prop="description">
|
||||
<el-input
|
||||
v-model="waveStrategyFormModel.description"
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
clearable
|
||||
maxlength="500"
|
||||
show-word-limit
|
||||
placeholder="策略说明(可选)"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<template #footer>
|
||||
<div class="dialog-footer-actions">
|
||||
<el-button size="small" @click="waveStrategyFormDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="waveStrategyFormSubmitting" @click="submitWaveStrategyForm">
|
||||
保存
|
||||
</el-button>
|
||||
<div v-if="waveStrategyFormModel.strategy_type !== 2" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">批次模式</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="batch_mode">
|
||||
<el-select v-model="waveStrategyFormModel.batch_mode" size="default" clearable placeholder="请选择批次模式" style="width: 100%">
|
||||
<el-option :value="1" label="单品单件" />
|
||||
<el-option :value="2" label="先拣后分" />
|
||||
<el-option :value="3" label="边拣边分" />
|
||||
<el-option :value="4" label="边拣边分H型" />
|
||||
<el-option :value="5" label="播种墙" />
|
||||
<el-option :value="6" label="流利架" />
|
||||
</el-select>
|
||||
</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-form">
|
||||
<el-form-item prop="status">
|
||||
<el-select v-model="waveStrategyFormModel.status" size="default" clearable placeholder="请选择状态" style="width: 100%">
|
||||
<el-option :value="1" label="启用" />
|
||||
<el-option :value="0" label="停用" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 拆单条件(SKU / 件数 / 同结构) -->
|
||||
<div class="task-panel__grid">
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">最小SKU数</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="order_min_sku">
|
||||
<el-input-number v-model="waveStrategyFormModel.order_min_sku" :min="0" :precision="0" controls-position="right" placeholder="不限" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">最大SKU数</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="order_max_sku">
|
||||
<el-input-number v-model="waveStrategyFormModel.order_max_sku" :min="0" :precision="0" controls-position="right" placeholder="不限" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">最小件数</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="order_min_qty">
|
||||
<el-input-number v-model="waveStrategyFormModel.order_min_qty" :min="0" :precision="0" controls-position="right" placeholder="不限" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">最大件数</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="order_max_qty">
|
||||
<el-input-number v-model="waveStrategyFormModel.order_max_qty" :min="0" :precision="0" controls-position="right" placeholder="不限" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">同结构最小数</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="min_same_structure">
|
||||
<el-input-number v-model="waveStrategyFormModel.min_same_structure" :min="0" :precision="0" controls-position="right" placeholder="不限" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">同结构最大数</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="max_same_structure">
|
||||
<el-input-number v-model="waveStrategyFormModel.max_same_structure" :min="0" :precision="0" controls-position="right" placeholder="不限" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 波次容量与组合限制 -->
|
||||
<div class="task-panel__grid">
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">单波最大订单</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="batch_max_orders">
|
||||
<el-input-number v-model="waveStrategyFormModel.batch_max_orders" :min="0" :precision="0" controls-position="right" placeholder="不限" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="waveStrategyFormModel.batch_mode === 2" class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">单波最大SKU</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="batch_max_skus">
|
||||
<el-input-number v-model="waveStrategyFormModel.batch_max_skus" :min="1" :precision="0" controls-position="right" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="waveStrategyFormModel.strategy_type === 2" class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">团购单波最大</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="group_batch_max_orders">
|
||||
<el-input-number v-model="waveStrategyFormModel.group_batch_max_orders" :min="0" :precision="0" controls-position="right" placeholder="不限" style="width: 100%" />
|
||||
</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-form">
|
||||
<el-form-item prop="require_same_express">
|
||||
<el-select v-model="waveStrategyFormModel.require_same_express" size="default" clearable placeholder="请选择" style="width: 100%">
|
||||
<el-option
|
||||
v-for="option in waveBooleanOptions"
|
||||
:key="String(option.value)"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</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-form">
|
||||
<el-form-item prop="allow_cross_owner">
|
||||
<el-select v-model="waveStrategyFormModel.allow_cross_owner" size="default" clearable placeholder="请选择" style="width: 100%">
|
||||
<el-option
|
||||
v-for="option in waveBooleanOptions"
|
||||
:key="String(option.value)"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 准入限制(多选) -->
|
||||
<div class="task-panel__grid">
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">允许货主</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_owners"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
size="default"
|
||||
placeholder="请选择允许货主"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyOwnerOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">允许快递</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_expresses"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
size="default"
|
||||
placeholder="请选择允许快递编码"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyExpressOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">允许省份</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_provinces"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
size="default"
|
||||
placeholder="请选择允许省份"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyProvinceOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">允许平台</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-select
|
||||
v-model="waveStrategyFormModel.allowed_platforms"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
size="default"
|
||||
placeholder="请选择允许平台"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="option in waveStrategyPlatformOptions"
|
||||
:key="option.value"
|
||||
:label="option.label"
|
||||
:value="option.value"
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--textarea task-panel__field--full">
|
||||
<span class="task-panel__field-label">说明</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="description">
|
||||
<el-input
|
||||
v-model="waveStrategyFormModel.description"
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
size="default"
|
||||
clearable
|
||||
maxlength="500"
|
||||
show-word-limit
|
||||
placeholder="策略说明(可选)"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
SKU / 件数 / 同结构类阈值留空表示不限;准入限制(货主、快递、省份、平台)不选表示不限制。
|
||||
</p>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认策略名称与拆单阈值</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="waveStrategyFormDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="waveStrategyFormSubmitting" @click="submitWaveStrategyForm">
|
||||
保存
|
||||
</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
@ -1108,17 +1254,251 @@ onMounted(() => {
|
||||
<style scoped lang="scss">
|
||||
@use "../orderManagement/styles/order-sub.scss";
|
||||
|
||||
/* 弹窗底部按钮间距:对齐工具栏按钮组(OrderToolbarButtonGroup)gap 6px */
|
||||
.dialog-footer-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
gap: 6px;
|
||||
/* 新建/编辑波次策略:面板结构对齐「手工录入运单号」(ManualWaybillForm),
|
||||
表单主体改用双列栅格,避免一行一个字段导致表单过高 */
|
||||
.task-panel {
|
||||
background: #fff;
|
||||
color: #303133;
|
||||
|
||||
/* 仅重置直接子按钮外边距,避免与 gap 叠加 */
|
||||
> .el-button {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
&__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;
|
||||
}
|
||||
}
|
||||
|
||||
&__form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
/* 双列栅格:每格一个「标签 + 控件」行,窄屏(<720px)自动降为单列 */
|
||||
&__grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
column-gap: 16px;
|
||||
row-gap: 8px;
|
||||
|
||||
@media (max-width: 720px) {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
}
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 左 12px 与上方标签对齐;右 0 让输入框右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
/* 输入行标签整体下移 7px,星号同步下移以保持与文字基线对齐 */
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 开关 / 数字输入等控件行:高度与输入框对齐(32px) */
|
||||
&--control {
|
||||
align-items: center;
|
||||
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;
|
||||
}
|
||||
|
||||
/* 整行占满(策略名称 / 说明) */
|
||||
&--full {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度(含必填星号占位):各行列、控件左边缘严格对齐 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
|
||||
/* 必填星号绝对定位在标签左侧,不占用标签宽度 */
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
color: #f56c6c;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 输入控件容器:占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
:deep(.el-input),
|
||||
:deep(.el-select),
|
||||
:deep(.el-input-number) {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* 控件行:数字输入左对齐,行高与输入框(32px)一致 */
|
||||
&--row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 表单下方统一提示条 */
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1152,28 +1532,6 @@ onMounted(() => {
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
/* 新建/编辑波次策略表单:双列栅格布局(参考「新增投递计划」表单) */
|
||||
.form-body {
|
||||
max-height: 64vh;
|
||||
padding: 4px 8px 0 0;
|
||||
overflow-y: auto;
|
||||
|
||||
.form-grid-2 {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
column-gap: 16px;
|
||||
}
|
||||
|
||||
:deep(.el-form-item) {
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
:deep(.el-select),
|
||||
:deep(.el-input-number) {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.order-sub-container .main-content {
|
||||
.toolbar {
|
||||
display: flex;
|
||||
@ -1200,3 +1558,19 @@ onMounted(() => {
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.wave-strategy-form-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
import { computed, onBeforeUnmount, watch } from 'vue'
|
||||
import UnifiedTaskProgressDialog from '@/components/task-progress/UnifiedTaskProgressDialog.vue'
|
||||
import type {
|
||||
ProgressMetricItem,
|
||||
@ -127,15 +127,49 @@ const metricItems = computed<ProgressMetricItem[]>(() => {
|
||||
})
|
||||
|
||||
const tipText = computed(() => {
|
||||
if (progressState.value === 'success') return props.progress.message || '扫描完成,可关闭窗口'
|
||||
if (progressState.value === 'success') {
|
||||
return props.progress.message || '扫描完成,窗口将在 1.5 秒后自动关闭'
|
||||
}
|
||||
if (progressState.value === 'running') return '扫描期间请勿关闭窗口,可最小化到后台。'
|
||||
return ''
|
||||
})
|
||||
|
||||
const footerHint = computed(() =>
|
||||
progressState.value === 'running' ? '扫描任务在后台执行' : '任务已结束,可关闭窗口'
|
||||
const footerHint = computed(() => {
|
||||
if (progressState.value === 'running') return '扫描任务在后台执行'
|
||||
if (progressState.value === 'success') return '扫描完成,窗口将在 1.5 秒后自动关闭'
|
||||
return '扫描失败,请查看错误信息后关闭窗口'
|
||||
})
|
||||
|
||||
// ============================================================
|
||||
// 完成后自动关闭(失败不自动关,便于查看错误)
|
||||
// ============================================================
|
||||
/** 完成后自动关闭的延迟(与导出进度弹窗保持一致:1.5 秒) */
|
||||
const AUTO_CLOSE_DELAY = 1500
|
||||
let autoCloseTimer: ReturnType<typeof setTimeout> | null = null
|
||||
|
||||
function stopAutoCloseTimer() {
|
||||
if (autoCloseTimer) {
|
||||
clearTimeout(autoCloseTimer)
|
||||
autoCloseTimer = null
|
||||
}
|
||||
}
|
||||
|
||||
watch(
|
||||
() => [props.modelValue, progressState.value] as const,
|
||||
([visible, state]) => {
|
||||
stopAutoCloseTimer()
|
||||
// 仅在「弹窗打开 + 扫描成功」时延时关闭;失败 / 手动关闭 / 重置状态都不排新定时器
|
||||
if (!visible || state !== 'success') return
|
||||
autoCloseTimer = setTimeout(() => {
|
||||
autoCloseTimer = null
|
||||
emit('update:modelValue', false)
|
||||
}, AUTO_CLOSE_DELAY)
|
||||
},
|
||||
{ immediate: true }
|
||||
)
|
||||
|
||||
onBeforeUnmount(stopAutoCloseTimer)
|
||||
|
||||
function formatDateTime(value: string | number | null | undefined) {
|
||||
if (!value) return '—'
|
||||
let normalizedValue: string | number = value
|
||||
|
||||
@ -1,133 +1,204 @@
|
||||
<template>
|
||||
<template>
|
||||
<el-dialog
|
||||
v-model="visible"
|
||||
:title="mode === 'create' ? '新增组合商品' : '编辑组合商品'"
|
||||
width="920px"
|
||||
class="combo-goods-form-dialog"
|
||||
width="min(920px, 96vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
destroy-on-close
|
||||
@close="resetForm"
|
||||
>
|
||||
<el-form ref="formRef" :model="formData" :rules="rules" label-width="96px">
|
||||
<el-row :gutter="16">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="组合编码" prop="combo_code">
|
||||
<el-input
|
||||
v-model="formData.combo_code"
|
||||
placeholder="全局唯一"
|
||||
:disabled="mode === 'edit'"
|
||||
@blur="normalizeComboCode"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="组合名称" prop="combo_name">
|
||||
<el-input v-model="formData.combo_name" placeholder="请输入组合名称" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="自定义编码" prop="custom_code">
|
||||
<el-input
|
||||
v-model="formData.custom_code"
|
||||
placeholder="可选,按货主唯一"
|
||||
@blur="normalizeCustomCode"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="仓库 ID" prop="warehouse_id">
|
||||
<el-input-number
|
||||
v-model="formData.warehouse_id"
|
||||
:min="1"
|
||||
controls-position="right"
|
||||
placeholder="可选"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="货主" prop="store_id">
|
||||
<el-select
|
||||
v-model="formData.store_id"
|
||||
placeholder="请选择货主"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="store in storeOptions"
|
||||
:key="store.value"
|
||||
:label="store.label"
|
||||
:value="store.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col v-if="mode === 'edit'" :span="12">
|
||||
<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-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="formData.remark" type="textarea" :rows="2" placeholder="可选" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<!-- 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<div class="task-panel">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>{{ mode === 'create' ? '新增组合商品' : '编辑组合商品' }}</h2>
|
||||
<p>组合编码全局唯一,添加子商品后按数量组合出库</p>
|
||||
</div>
|
||||
<button class="task-panel__close" type="button" aria-label="关闭" @click="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>
|
||||
|
||||
<div class="items-toolbar">
|
||||
<span class="items-title">子商品明细</span>
|
||||
<el-button type="primary" size="small" plain @click="pickerVisible = true">添加子商品</el-button>
|
||||
<div class="task-panel__body task-panel__body--scroll">
|
||||
<el-form ref="formRef" :model="formData" :rules="rules" class="task-panel__form" @submit.prevent>
|
||||
<!-- 编辑态:组合编码不可修改,用静态信息行展示 -->
|
||||
<div v-if="mode === 'edit'" class="task-panel__field">
|
||||
<span class="task-panel__field-label">组合编码</span>
|
||||
<strong class="task-panel__field-value">{{ formData.combo_code || '—' }}</strong>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__grid">
|
||||
<div v-if="mode !== 'edit'" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">组合编码</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="combo_code">
|
||||
<el-input
|
||||
v-model="formData.combo_code"
|
||||
size="default"
|
||||
placeholder="全局唯一"
|
||||
@blur="normalizeComboCode"
|
||||
/>
|
||||
</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-form">
|
||||
<el-form-item prop="combo_name">
|
||||
<el-input v-model="formData.combo_name" 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-form">
|
||||
<el-form-item prop="custom_code">
|
||||
<el-input
|
||||
v-model="formData.custom_code"
|
||||
size="default"
|
||||
placeholder="可选,按货主唯一"
|
||||
@blur="normalizeCustomCode"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">仓库 ID</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-form-item prop="warehouse_id">
|
||||
<el-input-number
|
||||
v-model="formData.warehouse_id"
|
||||
:min="1"
|
||||
controls-position="right"
|
||||
placeholder="可选"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</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-form">
|
||||
<el-form-item prop="store_id">
|
||||
<el-select
|
||||
v-model="formData.store_id"
|
||||
size="default"
|
||||
placeholder="请选择货主"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="store in storeOptions"
|
||||
:key="store.value"
|
||||
:label="store.label"
|
||||
:value="store.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="mode === 'edit'" class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">状态</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-radio-group v-model="formData.status">
|
||||
<el-radio :label="1">启用</el-radio>
|
||||
<el-radio :label="0">停用</el-radio>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--textarea task-panel__field--full">
|
||||
<span class="task-panel__field-label">备注</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item prop="remark">
|
||||
<el-input
|
||||
v-model="formData.remark"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
resize="none"
|
||||
size="default"
|
||||
placeholder="可选"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 子商品明细 -->
|
||||
<div class="task-panel__sub-head">
|
||||
<span class="task-panel__sub-title">子商品明细</span>
|
||||
<span class="task-panel__sub-meta">共 {{ formItems.length }} 个子商品</span>
|
||||
<el-button size="small" type="primary" plain @click="pickerVisible = true">添加子商品</el-button>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__table-wrap">
|
||||
<el-table :data="formItems" border size="small" max-height="280" empty-text="请至少添加 1 个子商品">
|
||||
<el-table-column label="序号" width="64" align="center" header-align="center">
|
||||
<template #default="{ $index }">{{ $index + 1 }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="item_goods_sku_id" label="SKU ID" width="90" align="center" header-align="center" />
|
||||
<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="140" align="center" header-align="center" show-overflow-tooltip />
|
||||
<el-table-column label="数量" width="120" align="center" header-align="center">
|
||||
<template #default="{ row }">
|
||||
<el-input-number
|
||||
v-model="row.item_quantity"
|
||||
:min="1"
|
||||
:step="1"
|
||||
controls-position="right"
|
||||
size="small"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="排序" width="100" align="center" header-align="center">
|
||||
<template #default="{ row, $index }">
|
||||
<el-input-number
|
||||
v-model="row.sort_order"
|
||||
:min="1"
|
||||
:step="1"
|
||||
controls-position="right"
|
||||
size="small"
|
||||
style="width: 100%"
|
||||
@change="(val: number | undefined) => onSortOrderChange($index, val)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="72" align="center" header-align="center" fixed="right">
|
||||
<template #default="{ $index }">
|
||||
<el-button link type="danger" size="small" @click="removeItem($index)">移除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
<!-- <p class="task-panel__form-tip">
|
||||
至少添加 1 个子商品;组合编码全局唯一,自定义编码按货主唯一;子商品数量需为正整数。
|
||||
</p> -->
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认组合编码与子商品明细</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="visible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="saving" @click="submitForm">保存</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
<el-table :data="formItems" border size="small" max-height="280" empty-text="请至少添加 1 个子商品">
|
||||
<el-table-column label="序号" width="64" align="center">
|
||||
<template #default="{ $index }">{{ $index + 1 }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="item_goods_sku_id" label="SKU ID" width="90" />
|
||||
<el-table-column prop="item_code" label="商品编码" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="item_name" label="商品名称" min-width="140" show-overflow-tooltip />
|
||||
<el-table-column label="数量" width="120">
|
||||
<template #default="{ row }">
|
||||
<el-input-number
|
||||
v-model="row.item_quantity"
|
||||
:min="1"
|
||||
:step="1"
|
||||
controls-position="right"
|
||||
size="small"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="排序" width="100">
|
||||
<template #default="{ row, $index }">
|
||||
<el-input-number
|
||||
v-model="row.sort_order"
|
||||
:min="1"
|
||||
:step="1"
|
||||
controls-position="right"
|
||||
size="small"
|
||||
style="width: 100%"
|
||||
@change="(val: number | undefined) => onSortOrderChange($index, val)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="72" align="center" fixed="right">
|
||||
<template #default="{ $index }">
|
||||
<el-button link type="danger" size="small" @click="removeItem($index)">移除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<ComboStockPickerDialog v-model="pickerVisible" :store-id="formData.store_id" @confirm="handlePickItems" />
|
||||
|
||||
<template #footer>
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="saving" @click="submitForm">保存</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@ -402,16 +473,293 @@ async function submitForm() {
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.items-toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin: 8px 0 10px;
|
||||
}
|
||||
|
||||
.items-title {
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.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;
|
||||
|
||||
/* 字段 + 子商品明细表:超出 66vh 时面板内滚动 */
|
||||
&--scroll {
|
||||
max-height: 66vh;
|
||||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
|
||||
&__form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
/* 双列栅格:每格一个「标签 + 控件」行,窄屏自动降为单列 */
|
||||
&__grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
column-gap: 16px;
|
||||
row-gap: 8px;
|
||||
|
||||
@media (max-width: 720px) {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
}
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 左 12px 与上方标签对齐;右 0 让输入框右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
/* 输入行标签整体下移 7px,星号同步下移以保持与文字基线对齐 */
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 开关 / 数字输入 / 单选等控件行:高度与输入框对齐(32px) */
|
||||
&--control {
|
||||
align-items: center;
|
||||
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;
|
||||
}
|
||||
|
||||
/* 整行占满(备注) */
|
||||
&--full {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度(含必填星号占位):各行列、控件左边缘严格对齐 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
|
||||
/* 必填星号绝对定位在标签左侧,不占用标签宽度 */
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
color: #f56c6c;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 输入控件容器:占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
:deep(.el-input),
|
||||
:deep(.el-select),
|
||||
:deep(.el-input-number) {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* 控件行:开关 / 数字输入 / 单选组左对齐,行高与输入框(32px)一致 */
|
||||
&--row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 子商品明细:标题 + 数量统计 + 添加按钮 */
|
||||
&__sub-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
margin: 12px 0 8px;
|
||||
}
|
||||
|
||||
&__sub-title {
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
&__sub-meta {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
/* 表格容器:表格边框与面板同色 */
|
||||
&__table-wrap {
|
||||
:deep(.el-table) {
|
||||
border-radius: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 表单下方统一提示条 */
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.combo-goods-form-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -151,7 +151,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p class="task-panel__form-tip">{{ transferTipText }}</p>
|
||||
<!-- <p class="task-panel__form-tip">{{ transferTipText }}</p> -->
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
|
||||
@ -185,92 +185,190 @@
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-model="editDialogVisible" :title="editDialogTitle" align-center width="760px" append-to-body>
|
||||
<el-form :model="editForm" label-width="110px" size="small" class="edit-detail-form">
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="6"><el-form-item><template #label>实际收货数量<span class="required-mark">*</span></template><el-input v-model="editForm.actual_quantity" clearable @input="handleQuantityLinkage('actual_quantity')" /></el-form-item></el-col>
|
||||
<el-col :span="6"><el-form-item><template #label>箱数<span class="required-mark">*</span></template><el-input v-model="editForm.box_quantity" clearable @input="handleQuantityLinkage('box_quantity')" /></el-form-item></el-col>
|
||||
<el-col :span="6"><el-form-item><template #label>箱规<span class="required-mark">*</span></template><el-input v-model="editForm.boxes_per_pallet" clearable @input="handleQuantityLinkage('boxes_per_pallet')" /></el-form-item></el-col>
|
||||
<el-col :span="6"><el-form-item><template #label>剩余不满一箱<span class="required-mark">*</span></template><el-input v-model="editForm.box_remainder" clearable @input="handleQuantityLinkage('box_remainder')" /></el-form-item></el-col>
|
||||
<!-- 新增/编辑收货明细:面板结构对齐「新建波次策略」(双列栅格) -->
|
||||
<el-dialog
|
||||
v-model="editDialogVisible"
|
||||
class="edit-detail-dialog"
|
||||
align-center
|
||||
width="min(880px, 96vw)"
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<div class="task-panel task-panel--detail">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>{{ editDialogTitle }}</h2>
|
||||
<p>数量、箱规与条码/商品名称按收货规则联动,带 * 为必填项</p>
|
||||
</div>
|
||||
<button class="task-panel__close" type="button" aria-label="关闭" @click="editDialogVisible = 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-col :span="12"><el-form-item label="托盘数"><el-input v-model="editForm.pallet_quantity" clearable /></el-form-item></el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item>
|
||||
<template #label>批次号<span v-if="hasSkuSelected && isBatchManaged" class="required-mark">*</span></template>
|
||||
<el-input v-model="editForm.batch_number" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<div class="task-panel__body task-panel__body--scroll">
|
||||
<el-form :model="editForm" class="task-panel__form" @submit.prevent>
|
||||
<div class="task-panel__grid">
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">实际收货数量</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="editForm.actual_quantity" size="default" clearable placeholder="实际清点数量,如 100" @input="handleQuantityLinkage('actual_quantity')" />
|
||||
</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-form">
|
||||
<el-input v-model="editForm.box_quantity" size="default" clearable placeholder="整箱数量" @input="handleQuantityLinkage('box_quantity')" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form-item>
|
||||
<template #label>生产日期<span v-if="hasSkuSelected && isShelfLifeManaged" class="required-mark">*</span></template>
|
||||
<el-date-picker
|
||||
v-model="editForm.production_date"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width:100%"
|
||||
@change="onEditProductionDateChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item>
|
||||
<template #label>到期日期<span v-if="hasSkuSelected && isShelfLifeManaged" class="required-mark">*</span></template>
|
||||
<el-date-picker
|
||||
v-model="editForm.expiry_date"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
style="width:100%"
|
||||
@change="onEditExpiryDateChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">箱规</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="editForm.boxes_per_pallet" size="default" clearable placeholder="每箱数量" @input="handleQuantityLinkage('boxes_per_pallet')" />
|
||||
</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-form">
|
||||
<el-input v-model="editForm.box_remainder" size="default" clearable placeholder="不满一箱的数量" @input="handleQuantityLinkage('box_remainder')" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form-item label="库位">
|
||||
<el-input :model-value="spaceDisplayName" readonly>
|
||||
<template #append>
|
||||
<el-button @click="openSpacePicker">选择系统库位</el-button>
|
||||
</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12"><el-form-item label="毛重/重量(g)"><el-input-number v-model="editForm.weight" :min="0" :precision="0" :controls="false" style="width: 100%" /></el-form-item></el-col>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">托盘数</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="editForm.pallet_quantity" size="default" clearable placeholder="" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label" :class="{ 'is-required': hasSkuSelected && isBatchManaged }">批次号</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="editForm.batch_number" size="default" clearable placeholder="如 20251029A" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form-item label="SKU">
|
||||
<el-input v-model="editForm.system_product_id" readonly>
|
||||
<template #append>
|
||||
<el-button @click="openEditSystemProductPicker">查询系统商品</el-button>
|
||||
</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item>
|
||||
<template #label>条码<span v-if="!hasSkuSelected" class="required-mark">*</span></template>
|
||||
<el-input v-model="editForm.barcode" clearable :disabled="hasSkuSelected" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item>
|
||||
<template #label>商品名称<span v-if="!hasSkuSelected" class="required-mark">*</span></template>
|
||||
<el-input v-model="editForm.product_name" clearable :disabled="hasSkuSelected" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label" :class="{ 'is-required': hasSkuSelected && isShelfLifeManaged }">生产日期</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-date-picker
|
||||
v-model="editForm.production_date"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
size="default"
|
||||
placeholder="请选择生产日期"
|
||||
style="width: 100%"
|
||||
@change="onEditProductionDateChange"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label" :class="{ 'is-required': hasSkuSelected && isShelfLifeManaged }">到期日期</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-date-picker
|
||||
v-model="editForm.expiry_date"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
size="default"
|
||||
placeholder="请选择到期日期"
|
||||
style="width: 100%"
|
||||
@change="onEditExpiryDateChange"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-col :span="12"><el-form-item label="箱长"><el-input v-model="editForm.box_length" clearable /></el-form-item></el-col>
|
||||
<el-col :span="12"><el-form-item label="箱宽"><el-input v-model="editForm.box_width" clearable /></el-form-item></el-col>
|
||||
<el-col :span="12"><el-form-item label="箱高"><el-input v-model="editForm.box_height" clearable /></el-form-item></el-col>
|
||||
<el-col :span="12"><el-form-item label="实测箱重(g)"><el-input-number v-model="editForm.box_weight" :min="0" :precision="0" :controls="false" style="width: 100%" /></el-form-item></el-col>
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--full">
|
||||
<span class="task-panel__field-label">库位</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input :model-value="spaceDisplayName" size="default" readonly placeholder="点击右侧按钮选择库位">
|
||||
<template #append>
|
||||
<el-button @click="openSpacePicker">选择系统库位</el-button>
|
||||
</template>
|
||||
</el-input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-col :span="24"><el-form-item label="备注"><el-input v-model="editForm.remark" type="textarea" :rows="3" clearable /></el-form-item></el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button size="small" @click="editDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="editSaving" @click="submitEditDetail">保存</el-button>
|
||||
</template>
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--full">
|
||||
<span class="task-panel__field-label">SKU</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="editForm.system_product_id" size="default" readonly placeholder="点击右侧按钮查询系统商品">
|
||||
<template #append>
|
||||
<el-button @click="openEditSystemProductPicker">查询系统商品</el-button>
|
||||
</template>
|
||||
</el-input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label" :class="{ 'is-required': !hasSkuSelected }">条码</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="editForm.barcode" size="default" clearable placeholder="扫码或输入条码" :disabled="hasSkuSelected" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">毛重/重量(g)</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-input-number v-model="editForm.weight" :min="0" :precision="0" :controls="false" placeholder="单位 g,如 1500" style="width: 100%" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--full">
|
||||
<span class="task-panel__field-label" :class="{ 'is-required': !hasSkuSelected }">商品名称</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="editForm.product_name" size="default" clearable placeholder="请输入商品名称" :disabled="hasSkuSelected" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">箱长</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="editForm.box_length" size="default" clearable placeholder="单位 cm,如 40" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">箱宽</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="editForm.box_width" size="default" clearable placeholder="单位 cm,如 30" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">箱高</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="editForm.box_height" size="default" clearable placeholder="单位 cm,如 20" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">实测箱重(g)</span>
|
||||
<div class="task-panel__field-form task-panel__field-form--row">
|
||||
<el-input-number v-model="editForm.box_weight" :min="0" :precision="0" :controls="false" placeholder="单位 g,如 1200" style="width: 100%" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--textarea task-panel__field--full">
|
||||
<span class="task-panel__field-label">备注</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="editForm.remark" type="textarea" :rows="3" resize="none" size="default" clearable placeholder="选填,可记录收货异常情况" />
|
||||
</div>
|
||||
</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="editDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="editSaving" @click="submitEditDetail">保存</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
@ -3097,6 +3195,18 @@ onUnmounted(() => {
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
/* 双列栅格:每格一个「标签 + 控件」行,窄屏自动降为单列 */
|
||||
&__grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
column-gap: 16px;
|
||||
row-gap: 8px;
|
||||
|
||||
@media (max-width: 720px) {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
}
|
||||
}
|
||||
|
||||
&__field {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -3133,6 +3243,21 @@ onUnmounted(() => {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(数字输入 / 开关等):与输入行同构,行高对齐 32px */
|
||||
&--control {
|
||||
align-items: center;
|
||||
min-height: 0;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
/* 整行占满(库位 / SKU / 商品名称 / 备注) */
|
||||
&--full {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-label {
|
||||
@ -3151,6 +3276,50 @@ onUnmounted(() => {
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 输入控件容器:占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
:deep(.el-input),
|
||||
:deep(.el-select),
|
||||
:deep(.el-input-number),
|
||||
:deep(.el-date-editor) {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
:deep(.el-input-group) {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* 控件行:数字输入左对齐,行高与输入框(32px)一致 */
|
||||
&--row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 多值条码折叠(同 UpperTable copyAction 列的 +N 折叠交互) */
|
||||
&__barcode {
|
||||
display: flex;
|
||||
@ -3361,6 +3530,64 @@ onUnmounted(() => {
|
||||
}
|
||||
}
|
||||
|
||||
/* 新增/编辑收货明细:标签列固定 96px(容得下「剩余不满一箱」),双列栅格对齐 */
|
||||
.task-panel--detail {
|
||||
/* 内边距 / 滚动高度严格对齐「新建波次策略」:head 16px、body 12px 16px 0、foot 16px */
|
||||
.task-panel__head {
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
.task-panel__body {
|
||||
padding: 12px 16px 0;
|
||||
|
||||
&--scroll {
|
||||
max-height: 64vh;
|
||||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__foot {
|
||||
justify-content: space-between;
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
.task-panel__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 96px;
|
||||
width: 96px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
/* 必填星号:绝对定位占位,标签文字起点一致 */
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__field--input {
|
||||
align-items: flex-start;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__field--control .task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 分页位于页脚「关闭」按钮左侧,始终展示;尺寸 / 选择器宽度对齐 UpperTable 默认分页 */
|
||||
.batch-import-pagination,
|
||||
.system-product-pagination {
|
||||
@ -3683,17 +3910,6 @@ onUnmounted(() => {
|
||||
z-index: 3;
|
||||
}
|
||||
|
||||
.edit-detail-form {
|
||||
:deep(.el-input-group) {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
:deep(.el-form-item .el-input),
|
||||
:deep(.el-form-item .el-date-editor) {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.right-col {
|
||||
grid-column: 2 / 3;
|
||||
grid-row: 2 / 3;
|
||||
@ -3784,6 +4000,7 @@ onUnmounted(() => {
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板(同手工录入运单号) */
|
||||
.el-dialog.batch-import-dialog,
|
||||
.el-dialog.system-product-dialog,
|
||||
.el-dialog.edit-detail-dialog,
|
||||
.el-dialog.bind-detail-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
@ -167,32 +167,92 @@
|
||||
:update-time="exportTaskProgress.updateTime"
|
||||
/>
|
||||
|
||||
<!-- 新建收货单对话框 -->
|
||||
<el-dialog v-model="createDialogVisible" title="新建收货单" width="600px" align-center
|
||||
@closed="handleCreateDialogClosed">
|
||||
<el-form :model="createForm" label-width="100px" size="small">
|
||||
<el-row :gutter="20">
|
||||
<el-col v-for="field in addReceivingFieldsRef" :key="field.prop" :span="field.type === 'textarea' ? 24 : 12">
|
||||
<el-form-item>
|
||||
<template #label>
|
||||
<span>{{ field.label }}</span>
|
||||
<span v-if="['delivery_method','loading_method'].includes(field.prop)" style="color: #f56c6c; margin-left:6px">*</span>
|
||||
</template>
|
||||
<el-select v-if="field.type === 'select'" v-model="createForm[field.prop]"
|
||||
:placeholder="'请选择' + field.label" style="width: 100%" :filterable="field.filterable">
|
||||
<el-option v-for="opt in field.options" :key="opt.value" :label="opt.label" :value="opt.value" />
|
||||
</el-select>
|
||||
<el-input v-else-if="field.type === 'textarea'" v-model="createForm[field.prop]" type="textarea" :rows="3"
|
||||
:placeholder="'请输入' + field.label" />
|
||||
<el-input v-else v-model="createForm[field.prop]" :placeholder="'请输入' + field.label" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button size="small" @click="createDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="createLoading" @click="submitCreateReceiving">确定</el-button>
|
||||
</template>
|
||||
<!-- 新建收货单:面板结构 / 尺寸对齐「手工录入运单号」,主体双列栅格 -->
|
||||
<el-dialog
|
||||
v-model="createDialogVisible"
|
||||
class="create-receiving-dialog"
|
||||
width="min(800px, 96vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
@closed="handleCreateDialogClosed"
|
||||
>
|
||||
<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="createDialogVisible = 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 task-panel__body--scroll">
|
||||
<el-form :model="createForm" class="task-panel__form" @submit.prevent>
|
||||
<div class="task-panel__grid">
|
||||
<div
|
||||
v-for="field in addReceivingFieldsRef"
|
||||
:key="field.prop"
|
||||
class="task-panel__field task-panel__field--input"
|
||||
:class="{
|
||||
'task-panel__field--textarea': field.type === 'textarea',
|
||||
'task-panel__field--full': field.type === 'textarea'
|
||||
}"
|
||||
>
|
||||
<span
|
||||
class="task-panel__field-label"
|
||||
:class="{ 'is-required': ['delivery_method', 'loading_method'].includes(field.prop) }"
|
||||
>{{ field.label }}</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-form-item :prop="field.prop">
|
||||
<el-select
|
||||
v-if="field.type === 'select'"
|
||||
v-model="createForm[field.prop]"
|
||||
size="default"
|
||||
:placeholder="'请选择' + field.label"
|
||||
style="width: 100%"
|
||||
:filterable="field.filterable"
|
||||
>
|
||||
<el-option v-for="opt in field.options" :key="opt.value" :label="opt.label" :value="opt.value" />
|
||||
</el-select>
|
||||
<el-input
|
||||
v-else-if="field.type === 'textarea'"
|
||||
v-model="createForm[field.prop]"
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
resize="none"
|
||||
size="default"
|
||||
:placeholder="'请输入' + field.label"
|
||||
/>
|
||||
<el-input
|
||||
v-else
|
||||
v-model="createForm[field.prop]"
|
||||
size="default"
|
||||
:placeholder="'请输入' + field.label"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</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="createDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="createLoading" @click="submitCreateReceiving">确定</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 驳回收货单对话框 -->
|
||||
@ -1908,6 +1968,11 @@ async function handleExportAll() {
|
||||
padding: 12px 16px 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
/* 字段较多时面板内滚动 */
|
||||
&--scroll {
|
||||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
|
||||
&__section-title {
|
||||
@ -1935,6 +2000,18 @@ async function handleExportAll() {
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
/* 双列栅格:每个格子一个「标签 + 控件」行,窄屏自动降为单列 */
|
||||
&__grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
column-gap: 16px;
|
||||
row-gap: 8px;
|
||||
|
||||
@media (max-width: 640px) {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
}
|
||||
}
|
||||
|
||||
&__field {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -1946,11 +2023,11 @@ async function handleExportAll() {
|
||||
border-radius: 4px;
|
||||
background: #fafafa;
|
||||
|
||||
/* 驳回理由输入行:不需要灰色容器,与上方静态信息行拉开层次 */
|
||||
/* 驳回理由 / 新建收货单输入行:不需要灰色容器,与静态信息行拉开层次 */
|
||||
&--input {
|
||||
align-items: center;
|
||||
align-items: flex-start;
|
||||
min-height: 0;
|
||||
/* 左 12px 与上方标签对齐;右 0 让输入框右边顶到灰色容器右边缘 */
|
||||
/* 左 12px 与上方标签对齐;右 0 让输入框右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
@ -1961,6 +2038,15 @@ async function handleExportAll() {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
/* 单行输入框垂直居中于 32px 控件,标签同步下移保持基线对齐 */
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&--textarea {
|
||||
@ -1970,14 +2056,81 @@ async function handleExportAll() {
|
||||
padding-top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(开关 / 数字输入等):与输入行同构,行高对齐 32px */
|
||||
&--control {
|
||||
align-items: center;
|
||||
min-height: 0;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 整行占满(文本域 / 说明类字段) */
|
||||
&--full {
|
||||
grid-column: 1 / -1;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
flex-shrink: 0;
|
||||
white-space: nowrap;
|
||||
text-align: left;
|
||||
|
||||
/* 必填星号绝对定位在标签左侧,不占用标签宽度,保证各行列对齐 */
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
color: #f56c6c;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 输入控件容器:占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
:deep(.el-input),
|
||||
:deep(.el-select),
|
||||
:deep(.el-input-number) {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-value {
|
||||
@ -2051,6 +2204,7 @@ async function handleExportAll() {
|
||||
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板(同手工录入运单号) */
|
||||
.el-dialog.reject-receiving-dialog,
|
||||
.el-dialog.create-receiving-dialog,
|
||||
.el-dialog.match-putaway-dialog-shell {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
@ -338,6 +338,10 @@
|
||||
<span v-if="!isBlind" class="sub-meta">
|
||||
账面 {{ item.system_quantity ?? '—' }} / 已盘 {{ item.checked_quantity ?? '—' }}
|
||||
</span>
|
||||
<!-- 静态盘点:拣货未完成(picking_completed=0)时该商品不可上报,仅作提示 -->
|
||||
<el-tag v-if="isPickingPending(item)" type="warning" size="small" class="unknown-tag">
|
||||
拣货中
|
||||
</el-tag>
|
||||
<RecordImages :images="item.images" :max="2" />
|
||||
</div>
|
||||
</div>
|
||||
@ -719,6 +723,20 @@ function checkedGoodsCount(row: Record<string, any>): number {
|
||||
: 0
|
||||
}
|
||||
|
||||
/**
|
||||
* 静态盘点:该商品是否**尚未完成拣货**(`picking_completed=0`)
|
||||
*
|
||||
* 📌 2026-10-29 文档新增:仅静态盘点(`is_static=1`)的 space 视图 `goods` 子项返回该字段
|
||||
* (1=已完成拣货 / 0=未完成,口径=仓库内该商品 `wms_storage SUM(locked_quantity)` 是否为 0)。
|
||||
* 未完成时 `stock.check.report` 会返 400「商品尚未完成拣货…」,这里只做提示、不拦截上报。
|
||||
* 字段缺失(非静态盘点 / 旧响应)一律视为「无此状态」,不展示标记。
|
||||
*/
|
||||
function isPickingPending(item: Record<string, any>): boolean {
|
||||
const raw = item?.picking_completed
|
||||
if (raw === undefined || raw === null) return false
|
||||
return !(raw === true || Number(raw) === 1)
|
||||
}
|
||||
|
||||
function itemStatusTag(status: any) {
|
||||
return String(status ?? '') === 'checked' ? 'success' : 'info'
|
||||
}
|
||||
|
||||
@ -381,9 +381,9 @@
|
||||
<strong class="task-panel__field-value">开启</strong>
|
||||
</div>
|
||||
</div>
|
||||
<p class="task-panel__form-tip">
|
||||
<!-- <p class="task-panel__form-tip">
|
||||
审核通过后即可开始盘点作业
|
||||
</p>
|
||||
</p> -->
|
||||
<p v-if="auditStatic" class="task-panel__form-tip task-panel__form-tip--warning">
|
||||
已开启静态盘点:审核通过后将锁定移库 / 分配储位(拣货不受影响),需等盘点完成后自动解锁。
|
||||
</p>
|
||||
|
||||
@ -149,9 +149,9 @@
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
<!-- <p class="task-panel__form-tip">
|
||||
{{ createAlertText }}
|
||||
</p>
|
||||
</p> -->
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
|
||||
@ -158,91 +158,122 @@
|
||||
:fetch-print-data="fetchPrintData"
|
||||
/>
|
||||
|
||||
<!-- 转为销售订单:面板结构 / 双列栅格对齐「新建波次策略」 -->
|
||||
<el-dialog
|
||||
v-model="toOrderDialogVisible"
|
||||
title="转为销售订单"
|
||||
width="640px"
|
||||
class="to-order-dialog-shell"
|
||||
width="min(720px, 96vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<div class="to-order-dialog">
|
||||
<!-- <el-alert
|
||||
type="info"
|
||||
:closable="false"
|
||||
show-icon
|
||||
:title="`将出库单「${toOrderTargetRow?.stockout_order_code || toOrderTargetRow?.id || ''}」转为正式销售订单,转单成功后原出库单将置为已作废。`"
|
||||
style="margin-bottom: 16px;"
|
||||
/> -->
|
||||
<div class="task-panel">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>转为销售订单</h2>
|
||||
<p>将出库单「{{ toOrderTargetRow?.stockout_order_code || toOrderTargetRow?.id || '—' }}」转为正式销售订单,转单成功后原出库单将置为已作废</p>
|
||||
</div>
|
||||
<button class="task-panel__close" type="button" aria-label="关闭" @click="toOrderDialogVisible = 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-form :model="toOrderForm" label-width="110px" size="small">
|
||||
<el-form-item label="新订单号">
|
||||
<el-input v-model="toOrderForm.delivery_order_code" placeholder="不填自动生成(SK 前缀)" clearable />
|
||||
</el-form-item>
|
||||
<div class="task-panel__body task-panel__body--scroll">
|
||||
<el-form :model="toOrderForm" class="task-panel__form" @submit.prevent>
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--full">
|
||||
<span class="task-panel__field-label">新订单号</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="toOrderForm.delivery_order_code" size="default" placeholder="不填自动生成(SK 前缀)" clearable />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-divider content-position="left">收件人信息(可选)</el-divider>
|
||||
<div class="task-panel__grid">
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">收件人姓名</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="toOrderForm.receiverInfo.name" size="default" placeholder="收件人姓名" clearable />
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">手机号</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="toOrderForm.receiverInfo.mobile" size="default" placeholder="手机号" clearable />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="姓名">
|
||||
<el-input v-model="toOrderForm.receiverInfo.name" placeholder="收件人姓名" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="手机号">
|
||||
<el-input v-model="toOrderForm.receiverInfo.mobile" placeholder="手机号" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="电话">
|
||||
<el-input v-model="toOrderForm.receiverInfo.tel" placeholder="固定电话(可选)" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="邮编">
|
||||
<el-input v-model="toOrderForm.receiverInfo.zipCode" placeholder="邮编(可选)" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="省份">
|
||||
<el-input v-model="toOrderForm.receiverInfo.province" placeholder="省份" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="城市">
|
||||
<el-input v-model="toOrderForm.receiverInfo.city" placeholder="城市" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="区县">
|
||||
<el-input v-model="toOrderForm.receiverInfo.area" placeholder="区县" clearable />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item label="乡镇">
|
||||
<el-input v-model="toOrderForm.receiverInfo.town" placeholder="乡镇(可选)" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="详细地址">
|
||||
<el-input
|
||||
v-model="toOrderForm.receiverInfo.detailAddress"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
placeholder="详细地址(可选)"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">电话</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="toOrderForm.receiverInfo.tel" size="default" placeholder="固定电话(可选)" clearable />
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">邮编</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="toOrderForm.receiverInfo.zipCode" size="default" placeholder="邮编(可选)" clearable />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">省份</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="toOrderForm.receiverInfo.province" size="default" placeholder="省份" clearable />
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">城市</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="toOrderForm.receiverInfo.city" size="default" placeholder="城市" clearable />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">区县</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="toOrderForm.receiverInfo.area" size="default" placeholder="区县" clearable />
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">乡镇</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input v-model="toOrderForm.receiverInfo.town" size="default" placeholder="乡镇(可选)" clearable />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--textarea task-panel__field--full">
|
||||
<span class="task-panel__field-label">详细地址</span>
|
||||
<div class="task-panel__field-form">
|
||||
<el-input
|
||||
v-model="toOrderForm.receiverInfo.detailAddress"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
resize="none"
|
||||
size="default"
|
||||
placeholder="详细地址(可选)"
|
||||
clearable
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
收件人信息均为选填,不会影响转单;新订单号留空时自动生成(SK 前缀),原出库单在转单成功后作废。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认新订单号与收件人信息</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="toOrderDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="toOrderLoading" @click="handleToOrderSubmit">确认转单</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<el-button size="small" @click="toOrderDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="toOrderLoading" @click="handleToOrderSubmit">确认转单</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
@ -1524,6 +1555,12 @@ function handleImport() {
|
||||
|
||||
&__body {
|
||||
padding: 12px 16px 0;
|
||||
|
||||
/* 字段较多时面板内滚动(对齐新建波次策略) */
|
||||
&--scroll {
|
||||
max-height: 64vh;
|
||||
overflow-y: auto;
|
||||
}
|
||||
}
|
||||
|
||||
&__form {
|
||||
@ -1532,6 +1569,18 @@ function handleImport() {
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
/* 双列栅格:每格一个「标签 + 控件」行,窄屏自动降为单列 */
|
||||
&__grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
column-gap: 16px;
|
||||
row-gap: 8px;
|
||||
|
||||
@media (max-width: 720px) {
|
||||
grid-template-columns: minmax(0, 1fr);
|
||||
}
|
||||
}
|
||||
|
||||
&__field {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -1563,6 +1612,25 @@ function handleImport() {
|
||||
padding-top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(开关 / 数字输入等):与输入行同构 */
|
||||
&--control {
|
||||
align-items: center;
|
||||
min-height: 0;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 整行占满(新订单号 / 详细地址) */
|
||||
&--full {
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度(含必填星号占位):保证各输入框左边缘对齐、长度一致 */
|
||||
@ -1592,6 +1660,38 @@ function handleImport() {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
/* 字段容器(双列栅格内使用):占满标签列右侧剩余宽度 */
|
||||
&__field-form {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
max-width: none;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
|
||||
:deep(.el-input),
|
||||
:deep(.el-select),
|
||||
:deep(.el-input-number),
|
||||
:deep(.el-date-editor) {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-tip {
|
||||
margin: 4px 0 0;
|
||||
font-size: 12px;
|
||||
@ -1599,6 +1699,17 @@ function handleImport() {
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
/* 表单下方统一提示条(对齐「新建波次策略」的 .task-panel__form-tip) */
|
||||
&__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;
|
||||
@ -1628,7 +1739,8 @@ function handleImport() {
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.update-express-dialog {
|
||||
.el-dialog.update-express-dialog,
|
||||
.el-dialog.to-order-dialog-shell {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
@ -1640,4 +1752,9 @@ function handleImport() {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* 转单表单字段少(双列 6 行),限死最大宽度避免输入框被拉长 */
|
||||
.el-dialog.to-order-dialog-shell {
|
||||
max-width: min(720px, 96vw);
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -97,7 +97,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 新增/编辑工号弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
|
||||
<!-- 新增/编辑工号弹窗:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="dialogFormVisible"
|
||||
class="account-form-dialog"
|
||||
@ -136,6 +136,12 @@
|
||||
<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 v-if="dialogStatus === 'update'" class="task-panel__field">
|
||||
<span class="task-panel__field-label">工号 ID</span>
|
||||
<strong class="task-panel__field-value">{{ temp.employee_id ?? '—' }}</strong>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span
|
||||
class="task-panel__field-label"
|
||||
@ -223,6 +229,13 @@
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
{{ dialogStatus === 'create'
|
||||
? '用户名留空由系统自动生成;密码默认 111111,可在此修改;角色决定该工号在系统中的操作权限。'
|
||||
: '可修改姓名、邮箱与角色配置,手机号创建后不可修改;头像在「工号头像」页签更新。' }}
|
||||
</p>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
|
||||
@ -254,54 +267,114 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 角色分配弹窗 -->
|
||||
<el-dialog title="分配角色" v-model="roleDialogVisible" width="900px" align-center>
|
||||
<div v-loading="roleLoading">
|
||||
<el-alert
|
||||
:title="`正在为工号「${currentEmployeeRow?.real_name || currentEmployeeId}」分配角色。已勾选项为当前已绑定角色,修改后点击确认分配即整体替换。`"
|
||||
type="info"
|
||||
:closable="false"
|
||||
style="margin-bottom:12px"
|
||||
/>
|
||||
<!-- 过滤栏 -->
|
||||
<el-form :inline="true" :model="roleFilter" style="margin-bottom:10px" size="small">
|
||||
<el-form-item label="关键词">
|
||||
<el-input v-model="roleFilter.keyword" placeholder="角色名称" clearable style="width:200px" @input="applyRoleFilter" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button size="small" @click="toggleSelectAll">{{ isAllSelected ? '取消全选' : '全选当前页' }}</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<!-- 角色表格 -->
|
||||
<el-table
|
||||
ref="roleTableRef"
|
||||
:data="filteredRoles"
|
||||
border
|
||||
size="small"
|
||||
max-height="450"
|
||||
row-key="role_id"
|
||||
@selection-change="handleRoleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="45" />
|
||||
<el-table-column label="角色名称" prop="role_name" min-width="130" />
|
||||
<el-table-column label="描述" prop="description" min-width="220" show-overflow-tooltip />
|
||||
<el-table-column label="初始状态" width="90">
|
||||
<template #default="{ row }">
|
||||
<el-tag v-if="row.selected" type="success" size="small">已分配</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div style="margin-top:8px;color:#999;font-size:12px">已选 {{ selectedRoleIds.length }} 项</div>
|
||||
</div>
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button size="small" @click="roleDialogVisible = false">关闭</el-button>
|
||||
<el-button size="small" type="primary" :loading="roleSubmitting" @click="submitRoleUpdate">确认分配</el-button>
|
||||
<!-- 分配角色弹窗:面板结构 / 尺寸对齐「批量发货」(BatchQuickRecheckForm) -->
|
||||
<el-dialog
|
||||
v-model="roleDialogVisible"
|
||||
class="role-assign-dialog"
|
||||
width="min(760px, 94vw)"
|
||||
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="roleDialogVisible = 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 v-loading="roleLoading" 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">{{ currentEmployeeRow?.real_name || currentEmployeeId || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">已选角色</span>
|
||||
<strong class="task-panel__field-value">{{ selectedRoleIds.length }} 项</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-input
|
||||
v-model="roleFilter.keyword"
|
||||
placeholder="按角色名称筛选"
|
||||
clearable
|
||||
@input="applyRoleFilter"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 提示条:对齐「批量发货」表单的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
勾选需要分配的角色(已勾选项为当前已绑定角色),确认后整体替换该工号的角色;可按角色名称筛选后使用「全选当前页」批量勾选。
|
||||
</p>
|
||||
|
||||
<div class="task-panel__section role-list">
|
||||
<div class="role-list-toolbar">
|
||||
<span class="task-panel__section-title">角色列表({{ filteredRoles.length }})</span>
|
||||
<el-button size="small" @click="toggleSelectAll">
|
||||
{{ isAllSelected ? '取消全选' : '全选当前页' }}
|
||||
</el-button>
|
||||
</div>
|
||||
<div class="task-panel__table-wrap">
|
||||
<el-table
|
||||
ref="roleTableRef"
|
||||
:data="filteredRoles"
|
||||
border
|
||||
size="small"
|
||||
max-height="420"
|
||||
row-key="role_id"
|
||||
@selection-change="handleRoleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="48" align="center" header-align="center" />
|
||||
<el-table-column label="角色名称" prop="role_name" min-width="130" align="center" header-align="center" />
|
||||
<el-table-column
|
||||
label="描述"
|
||||
prop="description"
|
||||
min-width="220"
|
||||
align="center"
|
||||
header-align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column label="初始状态" width="100" align="center" header-align="center">
|
||||
<template #default="{ row }">
|
||||
<span v-if="row.selected" :class="getStatusTextClass('success')">已分配</span>
|
||||
<span v-else>—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">确认后整体替换该工号的角色</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="roleDialogVisible = false">关闭</el-button>
|
||||
<el-button size="small" type="primary" :loading="roleSubmitting" @click="submitRoleUpdate">
|
||||
确认分配
|
||||
</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 重置密码弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
|
||||
<!-- 重置密码弹窗:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="resetPwdDialogVisible"
|
||||
class="reset-password-dialog"
|
||||
@ -353,10 +426,14 @@
|
||||
placeholder="请输入新密码(至少6位)"
|
||||
/>
|
||||
</el-form-item>
|
||||
<p class="task-panel__field-tip">密码至少 6 位,建议包含字母与数字</p>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
密码至少 6 位,建议包含字母与数字;提交后该账号将立即使用新密码登录,旧密码失效。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
@ -369,47 +446,112 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 绑定微信弹窗 -->
|
||||
<el-dialog title="绑定微信" v-model="bindWechatDialogVisible" width="400px" align-center @close="handleBindWechatDialogClose">
|
||||
<div class="bind-wechat-body">
|
||||
<!-- 已绑定状态 -->
|
||||
<div v-if="bindWechatIsBound" class="bound-info">
|
||||
<el-icon class="bound-icon"><CircleCheckFilled /></el-icon>
|
||||
<span>已绑定微信:{{ bindWechatNickname || '微信用户' }}</span>
|
||||
<!-- 绑定微信弹窗:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="bindWechatDialogVisible"
|
||||
class="bind-wechat-dialog"
|
||||
width="min(440px, 92vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
@close="handleBindWechatDialogClose"
|
||||
>
|
||||
<div class="task-panel">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>绑定微信</h2>
|
||||
<p>{{ bindWechatIsBound ? '该工号已完成微信绑定' : '使用微信扫码关注公众号完成绑定' }}</p>
|
||||
</div>
|
||||
<button
|
||||
class="task-panel__close"
|
||||
type="button"
|
||||
aria-label="关闭"
|
||||
@click="bindWechatDialogVisible = 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">{{ bindWechatTargetName || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">绑定状态</span>
|
||||
<span class="task-panel__field-value">
|
||||
<span :class="getStatusTextClass(bindWechatIsBound ? 'success' : 'info')">
|
||||
{{ bindWechatIsBound ? `已绑定${bindWechatNickname ? `:${bindWechatNickname}` : ''}` : '未绑定' }}
|
||||
</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="bind-wechat-body">
|
||||
<!-- 已绑定状态 -->
|
||||
<div v-if="bindWechatIsBound" class="bound-info">
|
||||
<el-icon class="bound-icon"><CircleCheckFilled /></el-icon>
|
||||
<span>已绑定微信:{{ bindWechatNickname || '微信用户' }}</span>
|
||||
</div>
|
||||
|
||||
<!-- 未绑定:二维码区域 -->
|
||||
<template v-else>
|
||||
<div class="qrcode-wrapper">
|
||||
<div v-if="bindWechatLoading" class="status-overlay loading-overlay">
|
||||
<el-icon class="is-loading"><Loading /></el-icon>
|
||||
<span>加载中...</span>
|
||||
</div>
|
||||
<div
|
||||
v-else-if="bindWechatQrStatus === 'expired'"
|
||||
class="status-overlay expired-overlay"
|
||||
@click="refreshBindWechatQr"
|
||||
>
|
||||
<el-icon><RefreshRight /></el-icon>
|
||||
<span>二维码已过期,点击刷新</span>
|
||||
</div>
|
||||
<div v-else-if="bindWechatQrStatus === 'scanned'" class="status-overlay scanned-overlay">
|
||||
<el-icon><CircleCheckFilled /></el-icon>
|
||||
<span>扫码成功,正在确认...</span>
|
||||
</div>
|
||||
<img
|
||||
v-else-if="bindWechatQrCodeUrl"
|
||||
:src="bindWechatQrCodeUrl"
|
||||
alt="微信二维码"
|
||||
class="qrcode-img"
|
||||
/>
|
||||
<div v-else class="status-overlay loading-overlay">
|
||||
<el-icon class="is-loading"><Loading /></el-icon>
|
||||
<span>正在获取二维码...</span>
|
||||
</div>
|
||||
|
||||
<p class="qrcode-tip">
|
||||
<template v-if="bindWechatQrStatus === 'scanned'">请在微信中确认绑定</template>
|
||||
<template v-else-if="bindWechatQrStatus === 'expired'">二维码已失效,点击上方刷新</template>
|
||||
<template v-else>请使用微信扫码关注公众号完成绑定</template>
|
||||
</p>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
{{ bindWechatIsBound
|
||||
? '如需更换微信,请先在列表中「解除绑定」后重新扫码。'
|
||||
: '二维码有效期有限,过期后点击二维码区域刷新;扫码后请在微信中确认绑定。' }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- 未绑定:二维码区域 -->
|
||||
<template v-else>
|
||||
<div class="qrcode-wrapper">
|
||||
<div v-if="bindWechatLoading" class="status-overlay loading-overlay">
|
||||
<el-icon class="is-loading"><Loading /></el-icon>
|
||||
<span>加载中...</span>
|
||||
</div>
|
||||
<div v-else-if="bindWechatQrStatus === 'expired'" class="status-overlay expired-overlay" @click="refreshBindWechatQr">
|
||||
<el-icon><RefreshRight /></el-icon>
|
||||
<span>二维码已过期,点击刷新</span>
|
||||
</div>
|
||||
<div v-else-if="bindWechatQrStatus === 'scanned'" class="status-overlay scanned-overlay">
|
||||
<el-icon><CircleCheckFilled /></el-icon>
|
||||
<span>扫码成功,正在确认...</span>
|
||||
</div>
|
||||
<img v-else-if="bindWechatQrCodeUrl" :src="bindWechatQrCodeUrl" alt="微信二维码" class="qrcode-img" />
|
||||
<div v-else class="status-overlay loading-overlay">
|
||||
<el-icon class="is-loading"><Loading /></el-icon>
|
||||
<span>正在获取二维码...</span>
|
||||
</div>
|
||||
|
||||
<p class="qrcode-tip">
|
||||
<template v-if="bindWechatQrStatus === 'scanned'">请在微信中确认绑定</template>
|
||||
<template v-else-if="bindWechatQrStatus === 'expired'">二维码已失效,点击上方刷新</template>
|
||||
<template v-else>请使用微信扫码关注公众号完成绑定</template>
|
||||
</p>
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">绑定结果将在列表中同步显示</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="bindWechatDialogVisible = false">关闭</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</footer>
|
||||
</div>
|
||||
<template #footer>
|
||||
<el-button size="small" @click="bindWechatDialogVisible = false">关闭</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
@ -844,6 +986,7 @@ const bindLinkTemplate = 'https://ye4s.wms.gztbyc.com/mini/?spm=0.3.${code}.1.4'
|
||||
|
||||
const bindWechatDialogVisible = ref(false)
|
||||
const bindWechatUserId = ref<number | null>(null)
|
||||
const bindWechatTargetName = ref('')
|
||||
const bindWechatIsBound = ref(false)
|
||||
const bindWechatNickname = ref('')
|
||||
const bindWechatLoading = ref(false)
|
||||
@ -953,6 +1096,7 @@ const refreshBindWechatQr = async () => {
|
||||
const handleBindWechat = async (row: any) => {
|
||||
stopBindWechatPoll()
|
||||
bindWechatUserId.value = row.account_id
|
||||
bindWechatTargetName.value = row.real_name || row.phone || ''
|
||||
bindWechatIsBound.value = false
|
||||
bindWechatNickname.value = ''
|
||||
bindWechatQrCodeUrl.value = ''
|
||||
@ -964,6 +1108,7 @@ const handleBindWechat = async (row: any) => {
|
||||
const handleBindWechatDialogClose = () => {
|
||||
stopBindWechatPoll()
|
||||
bindWechatUserId.value = null
|
||||
bindWechatTargetName.value = ''
|
||||
}
|
||||
|
||||
const handleUnbindWechat = (row: any) => {
|
||||
@ -1221,6 +1366,26 @@ const handleUnbindWechat = (row: any) => {
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
/* 列表分组(分配角色等) */
|
||||
&__section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
&__section-title {
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
&__table-wrap {
|
||||
border-radius: 4px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
&__field {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -1243,20 +1408,34 @@ const handleUnbindWechat = (row: any) => {
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
flex-shrink: 0;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1273,13 +1452,6 @@ const handleUnbindWechat = (row: any) => {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__field-tip {
|
||||
margin: 4px 0 0;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
&__foot {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -1296,7 +1468,8 @@ const handleUnbindWechat = (row: any) => {
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
@ -1321,11 +1494,21 @@ const handleUnbindWechat = (row: any) => {
|
||||
padding-top: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 分配角色弹窗:角色列表工具行(标题 + 全选按钮) */
|
||||
.role-list-toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 8px;
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.reset-password-dialog,
|
||||
.el-dialog.role-assign-dialog,
|
||||
.el-dialog.bind-wechat-dialog,
|
||||
.el-dialog.account-form-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
@ -129,22 +129,25 @@ function resolveTagType(field: DetailFieldConfig, value: any): string {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
/* ut-status-text 系列状态文字颜色类定义在 order-sub.scss 里(scoped 样式需要本组件自行引入) */
|
||||
@use "../../../../../../order/orderManagement/styles/order-sub.scss";
|
||||
/* 容器对齐 order/orderManagement 的 OrderDetailPanel(.order-detail-view) */
|
||||
|
||||
/* 面板自带内边距(宿主 .detail-container 已改为 padding: 0),
|
||||
与 order/waveOrder「波次明细」面板(WaveBatchDetailPanel)完全一致 */
|
||||
.detail-panel {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
padding: 10px;
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
padding: 6px 10px 8px;
|
||||
box-sizing: border-box;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.empty-tip {
|
||||
text-align: center;
|
||||
font-size: 13px;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
color: #909399;
|
||||
padding: 40px 0;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.section {
|
||||
@ -167,10 +170,15 @@ function resolveTagType(field: DetailFieldConfig, value: any): string {
|
||||
|
||||
.detail-descriptions {
|
||||
:deep(.el-descriptions__label) {
|
||||
width: 120px;
|
||||
width: 110px;
|
||||
min-width: 110px;
|
||||
background: #fafbfc;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
:deep(.el-descriptions__content) {
|
||||
word-break: break-word;
|
||||
}
|
||||
}
|
||||
|
||||
.order-list-pre {
|
||||
|
||||
@ -864,6 +864,13 @@ onMounted(() => {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 详情区外壳与 order/waveOrder「波次明细」一致:不留上/下间距(明细面板
|
||||
自带 padding: 6px 10px 8px),只留左右 10px,内容滚动交给明细面板 */
|
||||
.order-sub-container .main-content .lower-level .detail-container {
|
||||
padding: 0 10px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
/* ================================================================
|
||||
1. 顶部多标签页
|
||||
================================================================ */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!--
|
||||
<!--
|
||||
ApiAppFormDialog — API 应用创建/编辑弹窗
|
||||
对接接口:
|
||||
- apiAppListCallbackFunctions:拉取出站回调 method 注册表(「回调方法」多选项)
|
||||
@ -9,142 +9,187 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
v-model="dialogVisible"
|
||||
:title="isEdit ? '编辑 API 应用' : '创建 API 应用'"
|
||||
width="600px"
|
||||
class="api-app-form-dialog"
|
||||
width="min(600px, 94vw)"
|
||||
:close-on-click-modal="false"
|
||||
destroy-on-close
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
@closed="handleClosed"
|
||||
>
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
:rules="formRules"
|
||||
label-width="120px"
|
||||
label-position="right"
|
||||
size="small"
|
||||
>
|
||||
<el-form-item label="应用名称" prop="app_name">
|
||||
<el-input
|
||||
v-model="formData.app_name"
|
||||
placeholder="请输入应用名称"
|
||||
:maxlength="200"
|
||||
show-word-limit
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="速率限制">
|
||||
<el-input-number
|
||||
v-model="formData.rate_limit"
|
||||
:min="1"
|
||||
:max="100000"
|
||||
:precision="0"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
<span class="unit-text">次/秒</span>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="回调 URL">
|
||||
<el-input
|
||||
v-model="formData.callback_url"
|
||||
placeholder="接收推送通知的 URL,如 https://example.com/webhook"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="回调方法">
|
||||
<el-select
|
||||
v-model="formData.callback_functions"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
:loading="callbackLoading"
|
||||
placeholder="不选择 = 不承接任何回调"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="opt in callbackOptions"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="IP 白名单">
|
||||
<div class="ip-whitelist">
|
||||
<el-tag
|
||||
v-for="(ip, idx) in formData.self_ip_whitelist"
|
||||
:key="idx"
|
||||
closable
|
||||
class="ip-tag"
|
||||
@close="handleRemoveFormIp(idx)"
|
||||
>
|
||||
{{ ip }}
|
||||
</el-tag>
|
||||
<el-input
|
||||
v-if="formIpInputVisible"
|
||||
ref="formIpInputRef"
|
||||
v-model="formIpInputValue"
|
||||
size="small"
|
||||
style="width: 160px"
|
||||
placeholder="IP 或 CIDR"
|
||||
@blur="handleAddFormIp"
|
||||
@keyup.enter="handleAddFormIp"
|
||||
/>
|
||||
<el-button v-else size="small" @click="showFormIpInput">+ 添加 IP</el-button>
|
||||
<div class="task-panel">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>{{ isEdit ? '编辑 API 应用' : '创建 API 应用' }}</h2>
|
||||
<p>{{ isEdit ? '修改后保存立即生效' : '创建成功后将展示一次性的 AppKey / AppSecret' }}</p>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<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>
|
||||
|
||||
<el-form-item v-if="isEdit" label="启用状态">
|
||||
<el-switch
|
||||
v-model="formData.is_enabled"
|
||||
:active-value="1"
|
||||
:inactive-value="0"
|
||||
active-text="启用"
|
||||
inactive-text="停用"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="task-panel__body">
|
||||
<el-form ref="formRef" :model="formData" :rules="formRules" class="task-panel__form">
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">应用名称</span>
|
||||
<el-form-item prop="app_name">
|
||||
<el-input
|
||||
v-model="formData.app_name"
|
||||
placeholder="请输入应用名称"
|
||||
:maxlength="200"
|
||||
show-word-limit
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<!-- 创建成功后显示密钥信息 -->
|
||||
<template v-if="createdSecret">
|
||||
<el-divider />
|
||||
<el-alert
|
||||
type="warning"
|
||||
:closable="false"
|
||||
show-icon
|
||||
title="请立即保存以下密钥信息,关闭后 AppSecret 将不再完整显示!"
|
||||
/>
|
||||
<div class="secret-display">
|
||||
<div class="secret-row">
|
||||
<span class="secret-label">AppKey:</span>
|
||||
<code class="secret-value">{{ createdSecret.self_app_key }}</code>
|
||||
<el-button link type="primary" size="small" @click="handleCopy(createdSecret.self_app_key, 'AppKey')">
|
||||
复制
|
||||
</el-button>
|
||||
</div>
|
||||
<div class="secret-row">
|
||||
<span class="secret-label">AppSecret:</span>
|
||||
<code class="secret-value secret-highlight">{{ createdSecret.self_app_secret }}</code>
|
||||
<el-button link type="primary" size="small" @click="handleCopy(createdSecret.self_app_secret, 'AppSecret')">
|
||||
复制
|
||||
</el-button>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">速率限制</span>
|
||||
<div class="task-panel__field-control rate-limit-row">
|
||||
<el-form-item>
|
||||
<el-input-number
|
||||
v-model="formData.rate_limit"
|
||||
:min="1"
|
||||
:max="100000"
|
||||
:precision="0"
|
||||
controls-position="right"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<span class="unit-text">次/秒</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">回调 URL</span>
|
||||
<el-form-item>
|
||||
<el-input
|
||||
v-model="formData.callback_url"
|
||||
placeholder="接收推送通知的 URL,如 https://example.com/webhook"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">回调方法</span>
|
||||
<el-form-item>
|
||||
<el-select
|
||||
v-model="formData.callback_functions"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
collapse-tags
|
||||
collapse-tags-tooltip
|
||||
:loading="callbackLoading"
|
||||
placeholder="不选择 = 不承接任何回调"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="opt in callbackOptions"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">IP 白名单</span>
|
||||
<div class="ip-whitelist">
|
||||
<el-tag
|
||||
v-for="(ip, idx) in formData.self_ip_whitelist"
|
||||
:key="idx"
|
||||
closable
|
||||
class="ip-tag"
|
||||
@close="handleRemoveFormIp(idx)"
|
||||
>
|
||||
{{ ip }}
|
||||
</el-tag>
|
||||
<el-input
|
||||
v-if="formIpInputVisible"
|
||||
ref="formIpInputRef"
|
||||
v-model="formIpInputValue"
|
||||
size="small"
|
||||
style="width: 160px"
|
||||
placeholder="IP 或 CIDR"
|
||||
@blur="handleAddFormIp"
|
||||
@keyup.enter="handleAddFormIp"
|
||||
/>
|
||||
<el-button v-else size="small" @click="showFormIpInput">+ 添加 IP</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="isEdit" class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">启用状态</span>
|
||||
<div class="task-panel__field-control">
|
||||
<el-form-item>
|
||||
<el-switch
|
||||
v-model="formData.is_enabled"
|
||||
:active-value="1"
|
||||
:inactive-value="0"
|
||||
active-text="启用"
|
||||
inactive-text="停用"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
速率限制单位为「次/秒」;回调方法留空表示不承接任何出站回调;IP 白名单支持 IP 或 CIDR 格式。
|
||||
</p>
|
||||
|
||||
<!-- 创建成功后显示密钥信息 -->
|
||||
<div v-if="createdSecret" class="task-panel__section secret-section">
|
||||
<span class="task-panel__section-title">应用密钥(仅显示一次)</span>
|
||||
<p class="task-panel__form-tip task-panel__form-tip--warning">
|
||||
请立即保存以下密钥信息,关闭后 AppSecret 将不再完整显示!
|
||||
</p>
|
||||
<div class="secret-display">
|
||||
<div class="secret-row">
|
||||
<span class="secret-label">AppKey:</span>
|
||||
<code class="secret-value">{{ createdSecret.self_app_key }}</code>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="handleCopy(createdSecret.self_app_key, 'AppKey')"
|
||||
>
|
||||
复制
|
||||
</el-button>
|
||||
</div>
|
||||
<div class="secret-row">
|
||||
<span class="secret-label">AppSecret:</span>
|
||||
<code class="secret-value secret-highlight">{{ createdSecret.self_app_secret }}</code>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="handleCopy(createdSecret.self_app_secret, 'AppSecret')"
|
||||
>
|
||||
复制
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<template #footer>
|
||||
<el-button size="small" @click="handleClosed">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">
|
||||
{{ isEdit ? '保存' : '创建' }}
|
||||
</el-button>
|
||||
</template>
|
||||
<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="submitting" @click="handleSubmit">
|
||||
{{ isEdit ? '保存' : '创建' }}
|
||||
</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@ -405,9 +450,21 @@ async function handleCopy(text: string, label: string) {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
/* 速率限制:数值 + 单位同行 */
|
||||
.rate-limit-row {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 8px;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.unit-text {
|
||||
margin-left: 8px;
|
||||
font-size: 13px;
|
||||
line-height: 32px;
|
||||
color: #606266;
|
||||
white-space: nowrap;
|
||||
}
|
||||
@ -418,12 +475,17 @@ async function handleCopy(text: string, label: string) {
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
width: 100%;
|
||||
min-height: 32px;
|
||||
}
|
||||
|
||||
.ip-tag {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.secret-section {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.secret-display {
|
||||
background: #f5f7fa;
|
||||
border: 1px solid #e4e7ed;
|
||||
@ -460,4 +522,242 @@ async function handleCopy(text: string, label: string) {
|
||||
color: #e6a23c;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.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;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
&__section-title {
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
&__section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 右 0 让控件右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(开关):与输入行同尺寸,去掉灰色容器 */
|
||||
&--control {
|
||||
align-items: flex-start;
|
||||
min-height: 36px;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__field-control {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-control {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f5;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
|
||||
/* 一次性密钥等强提示 */
|
||||
&--warning {
|
||||
background: #fdf6ec;
|
||||
color: #e6a23c;
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.api-app-form-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!--
|
||||
<!--
|
||||
DefinitionFormDialog — 报表定义(wms_report_definition)新增/编辑 表单弹窗
|
||||
对接接口:report.definition.save(按 id upsert,未传字段不覆盖)
|
||||
极简配置:报表类型 type(report.definition.typeList 注册)+ 勾选字段 fields(勾选后支持上移/下移排序,顺序即导出表格列顺序)+ 导出文件名 file_name(占位 {date} 数据日期 / {time} 生成时刻 HHmmss / {datetime} 数据日期_生成时刻 / {timestamp} 生成时刻毫秒时间戳)
|
||||
@ -6,118 +6,162 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="visible"
|
||||
:title="isEdit ? '编辑报表定义' : '新增报表定义'"
|
||||
width="680px"
|
||||
class="definition-form-dialog"
|
||||
width="min(680px, 94vw)"
|
||||
align-center
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
@closed="handleClosed"
|
||||
>
|
||||
<div class="form-body">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="120px"
|
||||
size="small"
|
||||
>
|
||||
<el-form-item label="报表名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入报表名称(≤100 字符)" maxlength="100" />
|
||||
</el-form-item>
|
||||
<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>
|
||||
|
||||
<el-form-item label="报表类型" prop="type">
|
||||
<el-select
|
||||
v-model="form.type"
|
||||
:disabled="isEdit"
|
||||
placeholder="请选择报表类型"
|
||||
style="width: 100%"
|
||||
@change="handleTypeChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="opt in typeOptions"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
<div class="form-tip" v-if="isEdit">报表类型一经创建不可更改</div>
|
||||
<!-- <div v-if="currentTypeInfo" class="form-tip type-desc">{{ currentTypeInfo.description }}</div> -->
|
||||
</el-form-item>
|
||||
<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>
|
||||
<el-form-item prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入报表名称(≤100 字符)" maxlength="100" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<el-form-item label="导出文件名" prop="file_name">
|
||||
<el-input
|
||||
v-model="form.file_name"
|
||||
placeholder="导出文件名模板,支持 {date}/{time}/{datetime}/{timestamp} 占位(≤200 字符)"
|
||||
maxlength="200"
|
||||
/>
|
||||
<!-- <div class="form-tip">
|
||||
如:库存变化报表_{date};{date} 数据日期、{time} 生成时刻 HHmmss、{datetime} 数据日期_生成时刻、{timestamp} 生成时刻毫秒时间戳
|
||||
</div> -->
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="勾选字段" prop="fields">
|
||||
<el-checkbox-group v-model="form.fields" class="field-checkbox-group">
|
||||
<el-checkbox
|
||||
v-for="f in currentTypeFields"
|
||||
:key="f.key"
|
||||
:label="f.key"
|
||||
>
|
||||
{{ f.label }}
|
||||
<span v-if="f.computed" class="field-computed">(预计算)</span>
|
||||
<span v-else-if="f.asText" class="field-astext">(文本)</span>
|
||||
<span v-if="f.children?.length" class="field-array">(含子字段 {{ f.children.length }} 项)</span>
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
|
||||
<div v-if="form.fields.length" class="field-order">
|
||||
<div class="field-order__title">
|
||||
字段顺序(自上而下即导出表格列顺序)
|
||||
<span class="field-order__tip">已选 {{ form.fields.length }} 项,可拖动手柄或使用按钮调整</span>
|
||||
</div>
|
||||
<div ref="orderListRef" class="field-order__list">
|
||||
<div
|
||||
v-for="(key, idx) in form.fields"
|
||||
:key="key"
|
||||
class="field-order__item"
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">报表类型</span>
|
||||
<el-form-item prop="type">
|
||||
<el-select
|
||||
v-model="form.type"
|
||||
:disabled="isEdit"
|
||||
placeholder="请选择报表类型"
|
||||
style="width: 100%"
|
||||
@change="handleTypeChange"
|
||||
>
|
||||
<el-icon class="field-order__drag" :size="14"><Rank /></el-icon>
|
||||
<span class="field-order__idx">{{ idx + 1 }}</span>
|
||||
<span class="field-order__label" :title="key">{{ fieldLabel(key) }}</span>
|
||||
<span class="field-order__key">{{ key }}</span>
|
||||
<span class="field-order__actions">
|
||||
<el-button link size="small" :disabled="idx === 0" @click="moveField(idx, -1)">
|
||||
上移
|
||||
</el-button>
|
||||
<el-button link size="small" :disabled="idx === form.fields.length - 1" @click="moveField(idx, 1)">
|
||||
下移
|
||||
</el-button>
|
||||
</span>
|
||||
<el-option
|
||||
v-for="opt in typeOptions"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">导出文件名</span>
|
||||
<el-form-item prop="file_name">
|
||||
<el-input
|
||||
v-model="form.file_name"
|
||||
placeholder="导出文件名模板,支持 {date}/{time}/{datetime}/{timestamp} 占位(≤200 字符)"
|
||||
maxlength="200"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">勾选字段</span>
|
||||
<el-form-item prop="fields">
|
||||
<div class="field-picker">
|
||||
<el-checkbox-group v-model="form.fields" class="field-checkbox-group">
|
||||
<el-checkbox
|
||||
v-for="f in currentTypeFields"
|
||||
:key="f.key"
|
||||
:label="f.key"
|
||||
>
|
||||
{{ f.label }}
|
||||
<span v-if="f.computed" class="field-computed">(预计算)</span>
|
||||
<span v-else-if="f.asText" class="field-astext">(文本)</span>
|
||||
<span v-if="f.children?.length" class="field-array">(含子字段 {{ f.children.length }} 项)</span>
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
|
||||
<div v-if="!currentTypeFields.length" class="field-empty">
|
||||
{{ isEdit ? '未找到该类型的字段清单' : '请先选择报表类型' }}
|
||||
</div>
|
||||
|
||||
<div v-if="form.fields.length" class="field-order">
|
||||
<div class="field-order__title">
|
||||
字段顺序(自上而下即导出表格列顺序)
|
||||
<span class="field-order__tip">已选 {{ form.fields.length }} 项,可拖动手柄或使用按钮调整</span>
|
||||
</div>
|
||||
<div ref="orderListRef" class="field-order__list">
|
||||
<div
|
||||
v-for="(key, idx) in form.fields"
|
||||
:key="key"
|
||||
class="field-order__item"
|
||||
>
|
||||
<el-icon class="field-order__drag" :size="14"><Rank /></el-icon>
|
||||
<span class="field-order__idx">{{ idx + 1 }}</span>
|
||||
<span class="field-order__label" :title="key">{{ fieldLabel(key) }}</span>
|
||||
<span class="field-order__key">{{ key }}</span>
|
||||
<span class="field-order__actions">
|
||||
<el-button link size="small" :disabled="idx === 0" @click="moveField(idx, -1)">
|
||||
上移
|
||||
</el-button>
|
||||
<el-button link size="small" :disabled="idx === form.fields.length - 1" @click="moveField(idx, 1)">
|
||||
下移
|
||||
</el-button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">启用状态</span>
|
||||
<div class="task-panel__field-control">
|
||||
<el-form-item prop="is_enabled">
|
||||
<el-switch v-model="form.is_enabled" :active-value="1" :inactive-value="0" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="!currentTypeFields.length" class="form-tip">
|
||||
{{ isEdit ? '未找到该类型的字段清单' : '请先选择报表类型' }}
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--textarea">
|
||||
<span class="task-panel__field-label">备注</span>
|
||||
<el-form-item prop="remark">
|
||||
<el-input
|
||||
v-model="form.remark"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
resize="none"
|
||||
maxlength="500"
|
||||
placeholder="最长 500 字符"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-form-item label="启用状态" prop="is_enabled">
|
||||
<el-switch v-model="form.is_enabled" :active-value="1" :inactive-value="0" />
|
||||
</el-form-item>
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
<template v-if="isEdit">报表类型一经创建不可更改;</template>
|
||||
导出文件名支持 {date} 数据日期、{time} 生成时刻 HHmmss、{datetime} 数据日期_生成时刻、{timestamp} 毫秒时间戳;勾选字段的顺序即导出表格的列顺序。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" :rows="2" maxlength="500" placeholder="最长 500 字符" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<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="submitting" @click="handleSubmit">确认</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<el-button size="small" @click="handleClosed">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">
|
||||
确认
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@ -347,132 +391,354 @@ async function handleSubmit() {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.form-body {
|
||||
padding: 12px 4px 0 0;
|
||||
/* 字段选择区:勾选 + 顺序调整 */
|
||||
.field-picker {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.form-tip {
|
||||
.field-checkbox-group {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px 18px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.field-computed {
|
||||
font-size: 12px;
|
||||
color: #e6a23c;
|
||||
}
|
||||
|
||||
.field-astext {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.field-array {
|
||||
font-size: 12px;
|
||||
color: #409eff;
|
||||
}
|
||||
|
||||
.field-empty {
|
||||
margin-top: 4px;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.field-order {
|
||||
width: 100%;
|
||||
margin-top: 8px;
|
||||
|
||||
&__title {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
line-height: 1.5;
|
||||
margin-top: 4px;
|
||||
}
|
||||
color: #606266;
|
||||
font-weight: 600;
|
||||
margin-bottom: 6px;
|
||||
|
||||
.field-checkbox-group {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px 18px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.field-computed {
|
||||
font-size: 12px;
|
||||
color: #e6a23c;
|
||||
}
|
||||
|
||||
.field-astext {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.field-array {
|
||||
font-size: 12px;
|
||||
color: #409eff;
|
||||
}
|
||||
|
||||
.field-order {
|
||||
width: 100%;
|
||||
margin-top: 8px;
|
||||
|
||||
&__title {
|
||||
font-size: 12px;
|
||||
color: #606266;
|
||||
font-weight: 600;
|
||||
margin-bottom: 6px;
|
||||
|
||||
.field-order__tip {
|
||||
font-weight: 400;
|
||||
color: #909399;
|
||||
margin-left: 6px;
|
||||
}
|
||||
}
|
||||
|
||||
&__list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
max-height: 220px;
|
||||
overflow-y: auto;
|
||||
padding-right: 4px;
|
||||
}
|
||||
|
||||
&__item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 4px 8px;
|
||||
border: 1px solid #ebeef5;
|
||||
border-radius: 4px;
|
||||
background: #fafafa;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
&__drag {
|
||||
flex: 0 0 auto;
|
||||
.field-order__tip {
|
||||
font-weight: 400;
|
||||
color: #909399;
|
||||
cursor: move;
|
||||
margin-left: 6px;
|
||||
}
|
||||
}
|
||||
|
||||
&__ghost {
|
||||
opacity: 0.4;
|
||||
border-style: dashed;
|
||||
border-color: #409eff;
|
||||
background: #ecf5ff;
|
||||
}
|
||||
&__list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
max-height: 220px;
|
||||
overflow-y: auto;
|
||||
padding-right: 4px;
|
||||
}
|
||||
|
||||
&__chosen {
|
||||
border-color: #409eff;
|
||||
background: #ecf5ff;
|
||||
}
|
||||
&__item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 4px 8px;
|
||||
border: 1px solid #ebeef5;
|
||||
border-radius: 4px;
|
||||
background: #fafafa;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
&__dragging {
|
||||
opacity: 0.9;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.12);
|
||||
}
|
||||
&__drag {
|
||||
flex: 0 0 auto;
|
||||
color: #909399;
|
||||
cursor: move;
|
||||
}
|
||||
|
||||
&__idx {
|
||||
flex: 0 0 20px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50%;
|
||||
background: #409eff;
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
}
|
||||
&__ghost {
|
||||
opacity: 0.4;
|
||||
border-style: dashed;
|
||||
border-color: #409eff;
|
||||
background: #ecf5ff;
|
||||
}
|
||||
|
||||
&__label {
|
||||
flex: 0 0 auto;
|
||||
&__chosen {
|
||||
border-color: #409eff;
|
||||
background: #ecf5ff;
|
||||
}
|
||||
|
||||
&__dragging {
|
||||
opacity: 0.9;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.12);
|
||||
}
|
||||
|
||||
&__idx {
|
||||
flex: 0 0 20px;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
text-align: center;
|
||||
border-radius: 50%;
|
||||
background: #409eff;
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
&__label {
|
||||
flex: 0 0 auto;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
&__key {
|
||||
flex: 1 1 auto;
|
||||
color: #909399;
|
||||
font-size: 12px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
&__actions {
|
||||
flex: 0 0 auto;
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.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;
|
||||
}
|
||||
|
||||
&__key {
|
||||
flex: 1 1 auto;
|
||||
color: #909399;
|
||||
p {
|
||||
margin: 4px 0 0;
|
||||
font-size: 12px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
&__actions {
|
||||
flex: 0 0 auto;
|
||||
white-space: nowrap;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
}
|
||||
}
|
||||
|
||||
.type-desc {
|
||||
max-height: 52px;
|
||||
&__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;
|
||||
}
|
||||
}
|
||||
|
||||
/* 字段较多:超出 68vh 时面板内滚动 */
|
||||
&__body {
|
||||
padding: 12px 16px 0;
|
||||
max-height: 68vh;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
&__form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 右 0 让控件右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(开关):与输入行同尺寸,去掉灰色容器 */
|
||||
&--control {
|
||||
align-items: flex-start;
|
||||
min-height: 36px;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__field-control {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 多行文本行:标签与文本域顶部对齐 */
|
||||
&--textarea {
|
||||
padding-top: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-control {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.definition-form-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -5,52 +5,76 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="visible"
|
||||
title="复制投递计划"
|
||||
width="520px"
|
||||
class="delivery-plan-copy-dialog"
|
||||
width="min(520px, 92vw)"
|
||||
align-center
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
@closed="handleClosed"
|
||||
>
|
||||
<div class="form-body">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="90px"
|
||||
size="small"
|
||||
>
|
||||
<el-form-item label="源计划">
|
||||
<div class="source-info">
|
||||
<el-tag size="small" type="info" effect="plain">{{ sourceLabel }}</el-tag>
|
||||
<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="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">
|
||||
<span class="task-panel__field-label">源计划</span>
|
||||
<strong class="task-panel__field-value">{{ sourceLabel || '—' }}</strong>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="复制到" prop="store_ids">
|
||||
<el-select
|
||||
v-model="form.store_ids"
|
||||
multiple
|
||||
filterable
|
||||
placeholder="选择要复制到的货主(可多选,不含源货主)"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="opt in targetStoreOptions"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
<div class="form-tip">按源计划配置复制给所选货主;同一货主已有该报表计划时后端会返回冲突提示</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">关联报表</span>
|
||||
<strong class="task-panel__field-value">{{ report_name || '—' }}</strong>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">复制到</span>
|
||||
<el-form-item prop="store_ids">
|
||||
<el-select
|
||||
v-model="form.store_ids"
|
||||
multiple
|
||||
filterable
|
||||
placeholder="选择要复制到的货主(可多选,不含源货主)"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="opt in targetStoreOptions"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<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="handleClosed">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">确认复制</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<el-button size="small" @click="handleClosed">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">确认复制</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@ -152,20 +176,201 @@ async function handleSubmit() {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.form-body {
|
||||
padding: 12px 4px 0 0;
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.task-panel {
|
||||
background: #fff;
|
||||
color: #303133;
|
||||
|
||||
.source-info {
|
||||
min-height: 24px;
|
||||
&__head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
align-items: flex-start;
|
||||
gap: 12px;
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
.form-tip {
|
||||
&__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;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 右 0 让控件右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
}
|
||||
}
|
||||
|
||||
/* 静态信息行的值(源计划 / 关联报表) */
|
||||
&__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;
|
||||
}
|
||||
|
||||
&__foot {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
&__hint {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
line-height: 1.5;
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.delivery-plan-copy-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!--
|
||||
<!--
|
||||
DeliveryPlanFormDialog — 货主报表投递计划 新增/编辑 表单弹窗
|
||||
对接接口:report.deliveryPlan.save(货主 store_id + 报表定义 report_id 唯一,存在则更新)
|
||||
报表通过下拉单选关联 report.definition.list 中的启用报表定义;渠道已收敛,仅 inbox
|
||||
@ -6,164 +6,184 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
:model-value="visible"
|
||||
:title="isEdit ? '编辑投递计划' : '新增投递计划'"
|
||||
width="620px"
|
||||
class="delivery-plan-form-dialog"
|
||||
width="min(620px, 94vw)"
|
||||
align-center
|
||||
destroy-on-close
|
||||
:close-on-click-modal="false"
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
@closed="handleClosed"
|
||||
>
|
||||
<div class="form-body">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="110px"
|
||||
size="small"
|
||||
>
|
||||
<el-form-item label="计划名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入计划名称(≤100 字符)" maxlength="100" />
|
||||
</el-form-item>
|
||||
<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>
|
||||
|
||||
<el-form-item label="货主" prop="store_id">
|
||||
<el-select
|
||||
v-model="form.store_id"
|
||||
filterable
|
||||
placeholder="请选择货主"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="opt in storeOptions"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="关联报表" prop="report_definition_id">
|
||||
<el-select
|
||||
v-model="form.report_definition_id"
|
||||
filterable
|
||||
placeholder="请选择要关联的报表定义"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="opt in reportOptions"
|
||||
:key="opt.value"
|
||||
:label="opt.label"
|
||||
:value="opt.value"
|
||||
/>
|
||||
</el-select>
|
||||
<div class="form-tip">仅展示启用中的报表定义,选择后按其类型与字段生成投递内容</div>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="投递时间" prop="schedule_times">
|
||||
<div class="string-array-editor">
|
||||
<div v-if="form.schedule_times.length" class="tag-list">
|
||||
<el-tag
|
||||
v-for="(t, idx) in form.schedule_times"
|
||||
:key="`${t}-${idx}`"
|
||||
closable
|
||||
size="small"
|
||||
@close="removeScheduleTime(idx)"
|
||||
>{{ t }}</el-tag>
|
||||
</div>
|
||||
<div class="tag-input-row">
|
||||
<el-input
|
||||
v-model="scheduleTimeInput"
|
||||
placeholder="输入 HH:mm 后回车添加,如 08:00"
|
||||
maxlength="5"
|
||||
@keyup.enter="addScheduleTime"
|
||||
/>
|
||||
<el-button size="small" :disabled="!scheduleTimeInput.trim()" @click="addScheduleTime">添加</el-button>
|
||||
</div>
|
||||
<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>
|
||||
<el-form-item prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入计划名称(≤100 字符)" maxlength="100" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
<div class="form-tip">24 小时制时间点(如 08:00),系统会自动去重并升序排列</div>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="补投宽限(分)" prop="late_grace_minutes">
|
||||
<el-input-number
|
||||
v-model="form.late_grace_minutes"
|
||||
:min="0"
|
||||
:max="1440"
|
||||
:precision="0"
|
||||
controls-position="right"
|
||||
placeholder="默认 60"
|
||||
style="width: 100%"
|
||||
/>
|
||||
<div class="form-tip">0-1440,默认 60;越界值自动夹取</div>
|
||||
</el-form-item>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">货主</span>
|
||||
<el-form-item prop="store_id">
|
||||
<el-select v-model="form.store_id" filterable placeholder="请选择货主" style="width: 100%">
|
||||
<el-option v-for="opt in storeOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" :rows="2" maxlength="500" placeholder="最长 500 字符" />
|
||||
</el-form-item>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">关联报表</span>
|
||||
<el-form-item prop="report_definition_id">
|
||||
<el-select
|
||||
v-model="form.report_definition_id"
|
||||
filterable
|
||||
placeholder="请选择要关联的报表定义"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option v-for="opt in reportOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<el-divider content-position="left">文本通知配置(可选)</el-divider>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">投递时间</span>
|
||||
<el-form-item prop="schedule_times">
|
||||
<div class="string-array-editor">
|
||||
<div v-if="form.schedule_times.length" class="tag-list">
|
||||
<el-tag
|
||||
v-for="(t, idx) in form.schedule_times"
|
||||
:key="`${t}-${idx}`"
|
||||
closable
|
||||
size="small"
|
||||
@close="removeScheduleTime(idx)"
|
||||
>{{ t }}</el-tag>
|
||||
</div>
|
||||
<div class="tag-input-row">
|
||||
<el-input
|
||||
v-model="scheduleTimeInput"
|
||||
placeholder="输入 HH:mm 后回车添加,如 08:00"
|
||||
maxlength="5"
|
||||
@keyup.enter="addScheduleTime"
|
||||
/>
|
||||
<el-button size="small" :disabled="!scheduleTimeInput.trim()" @click="addScheduleTime">添加</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<el-form-item label="通知模板" prop="notify_template">
|
||||
<el-input
|
||||
v-model="form.notify_template"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
maxlength="500"
|
||||
placeholder="支持标签 {time}/{url}/{report_name}/{biz_date}"
|
||||
/>
|
||||
</el-form-item>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">补投宽限(分)</span>
|
||||
<el-form-item prop="late_grace_minutes">
|
||||
<el-input-number
|
||||
v-model="form.late_grace_minutes"
|
||||
:min="0"
|
||||
:max="1440"
|
||||
:precision="0"
|
||||
controls-position="right"
|
||||
placeholder="默认 60"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<el-form-item label="通知群ID" prop="notify_group_ids">
|
||||
<el-select
|
||||
v-model="form.notify_group_ids"
|
||||
multiple
|
||||
filterable
|
||||
remote
|
||||
reserve-keyword
|
||||
:remote-method="searchGroups"
|
||||
:loading="groupSearchLoading"
|
||||
placeholder="输入群名称或外部群ID搜索"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="g in groupOptions"
|
||||
:key="g.id"
|
||||
:label="g.label"
|
||||
:value="g.id"
|
||||
/>
|
||||
</el-select>
|
||||
<div class="form-tip">可搜索选择多个通知群,最多 20 个</div>
|
||||
</el-form-item>
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--textarea">
|
||||
<span class="task-panel__field-label">备注</span>
|
||||
<el-form-item prop="remark">
|
||||
<el-input
|
||||
v-model="form.remark"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
resize="none"
|
||||
maxlength="500"
|
||||
placeholder="最长 500 字符"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<el-form-item label="通知成员ID" prop="notify_member_ids">
|
||||
<el-select
|
||||
v-model="form.notify_member_ids"
|
||||
multiple
|
||||
filterable
|
||||
remote
|
||||
reserve-keyword
|
||||
:remote-method="searchMembers"
|
||||
:loading="memberSearchLoading"
|
||||
placeholder="先选择通知群,再搜索成员"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="m in memberOptions"
|
||||
:key="m.user_id"
|
||||
:label="m.label"
|
||||
:value="m.user_id"
|
||||
/>
|
||||
</el-select>
|
||||
<div class="form-tip">从已选通知群的成员中搜索选择,最多 100 个</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span class="task-panel__section-title is-spaced">文本通知配置(可选)</span>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--textarea">
|
||||
<span class="task-panel__field-label">通知模板</span>
|
||||
<el-form-item prop="notify_template">
|
||||
<el-input
|
||||
v-model="form.notify_template"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
resize="none"
|
||||
maxlength="500"
|
||||
placeholder="支持标签 {time}/{url}/{report_name}/{biz_date}"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">通知群ID</span>
|
||||
<el-form-item prop="notify_group_ids">
|
||||
<el-select
|
||||
v-model="form.notify_group_ids"
|
||||
multiple
|
||||
filterable
|
||||
remote
|
||||
reserve-keyword
|
||||
:remote-method="searchGroups"
|
||||
:loading="groupSearchLoading"
|
||||
placeholder="输入群名称或外部群ID搜索"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option v-for="g in groupOptions" :key="g.id" :label="g.label" :value="g.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">通知成员ID</span>
|
||||
<el-form-item prop="notify_member_ids">
|
||||
<el-select
|
||||
v-model="form.notify_member_ids"
|
||||
multiple
|
||||
filterable
|
||||
remote
|
||||
reserve-keyword
|
||||
:remote-method="searchMembers"
|
||||
:loading="memberSearchLoading"
|
||||
placeholder="先选择通知群,再搜索成员"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option v-for="m in memberOptions" :key="m.user_id" :label="m.label" :value="m.user_id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
仅展示启用中的报表定义,选择后按其类型与字段生成投递内容;投递时间为 24 小时制时间点(系统自动去重并升序);补投宽限 0-1440 分钟,越界自动夹取;通知群最多 20 个,通知成员最多 100 个。
|
||||
</p>
|
||||
</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="submitting" @click="handleSubmit">确认</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<el-button size="small" @click="handleClosed">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">
|
||||
确认
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@ -435,31 +455,236 @@ async function handleSubmit() {
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.form-body {
|
||||
padding: 12px 4px 0 0;
|
||||
/* 投递时间:标签列表 + 输入行(标签输入) */
|
||||
.string-array-editor {
|
||||
width: 100%;
|
||||
|
||||
.form-tip {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
line-height: 1.5;
|
||||
margin-top: 4px;
|
||||
.tag-list {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.string-array-editor {
|
||||
width: 100%;
|
||||
.tag-input-row {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
|
||||
.tag-list {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px;
|
||||
margin-bottom: 8px;
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.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;
|
||||
}
|
||||
|
||||
.tag-input-row {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
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;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 分段标题(文本通知配置) */
|
||||
&__section-title {
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
padding-left: 2px;
|
||||
|
||||
&.is-spaced {
|
||||
margin-top: 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;
|
||||
/* 右 0 让控件右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 多行文本行:标签与文本域顶部对齐 */
|
||||
&--textarea {
|
||||
padding-top: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
}
|
||||
}
|
||||
|
||||
&__field-control {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.delivery-plan-form-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -71,132 +71,290 @@
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
<!-- 新增权限弹窗 -->
|
||||
<el-dialog title="新增权限" v-model="createDialogVisible" width="600px" align-center>
|
||||
<el-form ref="createFormRef" :rules="rules" :model="tempCreate" label-width="100px" label-position="right" size="small">
|
||||
<el-form-item label="上级权限" prop="parent_id">
|
||||
<el-tree-select
|
||||
v-model="tempCreate.parent_id"
|
||||
:data="parentOptions"
|
||||
:props="{ label: 'title_display', value: 'permission_id', children: 'children' }"
|
||||
placeholder="请选择上级权限(留空表示顶级)"
|
||||
clearable
|
||||
check-strictly
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="权限类型" prop="type">
|
||||
<el-select v-model="tempCreate.type" placeholder="请选择类型" style="width: 100%">
|
||||
<el-option
|
||||
v-for="item in permissionTypeOptions"
|
||||
:key="item.value"
|
||||
:label="item.fullLabel || item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="图标" prop="meta_icon" v-if="tempCreate.type === 'pda_pages'">
|
||||
<el-select v-model="tempCreate.meta_icon" placeholder="请选择图标" filterable clearable style="width: 100%">
|
||||
<el-option v-for="item in iconList" :key="item" :label="item" :value="item">
|
||||
<div style="display: flex; align-items: center; gap: 8px;">
|
||||
<svg-icon :icon-class="item" />
|
||||
<span>{{ item }}</span>
|
||||
</div>
|
||||
</el-option>
|
||||
<template #prefix v-if="tempCreate.meta_icon">
|
||||
<svg-icon :icon-class="tempCreate.meta_icon" />
|
||||
</template>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="权限路径" prop="path">
|
||||
<el-input v-model="tempCreate.path" placeholder="必填,如:setting.account.list" />
|
||||
</el-form-item>
|
||||
<el-form-item label="组件" prop="component">
|
||||
<el-input v-model="tempCreate.component" placeholder="组件路径或名称(可选)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="页面标题" prop="meta_title">
|
||||
<el-input v-model="tempCreate.meta_title" placeholder="如:工号管理" />
|
||||
</el-form-item>
|
||||
<el-form-item label="权限名称" prop="name">
|
||||
<el-input v-model="tempCreate.name" placeholder="内部英文名或中文名称均可" />
|
||||
</el-form-item>
|
||||
<el-form-item label="排序" prop="sort">
|
||||
<el-input-number v-model="tempCreate.sort" :min="0" :max="9999" style="width: 150px" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<span class="dialog-footer">
|
||||
<el-button size="small" @click="createDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitLoading" @click="createData()">确定</el-button>
|
||||
</span>
|
||||
</template>
|
||||
<!-- 新增权限弹窗:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="createDialogVisible"
|
||||
class="permission-form-dialog"
|
||||
width="min(600px, 94vw)"
|
||||
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="createDialogVisible = 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="createFormRef" :rules="rules" :model="tempCreate" class="task-panel__form">
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">上级权限</span>
|
||||
<el-form-item prop="parent_id">
|
||||
<el-tree-select
|
||||
v-model="tempCreate.parent_id"
|
||||
:data="parentOptions"
|
||||
:props="{ label: 'title_display', value: 'permission_id', children: 'children' }"
|
||||
placeholder="请选择上级权限(留空表示顶级)"
|
||||
clearable
|
||||
check-strictly
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">权限类型</span>
|
||||
<el-form-item prop="type">
|
||||
<el-select v-model="tempCreate.type" placeholder="请选择类型" style="width: 100%">
|
||||
<el-option
|
||||
v-for="item in permissionTypeOptions"
|
||||
:key="item.value"
|
||||
:label="item.fullLabel || item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div v-if="tempCreate.type === 'pda_pages'" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">图标</span>
|
||||
<el-form-item prop="meta_icon">
|
||||
<el-select
|
||||
v-model="tempCreate.meta_icon"
|
||||
placeholder="请选择图标"
|
||||
filterable
|
||||
clearable
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option v-for="item in iconList" :key="item" :label="item" :value="item">
|
||||
<div style="display: flex; align-items: center; gap: 8px;">
|
||||
<svg-icon :icon-class="item" />
|
||||
<span>{{ item }}</span>
|
||||
</div>
|
||||
</el-option>
|
||||
<template #prefix v-if="tempCreate.meta_icon">
|
||||
<svg-icon :icon-class="tempCreate.meta_icon" />
|
||||
</template>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">权限路径</span>
|
||||
<el-form-item prop="path">
|
||||
<el-input v-model="tempCreate.path" placeholder="必填,如:setting.account.list" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">组件</span>
|
||||
<el-form-item prop="component">
|
||||
<el-input v-model="tempCreate.component" placeholder="组件路径或名称(可选)" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">页面标题</span>
|
||||
<el-form-item prop="meta_title">
|
||||
<el-input v-model="tempCreate.meta_title" placeholder="如:工号管理" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">权限名称</span>
|
||||
<el-form-item prop="name">
|
||||
<el-input v-model="tempCreate.name" placeholder="内部英文名或中文名称均可" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">排序</span>
|
||||
<el-form-item prop="sort">
|
||||
<el-input-number v-model="tempCreate.sort" :min="0" :max="9999" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
上级权限留空表示创建顶级菜单;权限路径为必填的业务标识(如 setting.account.list),权限类型决定该权限在系统中的分组。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认权限路径与类型无误</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="createDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitLoading" @click="createData()">确定</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 编辑权限弹窗 -->
|
||||
<el-dialog title="编辑权限" v-model="updateDialogVisible" width="620px" align-center>
|
||||
<el-form ref="updateFormRef" :rules="rules" :model="tempUpdate" label-width="100px" label-position="right" size="small">
|
||||
<el-form-item label="上级权限" prop="parent_id">
|
||||
<el-tree-select
|
||||
v-model="tempUpdate.parent_id"
|
||||
:data="parentOptions"
|
||||
:props="{ label: 'title_display', value: 'permission_id', children: 'children' }"
|
||||
placeholder="请选择上级权限(留空表示顶级)"
|
||||
clearable
|
||||
check-strictly
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="权限类型" prop="type">
|
||||
<el-select v-model="tempUpdate.type" placeholder="请选择类型" style="width: 100%">
|
||||
<el-option
|
||||
v-for="item in permissionTypeOptions"
|
||||
:key="item.value"
|
||||
:label="item.fullLabel || item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="图标" prop="meta_icon" v-if="tempUpdate.type === 'pda_pages'">
|
||||
<el-select v-model="tempUpdate.meta_icon" placeholder="请选择图标" filterable clearable style="width: 100%">
|
||||
<el-option v-for="item in iconList" :key="item" :label="item" :value="item">
|
||||
<div style="display: flex; align-items: center; gap: 8px;">
|
||||
<svg-icon :icon-class="item" />
|
||||
<span>{{ item }}</span>
|
||||
<!-- 编辑权限弹窗:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="updateDialogVisible"
|
||||
class="permission-form-dialog"
|
||||
width="min(620px, 94vw)"
|
||||
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="updateDialogVisible = 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="updateFormRef" :rules="rules" :model="tempUpdate" class="task-panel__form">
|
||||
<!-- 静态信息行:对齐「手工录入运单号」的只读信息行 -->
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">权限 ID</span>
|
||||
<strong class="task-panel__field-value">{{ tempUpdate.permission_id ?? '—' }}</strong>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">上级权限</span>
|
||||
<el-form-item prop="parent_id">
|
||||
<el-tree-select
|
||||
v-model="tempUpdate.parent_id"
|
||||
:data="parentOptions"
|
||||
:props="{ label: 'title_display', value: 'permission_id', children: 'children' }"
|
||||
placeholder="请选择上级权限(留空表示顶级)"
|
||||
clearable
|
||||
check-strictly
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">权限类型</span>
|
||||
<el-form-item prop="type">
|
||||
<el-select v-model="tempUpdate.type" placeholder="请选择类型" style="width: 100%">
|
||||
<el-option
|
||||
v-for="item in permissionTypeOptions"
|
||||
:key="item.value"
|
||||
:label="item.fullLabel || item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div v-if="tempUpdate.type === 'pda_pages'" class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">图标</span>
|
||||
<el-form-item prop="meta_icon">
|
||||
<el-select
|
||||
v-model="tempUpdate.meta_icon"
|
||||
placeholder="请选择图标"
|
||||
filterable
|
||||
clearable
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option v-for="item in iconList" :key="item" :label="item" :value="item">
|
||||
<div style="display: flex; align-items: center; gap: 8px;">
|
||||
<svg-icon :icon-class="item" />
|
||||
<span>{{ item }}</span>
|
||||
</div>
|
||||
</el-option>
|
||||
<template #prefix v-if="tempUpdate.meta_icon">
|
||||
<svg-icon :icon-class="tempUpdate.meta_icon" />
|
||||
</template>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">权限路径</span>
|
||||
<el-form-item prop="path">
|
||||
<el-input v-model="tempUpdate.path" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">组件</span>
|
||||
<el-form-item prop="component">
|
||||
<el-input v-model="tempUpdate.component" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">标题</span>
|
||||
<el-form-item prop="meta_title">
|
||||
<el-input v-model="tempUpdate.meta_title" placeholder="如:工号管理" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">权限名称</span>
|
||||
<el-form-item prop="name">
|
||||
<el-input v-model="tempUpdate.name" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">排序</span>
|
||||
<el-form-item prop="sort">
|
||||
<el-input-number v-model="tempUpdate.sort" :min="0" :max="9999" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">状态</span>
|
||||
<div class="task-panel__field-control">
|
||||
<el-form-item prop="status">
|
||||
<el-radio-group v-model="tempUpdate.status">
|
||||
<el-radio :label="1">启用</el-radio>
|
||||
<el-radio :label="0">禁用</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-option>
|
||||
<template #prefix v-if="tempUpdate.meta_icon">
|
||||
<svg-icon :icon-class="tempUpdate.meta_icon" />
|
||||
</template>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="权限路径" prop="path">
|
||||
<el-input v-model="tempUpdate.path" />
|
||||
</el-form-item>
|
||||
<el-form-item label="组件" prop="component">
|
||||
<el-input v-model="tempUpdate.component" />
|
||||
</el-form-item>
|
||||
<el-form-item label="标题" prop="meta_title">
|
||||
<el-input v-model="tempUpdate.meta_title" placeholder="如:工号管理" />
|
||||
</el-form-item>
|
||||
<el-form-item label="权限名称" prop="name">
|
||||
<el-input v-model="tempUpdate.name" />
|
||||
</el-form-item>
|
||||
<el-form-item label="排序" prop="sort">
|
||||
<el-input-number v-model="tempUpdate.sort" :min="0" :max="9999" style="width: 150px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-radio-group v-model="tempUpdate.status">
|
||||
<el-radio :label="1">启用</el-radio>
|
||||
<el-radio :label="0">禁用</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<span class="dialog-footer">
|
||||
<el-button size="small" @click="updateDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitLoading" @click="updateData()">确定</el-button>
|
||||
</span>
|
||||
</template>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<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="updateDialogVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitLoading" @click="updateData()">确定</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
@ -563,4 +721,231 @@ onMounted(() => {
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
/* 新增权限:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.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;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 右 0 让控件右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(单选/开关):与输入行同尺寸,去掉灰色容器 */
|
||||
&--control {
|
||||
align-items: flex-start;
|
||||
min-height: 36px;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__field-control {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
}
|
||||
}
|
||||
|
||||
/* 静态信息行的值(如:权限 ID) */
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
&__field-control {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.permission-form-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -106,7 +106,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 新增/编辑拣货车:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
|
||||
<!-- 新增/编辑拣货车:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="dialogVisible"
|
||||
class="pickcart-form-dialog"
|
||||
@ -149,14 +149,6 @@
|
||||
@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>
|
||||
|
||||
@ -175,14 +167,24 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field">
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<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 class="task-panel__field-control">
|
||||
<el-radio-group v-model="formData.status">
|
||||
<el-radio :label="1">启用</el-radio>
|
||||
<el-radio :label="0">停用</el-radio>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip(保留编码查重结果色) -->
|
||||
<p
|
||||
class="task-panel__form-tip"
|
||||
:class="codeCheckHint ? `is-${codeCheckHint.type}` : ''"
|
||||
>
|
||||
{{ codeCheckHint ? codeCheckHint.text : '支持扫码枪直接录入,编码在当前仓库内不可重复。' }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
@ -195,7 +197,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 扫码查询:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
|
||||
<!-- 扫码查询:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="scanDialogVisible"
|
||||
class="pickcart-scan-dialog"
|
||||
@ -235,25 +237,42 @@
|
||||
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="状态">
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">支持扫码枪直接录入,回车或点「查询」开始查找。</p>
|
||||
|
||||
<!-- 查询结果:静态信息行(对齐参考表单的只读信息行) -->
|
||||
<div v-if="scanResult" class="task-panel__section scan-result">
|
||||
<span class="task-panel__section-title">查询结果</span>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">ID</span>
|
||||
<strong class="task-panel__field-value">{{ scanResult.cart_id ?? '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">编码</span>
|
||||
<strong class="task-panel__field-value">{{ scanResult.cart_code || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">名称</span>
|
||||
<strong class="task-panel__field-value">{{ scanResult.cart_name || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">状态</span>
|
||||
<span class="task-panel__field-value">
|
||||
<span :class="getStatusTextClass(formatPickCartStatus(scanResult.status).type)">
|
||||
{{ formatPickCartStatus(scanResult.status).text }}
|
||||
</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="绑定任务">
|
||||
</span>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">绑定任务</span>
|
||||
<strong class="task-panel__field-value">
|
||||
{{ scanResult.current_task_no || scanResult.current_task_id || '未绑定' }}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</strong>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -267,7 +286,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 批量新增:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
|
||||
<!-- 批量新增:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="batchDialogVisible"
|
||||
class="pickcart-batch-dialog"
|
||||
@ -381,31 +400,43 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field">
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<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 class="task-panel__field-control">
|
||||
<el-radio-group v-model="batchForm.status">
|
||||
<el-radio :label="1">启用</el-radio>
|
||||
<el-radio :label="0">停用</el-radio>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</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 class="task-panel__field">
|
||||
<span class="task-panel__field-label">生成数量</span>
|
||||
<strong class="task-panel__field-value">{{ batchPreviewCount }} 条</strong>
|
||||
</div>
|
||||
<div class="task-panel__section">
|
||||
<div class="task-panel__table-wrap">
|
||||
<el-table
|
||||
:data="batchPreviewTableRows"
|
||||
size="small"
|
||||
border
|
||||
max-height="220"
|
||||
empty-text="请完善编码前缀与数字范围"
|
||||
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>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
按「编码前缀 + 数字范围」批量生成编码,编码在当前仓库内不可重复;确认后按预览结果一次性创建。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
@ -426,7 +457,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 绑定任务:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) -->
|
||||
<!-- 绑定任务:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) -->
|
||||
<el-dialog
|
||||
v-model="bindDialogVisible"
|
||||
class="pickcart-bind-dialog"
|
||||
@ -456,6 +487,15 @@
|
||||
|
||||
<div class="task-panel__body">
|
||||
<el-form ref="bindFormRef" :model="bindForm" :rules="bindRules" class="task-panel__form">
|
||||
<!-- 静态信息行:对齐「手工录入运单号」的订单 ID / 订单号 -->
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">拣货车 ID</span>
|
||||
<strong class="task-panel__field-value">{{ bindForm.cart_id ?? '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">拣货车编码</span>
|
||||
<strong class="task-panel__field-value">{{ bindForm.cart_code || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">拣货车</span>
|
||||
<strong class="task-panel__field-value">{{ bindForm.cartLabel || '—' }}</strong>
|
||||
@ -478,7 +518,7 @@
|
||||
</el-form>
|
||||
|
||||
<p class="task-panel__form-tip">
|
||||
若任务已绑定其他拣货车将自动改绑;目标拣货车已绑定其他活动任务时将返回冲突。
|
||||
拣货车编码在同一仓库内唯一;若任务已绑定其他拣货车将自动改绑,目标拣货车已绑定其他活动任务时将返回冲突。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@ -1193,7 +1233,7 @@ onMounted(() => {
|
||||
}
|
||||
|
||||
.scan-result {
|
||||
margin-top: 12px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.batch-range-row {
|
||||
@ -1223,15 +1263,8 @@ onMounted(() => {
|
||||
width: 120px;
|
||||
}
|
||||
|
||||
.batch-preview {
|
||||
width: 100%;
|
||||
font-size: 13px;
|
||||
color: #606266;
|
||||
line-height: 1.6;
|
||||
}
|
||||
|
||||
.batch-preview-table {
|
||||
margin-top: 8px;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
/* 新增/编辑拣货车:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) */
|
||||
@ -1302,16 +1335,28 @@ onMounted(() => {
|
||||
|
||||
/* 分组标题(批量新增用) */
|
||||
&__section-title {
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #303133;
|
||||
color: #606266;
|
||||
padding-left: 2px;
|
||||
|
||||
&.is-spaced {
|
||||
margin-top: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 表格分组容器(批量新增预览) */
|
||||
&__section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
&__table-wrap {
|
||||
border-radius: 4px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
&__form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@ -1340,20 +1385,58 @@ onMounted(() => {
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(单选/开关):与输入行同尺寸,去掉灰色容器 */
|
||||
&--control {
|
||||
align-items: flex-start;
|
||||
min-height: 36px;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__field-control {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
flex-shrink: 0;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1371,7 +1454,7 @@ onMounted(() => {
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 灰色提示块 */
|
||||
/* 灰色提示块(兼作编码查重结果提示) */
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
@ -1380,15 +1463,8 @@ onMounted(() => {
|
||||
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;
|
||||
}
|
||||
@ -1422,7 +1498,8 @@ onMounted(() => {
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
|
||||
@ -228,7 +228,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ===== 编辑/设置录制弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) ===== -->
|
||||
<!-- ===== 编辑/设置录制弹窗:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) ===== -->
|
||||
<el-dialog
|
||||
v-model="dialogVisible"
|
||||
class="print-computer-dialog"
|
||||
@ -261,6 +261,20 @@
|
||||
<div class="task-panel__body">
|
||||
<el-form :disabled="submitting" class="task-panel__form">
|
||||
<template v-if="dialogMode === 'edit'">
|
||||
<!-- 静态信息行(对齐「手工录入运单号」的只读信息行) -->
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">电脑 ID</span>
|
||||
<strong class="task-panel__field-value">{{ currentEditRow?.id ?? '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">在线状态</span>
|
||||
<strong class="task-panel__field-value">{{ translate('is_online', currentEditRow?.is_online) }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">最近登录</span>
|
||||
<strong class="task-panel__field-value">{{ currentEditRow?.last_login_time || '—' }}</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">
|
||||
@ -270,6 +284,7 @@
|
||||
</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>
|
||||
@ -282,6 +297,16 @@
|
||||
</strong>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">当前录制大小</span>
|
||||
<strong class="task-panel__field-value">{{ currentEditRow?.recording_size_value ?? '—' }}</strong>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">当前录制目录</span>
|
||||
<strong class="task-panel__field-value">{{ currentEditRow?.recording_directory || '—' }}</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">
|
||||
@ -299,7 +324,6 @@
|
||||
<el-option label="TB" value="TB" />
|
||||
</el-select>
|
||||
</div>
|
||||
<p class="task-panel__field-tip">单个录制文件的大小上限,超出后自动分片</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -311,11 +335,17 @@
|
||||
size="default"
|
||||
placeholder="如 D:/record"
|
||||
/>
|
||||
<p class="task-panel__field-tip">需为录制电脑本地可写入的绝对路径</p>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
{{ dialogMode === 'edit'
|
||||
? '电脑名称用于在列表中标识该打印电脑,保存后立即生效。'
|
||||
: '单个录制文件超出大小上限后自动分片;录制目录需为录制电脑本地可写入的绝对路径。' }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
@ -1166,20 +1196,34 @@ onMounted(() => {
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
flex-shrink: 0;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1197,8 +1241,11 @@ onMounted(() => {
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
&__field-tip {
|
||||
margin: 4px 0 0;
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f5;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
@ -1220,7 +1267,8 @@ onMounted(() => {
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!--
|
||||
<!--
|
||||
RoleFormDialog — 新增 / 编辑角色(setting.role.add / setting.role.update)
|
||||
|
||||
· 新增:可选父级角色(默认取当前树选中节点)+ 分配权限(权限树,提交 checked + halfChecked)
|
||||
@ -11,76 +11,149 @@
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:title="isEdit ? '编辑角色' : '新增角色'"
|
||||
:model-value="visible"
|
||||
width="600px"
|
||||
class="role-form-dialog"
|
||||
width="min(600px, 94vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
@update:model-value="handleVisibleChange"
|
||||
@close="handleClosed"
|
||||
>
|
||||
<el-form ref="formRef" :model="form" :rules="roleRules" label-width="90px" size="small">
|
||||
<el-form-item label="角色编码" prop="role_code">
|
||||
<el-input
|
||||
v-model="form.role_code"
|
||||
:disabled="isEdit"
|
||||
placeholder="主体内唯一,如:warehouse_admin"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="角色名称" prop="role_name">
|
||||
<el-input v-model="form.role_name" placeholder="如:仓库管理员" />
|
||||
</el-form-item>
|
||||
<el-form-item label="描述">
|
||||
<el-input v-model="form.description" type="textarea" :rows="2" placeholder="角色描述(可选)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="父级角色">
|
||||
<el-tree-select
|
||||
v-model="form.pid"
|
||||
:data="parentOptions"
|
||||
:props="{ label: 'role_name', value: 'role_id', children: 'children' }"
|
||||
check-strictly
|
||||
clearable
|
||||
placeholder="无(顶级角色)"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isEdit" label="状态">
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio :value="1">启用</el-radio>
|
||||
<el-radio :value="0">停用</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
<!-- 新增时才在表单里选权限;编辑走「权限」按钮 -->
|
||||
<el-form-item v-if="!isEdit" label="分配权限">
|
||||
<div v-loading="permLoading" class="perm-tree-wrapper">
|
||||
<el-tree
|
||||
ref="permTreeRef"
|
||||
:data="permissionTree"
|
||||
show-checkbox
|
||||
node-key="permission_id"
|
||||
:props="{ label: 'name', children: 'children' }"
|
||||
/>
|
||||
<div v-if="!permLoading && !permissionTree.length" class="perm-tree-empty">暂无可分配的权限</div>
|
||||
<div class="task-panel">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>{{ isEdit ? '编辑角色' : '新增角色' }}</h2>
|
||||
<p>
|
||||
{{ isEdit
|
||||
? '角色编码不可修改;权限请在列表中通过「权限」按钮调整'
|
||||
: '填写角色信息,并可同时勾选需要分配的权限' }}
|
||||
</p>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<button class="task-panel__close" type="button" aria-label="关闭" @click="handleVisibleChange(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-alert
|
||||
v-if="isEdit && !permissionLoaded && !permLoading"
|
||||
class="perm-load-alert"
|
||||
type="warning"
|
||||
:closable="false"
|
||||
show-icon
|
||||
title="未能读取该角色当前权限,已禁用提交"
|
||||
description="保存会整体覆盖角色权限,为避免误清空,请关闭弹窗后重试。"
|
||||
/>
|
||||
</el-form>
|
||||
<div class="task-panel__body">
|
||||
<el-form ref="formRef" :model="form" :rules="roleRules" class="task-panel__form">
|
||||
<!-- 编辑态:先展示不可编辑的标识信息(对齐「手工录入运单号」的静态信息行) -->
|
||||
<div v-if="isEdit" class="task-panel__field">
|
||||
<span class="task-panel__field-label">角色 ID</span>
|
||||
<strong class="task-panel__field-value">{{ form.role_id ?? '—' }}</strong>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<el-button size="small" @click="handleVisibleChange(false)">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="submitLoading" :disabled="submitDisabled" @click="handleSubmit">
|
||||
确定
|
||||
</el-button>
|
||||
</template>
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">角色编码</span>
|
||||
<el-form-item prop="role_code">
|
||||
<el-input
|
||||
v-model="form.role_code"
|
||||
:disabled="isEdit"
|
||||
placeholder="主体内唯一,如:warehouse_admin"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">角色名称</span>
|
||||
<el-form-item prop="role_name">
|
||||
<el-input v-model="form.role_name" placeholder="如:仓库管理员" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--textarea">
|
||||
<span class="task-panel__field-label">描述</span>
|
||||
<el-form-item prop="description">
|
||||
<el-input
|
||||
v-model="form.description"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
resize="none"
|
||||
placeholder="角色描述(可选)"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label">父级角色</span>
|
||||
<el-form-item prop="pid">
|
||||
<el-tree-select
|
||||
v-model="form.pid"
|
||||
:data="parentOptions"
|
||||
:props="{ label: 'role_name', value: 'role_id', children: 'children' }"
|
||||
check-strictly
|
||||
clearable
|
||||
placeholder="无(顶级角色)"
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
|
||||
<div v-if="isEdit" class="task-panel__field task-panel__field--control">
|
||||
<span class="task-panel__field-label">状态</span>
|
||||
<div class="task-panel__field-control">
|
||||
<el-form-item prop="status">
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio :value="1">启用</el-radio>
|
||||
<el-radio :value="0">停用</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 新增时才在表单里选权限;编辑走「权限」按钮 -->
|
||||
<template v-if="!isEdit">
|
||||
<div class="task-panel__section">
|
||||
<span class="task-panel__section-title">分配权限</span>
|
||||
<div v-loading="permLoading" class="perm-tree-wrapper">
|
||||
<el-tree
|
||||
ref="permTreeRef"
|
||||
:data="permissionTree"
|
||||
show-checkbox
|
||||
node-key="permission_id"
|
||||
:props="{ label: 'name', children: 'children' }"
|
||||
/>
|
||||
<div v-if="!permLoading && !permissionTree.length" class="perm-tree-empty">暂无可分配的权限</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p
|
||||
v-if="isEdit && !permissionLoaded && !permLoading"
|
||||
class="task-panel__form-tip task-panel__form-tip--warning"
|
||||
>
|
||||
未能读取该角色当前权限,已禁用提交:保存会整体覆盖角色权限,为避免误清空,请关闭弹窗后重试。
|
||||
</p>
|
||||
<p v-else class="task-panel__form-tip">
|
||||
{{
|
||||
isEdit
|
||||
? '编辑时角色编码不可修改;保存会把该角色当前权限原样回传,不会清空已有权限。'
|
||||
: '角色编码在主体内唯一;勾选的权限将随角色一并提交。'
|
||||
}}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认角色编码与名称无误</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="handleVisibleChange(false)">取消</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
type="primary"
|
||||
:loading="submitLoading"
|
||||
:disabled="submitDisabled"
|
||||
@click="handleSubmit"
|
||||
>
|
||||
确定
|
||||
</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@ -262,6 +335,7 @@ watch(
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
/* 权限树容器(新增态) */
|
||||
.perm-tree-wrapper {
|
||||
width: 100%;
|
||||
max-height: 300px;
|
||||
@ -278,7 +352,255 @@ watch(
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
.perm-load-alert {
|
||||
margin-bottom: 0;
|
||||
/* 面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.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;
|
||||
|
||||
:deep(.el-form-item) {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__content) {
|
||||
margin-left: 0 !important;
|
||||
width: 100%;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
:deep(.el-form-item__error) {
|
||||
position: static;
|
||||
padding-top: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
&__section-title {
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
/* 分组容器(新增态的权限树) */
|
||||
&__section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 右 0 让控件右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(单选/开关):与输入行同尺寸,去掉灰色容器 */
|
||||
&--control {
|
||||
align-items: flex-start;
|
||||
min-height: 36px;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__field-control {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 多行文本行:标签与文本域顶部对齐 */
|
||||
&--textarea {
|
||||
padding-top: 8px;
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
}
|
||||
}
|
||||
|
||||
/* 静态信息行的值(如:角色 ID) */
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
&__field-control {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f5;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
|
||||
/* 不可提交的告警提示 */
|
||||
&--warning {
|
||||
background: #fdf6ec;
|
||||
color: #e6a23c;
|
||||
}
|
||||
}
|
||||
|
||||
&__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;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.role-form-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<!--
|
||||
<!--
|
||||
RolePermissionDialog — 配置角色权限(setting.role.permission 读取 + setting.role.update 提交)
|
||||
|
||||
左侧:类型筛选 + 关键词 + 权限树表格(多选,支持跨筛选保留已选)
|
||||
@ -9,79 +9,139 @@
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
title="配置角色权限"
|
||||
:model-value="visible"
|
||||
width="860px"
|
||||
class="role-permission-dialog"
|
||||
width="min(900px, 96vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
@update:model-value="handleVisibleChange"
|
||||
@close="handleClosed"
|
||||
>
|
||||
<div class="perm-dialog-body">
|
||||
<div class="perm-left">
|
||||
<el-form :inline="true" :model="permFilter" class="perm-filter" size="small">
|
||||
<el-form-item label="类型">
|
||||
<el-select v-model="permFilter.type" placeholder="全部" clearable style="width: 130px" @change="applyPermFilter">
|
||||
<el-option
|
||||
v-for="item in permissionTypeOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-input
|
||||
v-model="permFilter.keyword"
|
||||
placeholder="路径/名称"
|
||||
clearable
|
||||
style="width: 160px"
|
||||
@input="applyPermFilter"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div class="task-panel">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>配置角色权限</h2>
|
||||
<p>为「{{ role?.role_name || '—' }}」勾选可用权限,保存后立即生效</p>
|
||||
</div>
|
||||
<button
|
||||
class="task-panel__close"
|
||||
type="button"
|
||||
aria-label="关闭"
|
||||
@click="handleVisibleChange(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="perm-tree-header">
|
||||
<span>权限列表</span>
|
||||
<div>
|
||||
<el-button size="small" @click="selectAllPerms">全选</el-button>
|
||||
<el-button size="small" @click="deselectAllPerms">取消全选</el-button>
|
||||
<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">{{ role?.role_name || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">已选权限</span>
|
||||
<strong class="task-panel__field-value">{{ selectedPermIds.length }} 个</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="permFilter.type"
|
||||
placeholder="全部类型"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
@change="applyPermFilter"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in permissionTypeOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</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-input
|
||||
v-model="permFilter.keyword"
|
||||
placeholder="按路径 / 名称搜索"
|
||||
clearable
|
||||
@input="applyPermFilter"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-table
|
||||
ref="permTableRef"
|
||||
v-loading="permLoading"
|
||||
:data="filteredPerms"
|
||||
row-key="permission_id"
|
||||
border
|
||||
height="440px"
|
||||
size="small"
|
||||
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
||||
@selection-change="handlePermSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="50" align="center" />
|
||||
<el-table-column label="标题/名称" min-width="160" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
<span>{{ permissionTitle(row) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="路径" prop="path" min-width="180" show-overflow-tooltip />
|
||||
<el-table-column label="类型" prop="type" width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
<span :class="getStatusTextClass(permissionTypeTag(row.type))">
|
||||
{{ permissionTypeName(row.type) }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 提示条:对齐「批量发货」表单的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
筛选仅影响列表显示,已勾选权限会跨筛选保留;保存时按已选权限整体覆盖该角色的权限。
|
||||
</p>
|
||||
|
||||
<template #footer>
|
||||
<span class="perm-footer-tip">已选 {{ selectedPermIds.length }} 个权限</span>
|
||||
<el-button size="small" @click="handleVisibleChange(false)">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="permSubmitting" @click="handleSubmit">保存权限</el-button>
|
||||
</template>
|
||||
<div class="task-panel__section">
|
||||
<div class="perm-list-toolbar">
|
||||
<span class="task-panel__section-title">权限列表({{ filteredPerms.length }})</span>
|
||||
<div class="perm-list-actions">
|
||||
<el-button size="small" @click="selectAllPerms">全选</el-button>
|
||||
<el-button size="small" @click="deselectAllPerms">取消全选</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="task-panel__table-wrap">
|
||||
<el-table
|
||||
ref="permTableRef"
|
||||
v-loading="permLoading"
|
||||
:data="filteredPerms"
|
||||
row-key="permission_id"
|
||||
border
|
||||
height="420"
|
||||
size="small"
|
||||
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
||||
@selection-change="handlePermSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="48" align="center" header-align="center" />
|
||||
<el-table-column label="标题/名称" min-width="180" align="center" header-align="center" show-overflow-tooltip>
|
||||
<template #default="{ row }">
|
||||
<span>{{ permissionTitle(row) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="路径"
|
||||
prop="path"
|
||||
min-width="200"
|
||||
align="center"
|
||||
header-align="center"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column label="类型" prop="type" width="110" align="center" header-align="center">
|
||||
<template #default="{ row }">
|
||||
<span :class="getStatusTextClass(permissionTypeTag(row.type))">
|
||||
{{ permissionTypeName(row.type) }}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">已选 {{ selectedPermIds.length }} 个权限,保存后整体覆盖</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="handleVisibleChange(false)">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="permSubmitting" @click="handleSubmit">
|
||||
保存权限
|
||||
</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
@ -271,39 +331,221 @@ watch(
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.perm-dialog-body {
|
||||
display: flex;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.perm-left {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
/* 面板结构 / 尺寸对齐「批量发货」(BatchQuickRecheckForm) */
|
||||
.task-panel {
|
||||
background: #fff;
|
||||
color: #303133;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
max-height: 82vh;
|
||||
|
||||
.perm-filter {
|
||||
margin-bottom: 10px;
|
||||
&__head {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 12px;
|
||||
padding: 16px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
:deep(.el-form-item) {
|
||||
margin-bottom: 0;
|
||||
&__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;
|
||||
min-height: 0;
|
||||
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;
|
||||
/* 右 0 让控件右边顶到容器右边缘 */
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度:各控件左边缘对齐 */
|
||||
&__field-label {
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
/* 静态信息行的值(目标角色 / 已选权限) */
|
||||
&__field-value {
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
text-align: right;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
&__field-control {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
background: #f4f4f5;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
/* 列表分组(权限列表) */
|
||||
&__section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
&__section-title {
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
&__table-wrap {
|
||||
border-radius: 4px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
&__foot {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
padding: 12px 16px 16px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
&__hint {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.perm-tree-header {
|
||||
/* 权限列表工具行:标题 + 全选按钮 */
|
||||
.perm-list-toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 8px;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: #606266;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.perm-footer-tip {
|
||||
margin-right: 12px;
|
||||
font-size: 13px;
|
||||
color: #606266;
|
||||
.perm-list-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.role-permission-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
.el-dialog__header {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-dialog__body {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -248,7 +248,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ===== 新增 / 编辑工作台弹窗:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) ===== -->
|
||||
<!-- ===== 新增 / 编辑工作台弹窗:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) ===== -->
|
||||
<el-dialog
|
||||
v-model="dialogVisible"
|
||||
class="workbench-form-dialog"
|
||||
@ -280,6 +280,18 @@
|
||||
|
||||
<div class="task-panel__body">
|
||||
<el-form ref="formRef" :model="formData" :rules="rules" class="task-panel__form">
|
||||
<!-- 编辑态:先展示不可编辑的标识信息(对齐「手工录入运单号」的静态信息行) -->
|
||||
<template v-if="dialogMode === 'edit'">
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">工作台 ID</span>
|
||||
<strong class="task-panel__field-value">{{ formData.id ?? '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">登录码</span>
|
||||
<strong class="task-panel__field-value">{{ editingRow?.login_code || '—' }}</strong>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input">
|
||||
<span class="task-panel__field-label is-required">名称</span>
|
||||
<div class="task-panel__field-control">
|
||||
@ -308,23 +320,17 @@
|
||||
@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">
|
||||
<div class="task-panel__field task-panel__field--control">
|
||||
<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 class="task-panel__field-control">
|
||||
<el-radio-group v-model="formData.status">
|
||||
<el-radio :label="1">启用</el-radio>
|
||||
<el-radio :label="0">禁用</el-radio>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="task-panel__field task-panel__field--input task-panel__field--textarea">
|
||||
@ -343,6 +349,14 @@
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip(保留条码查重结果色) -->
|
||||
<p
|
||||
class="task-panel__form-tip"
|
||||
:class="barcodeCheckHint ? `is-${barcodeCheckHint.type}` : ''"
|
||||
>
|
||||
{{ barcodeCheckHint ? barcodeCheckHint.text : '用于扫码定位工作台,条码在仓库内唯一且可留空(留空则不启用条码)。' }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
@ -419,56 +433,105 @@
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- ===== 绑定摄像头弹窗 ===== -->
|
||||
<!-- ===== 绑定摄像头弹窗:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) ===== -->
|
||||
<el-dialog
|
||||
v-model="bindCameraVisible"
|
||||
:title="`绑定摄像头 — ${bindCameraWorkbenchName}`"
|
||||
width="640px"
|
||||
class="bind-camera-dialog"
|
||||
width="min(640px, 94vw)"
|
||||
align-center
|
||||
append-to-body
|
||||
destroy-on-close
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
@close="resetBindCamera"
|
||||
>
|
||||
<div v-loading="bindCameraLoading" class="bind-camera-body">
|
||||
<div class="bind-camera-toolbar">
|
||||
<el-input
|
||||
v-model="cameraSearchKeyword"
|
||||
placeholder="搜索摄像头名称"
|
||||
clearable
|
||||
size="small"
|
||||
style="width: 240px"
|
||||
@input="filterCameraList"
|
||||
<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="bindCameraVisible = false"
|
||||
>
|
||||
<template #prefix>
|
||||
<el-icon><Search /></el-icon>
|
||||
</template>
|
||||
</el-input>
|
||||
<div class="bind-camera-count">
|
||||
已选 <strong>{{ selectedCameraIds.length }}</strong> / {{ allCameras.length }} 个摄像头
|
||||
<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 v-loading="bindCameraLoading" 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">{{ bindCameraWorkbenchName || '—' }}</strong>
|
||||
</div>
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">已选摄像头</span>
|
||||
<strong class="task-panel__field-value">{{ selectedCameraIds.length }} / {{ allCameras.length }} 个</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-input
|
||||
v-model="cameraSearchKeyword"
|
||||
placeholder="输入摄像头名称筛选"
|
||||
clearable
|
||||
@input="filterCameraList"
|
||||
>
|
||||
<template #prefix>
|
||||
<el-icon><Search /></el-icon>
|
||||
</template>
|
||||
</el-input>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
勾选即建立绑定,取消勾选保存后解除绑定;未选任何摄像头时保存将清空该工作台的摄像头绑定。
|
||||
</p>
|
||||
|
||||
<div class="task-panel__section bind-camera-list">
|
||||
<span class="task-panel__section-title">摄像头列表({{ filteredCameras.length }})</span>
|
||||
<div class="task-panel__table-wrap">
|
||||
<el-checkbox-group v-model="selectedCameraIds" class="camera-checkbox-group">
|
||||
<el-checkbox
|
||||
v-for="cam in filteredCameras"
|
||||
:key="cam.id"
|
||||
:label="cam.id"
|
||||
class="camera-checkbox-item"
|
||||
>
|
||||
<div class="camera-item-info">
|
||||
<span class="camera-item-name">{{ cam.custom_name || cam.channel_name || `摄像头-${cam.id}` }}</span>
|
||||
<span class="camera-item-server">{{ cam.server?.name || '' }}</span>
|
||||
</div>
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
<el-empty
|
||||
v-if="filteredCameras.length === 0 && !bindCameraLoading"
|
||||
description="暂无摄像头"
|
||||
:image-size="60"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-checkbox-group v-model="selectedCameraIds" class="camera-checkbox-group">
|
||||
<el-checkbox
|
||||
v-for="cam in filteredCameras"
|
||||
:key="cam.id"
|
||||
:label="cam.id"
|
||||
class="camera-checkbox-item"
|
||||
>
|
||||
<div class="camera-item-info">
|
||||
<span class="camera-item-name">{{ cam.custom_name || cam.channel_name || `摄像头-${cam.id}` }}</span>
|
||||
<span class="camera-item-server">{{ cam.server?.name || '' }}</span>
|
||||
</div>
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
<el-empty v-if="filteredCameras.length === 0 && !bindCameraLoading" description="暂无摄像头" :image-size="60" />
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">提交前请确认摄像头选择无误</span>
|
||||
<div class="task-panel__actions">
|
||||
<el-button size="small" @click="bindCameraVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="bindCameraSaving" @click="submitBindCamera">保存</el-button>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
<template #footer>
|
||||
<el-button size="small" @click="bindCameraVisible = false">取消</el-button>
|
||||
<el-button size="small" type="primary" :loading="bindCameraSaving" @click="submitBindCamera">保存</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- ===== 绑定工作台弹窗(workbench.bind):面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) ===== -->
|
||||
<!-- ===== 绑定工作台弹窗(workbench.bind):面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) ===== -->
|
||||
<el-dialog
|
||||
v-model="bindVisible"
|
||||
class="workbench-bind-dialog"
|
||||
@ -518,13 +581,13 @@
|
||||
@input="handleBindCodeInput"
|
||||
/>
|
||||
</el-form-item>
|
||||
<p class="task-panel__field-tip">绑定码为 6 位大写字母/数字,由工作台设备端生成并显示</p>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p class="task-panel__form-tip">
|
||||
确认绑定后,设备端将自动获取访问令牌,原工作台令牌失效。
|
||||
绑定码为 6 位大写字母/数字,由工作台设备端生成并显示;确认绑定后设备端将自动获取访问令牌,原工作台令牌失效。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@ -538,61 +601,94 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- ===== 重置登录码弹窗(workbench.resetLoginCode):重新生成 64 位登录码 ===== -->
|
||||
<!-- ===== 重置登录码弹窗(workbench.resetLoginCode):面板结构对齐「手工录入运单号」(ManualWaybillForm) ===== -->
|
||||
<el-dialog
|
||||
v-model="resetLoginCodeVisible"
|
||||
title="重置登录码"
|
||||
width="480px"
|
||||
class="reset-login-code-dialog"
|
||||
width="min(520px, 92vw)"
|
||||
align-center
|
||||
destroy-on-close
|
||||
append-to-body
|
||||
:show-close="false"
|
||||
:close-on-click-modal="false"
|
||||
@close="closeResetLoginCode"
|
||||
>
|
||||
<div v-if="!resetResult" class="reset-login-code-body">
|
||||
<el-alert
|
||||
type="warning"
|
||||
:closable="false"
|
||||
show-icon
|
||||
title="重置后旧登录码将立即失效"
|
||||
description="将为本工作台重新生成 64 位登录码(wblc 前缀);访问令牌保持不变,不影响已绑定设备正常使用。"
|
||||
/>
|
||||
<div class="reset-target">目标工作台:{{ resetWorkbenchName || '--' }}</div>
|
||||
</div>
|
||||
|
||||
<div v-else class="reset-login-code-result">
|
||||
<div class="result-head">
|
||||
<span class="result-title">重置成功,旧登录码已失效</span>
|
||||
</div>
|
||||
<div class="qr-login-box">
|
||||
<QrCodeDisplay
|
||||
v-if="resetResult.login_code"
|
||||
:value="resetResult.login_code"
|
||||
:size="220"
|
||||
/>
|
||||
</div>
|
||||
<div class="login-code-box">
|
||||
<span class="login-code-text">{{ resetResult.login_code || '--' }}</span>
|
||||
</div>
|
||||
<div class="result-tip">请用工作台设备扫描上方二维码完成登录;无法扫码时,可复制下方 64 位登录码手动配置(token 保持不变)。</div>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
<template v-if="!resetResult">
|
||||
<el-button size="small" @click="resetLoginCodeVisible = false">取消</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
type="danger"
|
||||
:loading="resetLoginCodeSaving"
|
||||
@click="submitResetLoginCode"
|
||||
<div class="task-panel">
|
||||
<header class="task-panel__head">
|
||||
<div class="task-panel__titles">
|
||||
<h2>重置登录码</h2>
|
||||
<p>{{ resetResult ? '旧登录码已失效,请用新登录码重新登录设备' : '重新生成 64 位登录码,旧登录码立即失效' }}</p>
|
||||
</div>
|
||||
<button
|
||||
class="task-panel__close"
|
||||
type="button"
|
||||
aria-label="关闭"
|
||||
@click="closeResetLoginCode"
|
||||
>
|
||||
立即重置
|
||||
</el-button>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-button size="small" type="primary" @click="copyLoginCode">复制登录码</el-button>
|
||||
<el-button size="small" @click="closeResetLoginCode">完成</el-button>
|
||||
</template>
|
||||
</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">
|
||||
<div class="task-panel__form">
|
||||
<div class="task-panel__field">
|
||||
<span class="task-panel__field-label">目标工作台</span>
|
||||
<strong class="task-panel__field-value">{{ resetWorkbenchName || '—' }}</strong>
|
||||
</div>
|
||||
<div v-if="resetResult" class="task-panel__field">
|
||||
<span class="task-panel__field-label">重置结果</span>
|
||||
<span class="task-panel__field-value">
|
||||
<span :class="getStatusTextClass('success')">重置成功·旧码已失效</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 提示条:对齐「手工录入运单号」的 .task-panel__form-tip -->
|
||||
<p v-if="!resetResult" class="task-panel__form-tip task-panel__form-tip--warning">
|
||||
重置后旧登录码将立即失效:将为本工作台重新生成 64 位登录码(wblc 前缀),访问令牌保持不变,不影响已绑定设备正常使用。
|
||||
</p>
|
||||
|
||||
<div v-else class="reset-login-code-result">
|
||||
<div class="qr-login-box">
|
||||
<QrCodeDisplay
|
||||
v-if="resetResult.login_code"
|
||||
:value="resetResult.login_code"
|
||||
:size="220"
|
||||
/>
|
||||
</div>
|
||||
<div class="login-code-box">
|
||||
<span class="login-code-text">{{ resetResult.login_code || '--' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<p v-if="resetResult" class="task-panel__form-tip">
|
||||
请用工作台设备扫描上方二维码完成登录;无法扫码时,可复制下方 64 位登录码手动配置(token 保持不变)。
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<footer class="task-panel__foot">
|
||||
<span class="task-panel__hint">{{ resetResult ? '登录码已更新,请及时下发设备' : '重置后无法恢复旧登录码' }}</span>
|
||||
<div class="task-panel__actions">
|
||||
<template v-if="!resetResult">
|
||||
<el-button size="small" @click="resetLoginCodeVisible = false">取消</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
type="danger"
|
||||
:loading="resetLoginCodeSaving"
|
||||
@click="submitResetLoginCode"
|
||||
>
|
||||
立即重置
|
||||
</el-button>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-button size="small" type="primary" @click="copyLoginCode">复制登录码</el-button>
|
||||
<el-button size="small" @click="closeResetLoginCode">完成</el-button>
|
||||
</template>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
@ -933,6 +1029,9 @@ const formData = reactive({
|
||||
remark: ''
|
||||
})
|
||||
|
||||
/** 编辑态静态信息行用的原始行数据(如登录码) */
|
||||
const editingRow = ref<Record<string, any> | null>(null)
|
||||
|
||||
const barcodeCheckHint = ref<{ text: string; type: 'success' | 'warning' | 'danger' | 'info' } | null>(null)
|
||||
|
||||
const rules: FormRules = {
|
||||
@ -1139,6 +1238,7 @@ function resetFormData() {
|
||||
formData.status = 1
|
||||
formData.remark = ''
|
||||
barcodeCheckHint.value = null
|
||||
editingRow.value = null
|
||||
}
|
||||
|
||||
function openCreate() {
|
||||
@ -1150,6 +1250,7 @@ function openCreate() {
|
||||
function openEdit(row: Record<string, any>) {
|
||||
dialogMode.value = 'edit'
|
||||
resetFormData()
|
||||
editingRow.value = row
|
||||
formData.id = row.id
|
||||
formData.name = row.name || ''
|
||||
formData.barcode = row.barcode || ''
|
||||
@ -1772,28 +1873,17 @@ onMounted(() => {
|
||||
/* ================================================================
|
||||
8. 绑定摄像头
|
||||
================================================================ */
|
||||
.bind-camera-body {
|
||||
min-height: 200px;
|
||||
}
|
||||
|
||||
.bind-camera-toolbar {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.bind-camera-count {
|
||||
font-size: 13px;
|
||||
color: #606266;
|
||||
.bind-camera-list {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.camera-checkbox-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
max-height: 360px;
|
||||
max-height: 340px;
|
||||
overflow-y: auto;
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
.camera-checkbox-item {
|
||||
@ -1825,31 +1915,11 @@ onMounted(() => {
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
// ─── 重置登录码弹窗 ─────────────────────────────────────────────────────────
|
||||
.reset-login-code-body {
|
||||
.reset-target {
|
||||
margin-top: 16px;
|
||||
font-size: 13px;
|
||||
color: #303133;
|
||||
}
|
||||
}
|
||||
|
||||
// ─── 重置登录码弹窗(面板结构对齐手工录入运单号) ──────────────────────────
|
||||
.reset-login-code-result {
|
||||
margin-top: 10px;
|
||||
text-align: center;
|
||||
|
||||
.result-head {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
margin-bottom: 16px;
|
||||
|
||||
.result-title {
|
||||
font-size: 15px;
|
||||
font-weight: 600;
|
||||
color: #67c23a;
|
||||
}
|
||||
}
|
||||
|
||||
.qr-login-box {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
@ -1861,7 +1931,7 @@ onMounted(() => {
|
||||
background: #f5f7fa;
|
||||
border: 1px dashed #dcdfe6;
|
||||
border-radius: 6px;
|
||||
margin-bottom: 10px;
|
||||
margin-bottom: 0;
|
||||
word-break: break-all;
|
||||
|
||||
.login-code-text {
|
||||
@ -1871,11 +1941,6 @@ onMounted(() => {
|
||||
user-select: text;
|
||||
}
|
||||
}
|
||||
|
||||
.result-tip {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
}
|
||||
}
|
||||
|
||||
.create-result-target {
|
||||
@ -1902,7 +1967,7 @@ onMounted(() => {
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
/* 新增 / 编辑工作台:面板结构 / 尺寸对齐「批量修改平台信息」(UpdateOrderMetaForm) */
|
||||
/* 新增 / 编辑工作台:面板结构 / 尺寸对齐「手工录入运单号」(ManualWaybillForm) */
|
||||
.task-panel {
|
||||
background: #fff;
|
||||
color: #303133;
|
||||
@ -1990,6 +2055,34 @@ onMounted(() => {
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 控件行(单选/开关):与输入行同尺寸,去掉灰色容器 */
|
||||
&--control {
|
||||
align-items: flex-start;
|
||||
min-height: 36px;
|
||||
padding: 4px 0 0 12px;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
background: transparent;
|
||||
|
||||
.task-panel__field-label {
|
||||
padding-top: 7px;
|
||||
|
||||
&.is-required::before {
|
||||
top: 7px;
|
||||
}
|
||||
}
|
||||
|
||||
.task-panel__field-control {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-height: 32px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1999,16 +2092,26 @@ onMounted(() => {
|
||||
}
|
||||
}
|
||||
|
||||
/* 标签列固定宽度 + 必填星号绝对定位前缀 */
|
||||
&__field-label {
|
||||
position: relative;
|
||||
flex: 0 0 88px;
|
||||
width: 88px;
|
||||
padding-left: 10px;
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
flex-shrink: 0;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-required::before {
|
||||
content: '*';
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
line-height: 20px;
|
||||
color: #f56c6c;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2021,7 +2124,26 @@ onMounted(() => {
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* 灰色提示块 */
|
||||
/* 列表分组(绑定摄像头等) */
|
||||
&__section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
&__section-title {
|
||||
font-size: 12px;
|
||||
line-height: 20px;
|
||||
color: #606266;
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
&__table-wrap {
|
||||
border-radius: 4px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* 灰底提示条:兼作告警提示(重置登录码等) */
|
||||
&__form-tip {
|
||||
margin: 8px 0 0;
|
||||
padding: 8px 12px;
|
||||
@ -2030,20 +2152,14 @@ onMounted(() => {
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
}
|
||||
|
||||
&__field-control {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
/* 不可逆操作提示 */
|
||||
&--warning {
|
||||
background: #fdf6ec;
|
||||
color: #e6a23c;
|
||||
}
|
||||
|
||||
&__field-tip {
|
||||
margin: 4px 0 0;
|
||||
font-size: 12px;
|
||||
line-height: 18px;
|
||||
color: #909399;
|
||||
|
||||
/* 条码查重结果提示(对齐 el-text 的语义色) */
|
||||
/* 查重结果:不改底色,仅用语义色文字 */
|
||||
&.is-success {
|
||||
color: #67c23a;
|
||||
}
|
||||
@ -2061,6 +2177,11 @@ onMounted(() => {
|
||||
}
|
||||
}
|
||||
|
||||
&__field-control {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
&__foot {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -2077,7 +2198,8 @@ onMounted(() => {
|
||||
&__actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
/* 与工具栏按钮组(OrderToolbarButtonGroup)保持一致:gap 6px */
|
||||
gap: 6px;
|
||||
|
||||
:deep(.el-button) {
|
||||
margin-left: 0;
|
||||
@ -2107,7 +2229,9 @@ onMounted(() => {
|
||||
<style lang="scss">
|
||||
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给面板 */
|
||||
.el-dialog.workbench-form-dialog,
|
||||
.el-dialog.workbench-bind-dialog {
|
||||
.el-dialog.workbench-bind-dialog,
|
||||
.el-dialog.bind-camera-dialog,
|
||||
.el-dialog.reset-login-code-dialog {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user