refactor(frontend): 业务弹窗统一为 task-panel 面板,统一确认框样式

新增统一弹窗外壳与样式:
- 新增 TaskPanelDialog.vue(自绘标题+副标题 / 可滚动内容区 / 底部提示+操作区),
  默认点遮罩不关闭,内容区 max-height 内部滚动
- 新增 styles/task-panel.css 并在 main.ts 引入:section 分组、栅格字段行
  (88px 标签 + 控件)、提示条、表格区、底部按钮区(small / gap 6)
- 新增 ReasonPromptDialog.vue:替换 ElMessageBox.prompt,用于作废 / 取消 /
  手工标记推送失败等需填原因的操作,支持必填校验、多行、按钮类型与提示

页面改造(el-dialog / el-drawer → TaskPanelDialog + task-panel 栅格):
- 订单、发货单、状态面板、订单同步、入库单(列表/新建)、出库单(列表/新建)、
  库存单据、导出任务、导出按钮、商品查询、单据选择、商品(新增/编辑/批量导入,
  抽屉改弹窗)、店铺、店铺商品、组合商品、自定义快递、外接 API、
  外接打印平台/快递接口、组织(集团设置/下属公司)、权限角色组、主体、主体用户、
  商品属性、用户资料

交互与样式统一:
- ElMessageBox.confirm 统一挂 customClass="app-confirm-box"(App.vue 中定义按钮
  高度/内边距/间距),状态面板封装 ElMessageBox 别名统一注入
- 侧边栏 BasicLayout:加 contain: layout、菜单内部 overflow 滚动、
  关闭子菜单折叠过渡,避免展开时逐帧重排扩散到主内容区
This commit is contained in:
yin 2026-11-19 18:00:54 +08:00
parent a9485eecc0
commit 60a7db4085
34 changed files with 5815 additions and 3223 deletions

View File

@ -68,6 +68,20 @@ body,
padding: 0;
}
/* 业务弹窗确认框:按钮尺寸/间距对齐表单面板底部(small / gap 6) */
.app-confirm-box .el-message-box__btns {
gap: 6px;
}
.app-confirm-box .el-message-box__btns .el-button {
height: 24px;
padding: 5px 11px;
font-size: 12px;
border-radius: 4px;
}
.app-confirm-box .el-message-box__btns .el-button + .el-button {
margin-left: 0;
}
/* 表格:单元格上下与左右内边距 */
.el-table .cell {
padding: 0 8px;

View File

@ -2,6 +2,7 @@
import { computed, ref } from 'vue'
import { ElMessage } from 'element-plus'
import { useExportTasks } from '@/composables/useExportTasks'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import type { ExportFilters, ExportType } from '@/api/exportTask'
/**
@ -85,36 +86,56 @@ async function confirmOrderExport() {
<span>{{ text }}</span>
</el-button>
<el-dialog v-model="dialogVisible" title="导出订单" width="440px" append-to-body>
<el-form label-width="76px" size="small">
<el-form-item label="导出范围">
<el-radio-group v-model="scope">
<el-radio value="selected" :disabled="!selectedCount">
导出选中({{ selectedCount }} 条)
</el-radio>
<el-radio value="filtered">按条件全部</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="导出内容">
<el-radio-group v-model="mode">
<el-radio value="order">订单行(不含明细)</el-radio>
<el-radio value="item">订单含明细(每商品一行)</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="selectedCount > MAX_SELECTED && scope === 'selected'" label=" ">
<span class="hint">单次最多导出 {{ MAX_SELECTED }} 条选中订单,超出部分请分批导出</span>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="confirmOrderExport">提交导出</el-button>
<TaskPanelDialog
v-model="dialogVisible"
title="导出订单"
subtitle="按勾选的订单或当前筛选条件生成导出文件"
width="min(440px, 92vw)"
body-max-height="56vh"
>
<div class="task-panel__form">
<div class="task-panel__grid task-panel__grid--single">
<div class="task-panel__field task-panel__field--control">
<span class="task-panel__field-label">导出范围</span>
<div class="task-panel__field-form">
<el-radio-group v-model="scope">
<el-radio value="selected" :disabled="!selectedCount">
导出选中({{ selectedCount }} 条)
</el-radio>
<el-radio value="filtered">按条件全部</el-radio>
</el-radio-group>
</div>
</div>
<div class="task-panel__field task-panel__field--control">
<span class="task-panel__field-label">导出内容</span>
<div class="task-panel__field-form">
<el-radio-group v-model="mode">
<el-radio value="order">订单行(不含明细)</el-radio>
<el-radio value="item">订单含明细(每商品一行)</el-radio>
</el-radio-group>
</div>
</div>
</div>
<p
v-if="selectedCount > MAX_SELECTED && scope === 'selected'"
class="task-panel__form-tip task-panel__form-tip--warning"
>
单次最多导出 {{ MAX_SELECTED }} 条选中订单,超出部分请分批导出。
</p>
</div>
<template #hint>导出在后台任务中执行,完成后自动下载</template>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="confirmOrderExport">提交导出</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
</template>
<style scoped>
.hint {
color: var(--el-text-color-secondary);
.task-panel__field-form :deep(.el-radio__label) {
font-size: 12px;
}
</style>

View File

@ -2,6 +2,7 @@
import { computed, ref, watch } from 'vue'
import { DEFAULT_PAGE_SIZE } from '@/composables/useListPage'
import { mediaUrl } from '@/utils/media'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import {
getProducts,
searchProducts,
@ -191,9 +192,15 @@ function pickProduct(row: ProductItem) {
<el-button size="small" :disabled="disabled" @click="openPicker">查询</el-button>
</div>
<el-dialog v-model="pickerVisible" title="商品查询" width="min(1040px, 94vw)" append-to-body>
<el-form :inline="true" class="picker-search">
<el-form-item label="关键词">
<TaskPanelDialog
v-model="pickerVisible"
title="商品查询"
subtitle="双击一行或点「选择」把商品填入当前行"
width="min(1040px, 96vw)"
body-max-height="60vh"
>
<div class="task-panel__form">
<div class="picker-search">
<el-input
v-model="searchKey"
placeholder="商品编码 / 名称 / 货物编码 / 条码"
@ -201,13 +208,12 @@ function pickProduct(row: ProductItem) {
style="width: 280px"
@keyup.enter="onPickerSearch"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="onPickerSearch">查询</el-button>
<el-button @click="searchKey = ''; onPickerSearch()">重置</el-button>
</el-form-item>
</el-form>
<div v-if="subsidiaryId != null" class="picker-tip">仅显示当前所选店铺同货主(所属公司)的商品</div>
<el-button size="small" type="primary" @click="onPickerSearch">查询</el-button>
<el-button size="small" @click="searchKey = ''; onPickerSearch()">重置</el-button>
</div>
<p v-if="subsidiaryId != null" class="task-panel__form-tip">
仅显示当前所选店铺同货主(所属公司)的商品。
</p>
<el-table
:data="pickerList"
v-loading="pickerLoading"
@ -254,7 +260,13 @@ function pickProduct(row: ProductItem) {
:page-size="pickerPageSize"
@current-change="onPickerPageChange"
/>
</el-dialog>
</div>
<template #hint>共 {{ pickerTotal }} 个商品</template>
<template #actions>
<el-button size="small" @click="pickerVisible = false">关闭</el-button>
</template>
</TaskPanelDialog>
</template>
<style scoped>
@ -269,22 +281,12 @@ function pickProduct(row: ProductItem) {
min-width: 0;
}
.picker-search {
margin-bottom: 6px;
}
.picker-tip {
margin-bottom: 6px;
color: var(--el-text-color-secondary);
font-size: 12px;
display: flex;
align-items: center;
gap: 6px;
}
.picker-pager {
margin-top: 8px;
justify-content: flex-end;
}
/* 弹窗(append-to-body 仍带组件 scope 属性,可用 :deep 命中) */
.product-select :deep(.el-dialog__header) {
padding: 10px 12px;
}
.product-select :deep(.el-dialog__body) {
padding: 4px 12px 10px;
}
</style>

View File

@ -0,0 +1,151 @@
<script setup lang="ts">
/**
* 原因输入面板(对齐 new3 order/orderManagement「手工录入运单号」)
*
* 用于替换 ElMessageBox.prompt:作废 / 取消 / 手工标记推送失败等需要填写原因的操作。
* 面板结构复用 TaskPanelDialog,字段行与其它业务表单一致(88px 标签 + 控件)。
*
* 用法:
* <ReasonPromptDialog
* v-model="state.visible"
* title="取消订单"
* subtitle="确认取消订单 FH001?"
* tip="取消后进入「已取消」视图,可在该视图恢复。"
* label="取消原因"
* hint="原因会写入订单备注"
* @confirm="onConfirm"
* @cancel="onCancel"
* />
*/
import { computed, reactive, ref, watch } from 'vue'
import type { FormInstance, FormRules } from 'element-plus'
import TaskPanelDialog from './TaskPanelDialog.vue'
const visible = defineModel<boolean>({ default: false })
const props = withDefaults(
defineProps<{
/** 面板标题 */
title?: string
/** 标题下说明 */
subtitle?: string
/** 正文灰色提示条(写清后果/影响范围) */
tip?: string
/** 字段标签 */
label?: string
/** 输入框占位 */
placeholder?: string
/** 是否必填 */
required?: boolean
/** 底部左侧提示 */
hint?: string
/** 确认按钮文案 */
confirmText?: string
/** 确认按钮类型 */
confirmType?: 'primary' | 'danger' | 'warning'
/** 多行文本(原因较长时用) */
multiline?: boolean
/** 最大长度 */
maxlength?: number
}>(),
{
title: '',
subtitle: '',
tip: '',
label: '原因',
placeholder: '',
required: false,
hint: '',
confirmText: '确定',
confirmType: 'primary',
multiline: false,
maxlength: 200,
},
)
const emit = defineEmits<{
confirm: [value: string]
cancel: []
}>()
const formRef = ref<FormInstance>()
const form = reactive({ reason: '' })
const rules = computed<FormRules>(() => ({
reason: props.required
? [
{ required: true, message: `请填写${props.label}`, trigger: 'blur' },
{ whitespace: true, message: `请填写${props.label}`, trigger: 'blur' },
]
: [],
}))
/** 每次打开重置输入与校验状态 */
watch(visible, (value) => {
if (!value) return
form.reason = ''
formRef.value?.clearValidate()
})
/** 区分「确认关闭」与「取消关闭」:只有取消才触发 cancel */
let confirmed = false
async function submit() {
if (props.required) {
try {
await formRef.value?.validate()
} catch {
return
}
}
confirmed = true
visible.value = false
emit('confirm', form.reason.trim())
}
function handleClosed() {
if (!confirmed) emit('cancel')
confirmed = false
}
</script>
<template>
<TaskPanelDialog
v-model="visible"
:title="title"
:subtitle="subtitle"
width="min(560px, 92vw)"
body-max-height="60vh"
@closed="handleClosed"
>
<el-form ref="formRef" :model="form" :rules="rules" class="task-panel__form" @submit.prevent>
<p v-if="tip" class="task-panel__form-tip">{{ tip }}</p>
<div class="task-panel__grid task-panel__grid--single">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label" :class="{ 'is-required': required }">{{ label }}</span>
<div class="task-panel__field-form">
<el-form-item prop="reason">
<el-input
v-model="form.reason"
:type="multiline ? 'textarea' : 'text'"
:rows="multiline ? 3 : undefined"
:placeholder="placeholder"
:maxlength="maxlength"
show-word-limit
clearable
@keyup.enter="multiline ? undefined : submit"
/>
</el-form-item>
</div>
</div>
</div>
</el-form>
<template v-if="hint" #hint>{{ hint }}</template>
<template #actions>
<el-button size="small" @click="visible = false">取消</el-button>
<el-button size="small" :type="confirmType" @click="submit">{{ confirmText }}</el-button>
</template>
</TaskPanelDialog>
</template>

View File

@ -8,6 +8,7 @@
*/
import { computed, ref, watch } from 'vue'
import DataTable from '@/components/DataTable.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
export interface PickerColumn {
prop: string
@ -59,6 +60,14 @@ const filtered = computed(() => {
)
})
/** 已选中行的展示文案(取第一列) */
const selectedLabel = computed(() => {
if (selected.value == null) return '未选择'
const row = props.options.find(item => item[props.valueKey] === selected.value)
const key = props.columns[0]?.prop
return row && key ? String(row[key] ?? selected.value) : String(selected.value)
})
watch(
() => props.modelValue,
(open) => {
@ -86,24 +95,26 @@ function confirm() {
</script>
<template>
<el-dialog
<TaskPanelDialog
:model-value="modelValue"
:title="title"
width="640px"
top="8vh"
subtitle="点击一行选择,或双击直接确认"
width="min(640px, 94vw)"
body-max-height="64vh"
@update:model-value="emit('update:modelValue', $event)"
>
<div class="picker-toolbar">
<el-input v-model="keyword" placeholder="输入关键词过滤" clearable style="width: 260px" />
<span class="picker-tip">点击一行选择,或双击直接确认</span>
</div>
<DataTable
:data="filtered"
height="320"
highlight-current-row
@row-click="onRowClick"
@row-dblclick="(_row: Record<string, unknown>) => { onRowClick(_row); confirm() }"
>
<div class="task-panel__form">
<div class="picker-toolbar">
<el-input v-model="keyword" placeholder="输入关键词过滤" clearable style="width: 260px" />
<span class="picker-tip">共 {{ filtered.length }} 项可选项</span>
</div>
<DataTable
:data="filtered"
height="320"
highlight-current-row
@row-click="onRowClick"
@row-dblclick="(_row: Record<string, unknown>) => { onRowClick(_row); confirm() }"
>
<el-table-column label="" width="48" align="center">
<template #default="{ row }">
<el-radio :model-value="selected" :value="row[valueKey]" class="picker-radio">
@ -123,12 +134,15 @@ function confirm() {
<template #empty>
<span>{{ emptyText }}</span>
</template>
</DataTable>
<template #footer>
<el-button @click="close">取消</el-button>
<el-button type="primary" :disabled="selected == null" @click="confirm">{{ confirmText }}</el-button>
</DataTable>
</div>
<template #hint>已选中:{{ selectedLabel }}</template>
<template #actions>
<el-button size="small" @click="close">取消</el-button>
<el-button size="small" type="primary" :disabled="selected == null" @click="confirm">{{ confirmText }}</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
</template>
<style scoped>
@ -136,7 +150,6 @@ function confirm() {
display: flex;
align-items: center;
gap: 12px;
margin-bottom: 10px;
}
.picker-tip {
font-size: 12px;

View File

@ -0,0 +1,115 @@
<script setup lang="ts">
/**
* 统一表单弹窗外壳(对齐 new3 order/waveOrder「新建波次策略」的 task-panel)
*
* 结构:自绘标题(h2 + 副标题 + 右上关闭)→ 可滚动内容区 → 底部提示 + 操作区
* 说明:
* - 关闭 Element 默认头部与内边距,避免「默认头 + 自绘头」叠两层;
* - 内容区默认 max-height 64vh,超出在面板内滚动,不撑高页面;
* - 底部左侧放 12px 灰提示,右侧操作按钮 gap 6px(与工具栏按钮组一致)。
*
* 用法:
* <TaskPanelDialog v-model="visible" title="新建订单" subtitle="..." @closed="onClosed">
* <el-form class="task-panel__form">…</el-form>
* <template #hint>带 * 为必填项</template>
* <template #actions>
* <el-button size="small" @click="visible = false">取消</el-button>
* <el-button size="small" type="primary" @click="submit">保存</el-button>
* </template>
* </TaskPanelDialog>
*/
const visible = defineModel<boolean>({ default: false })
withDefaults(
defineProps<{
/** 面板标题 */
title?: string
/** 标题下方说明(12px 灰字) */
subtitle?: string
/** 弹窗宽度,默认与波次策略表单一致 */
width?: string
/** 内容区最大高度,超出后内部滚动 */
bodyMaxHeight?: string
/** 是否显示底部操作区 */
showFooter?: boolean
/** 点击遮罩是否关闭(默认不关闭,避免误触丢表单) */
closeOnClickModal?: boolean
}>(),
{
title: '',
subtitle: '',
width: 'min(880px, 96vw)',
bodyMaxHeight: '64vh',
showFooter: true,
closeOnClickModal: false,
},
)
const emit = defineEmits<{
closed: []
}>()
function close() {
visible.value = false
}
defineExpose({ close })
</script>
<template>
<el-dialog
v-model="visible"
class="task-panel-dialog"
:width="width"
align-center
append-to-body
destroy-on-close
:show-close="false"
:close-on-click-modal="closeOnClickModal"
@closed="emit('closed')"
>
<div class="task-panel">
<header class="task-panel__head">
<div class="task-panel__titles">
<h2><slot name="title">{{ title }}</slot></h2>
<p v-if="subtitle || $slots.subtitle">
<slot name="subtitle">{{ subtitle }}</slot>
</p>
</div>
<slot name="head-extra" />
<button class="task-panel__close" type="button" aria-label="关闭" @click="close">
<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" :style="{ maxHeight: bodyMaxHeight }">
<slot />
</div>
<footer v-if="showFooter || $slots.actions" class="task-panel__foot">
<span class="task-panel__hint"><slot name="hint" /></span>
<div class="task-panel__actions">
<slot name="actions" />
</div>
</footer>
</div>
</el-dialog>
</template>
<style>
/* el-dialog 会被 append 到 body:去掉默认头/内边距,统一交给 .task-panel 自绘 */
.el-dialog.task-panel-dialog {
padding: 0;
overflow: hidden;
}
.el-dialog.task-panel-dialog .el-dialog__header {
display: none;
}
.el-dialog.task-panel-dialog .el-dialog__body {
padding: 0;
}
</style>

View File

@ -274,6 +274,9 @@ function onPrincipalChange(id: number) {
border-right: 1px solid var(--el-border-color);
display: flex;
flex-direction: column;
/* 侧边栏内部的高度变化(子菜单展开/收起)不参与外层布局计算,
避免重排扩散到右侧主内容区(订单页多张表格常驻时尤其明显) */
contain: layout;
}
.logo {
@ -292,6 +295,20 @@ function onPrincipalChange(id: number) {
.app-menu {
flex: 1;
border-right: none;
/* 菜单总高超出侧边栏时在栏内滚动,避免溢出到页面外影响整体布局 */
overflow-x: hidden;
overflow-y: auto;
}
/*
* 子菜单展开/收起:去掉 Element Plus 的折叠过渡。
* EP 的折叠过渡是逐帧改 max-height / padding 来实现的,属于布局属性,
* 每帧都会触发一次重排(页面越重、掉帧越明显,例如订单页常驻多张 el-table)。
* 侧边栏只需要「开 / 关」两个状态,这里改为一次性布局完成,展开立即到位。
*/
.app-menu :deep(.el-collapse-transition-enter-active),
.app-menu :deep(.el-collapse-transition-leave-active) {
transition: none !important;
}
.app-header {

View File

@ -1,6 +1,7 @@
import { createApp } from 'vue'
import ElementPlus from 'element-plus'
import 'element-plus/dist/index.css'
import './styles/task-panel.css'
import * as ElementPlusIconsVue from '@element-plus/icons-vue'
import App from './App.vue'
import router from './router'

View File

@ -0,0 +1,310 @@
/**
* 表单面板样式(对齐 new3 order/waveOrder「新建波次策略」)
*
* 设计要点(与 new3 保持一致):
* - 弹窗内不留 Element 默认头/内边距,全部交给 .task-panel 自绘
* - 字段 = 「88px 标签 + 控件」一行;输入行不带灰底边框,只读行才用 #fafafa 底 + 1px #ebeef5
* - 双列栅格(column-gap 16 / row-gap 8),窄屏 < 720px 自动降为单列
* - 必填星号绝对定位在标签左侧,不占标签宽度,保证各行列严格对齐
* - 分组标题用 12px 灰字,不加分割线(避免与面板边框叠出多条线)
*/
.task-panel {
background: #fff;
color: #303133;
}
.task-panel__head {
display: flex;
align-items: flex-start;
gap: 12px;
padding: 16px;
}
.task-panel__titles {
flex: 1;
min-width: 0;
}
.task-panel__titles h2 {
margin: 0;
font-size: 18px;
line-height: 24px;
font-weight: 400;
color: #303133;
}
.task-panel__titles p {
margin: 4px 0 0;
font-size: 12px;
line-height: 18px;
color: #909399;
}
.task-panel__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;
}
.task-panel__close svg {
width: 12px;
height: 12px;
}
.task-panel__close:hover {
color: #409eff;
}
.task-panel__body {
padding: 12px 16px 0;
overflow-y: auto;
}
/* 表单整体:纵向排列「分组标题 / 栅格 / 提示条」 */
.task-panel__form {
display: flex;
flex-direction: column;
gap: 8px;
}
.task-panel__grid {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
column-gap: 16px;
row-gap: 8px;
}
.task-panel__grid--single {
grid-template-columns: minmax(0, 1fr);
}
/* 分组标题:灰字 + 右侧虚线,跨整行 */
.task-panel__section {
grid-column: 1 / -1;
display: flex;
align-items: center;
gap: 8px;
margin: 4px 0 0;
font-size: 12px;
line-height: 18px;
font-weight: 600;
color: #909399;
letter-spacing: 0.3px;
}
.task-panel__section:first-child {
margin-top: 0;
}
/* 只读信息行:灰底 + 细边框 */
.task-panel__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;
}
.task-panel__field--full {
grid-column: 1 / -1;
}
/* 输入行:去掉灰色容器,与只读行拉开层次 */
.task-panel__field--input {
align-items: flex-start;
min-height: 0;
padding: 4px 0 0 12px;
border: none;
border-radius: 0;
background: transparent;
}
/* 开关 / 单选等控件行:高度与输入框(32px)对齐 */
.task-panel__field--control {
align-items: center;
min-height: 0;
padding: 4px 0 0 12px;
border: none;
border-radius: 0;
background: transparent;
}
/* 多行文本行:标签与文本域顶部对齐 */
.task-panel__field--textarea {
padding-top: 8px;
}
.task-panel__field--input > .task-panel__field-label,
.task-panel__field--control > .task-panel__field-label {
padding-top: 7px;
}
.task-panel__field--input > .task-panel__field-label.is-required::before,
.task-panel__field--control > .task-panel__field-label.is-required::before {
top: 7px;
}
/* 标签列固定宽度(含必填星号占位):各行列、控件左边缘严格对齐 */
.task-panel__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;
}
.task-panel__field-label.is-required::before {
content: '*';
position: absolute;
left: 0;
top: 0;
color: #f56c6c;
line-height: 20px;
}
.task-panel__field-value {
font-size: 13px;
font-weight: 500;
color: #303133;
text-align: right;
word-break: break-all;
}
/* 输入控件容器:占满标签列右侧剩余宽度 */
.task-panel__field-form {
flex: 1;
min-width: 0;
max-width: none;
}
.task-panel__field-form .el-form-item {
flex: 1;
min-width: 0;
width: 100%;
margin-bottom: 0;
}
.task-panel__field-form .el-form-item__content {
margin-left: 0 !important;
width: 100%;
line-height: 1.4;
}
.task-panel__field-form .el-form-item__error {
position: static;
padding-top: 4px;
}
.task-panel__field-form .el-input,
.task-panel__field-form .el-select,
.task-panel__field-form .el-input-number,
.task-panel__field-form .el-cascader,
.task-panel__field-form .el-date-editor {
width: 100%;
}
.task-panel__field-form--row {
display: flex;
align-items: center;
gap: 8px;
min-height: 32px;
}
.task-panel__field-hint {
display: block;
margin-top: 2px;
font-size: 12px;
line-height: 16px;
color: #909399;
}
/* 表单下方统一提示条 */
.task-panel__form-tip {
margin: 8px 0 0;
padding: 8px 12px;
border-radius: 4px;
background: #f4f4f5;
font-size: 12px;
line-height: 18px;
color: #909399;
}
.task-panel__form-tip--error {
background: #fef0f0;
color: #f56c6c;
}
.task-panel__form-tip--warning {
background: #fdf6ec;
color: #e6a23c;
}
/* 浅色块(智能识别 / 影响范围等) */
.task-panel__block {
padding: 8px 12px;
border: 1px solid #ebeef5;
border-radius: 4px;
background: #fafafa;
}
.task-panel__block .el-textarea__inner {
background: #fff;
}
/* 面板内表格:保持整宽,不允许撑破栅格 */
.task-panel__table {
width: 100%;
min-width: 0;
}
.task-panel__foot {
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
padding: 16px;
}
.task-panel__hint {
font-size: 12px;
color: #909399;
}
.task-panel__actions {
display: flex;
align-items: center;
gap: 6px;
}
.task-panel__actions .el-button {
margin-left: 0;
margin-right: 0;
}
@media (max-width: 720px) {
.task-panel__grid {
grid-template-columns: minmax(0, 1fr);
}
.task-panel__field {
gap: 8px;
}
}

View File

@ -12,6 +12,7 @@ import { searchProducts, type ProductSearchItem } from '@/api/product'
import DataTable from '@/components/DataTable.vue'
import ExportButton from '@/components/ExportButton.vue'
import ListPager from '@/components/ListPager.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import OperationLogPanel from '@/components/OperationLogPanel.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import { mediaUrl } from '@/utils/media'
@ -68,7 +69,7 @@ interface ComboRow {
subsidiary_name: string
}
const drawerVisible = ref(false)
const dialogVisible = ref(false)
const submitting = ref(false)
const formRef = ref<FormInstance>()
const editId = ref<number | null>(null)
@ -158,7 +159,7 @@ function openCreate() {
form.remark = ''
itemRows.value = []
productKeyword.value = ''
drawerVisible.value = true
dialogVisible.value = true
fetchSearchProducts()
}
@ -182,7 +183,7 @@ function openEdit(row: ComboProductItem) {
subsidiary_name: it.product?.subsidiary_name || '',
}))
productKeyword.value = ''
drawerVisible.value = true
dialogVisible.value = true
fetchSearchProducts()
}
@ -227,7 +228,7 @@ async function submitForm() {
await updateComboProduct(editId.value, payload)
ElMessage.success('保存成功')
}
drawerVisible.value = false
dialogVisible.value = false
await fetchList()
} catch {
// 拦截器已提示
@ -243,6 +244,7 @@ async function handleDelete(row: ComboProductItem) {
type: 'warning',
confirmButtonText: '删除',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -372,36 +374,74 @@ onMounted(fetchList)
</div>
</div>
<el-drawer
v-model="drawerVisible"
<TaskPanelDialog
v-model="dialogVisible"
:title="editId == null ? '新增组合商品' : '编辑组合商品'"
direction="rtl"
size="960px"
:close-on-click-modal="false"
:subtitle="editId == null ? '选择系统商品并设置数量,组合编码留空由系统生成' : '修改组合信息或明细,保存后立即生效'"
width="min(1180px, 96vw)"
body-max-height="72vh"
>
<div class="combo-editor">
<!-- 左:组合商品信息 -->
<div class="combo-info">
<div class="pane-title">组合商品信息</div>
<el-form ref="formRef" :model="form" :rules="rules" label-width="90px">
<el-form-item label="组合编码" prop="code">
<el-input v-model="form.code" placeholder="留空由系统生成(主体内唯一)" />
</el-form-item>
<el-form-item label="组合名称" prop="name">
<el-input v-model="form.name" placeholder="请输入组合商品名称" />
</el-form-item>
<el-form-item label="组合售价" prop="price">
<el-input-number v-model="form.price" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" style="width: 100%">
<el-option label="上架" :value="1" />
<el-option label="下架" :value="0" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="3" placeholder="选填" />
</el-form-item>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__grid task-panel__grid--single">
<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="code">
<el-input v-model="form.code" placeholder="留空由系统生成(主体内唯一)" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">组合名称</span>
<div class="task-panel__field-form">
<el-form-item prop="name">
<el-input v-model="form.name" placeholder="请输入组合商品名称" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">组合售价</span>
<div class="task-panel__field-form">
<el-form-item prop="price">
<el-input-number v-model="form.price" :min="0" :precision="2" style="width: 100%" />
</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="status">
<el-select v-model="form.status" style="width: 100%">
<el-option label="上架" :value="1" />
<el-option label="下架" :value="0" />
</el-select>
</el-form-item>
</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="form.remark" type="textarea" :rows="3" placeholder="选填" />
</el-form-item>
</div>
</div>
</div>
</el-form>
</div>
@ -414,7 +454,7 @@ onMounted(fetchList)
v-model="productKeyword"
placeholder="商品编码/货物编码/条码/名称"
clearable
style="width: 280px"
style="width: 300px"
@keyup.enter="fetchSearchProducts"
>
<template #append>
@ -422,41 +462,43 @@ onMounted(fetchList)
</template>
</el-input>
</div>
<DataTable
:loading="productLoading"
:data="productList"
height="100%"
>
<el-table-column label="图片" width="64" align="center">
<template #default="{ row }">
<el-image
v-if="row.image"
:src="mediaUrl(row.image)"
fit="cover"
style="width: 40px; height: 40px; border-radius: 4px"
:preview-src-list="[ mediaUrl(row.image) ]"
preview-teleported
/>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="item_code" label="商品编码" width="120" />
<el-table-column prop="item_name" label="商品名称" min-width="140" show-overflow-tooltip />
<el-table-column label="货主" width="120" show-overflow-tooltip>
<template #default="{ row }">{{ row.subsidiary_name || '-' }}</template>
</el-table-column>
<el-table-column prop="sku_property" label="SKU规格" width="90" />
<el-table-column prop="barcode" label="条码" width="130" show-overflow-tooltip>
<template #default="{ row }">{{ row.barcode || '-' }}</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<template #default="{ row }">
<el-button link type="primary" :disabled="isAdded(row.id)" @click="addProduct(row)">
{{ isAdded(row.id) ? '已添加' : '添加' }}
</el-button>
</template>
</el-table-column>
</DataTable>
<div class="task-panel__table">
<DataTable
:loading="productLoading"
:data="productList"
height="100%"
>
<el-table-column label="图片" width="64" align="center">
<template #default="{ row }">
<el-image
v-if="row.image"
:src="mediaUrl(row.image)"
fit="cover"
style="width: 40px; height: 40px; border-radius: 4px"
:preview-src-list="[ mediaUrl(row.image) ]"
preview-teleported
/>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="item_code" label="商品编码" width="120" />
<el-table-column prop="item_name" label="商品名称" min-width="140" show-overflow-tooltip />
<el-table-column label="货主" width="120" show-overflow-tooltip>
<template #default="{ row }">{{ row.subsidiary_name || '-' }}</template>
</el-table-column>
<el-table-column prop="sku_property" label="SKU规格" width="90" />
<el-table-column prop="barcode" label="条码" width="130" show-overflow-tooltip>
<template #default="{ row }">{{ row.barcode || '-' }}</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<template #default="{ row }">
<el-button link type="primary" :disabled="isAdded(row.id)" @click="addProduct(row)">
{{ isAdded(row.id) ? '已添加' : '添加' }}
</el-button>
</template>
</el-table-column>
</DataTable>
</div>
</div>
<div class="pane pane-bottom">
@ -464,55 +506,58 @@ onMounted(fetchList)
<span class="pane-title">已添加组合明细</span>
<span class="pane-sub">共 {{ itemRows.length }} 项</span>
</div>
<DataTable :data="itemRows" height="100%">
<el-table-column label="图片" width="64" align="center">
<template #default="{ row }">
<el-image
v-if="row.image"
:src="mediaUrl(row.image)"
fit="cover"
style="width: 40px; height: 40px; border-radius: 4px"
:preview-src-list="[ mediaUrl(row.image) ]"
preview-teleported
/>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="item_name" label="商品名称" min-width="140" show-overflow-tooltip />
<el-table-column prop="item_code" label="商品编码" width="120" />
<el-table-column label="货主" width="120" show-overflow-tooltip>
<template #default="{ row }">{{ row.subsidiary_name || '-' }}</template>
</el-table-column>
<el-table-column prop="sku_property" label="SKU规格" width="90" />
<el-table-column prop="barcode" label="条码" width="130" show-overflow-tooltip>
<template #default="{ row }">{{ row.barcode || '-' }}</template>
</el-table-column>
<el-table-column label="数量" width="150">
<template #default="{ row }">
<el-input-number
v-model="row.quantity"
:min="1"
:precision="0"
size="small"
style="width: 110px"
/>
</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<template #default="{ $index }">
<el-button link type="danger" @click="removeRow($index)">移除</el-button>
</template>
</el-table-column>
</DataTable>
<div class="task-panel__table">
<DataTable :data="itemRows" height="100%">
<el-table-column label="图片" width="64" align="center">
<template #default="{ row }">
<el-image
v-if="row.image"
:src="mediaUrl(row.image)"
fit="cover"
style="width: 40px; height: 40px; border-radius: 4px"
:preview-src-list="[ mediaUrl(row.image) ]"
preview-teleported
/>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="item_name" label="商品名称" min-width="140" show-overflow-tooltip />
<el-table-column prop="item_code" label="商品编码" width="120" />
<el-table-column label="货主" width="120" show-overflow-tooltip>
<template #default="{ row }">{{ row.subsidiary_name || '-' }}</template>
</el-table-column>
<el-table-column prop="sku_property" label="SKU规格" width="90" />
<el-table-column prop="barcode" label="条码" width="130" show-overflow-tooltip>
<template #default="{ row }">{{ row.barcode || '-' }}</template>
</el-table-column>
<el-table-column label="数量" width="150">
<template #default="{ row }">
<el-input-number
v-model="row.quantity"
:min="1"
:precision="0"
size="small"
style="width: 110px"
/>
</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<template #default="{ $index }">
<el-button link type="danger" size="small" @click="removeRow($index)">移除</el-button>
</template>
</el-table-column>
</DataTable>
</div>
</div>
</div>
</div>
<template #footer>
<el-button @click="drawerVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">保存</el-button>
<template #hint>带 * 为必填项;组合明细至少 1 项</template>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</el-drawer>
</TaskPanelDialog>
</el-card>
</template>
@ -577,22 +622,22 @@ onMounted(fetchList)
.search-bar {
margin-bottom: 16px;
}
:deep(.el-drawer__body) {
padding: 10px;
overflow: hidden;
}
/* 组合编辑器:左侧信息 + 右侧上下两个商品列表 */
.combo-editor {
display: flex;
gap: 16px;
height: 100%;
height: min(620px, 66vh);
}
.combo-info {
flex: none;
width: 320px;
padding-right: 10px;
border-right: 1px solid var(--el-border-color-lighter);
width: 360px;
padding-right: 16px;
border-right: 1px solid #ebeef5;
overflow: auto;
}
.combo-info .pane-title {
margin-bottom: 8px;
}
.combo-detail {
flex: 1;
display: flex;
@ -613,13 +658,22 @@ onMounted(fetchList)
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
margin-bottom: 8px;
}
.pane-title {
font-size: 12px;
line-height: 18px;
font-weight: 600;
color: #909399;
letter-spacing: 0.3px;
}
.pane-sub {
color: var(--el-text-color-secondary);
font-size: 12px;
}
.pane > .task-panel__table {
flex: 1;
min-height: 0;
}
</style>

View File

@ -3,6 +3,7 @@ import { onMounted, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import { formatDateTime } from '@/utils/datetime'
import { getExpressCompanyOptions, type ExpressCompanyOption } from '@/api/expressCompany'
@ -149,7 +150,7 @@ async function handleDelete(row: CustomExpressCodeItem) {
await ElMessageBox.confirm(
`确认删除自定义快递「${row.name}(${row.code})」?历史订单已保存编码与名称快照,不受影响。`,
'删除确认',
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' },
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消', customClass: 'app-confirm-box' },
)
} catch {
return
@ -175,13 +176,9 @@ onMounted(async () => {
<div class="page-header">自定义快递编码</div>
</template>
<el-alert
type="info"
show-icon
:closable="false"
class="tip"
title="自定义编码会出现在订单的「修改快递」列表;订单保存自定义编码/名称,推送奇门时原样下发。自定义编码不能与系统快递编码重复。"
/>
<p class="task-panel__form-tip page-tip">
自定义编码会出现在订单的「修改快递」列表;订单保存自定义编码/名称,推送奇门时原样下发。自定义编码不能与系统快递编码重复。
</p>
<el-form :inline="true" class="search-bar" @submit.prevent>
<el-form-item label="关键词">
@ -210,11 +207,11 @@ onMounted(async () => {
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button @click="reset">重置</el-button>
<el-button size="small" type="primary" @click="search">查询</el-button>
<el-button size="small" @click="reset">重置</el-button>
</el-form-item>
<el-form-item class="add-btn">
<el-button type="success" @click="openCreate">新增自定义快递</el-button>
<el-button size="small" type="success" @click="openCreate">新增自定义快递</el-button>
</el-form-item>
</el-form>
@ -257,43 +254,100 @@ onMounted(async () => {
@size-change="handleSizeChange"
/>
<el-drawer
<TaskPanelDialog
v-model="drawerVisible"
:title="editId == null ? '新增自定义快递' : '编辑自定义快递'"
size="480px"
subtitle="自定义编码会随订单原样推送到奇门(WMS),不能与系统快递编码重复"
width="min(560px, 92vw)"
body-max-height="60vh"
>
<el-form ref="formRef" :model="form" :rules="rules" label-width="130px">
<el-form-item label="自定义编码" prop="code">
<el-input v-model="form.code" maxlength="50" placeholder="如 SF.KY(订单物流编码)" />
</el-form-item>
<el-form-item label="自定义名称" prop="name">
<el-input v-model="form.name" maxlength="100" placeholder="如 顺丰快运(订单物流名称)" />
</el-form-item>
<el-form-item label="对应系统快递" prop="express_code">
<el-select v-model="form.express_code" filterable placeholder="请选择" style="width: 100%">
<el-option
v-for="company in expressCompanies"
:key="company.code"
:label="`${company.name}(${company.code})`"
:value="company.code"
/>
</el-select>
</el-form-item>
<el-form-item label="排序">
<el-input-number v-model="form.sort" :min="0" :max="99999" controls-position="right" />
</el-form-item>
<el-form-item label="状态">
<el-switch v-model="form.status" :active-value="1" :inactive-value="0" active-text="启用" inactive-text="禁用" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="2" maxlength="255" show-word-limit />
</el-form-item>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__grid task-panel__grid--single">
<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="code">
<el-input v-model="form.code" maxlength="50" placeholder="如 SF.KY(订单物流编码)" />
</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" maxlength="100" placeholder="如 顺丰快运(订单物流名称)" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">系统快递</span>
<div class="task-panel__field-form">
<el-form-item prop="express_code">
<el-select v-model="form.express_code" filterable placeholder="请选择对应系统快递" style="width: 100%">
<el-option
v-for="company in expressCompanies"
:key="company.code"
:label="`${company.name}(${company.code})`"
:value="company.code"
/>
</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 task-panel__field-form--row">
<el-input-number v-model="form.sort" :min="0" :max="99999" controls-position="right" />
</div>
</div>
<div class="task-panel__field task-panel__field--control">
<span class="task-panel__field-label">状态</span>
<div class="task-panel__field-form">
<el-switch
v-model="form.status"
:active-value="1"
:inactive-value="0"
active-text="启用"
inactive-text="禁用"
/>
</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-form">
<el-input
v-model="form.remark"
type="textarea"
:rows="2"
maxlength="255"
show-word-limit
placeholder="选填"
/>
</div>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="drawerVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">确定</el-button>
<template #hint>
{{ editId == null ? '禁用后不再出现在订单的快递列表中' : '历史订单保存的编码与名称快照不受影响' }}
</template>
</el-drawer>
<template #actions>
<el-button size="small" @click="drawerVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">确定</el-button>
</template>
</TaskPanelDialog>
</el-card>
</template>
@ -315,8 +369,8 @@ onMounted(async () => {
.page-header {
font-weight: 600;
}
.tip {
margin-bottom: 12px;
.page-tip {
margin: 0 0 12px;
}
.search-bar {
flex: 0 0 auto;

View File

@ -4,6 +4,7 @@ import { ElMessage } from 'element-plus'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import ExportFilterField from '@/components/ExportFilterField.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import { downloadExportFile, useExportTasks } from '@/composables/useExportTasks'
import { formatDateTime } from '@/utils/datetime'
@ -204,8 +205,7 @@ onUnmounted(() => stopPolling())
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button type="success" @click="openDialog">新建导出</el-button>
</el-form-item>
</el-form>
</el-form-item> </el-form>
<div class="table-wrap">
<DataTable :loading="loading" :data="list" height="100%">
@ -258,32 +258,50 @@ onUnmounted(() => stopPolling())
/>
<!-- 新建导出对话框(筛选字段由所选导出类型的后端定义渲染) -->
<el-dialog v-model="dialogVisible" title="新建导出" width="560px" append-to-body>
<el-form label-width="90px" size="small">
<el-form-item label="导出类型" required>
<el-select v-model="form.type" placeholder="请选择" style="width: 100%" @change="onTypeChange">
<el-option v-for="o in typeOptions" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</el-form-item>
<el-form-item v-for="fd in currentFilters" :key="fd.key" :label="fd.label">
<ExportFilterField
v-model="form.values[fd.key]"
v-model:product-label="form.productLabels[fd.key]"
:field="fd"
:shop-options="shopOptions"
:warehouse-options="warehouseOptions"
:subsidiary-options="subsidiaryOptions"
/>
</el-form-item>
<el-form-item v-if="!currentFilters.length">
<span class="hint">该类型暂无可选筛选条件,将导出当前主体的全部数据</span>
</el-form-item>
<TaskPanelDialog
v-model="dialogVisible"
title="新建导出"
subtitle="按所选类型与筛选条件生成 XLSX,后台异步处理后自动下载"
width="min(560px, 92vw)"
body-max-height="62vh"
>
<el-form class="task-panel__form" @submit.prevent>
<div class="task-panel__grid task-panel__grid--single">
<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-select v-model="form.type" placeholder="请选择" style="width: 100%" @change="onTypeChange">
<el-option v-for="o in typeOptions" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</div>
</div>
<div v-for="fd in currentFilters" :key="fd.key" class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">{{ fd.label }}</span>
<div class="task-panel__field-form">
<ExportFilterField
v-model="form.values[fd.key]"
v-model:product-label="form.productLabels[fd.key]"
:field="fd"
:shop-options="shopOptions"
:warehouse-options="warehouseOptions"
:subsidiary-options="subsidiaryOptions"
/>
</div>
</div>
</div>
<p v-if="!currentFilters.length" class="task-panel__form-tip">
该类型暂无可选筛选条件,将导出当前主体的全部数据。
</p>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="onSubmit">提交</el-button>
<template #hint>任务可在本页查看进度,完成后自动下载</template>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="onSubmit">提交</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
</el-card>
</template>

View File

@ -46,6 +46,7 @@ import ExportButton from '@/components/ExportButton.vue'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import FieldValueForm from '@/components/FieldValueForm.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import { formatDateTime } from '@/utils/datetime'
@ -342,7 +343,7 @@ async function handleMappingDelete(row: WarehouseExpressMappingItem) {
await ElMessageBox.confirm(
`确定删除自定义编码「${row.custom_code}」的映射吗?删除后该编码将只能按快递公司字典兑底解析。`,
'删除映射',
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' },
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消', customClass: 'app-confirm-box' },
)
} catch {
return
@ -437,6 +438,7 @@ async function handleDelete(row: WarehouseItem) {
type: 'warning',
confirmButtonText: '删除',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -764,7 +766,7 @@ async function handleQueryInventorySelected() {
await ElMessageBox.confirm(
'同步后,库存差异将会以出入库单的形式平衡库存。确认同步?',
'同步覆盖本地数量',
{ confirmButtonText: '确认同步', cancelButtonText: '取消', type: 'warning' },
{ confirmButtonText: '确认同步', cancelButtonText: '取消', type: 'warning', customClass: 'app-confirm-box' },
)
} catch {
return
@ -908,6 +910,7 @@ async function handleApiDelete(row: WarehouseApiItem) {
type: 'warning',
confirmButtonText: '删除',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -1250,6 +1253,7 @@ onMounted(async () => {
<span class="items-title">商品 · {{ currentWarehouse.name }}</span>
<el-button
type="primary"
size="small"
:disabled="!selectedProducts.length || pushing"
:loading="pushing"
@click="handlePushProducts"
@ -1263,7 +1267,7 @@ onMounted(async () => {
class="toolbar-search"
@keyup.enter="searchProducts"
/>
<el-button @click="searchProducts">查询</el-button>
<el-button size="small" @click="searchProducts">查询</el-button>
<ExportButton
v-if="!isCompanyScope"
type="warehouse_product"
@ -1312,6 +1316,7 @@ onMounted(async () => {
<span class="items-title">库存 · {{ currentWarehouse.name }}</span>
<el-button
type="success"
size="small"
:disabled="!selectedInventory.length || queryingWms"
:loading="queryingWms"
@click="handleQueryInventorySelected"
@ -1320,6 +1325,7 @@ onMounted(async () => {
</el-button>
<el-button
type="warning"
size="small"
:disabled="!selectedInventory.length || syncing"
:loading="syncing"
@click="handleSyncInventory"
@ -1334,7 +1340,7 @@ onMounted(async () => {
class="toolbar-search"
@keyup.enter="searchInventory"
/>
<el-button @click="searchInventory">查询</el-button>
<el-button size="small" @click="searchInventory">查询</el-button>
<ExportButton
v-if="!isCompanyScope"
type="warehouse_product"
@ -1498,144 +1504,288 @@ onMounted(async () => {
</SplitLayout>
<!-- 仓库 新增 / 编辑(仅基础信息) -->
<el-dialog v-model="dialogVisible" :title="editId == null ? '新增仓库' : '编辑仓库'" width="520px">
<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
<el-form-item v-if="editId != null" label="仓库编码">
<el-input v-model="form.code" disabled />
</el-form-item>
<el-form-item v-else label="仓库编码">
<span class="hint">系统自动生成(WH 前缀),无需填写</span>
</el-form-item>
<el-form-item label="仓库名称" prop="name">
<el-input v-model="form.name" placeholder="如 上海中心仓" />
</el-form-item>
<el-form-item label="货主" prop="subsidiary_id">
<el-select v-model="form.subsidiary_id" placeholder="请选择货主(下属公司)" filterable style="width: 100%">
<el-option v-for="s in subsidiaryOptions" :key="s.id" :label="s.name" :value="s.id" />
</el-select>
</el-form-item>
<el-form-item label="仓库类型" prop="type">
<el-select v-model="form.type" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="t in WAREHOUSE_TYPE_OPTIONS" :key="t.value" :label="t.label" :value="t.value" />
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
<TaskPanelDialog
v-model="dialogVisible"
:title="editId == null ? '新增仓库' : '编辑仓库'"
:subtitle="editId == null ? '保存后自动生成仓库编码,可继续配置对接接口' : '仓库编码创建后不可修改'"
width="min(560px, 92vw)"
body-max-height="60vh"
>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<p v-if="editId == null" class="task-panel__form-tip">
仓库编码由系统自动生成(前缀 WH),无需填写。
</p>
<div class="task-panel__grid task-panel__grid--single">
<div v-if="editId != null" 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="form.code" disabled />
</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" placeholder="如 上海中心仓" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">货主</span>
<div class="task-panel__field-form">
<el-form-item prop="subsidiary_id">
<el-select v-model="form.subsidiary_id" placeholder="请选择货主(下属公司)" filterable style="width: 100%">
<el-option v-for="s in subsidiaryOptions" :key="s.id" :label="s.name" :value="s.id" />
</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="type">
<el-select v-model="form.type" clearable placeholder="请选择" style="width: 100%">
<el-option v-for="t in WAREHOUSE_TYPE_OPTIONS" :key="t.value" :label="t.label" :value="t.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="status">
<el-select v-model="form.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</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>
<div class="task-panel__field-form">
<el-form-item prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</div>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">保存</el-button>
<template #hint>
{{ editId == null ? '仓库编码保存后自动生成' : `仓库编码:${form.code || '-'}` }}
</template>
</el-dialog>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</TaskPanelDialog>
<!-- 接口配置 新增 / 编辑:基础信息 + 配置项(分组硬编码,配置项值单独接口整体覆盖保存) -->
<el-dialog
<TaskPanelDialog
v-model="apiDialogVisible"
:title="apiEditId == null ? '新增接口配置' : '编辑接口配置'"
width="760px"
append-to-body
subtitle="基础地址随接口类型自动带出;每个仓库只能配置一个接口"
width="min(880px, 96vw)"
body-max-height="60vh"
>
<el-form
ref="apiFormRef"
:model="apiFormModel"
:rules="apiRules"
label-position="top"
class="api-form"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="config-base">
<el-form-item label="配置名称" prop="name">
<el-input v-model="apiForm.name" placeholder="如 出库推送接口" />
</el-form-item>
<el-form-item label="接口类型">
<el-select v-model="apiForm.type" style="width: 100%" @change="onApiTypeChange">
<el-option
v-for="opt in API_TYPE_OPTIONS"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
</el-form-item>
<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-form-item prop="name">
<el-input v-model="apiForm.name" 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-select v-model="apiForm.type" style="width: 100%" @change="onApiTypeChange">
<el-option
v-for="opt in API_TYPE_OPTIONS"
:key="opt.value"
:label="opt.label"
:value="opt.value"
/>
</el-select>
</div>
</div>
<!-- 基础地址由接口类型自动带出,表单里不展示(保存时按类型预设写入) -->
<el-form-item label="应用Key" prop="app_key">
<el-input v-model="apiForm.app_key" placeholder="选填" />
</el-form-item>
<el-form-item label="应用密钥" prop="app_secret">
<el-input v-model="apiForm.app_secret" type="password" show-password placeholder="选填" />
</el-form-item>
<el-form-item label="对外回调地址" class="config-base-full">
<div class="callback-cell">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">应用Key</span>
<div class="task-panel__field-form">
<el-form-item prop="app_key">
<el-input v-model="apiForm.app_key" 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="app_secret">
<el-input v-model="apiForm.app_secret" type="password" show-password placeholder="选填" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--full task-panel__field--control">
<span class="task-panel__field-label">回调地址</span>
<div class="task-panel__field-form task-panel__field-form--row">
<span v-if="apiForm.callback_url" class="callback-url" :title="apiForm.callback_url">
{{ apiForm.callback_url }}
</span>
<span v-else class="hint">保存后展示</span>
<el-button v-if="apiForm.callback_url" link type="primary" @click="copyText(apiForm.callback_url)">复制</el-button>
<span v-else class="task-panel__field-hint">保存后展示</span>
<el-button
v-if="apiForm.callback_url"
size="small"
link
type="primary"
@click="copyText(apiForm.callback_url)"
>
复制
</el-button>
</div>
<div class="hint">外部系统(WMS/第三方)以 POST 调用该地址回调 OMS,query 需携带 method / app_key / timestamp / sign,报文为业务 JSON</div>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="apiForm.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark" class="config-base-full">
<el-input v-model="apiForm.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</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="apiForm.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--full task-panel__field--input task-panel__field--textarea">
<span class="task-panel__field-label">备注</span>
<div class="task-panel__field-form">
<el-form-item prop="remark">
<el-input v-model="apiForm.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</div>
</div>
</div>
<el-divider content-position="left">配置项</el-divider>
<FieldValueForm v-model="configFieldValues" :groups="configFieldGroups" :fields="configFieldDefs" />
<p class="task-panel__form-tip">
外部系统(WMS/第三方)以 POST 调用回调地址通知 OMS,query 需携带 method / app_key / timestamp / sign,报文为业务 JSON。
</p>
<div class="task-panel__section">配置项</div>
<div class="config-fields">
<FieldValueForm v-model="configFieldValues" :groups="configFieldGroups" :fields="configFieldDefs" />
</div>
</el-form>
<template #footer>
<el-button @click="apiDialogVisible = false">取消</el-button>
<el-button type="primary" :loading="apiSubmitting" @click="submitApiForm">保存</el-button>
<template #hint>
{{ apiEditId == null ? '保存后按配置项推送,可随时修改' : '配置项保存后整体覆盖' }}
</template>
</el-dialog>
<template #actions>
<el-button size="small" @click="apiDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="apiSubmitting" @click="submitApiForm">保存</el-button>
</template>
</TaskPanelDialog>
<!-- 快递映射 新增 / 编辑:自定义编码(外部传入)→ 默认快递编码(快递公司字典) -->
<el-dialog
<TaskPanelDialog
v-model="mappingDialogVisible"
:title="mappingEditId == null ? '新增快递映射' : '编辑快递映射'"
width="520px"
append-to-body
subtitle="外部回传的快递编码按「自定义编码 → 默认快递编码」解析"
width="min(560px, 92vw)"
body-max-height="60vh"
>
<el-form ref="mappingFormRef" :model="mappingForm" :rules="mappingRules" label-width="110px">
<el-form-item label="默认快递" prop="express_code">
<el-select
v-model="mappingForm.express_code"
filterable
placeholder="请选择快递公司(OMS 默认编码)"
style="width: 100%"
>
<el-option v-for="c in expressCompanies" :key="c.code" :label="`${c.name}(${c.code})`" :value="c.code" />
</el-select>
</el-form-item>
<el-form-item label="自定义编码" prop="custom_code">
<el-input v-model="mappingForm.custom_code" placeholder="外部传入的快递编码,如 SF.KY / KYSF" />
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="mappingForm.status">
<el-radio :value="1">启用</el-radio>
<el-radio :value="0">禁用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="mappingForm.remark" placeholder="选填" />
</el-form-item>
<el-form
ref="mappingFormRef"
:model="mappingForm"
:rules="mappingRules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__grid task-panel__grid--single">
<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="express_code">
<el-select
v-model="mappingForm.express_code"
filterable
placeholder="请选择快递公司(OMS 默认编码)"
style="width: 100%"
>
<el-option
v-for="c in expressCompanies"
:key="c.code"
:label="`${c.name}(${c.code})`"
:value="c.code"
/>
</el-select>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">自定义编码</span>
<div class="task-panel__field-form">
<el-form-item prop="custom_code">
<el-input v-model="mappingForm.custom_code" placeholder="外部传入的快递编码,如 SF.KY / KYSF" />
</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">
<el-radio-group v-model="mappingForm.status">
<el-radio :value="1">启用</el-radio>
<el-radio :value="0">禁用</el-radio>
</el-radio-group>
</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="mappingForm.remark" placeholder="选填" />
</div>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="mappingDialogVisible = false">取消</el-button>
<el-button type="primary" :loading="mappingSubmitting" @click="submitMappingForm">保存</el-button>
<template #hint>未配映射的编码按快递公司字典允许兜底解析</template>
<template #actions>
<el-button size="small" @click="mappingDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="mappingSubmitting" @click="submitMappingForm">保存</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
</el-card>
</template>
@ -1672,19 +1822,28 @@ onMounted(async () => {
color: var(--el-text-color-secondary);
font-size: 13px;
}
.api-form {
max-height: 66vh;
overflow-y: auto;
padding-right: 6px;
/* 接口配置:配置项由 FieldValueForm 按分组渲染,分组标题/字段标签对齐面板风格 */
.config-fields :deep(.field-group .group-title) {
padding: 0;
margin: 0 0 4px;
border-bottom: none;
font-size: 12px;
font-weight: 500;
color: var(--el-text-color-regular);
}
/* 接口配置的基础信息两列排布,配置项由 FieldValueForm 按分组渲染 */
.config-base {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
column-gap: 16px;
.config-fields :deep(.field-group + .field-group) {
margin-top: 12px;
}
.config-base .config-base-full {
grid-column: 1 / -1;
.config-fields :deep(.group-hint) {
margin: 0 0 6px;
}
.config-fields :deep(.el-form-item) {
margin-bottom: 10px;
}
.config-fields :deep(.el-form-item__label) {
font-size: 12px;
color: var(--el-text-color-regular);
padding-bottom: 4px;
}
.detail-tabs {
flex: 1;

View File

@ -3,6 +3,7 @@ import { computed, reactive, ref, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE } from '@/composables/useListPage'
import { formatDateTime } from '@/utils/datetime'
import { getExpressCodeOptions, type ExpressCodeOption } from '@/api/customExpressCode'
@ -205,7 +206,7 @@ async function runSync(manual = false) {
await ElMessageBox.confirm(
`当前有 ${dirtyItems.value.length} 条未保存的设置,重新拉取会丢弃这些修改,是否继续?`,
'重新拉取',
{ type: 'warning', confirmButtonText: '继续', cancelButtonText: '取消' },
{ type: 'warning', confirmButtonText: '继续', cancelButtonText: '取消', customClass: 'app-confirm-box' },
)
} catch {
return
@ -336,17 +337,20 @@ watch(
</script>
<template>
<el-dialog v-model="visible" :title="dialogTitle" width="1180px" top="5vh" destroy-on-close>
<el-alert
type="info"
show-icon
:closable="false"
class="tip"
title="列表展示已落库的数据,点击「从平台同步数据」才会重新拉取。平台侧已删除的接口会保留并标记「已失效」;同一账号、同一平台内一个快递编码只能绑定一个模板,不同平台互不影响(可绑定相同编码)。回读时按账号 + 平台 + 编码定位。"
/>
<TaskPanelDialog
v-model="visible"
:title="dialogTitle"
subtitle="展示已落库的快递接口,可绑定自定义快递编码;平台侧删除的接口标记为已失效"
width="min(1180px, 96vw)"
body-max-height="68vh"
>
<div class="task-panel__form">
<p class="task-panel__form-tip">
列表展示已落库的数据,点击「从平台同步数据」才会重新拉取。平台侧已删除的接口会保留并标记「已失效」;同一账号、同一平台内一个快递编码只能绑定一个模板,不同平台互不影响(可绑定相同编码)。回读时按账号 + 平台 + 编码定位。
</p>
<div class="toolbar">
<el-form :inline="true" size="small" class="filters" @submit.prevent>
<div class="toolbar">
<el-form :inline="true" size="small" class="filters" @submit.prevent>
<el-form-item label="状态">
<el-select v-model="query.status" placeholder="全部" clearable style="width: 110px" @change="search">
<el-option label="有效" :value="1" />
@ -383,8 +387,8 @@ watch(
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button @click="resetQuery">重置</el-button>
<el-button size="small" type="primary" @click="search">查询</el-button>
<el-button size="small" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<div class="toolbar-right">
@ -395,7 +399,8 @@ watch(
</div>
</div>
<DataTable :loading="loading || syncing" :data="list" height="430">
<div class="task-panel__table">
<DataTable :loading="loading || syncing" :data="list" height="430">
<el-table-column label="平台" width="100">
<template #default="{ row }">
<el-tag size="small" effect="plain">{{ row.platform_name || row.platform_code || '-' }}</el-tag>
@ -471,50 +476,73 @@ watch(
</el-button>
</template>
</el-table-column>
</DataTable>
<ListPager
:total="total"
:elapsed="elapsed"
:page="query.page"
:page-size="query.pageSize"
@page-change="handlePageChange"
@size-change="handleSizeChange"
/>
<template #footer>
<div class="footer-bar">
<span class="footer-hint">失效记录仅保留展示与绑定关系,不参与回读定位。</span>
<div>
<el-button @click="visible = false">关闭</el-button>
<el-button type="primary" :disabled="!dirtyItems.length" :loading="saving" @click="save">
保存设置{{ dirtyItems.length ? `(${dirtyItems.length})` : '' }}
</el-button>
</div>
</DataTable>
</div>
<ListPager
:total="total"
:elapsed="elapsed"
:page="query.page"
:page-size="query.pageSize"
@page-change="handlePageChange"
@size-change="handleSizeChange"
/>
</div>
<template #hint>失效记录仅保留展示与绑定关系,不参与回读定位。</template>
<template #actions>
<el-button size="small" @click="visible = false">关闭</el-button>
<el-button size="small" type="primary" :disabled="!dirtyItems.length" :loading="saving" @click="save">
保存设置{{ dirtyItems.length ? `(${dirtyItems.length})` : '' }}
</el-button>
</template>
<!-- 明细:单独请求平台接口 -->
<el-drawer v-model="detailVisible" title="快递接口明细" size="560px">
<template v-if="detailRow">
<el-descriptions v-loading="detailLoading" :column="1" border size="small">
<el-descriptions-item label="平台">{{ detailRow.platform_name || detailRow.platform_code || '-' }}</el-descriptions-item>
<el-descriptions-item label="店铺">{{ detailRow.shop_name || '-' }}</el-descriptions-item>
<el-descriptions-item label="接口">{{ detailRow.template_name || '-' }}</el-descriptions-item>
<el-descriptions-item label="模板ID">{{ detailRow.template_id }}</el-descriptions-item>
<el-descriptions-item label="平台快递">
{{ detailRow.express_company_name || '-' }}
<span v-if="detailRow.express_company_code">({{ detailRow.express_company_code }})</span>
</el-descriptions-item>
<el-descriptions-item label="自定义编码">{{ detailRow.custom_code || '-' }}</el-descriptions-item>
</el-descriptions>
<TaskPanelDialog
v-model="detailVisible"
title="快递接口明细"
:subtitle="detailRow ? `${detailRow.platform_name || detailRow.platform_code || '-'} · ${detailRow.template_name || '-'}` : ''"
width="min(560px, 92vw)"
body-max-height="62vh"
>
<div v-if="detailRow" v-loading="detailLoading" class="task-panel__form">
<div class="task-panel__grid task-panel__grid--single">
<div class="task-panel__field">
<span class="task-panel__field-label">平台</span>
<strong class="task-panel__field-value">{{ detailRow.platform_name || detailRow.platform_code || '-' }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">店铺</span>
<strong class="task-panel__field-value">{{ detailRow.shop_name || '-' }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">接口</span>
<strong class="task-panel__field-value">{{ detailRow.template_name || '-' }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">模板ID</span>
<strong class="task-panel__field-value">{{ detailRow.template_id }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">平台快递</span>
<strong class="task-panel__field-value">
{{ detailRow.express_company_name || '-' }}
<span v-if="detailRow.express_company_code">({{ detailRow.express_company_code }})</span>
</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">自定义编码</span>
<strong class="task-panel__field-value">{{ detailRow.custom_code || '-' }}</strong>
</div>
</div>
<el-divider content-position="left">平台明细</el-divider>
<el-descriptions v-if="detailFields.length" :column="1" border size="small">
<el-descriptions-item v-for="field in detailFields" :key="field.label" :label="field.label">
{{ field.value }}
</el-descriptions-item>
</el-descriptions>
<div class="task-panel__section">平台明细</div>
<div v-if="detailFields.length" class="task-panel__grid task-panel__grid--single">
<div v-for="field in detailFields" :key="field.label" class="task-panel__field">
<span class="task-panel__field-label">{{ field.label }}</span>
<strong class="task-panel__field-value">{{ field.value }}</strong>
</div>
</div>
<el-empty v-else :image-size="60" description="平台未返回可用字段,可查看下方原始返回" />
<el-collapse class="raw-collapse">
@ -522,15 +550,16 @@ watch(
<pre class="raw-json">{{ detailRaw || '无' }}</pre>
</el-collapse-item>
</el-collapse>
</div>
<template #actions>
<el-button size="small" @click="detailVisible = false">关闭</el-button>
</template>
</el-drawer>
</el-dialog>
</TaskPanelDialog>
</TaskPanelDialog>
</template>
<style scoped>
.tip {
margin-bottom: 8px;
}
.toolbar {
display: flex;
align-items: flex-start;
@ -571,16 +600,6 @@ watch(
.dirty-tag {
flex: 0 0 auto;
}
.footer-bar {
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
}
.footer-hint {
font-size: 12px;
color: var(--el-text-color-secondary);
}
.raw-collapse {
margin-top: 8px;
}

View File

@ -23,6 +23,7 @@ import {
} from '@/api/externalPrintAccount'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import ExpressInterfaceDialog from './ExpressInterfaceDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import { getPrincipalSubsidiaryOptions } from '@/api/principalSubsidiary'
@ -153,7 +154,7 @@ async function handleDelete(row: ExternalPrintAccountItem) {
await ElMessageBox.confirm(
`确认删除「${row.platform?.name || platformName(row.platform_id)}」下的账号「${row.account}」?`,
'删除确认',
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' },
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消', customClass: 'app-confirm-box' },
)
} catch {
return
@ -500,105 +501,146 @@ onBeforeUnmount(() => {
@size-change="handleSizeChange"
/>
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="480px">
<el-form ref="formRef" :model="form" :rules="rules" label-width="96px">
<el-form-item label="打单平台" prop="platform_id">
<el-select v-model="form.platform_id" placeholder="请选择" style="width: 100%">
<el-option v-for="p in platforms" :key="p.id" :label="platformOptionLabel(p)" :value="p.id" />
</el-select>
</el-form-item>
<el-form-item label="账号" prop="account">
<el-input v-model="form.account" placeholder="外部打单平台登录账号" />
</el-form-item>
<el-form-item label="密码" prop="password">
<el-input
v-model="form.password"
type="password"
show-password
:placeholder="editId == null ? '外部打单平台登录密码' : '留空表示不修改密码'"
/>
</el-form-item>
<TaskPanelDialog
v-model="dialogVisible"
:title="dialogTitle"
subtitle="外部打单平台的登录账号,用于同步店铺与快递接口"
width="min(560px, 92vw)"
body-max-height="60vh"
>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__grid task-panel__grid--single">
<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="platform_id">
<el-select v-model="form.platform_id" placeholder="请选择" style="width: 100%">
<el-option v-for="p in platforms" :key="p.id" :label="platformOptionLabel(p)" :value="p.id" />
</el-select>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">账号</span>
<div class="task-panel__field-form">
<el-form-item prop="account">
<el-input v-model="form.account" placeholder="外部打单平台登录账号" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label" :class="{ 'is-required': editId == null }">密码</span>
<div class="task-panel__field-form">
<el-form-item prop="password">
<el-input
v-model="form.password"
type="password"
show-password
:placeholder="editId == null ? '外部打单平台登录密码' : '留空表示不修改密码'"
/>
</el-form-item>
</div>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">确定</el-button>
<template #hint>密码在修改时留空表示不修改</template>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">确定</el-button>
</template>
</el-dialog>
<el-dialog
</TaskPanelDialog>
<TaskPanelDialog
v-model="shopsDialogVisible"
:title="shopsAccount ? `店铺列表 - ${shopsAccount.account}` : '店铺列表'"
width="920px"
top="6vh"
subtitle="勾选平台店铺,选择所属货主后添加到本系统"
width="min(980px, 96vw)"
body-max-height="64vh"
>
<el-radio-group
v-if="shopSources.length > 1"
v-model="merchantQuery.source"
class="shop-source-tabs"
@change="changeShopSource"
>
<el-radio-button v-for="item in shopSources" :key="item.code" :value="item.code">
{{ item.name }}
</el-radio-button>
</el-radio-group>
<div class="task-panel__form">
<el-radio-group
v-if="shopSources.length > 1"
v-model="merchantQuery.source"
class="shop-source-tabs"
@change="changeShopSource"
>
<el-radio-button v-for="item in shopSources" :key="item.code" :value="item.code">
{{ item.name }}
</el-radio-button>
</el-radio-group>
<el-form :inline="true" class="merchant-search">
<el-form-item label="关键词">
<el-input
v-model="merchantQuery.keyword"
placeholder="店铺名称/手机号"
clearable
@keyup.enter="searchMerchants"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchMerchants">查询</el-button>
</el-form-item>
</el-form>
<el-form :inline="true" class="merchant-search">
<el-form-item label="关键词">
<el-input
v-model="merchantQuery.keyword"
placeholder="店铺名称/手机号"
clearable
@keyup.enter="searchMerchants"
/>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="searchMerchants">查询</el-button>
</el-form-item>
</el-form>
<DataTable
class="merchant-table"
:height="merchantTableHeight"
:loading="merchantLoading"
:data="merchantList"
@selection-change="handleMerchantSelection"
>
<el-table-column type="selection" width="45" :selectable="canSelectMerchant" />
<el-table-column prop="name" label="店铺名称" min-width="160" show-overflow-tooltip />
<el-table-column prop="platform_name" label="平台" width="110">
<template #default="{ row }">{{ row.platform_name || '-' }}</template>
</el-table-column>
<el-table-column prop="contact_name" label="联系人" width="110" />
<el-table-column prop="contact_phone" label="联系电话" width="120" />
<el-table-column label="状态" width="100">
<template #default="{ row }">
<el-tag :type="row.status === 0 ? 'info' : 'success'">
{{ row.status_label || (row.status === 0 ? '停用' : '正常') }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="服务到期时间" width="160">
<template #default="{ row }">{{ row.auth_time || '-' }}</template>
</el-table-column>
<el-table-column label="是否已添加" width="110">
<template #default="{ row }">
<el-tag :type="row.added ? 'success' : 'info'">{{ row.added ? '已添加' : '未添加' }}</el-tag>
</template>
</el-table-column>
</DataTable>
<div class="task-panel__table">
<DataTable
class="merchant-table"
:height="merchantTableHeight"
:loading="merchantLoading"
:data="merchantList"
@selection-change="handleMerchantSelection"
>
<el-table-column type="selection" width="45" :selectable="canSelectMerchant" />
<el-table-column prop="name" label="店铺名称" min-width="160" show-overflow-tooltip />
<el-table-column prop="platform_name" label="平台" width="110">
<template #default="{ row }">{{ row.platform_name || '-' }}</template>
</el-table-column>
<el-table-column prop="contact_name" label="联系人" width="110" />
<el-table-column prop="contact_phone" label="联系电话" width="120" />
<el-table-column label="状态" width="100">
<template #default="{ row }">
<el-tag :type="row.status === 0 ? 'info' : 'success'">
{{ row.status_label || (row.status === 0 ? '停用' : '正常') }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="服务到期时间" width="160">
<template #default="{ row }">{{ row.auth_time || '-' }}</template>
</el-table-column>
<el-table-column label="是否已添加" width="110">
<template #default="{ row }">
<el-tag :type="row.added ? 'success' : 'info'">{{ row.added ? '已添加' : '未添加' }}</el-tag>
</template>
</el-table-column>
</DataTable>
</div>
<ListPager
:total="merchantTotal"
:page="merchantQuery.page"
:page-size="merchantQuery.pageSize"
@page-change="handleMerchantPageChange"
@size-change="handleMerchantSizeChange"
/>
<ListPager
:total="merchantTotal"
:page="merchantQuery.page"
:page-size="merchantQuery.pageSize"
@page-change="handleMerchantPageChange"
@size-change="handleMerchantSizeChange"
/>
</div>
<template #footer>
<template #hint>已选 {{ selectedMerchants.length }} 项</template>
<template #actions>
<span class="merchant-owner">
所属货主
<el-select
v-model="merchantSubsidiaryId"
size="small"
placeholder="请选择货主"
filterable
style="width: 180px"
@ -606,9 +648,9 @@ onBeforeUnmount(() => {
<el-option v-for="s in subsidiaryOptions" :key="s.id" :label="s.name" :value="s.id" />
</el-select>
</span>
<span class="merchant-selected">已选 {{ selectedMerchants.length }} 项</span>
<el-button @click="shopsDialogVisible = false">取消</el-button>
<el-button size="small" @click="shopsDialogVisible = false">取消</el-button>
<el-button
size="small"
type="primary"
:loading="addingShops"
:disabled="!selectedMerchants.length || !merchantSubsidiaryId"
@ -617,7 +659,7 @@ onBeforeUnmount(() => {
添加到店铺
</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
<!-- 快递接口:打开读取已落库数据,可手动同步并绑定快递编码 -->
<ExpressInterfaceDialog v-model="expressVisible" :account="expressAccount" />
@ -661,22 +703,20 @@ onBeforeUnmount(() => {
margin-bottom: 12px;
}
.shop-source-tabs {
margin-bottom: 12px;
margin-bottom: 0;
}
.merchant-search {
margin-bottom: 8px;
margin-bottom: 0;
}
.merchant-table {
width: 100%;
}
.merchant-owner {
margin-right: 12px;
font-size: 12px;
color: var(--el-text-color-secondary);
}
.merchant-selected {
margin-right: 12px;
display: inline-flex;
align-items: center;
gap: 6px;
font-size: 12px;
color: var(--el-text-color-secondary);
white-space: nowrap;
}
</style>

View File

@ -273,177 +273,237 @@ onMounted(async () => {
<template #header>
<div class="page-header">
<span>创建入库单</span>
<div>
<el-button @click="handleReset">重置</el-button>
<el-button @click="cancel">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submit">保存</el-button>
<div class="page-actions">
<el-button size="small" @click="handleReset">重置</el-button>
<el-button size="small" @click="cancel">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submit">保存</el-button>
</div>
</div>
</template>
<div class="page-scroll">
<el-form ref="formRef" :model="form" :rules="rules" size="small" label-width="96px" class="compact-form">
<el-divider content-position="left">单据信息</el-divider>
<el-row :gutter="16">
<el-col :span="6">
<el-form-item label="仓库" prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="selectableWarehouses"
label-key="name"
value-key="id"
placeholder="请选择仓库"
clearable
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="入库类型">
<el-select v-model="form.inbound_type" style="width: 100%">
<el-option v-for="o in TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商">
<el-input v-model="form.supplier" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商编码">
<el-input v-model="form.supplier_code" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="采购单号">
<el-input v-model="form.purchase_order_code" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据金额">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input v-model="form.express_code" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物流公司">
<el-select
v-model="form.logistics_code"
placeholder="选填,推送为 logisticsCode"
clearable
filterable
style="width: 100%"
@change="handleExpressChange"
>
<el-option v-for="c in expressCompanies" :key="c.code" :label="`${c.name}(${c.code})`" :value="c.code" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="操作时间">
<el-date-picker
v-model="form.operate_time"
type="datetime"
placeholder="选填"
style="width: 100%"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="预计到货">
<el-date-picker
v-model="form.expect_start_time"
type="datetime"
placeholder="选填"
style="width: 100%"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="最迟到货">
<el-date-picker
v-model="form.expect_end_time"
type="datetime"
placeholder="选填"
style="width: 100%"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<el-input v-model="form.remark" placeholder="选填" />
</el-form-item>
</el-col>
</el-row>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form create-form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__section">单据信息</div>
<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-form-item prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="selectableWarehouses"
label-key="name"
value-key="id"
placeholder="请选择仓库"
clearable
style="width: 100%"
/>
</el-form-item>
</div>
</div>
<el-divider content-position="left">商品明细</el-divider>
<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="inbound_type">
<el-select v-model="form.inbound_type" style="width: 100%">
<el-option v-for="o in TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.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="supplier">
<el-input v-model="form.supplier" 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="supplier_code">
<el-input v-model="form.supplier_code" 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="purchase_order_code">
<el-input v-model="form.purchase_order_code" 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="total_amount">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" 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="express_code">
<el-input v-model="form.express_code" 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="logistics_code">
<el-select
v-model="form.logistics_code"
placeholder="选填,推送为 logisticsCode"
clearable
filterable
style="width: 100%"
@change="handleExpressChange"
>
<el-option v-for="c in expressCompanies" :key="c.code" :label="`${c.name}(${c.code})`" :value="c.code" />
</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="operate_time">
<el-date-picker
v-model="form.operate_time"
type="datetime"
placeholder="选填"
style="width: 100%"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</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="expect_start_time">
<el-date-picker
v-model="form.expect_start_time"
type="datetime"
placeholder="选填"
style="width: 100%"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</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="expect_end_time">
<el-date-picker
v-model="form.expect_end_time"
type="datetime"
placeholder="选填"
style="width: 100%"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</div>
</div>
<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-form-item prop="remark">
<el-input v-model="form.remark" placeholder="选填" />
</el-form-item>
</div>
</div>
</div>
<div class="task-panel__section">商品明细</div>
<div class="items-toolbar">
<span class="items-title">共 {{ lines.length }} 项</span>
<span class="items-total">合计金额:{{ itemsTotal.toFixed(2) }}</span>
<el-button type="primary" size="small" @click="addLine">添加商品</el-button>
<el-button size="small" type="primary" @click="addLine">添加商品</el-button>
</div>
<div v-if="warehouseOwnerId !== null || goodsOwnerId !== null" class="items-tip">
<p
v-if="warehouseOwnerId !== null || goodsOwnerId !== null"
class="task-panel__form-tip"
>
{{ warehouseOwnerId !== null
? '明细商品仅可选与仓库同货主(所属公司)的商品'
: '已按所选商品的货主(所属公司)过滤可选仓库' }}
</p>
<div class="task-panel__table">
<el-table :data="lines" size="small" border max-height="320">
<el-table-column label="商品" min-width="170">
<template #default="{ row, $index }">
<ProductSelect
v-model="row.product_id"
:subsidiary-id="scopeSubsidiaryId"
:before-select="(p: ProductSearchItem) => canPickGoods(p.subsidiary_id, $index)"
@select="(p: ProductSearchItem) => onLineProductSelect($index, p)"
/>
</template>
</el-table-column>
<el-table-column label="商品编码" width="120">
<template #default="{ row }">
<el-input v-model="row.code" size="small" placeholder="自动带出" />
</template>
</el-table-column>
<el-table-column label="商品名称" min-width="140">
<template #default="{ row }">
<el-input v-model="row.name" size="small" placeholder="自动带出" />
</template>
</el-table-column>
<el-table-column label="库存类型" width="110">
<template #default="{ row }">
<el-select v-model="row.inventory_type" size="small" style="width: 100%">
<el-option v-for="o in INVENTORY_TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="数量" width="100">
<template #default="{ row }">
<el-input-number v-model="row.quantity" :min="0" :precision="3" size="small" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="单价" width="110">
<template #default="{ row }">
<el-input-number v-model="row.price" :min="0" :precision="2" size="small" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="金额" width="100" align="right">
<template #default="{ row }">
{{ ((Number(row.quantity) || 0) * (Number(row.price) || 0)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="操作" width="64" fixed="right">
<template #default="{ $index }">
<el-button link type="danger" size="small" @click="removeLine($index)">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<el-table :data="lines" size="small" border max-height="240">
<el-table-column label="商品" min-width="170">
<template #default="{ row, $index }">
<ProductSelect
v-model="row.product_id"
:subsidiary-id="scopeSubsidiaryId"
:before-select="(p: ProductSearchItem) => canPickGoods(p.subsidiary_id, $index)"
@select="(p: ProductSearchItem) => onLineProductSelect($index, p)"
/>
</template>
</el-table-column>
<el-table-column label="商品编码" width="120">
<template #default="{ row }">
<el-input v-model="row.code" placeholder="自动带出" />
</template>
</el-table-column>
<el-table-column label="商品名称" min-width="140">
<template #default="{ row }">
<el-input v-model="row.name" placeholder="自动带出" />
</template>
</el-table-column>
<el-table-column label="库存类型" width="110">
<template #default="{ row }">
<el-select v-model="row.inventory_type" style="width: 100%">
<el-option v-for="o in INVENTORY_TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="数量" width="100">
<template #default="{ row }">
<el-input-number v-model="row.quantity" :min="0" :precision="3" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="单价" width="110">
<template #default="{ row }">
<el-input-number v-model="row.price" :min="0" :precision="2" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="金额" width="100" align="right">
<template #default="{ row }">
{{ ((Number(row.quantity) || 0) * (Number(row.price) || 0)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="操作" width="64" fixed="right">
<template #default="{ $index }">
<el-button link type="danger" @click="removeLine($index)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</el-card>
@ -456,36 +516,23 @@ onMounted(async () => {
justify-content: space-between;
font-weight: 600;
}
/* 紧凑排版:压缩表单项行距、分割线边距与卡片内边距(与创建发货单一致) */
.compact-form :deep(.el-form-item) {
margin-bottom: 6px;
/* 头部操作按钮:与表单面板底部一致(small / gap 6) */
.page-actions {
display: flex;
align-items: center;
gap: 6px;
}
.compact-form :deep(.el-form-item__label) {
padding-right: 6px;
/* 页面型表单:分组之间留出比弹窗更大的间距 */
.create-form .task-panel__section {
margin-top: 12px;
}
/* 数值字段(金额)不必占满整列 */
.compact-form :deep(.el-input-number) {
max-width: 124px;
.create-form .task-panel__section:first-child {
margin-top: 0;
}
/* 明细表格内控件本身列宽已很窄,不做限制 */
.compact-form :deep(.el-table .el-input-number) {
max-width: none;
}
.compact-form :deep(.el-table .cell) {
.create-form :deep(.el-table .cell) {
padding: 0 6px;
}
.compact-form :deep(.el-divider--horizontal) {
margin: 6px 0 8px;
}
.compact-form :deep(.el-divider__text) {
font-size: 13px;
font-weight: 600;
color: #303133;
}
.compact-form :deep(.el-collapse) {
margin-top: 8px;
border-top: none;
}
.create-card {
flex: 1;
min-height: 0;
@ -507,24 +554,22 @@ onMounted(async () => {
flex: 1;
min-height: 0;
overflow-y: auto;
padding-right: 4px;
}
.items-toolbar {
display: flex;
align-items: center;
gap: 12px;
margin-bottom: 8px;
}
.items-title {
color: #606266;
font-size: 13px;
font-size: 12px;
line-height: 18px;
}
.items-total {
font-size: 12px;
line-height: 18px;
font-weight: 600;
color: #303133;
}
.items-tip {
margin-bottom: 6px;
color: var(--el-text-color-secondary);
font-size: 12px;
}
</style>

View File

@ -16,6 +16,8 @@ import ExportButton from '@/components/ExportButton.vue'
import ProductSelect from '@/components/ProductSelect.vue'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import ReasonPromptDialog from '@/components/ReasonPromptDialog.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import VirtualSelect from '@/components/VirtualSelect.vue'
import { getPrincipalSubsidiaryOptions } from '@/api/principalSubsidiary'
@ -224,7 +226,7 @@ async function transit(action: 'audit' | 'push' | 'complete' | 'cancel' | 'resto
async function handleDelete(row: InboundOrder) {
try {
await ElMessageBox.confirm(`确认删除入库单「${row.bill_no}」?`, '删除确认', {
type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消',
type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消', customClass: 'app-confirm-box',
})
} catch { return }
try {
@ -240,23 +242,30 @@ async function handleDelete(row: InboundOrder) {
}
}
/** 作废:仅「已审核(2)」可作废,需确认并可填写作废原因;作废后不可恢复 */
const voidPrompt = reactive({ visible: false, subtitle: '' })
let voidResolver: ((value: string | null) => void) | null = null
function askVoidReason(row: InboundOrder): Promise<string | null> {
voidPrompt.subtitle = `确认作废入库单「${row.bill_no}」?`
voidPrompt.visible = true
return new Promise<string | null>((resolve) => {
voidResolver = resolve
})
}
function onVoidConfirm(value: string) {
voidResolver?.(value)
voidResolver = null
}
function onVoidCancel() {
voidResolver?.(null)
voidResolver = null
}
async function handleVoid(row: InboundOrder) {
let reason = ''
try {
const res = await ElMessageBox.prompt(
`确认作废入库单「${row.bill_no}」?作废后不可恢复。`,
'作废确认',
{
type: 'warning',
confirmButtonText: '确认作废',
cancelButtonText: '取消',
inputType: 'textarea',
inputPlaceholder: '作废原因(选填)',
inputValidator: () => true,
},
)
reason = (res.value || '').trim()
} catch { return }
const reason = await askVoidReason(row)
if (reason === null) return
try {
await inboundOrderApi.voidOrder(row.id, reason ? { void_reason: reason } : {})
ElMessage.success('已作废')
@ -273,7 +282,7 @@ async function handleReject(row: InboundOrder) {
: `确认驳回入库单「${row.bill_no}」?驳回后回到「待入库」并自动加单号后缀(如 _1),可重新编辑后再次审核。`
try {
await ElMessageBox.confirm(tip, '驳回确认', {
type: 'warning', confirmButtonText: '确认驳回', cancelButtonText: '取消',
type: 'warning', confirmButtonText: '确认驳回', cancelButtonText: '取消', customClass: 'app-confirm-box',
})
} catch { return }
try {
@ -714,54 +723,79 @@ onMounted(async () => {
</template>
</SplitLayout>
<!-- 新增 / 编辑 对话框 -->
<el-dialog
<!-- 编辑入库单:面板结构对齐其它业务表单 -->
<TaskPanelDialog
v-model="dialogVisible"
:title="'编辑入库单'"
width="880px"
title="编辑入库单"
subtitle="修改单据基础信息与到货时间,保存后按当前状态流转"
width="min(880px, 96vw)"
body-max-height="64vh"
>
<el-form ref="formRef" :model="form" :rules="rules" label-width="110px">
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="仓库" prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="warehouseSelectOptions"
placeholder="请选择仓库"
clearable
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="入库类型">
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__section">单据信息</div>
<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-form-item prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="warehouseSelectOptions"
placeholder="请选择仓库"
clearable
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-select v-model="form.inbound_type" style="width: 100%">
<el-option v-for="o in TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商">
</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="form.supplier" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="供应商编码">
</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="form.supplier_code" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="采购单号">
</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="form.purchase_order_code" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="运单号">
</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="form.express_code" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物流公司">
</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="form.logistics_code"
placeholder="选填,推送为 logisticsCode"
@ -772,40 +806,68 @@ onMounted(async () => {
>
<el-option v-for="c in expressCompanies" :key="c.code" :label="`${c.name}(${c.code})`" :value="c.code" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="操作时间">
</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-date-picker v-model="form.operate_time" type="datetime" placeholder="选填" style="width: 100%" value-format="YYYY-MM-DD HH:mm:ss" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="预计到货">
</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-date-picker v-model="form.expect_start_time" type="datetime" placeholder="选填" style="width: 100%" value-format="YYYY-MM-DD HH:mm:ss" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最迟到货">
</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-date-picker v-model="form.expect_end_time" type="datetime" placeholder="选填" style="width: 100%" value-format="YYYY-MM-DD HH:mm:ss" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单据金额">
</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-number v-model="form.total_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注">
</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="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</el-col>
</el-row>
</div>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">保存</el-button>
<template #hint>带 * 为必填项</template>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
<!-- 作废原因输入 -->
<ReasonPromptDialog
v-model="voidPrompt.visible"
title="作废确认"
:subtitle="voidPrompt.subtitle"
tip="作废后不可恢复,单据不可再流转。"
label="作废原因"
placeholder="作废原因(选填)"
multiline
confirm-text="确认作废"
confirm-type="danger"
hint="作废原因会记录在单据上"
@confirm="onVoidConfirm"
@cancel="onVoidCancel"
/>
</el-card>
</template>

View File

@ -37,6 +37,8 @@ import { getExpressCompanyOptions, type ExpressCompanyOption } from '@/api/expre
import SplitLayout from '@/components/SplitLayout.vue'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import ReasonPromptDialog from '@/components/ReasonPromptDialog.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import VirtualTable from '@/components/VirtualTable.vue'
import VirtualSelect from '@/components/VirtualSelect.vue'
@ -620,20 +622,35 @@ async function handleRestore(row: OrderDelivery) {
}
}
/* -------------------- 原因输入面板(作废发货单) -------------------- */
const voidPrompt = reactive({
visible: false,
subtitle: '',
})
let voidResolver: ((value: string | null) => void) | null = null
function askVoidReason(row: OrderDelivery): Promise<string | null> {
voidPrompt.subtitle = `确认作废发货单「${row.delivery_order_code}」?`
voidPrompt.visible = true
return new Promise<string | null>((resolve) => {
voidResolver = resolve
})
}
function onVoidConfirm(value: string) {
voidResolver?.(value)
voidResolver = null
}
function onVoidCancel() {
voidResolver?.(null)
voidResolver = null
}
async function handleVoid(row: OrderDelivery) {
let reason = ''
try {
const res = await ElMessageBox.prompt(`作废发货单「${row.delivery_order_code}」,作废后不可恢复。`, '作废确认', {
type: 'warning',
confirmButtonText: '作废',
cancelButtonText: '取消',
inputPlaceholder: '作废原因(选填)',
inputValidator: () => true,
})
reason = res.value || ''
} catch {
return
}
const reason = await askVoidReason(row)
if (reason === null) return
try {
await voidOrderDelivery(row.id, { void_reason: reason })
ElMessage.success('已作废')
@ -655,13 +672,14 @@ async function handleDelete(row: OrderDelivery) {
}
}
/** 统一确认弹窗(取消/关闭返回 false) */
/** 统一确认弹窗(取消/关闭返回 false);按钮尺寸与表单面板底部一致 */
async function confirm(message: string, title: string, confirmText = '确定') {
try {
await ElMessageBox.confirm(message, title, {
type: 'warning',
confirmButtonText: confirmText,
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
return true
} catch {
@ -1065,274 +1083,527 @@ onMounted(async () => {
</template>
</SplitLayout>
<el-dialog
<TaskPanelDialog
v-model="dialogVisible"
:title="'编辑发货单'"
width="760px"
:close-on-click-modal="false"
title="编辑发货单"
subtitle="修改单据基础信息与收件人资料,审核前可反复调整"
width="min(880px, 96vw)"
body-max-height="64vh"
>
<div class="form-scroll">
<el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
<el-divider content-position="left">基本信息</el-divider>
<el-form-item v-if="editId != null" label="发货单号">
<el-tag type="info">{{ form.delivery_order_code }}</el-tag>
</el-form-item>
<el-form-item label="店铺" prop="shop_id">
<VirtualSelect
v-model="form.shop_id"
:options="shops"
label-key="name"
value-key="id"
:placeholder="shops.length ? '请选择店铺' : '暂无店铺,请先新建店铺'"
:disabled="!shops.length"
style="width: 100%"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="warehouses"
label-key="name"
value-key="id"
placeholder="请选择仓库"
clearable
style="width: 100%"
/>
</el-form-item>
<el-form-item label="订单类型">
<el-select v-model="form.order_type" style="width: 100%">
<el-option v-for="opt in ORDER_TYPE_OPTIONS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
<el-form-item label="加急">
<el-radio-group v-model="form.is_urgency">
<el-radio value="N">否</el-radio>
<el-radio value="Y">是</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="需要发票">
<el-radio-group v-model="form.invoice_flag">
<el-radio value="N">否</el-radio>
<el-radio value="Y">是</el-radio>
</el-radio-group>
</el-form-item>
<el-form ref="formRef" :model="form" :rules="rules" class="task-panel__form" scroll-to-error @submit.prevent>
<div class="task-panel__section">基本信息</div>
<div class="task-panel__grid">
<div v-if="editId != null" class="task-panel__field task-panel__field--full">
<span class="task-panel__field-label">发货单号</span>
<strong class="task-panel__field-value">{{ form.delivery_order_code }}</strong>
</div>
<el-divider content-position="left">金额</el-divider>
<el-form-item label="订单总金额">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
<el-form-item label="折扣金额">
<el-input-number v-model="form.discount_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
<el-form-item label="快递费用">
<el-input-number v-model="form.freight" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
<el-form-item label="应收金额">
<el-input-number v-model="form.ar_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
<el-form-item label="已收金额">
<el-input-number v-model="form.got_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">店铺</span>
<div class="task-panel__field-form">
<el-form-item prop="shop_id">
<VirtualSelect
v-model="form.shop_id"
:options="shops"
label-key="name"
value-key="id"
:placeholder="shops.length ? '请选择店铺' : '暂无店铺,请先新建店铺'"
:disabled="!shops.length"
style="width: 100%"
/>
</el-form-item>
</div>
</div>
<el-divider content-position="left">快递</el-divider>
<el-form-item label="物流公司">
<el-select
v-model="form.logistics_code"
placeholder="请选择快递公司"
clearable
filterable
style="width: 100%"
@change="handleExpressChange"
>
<el-option
v-for="c in expressCompanies"
:key="c.code"
:label="`${c.name}(${c.code})`"
:value="c.code"
/>
</el-select>
</el-form-item>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">仓库</span>
<div class="task-panel__field-form">
<el-form-item prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="warehouses"
label-key="name"
value-key="id"
placeholder="请选择仓库"
clearable
style="width: 100%"
/>
</el-form-item>
</div>
</div>
<el-divider content-position="left">收件人(receiverInfo)</el-divider>
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="必填,收件人姓名" />
</el-form-item>
<el-form-item label="电话" prop="tel">
<el-input v-model="form.tel" placeholder="tel,与手机至少填一个" />
</el-form-item>
<el-form-item label="手机">
<el-input v-model="form.mobile" placeholder="mobile,与电话至少填一个" />
</el-form-item>
<el-form-item label="邮箱">
<el-input v-model="form.email" placeholder="选填" />
</el-form-item>
<el-form-item label="国家编码">
<el-input v-model="form.country_code" placeholder="选填" />
</el-form-item>
<el-form-item label="省份" prop="province">
<el-input v-model="form.province" placeholder="必填" />
</el-form-item>
<el-form-item label="城市" prop="city">
<el-input v-model="form.city" placeholder="必填" />
</el-form-item>
<el-form-item label="区县" prop="area">
<el-input v-model="form.area" placeholder="必填" />
</el-form-item>
<el-form-item label="街道/镇" prop="town">
<el-input v-model="form.town" placeholder="必填" />
</el-form-item>
<el-form-item label="详细地址">
<el-input v-model="form.detail_address" type="textarea" :rows="2" placeholder="选填,取号必需" />
</el-form-item>
<el-form-item label="邮编">
<el-input v-model="form.zip_code" placeholder="选填" />
</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="order_type">
<el-select v-model="form.order_type" style="width: 100%">
<el-option v-for="opt in ORDER_TYPE_OPTIONS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</div>
</div>
<el-divider content-position="left">留言</el-divider>
<el-form-item label="留言">
<el-input v-model="form.seller_message" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</el-form>
</div>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">保存</el-button>
<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="form.is_urgency">
<el-radio value="N">否</el-radio>
<el-radio value="Y">是</el-radio>
</el-radio-group>
</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="form.invoice_flag">
<el-radio value="N">否</el-radio>
<el-radio value="Y">是</el-radio>
</el-radio-group>
</div>
</div>
</div>
<div class="task-panel__section">金额</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="total_amount">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" 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="discount_amount">
<el-input-number v-model="form.discount_amount" :min="0" :precision="2" 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="freight">
<el-input-number v-model="form.freight" :min="0" :precision="2" 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="ar_amount">
<el-input-number v-model="form.ar_amount" :min="0" :precision="2" 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="got_amount">
<el-input-number v-model="form.got_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
</div>
</div>
</div>
<div class="task-panel__section">快递</div>
<div class="task-panel__grid">
<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-form-item prop="logistics_code">
<el-select
v-model="form.logistics_code"
placeholder="请选择快递公司"
clearable
filterable
style="width: 100%"
@change="handleExpressChange"
>
<el-option
v-for="c in expressCompanies"
:key="c.code"
:label="`${c.name}(${c.code})`"
:value="c.code"
/>
</el-select>
</el-form-item>
</div>
</div>
</div>
<div class="task-panel__section">收件人(receiverInfo)</div>
<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-form-item prop="name">
<el-input v-model="form.name" 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="tel">
<el-input v-model="form.tel" placeholder="tel,与手机至少填一个" />
</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="mobile">
<el-input v-model="form.mobile" placeholder="mobile,与电话至少填一个" />
</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="email">
<el-input v-model="form.email" 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="country_code">
<el-input v-model="form.country_code" placeholder="选填" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">省份</span>
<div class="task-panel__field-form">
<el-form-item prop="province">
<el-input v-model="form.province" placeholder="必填" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">城市</span>
<div class="task-panel__field-form">
<el-form-item prop="city">
<el-input v-model="form.city" placeholder="必填" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">区县</span>
<div class="task-panel__field-form">
<el-form-item prop="area">
<el-input v-model="form.area" placeholder="必填" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">街道/镇</span>
<div class="task-panel__field-form">
<el-form-item prop="town">
<el-input v-model="form.town" 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="zip_code">
<el-input v-model="form.zip_code" placeholder="选填" />
</el-form-item>
</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="detail_address">
<el-input v-model="form.detail_address" type="textarea" :rows="2" placeholder="选填,取号必需" />
</el-form-item>
</div>
</div>
</div>
<div class="task-panel__section">留言</div>
<div class="task-panel__grid">
<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="seller_message">
<el-input v-model="form.seller_message" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</div>
</div>
</div>
</el-form>
<template #hint>仅「待处理」状态的发货单可编辑</template>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
<el-dialog
<TaskPanelDialog
v-model="itemDialogVisible"
:title="itemEditId == null ? '新增明细' : '编辑明细'"
width="560px"
append-to-body
subtitle="选择系统商品后自动带出编码与名称"
width="min(560px, 92vw)"
body-max-height="60vh"
>
<el-form :model="itemForm" label-width="130px">
<el-form-item label="系统商品">
<VirtualSelect
v-model="itemForm.productId"
:options="productSelectOptions"
filterable
clearable
placeholder="选择后自动带出商品编码/名称"
style="width: 100%"
@change="handleProductChange"
/>
</el-form-item>
<el-form-item label="行号">
<el-input v-model="itemForm.order_line_no" placeholder="orderLineNo,缺省按行序号" />
</el-form-item>
<el-form-item label="商品编码">
<el-input v-model="itemForm.item_code" placeholder="itemCode" />
</el-form-item>
<el-form-item label="商品名称">
<el-input v-model="itemForm.item_name" placeholder="itemName" />
</el-form-item>
<el-form-item label="WMS 商品ID">
<el-input-number v-model="itemForm.item_id" :min="0" :precision="0" style="width: 100%" />
</el-form-item>
<el-form-item label="计划数量">
<el-input-number v-model="itemForm.plan_qty" :min="0" :precision="3" style="width: 100%" />
</el-form-item>
<el-form-item label="实际单价">
<el-input-number v-model="itemForm.actual_price" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
<el-form-item label="零售价">
<el-input-number v-model="itemForm.retail_price" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
<el-form-item label="外部编码">
<el-input v-model="itemForm.ext_code" placeholder="extCode" />
</el-form-item>
<el-form-item label="库存类型">
<el-select v-model="itemForm.inventory_type" style="width: 100%">
<el-option label="正品(ZP)" value="ZP" />
<el-option label="残次(CC)" value="CC" />
</el-select>
</el-form-item>
<el-form-item label="来源订单编码">
<el-input v-model="itemForm.source_order_code" placeholder="sourceOrderCode,选填" />
</el-form-item>
<el-form-item label="子来源订单编码">
<el-input v-model="itemForm.sub_source_order_code" placeholder="subSourceOrderCode,选填" />
</el-form-item>
<el-form-item label="WMS 库存ID">
<el-input-number v-model="itemForm.stock_id" :min="0" :precision="0" style="width: 100%" />
</el-form-item>
<el-form :model="itemForm" class="task-panel__form" @submit.prevent>
<div class="task-panel__grid task-panel__grid--single">
<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="productId">
<VirtualSelect
v-model="itemForm.productId"
:options="productSelectOptions"
filterable
clearable
placeholder="选择后自动带出商品编码/名称"
style="width: 100%"
@change="handleProductChange"
/>
</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="order_line_no">
<el-input v-model="itemForm.order_line_no" placeholder="orderLineNo,缺省按行序号" />
</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="item_code">
<el-input v-model="itemForm.item_code" placeholder="itemCode" />
</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="item_name">
<el-input v-model="itemForm.item_name" placeholder="itemName" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">WMS 商品ID</span>
<div class="task-panel__field-form">
<el-form-item prop="item_id">
<el-input-number v-model="itemForm.item_id" :min="0" :precision="0" 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="plan_qty">
<el-input-number v-model="itemForm.plan_qty" :min="0" :precision="3" 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="actual_price">
<el-input-number v-model="itemForm.actual_price" :min="0" :precision="2" 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="retail_price">
<el-input-number v-model="itemForm.retail_price" :min="0" :precision="2" 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="ext_code">
<el-input v-model="itemForm.ext_code" placeholder="extCode" />
</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="inventory_type">
<el-select v-model="itemForm.inventory_type" style="width: 100%">
<el-option label="正品(ZP)" value="ZP" />
<el-option label="残次(CC)" value="CC" />
</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="source_order_code">
<el-input v-model="itemForm.source_order_code" placeholder="sourceOrderCode,选填" />
</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="sub_source_order_code">
<el-input v-model="itemForm.sub_source_order_code" placeholder="subSourceOrderCode,选填" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">WMS 库存ID</span>
<div class="task-panel__field-form">
<el-form-item prop="stock_id">
<el-input-number v-model="itemForm.stock_id" :min="0" :precision="0" style="width: 100%" />
</el-form-item>
</div>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="itemDialogVisible = false">取消</el-button>
<el-button type="primary" :loading="itemSubmitting" @click="submitItem">保存</el-button>
<template #hint>计划数量支持 3 位小数</template>
<template #actions>
<el-button size="small" @click="itemDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="itemSubmitting" @click="submitItem">保存</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
<!-- 批量操作(批量审核 / 批量推送 / 切换发货仓库):按勾选或按筛选条件,先预览影响范围再确认 -->
<el-dialog v-model="batchDialog.visible" :title="BATCH_ACTION_LABELS[batchDialog.action]" width="580px">
<el-form label-width="96px">
<el-form-item v-if="batchDialog.action === 'warehouse'" label="目标仓库" required>
<VirtualSelect
v-model="batchDialog.targetWarehouseId"
:options="warehouses"
label-key="name"
value-key="id"
placeholder="请选择目标仓库"
clearable
style="width: 100%"
/>
</el-form-item>
<el-form-item v-if="batchDialog.action === 'shop'" label="目标店铺" required>
<VirtualSelect
v-model="batchDialog.targetShopId"
:options="shops"
label-key="name"
value-key="id"
:placeholder="shops.length ? '请选择目标店铺(shopNick 取该名称)' : '暂无店铺,请先新建店铺'"
:disabled="!shops.length"
style="width: 100%"
/>
</el-form-item>
<el-form-item label="操作范围">
<el-radio-group v-model="batchDialog.mode">
<el-radio value="selected" :disabled="!selectedRows.length">
已选中 {{ selectedRows.length }} 条
</el-radio>
<el-radio value="filter">当前筛选条件(忽略勾选)</el-radio>
</el-radio-group>
<div class="scope-tip">{{ scopeText }}</div>
</el-form-item>
<el-form-item v-if="batchDialog.preview" label="影响范围">
<div class="preview-box">
<div>
命中 <b>{{ batchDialog.preview.matched }}</b> 条:{{ previewText.hitLabel }}
<b class="ok">{{ previewText.hit }}</b> 条,跳过
<b class="bad">{{ previewText.skip }}</b> 条
<TaskPanelDialog
v-model="batchDialog.visible"
:title="BATCH_ACTION_LABELS[batchDialog.action]"
subtitle="先预览影响范围,确认后统一执行"
width="min(580px, 92vw)"
body-max-height="60vh"
>
<div class="task-panel__form">
<div class="task-panel__grid task-panel__grid--single">
<div v-if="batchDialog.action === 'warehouse'" class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">目标仓库</span>
<div class="task-panel__field-form">
<VirtualSelect
v-model="batchDialog.targetWarehouseId"
:options="warehouses"
label-key="name"
value-key="id"
placeholder="请选择目标仓库"
clearable
style="width: 100%"
/>
</div>
<div v-if="batchDialog.action === 'warehouse' && previewText.skip" class="dim">
不可切换:{{ blockedText }}
</div>
<div v-else-if="batchDialog.action === 'shop' && previewText.skip" class="dim">
不可设置:{{ blockedText }}(已完成/已作废/已取消)
</div>
<div v-else-if="batchDialog.action === 'audit' && previewText.skip" class="dim">
跳过 {{ previewText.skip }} 条(非「待处理」状态或未设置店铺)
</div>
<div v-else-if="batchDialog.action === 'push' && previewText.skip" class="dim">
跳过 {{ previewText.skip }} 条(非「已审核」状态)
</div>
<div v-if="batchDialog.action === 'warehouse' && (batchDialog.preview as WarehouseChangeResult).same_warehouse" class="dim">
其中 {{ (batchDialog.preview as WarehouseChangeResult).same_warehouse }} 条已属于目标仓库,无需切换(不计入命中)
</div>
<div v-if="batchDialog.action === 'shop' && (batchDialog.preview as ShopChangeResult).same_shop" class="dim">
其中 {{ (batchDialog.preview as ShopChangeResult).same_shop }} 条已属于目标店铺,无需设置(不计入命中)
</div>
<div v-if="batchDialog.preview.samples && batchDialog.preview.samples.length" class="dim">
样例:{{ samplesText }}
</div>
<div v-if="!batchDialog.preview.matched" class="dim">命中 0 条,无需处理</div>
</div>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="batchDialog.visible = false">取消</el-button>
<div v-if="batchDialog.action === 'shop'" class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">目标店铺</span>
<div class="task-panel__field-form">
<VirtualSelect
v-model="batchDialog.targetShopId"
:options="shops"
label-key="name"
value-key="id"
:placeholder="shops.length ? '请选择目标店铺(shopNick 取该名称)' : '暂无店铺,请先新建店铺'"
:disabled="!shops.length"
style="width: 100%"
/>
</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-radio-group v-model="batchDialog.mode">
<el-radio value="selected" :disabled="!selectedRows.length">
已选中 {{ selectedRows.length }} 条
</el-radio>
<el-radio value="filter">当前筛选条件(忽略勾选)</el-radio>
</el-radio-group>
<span class="task-panel__field-hint">{{ scopeText }}</span>
</div>
</div>
<div
v-if="batchDialog.preview"
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">
<div class="preview-box">
<div>
命中 <b>{{ batchDialog.preview.matched }}</b> 条:{{ previewText.hitLabel }}
<b class="ok">{{ previewText.hit }}</b> 条,跳过
<b class="bad">{{ previewText.skip }}</b> 条
</div>
<div v-if="batchDialog.action === 'warehouse' && previewText.skip" class="dim">
不可切换:{{ blockedText }}
</div>
<div v-else-if="batchDialog.action === 'shop' && previewText.skip" class="dim">
不可设置:{{ blockedText }}(已完成/已作废/已取消)
</div>
<div v-else-if="batchDialog.action === 'audit' && previewText.skip" class="dim">
跳过 {{ previewText.skip }} 条(非「待处理」状态或未设置店铺)
</div>
<div v-else-if="batchDialog.action === 'push' && previewText.skip" class="dim">
跳过 {{ previewText.skip }} 条(非「已审核」状态)
</div>
<div v-if="batchDialog.action === 'warehouse' && (batchDialog.preview as WarehouseChangeResult).same_warehouse" class="dim">
其中 {{ (batchDialog.preview as WarehouseChangeResult).same_warehouse }} 条已属于目标仓库,无需切换(不计入命中)
</div>
<div v-if="batchDialog.action === 'shop' && (batchDialog.preview as ShopChangeResult).same_shop" class="dim">
其中 {{ (batchDialog.preview as ShopChangeResult).same_shop }} 条已属于目标店铺,无需设置(不计入命中)
</div>
<div v-if="batchDialog.preview.samples && batchDialog.preview.samples.length" class="dim">
样例:{{ samplesText }}
</div>
<div v-if="!batchDialog.preview.matched" class="dim">命中 0 条,无需处理</div>
</div>
</div>
</div>
</div>
</div>
<template #hint>预览不写入数据,确认后才会执行</template>
<template #actions>
<el-button size="small" @click="batchDialog.visible = false">取消</el-button>
<el-button
size="small"
:loading="batchDialog.previewing"
:disabled="(batchDialog.action === 'warehouse' && !batchDialog.targetWarehouseId) || (batchDialog.action === 'shop' && !batchDialog.targetShopId)"
@click="previewBatch"
@ -1340,6 +1611,7 @@ onMounted(async () => {
预览影响范围
</el-button>
<el-button
size="small"
type="primary"
:loading="batchDialog.submitting"
:disabled="!batchDialog.preview || !previewText.hit"
@ -1348,7 +1620,22 @@ onMounted(async () => {
确认{{ BATCH_ACTION_LABELS[batchDialog.action] }}
</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
<!-- 作废原因输入 -->
<ReasonPromptDialog
v-model="voidPrompt.visible"
title="作废确认"
:subtitle="voidPrompt.subtitle"
tip="作废后不可恢复,该发货单将从待处理流程中移除。"
label="作废原因"
placeholder="作废原因(选填)"
confirm-text="作废"
confirm-type="danger"
hint="作废原因会记录在单据上"
@confirm="onVoidConfirm"
@cancel="onVoidCancel"
/>
</el-card>
</template>
@ -1380,21 +1667,15 @@ onMounted(async () => {
font-size: 12px;
}
/* 切换仓库弹窗 */
.scope-tip {
margin-top: 4px;
color: #909399;
font-size: 12px;
line-height: 1.6;
word-break: break-all;
}
.preview-box {
width: 100%;
padding: 8px 10px;
border: 1px dashed #dcdfe6;
border: 1px solid #ebeef5;
border-radius: 4px;
background: #fafafa;
font-size: 13px;
font-size: 12px;
line-height: 1.8;
word-break: break-all;
}
.preview-box .ok {
color: #67c23a;
@ -1422,11 +1703,6 @@ onMounted(async () => {
cursor: help;
border-bottom: 1px dashed #e6a23c;
}
.form-scroll {
max-height: 62vh;
overflow-y: auto;
padding-right: 6px;
}
.order-card {
flex: 1;
min-height: 0;

View File

@ -3,6 +3,7 @@ import { computed, reactive, ref, watch } from 'vue'
import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
import DataTable from '@/components/DataTable.vue'
import ProductSelect from '@/components/ProductSelect.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { getExpressCodeOptions, type ExpressCodeOption } from '@/api/customExpressCode'
import { PLATFORM_PRESETS } from '@/constants/platform'
import type { ProductSearchItem } from '@/api/product'
@ -579,119 +580,163 @@ async function submit() {
</script>
<template>
<el-dialog
<TaskPanelDialog
v-model="visible"
:title="isEdit ? '编辑订单' : '新建订单(发货单)'"
width="980px"
top="6vh"
append-to-body
destroy-on-close
subtitle="录入基础信息、收件人与金额物流,保存后进入待审核"
width="min(880px, 96vw)"
body-max-height="64vh"
>
<el-form ref="formRef" :model="form" :rules="rules" label-width="96px" size="small" scroll-to-error v-loading="loading">
<div class="form-body">
<el-divider content-position="left">基础信息</el-divider>
<el-row :gutter="8">
<el-col :span="12">
<el-form-item label="来源订单号">
<el-input v-model="form.parent_order_no" placeholder="上游 / 平台订单号(可空)" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="订单号">
<el-input
v-model="form.order_no"
:disabled="isEdit"
:placeholder="isEdit ? '订单号不可修改(驳回 / 恢复时系统换号)' : '留空自动生成'"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="仓库" prop="warehouse_id">
<el-select v-model="form.warehouse_id" placeholder="请选择仓库" clearable filterable style="width: 100%">
<el-option
v-for="warehouse in selectableWarehouses"
:key="warehouse.id"
:label="`${warehouse.name}(${warehouse.code})`"
:value="warehouse.id"
/>
</el-select>
<div v-if="shopSubsidiaryId !== null" class="form-tip">仅可选择与所选店铺同货主(所属公司)的仓库</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="店铺" prop="shop_id">
<el-input
v-if="isExternal"
:model-value="externalShopLabel || '店铺信息不可用'"
disabled
style="width: 100%"
/>
<template v-else>
<el-select v-model="form.shop_id" placeholder="请选择店铺" clearable filterable style="width: 100%">
<el-option
v-for="shop in selectableShops"
:key="shop.id"
:label="shop.code ? `${shop.name}(${shop.code})` : shop.name"
:value="shop.id"
/>
</el-select>
<div v-if="!selectableShops.length" class="form-tip">
当前主体下没有可用的平台店铺(外部打单平台店铺不可用于手工建单)
</div>
</template>
<div v-if="isExternal" class="form-tip">平台拉取的订单,店铺由平台决定,不可修改</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单类型">
<el-select v-model="form.order_type" style="width: 100%">
<el-option v-for="item in ORDER_TYPES" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="电商平台">
<el-select
v-model="form.source_platform_code"
filterable
:disabled="isExternal"
placeholder="默认淘宝"
style="width: 100%"
>
<el-option
v-for="item in PLATFORM_PRESETS"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否紧急">
<el-select v-model="form.is_urgency" style="width: 100%">
<el-option label="否" value="N" />
<el-option label="是" value="Y" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="需要发票">
<el-select v-model="form.invoice_flag" style="width: 100%">
<el-option label="否" value="N" />
<el-option label="是" value="Y" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注">
<el-input v-model="form.remark" placeholder="备注 / 异常原因" clearable />
</el-form-item>
</el-col>
</el-row>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
v-loading="loading"
@submit.prevent
>
<div class="task-panel__section">基础信息</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="parent_order_no">
<el-input v-model="form.parent_order_no" placeholder="上游 / 平台订单号(可空)" clearable />
</el-form-item>
</div>
</div>
<el-divider content-position="left">收件人</el-divider>
<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="order_no">
<el-input
v-model="form.order_no"
:disabled="isEdit"
:placeholder="isEdit ? '订单号不可修改(驳回 / 恢复时系统换号)' : '留空自动生成'"
clearable
/>
</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="warehouse_id">
<el-select v-model="form.warehouse_id" placeholder="请选择仓库" clearable filterable style="width: 100%">
<el-option
v-for="warehouse in selectableWarehouses"
:key="warehouse.id"
:label="`${warehouse.name}(${warehouse.code})`"
:value="warehouse.id"
/>
</el-select>
</el-form-item>
<span v-if="shopSubsidiaryId !== null" class="task-panel__field-hint">
仅可选择与所选店铺同货主(所属公司)的仓库
</span>
</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="shop_id">
<el-input
v-if="isExternal"
:model-value="externalShopLabel || '店铺信息不可用'"
disabled
style="width: 100%"
/>
<el-select v-else v-model="form.shop_id" placeholder="请选择店铺" clearable filterable style="width: 100%">
<el-option
v-for="shop in selectableShops"
:key="shop.id"
:label="shop.code ? `${shop.name}(${shop.code})` : shop.name"
:value="shop.id"
/>
</el-select>
</el-form-item>
<span v-if="!isExternal && !selectableShops.length" class="task-panel__field-hint">
当前主体下没有可用的平台店铺(外部打单平台店铺不可用于手工建单)
</span>
<span v-if="isExternal" class="task-panel__field-hint">平台拉取的订单,店铺由平台决定,不可修改</span>
</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="order_type">
<el-select v-model="form.order_type" style="width: 100%">
<el-option v-for="item in ORDER_TYPES" :key="item.value" :label="item.label" :value="item.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="source_platform_code">
<el-select
v-model="form.source_platform_code"
filterable
:disabled="isExternal"
placeholder="默认淘宝"
style="width: 100%"
>
<el-option
v-for="item in PLATFORM_PRESETS"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">是否紧急</span>
<div class="task-panel__field-form">
<el-form-item prop="is_urgency">
<el-select v-model="form.is_urgency" style="width: 100%">
<el-option label="否" value="N" />
<el-option label="是" value="Y" />
</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="invoice_flag">
<el-select v-model="form.invoice_flag" style="width: 100%">
<el-option label="否" value="N" />
<el-option label="是" value="Y" />
</el-select>
</el-form-item>
</div>
</div>
<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-form-item prop="remark">
<el-input v-model="form.remark" placeholder="备注 / 异常原因" clearable />
</el-form-item>
</div>
</div>
</div>
<div class="task-panel__section">收件人</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">
<div class="parse-bar">
<el-input
v-model="receiverText"
@ -701,272 +746,343 @@ async function submit() {
/>
<el-button type="primary" size="small" :loading="parsing" @click="handleParseReceiver">智能识别</el-button>
</div>
<el-row :gutter="8">
<el-col :span="8">
<el-form-item label="收件人" prop="receiver">
<el-input v-model="form.receiver" placeholder="姓名" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="电话">
<el-input v-model="form.tel" placeholder="电话(与手机至少填一个)" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机">
<el-input v-model="form.mobile" placeholder="手机" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="省/市/区" prop="province">
<div class="area-field">
<el-cascader
:model-value="areaPath"
:options="areaOptions"
:props="{ expandTrigger: 'hover' }"
placeholder="搜索或逐级选择省 / 市 / 区"
filterable
clearable
style="width: 100%"
@change="handleAreaChange"
/>
<span v-if="!areaPathMatched" class="field-hint">
库内地区:{{ areaPath.join(' / ') }}(不在标准行政区划内,重新选择将覆盖)
</span>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="街道/镇" prop="town">
<el-input v-model="form.town" clearable />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="详细地址">
<el-input v-model="form.detail_address" placeholder="门牌号 / 楼栋 / 村组等" clearable />
</el-form-item>
</el-col>
</el-row>
<el-collapse class="more-collapse">
<el-collapse-item title="更多收件人字段(选填:邮箱 / 国家编码 / 邮编 / OAID)" name="more-receiver">
<el-row :gutter="8">
<el-col :span="8">
<el-form-item label="邮箱">
<el-input v-model="form.email" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="国家编码">
<el-input v-model="form.country_code" placeholder="如 CN" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮编">
<el-input v-model="form.zip_code" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="OAID">
<el-input v-model="form.oaid" clearable />
</el-form-item>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
</div>
</div>
<el-divider content-position="left">金额与物流</el-divider>
<el-row :gutter="8">
<el-col :span="6">
<el-form-item label="订单总金额">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" :controls="false" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="商品总金额">
<div class="amount-field">
<el-input-number
v-model="form.item_amount"
:min="0"
:precision="2"
:controls="false"
:disabled="hasRealItems"
style="width: 100%"
/>
<span v-if="hasRealItems" class="field-hint">按明细自动计算</span>
</div>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="折扣金额">
<el-input-number v-model="form.discount_amount" :min="0" :precision="2" :controls="false" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="快递费">
<el-input-number v-model="form.freight" :min="0" :precision="2" :controls="false" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="应收金额">
<el-input-number v-model="form.ar_amount" :min="0" :precision="2" :controls="false" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="已收金额">
<el-input-number v-model="form.got_amount" :min="0" :precision="2" :controls="false" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物流公司" prop="logistics_code">
<el-select
v-model="form.logistics_code"
placeholder="请选择快递"
clearable
filterable
style="width: 100%"
@change="handleExpressChange"
>
<el-option-group label="自定义快递编码">
<el-option
v-for="company in expressOptions.filter(item => item.source === 'custom')"
:key="company.code"
:label="`${company.name}(${company.code})`"
:value="company.code"
/>
</el-option-group>
<el-option-group label="系统快递">
<el-option
v-for="company in expressOptions.filter(item => item.source === 'system')"
:key="company.code"
:label="`${company.name}(${company.code})`"
:value="company.code"
/>
</el-option-group>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-collapse class="more-collapse">
<el-collapse-item title="更多(选填:卖家留言 / 买家留言)" name="more-amount">
<el-row :gutter="8">
<el-col :span="12">
<el-form-item label="卖家留言">
<el-input v-model="form.seller_message" type="textarea" :rows="2" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="买家留言">
<el-input v-model="form.buyer_message" type="textarea" :rows="2" />
</el-form-item>
</el-col>
</el-row>
</el-collapse-item>
</el-collapse>
<el-divider content-position="left">商品明细</el-divider>
<DataTable :data="form.items" :stripe="true">
<el-table-column label="行号" width="70">
<template #default="{ row, $index }">
<el-input v-model="row.order_line_no" size="small" :placeholder="String($index + 1)" />
</template>
</el-table-column>
<el-table-column label="商品" min-width="220">
<template #default="{ row, $index }">
<ProductSelect
v-model="row.product_id"
:model-label="[ row.item_code, row.item_name ].filter(Boolean).join(' ')"
:subsidiary-id="shopSubsidiaryId"
@select="(p: ProductSearchItem) => onLineProductSelect($index, p)"
/>
</template>
</el-table-column>
<el-table-column label="商品编码" width="140">
<template #default="{ row }">
<el-input v-model="row.item_code" size="small" placeholder="选商品后自动带出" />
</template>
</el-table-column>
<el-table-column label="商品名称" min-width="150">
<template #default="{ row }">
<el-input v-model="row.item_name" size="small" placeholder="选商品后自动带出" />
</template>
</el-table-column>
<el-table-column label="数量" width="100">
<template #default="{ row }">
<el-input-number v-model="row.plan_qty" :min="0" :precision="3" :controls="false" size="small" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="单价" width="100">
<template #default="{ row }">
<el-input-number v-model="row.actual_price" :min="0" :precision="2" :controls="false" size="small" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="库存类型" width="100">
<template #default="{ row }">
<el-select v-model="row.inventory_type" size="small">
<el-option label="正品" value="ZP" />
<el-option label="残次" value="CC" />
</el-select>
</template>
</el-table-column>
<el-table-column label="外部编码" width="120">
<template #default="{ row }">
<el-input v-model="row.ext_code" size="small" />
</template>
</el-table-column>
<el-table-column label="金额" width="90" align="right">
<template #default="{ row }">{{ lineAmount(row) }}</template>
</el-table-column>
<el-table-column label="操作" width="70">
<template #default="{ $index }">
<el-button link type="danger" size="small" @click="removeLine($index)">删除</el-button>
</template>
</el-table-column>
</DataTable>
<div class="items-footer">
<el-button size="small" @click="addLine">添加商品行</el-button>
<span class="items-total">明细金额合计:{{ itemsAmount.toFixed(2) }}</span>
<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-form-item prop="receiver">
<el-input v-model="form.receiver" 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="tel">
<el-input v-model="form.tel" 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="mobile">
<el-input v-model="form.mobile" placeholder="手机" clearable />
</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="province">
<el-cascader
:model-value="areaPath"
:options="areaOptions"
:props="{ expandTrigger: 'hover' }"
placeholder="搜索或逐级选择省 / 市 / 区"
filterable
clearable
style="width: 100%"
@change="handleAreaChange"
/>
</el-form-item>
<span v-if="!areaPathMatched" class="task-panel__field-hint">
库内地区:{{ areaPath.join(' / ') }}(不在标准行政区划内,重新选择将覆盖)
</span>
</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="town">
<el-input v-model="form.town" clearable />
</el-form-item>
</div>
</div>
<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-form-item prop="detail_address">
<el-input v-model="form.detail_address" placeholder="门牌号 / 楼栋 / 村组等" clearable />
</el-form-item>
</div>
</div>
</div>
<el-collapse class="more-collapse">
<el-collapse-item title="更多收件人字段(选填:邮箱 / 国家编码 / 邮编 / OAID)" name="more-receiver">
<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="email">
<el-input v-model="form.email" 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="country_code">
<el-input v-model="form.country_code" placeholder="如 CN" 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="zip_code">
<el-input v-model="form.zip_code" clearable />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">OAID</span>
<div class="task-panel__field-form">
<el-form-item prop="oaid">
<el-input v-model="form.oaid" clearable />
</el-form-item>
</div>
</div>
</div>
</el-collapse-item>
</el-collapse>
<div class="task-panel__section">金额与物流</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="total_amount">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" :controls="false" 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="item_amount">
<el-input-number
v-model="form.item_amount"
:min="0"
:precision="2"
:controls="false"
:disabled="hasRealItems"
style="width: 100%"
/>
</el-form-item>
<span v-if="hasRealItems" class="task-panel__field-hint">按明细自动计算</span>
</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="discount_amount">
<el-input-number v-model="form.discount_amount" :min="0" :precision="2" :controls="false" 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="freight">
<el-input-number v-model="form.freight" :min="0" :precision="2" :controls="false" 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="ar_amount">
<el-input-number v-model="form.ar_amount" :min="0" :precision="2" :controls="false" 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="got_amount">
<el-input-number v-model="form.got_amount" :min="0" :precision="2" :controls="false" style="width: 100%" />
</el-form-item>
</div>
</div>
<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="logistics_code">
<el-select
v-model="form.logistics_code"
placeholder="请选择快递"
clearable
filterable
style="width: 100%"
@change="handleExpressChange"
>
<el-option-group label="自定义快递编码">
<el-option
v-for="company in expressOptions.filter(item => item.source === 'custom')"
:key="company.code"
:label="`${company.name}(${company.code})`"
:value="company.code"
/>
</el-option-group>
<el-option-group label="系统快递">
<el-option
v-for="company in expressOptions.filter(item => item.source === 'system')"
:key="company.code"
:label="`${company.name}(${company.code})`"
:value="company.code"
/>
</el-option-group>
</el-select>
</el-form-item>
</div>
</div>
</div>
<el-collapse class="more-collapse">
<el-collapse-item title="更多(选填:卖家留言 / 买家留言)" name="more-amount">
<div class="task-panel__grid">
<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-form-item prop="seller_message">
<el-input v-model="form.seller_message" type="textarea" :rows="2" />
</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>
<div class="task-panel__field-form">
<el-form-item prop="buyer_message">
<el-input v-model="form.buyer_message" type="textarea" :rows="2" />
</el-form-item>
</div>
</div>
</div>
</el-collapse-item>
</el-collapse>
<div class="task-panel__section">商品明细</div>
<div class="task-panel__table">
<DataTable :data="form.items" :stripe="true">
<el-table-column label="行号" width="70">
<template #default="{ row, $index }">
<el-input v-model="row.order_line_no" size="small" :placeholder="String($index + 1)" />
</template>
</el-table-column>
<el-table-column label="商品" min-width="220">
<template #default="{ row, $index }">
<ProductSelect
v-model="row.product_id"
:model-label="[ row.item_code, row.item_name ].filter(Boolean).join(' ')"
:subsidiary-id="shopSubsidiaryId"
@select="(p: ProductSearchItem) => onLineProductSelect($index, p)"
/>
</template>
</el-table-column>
<el-table-column label="商品编码" width="140">
<template #default="{ row }">
<el-input v-model="row.item_code" size="small" placeholder="选商品后自动带出" />
</template>
</el-table-column>
<el-table-column label="商品名称" min-width="150">
<template #default="{ row }">
<el-input v-model="row.item_name" size="small" placeholder="选商品后自动带出" />
</template>
</el-table-column>
<el-table-column label="数量" width="100">
<template #default="{ row }">
<el-input-number v-model="row.plan_qty" :min="0" :precision="3" :controls="false" size="small" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="单价" width="100">
<template #default="{ row }">
<el-input-number v-model="row.actual_price" :min="0" :precision="2" :controls="false" size="small" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="库存类型" width="100">
<template #default="{ row }">
<el-select v-model="row.inventory_type" size="small">
<el-option label="正品" value="ZP" />
<el-option label="残次" value="CC" />
</el-select>
</template>
</el-table-column>
<el-table-column label="外部编码" width="120">
<template #default="{ row }">
<el-input v-model="row.ext_code" size="small" />
</template>
</el-table-column>
<el-table-column label="金额" width="90" align="right">
<template #default="{ row }">{{ lineAmount(row) }}</template>
</el-table-column>
<el-table-column label="操作" width="70">
<template #default="{ $index }">
<el-button link type="danger" size="small" @click="removeLine($index)">删除</el-button>
</template>
</el-table-column>
</DataTable>
</div>
<div class="items-footer">
<el-button size="small" @click="addLine">添加商品行</el-button>
<span class="items-total">明细金额合计:{{ itemsAmount.toFixed(2) }}</span>
</div>
</el-form>
<template #footer>
<template #hint>带 * 为必填项;保存后可在列表中审核并推送仓库</template>
<template #actions>
<el-button size="small" @click="visible = false">取消</el-button>
<el-button type="primary" size="small" :loading="submitting" @click="submit">保存</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submit">保存</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
</template>
<style scoped>
.form-body {
max-height: 66vh;
overflow-y: auto;
padding-right: 4px;
}
.form-body :deep(.el-divider) {
margin: 4px 0 14px;
}
.form-body :deep(.el-divider__text) {
font-size: 13px;
font-weight: 600;
}
.more-collapse {
margin-top: 2px;
border-top: none;
border-bottom: none;
}
.more-collapse :deep(.el-collapse-item__header) {
font-size: 12px;
color: var(--el-text-color-secondary);
height: 32px;
line-height: 32px;
padding-left: 12px;
font-size: 12px;
color: var(--el-text-color-secondary);
background: transparent;
border-bottom: none;
}
.more-collapse :deep(.el-collapse-item__wrap) {
background: transparent;
border-bottom: none;
}
.more-collapse :deep(.el-collapse-item__content) {
padding-bottom: 4px;
}
.parse-bar {
display: flex;
gap: 8px;
align-items: flex-start;
margin-bottom: 12px;
}
.parse-bar .el-button {
flex: 0 0 auto;
@ -976,32 +1092,10 @@ async function submit() {
align-items: center;
justify-content: space-between;
margin-top: 8px;
padding-bottom: 8px;
}
.items-total {
font-size: 12px;
color: var(--el-text-color-secondary);
}
.amount-field {
width: 100%;
}
.area-field {
width: 100%;
}
.field-hint {
display: block;
margin-top: 2px;
font-size: 12px;
line-height: 16px;
color: var(--el-text-color-secondary);
}
.form-tip {
display: block;
margin-top: 2px;
font-size: 12px;
line-height: 16px;
color: var(--el-text-color-secondary);
}
:deep(.el-descriptions__label) {
width: 110px;
}
</style>

View File

@ -2,6 +2,7 @@
import { computed, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import DataTable from '@/components/DataTable.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { getShops, type ShopItem } from '@/api/shop'
import type { OrderSyncShopItem } from '@/api/orderSyncTask'
import { useOrderSyncTask } from '@/composables/useOrderSyncTask'
@ -123,148 +124,183 @@ function rowClassName({ row }: { row: OrderSyncShopItem }) {
</script>
<template>
<el-dialog v-model="visible" title="拉取订单(异步任务)" width="880px" append-to-body destroy-on-close>
<el-alert
type="info"
:closable="false"
show-icon
title="会按当前范围从打单平台店铺(及数据库店铺)拉取订单并写入「待审核」;平台已发货/已终结的订单会被自动作废。"
class="tip"
/>
<TaskPanelDialog
v-model="visible"
title="拉取订单(异步任务)"
subtitle="按范围从打单平台店铺拉取订单,写入「待审核」"
width="min(880px, 96vw)"
body-max-height="64vh"
>
<el-form
:model="form"
class="task-panel__form"
:disabled="isRunning || submitting"
@submit.prevent
>
<p class="task-panel__form-tip">
会按当前范围从打单平台店铺(及数据库店铺)拉取订单并写入「待审核」;平台已发货/已终结的订单会被自动作废。
</p>
<el-form :inline="true" size="small" label-width="90px" :disabled="isRunning || submitting">
<el-form-item label="拉取范围">
<el-select v-model="form.scope" style="width: 280px">
<el-option v-for="opt in SCOPE_OPTIONS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
<el-form-item label="时间范围">
<el-select v-model="form.lookback_days" style="width: 260px">
<el-option v-for="opt in LOOKBACK_OPTIONS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
<el-form-item label="指定店铺">
<el-select
v-model="form.shop_ids"
multiple
clearable
collapse-tags
collapse-tags-tooltip
filterable
:loading="shopsLoading"
placeholder="不选表示全部店铺"
style="width: 320px"
>
<el-option v-for="opt in shopOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
<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="scope">
<el-select v-model="form.scope" style="width: 100%">
<el-option v-for="opt in SCOPE_OPTIONS" :key="opt.value" :label="opt.label" :value="opt.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="lookback_days">
<el-select v-model="form.lookback_days" style="width: 100%">
<el-option v-for="opt in LOOKBACK_OPTIONS" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</div>
</div>
<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-form-item prop="shop_ids">
<el-select
v-model="form.shop_ids"
multiple
clearable
collapse-tags
collapse-tags-tooltip
filterable
:loading="shopsLoading"
placeholder="不选表示全部店铺"
style="width: 100%"
>
<el-option v-for="opt in shopOptions" :key="opt.value" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
</div>
</div>
</div>
<div class="sync-actions">
<el-button type="primary" size="small" :loading="submitting || isRunning" @click="onSubmit">
{{ isRunning ? '任务执行中…' : '开始拉取' }}
</el-button>
<span v-if="task" class="task-panel__field-hint">
任务 #{{ task.id }} · {{ task.status_label || '待处理' }} · {{ progressText }}
</span>
</div>
<template v-if="task">
<el-progress
:percentage="task.progress"
:status="task.status === 4 ? 'exception' : (task.status === 2 ? 'success' : undefined)"
:stroke-width="14"
class="progress"
/>
<div class="summary">
<span class="sync-status" :class="`sync-status--${statusType}`">{{ task.status_label }}</span>
<span>店铺 {{ task.processed_shops }}/{{ task.total_shops }}(失败 {{ task.failed_shops }})</span>
<span>新增 {{ task.created_orders }}</span>
<span>更新 {{ task.updated_orders }}</span>
<span>跳过(已发货) {{ task.skipped_orders }}</span>
<span>自动作废 {{ task.voided_orders }}</span>
</div>
<p v-if="task.error_message" class="task-panel__form-tip task-panel__form-tip--error">
{{ task.error_message }}
</p>
<div v-if="items.length" class="task-panel__table">
<DataTable
:data="items"
:row-class-name="rowClassName"
max-height="320"
>
<el-table-column prop="shop_name" label="店铺" min-width="160" show-overflow-tooltip />
<el-table-column label="结果" min-width="320" show-overflow-tooltip>
<template #default="{ row }">
<span :class="{ 'fail-text': !row.success }">{{ row.message }}</span>
</template>
</el-table-column>
<el-table-column prop="orders" label="订单" width="80" />
<el-table-column prop="created" label="新增" width="80" />
<el-table-column prop="updated" label="更新" width="80" />
<el-table-column prop="skipped" label="跳过" width="80" />
<el-table-column prop="voided" label="作废" width="80">
<template #default="{ row }">
<el-tooltip
v-if="row.voided"
:content="`已发货 ${row.voided_shipped || 0} 单 / 平台查不到 ${row.voided_missing || 0} 单`"
placement="top"
>
<span>{{ row.voided }}</span>
</el-tooltip>
<span v-else>0</span>
</template>
</el-table-column>
</DataTable>
</div>
<p v-else-if="isRunning" class="task-panel__form-tip">正在逐店拉取,进度会自动刷新…</p>
<p v-else-if="finished" class="task-panel__form-tip">没有店铺结果</p>
</template>
</el-form>
<div class="actions">
<el-button type="primary" size="small" :loading="submitting || isRunning" @click="onSubmit">
{{ isRunning ? '任务执行中…' : '开始拉取' }}
</el-button>
<span v-if="task" class="hint">
任务 #{{ task.id }} · {{ task.status_label || '待处理' }} · {{ progressText }}
</span>
</div>
<template v-if="task">
<el-progress
:percentage="task.progress"
:status="task.status === 4 ? 'exception' : (task.status === 2 ? 'success' : undefined)"
:stroke-width="14"
class="progress"
/>
<div class="summary">
<el-tag :type="statusType as never" size="small" effect="plain">{{ task.status_label }}</el-tag>
<span>店铺 {{ task.processed_shops }}/{{ task.total_shops }}(失败 {{ task.failed_shops }})</span>
<span>新增 {{ task.created_orders }}</span>
<span>更新 {{ task.updated_orders }}</span>
<span>跳过(已发货) {{ task.skipped_orders }}</span>
<span>自动作废 {{ task.voided_orders }}</span> </div>
<el-alert
v-if="task.error_message"
type="error"
:closable="false"
show-icon
:title="task.error_message"
class="tip"
/>
<DataTable
v-if="items.length"
:data="items"
:row-class-name="rowClassName"
max-height="320"
>
<el-table-column prop="shop_name" label="店铺" min-width="160" show-overflow-tooltip />
<el-table-column label="结果" min-width="320" show-overflow-tooltip>
<template #default="{ row }">
<span :class="{ 'fail-text': !row.success }">{{ row.message }}</span>
</template>
</el-table-column>
<el-table-column prop="orders" label="订单" width="80" />
<el-table-column prop="created" label="新增" width="80" />
<el-table-column prop="updated" label="更新" width="80" />
<el-table-column prop="skipped" label="跳过" width="80" />
<el-table-column prop="voided" label="作废" width="80">
<template #default="{ row }">
<el-tooltip
v-if="row.voided"
:content="`已发货 ${row.voided_shipped || 0} 单 / 平台查不到 ${row.voided_missing || 0} 单`"
placement="top"
>
<span>{{ row.voided }}</span>
</el-tooltip>
<span v-else>0</span>
</template>
</el-table-column>
</DataTable>
<div v-else-if="isRunning" class="hint">正在逐店拉取,进度会自动刷新…</div>
<div v-else-if="finished" class="hint">没有店铺结果</div>
</template>
<template #footer>
<template #hint>任务在后台执行,关闭弹窗不影响进度</template>
<template #actions>
<el-button size="small" @click="visible = false">{{ finished ? '关闭' : '后台执行,先关闭' }}</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
</template>
<style scoped>
.tip {
margin-bottom: 12px;
}
.actions {
.sync-actions {
display: flex;
align-items: center;
gap: 12px;
margin: 4px 0 12px;
margin: 4px 0;
}
.progress {
margin-bottom: 10px;
margin: 4px 0 10px;
}
.summary {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: 14px;
gap: 12px;
margin-bottom: 10px;
font-size: 13px;
font-size: 12px;
line-height: 18px;
color: #606266;
}
.hint {
.sync-status {
font-size: 12px;
color: #909399;
line-height: 18px;
white-space: nowrap;
}
.sync-status--primary {
color: var(--el-color-primary);
}
.sync-status--success {
color: var(--el-color-success);
}
.sync-status--warning {
color: var(--el-color-warning);
}
.sync-status--info {
color: var(--el-color-info);
}
.sync-status--danger {
color: var(--el-color-danger);
}
:deep(.sync-row-failed) {
background: #fef0f0;
}
.fail-text {
color: #f56c6c;
}

View File

@ -1,12 +1,23 @@
<script setup lang="ts">
import { computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { ElMessage, ElMessageBox as ElMessageBoxBase } from 'element-plus'
import DataTable from '@/components/DataTable.vue'
import ExportButton from '@/components/ExportButton.vue'
import ListPager from '@/components/ListPager.vue'
import ReasonPromptDialog from '@/components/ReasonPromptDialog.vue'
import RecordPickerDialog from '@/components/RecordPickerDialog.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import OrderFormDialog from './OrderFormDialog.vue'
import OrderSyncDialog from './OrderSyncDialog.vue'
/**
* 订单模块统一确认框:内容 / 图标保持 Element 默认,
* 只挂 customClass,让按钮尺寸与间距对齐表单面板底部(small / gap 6)。
*/
const ElMessageBox = {
confirm: (message: string, title: string, options: Record<string, unknown> = {}) =>
ElMessageBoxBase.confirm(message, title, { customClass: 'app-confirm-box', ...options }),
}
import { getExpressCodeOptions } from '@/api/customExpressCode'
import {
EXTERNAL_SEND_STATUS_OPTIONS,
@ -346,6 +357,61 @@ function confirmText(key: BatchKey, count: number): string {
return map[key]
}
/* -------------------- 原因输入面板(作废 / 取消 / 手工标记推送失败) -------------------- */
const reasonPrompt = reactive({
visible: false,
title: '',
subtitle: '',
tip: '',
label: '原因',
placeholder: '',
required: false,
hint: '',
confirmText: '确定',
confirmType: 'primary' as 'primary' | 'danger' | 'warning',
})
let reasonResolver: ((value: string | null) => void) | null = null
/** 打开原因输入面板;返回填写内容,用户取消时返回 null */
function askReason(options: {
title: string
subtitle?: string
tip?: string
label?: string
placeholder?: string
required?: boolean
hint?: string
confirmText?: string
confirmType?: 'primary' | 'danger' | 'warning'
}): Promise<string | null> {
Object.assign(reasonPrompt, {
title: options.title,
subtitle: options.subtitle || '',
tip: options.tip || '',
label: options.label || '原因',
placeholder: options.placeholder || '请填写原因(可不填)',
required: Boolean(options.required),
hint: options.hint || '',
confirmText: options.confirmText || '确定',
confirmType: options.confirmType || 'primary',
})
reasonPrompt.visible = true
return new Promise<string | null>((resolve) => {
reasonResolver = resolve
})
}
function onReasonConfirm(value: string) {
reasonResolver?.(value)
reasonResolver = null
}
function onReasonCancel() {
reasonResolver?.(null)
reasonResolver = null
}
/** 切换仓库使用的目标选择弹窗(列表选择,而非手输名称) */
const picker = reactive({
visible: false,
@ -492,27 +558,40 @@ async function handleBatch(key: BatchKey) {
let tip = ''
if (key === 'push_failed') {
const { value } = await ElMessageBox.prompt(confirmText(key, ids.length), '手工标记推送失败', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPlaceholder: '请填写推送失败原因(写入订单备注)',
inputValidator: (text: string) => (text && text.trim() ? true : '请填写推送失败原因'),
const reason = await askReason({
title: '手工标记推送失败',
subtitle: `确认将选中的 ${ids.length} 条订单标记为「推送失败」?`,
tip: `将转入「${ORDER_STAGE_META.exception.label}」并释放锁定库存。`,
label: '失败原因',
placeholder: '请填写推送失败原因(写入订单备注)',
required: true,
hint: '原因会写入订单备注,便于后续排查',
})
tip = String(value).trim()
if (reason === null) return
tip = reason
} else if (key === 'void') {
const { value } = await ElMessageBox.prompt(confirmText(key, ids.length), '作废订单', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPlaceholder: '请填写作废原因(可不填)',
const reason = await askReason({
title: '作废订单',
subtitle: `确认作废选中的 ${ids.length} 条订单?`,
tip: '作废会记录人与原因、释放锁定库存;作废后不可恢复也禁止删除。',
label: '作废原因',
placeholder: '请填写作废原因(可不填)',
confirmType: 'danger',
hint: '作废后不可恢复',
})
tip = String(value || '').trim()
if (reason === null) return
tip = reason
} else if (key === 'cancel') {
const { value } = await ElMessageBox.prompt(confirmText(key, ids.length), '取消订单', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPlaceholder: '请填写取消原因(可不填)',
const reason = await askReason({
title: '取消订单',
subtitle: `确认取消选中的 ${ids.length} 条订单?`,
tip: '已推送成功的订单会先取消仓库单据,成功后再释放锁定库存。',
label: '取消原因',
placeholder: '请填写取消原因(可不填)',
hint: '取消后可在「已取消」视图恢复',
})
tip = String(value || '').trim()
if (reason === null) return
tip = reason
} else {
await ElMessageBox.confirm(confirmText(key, ids.length), '批量操作', {
type: 'warning',
@ -646,6 +725,105 @@ async function openDetail(row: OrderStatusItem) {
}
}
/** 详情只读信息行(按分组渲染,避免模板里堆大量 el-descriptions-item) */
interface DetailRowItem {
label: string
value?: string
tag?: { type: '' | 'info' | 'warning' | 'success' | 'danger'; text: string }
full?: boolean
}
const detailGroups = computed<Array<{ title: string; rows: DetailRowItem[] }>>(() => {
const row = detailRow.value
if (!row) return []
const stage = ORDER_STAGE_META[row.status]
const address =
[ row.province, row.city, row.area, row.town, row.detail_address ].filter(Boolean).join('') ||
row.address ||
'-'
const expressCodes = expressCodesOf(row).join(' / ') || '-'
const baseRows: DetailRowItem[] = [
{ label: '订单号', value: String(row.order_no ?? '-') },
{ label: '来源订单号', value: row.parent_order_no || '-' },
]
if (platformOrderNoOf(row)) baseRows.push({ label: '平台订单号', value: platformOrderNoOf(row) })
if (row.source_platform_name || row.source_platform_code) {
baseRows.push({ label: '电商平台', value: platformTextOf(row) })
}
baseRows.push(
{
label: '状态',
tag: {
type: stage?.tag ?? 'info',
text: row.status_label || stage?.label || '-',
},
},
{ label: '所在表', value: row.current_table || String(row.status) },
{ label: '仓库', value: row.warehouse_name || row.warehouse_code || '-' },
{ label: '店铺', value: row.shop_name || row.shop_nick || '-' },
{ label: '订单类型', value: row.order_type || '-' },
{ label: '订单ID', value: String(row.id) },
)
const timeRows: DetailRowItem[] = [
{ label: '审核人 / 时间', value: `${row.operator_name || row.audit_by || '-'} / ${formatDateTime(row.audit_time)}` },
{ label: '推送时间', value: formatDateTime(row.pushed_at) },
]
if (row.void_at) {
timeRows.push({ label: '作废时间', value: formatDateTime(row.void_at) })
timeRows.push({ label: '作废原因', value: row.void_reason || '-' })
}
timeRows.push(
{ label: '创建时间', value: formatDateTime(row.created_at) },
{ label: '更新时间', value: formatDateTime(row.updated_at) },
)
if (isHistory.value) {
timeRows.push({ label: '归档时间', value: formatDateTime(row.archived_at) })
timeRows.push({ label: '转入时间', value: formatDateTime(row.transferred_at) })
}
return [
{ title: '订单信息', rows: baseRows },
{
title: '收件信息',
rows: [
{ label: '收件人', value: row.receiver || '-' },
{ label: '电话 / 手机', value: row.mobile || row.tel || '-' },
{ label: '收货地址', value: address, full: true },
],
},
{
title: '金额与物流',
rows: [
{ label: '商品总数量', value: fmtNum(row.item_total) },
{ label: '商品种类', value: `${row.item_kind ?? 0} 种` },
{ label: '订单总金额', value: fmtNum(row.total_amount) },
{ label: '商品金额', value: fmtNum(row.item_amount) },
{ label: '快递费', value: fmtNum(row.freight) },
{ label: '已收金额', value: fmtNum(row.got_amount) },
{ label: '物流公司', value: row.logistics_name || row.logistics_code || '-' },
{ label: '运单号', value: expressCodes },
{
label: '库存锁定',
tag: {
type: Number(row.stock_locked) === 1 ? 'warning' : 'info',
text: Number(row.stock_locked) === 1 ? '已锁定' : '未锁定',
},
},
{ label: '仓库单号', value: row.wms_order_no || '-' },
],
},
{
title: '时间与备注',
rows: [
...timeRows,
{ label: '卖家留言', value: row.seller_message || '-', full: true },
{ label: '备注 / 异常原因', value: row.remark || '-', full: true },
],
},
]
})
/* -------------------- 新建 / 编辑(发货单口径表单) -------------------- */
const formVisible = ref(false)
const formOrderId = ref<number | null>(null)
@ -744,24 +922,29 @@ async function handleRowAction(row: OrderStatusItem, key: RowActionKey) {
const item = result.items[0]
ElMessage.success(item.bill_no_changed ? `已驳回并换号:${item.order_no}` : '已驳回')
} else if (key === 'cancel') {
const { value } = await ElMessageBox.prompt(`确认取消订单 ${row.order_no}?`, '取消订单', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPlaceholder: '请填写取消原因(可不填)',
const reason = await askReason({
title: '取消订单',
subtitle: `确认取消订单 ${row.order_no}?`,
tip: '已推送成功的订单会先取消仓库单据,成功后再释放锁定库存。',
label: '取消原因',
placeholder: '请填写取消原因(可不填)',
hint: '取消后可在「已取消」视图恢复',
})
await cancelOrders(ids, String(value || '').trim() || undefined)
if (reason === null) return
await cancelOrders(ids, reason || undefined)
ElMessage.success(`已取消 ${row.order_no}`)
} else if (key === 'void') {
const { value } = await ElMessageBox.prompt(
`确认作废订单 ${row.order_no}?作废后不可恢复也禁止删除。`,
'作废订单',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPlaceholder: '请填写作废原因(可不填)',
},
)
await voidOrders(ids, String(value || '').trim() || undefined)
const reason = await askReason({
title: '作废订单',
subtitle: `确认作废订单 ${row.order_no}?`,
tip: '作废会记录人与原因、释放锁定库存;作废后不可恢复也禁止删除。',
label: '作废原因',
placeholder: '请填写作废原因(可不填)',
confirmType: 'danger',
hint: '作废后不可恢复',
})
if (reason === null) return
await voidOrders(ids, reason || undefined)
ElMessage.success(`已作废 ${row.order_no}`)
} else if (key === 'restore') {
await ElMessageBox.confirm(`确认把订单 ${row.order_no} 恢复到「待审核」?曾推送过的会自动换号。`, '恢复', {
@ -1180,86 +1363,41 @@ onBeforeUnmount(() => {
/>
<!-- 详情(单据头 + 明细,实时取自详情接口) -->
<el-drawer v-model="detailVisible" :title="`订单 ${detailRow?.order_no || ''}`" size="860px">
<template v-if="detailRow">
<el-descriptions v-loading="detailLoading" :column="2" border size="small">
<el-descriptions-item label="订单号">{{ detailRow.order_no }}</el-descriptions-item>
<el-descriptions-item label="来源订单号">{{ detailRow.parent_order_no || '-' }}</el-descriptions-item>
<el-descriptions-item v-if="platformOrderNoOf(detailRow)" label="平台订单号">
{{ platformOrderNoOf(detailRow) }}
</el-descriptions-item>
<el-descriptions-item
v-if="detailRow.source_platform_name || detailRow.source_platform_code"
label="电商平台"
>
{{ platformTextOf(detailRow) }}
</el-descriptions-item>
<el-descriptions-item label="状态">
<el-tag size="small" :type="ORDER_STAGE_META[detailRow.status]?.tag">
{{ detailRow.status_label || ORDER_STAGE_META[detailRow.status]?.label }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="所在表">{{ detailRow.current_table || detailRow.status }}</el-descriptions-item>
<el-descriptions-item label="仓库">
{{ detailRow.warehouse_name || detailRow.warehouse_code || '-' }}
</el-descriptions-item>
<el-descriptions-item label="店铺">{{ detailRow.shop_name || detailRow.shop_nick || '-' }}</el-descriptions-item>
<el-descriptions-item label="订单类型">{{ detailRow.order_type || '-' }}</el-descriptions-item>
<el-descriptions-item label="订单ID(索引表)">{{ detailRow.id }}</el-descriptions-item>
<el-descriptions-item label="收件人">{{ detailRow.receiver || '-' }}</el-descriptions-item>
<el-descriptions-item label="电话 / 手机">
{{ detailRow.mobile || detailRow.tel || '-' }}
</el-descriptions-item>
<el-descriptions-item label="收货地址" :span="2">
{{ [ detailRow.province, detailRow.city, detailRow.area, detailRow.town, detailRow.detail_address ].filter(Boolean).join('') || detailRow.address || '-' }}
</el-descriptions-item>
<el-descriptions-item label="商品总数量">{{ fmtNum(detailRow.item_total) }}</el-descriptions-item>
<el-descriptions-item label="商品种类">{{ detailRow.item_kind ?? 0 }} 种</el-descriptions-item>
<el-descriptions-item label="订单总金额">{{ fmtNum(detailRow.total_amount) }}</el-descriptions-item>
<el-descriptions-item label="商品金额">{{ fmtNum(detailRow.item_amount) }}</el-descriptions-item>
<el-descriptions-item label="快递费">{{ fmtNum(detailRow.freight) }}</el-descriptions-item>
<el-descriptions-item label="已收金额">{{ fmtNum(detailRow.got_amount) }}</el-descriptions-item>
<el-descriptions-item label="物流公司">
{{ detailRow.logistics_name || detailRow.logistics_code || '-' }}
</el-descriptions-item>
<el-descriptions-item label="运单号">
<template v-if="expressCodesOf(detailRow).length">
<div v-for="code in expressCodesOf(detailRow)" :key="code">{{ code }}</div>
</template>
<template v-else>-</template>
</el-descriptions-item>
<el-descriptions-item label="库存锁定">
<el-tag size="small" :type="Number(detailRow.stock_locked) === 1 ? 'warning' : 'info'" effect="plain">
{{ Number(detailRow.stock_locked) === 1 ? '已锁定' : '未锁定' }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="仓库单号">{{ detailRow.wms_order_no || '-' }}</el-descriptions-item>
<el-descriptions-item label="审核人 / 时间">
{{ detailRow.operator_name || detailRow.audit_by || '-' }} / {{ formatDateTime(detailRow.audit_time) }}
</el-descriptions-item>
<el-descriptions-item label="推送时间">{{ formatDateTime(detailRow.pushed_at) }}</el-descriptions-item>
<template v-if="detailRow.void_at">
<el-descriptions-item label="作废时间">{{ formatDateTime(detailRow.void_at) }}</el-descriptions-item>
<el-descriptions-item label="作废原因">{{ detailRow.void_reason || '-' }}</el-descriptions-item>
</template>
<el-descriptions-item label="卖家留言" :span="2">{{ detailRow.seller_message || '-' }}</el-descriptions-item>
<el-descriptions-item label="备注 / 异常原因" :span="2">{{ detailRow.remark || '-' }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ formatDateTime(detailRow.created_at) }}</el-descriptions-item>
<el-descriptions-item label="更新时间">{{ formatDateTime(detailRow.updated_at) }}</el-descriptions-item>
<template v-if="isHistory">
<el-descriptions-item label="归档时间">{{ formatDateTime(detailRow.archived_at) }}</el-descriptions-item>
<el-descriptions-item label="转入时间">{{ formatDateTime(detailRow.transferred_at) }}</el-descriptions-item>
</template>
</el-descriptions>
<TaskPanelDialog
v-model="detailVisible"
:title="`订单 ${detailRow?.order_no || ''}`"
subtitle="单据头信息与商品明细,数据实时取自详情接口"
width="min(880px, 96vw)"
body-max-height="64vh"
>
<div v-if="detailRow" v-loading="detailLoading" class="task-panel__form">
<template v-for="group in detailGroups" :key="group.title">
<div class="task-panel__section">{{ group.title }}</div>
<div class="task-panel__grid">
<div
v-for="item in group.rows"
:key="item.label"
class="task-panel__field"
:class="{ 'task-panel__field--full': item.full }"
>
<span class="task-panel__field-label">{{ item.label }}</span>
<span class="task-panel__field-value">
<el-tag v-if="item.tag" size="small" :type="item.tag.type">{{ item.tag.text }}</el-tag>
<template v-else>{{ item.value }}</template>
</span>
</div>
</div>
</template>
<el-divider content-position="left">
<div class="task-panel__section">
商品明细({{ detailProducts.length }} 行{{ detailSnCodes.length ? ` · 序列号 ${detailSnCodes.length} 个` : '' }})
</el-divider>
<DataTable
:data="detailProducts"
:stripe="true"
row-key="id"
:expand-row-keys="expandedItemIds"
</div>
<div class="task-panel__table">
<DataTable
:data="detailProducts"
:stripe="true"
row-key="id"
:expand-row-keys="expandedItemIds"
@expand-change="onItemExpandChange"
>
<el-table-column type="expand" width="32">
@ -1306,8 +1444,13 @@ onBeforeUnmount(() => {
</template>
</el-table-column>
</DataTable>
</div>
</div>
<template #actions>
<el-button size="small" @click="detailVisible = false">关闭</el-button>
</template>
</el-drawer>
</TaskPanelDialog>
<!-- 新建 / 编辑(发货单口径:仓库 / 店铺 / 收件人 12 项 / 金额 / 留言 / 明细) -->
<OrderFormDialog
@ -1317,6 +1460,22 @@ onBeforeUnmount(() => {
@saved="handleFormSaved"
/>
<!-- 原因输入:作废 / 取消 / 手工标记推送失败 -->
<ReasonPromptDialog
v-model="reasonPrompt.visible"
:title="reasonPrompt.title"
:subtitle="reasonPrompt.subtitle"
:tip="reasonPrompt.tip"
:label="reasonPrompt.label"
:placeholder="reasonPrompt.placeholder"
:required="reasonPrompt.required"
:hint="reasonPrompt.hint"
:confirm-text="reasonPrompt.confirmText"
:confirm-type="reasonPrompt.confirmType"
@confirm="onReasonConfirm"
@cancel="onReasonCancel"
/>
<!-- 一键拉取订单(异步任务 + 进度):完成后刷新列表 -->
<OrderSyncDialog v-model="syncDialogVisible" />
@ -1448,10 +1607,4 @@ onBeforeUnmount(() => {
.add-line {
margin-top: 8px;
}
.compact-form :deep(.el-form-item) {
margin-bottom: 6px;
}
.compact-form :deep(.el-divider) {
margin: 6px 0 8px;
}
</style>

View File

@ -99,51 +99,103 @@ onMounted(fetchGroup)
<template>
<div v-loading="loading" class="group-settings">
<el-alert
type="info"
show-icon
:closable="false"
class="tip"
:title="`当前集团:${groupName || '未选择'},如需切换集团请使用顶部主体下拉`"
/>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form group-form"
scroll-to-error
@submit.prevent
>
<p class="task-panel__form-tip">
当前集团:{{ groupName || '未选择' }},如需切换集团请使用顶部主体下拉。
</p>
<el-form ref="formRef" :model="form" :rules="rules" label-width="110px" class="form">
<el-form-item label="集团名称" prop="name">
<el-input v-model="form.name" maxlength="100" placeholder="集团(主体)显示名称" />
</el-form-item>
<el-form-item label="集团类型" prop="type">
<el-select v-model="form.type" placeholder="请选择" style="width: 100%">
<el-option :value="1" label="自营" />
<el-option :value="2" label="加盟" />
<el-option :value="3" label="外部" />
</el-select>
</el-form-item>
<el-form-item label="联系人">
<el-input v-model="form.contact_name" maxlength="50" placeholder="选填" />
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="form.contact_phone" maxlength="20" placeholder="选填" />
</el-form-item>
<el-form-item label="状态">
<el-tag :type="form.status === 1 ? 'success' : 'info'">
{{ form.status === 1 ? '启用' : '已停用' }}
</el-tag>
<span class="status-hint">主体启用/停用由平台运维在后台维护,页面不可自行切换</span>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="3" maxlength="255" show-word-limit placeholder="选填" />
</el-form-item>
<el-form-item>
<el-button @click="fetchGroup">重置</el-button>
<el-button type="primary" :loading="submitting" @click="handleSave">保存</el-button>
</el-form-item>
<div class="task-panel__section">集团信息</div>
<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-form-item prop="name">
<el-input v-model="form.name" maxlength="100" placeholder="集团(主体)显示名称" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">集团类型</span>
<div class="task-panel__field-form">
<el-form-item prop="type">
<el-select v-model="form.type" placeholder="请选择" style="width: 100%">
<el-option :value="1" label="自营" />
<el-option :value="2" label="加盟" />
<el-option :value="3" 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-input v-model="form.contact_name" maxlength="50" placeholder="选填" />
</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="form.contact_phone" maxlength="20" placeholder="选填" />
</div>
</div>
<div class="task-panel__field task-panel__field--full 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="form.remark"
type="textarea"
:rows="2"
maxlength="255"
show-word-limit
placeholder="选填"
/>
</div>
</div>
<div class="task-panel__field task-panel__field--full">
<span class="task-panel__field-label">状态</span>
<span class="task-panel__field-value">
<el-tag :type="form.status === 1 ? 'success' : 'info'" size="small">
{{ form.status === 1 ? '启用' : '已停用' }}
</el-tag>
</span>
</div>
</div>
<p class="task-panel__form-tip">主体启用/停用由平台运维在后台维护,页面不可自行切换。</p>
<div class="task-panel__section">主体信息</div>
<div class="task-panel__grid">
<div class="task-panel__field">
<span class="task-panel__field-label">主体ID</span>
<strong class="task-panel__field-value">{{ meta.id ?? '-' }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">创建时间</span>
<strong class="task-panel__field-value">{{ formatDateTime(meta.created_at) }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">更新时间</span>
<strong class="task-panel__field-value">{{ formatDateTime(meta.updated_at) }}</strong>
</div>
</div>
<div class="form-actions">
<el-button size="small" @click="fetchGroup">重置</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="handleSave">保存</el-button>
</div>
</el-form>
<el-descriptions v-if="meta.id" :column="3" size="small" class="meta" border>
<el-descriptions-item label="主体ID">{{ meta.id }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ formatDateTime(meta.created_at) }}</el-descriptions-item>
<el-descriptions-item label="更新时间">{{ formatDateTime(meta.updated_at) }}</el-descriptions-item>
</el-descriptions>
</div>
</template>
@ -153,19 +205,13 @@ onMounted(fetchGroup)
overflow: auto;
padding-right: 4px;
}
.tip {
margin-bottom: 16px;
.group-form {
max-width: 880px;
}
.form {
max-width: 620px;
}
.meta {
max-width: 620px;
margin-top: 8px;
}
.status-hint {
margin-left: 10px;
font-size: 12px;
color: var(--el-text-color-secondary);
.form-actions {
display: flex;
justify-content: flex-end;
gap: 6px;
margin-top: 12px;
}
</style>

View File

@ -3,6 +3,7 @@ import { onMounted, reactive, ref, watch } from 'vue'
import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import { usePrincipalStore } from '@/store/principal'
import { formatDateTime } from '@/utils/datetime'
@ -131,6 +132,7 @@ async function handleDelete(row: PrincipalSubsidiaryItem) {
type: 'warning',
confirmButtonText: '删除',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -169,11 +171,11 @@ onMounted(fetchList)
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button @click="reset">重置</el-button>
<el-button size="small" type="primary" @click="search">查询</el-button>
<el-button size="small" @click="reset">重置</el-button>
</el-form-item>
<el-form-item class="add-btn">
<el-button type="success" @click="openCreate">新增下属公司</el-button>
<el-button size="small" type="success" @click="openCreate">新增下属公司</el-button>
</el-form-item>
</el-form>
@ -213,35 +215,96 @@ onMounted(fetchList)
@size-change="handleSizeChange"
/>
<el-drawer v-model="drawerVisible" :title="editId == null ? '新增下属公司' : '编辑下属公司'" size="480px">
<el-form ref="formRef" :model="form" :rules="rules" label-width="130px">
<el-form-item label="公司名称" prop="name">
<el-input v-model="form.name" maxlength="100" placeholder="下属公司全称" />
</el-form-item>
<el-form-item label="统一社会信用代码">
<el-input v-model="form.credit_code" maxlength="50" placeholder="选填" />
</el-form-item>
<el-form-item label="联系人">
<el-input v-model="form.contact_name" maxlength="50" placeholder="选填" />
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="form.contact_phone" maxlength="20" placeholder="选填" />
</el-form-item>
<el-form-item label="公司地址">
<el-input v-model="form.address" maxlength="255" placeholder="选填" />
</el-form-item>
<el-form-item label="状态">
<el-switch v-model="form.status" :active-value="1" :inactive-value="0" active-text="启用" inactive-text="禁用" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="2" maxlength="255" show-word-limit placeholder="选填" />
</el-form-item>
<TaskPanelDialog
v-model="drawerVisible"
:title="editId == null ? '新增下属公司' : '编辑下属公司'"
subtitle="下属公司是商品的「所属货主」与外部仓库的归属,按当前主体隔离"
width="min(560px, 92vw)"
body-max-height="60vh"
>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__grid task-panel__grid--single">
<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" maxlength="100" 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-input v-model="form.credit_code" maxlength="50" placeholder="统一社会信用代码,选填" />
</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="form.contact_name" maxlength="50" placeholder="选填" />
</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="form.contact_phone" maxlength="20" placeholder="选填" />
</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="form.address" maxlength="255" placeholder="选填" />
</div>
</div>
<div class="task-panel__field task-panel__field--control">
<span class="task-panel__field-label">状态</span>
<div class="task-panel__field-form">
<el-switch
v-model="form.status"
:active-value="1"
:inactive-value="0"
active-text="启用"
inactive-text="禁用"
/>
</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-form">
<el-input
v-model="form.remark"
type="textarea"
:rows="2"
maxlength="255"
show-word-limit
placeholder="选填"
/>
</div>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="drawerVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">确定</el-button>
<template #hint>
{{ editId == null ? '保存后可作为商品货主与仓库归属' : '修改后同步到引用该公司的商品与仓库' }}
</template>
</el-drawer>
<template #actions>
<el-button size="small" @click="drawerVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">确定</el-button>
</template>
</TaskPanelDialog>
</div>
</template>

View File

@ -302,211 +302,302 @@ onMounted(async () => {
<template #header>
<div class="page-header">
<span>创建出库单</span>
<div>
<el-button @click="handleReset">重置</el-button>
<el-button @click="cancel">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submit">保存</el-button>
<div class="page-actions">
<el-button size="small" @click="handleReset">重置</el-button>
<el-button size="small" @click="cancel">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submit">保存</el-button>
</div>
</div>
</template>
<div class="page-scroll">
<el-form ref="formRef" :model="form" :rules="rules" size="small" label-width="96px" class="compact-form">
<el-divider content-position="left">单据信息</el-divider>
<el-row :gutter="16">
<el-col :span="6">
<el-form-item label="仓库" prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="selectableWarehouses"
label-key="name"
value-key="id"
placeholder="请选择仓库"
clearable
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="出库类型">
<el-select v-model="form.outbound_type" style="width: 100%">
<el-option v-for="o in TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="目标店铺">
<VirtualSelect
v-model="form.shop_id"
:options="shops"
label-key="name"
value-key="id"
placeholder="选填"
clearable
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户/收货方">
<el-input v-model="form.customer" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物流公司">
<el-select
v-model="form.express_code"
placeholder="选填,推送为 logisticsCode"
clearable
filterable
style="width: 100%"
@change="handleExpressChange"
>
<el-option v-for="c in expressCompanies" :key="c.code" :label="`${c.name}(${c.code})`" :value="c.code" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据金额">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注">
<el-input v-model="form.remark" placeholder="选填" />
</el-form-item>
</el-col>
</el-row>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form create-form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__section">单据信息</div>
<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-form-item prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="selectableWarehouses"
label-key="name"
value-key="id"
placeholder="请选择仓库"
clearable
style="width: 100%"
/>
</el-form-item>
</div>
</div>
<el-divider content-position="left">收件人(receiverInfo)</el-divider>
<el-row :gutter="16">
<el-col :span="6">
<el-form-item label="姓名">
<el-input v-model="form.receiver_name" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="公司">
<el-input v-model="form.receiver_company" maxlength="200" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="手机">
<el-input v-model="form.receiver_mobile" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="固定电话">
<el-input v-model="form.receiver_tel" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="邮箱">
<el-input v-model="form.receiver_email" maxlength="100" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="邮编">
<el-input v-model="form.receiver_zip_code" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="国家编码">
<el-input v-model="form.receiver_country_code" maxlength="50" placeholder="如 CN" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号">
<el-input v-model="form.receiver_id" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="省">
<el-input v-model="form.receiver_province" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="市">
<el-input v-model="form.receiver_city" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="区">
<el-input v-model="form.receiver_area" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="街道/镇">
<el-input v-model="form.receiver_town" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="详细地址">
<el-input v-model="form.receiver_detail_address" maxlength="200" />
</el-form-item>
</el-col>
</el-row>
<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="outbound_type">
<el-select v-model="form.outbound_type" style="width: 100%">
<el-option v-for="o in TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</el-form-item>
</div>
</div>
<el-divider content-position="left">商品明细</el-divider>
<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="shop_id">
<VirtualSelect
v-model="form.shop_id"
:options="shops"
label-key="name"
value-key="id"
placeholder="选填"
clearable
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="customer">
<el-input v-model="form.customer" 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="express_code">
<el-select
v-model="form.express_code"
placeholder="选填,推送为 logisticsCode"
clearable
filterable
style="width: 100%"
@change="handleExpressChange"
>
<el-option v-for="c in expressCompanies" :key="c.code" :label="`${c.name}(${c.code})`" :value="c.code" />
</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="total_amount">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
</div>
</div>
<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-form-item prop="remark">
<el-input v-model="form.remark" placeholder="选填" />
</el-form-item>
</div>
</div>
</div>
<div class="task-panel__section">收件人(receiverInfo)</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="receiver_name">
<el-input v-model="form.receiver_name" maxlength="50" 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="receiver_company">
<el-input v-model="form.receiver_company" maxlength="200" 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="receiver_mobile">
<el-input v-model="form.receiver_mobile" maxlength="50" 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="receiver_tel">
<el-input v-model="form.receiver_tel" maxlength="50" 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="receiver_email">
<el-input v-model="form.receiver_email" maxlength="100" 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="receiver_zip_code">
<el-input v-model="form.receiver_zip_code" maxlength="50" 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="receiver_country_code">
<el-input v-model="form.receiver_country_code" maxlength="50" placeholder="如 CN" />
</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="receiver_id">
<el-input v-model="form.receiver_id" maxlength="50" 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="receiver_province">
<el-input v-model="form.receiver_province" maxlength="50" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">市</span>
<div class="task-panel__field-form">
<el-form-item prop="receiver_city">
<el-input v-model="form.receiver_city" maxlength="50" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">区</span>
<div class="task-panel__field-form">
<el-form-item prop="receiver_area">
<el-input v-model="form.receiver_area" maxlength="50" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">街道/镇</span>
<div class="task-panel__field-form">
<el-form-item prop="receiver_town">
<el-input v-model="form.receiver_town" maxlength="50" />
</el-form-item>
</div>
</div>
<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-form-item prop="receiver_detail_address">
<el-input v-model="form.receiver_detail_address" maxlength="200" />
</el-form-item>
</div>
</div>
</div>
<div class="task-panel__section">商品明细</div>
<div class="items-toolbar">
<span class="items-title">共 {{ lines.length }} 项</span>
<span class="items-total">合计金额:{{ itemsTotal.toFixed(2) }}</span>
<el-button type="primary" size="small" @click="addLine">添加商品</el-button>
<el-button size="small" type="primary" @click="addLine">添加商品</el-button>
</div>
<div v-if="warehouseOwnerId !== null || goodsOwnerId !== null" class="items-tip">
<p
v-if="warehouseOwnerId !== null || goodsOwnerId !== null"
class="task-panel__form-tip"
>
{{ warehouseOwnerId !== null
? '明细商品仅可选与仓库同货主(所属公司)的商品'
: '已按所选商品的货主(所属公司)过滤可选仓库' }}
</p>
<div class="task-panel__table">
<el-table :data="lines" size="small" border max-height="320">
<el-table-column label="商品" min-width="170">
<template #default="{ row, $index }">
<ProductSelect
v-model="row.product_id"
:subsidiary-id="scopeSubsidiaryId"
:before-select="(p: ProductSearchItem) => canPickGoods(p.subsidiary_id, $index)"
@select="(p: ProductSearchItem) => onLineProductSelect($index, p)"
/>
</template>
</el-table-column>
<el-table-column label="商品编码" width="120">
<template #default="{ row }">
<el-input v-model="row.code" size="small" placeholder="自动带出" />
</template>
</el-table-column>
<el-table-column label="商品名称" min-width="140">
<template #default="{ row }">
<el-input v-model="row.name" size="small" placeholder="自动带出" />
</template>
</el-table-column>
<el-table-column label="库存类型" width="110">
<template #default="{ row }">
<el-select v-model="row.inventory_type" size="small" style="width: 100%">
<el-option v-for="o in INVENTORY_TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="数量" width="100">
<template #default="{ row }">
<el-input-number v-model="row.quantity" :min="0" :precision="3" size="small" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="单价" width="110">
<template #default="{ row }">
<el-input-number v-model="row.price" :min="0" :precision="2" size="small" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="金额" width="100" align="right">
<template #default="{ row }">
{{ ((Number(row.quantity) || 0) * (Number(row.price) || 0)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="操作" width="64" fixed="right">
<template #default="{ $index }">
<el-button link type="danger" size="small" @click="removeLine($index)">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<el-table :data="lines" size="small" border max-height="240">
<el-table-column label="商品" min-width="170">
<template #default="{ row, $index }">
<ProductSelect
v-model="row.product_id"
:subsidiary-id="scopeSubsidiaryId"
:before-select="(p: ProductSearchItem) => canPickGoods(p.subsidiary_id, $index)"
@select="(p: ProductSearchItem) => onLineProductSelect($index, p)"
/>
</template>
</el-table-column>
<el-table-column label="商品编码" width="120">
<template #default="{ row }">
<el-input v-model="row.code" placeholder="自动带出" />
</template>
</el-table-column>
<el-table-column label="商品名称" min-width="140">
<template #default="{ row }">
<el-input v-model="row.name" placeholder="自动带出" />
</template>
</el-table-column>
<el-table-column label="库存类型" width="110">
<template #default="{ row }">
<el-select v-model="row.inventory_type" style="width: 100%">
<el-option v-for="o in INVENTORY_TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</template>
</el-table-column>
<el-table-column label="数量" width="100">
<template #default="{ row }">
<el-input-number v-model="row.quantity" :min="0" :precision="3" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="单价" width="110">
<template #default="{ row }">
<el-input-number v-model="row.price" :min="0" :precision="2" style="width: 100%" />
</template>
</el-table-column>
<el-table-column label="金额" width="100" align="right">
<template #default="{ row }">
{{ ((Number(row.quantity) || 0) * (Number(row.price) || 0)).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="操作" width="64" fixed="right">
<template #default="{ $index }">
<el-button link type="danger" @click="removeLine($index)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</el-card>
@ -519,32 +610,23 @@ onMounted(async () => {
justify-content: space-between;
font-weight: 600;
}
/* 紧凑排版:压缩表单项行距、分割线边距与卡片内边距(与创建发货单一致) */
.compact-form :deep(.el-form-item) {
margin-bottom: 6px;
/* 头部操作按钮:与表单面板底部一致(small / gap 6) */
.page-actions {
display: flex;
align-items: center;
gap: 6px;
}
.compact-form :deep(.el-form-item__label) {
padding-right: 6px;
/* 页面型表单:分组之间留出比弹窗更大的间距 */
.create-form .task-panel__section {
margin-top: 12px;
}
/* 数值字段(金额)不必占满整列 */
.compact-form :deep(.el-input-number) {
max-width: 124px;
.create-form .task-panel__section:first-child {
margin-top: 0;
}
/* 明细表格内控件本身列宽已很窄,不做限制 */
.compact-form :deep(.el-table .el-input-number) {
max-width: none;
}
.compact-form :deep(.el-table .cell) {
.create-form :deep(.el-table .cell) {
padding: 0 6px;
}
.compact-form :deep(.el-divider--horizontal) {
margin: 6px 0 8px;
}
.compact-form :deep(.el-divider__text) {
font-size: 13px;
font-weight: 600;
color: #303133;
}
.create-card {
flex: 1;
min-height: 0;
@ -566,24 +648,22 @@ onMounted(async () => {
flex: 1;
min-height: 0;
overflow-y: auto;
padding-right: 4px;
}
.items-toolbar {
display: flex;
align-items: center;
gap: 12px;
margin-bottom: 8px;
}
.items-title {
color: #606266;
font-size: 13px;
font-size: 12px;
line-height: 18px;
}
.items-total {
font-size: 12px;
line-height: 18px;
font-weight: 600;
color: #303133;
}
.items-tip {
margin-bottom: 6px;
color: var(--el-text-color-secondary);
font-size: 12px;
}
</style>

View File

@ -16,6 +16,8 @@ import SplitLayout from '@/components/SplitLayout.vue'
import ExportButton from '@/components/ExportButton.vue'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import ReasonPromptDialog from '@/components/ReasonPromptDialog.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import VirtualSelect from '@/components/VirtualSelect.vue'
import ProductSelect from '@/components/ProductSelect.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
@ -257,7 +259,7 @@ async function transit(action: 'audit' | 'push' | 'complete' | 'cancel' | 'resto
async function handleDelete(row: OutboundOrder) {
try {
await ElMessageBox.confirm(`确认删除出库单「${row.bill_no}」?`, '删除确认', {
type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消',
type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消', customClass: 'app-confirm-box',
})
} catch { return }
try {
@ -273,23 +275,30 @@ async function handleDelete(row: OutboundOrder) {
}
}
/** 作废:仅「已审核(2)」可作废,需确认并可填写作废原因;作废后不可恢复 */
const voidPrompt = reactive({ visible: false, subtitle: '' })
let voidResolver: ((value: string | null) => void) | null = null
function askVoidReason(row: OutboundOrder): Promise<string | null> {
voidPrompt.subtitle = `确认作废出库单「${row.bill_no}」?`
voidPrompt.visible = true
return new Promise<string | null>((resolve) => {
voidResolver = resolve
})
}
function onVoidConfirm(value: string) {
voidResolver?.(value)
voidResolver = null
}
function onVoidCancel() {
voidResolver?.(null)
voidResolver = null
}
async function handleVoid(row: OutboundOrder) {
let reason = ''
try {
const res = await ElMessageBox.prompt(
`确认作废出库单「${row.bill_no}」?作废后不可恢复。`,
'作废确认',
{
type: 'warning',
confirmButtonText: '确认作废',
cancelButtonText: '取消',
inputType: 'textarea',
inputPlaceholder: '作废原因(选填)',
inputValidator: () => true,
},
)
reason = (res.value || '').trim()
} catch { return }
const reason = await askVoidReason(row)
if (reason === null) return
try {
await outboundOrderApi.voidOrder(row.id, reason ? { void_reason: reason } : {})
ElMessage.success('已作废')
@ -306,7 +315,7 @@ async function handleReject(row: OutboundOrder) {
: `确认驳回出库单「${row.bill_no}」?驳回后回到「待出库」并自动加单号后缀(如 _1),可重新编辑后再次审核。`
try {
await ElMessageBox.confirm(tip, '驳回确认', {
type: 'warning', confirmButtonText: '确认驳回', cancelButtonText: '取消',
type: 'warning', confirmButtonText: '确认驳回', cancelButtonText: '取消', customClass: 'app-confirm-box',
})
} catch { return }
try {
@ -779,34 +788,51 @@ onMounted(async () => {
</template>
</SplitLayout>
<!-- 新增 / 编辑 对话框 -->
<el-dialog
<!-- 编辑出库单:面板结构对齐其它业务表单 -->
<TaskPanelDialog
v-model="dialogVisible"
title="编辑出库单"
width="880px"
subtitle="修改单据信息与收件人资料,保存后按当前状态流转"
width="min(880px, 96vw)"
body-max-height="64vh"
>
<el-form ref="formRef" :model="form" :rules="rules" label-width="110px">
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="仓库" prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="warehouseSelectOptions"
placeholder="请选择仓库"
clearable
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出库类型">
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__section">单据信息</div>
<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-form-item prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="warehouseSelectOptions"
placeholder="请选择仓库"
clearable
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-select v-model="form.outbound_type" style="width: 100%">
<el-option v-for="o in TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="目标店铺">
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">目标店铺</span>
<div class="task-panel__field-form">
<VirtualSelect
v-model="form.shop_id"
:options="shopSelectOptions"
@ -814,15 +840,19 @@ onMounted(async () => {
clearable
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户/收货方">
</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="form.customer" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物流公司">
</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="form.express_code"
placeholder="选填,推送为 logisticsCode"
@ -833,94 +863,141 @@ onMounted(async () => {
>
<el-option v-for="c in expressCompanies" :key="c.code" :label="`${c.name}(${c.code})`" :value="c.code" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单据金额">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</el-col>
</div>
</div>
<el-col :span="24">
<el-divider content-position="left">收件人(receiverInfo)</el-divider>
</el-col>
<el-col :span="12">
<el-form-item label="姓名">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">单据金额</span>
<div class="task-panel__field-form">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" 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="form.remark" type="textarea" :rows="2" placeholder="选填" />
</div>
</div>
</div>
<div class="task-panel__section">收件人(receiverInfo)</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-input v-model="form.receiver_name" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="公司">
</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="form.receiver_company" maxlength="200" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="手机">
</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="form.receiver_mobile" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="固定电话">
</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="form.receiver_tel" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱">
</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="form.receiver_email" maxlength="100" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮编">
</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="form.receiver_zip_code" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="国家编码">
</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="form.receiver_country_code" maxlength="50" placeholder="如 CN" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="收件人证件号">
</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="form.receiver_id" maxlength="50" placeholder="选填" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="省">
</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="form.receiver_province" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="市">
</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="form.receiver_city" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="区">
</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="form.receiver_area" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="街道/镇">
</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="form.receiver_town" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="详细地址">
</div>
</div>
<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="form.receiver_detail_address" maxlength="200" />
</el-form-item>
</el-col>
</el-row>
</div>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">保存</el-button>
<template #hint>带 * 为必填项</template>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
<!-- 作废原因输入 -->
<ReasonPromptDialog
v-model="voidPrompt.visible"
title="作废确认"
:subtitle="voidPrompt.subtitle"
tip="作废后不可恢复,库存锁定会被释放,单据不可再流转。"
label="作废原因"
placeholder="作废原因(选填)"
multiline
confirm-text="确认作废"
confirm-type="danger"
hint="作废原因会记录在单据上"
@confirm="onVoidConfirm"
@cancel="onVoidCancel"
/>
</el-card>
</template>

View File

@ -3,6 +3,7 @@ import { computed, onMounted, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import { formatDateTime } from '@/utils/datetime'
import {
@ -150,7 +151,7 @@ async function handleDelete(row: RoleItem) {
await ElMessageBox.confirm(
`确认删除角色组「${row.name}」?已分配该角色的账号将变为未分配角色组。`,
'删除确认',
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' },
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消', customClass: 'app-confirm-box' },
)
} catch {
return
@ -195,11 +196,11 @@ onMounted(async () => {
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button @click="reset">重置</el-button>
<el-button size="small" type="primary" @click="search">查询</el-button>
<el-button size="small" @click="reset">重置</el-button>
</el-form-item>
<el-form-item class="add-btn">
<el-button type="success" @click="openCreate">新增角色组</el-button>
<el-button size="small" type="success" @click="openCreate">新增角色组</el-button>
</el-form-item>
</el-form>
@ -255,50 +256,87 @@ onMounted(async () => {
@size-change="handleSizeChange"
/>
<el-drawer v-model="drawerVisible" :title="drawerTitle" size="560px">
<el-alert
v-if="readonly"
type="info"
show-icon
:closable="false"
class="tip"
title="系统预设角色的权限固定,不可修改或删除;如需调整请新建自定义角色"
/>
<el-form ref="formRef" :model="form" :rules="rules" label-width="100px" :disabled="readonly">
<el-form-item label="角色名称" prop="name">
<el-input v-model="form.name" maxlength="50" placeholder="如 区域运营" />
</el-form-item>
<el-form-item label="角色标识">
<el-input v-model="form.code" maxlength="50" placeholder="选填,留空自动生成;用于接口标识" />
</el-form-item>
<el-form-item label="状态">
<el-switch v-model="form.status" :active-value="1" :inactive-value="0" active-text="启用" inactive-text="禁用" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="2" maxlength="255" show-word-limit placeholder="选填" />
</el-form-item>
<el-form-item label="权限配置">
<div class="perm-matrix">
<div v-for="menu in menus" :key="menu.id" class="menu-row">
<div class="menu-name">{{ menu.name }}</div>
<el-checkbox-group v-model="form.permission_ids" :disabled="readonly">
<el-checkbox
v-for="p in permissionsOfMenu(menu.id)"
:key="p.id"
:value="p.id"
>
{{ PERMISSION_SCOPE_LABELS[p.scope as PermissionScope] }}
</el-checkbox>
</el-checkbox-group>
<TaskPanelDialog
v-model="drawerVisible"
:title="drawerTitle"
subtitle="角色组决定员工可见的菜单与数据范围,系统预设角色只读"
width="min(720px, 94vw)"
body-max-height="60vh"
>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
:disabled="readonly"
scroll-to-error
@submit.prevent
>
<p v-if="readonly" class="task-panel__form-tip">
系统预设角色的权限固定,不可修改或删除;如需调整请新建自定义角色。
</p>
<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-form-item prop="name">
<el-input v-model="form.name" maxlength="50" placeholder="如 区域运营" />
</el-form-item>
</div>
</div>
</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-input v-model="form.code" maxlength="50" placeholder="选填,留空自动生成" />
</div>
</div>
<div class="task-panel__field task-panel__field--control">
<span class="task-panel__field-label">状态</span>
<div class="task-panel__field-form">
<el-switch
v-model="form.status"
:active-value="1"
:inactive-value="0"
active-text="启用"
inactive-text="禁用"
/>
</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-form">
<el-input v-model="form.remark" type="textarea" :rows="2" maxlength="255" show-word-limit placeholder="选填" />
</div>
</div>
</div>
<div class="task-panel__section">权限配置</div>
<div class="perm-matrix">
<div v-for="menu in menus" :key="menu.id" class="menu-row">
<div class="menu-name">{{ menu.name }}</div>
<el-checkbox-group v-model="form.permission_ids" :disabled="readonly">
<el-checkbox v-for="p in permissionsOfMenu(menu.id)" :key="p.id" :value="p.id">
{{ PERMISSION_SCOPE_LABELS[p.scope as PermissionScope] }}
</el-checkbox>
</el-checkbox-group>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="drawerVisible = false">{{ readonly ? '关闭' : '取消' }}</el-button>
<el-button v-if="!readonly" type="primary" :loading="submitting" @click="submitForm">确定</el-button>
<template #hint>
{{ readonly ? '系统预设角色仅可查看' : `已勾选 ${form.permission_ids.length} 项权限` }}
</template>
</el-drawer>
<template #actions>
<el-button size="small" @click="drawerVisible = false">{{ readonly ? '关闭' : '取消' }}</el-button>
<el-button v-if="!readonly" size="small" type="primary" :loading="submitting" @click="submitForm">
确定
</el-button>
</template>
</TaskPanelDialog>
</div>
</template>
@ -321,23 +359,21 @@ onMounted(async () => {
min-height: 0;
overflow: hidden;
}
.tip {
margin-bottom: 16px;
}
.perm-matrix {
width: 100%;
border: 1px solid var(--el-border-color-lighter);
box-sizing: border-box;
border: 1px solid #ebeef5;
border-radius: 4px;
padding: 4px 12px;
max-height: 320px;
padding: 2px 12px;
max-height: 300px;
overflow: auto;
}
.menu-row {
display: flex;
align-items: center;
gap: 12px;
padding: 4px 0;
border-bottom: 1px dashed var(--el-border-color-lighter);
padding: 3px 0;
border-bottom: 1px dashed #ebeef5;
}
.menu-row:last-child {
border-bottom: none;
@ -345,6 +381,10 @@ onMounted(async () => {
.menu-name {
width: 110px;
flex: 0 0 auto;
color: var(--el-text-color-regular);
font-size: 12px;
color: #606266;
}
.perm-matrix :deep(.el-checkbox__label) {
font-size: 12px;
}
</style>

View File

@ -48,42 +48,74 @@ async function handleSubmit() {
<template>
<div class="create-principal">
<el-card class="panel" header="创建主体">
<el-card class="panel">
<template #header>
<div class="panel-header">
<el-icon><OfficeBuilding /></el-icon>
<span>创建主体</span>
</div>
</template>
<el-alert
type="info"
:closable="false"
title="你当前尚未关联任何主体,请先创建一个主体以使用系统功能"
style="margin-bottom: 20px"
/>
<el-form ref="formRef" :model="form" :rules="rules" label-width="96px" style="max-width: 520px">
<el-form-item label="主体名称" prop="name">
<el-input v-model="form.name" placeholder="主体显示名称,如 某某贸易公司" />
</el-form-item>
<el-form-item label="主体类型" prop="type">
<el-select v-model="form.type" placeholder="请选择" style="width: 100%">
<el-option :value="1" label="自营" />
<el-option :value="2" label="加盟" />
<el-option :value="3" label="外部" />
</el-select>
</el-form-item>
<el-form-item label="联系人">
<el-input v-model="form.contact_name" placeholder="选填" />
</el-form-item>
<el-form-item label="联系电话">
<el-input v-model="form.contact_phone" placeholder="选填" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
<el-form-item>
<el-button type="primary" :loading="submitting" @click="handleSubmit">创建主体</el-button>
</el-form-item>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<p class="task-panel__form-tip">
你当前尚未关联任何主体,请先创建一个主体以使用系统功能;创建后可在「组织架构」继续维护下属公司。
</p>
<div class="task-panel__grid task-panel__grid--single">
<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" placeholder="主体显示名称,如 某某贸易公司" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">主体类型</span>
<div class="task-panel__field-form">
<el-form-item prop="type">
<el-select v-model="form.type" placeholder="请选择" style="width: 100%">
<el-option :value="1" label="自营" />
<el-option :value="2" label="加盟" />
<el-option :value="3" 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-input v-model="form.contact_name" placeholder="选填" />
</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="form.contact_phone" placeholder="选填" />
</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-form">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" />
</div>
</div>
</div>
<div class="form-actions">
<el-button size="small" type="primary" :loading="submitting" @click="handleSubmit">创建主体</el-button>
</div>
</el-form>
</el-card>
</div>
@ -107,4 +139,11 @@ async function handleSubmit() {
gap: 8px;
font-weight: 600;
}
.form-actions {
display: flex;
justify-content: flex-end;
gap: 6px;
margin-top: 12px;
}
</style>

View File

@ -15,6 +15,7 @@ import {
import { getWechatEnabled, type WechatQrcode } from '@/api/wechat'
import DataTable from '@/components/DataTable.vue'
import ExportButton from '@/components/ExportButton.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import ImageUploader from '@/components/ImageUploader.vue'
import ListPager from '@/components/ListPager.vue'
import QrCode from '@/components/QrCode.vue'
@ -376,9 +377,9 @@ async function refreshWechatQrcode() {
const res = await createEmployeeWechatBindCode(target.id)
wechatQr.value = res
startWechatPolling(target.id, res.state)
} catch {
// 具体原因由响应拦截器统一提示,这里只给弹窗内的兜底文案
wechatHint.value = '获取微信二维码失败,请稍后重试'
} catch (error) {
const err = error as { response?: { data?: { message?: string } }; message?: string }
wechatHint.value = err?.response?.data?.message || err?.message || '获取微信二维码失败,请稍后重试'
} finally {
wechatLoading.value = false
}
@ -397,7 +398,7 @@ async function handleWechatUnbind(row: PrincipalUserItem) {
await ElMessageBox.confirm(
`确认解绑「${userLabel(row)}」的微信?解绑后该员工将无法使用微信扫码登录。`,
'解绑微信',
{ type: 'warning', confirmButtonText: '确定解绑', cancelButtonText: '取消' },
{ type: 'warning', confirmButtonText: '确定解绑', cancelButtonText: '取消', customClass: 'app-confirm-box' },
)
} catch {
return
@ -419,6 +420,7 @@ async function handleUnbind(row: PrincipalUserItem) { try {
type: 'warning',
confirmButtonText: '解绑',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -465,8 +467,8 @@ onUnmounted(stopWechatPolling)
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button @click="reset">重置</el-button>
<el-button size="small" type="primary" @click="search">查询</el-button>
<el-button size="small" @click="reset">重置</el-button>
</el-form-item>
</el-form>
@ -559,156 +561,270 @@ onUnmounted(stopWechatPolling)
@size-change="handleSizeChange"
/>
<el-dialog v-model="inviteVisible" title="新增员工" width="520px">
<el-form ref="inviteFormRef" :model="inviteForm" :rules="inviteRules" label-width="88px">
<el-form-item label="邮箱" prop="email">
<el-input v-model="inviteForm.email" placeholder="选填:不填则创建临时账号" />
<div class="form-hint">
填邮箱后作为登录账号;留空则生成临时账号(邮箱可后续补填,也可直接用微信扫码绑定)
<TaskPanelDialog
v-model="inviteVisible"
title="新增员工"
subtitle="填邮箱则创建可登录账号,留空生成临时账号(后续可扫码绑定微信)"
width="min(560px, 92vw)"
body-max-height="62vh"
>
<el-form
ref="inviteFormRef"
:model="inviteForm"
:rules="inviteRules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__grid task-panel__grid--single">
<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="email">
<el-input v-model="inviteForm.email" placeholder="选填:不填则创建临时账号" />
</el-form-item>
<span class="task-panel__field-hint">
填邮箱后作为登录账号;留空则生成临时账号(邮箱可后续补填,也可直接用微信扫码绑定)
</span>
</div>
</div>
</el-form-item>
<el-form-item label="姓名" prop="name">
<el-input v-model="inviteForm.name" placeholder="员工在此主体下的显示名称" />
</el-form-item>
<el-form-item label="角色组" prop="role_id">
<el-select v-model="inviteForm.role_id" placeholder="请选择角色组" style="width: 100%">
<el-option v-for="r in roles" :key="r.id" :label="r.name" :value="r.id" />
</el-select>
</el-form-item>
<el-form-item label="所属公司" prop="company_ids">
<el-select
v-model="inviteForm.company_ids"
multiple
filterable
placeholder="可关联多家公司"
style="width: 100%"
>
<el-option v-for="c in companies" :key="c.id" :label="c.name" :value="c.id" />
</el-select>
</el-form-item>
<el-form-item label="头像">
<ImageUploader v-model="inviteAvatarList" :limit="1" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="inviteVisible = false">取消</el-button>
<el-button type="primary" :loading="inviteSubmitting" @click="submitInvite">确定创建</el-button>
</template>
</el-dialog>
<el-dialog v-model="editVisible" title="编辑员工" width="520px">
<el-form ref="editFormRef" :model="editForm" :rules="editRules" label-width="88px">
<el-form-item label="姓名" prop="name">
<el-input v-model="editForm.name" placeholder="员工在此主体下的显示名称" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input
v-model="editForm.email"
:disabled="editEmailLocked"
:placeholder="editEmailLocked ? '已绑定邮箱' : '选填:为临时账号补填邮箱'"
/>
<div class="form-hint">
{{ editEmailLocked ? '邮箱已绑定,如需修改请让员工在「个人设置」中维护' : '临时账号可在此补填邮箱,补填后即可用邮箱登录' }}
<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="inviteForm.name" placeholder="员工在此主体下的显示名称" />
</el-form-item>
</div>
</div>
</el-form-item>
<el-form-item label="头像">
<ImageUploader v-model="editAvatarList" :limit="1" />
</el-form-item>
<el-form-item label="角色组" prop="role_id">
<el-select
v-model="editForm.role_id"
placeholder="请选择角色组"
:disabled="isCompanyScope"
style="width: 100%"
>
<el-option v-for="r in roles" :key="r.id" :label="r.name" :value="r.id" />
</el-select>
<div v-if="isCompanyScope" class="form-hint">所在公司权限不可修改角色组</div>
</el-form-item>
<el-form-item label="所属公司" prop="company_ids">
<el-select
v-model="editForm.company_ids"
multiple
filterable
placeholder="可关联多家公司"
:disabled="isCompanyScope"
style="width: 100%"
>
<el-option v-for="c in companies" :key="c.id" :label="c.name" :value="c.id" />
</el-select>
<div v-if="isCompanyScope" class="form-hint">所在公司权限不可修改所属公司</div>
<div v-if="editIsOwner" class="form-hint">主体所有者无需关联公司</div>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="editForm.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="editVisible = false">取消</el-button>
<el-button type="primary" :loading="editSubmitting" @click="submitEdit">保存</el-button>
</template>
</el-dialog>
<el-dialog v-model="inviteResultVisible" :title="inviteResult?.reused ? '已关联现有账号' : '账号已开通'" width="520px">
<el-alert
v-if="inviteResult?.reused"
type="info"
:closable="false"
title="该邮箱已注册过账号,已直接关联到当前主体;登录密码沿用原账号密码,如需重置请在登录页使用「忘记密码」"
style="margin-bottom: 16px"
/>
<el-alert
v-else-if="inviteResult?.temporary"
type="warning"
:closable="false"
title="未填邮箱,已创建临时账号:可直接把下方账号密码交给员工登录,或在员工档案里点「绑定微信」让员工扫码(该微信已有账号时会自动绑定到该账号);邮箱可后续在员工档案或「个人设置」中补填"
style="margin-bottom: 16px"
/>
<el-alert
v-else
type="warning"
:closable="false"
title="初始密码仅显示一次,请复制后妥善交付给被邀请人,并提醒其尽快登录修改密码"
style="margin-bottom: 16px"
/>
<div class="copy-row">
<span class="copy-label">登录账号</span>
<el-input :model-value="inviteResult?.username" readonly>
<template #append>
<el-button @click="copyText(inviteResult?.username || '')">复制</el-button>
</template>
</el-input>
<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="role_id">
<el-select v-model="inviteForm.role_id" placeholder="请选择角色组" style="width: 100%">
<el-option v-for="r in roles" :key="r.id" :label="r.name" :value="r.id" />
</el-select>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">所属公司</span>
<div class="task-panel__field-form">
<el-form-item prop="company_ids">
<el-select
v-model="inviteForm.company_ids"
multiple
filterable
placeholder="可关联多家公司"
style="width: 100%"
>
<el-option v-for="c in companies" :key="c.id" :label="c.name" :value="c.id" />
</el-select>
</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>
<div class="task-panel__field-form">
<ImageUploader v-model="inviteAvatarList" :limit="1" />
</div>
</div>
</div>
</el-form>
<template #hint>
{{ inviteForm.email ? '创建后可用邮箱 + 设置的初始密码登录' : '临时账号建议绑定微信后扫码登录' }}
</template>
<template #actions>
<el-button size="small" @click="inviteVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="inviteSubmitting" @click="submitInvite">确定创建</el-button>
</template>
</TaskPanelDialog>
<TaskPanelDialog
v-model="editVisible"
title="编辑员工"
subtitle="修改员工在本主体下的姓名、角色组与所属公司"
width="min(560px, 92vw)"
body-max-height="62vh"
>
<el-form
ref="editFormRef"
:model="editForm"
:rules="editRules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__grid task-panel__grid--single">
<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="editForm.name" 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="email">
<el-input
v-model="editForm.email"
:disabled="editEmailLocked"
:placeholder="editEmailLocked ? '已绑定邮箱' : '选填:为临时账号补填邮箱'"
/>
</el-form-item>
<span class="task-panel__field-hint">
{{
editEmailLocked
? '邮箱已绑定,如需修改请让员工在「个人设置」中维护'
: '临时账号可在此补填邮箱,补填后即可用邮箱登录'
}}
</span>
</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-form">
<ImageUploader v-model="editAvatarList" :limit="1" />
</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="role_id">
<el-select
v-model="editForm.role_id"
placeholder="请选择角色组"
:disabled="isCompanyScope"
style="width: 100%"
>
<el-option v-for="r in roles" :key="r.id" :label="r.name" :value="r.id" />
</el-select>
</el-form-item>
<span v-if="isCompanyScope" class="task-panel__field-hint">所在公司权限不可修改角色组</span>
</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="company_ids">
<el-select
v-model="editForm.company_ids"
multiple
filterable
placeholder="可关联多家公司"
:disabled="isCompanyScope"
style="width: 100%"
>
<el-option v-for="c in companies" :key="c.id" :label="c.name" :value="c.id" />
</el-select>
</el-form-item>
<span v-if="isCompanyScope" class="task-panel__field-hint">所在公司权限不可修改所属公司</span>
<span v-else-if="editIsOwner" class="task-panel__field-hint">主体所有者无需关联公司</span>
</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="editForm.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
</div>
</div>
</div>
</el-form>
<template #hint>禁用后该员工无法登录,历史操作记录保留</template>
<template #actions>
<el-button size="small" @click="editVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="editSubmitting" @click="submitEdit">保存</el-button>
</template>
</TaskPanelDialog>
<TaskPanelDialog
v-model="inviteResultVisible"
:title="inviteResult?.reused ? '已关联现有账号' : '账号已开通'"
subtitle="初始密码仅显示一次,请复制后交付给员工"
width="min(560px, 92vw)"
body-max-height="60vh"
>
<div class="task-panel__form">
<p v-if="inviteResult?.reused" class="task-panel__form-tip">
该邮箱已注册过账号,已直接关联到当前主体;登录密码沿用原账号密码,如需重置请在登录页使用「忘记密码」。
</p>
<p v-else-if="inviteResult?.temporary" class="task-panel__form-tip task-panel__form-tip--warning">
未填邮箱,已创建临时账号:可直接把下方账号密码交给员工登录,或在员工档案里点「绑定微信」让员工扫码
(该微信已有账号时会自动绑定到该账号);邮箱可后续在员工档案或「个人设置」中补填。
</p>
<p v-else class="task-panel__form-tip task-panel__form-tip--warning">
初始密码仅显示一次,请复制后妥善交付给被邀请人,并提醒其尽快登录修改密码。
</p>
<div class="task-panel__grid task-panel__grid--single">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">登录账号</span>
<div class="task-panel__field-form task-panel__field-form--row">
<el-input :model-value="inviteResult?.username" readonly>
<template #append>
<el-button size="small" @click="copyText(inviteResult?.username || '')">复制</el-button>
</template>
</el-input>
</div>
</div>
<div v-if="!inviteResult?.reused" class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">初始密码</span>
<div class="task-panel__field-form task-panel__field-form--row">
<el-input :model-value="inviteResult?.password" readonly show-password>
<template #append>
<el-button size="small" @click="copyText(inviteResult?.password || '')">复制</el-button>
</template>
</el-input>
</div>
</div>
</div>
</div>
<div v-if="!inviteResult?.reused" class="copy-row">
<span class="copy-label">初始密码</span>
<el-input :model-value="inviteResult?.password" readonly show-password>
<template #append>
<el-button @click="copyText(inviteResult?.password || '')">复制</el-button>
</template>
</el-input>
</div>
<template #footer>
<template #hint>
{{ inviteResult?.reused ? '原账号密码继续有效' : '请提醒员工首次登录后修改密码' }}
</template>
<template #actions>
<el-button
v-if="!inviteResult?.reused"
size="small"
@click="copyText(`登录账号:${inviteResult?.username}\n初始密码:${inviteResult?.password}`)"
>
复制全部
</el-button>
<el-button type="primary" @click="inviteResultVisible = false">
<el-button size="small" type="primary" @click="inviteResultVisible = false">
{{ inviteResult?.reused ? '知道了' : '我已记录' }}
</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
<!-- 员工微信绑定:展示二维码,扫码后绑定到该员工的系统账号 -->
<el-dialog v-model="wechatVisible" title="绑定微信" width="380px" @closed="stopWechatPolling">
<TaskPanelDialog
v-model="wechatVisible"
title="绑定微信"
:subtitle="wechatTarget ? `绑定对象:${userLabel(wechatTarget)}` : ''"
width="min(420px, 92vw)"
body-max-height="60vh"
@closed="stopWechatPolling"
>
<div class="wechat-dialog">
<p class="wechat-target">
绑定对象:{{ wechatTarget ? userLabel(wechatTarget) : '-' }}
</p>
<div class="wechat-qr">
<QrCode v-if="wechatQr" :value="wechatQr.page_url" :size="180" />
<div v-else class="wechat-qr-empty">
@ -717,12 +833,13 @@ onUnmounted(stopWechatPolling)
</div>
</div>
<p class="wechat-hint">请该员工使用微信扫码,并在手机上确认绑定</p>
<p class="wechat-hint wechat-sub">绑定成功后窗口会自动关闭</p>
<el-button text type="primary" :loading="wechatLoading" @click="refreshWechatQrcode">
刷新二维码
</el-button>
</div>
</el-dialog>
<template #hint>绑定成功后窗口会自动关闭</template>
<template #actions>
<el-button size="small" :loading="wechatLoading" @click="refreshWechatQrcode">刷新二维码</el-button>
<el-button size="small" @click="wechatVisible = false">关闭</el-button>
</template>
</TaskPanelDialog>
</el-card>
</template>
@ -763,22 +880,6 @@ onUnmounted(stopWechatPolling)
align-items: center;
gap: 8px;
}
.copy-row {
display: flex;
align-items: center;
gap: 12px;
margin-bottom: 12px;
}
.copy-label {
width: 68px;
flex-shrink: 0;
color: #606266;
}
.form-hint {
font-size: 12px;
color: var(--el-text-color-secondary);
line-height: 1.6;
}
/* 微信列:绑定状态 + 详情 */
.wechat-cell {
display: flex;
@ -797,10 +898,6 @@ onUnmounted(stopWechatPolling)
align-items: center;
gap: 6px;
}
.wechat-target {
margin: 0;
font-weight: 600;
}
.wechat-qr {
width: 196px;
height: 196px;
@ -826,8 +923,4 @@ onUnmounted(stopWechatPolling)
font-size: 13px;
color: var(--el-text-color-regular);
}
.wechat-sub {
color: var(--el-text-color-secondary);
font-size: 12px;
}
</style>

View File

@ -33,6 +33,7 @@ import ExportButton from '@/components/ExportButton.vue'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import OperationLogPanel from '@/components/OperationLogPanel.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import { getPrincipalSubsidiaryOptions, type PrincipalSubsidiaryOption } from '@/api/principalSubsidiary'
import { mediaUrl } from '@/utils/media'
@ -190,7 +191,7 @@ async function submitQuickAdd() {
}
/* -------------------- 新增 / 编辑 -------------------- */
const drawerVisible = ref(false)
const dialogVisible = ref(false)
const submitting = ref(false)
const formRef = ref<FormInstance>()
const editId = ref<number | null>(null)
@ -273,7 +274,7 @@ function openCreate() {
Object.assign(form, EMPTY_FORM)
// EMPTY_FORM 里的数组会被 Object.assign 共享引用,这里换成新数组
form.images = []
drawerVisible.value = true
dialogVisible.value = true
}
function openEdit(row: ProductItem) {
@ -311,7 +312,7 @@ function openEdit(row: ProductItem) {
status: row.status,
remark: row.remark || '',
})
drawerVisible.value = true
dialogVisible.value = true
}
/** 空值原样返回 null,避免把空串塞进 number 输入框 */
@ -363,7 +364,7 @@ async function submitForm() {
await updateProduct(editId.value, payload)
ElMessage.success('保存成功')
}
drawerVisible.value = false
dialogVisible.value = false
await fetchList()
} catch {
// 拦截器已提示
@ -379,6 +380,7 @@ async function handleDelete(row: ProductItem) {
type: 'warning',
confirmButtonText: '删除',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -673,16 +675,20 @@ onMounted(async () => {
</div>
<!-- 批量导入:上传 xlsx,按商品编码新增/更新 -->
<el-dialog v-model="importVisible" title="批量导入商品" width="min(720px, 94vw)" top="8vh" destroy-on-close>
<div class="import-body">
<el-alert type="info" :closable="false" show-icon>
<template #title>
仅识别 13 个字段:商品编码、商品名称、货物编码、SKU规格、分类、品牌、条码、单位、零售价、成本价、标签价、所属货主、备注;新增商品时「所属货主」必填(填下属公司名称),同一主体下商品编码已存在则更新(空单元格不覆盖原值),否则新建。
</template>
</el-alert>
<TaskPanelDialog
v-model="importVisible"
title="批量导入商品"
subtitle="按商品编码新增或更新,空单元格不覆盖原值"
width="min(720px, 94vw)"
body-max-height="64vh"
>
<div class="task-panel__form">
<p class="task-panel__form-tip">
仅识别 13 个字段:商品编码、商品名称、货物编码、SKU规格、分类、品牌、条码、单位、零售价、成本价、标签价、所属货主、备注;新增商品时「所属货主」必填(填下属公司名称),同一主体下商品编码已存在则更新(空单元格不覆盖原值),否则新建。
</p>
<div class="import-actions">
<el-button link type="primary" @click="downloadTemplate">下载导入模板</el-button>
<el-button size="small" link type="primary" @click="downloadTemplate">下载导入模板</el-button>
</div>
<el-upload
@ -693,7 +699,7 @@ onMounted(async () => {
:on-change="onImportFileChange"
:on-remove="onImportFileRemove"
>
<el-button type="primary" plain>选择 .xlsx 文件</el-button>
<el-button size="small" type="primary" plain>选择 .xlsx 文件</el-button>
<template #tip>
<div class="import-tip">第一行必须是表头(可用导入模板填好再上传)</div>
</template>
@ -709,229 +715,382 @@ onMounted(async () => {
<div v-if="importResult.ignored_columns.length" class="import-ignored">
已忽略的未知列:{{ importResult.ignored_columns.join('、') }}
</div>
<DataTable
v-if="importResult.errors.length"
:data="importResult.errors"
height="220"
size="small"
>
<el-table-column prop="row" label="行号" width="80" />
<el-table-column prop="item_code" label="商品编码" width="180" />
<el-table-column prop="message" label="失败原因" min-width="240" />
</DataTable>
<div v-if="importResult.errors.length" class="task-panel__table">
<DataTable
:data="importResult.errors"
height="220"
size="small"
>
<el-table-column prop="row" label="行号" width="80" />
<el-table-column prop="item_code" label="商品编码" width="180" />
<el-table-column prop="message" label="失败原因" min-width="240" />
</DataTable>
</div>
</div>
</div>
<template #footer>
<el-button @click="importVisible = false">关闭</el-button>
<el-button type="primary" :loading="importing" :disabled="!importFileName" @click="submitImport">
<template #hint>仅支持 .xlsx,第一行必须是表头</template>
<template #actions>
<el-button size="small" @click="importVisible = false">关闭</el-button>
<el-button size="small" type="primary" :loading="importing" :disabled="!importFileName" @click="submitImport">
开始导入
</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
<el-drawer
v-model="drawerVisible"
<TaskPanelDialog
v-model="dialogVisible"
:title="editId == null ? '新增商品' : '编辑商品'"
direction="rtl"
size="580px"
:subtitle="editId == null ? '商品编码在同一主体下唯一,所属货主创建后不可修改' : '修改商品资料;所属货主创建后不可更改'"
width="min(880px, 96vw)"
body-max-height="70vh"
>
<el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="商品编码" prop="item_code">
<el-input v-model="form.item_code" placeholder="同一主体下唯一">
<template v-if="editId == null" #append>
<el-button @click="genRandomCode">随机生成</el-button>
</template>
</el-input>
</el-form-item>
<el-form-item label="商品名称" prop="item_name">
<el-input v-model="form.item_name" placeholder="请输入商品名称" />
</el-form-item>
<el-form-item label="所属货主" prop="subsidiary_id">
<el-select
v-model="form.subsidiary_id"
placeholder="请选择下属公司(所属货主)"
filterable
:disabled="editId != null"
style="width: 100%"
>
<el-option v-for="o in subsidiaryOptions" :key="o.id" :label="o.name" :value="o.id" />
</el-select>
<div v-if="editId != null" class="form-tip">商品创建后不可更改所属货主</div>
</el-form-item>
<el-form-item label="货物编码" prop="goods_code">
<el-input v-model="form.goods_code" placeholder="选填,与条码可二选一" />
</el-form-item>
<el-form-item label="条码" prop="barcode">
<el-input v-model="form.barcode" placeholder="选填,商品条码" />
</el-form-item>
<el-form-item label="分类" prop="category_name">
<div class="select-with-add">
<el-select
v-model="form.category_id"
placeholder="选填(也可在商品属性中维护)"
clearable
filterable
style="flex: 1"
@change="onCategoryChange"
>
<el-option v-for="o in categoryOptions" :key="o.id" :label="o.name" :value="o.id" />
</el-select>
<el-button title="快速新增分类" @click="openQuickAdd('category')">+</el-button>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__section">基础信息</div>
<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-form-item prop="item_code">
<el-input v-model="form.item_code" placeholder="同一主体下唯一">
<template v-if="editId == null" #append>
<el-button @click="genRandomCode">随机生成</el-button>
</template>
</el-input>
</el-form-item>
</div>
</div>
</el-form-item>
<el-form-item label="SKU规格" prop="sku_property">
<el-input v-model="form.sku_property" placeholder="选填" />
</el-form-item>
<el-form-item label="单位" prop="stock_unit">
<div class="select-with-add">
<el-select
v-model="form.unit_id"
placeholder="选填(也可在商品属性中维护)"
clearable
filterable
style="flex: 1"
@change="onUnitChange"
>
<el-option v-for="o in unitOptions" :key="o.id" :label="o.name" :value="o.id" />
</el-select>
<el-button title="快速新增单位" @click="openQuickAdd('unit')">+</el-button>
</div>
</el-form-item>
<el-form-item label="品牌" prop="brand_name">
<div class="select-with-add">
<el-select
v-model="form.brand_id"
placeholder="选填(也可在商品属性中维护)"
clearable
filterable
style="flex: 1"
@change="onBrandChange"
>
<el-option v-for="o in brandOptions" :key="o.id" :label="o.name" :value="o.id" />
</el-select>
<el-button title="快速新增品牌" @click="openQuickAdd('brand')">+</el-button>
</div>
</el-form-item>
<el-form-item label="标价" prop="tag_price">
<el-input-number
v-model="form.tag_price"
:min="0"
:precision="2"
style="width: 100%"
placeholder="选填"
/>
</el-form-item>
<el-form-item label="零售价" prop="retail_price">
<el-input-number v-model="form.retail_price" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
<el-form-item label="成本价" prop="cost_price">
<el-input-number
v-model="form.cost_price"
:min="0"
:precision="2"
style="width: 100%"
placeholder="选填"
/>
</el-form-item>
<el-divider content-position="left">物流属性(选填)</el-divider>
<el-form-item label="长/宽/高 (cm)">
<div class="field-row">
<el-input-number v-model="form.length" :min="0" :precision="2" placeholder="长(cm)" />
<el-input-number v-model="form.width" :min="0" :precision="2" placeholder="宽(cm)" />
<el-input-number v-model="form.height" :min="0" :precision="2" placeholder="高(cm)" />
<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="item_name">
<el-input v-model="form.item_name" placeholder="请输入商品名称" />
</el-form-item>
</div>
</div>
</el-form-item>
<el-form-item label="体积 (cm³)">
<el-input-number
v-model="form.volume"
:min="0"
:precision="2"
style="width: 100%"
placeholder="留空可由长×宽×高自动推算"
/>
</el-form-item>
<el-form-item label="毛重/净重 (g)">
<div class="field-row">
<el-input-number v-model="form.gross_weight" :min="0" :precision="0" placeholder="毛重(g)" />
<el-input-number v-model="form.net_weight" :min="0" :precision="0" placeholder="净重(g)" />
<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="subsidiary_id">
<el-select
v-model="form.subsidiary_id"
placeholder="请选择下属公司(所属货主)"
filterable
:disabled="editId != null"
style="width: 100%"
>
<el-option v-for="o in subsidiaryOptions" :key="o.id" :label="o.name" :value="o.id" />
</el-select>
</el-form-item>
<span v-if="editId != null" class="task-panel__field-hint">商品创建后不可更改所属货主</span>
</div>
</div>
</el-form-item>
<el-form-item label="区域销售">
<el-switch v-model="form.is_area_sale" active-value="Y" inactive-value="N" />
</el-form-item>
<el-form-item label="序列号管理">
<el-switch v-model="form.is_sn_mgmt" active-value="Y" inactive-value="N" />
</el-form-item>
<el-form-item label="保质期管理">
<el-switch v-model="form.is_shelf_life_mgmt" active-value="Y" inactive-value="N" />
</el-form-item>
<el-form-item label="批次管理">
<el-switch v-model="form.is_batch_mgmt" active-value="Y" inactive-value="N" />
</el-form-item>
<el-form-item label="订单唯一赠品">
<el-switch v-model="form.is_order_unique_gift" :active-value="1" :inactive-value="0" />
<el-tooltip
content="开启后:订单明细解析到该商品时整单只保留一行、数量固定 1(多数量、多个组合命中同一赠品都只落一条)"
placement="top"
>
<el-icon class="field-hint"><QuestionFilled /></el-icon>
</el-tooltip>
</el-form-item>
<el-divider content-position="left">图片</el-divider>
<el-form-item label="图片组" prop="images">
<ImageUploader v-model="form.images" />
</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="goods_code">
<el-input v-model="form.goods_code" placeholder="选填,与条码可二选一" />
</el-form-item>
</div>
</div>
<el-divider content-position="left">其它</el-divider>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" />
</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="barcode">
<el-input v-model="form.barcode" placeholder="选填,商品条码" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">SKU规格</span>
<div class="task-panel__field-form">
<el-form-item prop="sku_property">
<el-input v-model="form.sku_property" 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 task-panel__field-form--row">
<el-form-item prop="category_id">
<el-select
v-model="form.category_id"
placeholder="选填(也可在商品属性中维护)"
clearable
filterable
style="width: 100%"
@change="onCategoryChange"
>
<el-option v-for="o in categoryOptions" :key="o.id" :label="o.name" :value="o.id" />
</el-select>
</el-form-item>
<el-button size="small" title="快速新增分类" @click="openQuickAdd('category')">+</el-button>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">单位</span>
<div class="task-panel__field-form task-panel__field-form--row">
<el-form-item prop="unit_id">
<el-select
v-model="form.unit_id"
placeholder="选填(也可在商品属性中维护)"
clearable
filterable
style="width: 100%"
@change="onUnitChange"
>
<el-option v-for="o in unitOptions" :key="o.id" :label="o.name" :value="o.id" />
</el-select>
</el-form-item>
<el-button size="small" title="快速新增单位" @click="openQuickAdd('unit')">+</el-button>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">品牌</span>
<div class="task-panel__field-form task-panel__field-form--row">
<el-form-item prop="brand_id">
<el-select
v-model="form.brand_id"
placeholder="选填(也可在商品属性中维护)"
clearable
filterable
style="width: 100%"
@change="onBrandChange"
>
<el-option v-for="o in brandOptions" :key="o.id" :label="o.name" :value="o.id" />
</el-select>
</el-form-item>
<el-button size="small" title="快速新增品牌" @click="openQuickAdd('brand')">+</el-button>
</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="tag_price">
<el-input-number
v-model="form.tag_price"
:min="0"
:precision="2"
style="width: 100%"
placeholder="选填"
/>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">零售价</span>
<div class="task-panel__field-form">
<el-form-item prop="retail_price">
<el-input-number v-model="form.retail_price" :min="0" :precision="2" 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="cost_price">
<el-input-number
v-model="form.cost_price"
:min="0"
:precision="2"
style="width: 100%"
placeholder="选填"
/>
</el-form-item>
</div>
</div>
</div>
<div class="task-panel__section">物流属性(选填)</div>
<div class="task-panel__grid">
<div class="task-panel__field task-panel__field--input task-panel__field--full">
<span class="task-panel__field-label">长/宽/高 (cm)</span>
<div class="task-panel__field-form field-row">
<el-form-item prop="length">
<el-input-number v-model="form.length" :min="0" :precision="2" placeholder="长(cm)" style="width: 100%" />
</el-form-item>
<el-form-item prop="width">
<el-input-number v-model="form.width" :min="0" :precision="2" placeholder="宽(cm)" style="width: 100%" />
</el-form-item>
<el-form-item prop="height">
<el-input-number v-model="form.height" :min="0" :precision="2" placeholder="高(cm)" style="width: 100%" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">体积 (cm³)</span>
<div class="task-panel__field-form">
<el-form-item prop="volume">
<el-input-number
v-model="form.volume"
:min="0"
:precision="2"
style="width: 100%"
placeholder="留空可由长×宽×高自动推算"
/>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">毛重/净重 (g)</span>
<div class="task-panel__field-form field-row">
<el-form-item prop="gross_weight">
<el-input-number v-model="form.gross_weight" :min="0" :precision="0" placeholder="毛重(g)" style="width: 100%" />
</el-form-item>
<el-form-item prop="net_weight">
<el-input-number v-model="form.net_weight" :min="0" :precision="0" placeholder="净重(g)" 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">
<el-form-item prop="is_area_sale">
<el-switch v-model="form.is_area_sale" active-value="Y" inactive-value="N" />
</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">
<el-form-item prop="is_sn_mgmt">
<el-switch v-model="form.is_sn_mgmt" active-value="Y" inactive-value="N" />
</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">
<el-form-item prop="is_shelf_life_mgmt">
<el-switch v-model="form.is_shelf_life_mgmt" active-value="Y" inactive-value="N" />
</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">
<el-form-item prop="is_batch_mgmt">
<el-switch v-model="form.is_batch_mgmt" active-value="Y" inactive-value="N" />
</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="is_order_unique_gift">
<el-switch v-model="form.is_order_unique_gift" :active-value="1" :inactive-value="0" />
</el-form-item>
<el-tooltip
content="开启后:订单明细解析到该商品时整单只保留一行、数量固定 1(多数量、多个组合命中同一赠品都只落一条)"
placement="top"
>
<el-icon class="field-hint"><QuestionFilled /></el-icon>
</el-tooltip>
</div>
</div>
</div>
<div class="task-panel__section">图片</div>
<div class="task-panel__grid">
<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="images">
<ImageUploader v-model="form.images" />
</el-form-item>
</div>
</div>
</div>
<div class="task-panel__section">其它</div>
<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-form-item prop="status">
<el-select v-model="form.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
</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="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</div>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="drawerVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</el-drawer>
<el-dialog
<template #hint>带 * 为必填项;分类 / 单位 / 品牌可点右侧「+」快速新增</template>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</TaskPanelDialog>
<TaskPanelDialog
v-model="quickAddVisible"
:title="`快速新增${quickAddType ? quickAddLabelMap[quickAddType] : ''}`"
width="420px"
append-to-body
subtitle="创建后会自动选中"
width="min(420px, 92vw)"
>
<el-form label-width="72px" @submit.prevent>
<el-form-item :label="quickAddType ? quickAddLabelMap[quickAddType] : '名称'">
<el-input
v-model="quickAddName"
placeholder="请输入名称"
maxlength="50"
show-word-limit
@keyup.enter="submitQuickAdd"
/>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="quickAddVisible = false">取消</el-button>
<el-button type="primary" :loading="quickAdding" @click="submitQuickAdd">确定</el-button>
<div class="task-panel__form">
<div class="task-panel__grid task-panel__grid--single">
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">{{ quickAddType ? quickAddLabelMap[quickAddType] : '名称' }}</span>
<div class="task-panel__field-form">
<el-input
v-model="quickAddName"
placeholder="请输入名称"
maxlength="50"
show-word-limit
@keyup.enter="submitQuickAdd"
/>
</div>
</div>
</div>
</div>
<template #actions>
<el-button size="small" @click="quickAddVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="quickAdding" @click="submitQuickAdd">确定</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
</el-card>
</template>
<style scoped>
.form-tip {
font-size: 12px;
color: var(--el-text-color-secondary);
line-height: 1.4;
}
/* 列表页统一版式:卡片撑满可视高度,筛选与分页固定,只有表格主体滚动 */
.list-card {
flex: 1;
@ -989,11 +1148,6 @@ onMounted(async () => {
flex: 1 1 auto;
min-height: 0;
}
.import-body {
display: flex;
flex-direction: column;
gap: 12px;
}
.import-actions {
display: flex;
justify-content: flex-end;
@ -1008,7 +1162,9 @@ onMounted(async () => {
gap: 8px;
}
.import-summary {
font-size: 13px;
font-size: 12px;
line-height: 18px;
color: #606266;
}
.import-ignored {
font-size: 12px;
@ -1030,16 +1186,4 @@ onMounted(async () => {
.muted {
color: var(--el-text-color-placeholder);
}
.select-with-add {
display: flex;
gap: 8px;
width: 100%;
}
.select-with-add .el-button {
flex: 0 0 auto;
padding-left: 12px;
padding-right: 12px;
font-size: 16px;
line-height: 1;
}
</style>

View File

@ -5,6 +5,7 @@ import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'elem
import DataTable from '@/components/DataTable.vue'
import ExportButton from '@/components/ExportButton.vue'
import ListPager from '@/components/ListPager.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import {
getProductCategories,
@ -159,7 +160,7 @@ function reset() {
}
/* -------------------- 新增 / 编辑 -------------------- */
const drawerVisible = ref(false)
const dialogVisible = ref(false)
const submitting = ref(false)
const formRef = ref<FormInstance>()
const editId = ref<number | null>(null)
@ -180,7 +181,7 @@ const rules: FormRules = {
function openCreate() {
editId.value = null
Object.assign(form, EMPTY_FORM)
drawerVisible.value = true
dialogVisible.value = true
}
function openEdit(row: AttrRow) {
@ -193,7 +194,7 @@ function openEdit(row: AttrRow) {
sort: Number(row.sort) || 0,
remark: row.remark || '',
})
drawerVisible.value = true
dialogVisible.value = true
}
async function submitForm() {
@ -213,7 +214,7 @@ async function submitForm() {
await api.update(editId.value, payload)
ElMessage.success('保存成功')
}
drawerVisible.value = false
dialogVisible.value = false
await fetchList()
} catch {
// 拦截器已提示
@ -237,6 +238,7 @@ async function handleDelete(row: AttrRow) {
type: 'warning',
confirmButtonText: '删除',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -347,44 +349,89 @@ onMounted(() => {
@size-change="handleSizeChange"
/>
<el-drawer
v-model="drawerVisible"
<TaskPanelDialog
v-model="dialogVisible"
:title="editId == null ? `新增${cur.title}` : `编辑${cur.title}`"
direction="rtl"
size="460px"
:subtitle="editId == null ? `创建后可在商品中引用该${cur.title}` : `修改${cur.title}信息,已被商品引用的记录不可删除`"
width="min(560px, 92vw)"
body-max-height="60vh"
>
<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="货主">
<el-select v-model="form.subsidiary_id" placeholder="主体(全集团)" clearable filterable style="width: 100%">
<el-option label="主体(全集团)" value="" />
<el-option v-for="s in subsidiaryOptions" :key="s.id" :label="s.name" :value="s.id" />
</el-select>
<div v-if="isCompanyScope" class="form-tip">所在公司权限只能选择主体或自己所属公司</div>
</el-form-item>
<el-form-item :label="cur.nameLabel" prop="name">
<el-input v-model="form.name" :placeholder="cur.placeholder" />
</el-form-item>
<el-form-item :label="cur.codeLabel">
<el-input v-model="form.code" placeholder="选填" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
<el-form-item label="排序">
<el-input-number v-model="form.sort" :min="0" :precision="0" style="width: 100%" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__grid task-panel__grid--single">
<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="form.subsidiary_id" placeholder="主体(全集团)" clearable filterable style="width: 100%">
<el-option label="主体(全集团)" value="" />
<el-option v-for="s in subsidiaryOptions" :key="s.id" :label="s.name" :value="s.id" />
</el-select>
<span v-if="isCompanyScope" class="task-panel__field-hint">所在公司权限只能选择主体或自己所属公司</span>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">{{ cur.nameLabel }}</span>
<div class="task-panel__field-form">
<el-form-item prop="name">
<el-input v-model="form.name" :placeholder="cur.placeholder" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">{{ cur.codeLabel }}</span>
<div class="task-panel__field-form">
<el-form-item prop="code">
<el-input v-model="form.code" placeholder="选填" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">状态</span>
<div class="task-panel__field-form">
<el-form-item prop="status">
<el-select v-model="form.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</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="sort">
<el-input-number v-model="form.sort" :min="0" :precision="0" style="width: 100%" />
</el-form-item>
</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="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</div>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="drawerVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">保存</el-button>
<template #hint>带 * 为必填项</template>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</el-drawer>
</TaskPanelDialog>
</div>
</template>
@ -410,9 +457,4 @@ onMounted(() => {
:deep(.el-input-number) {
width: 100%;
}
.form-tip {
font-size: 12px;
color: var(--el-text-color-secondary);
line-height: 1.4;
}
</style>

View File

@ -37,6 +37,7 @@ import SplitLayout from '@/components/SplitLayout.vue'
import ExportButton from '@/components/ExportButton.vue'
import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import { formatDateTime } from '@/utils/datetime'
@ -876,6 +877,7 @@ async function handleDelete(row: ShopItem) {
type: 'warning',
confirmButtonText: '删除',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -1242,219 +1244,351 @@ onMounted(() => {
</template>
</SplitLayout>
<el-dialog v-model="dialogVisible" :title="editId == null ? '新增店铺' : '编辑店铺'" width="560px">
<el-form ref="formRef" :model="form" :rules="rules" label-width="96px">
<el-alert
v-if="editId == null"
class="code-tip"
type="info"
show-icon
:closable="false"
title="店铺编码无需填写,保存后由系统自动生成(前缀 OMS,表示在 OMS 中创建)"
/>
<el-form-item label="店铺编码" prop="code">
<el-input
v-model="form.code"
:disabled="editId == null"
:placeholder="editId == null ? '保存后自动生成(前缀 OMS)' : '同一主体下唯一,留空表示不修改'"
/>
</el-form-item>
<el-form-item label="所属货主" prop="subsidiary_id">
<el-select
v-model="form.subsidiary_id"
placeholder="请选择所属货主(下属公司)"
filterable
:disabled="editId != null"
style="width: 100%"
@change="onFormSubsidiaryChange"
>
<el-option v-for="s in subsidiaryOptions" :key="s.id" :label="s.name" :value="s.id" />
</el-select>
<div v-if="editId != null" class="owner-tip">店铺创建后不可更改所属货主</div>
</el-form-item>
<el-form-item label="默认发货仓库">
<el-select
v-model="form.default_warehouse_id"
placeholder="不设置为空;拉单与未审核订单默认用该仓库"
filterable
clearable
:disabled="!form.subsidiary_id"
style="width: 100%"
>
<el-option
v-for="w in formWarehouseOptions"
:key="w.id"
:label="w.label"
:value="w.id"
/>
</el-select>
<div class="owner-tip">仅可选所属货主下的启用仓库;设置后拉取的订单与未审核订单自动使用该仓库</div>
</el-form-item>
<el-form-item label="店铺名称" prop="name">
<el-input v-model="form.name" placeholder="请输入店铺名称" />
</el-form-item>
<el-form-item label="店铺类型" prop="type">
<el-select v-model="form.type" :disabled="editId != null" style="width: 100%">
<el-option v-for="t in CREATABLE_TYPES" :key="t.value" :label="t.label" :value="t.value" />
</el-select>
<div v-if="form.type === SHOP_TYPE_DATABASE" class="owner-tip">
数据库店铺保存后需在列表「配置」中填写数据库连接、选表与字段映射
</div>
</el-form-item>
<el-form-item v-if="form.type === SHOP_TYPE_PLATFORM" label="平台" prop="platform" required>
<el-select v-model="form.platform" placeholder="请选择平台" clearable style="width: 100%">
<el-option v-for="p in PLATFORMS" :key="p.value" :label="p.label" :value="p.value" />
</el-select>
</el-form-item>
<el-form-item label="联系人" prop="contact_name">
<el-input v-model="form.contact_name" placeholder="选填" />
</el-form-item>
<el-form-item label="联系电话" prop="contact_phone">
<el-input v-model="form.contact_phone" placeholder="选填" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
<el-form-item v-if="form.type !== SHOP_TYPE_OFFLINE" label="自动拉取订单" prop="auto_fetch_order">
<el-switch v-model="form.auto_fetch_order" :active-value="1" :inactive-value="0" />
<span class="form-tip">开启后按间隔自动拉取该店铺订单</span>
</el-form-item>
<el-form-item v-if="form.type !== SHOP_TYPE_OFFLINE" label="拉取间隔" prop="auto_fetch_interval">
<el-input-number
v-model="form.auto_fetch_interval"
:min="3"
:step="1"
:precision="0"
/>
<span class="form-tip">分钟(不小于 3 分钟,开启自动拉取后生效)</span>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</el-dialog>
<el-dialog v-model="warehouseDialogVisible" title="默认发货仓库" width="460px" append-to-body>
<el-alert
type="info"
:closable="false"
show-icon
title="设置后:拉取该店铺订单时自动带此仓库;该店铺尚未审核的订单也会回填为该仓库(已手工改过仓库的不动)。"
class="code-tip"
/>
<el-form label-width="110px">
<el-form-item label="店铺">
<span>{{ warehouseShop?.name || '-' }}</span>
</el-form-item>
<el-form-item label="默认发货仓库">
<el-select
v-model="warehouseForm.default_warehouse_id"
placeholder="不设置为空"
filterable
clearable
style="width: 100%"
>
<el-option
v-for="w in warehouseDialogOptions"
:key="w.id"
:label="w.label"
:value="w.id"
/>
</el-select>
<div class="owner-tip">仅可选该店铺货主下的启用仓库</div>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="warehouseDialogVisible = false">取消</el-button>
<el-button type="primary" :loading="warehouseSaving" @click="submitWarehouseConfig">保存</el-button>
</template>
</el-dialog>
<el-dialog v-model="dbPullOrdersVisible" title="拉取订单(数据库店铺)" width="480px">
<el-alert
type="info"
:closable="false"
show-icon
class="fetch-order-tip"
title="按「订单表 + 订单明细表」的字段映射读取客户库明文订单,写入「待审核」;无明细的订单会跳过,已流转出待审核的订单只刷新平台侧数据"
/>
<el-form :model="dbPullOrdersForm" label-width="96px">
<el-form-item label="店铺">
<span>{{ dbPullOrdersShop?.name || '-' }}</span>
</el-form-item>
<el-form-item label="拉取范围">
<el-select v-model="dbPullOrdersForm.days" style="width: 100%">
<el-option v-for="item in FETCH_ORDER_DAYS" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dbPullOrdersVisible = false">取消</el-button>
<el-button type="primary" :loading="dbPullOrdersSubmitting" @click="submitDbPullOrders">开始拉取</el-button>
</template>
</el-dialog>
<!-- 数据库店铺配置:连接信息 → 测试连通 / 连接拉表 → 选表与字段映射 → 回传单号 -->
<el-dialog
v-model="dbConfigVisible"
:title="`数据库配置 · ${dbConfigShop?.name || ''}`"
width="min(980px, 96vw)"
top="4vh"
destroy-on-close
<TaskPanelDialog
v-model="dialogVisible"
:title="editId == null ? '新增店铺' : '编辑店铺'"
:subtitle="editId == null ? '创建后由系统生成店铺编码,可配置默认仓库与自动拉单' : '店铺类型与所属货主创建后不可修改'"
width="min(880px, 96vw)"
body-max-height="64vh"
>
<div v-loading="dbConfigLoading" class="db-config-body">
<el-alert
type="info"
:closable="false"
show-icon
class="db-tip"
title="数据库店铺直接读取客户自有库的明文订单:先在服务端测试连通并拉取数据表,再选择商品表 / 订单表 / 订单明细表,并把 OMS 字段与源表列一一对应"
/>
<el-form :model="dbForm" label-width="110px" size="small">
<el-row :gutter="12">
<el-col :span="8">
<el-form-item label="数据库类型">
<el-select v-model="dbForm.db_type" style="width: 100%">
<el-option v-for="t in dbTypes" :key="t.value" :label="t.label" :value="t.value" />
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<p v-if="editId == null" class="task-panel__form-tip">
店铺编码无需填写,保存后由系统自动生成(前缀 OMS,表示在 OMS 中创建)。
</p>
<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="code">
<el-input
v-model="form.code"
:disabled="editId == null"
:placeholder="editId == null ? '保存后自动生成(前缀 OMS)' : '同一主体下唯一,留空表示不修改'"
/>
</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="subsidiary_id">
<el-select
v-model="form.subsidiary_id"
placeholder="请选择所属货主(下属公司)"
filterable
:disabled="editId != null"
style="width: 100%"
@change="onFormSubsidiaryChange"
>
<el-option v-for="s in subsidiaryOptions" :key="s.id" :label="s.name" :value="s.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="IP / 域名">
<el-input v-model="dbForm.host" placeholder="如 127.0.0.1" />
<span v-if="editId != null" class="task-panel__field-hint">店铺创建后不可更改所属货主</span>
</div>
</div>
<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-form-item prop="default_warehouse_id">
<el-select
v-model="form.default_warehouse_id"
placeholder="不设置为空;拉单与未审核订单默认用该仓库"
filterable
clearable
:disabled="!form.subsidiary_id"
style="width: 100%"
>
<el-option
v-for="w in formWarehouseOptions"
:key="w.id"
:label="w.label"
:value="w.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="端口">
<el-input-number v-model="dbForm.port" :min="1" :max="65535" :precision="0" style="width: 100%" />
<span class="task-panel__field-hint">
仅可选所属货主下的启用仓库;设置后拉取的订单与未审核订单自动使用该仓库
</span>
</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" placeholder="请输入店铺名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="数据库名">
<el-input v-model="dbForm.database_name" placeholder="库名" />
</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="type">
<el-select v-model="form.type" :disabled="editId != null" style="width: 100%">
<el-option v-for="t in CREATABLE_TYPES" :key="t.value" :label="t.label" :value="t.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="账号">
<el-input v-model="dbForm.username" placeholder="数据库账号" />
<span v-if="form.type === SHOP_TYPE_DATABASE" class="task-panel__field-hint">
数据库店铺保存后需在列表「配置」中填写数据库连接、选表与字段映射
</span>
</div>
</div>
<div v-if="form.type === SHOP_TYPE_PLATFORM" 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="platform">
<el-select v-model="form.platform" placeholder="请选择平台" clearable style="width: 100%">
<el-option v-for="p in PLATFORMS" :key="p.value" :label="p.label" :value="p.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="密码">
<el-input v-model="dbForm.password" type="password" show-password placeholder="留空表示沿用已保存密码" />
</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="contact_name">
<el-input v-model="form.contact_name" placeholder="选填" />
</el-form-item>
</el-col>
</el-row>
</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="contact_phone">
<el-input v-model="form.contact_phone" placeholder="选填" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">状态</span>
<div class="task-panel__field-form">
<el-form-item prop="status">
<el-select v-model="form.status" style="width: 100%">
<el-option label="启用" :value="1" />
<el-option label="禁用" :value="0" />
</el-select>
</el-form-item>
</div>
</div>
<div v-if="form.type !== SHOP_TYPE_OFFLINE" class="task-panel__field task-panel__field--control">
<span class="task-panel__field-label">自动拉取订单</span>
<div class="task-panel__field-form">
<el-form-item prop="auto_fetch_order">
<el-switch v-model="form.auto_fetch_order" :active-value="1" :inactive-value="0" />
</el-form-item>
<span class="task-panel__field-hint">开启后按间隔自动拉取该店铺订单</span>
</div>
</div>
<div v-if="form.type !== SHOP_TYPE_OFFLINE" 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="auto_fetch_interval">
<el-input-number
v-model="form.auto_fetch_interval"
:min="3"
:step="1"
:precision="0"
style="width: 100%"
/>
</el-form-item>
<span class="task-panel__field-hint">分钟(不小于 3 分钟,开启自动拉取后生效)</span>
</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="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</div>
</div>
</div>
</el-form>
<template #hint>带 * 为必填项;店铺编码保存后由系统生成</template>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</TaskPanelDialog>
<TaskPanelDialog
v-model="warehouseDialogVisible"
title="默认发货仓库"
subtitle="设置后拉取订单与未审核订单默认使用该仓库"
width="min(560px, 92vw)"
body-max-height="60vh"
>
<div class="task-panel__form">
<p class="task-panel__form-tip">
拉取该店铺订单时自动带此仓库;该店铺尚未审核的订单也会回填为该仓库(已手工改过仓库的不动)。
</p>
<div class="task-panel__grid task-panel__grid--single">
<div class="task-panel__field">
<span class="task-panel__field-label">店铺</span>
<strong class="task-panel__field-value">{{ warehouseShop?.name || '-' }}</strong>
</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="warehouseForm.default_warehouse_id"
placeholder="不设置为空"
filterable
clearable
style="width: 100%"
>
<el-option
v-for="w in warehouseDialogOptions"
:key="w.id"
:label="w.label"
:value="w.id"
/>
</el-select>
<span class="task-panel__field-hint">仅可选该店铺货主下的启用仓库</span>
</div>
</div>
</div>
</div>
<template #hint>保存后立即生效</template>
<template #actions>
<el-button size="small" @click="warehouseDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="warehouseSaving" @click="submitWarehouseConfig">保存</el-button>
</template>
</TaskPanelDialog>
<TaskPanelDialog
v-model="dbPullOrdersVisible"
title="拉取订单(数据库店铺)"
subtitle="按字段映射读取客户库明文订单,写入「待审核」"
width="min(560px, 92vw)"
body-max-height="60vh"
>
<div class="task-panel__form">
<p class="task-panel__form-tip">
按「订单表 + 订单明细表」的字段映射读取客户库明文订单,写入「待审核」;无明细的订单会跳过,已流转出待审核的订单只刷新平台侧数据。
</p>
<div class="task-panel__grid task-panel__grid--single">
<div class="task-panel__field">
<span class="task-panel__field-label">店铺</span>
<strong class="task-panel__field-value">{{ dbPullOrdersShop?.name || '-' }}</strong>
</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="dbPullOrdersForm.days" style="width: 100%">
<el-option v-for="item in FETCH_ORDER_DAYS" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
</div>
</div>
</div>
<template #hint>时间越长拉取越慢</template>
<template #actions>
<el-button size="small" @click="dbPullOrdersVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="dbPullOrdersSubmitting" @click="submitDbPullOrders">开始拉取</el-button>
</template>
</TaskPanelDialog>
<!-- 数据库店铺配置:连接信息 → 测试连通 / 连接拉表 → 选表与字段映射 → 回传单号 -->
<TaskPanelDialog
v-model="dbConfigVisible"
:title="`数据库配置 · ${dbConfigShop?.name || ''}`"
subtitle="先测试连通并拉取数据表,再选择表与字段映射"
width="min(980px, 96vw)"
body-max-height="72vh"
>
<div v-loading="dbConfigLoading" class="task-panel__form">
<p class="task-panel__form-tip">
数据库店铺直接读取客户自有库的明文订单:先在服务端测试连通并拉取数据表,再选择商品表 / 订单表 / 订单明细表,并把 OMS 字段与源表列一一对应。
</p>
<el-form :model="dbForm" class="task-panel__form">
<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="db_type">
<el-select v-model="dbForm.db_type" style="width: 100%">
<el-option v-for="t in dbTypes" :key="t.value" :label="t.label" :value="t.value" />
</el-select>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">IP / 域名</span>
<div class="task-panel__field-form">
<el-form-item prop="host">
<el-input v-model="dbForm.host" placeholder="如 127.0.0.1" />
</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="port">
<el-input-number v-model="dbForm.port" :min="1" :max="65535" :precision="0" 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="database_name">
<el-input v-model="dbForm.database_name" 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="username">
<el-input v-model="dbForm.username" 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="password">
<el-input v-model="dbForm.password" type="password" show-password placeholder="留空表示沿用已保存密码" />
</el-form-item>
</div>
</div>
</div>
<div class="db-actions">
<el-button :loading="dbTesting" @click="handleTestConnection">测试连通</el-button>
<el-button type="primary" :loading="dbConnecting" @click="handleConnect">连接</el-button>
<el-button size="small" :loading="dbTesting" @click="handleTestConnection">测试连通</el-button>
<el-button size="small" type="primary" :loading="dbConnecting" @click="handleConnect">连接</el-button>
<span v-if="dbTables.length" class="db-conn-tip">已加载 {{ dbTables.length }} 张表</span>
<span v-if="dbLastResult.at" class="db-conn-tip">
{{ dbLastResult.at }}:{{ dbLastResult.success ? '成功' : '失败' }} {{ dbLastResult.message }}
@ -1462,7 +1596,7 @@ onMounted(() => {
</div>
</el-form>
<el-divider content-position="left">表与字段映射</el-divider>
<div class="task-panel__section">表与字段映射</div>
<el-empty v-if="!dbDatasets.length" description="暂无字段定义" :image-size="60" />
<div v-for="dataset in dbDatasets" :key="dataset.key" class="db-dataset">
<div class="db-dataset-head">
@ -1547,78 +1681,108 @@ onMounted(() => {
</el-table>
</div>
<el-divider content-position="left">回传单号</el-divider>
<div class="task-panel__section">回传单号</div>
<div class="db-callback">
<el-alert
type="info"
:closable="false"
class="db-tip"
title="发货确认(WMS 回推运单号)后把运单号写回客户库:写回字段=更新目标表的一个字段(多包裹按间隔符合并);写回行=每个运单号写一行(按订单号先删后插,重复回传不会重复)"
/>
<el-form :model="dbCallback" label-width="110px" size="small">
<el-form-item label="回传方式">
<el-radio-group v-model="dbCallback.mode">
<el-radio v-for="m in dbCallbackModes" :key="m.value" :value="m.value">{{ m.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="dbCallback.mode" label="写回表">
<el-select
:model-value="dbCallback.table"
placeholder="选择写回的数据表(先点「连接」拉取)"
filterable
clearable
style="width: 320px"
@change="(v: string | null) => onCallbackTableChange(v)"
>
<el-option
v-for="t in dbTables"
:key="t.name"
:label="t.comment ? `${t.name}(${t.comment})` : t.name"
:value="t.name"
/>
</el-select>
</el-form-item>
<template v-if="dbCallback.mode === 1">
<el-form-item label="运单号字段">
<el-select
v-model="dbCallback.field"
placeholder="运单号写入的字段"
filterable
clearable
:disabled="!dbCallback.table"
style="width: 320px"
>
<el-option
v-for="col in dbCallbackColumns"
:key="col.name"
:label="col.comment ? `${col.name}(${col.comment})` : col.name"
:value="col.name"
/>
</el-select>
</el-form-item>
<el-form-item label="定位字段">
<el-select
v-model="dbCallback.keyField"
placeholder="订单号所在的字段(用于定位订单行)"
filterable
clearable
:disabled="!dbCallback.table"
style="width: 320px"
>
<el-option
v-for="col in dbCallbackColumns"
:key="col.name"
:label="col.comment ? `${col.name}(${col.comment})` : col.name"
:value="col.name"
/>
</el-select>
<span class="db-conn-tip">多包裹时按此字段定位同一订单行更新</span>
</el-form-item>
<el-form-item label="间隔符">
<el-input v-model="dbCallback.separator" placeholder="如 ," style="width: 120px" />
<span class="db-conn-tip">多个运单号合并到同一字段时的分隔符号</span>
</el-form-item>
</template>
<p class="task-panel__form-tip">
发货确认(WMS 回推运单号)后把运单号写回客户库:写回字段=更新目标表的一个字段(多包裹按间隔符合并);写回行=每个运单号写一行(按订单号先删后插,重复回传不会重复)。
</p>
<el-form :model="dbCallback" class="task-panel__form">
<div class="task-panel__grid">
<div class="task-panel__field task-panel__field--control task-panel__field--full">
<span class="task-panel__field-label">回传方式</span>
<div class="task-panel__field-form">
<el-form-item prop="mode">
<el-radio-group v-model="dbCallback.mode">
<el-radio v-for="m in dbCallbackModes" :key="m.value" :value="m.value">{{ m.label }}</el-radio>
</el-radio-group>
</el-form-item>
</div>
</div>
<div v-if="dbCallback.mode" 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-form-item prop="table">
<el-select
:model-value="dbCallback.table"
placeholder="选择写回的数据表(先点「连接」拉取)"
filterable
clearable
style="width: 100%"
@change="(v: string | null) => onCallbackTableChange(v)"
>
<el-option
v-for="t in dbTables"
:key="t.name"
:label="t.comment ? `${t.name}(${t.comment})` : t.name"
:value="t.name"
/>
</el-select>
</el-form-item>
</div>
</div>
<template v-if="dbCallback.mode === 1">
<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="field">
<el-select
v-model="dbCallback.field"
placeholder="运单号写入的字段"
filterable
clearable
:disabled="!dbCallback.table"
style="width: 100%"
>
<el-option
v-for="col in dbCallbackColumns"
:key="col.name"
:label="col.comment ? `${col.name}(${col.comment})` : col.name"
:value="col.name"
/>
</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="keyField">
<el-select
v-model="dbCallback.keyField"
placeholder="订单号所在的字段(用于定位订单行)"
filterable
clearable
:disabled="!dbCallback.table"
style="width: 100%"
>
<el-option
v-for="col in dbCallbackColumns"
:key="col.name"
:label="col.comment ? `${col.name}(${col.comment})` : col.name"
:value="col.name"
/>
</el-select>
</el-form-item>
<span class="task-panel__field-hint">多包裹时按此字段定位同一订单行更新</span>
</div>
</div>
<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-form-item prop="separator">
<el-input v-model="dbCallback.separator" placeholder="如 ," style="width: 160px" />
</el-form-item>
<span class="task-panel__field-hint">多个运单号合并到同一字段时的分隔符号</span>
</div>
</div>
</template>
</div>
<el-table
v-if="dbCallback.mode === 2"
:data="dbCallbackFields"
@ -1656,35 +1820,49 @@ onMounted(() => {
</el-form>
</div>
</div>
<template #footer>
<el-button @click="dbConfigVisible = false">取消</el-button>
<el-button type="primary" :loading="dbConfigSaving" @click="handleSaveDatabaseConfig">保存</el-button>
</template>
</el-dialog>
<el-dialog v-model="fetchOrderVisible" title="拉取订单" width="480px">
<el-alert
type="info"
:closable="false"
show-icon
title="按店铺来源(平台商家按商家归属、我的店铺按店铺ID)逐平台分区拉取;时间窗按「此刻往前 N×24 小时」计算。只拉取平台侧未发货的订单(已发货/已完成/已关闭的订单会跳过)。下拉时间越长耗时越久。开启「自动拉取订单」后系统会按间隔定时拉取"
class="fetch-order-tip"
/>
<el-form :model="fetchOrderForm" label-width="96px">
<el-form-item label="店铺">
<span>{{ fetchOrderShop?.name || '-' }}</span>
</el-form-item>
<el-form-item label="拉取范围">
<el-select v-model="fetchOrderForm.days" style="width: 100%">
<el-option v-for="item in FETCH_ORDER_DAYS" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="fetchOrderVisible = false">取消</el-button>
<el-button type="primary" :loading="fetchOrderSubmitting" @click="submitFetchOrder">开始拉取</el-button>
<template #hint>保存后按新配置拉单与回传</template>
<template #actions>
<el-button size="small" @click="dbConfigVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="dbConfigSaving" @click="handleSaveDatabaseConfig">保存</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
<TaskPanelDialog
v-model="fetchOrderVisible"
title="拉取订单"
subtitle="按店铺来源逐平台分区拉取未发货订单"
width="min(640px, 92vw)"
body-max-height="60vh"
>
<div class="task-panel__form">
<p class="task-panel__form-tip">
按店铺来源(平台商家按商家归属、我的店铺按店铺ID)逐平台分区拉取;时间窗按「此刻往前 N×24 小时」计算。只拉取平台侧未发货的订单(已发货/已完成/已关闭的订单会跳过)。下拉时间越长耗时越久。开启「自动拉取订单」后系统会按间隔定时拉取。
</p>
<div class="task-panel__grid task-panel__grid--single">
<div class="task-panel__field">
<span class="task-panel__field-label">店铺</span>
<strong class="task-panel__field-value">{{ fetchOrderShop?.name || '-' }}</strong>
</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="fetchOrderForm.days" style="width: 100%">
<el-option v-for="item in FETCH_ORDER_DAYS" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
</div>
</div>
</div>
<template #hint>时间越长拉取越慢</template>
<template #actions>
<el-button size="small" @click="fetchOrderVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="fetchOrderSubmitting" @click="submitFetchOrder">开始拉取</el-button>
</template>
</TaskPanelDialog>
</el-card>
</template>
@ -1715,21 +1893,15 @@ onMounted(() => {
color: var(--el-text-color-secondary);
cursor: default;
}
.fetch-order-tip {
margin-bottom: 14px;
}
.sync-msg {
margin-left: 6px;
color: var(--el-text-color-secondary);
}
.db-tip {
margin-bottom: 10px;
}
.db-actions {
display: flex;
align-items: center;
gap: 8px;
margin: -4px 0 4px 110px;
gap: 6px;
margin: 0 0 4px 12px;
}
.db-conn-tip {
color: var(--el-text-color-secondary);
@ -1737,24 +1909,12 @@ onMounted(() => {
}
.db-dataset {
margin-bottom: 14px;
/* 对齐常规字段标签文字:字段行 12px 内边距 + 标签 10px 内边距 = 22px */
padding-left: 22px;
}
.db-callback {
margin-bottom: 6px;
}
/* 配置窗口高度固定,内容在窗口内滚动(与外部打单平台「查看店铺」一致) */
.db-config-body {
height: calc(88vh - 190px);
min-height: 320px;
overflow-y: auto;
padding-right: 6px;
}
.db-config-body::-webkit-scrollbar {
width: 8px;
}
.db-config-body::-webkit-scrollbar-thumb {
border-radius: 4px;
background: var(--el-border-color-darker);
}
.db-dataset-head {
display: flex;
align-items: center;
@ -1789,19 +1949,6 @@ onMounted(() => {
min-height: 0;
overflow: hidden;
}
.code-tip {
margin-bottom: 14px;
}
.form-tip {
margin-left: 8px;
font-size: 12px;
color: var(--el-text-color-secondary);
}
.owner-tip {
font-size: 12px;
line-height: 1.4;
color: var(--el-text-color-secondary);
}
.detail-tabs {
flex: 1;
min-height: 0;

View File

@ -17,6 +17,7 @@ import ExportButton from '@/components/ExportButton.vue'
import ListPager from '@/components/ListPager.vue'
import MultiValueFilter from '@/components/MultiValueFilter.vue'
import OperationLogPanel from '@/components/OperationLogPanel.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import VirtualSelect from '@/components/VirtualSelect.vue'
import { PLATFORM_PRESETS, platformNameOf } from '@/constants/platform'
@ -129,7 +130,9 @@ const bindTitle = computed(() => (batchMode.value ? `批量绑定(已选 ${sel
const bindBodyHeight = ref(420)
function updateBindBodyHeight() {
bindBodyHeight.value = Math.min(560, Math.max(220, Math.round(window.innerHeight * 0.6)))
const base = Math.min(560, Math.max(220, Math.round(window.innerHeight * 0.6)))
// 批量模式多一行提示,需要让出高度,避免整个面板超出视口
bindBodyHeight.value = batchMode.value ? Math.max(200, base - 56) : base
}
/** 正在绑定的行(`p<id>` / `c<id>`),用于展示行内 loading */
const bindingKey = ref('')
@ -252,6 +255,7 @@ function openBind(row: ShopProductItem) {
comboQuery.keyword = ''
comboQuery.status = ''
comboQuery.page = 1
updateBindBodyHeight()
bindVisible.value = true
loadProducts()
loadCombos()
@ -272,6 +276,7 @@ function openBatchBind() {
comboQuery.keyword = ''
comboQuery.status = ''
comboQuery.page = 1
updateBindBodyHeight()
bindVisible.value = true
loadProducts()
loadCombos()
@ -325,7 +330,7 @@ async function batchBind(targetType: number, targetId: number) {
await ElMessageBox.confirm(
`把已勾选的 ${count} 条店铺商品统一绑定到该${targetType === BIND_TYPES.combo ? '组合商品' : '系统商品'}?已有其它绑定的会被覆盖。`,
'批量绑定确认',
{ type: 'warning', confirmButtonText: '确定绑定', cancelButtonText: '取消' },
{ type: 'warning', confirmButtonText: '确定绑定', cancelButtonText: '取消', customClass: 'app-confirm-box' },
)
} catch {
return
@ -364,7 +369,7 @@ async function batchUnbind() {
await ElMessageBox.confirm(
`确认解除已勾选 ${count} 条店铺商品的绑定?解除后订单明细会还原为平台原样数据。`,
'批量解绑确认',
{ type: 'warning', confirmButtonText: '解绑', cancelButtonText: '取消' },
{ type: 'warning', confirmButtonText: '解绑', cancelButtonText: '取消', customClass: 'app-confirm-box' },
)
} catch {
return
@ -399,6 +404,7 @@ async function unbind() {
type: 'warning',
confirmButtonText: '解绑',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -683,24 +689,19 @@ onBeforeUnmount(() => {
</div>
</div>
<el-dialog
<TaskPanelDialog
v-model="bindVisible"
:title="bindTitle"
width="min(1100px, 94vw)"
top="5vh"
class="bind-dialog"
destroy-on-close
:subtitle="batchMode ? `已勾选 ${selectedRows.length} 条店铺商品,选择商品后统一绑定` : '选择系统商品或组合商品完成绑定'"
width="min(1100px, 96vw)"
body-max-height="72vh"
>
<el-alert
v-if="batchMode"
type="warning"
:closable="false"
show-icon
class="bind-batch-tip"
:title="`已勾选 ${selectedRows.length} 条店铺商品:选择下面的系统商品或组合商品后,会把这 ${selectedRows.length} 条统一绑定到同一个对象(已有其它绑定的会被覆盖)`"
/>
<div class="bind-layout" :style="{ height: `${bindBodyHeight}px` }">
<el-tabs v-model="bindTab" tab-position="left" class="bind-tabs">
<div class="task-panel__form">
<p v-if="batchMode" class="task-panel__form-tip task-panel__form-tip--warning">
已勾选 {{ selectedRows.length }} 条店铺商品:选择下面的系统商品或组合商品后,会把这 {{ selectedRows.length }} 条统一绑定到同一个对象(已有其它绑定的会被覆盖)
</p>
<div class="bind-layout" :style="{ height: `${bindBodyHeight}px` }">
<el-tabs v-model="bindTab" tab-position="left" class="bind-tabs">
<el-tab-pane label="系统商品" name="product">
<div class="bind-pane">
<div class="bind-filters">
@ -715,8 +716,8 @@ onBeforeUnmount(() => {
<el-option label="上架" :value="1" />
<el-option label="下架" :value="0" />
</el-select>
<el-button type="primary" @click="searchProducts">查询</el-button>
<el-button @click="resetProductQuery">重置</el-button>
<el-button size="small" type="primary" @click="searchProducts">查询</el-button>
<el-button size="small" @click="resetProductQuery">重置</el-button>
</div>
<div class="bind-table">
<DataTable :loading="productLoading" :data="productList" height="100%">
@ -794,8 +795,8 @@ onBeforeUnmount(() => {
<el-option label="上架" :value="1" />
<el-option label="下架" :value="0" />
</el-select>
<el-button type="primary" @click="searchCombos">查询</el-button>
<el-button @click="resetComboQuery">重置</el-button>
<el-button size="small" type="primary" @click="searchCombos">查询</el-button>
<el-button size="small" @click="resetComboQuery">重置</el-button>
</div>
<div class="bind-table">
<DataTable :loading="comboLoading" :data="comboList" height="100%">
@ -836,27 +837,26 @@ onBeforeUnmount(() => {
/>
</div>
</el-tab-pane>
</el-tabs>
</div>
<template #footer>
<div class="bind-footer">
<span class="bind-current">
{{ batchMode ? `已勾选 ${selectedRows.length} 条:统一绑定到同一对象` : `当前绑定:${currentBindLabel}` }}
</span>
<div>
<el-button v-if="batchMode" :loading="bindSubmitting" @click="batchUnbind">统一解绑</el-button>
<el-button
v-else-if="bindRow && bindRow.bind_type !== BIND_TYPES.none"
:loading="bindSubmitting"
@click="unbind"
>
解绑
</el-button>
<el-button @click="bindVisible = false">关闭</el-button>
</div>
</el-tabs>
</div>
</div>
<template #hint>
{{ batchMode ? `已勾选 ${selectedRows.length} 条:统一绑定到同一对象` : `当前绑定:${currentBindLabel}` }}
</template>
</el-dialog>
<template #actions>
<el-button v-if="batchMode" size="small" :loading="bindSubmitting" @click="batchUnbind">统一解绑</el-button>
<el-button
v-else-if="bindRow && bindRow.bind_type !== BIND_TYPES.none"
size="small"
:loading="bindSubmitting"
@click="unbind"
>
解绑
</el-button>
<el-button size="small" @click="bindVisible = false">关闭</el-button>
</template>
</TaskPanelDialog>
</el-card>
</template>
@ -984,16 +984,4 @@ onBeforeUnmount(() => {
flex: 1 1 auto;
min-height: 0;
}
.bind-footer {
display: flex;
align-items: center;
justify-content: space-between;
}
.bind-current {
font-size: 12px;
color: var(--el-text-color-secondary);
}
.bind-batch-tip {
margin-bottom: 8px;
}
</style>

View File

@ -16,6 +16,7 @@ import DataTable from '@/components/DataTable.vue'
import ListPager from '@/components/ListPager.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import VirtualTable from '@/components/VirtualTable.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import { formatDateTime } from '@/utils/datetime'
import VirtualSelect from '@/components/VirtualSelect.vue'
import type { VirtualColumn } from '@/components/virtualTable'
@ -209,6 +210,7 @@ async function handleDelete(row: StockOrder) {
type: 'warning',
confirmButtonText: '删除',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -371,6 +373,7 @@ async function handleDeleteItem(row: StockItemLine) {
type: 'warning',
confirmButtonText: '删除',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -425,8 +428,8 @@ onMounted(async () => {
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button @click="reset">重置</el-button>
<el-button size="small" type="primary" @click="search">查询</el-button>
<el-button size="small" @click="reset">重置</el-button>
</el-form-item>
</el-form>
@ -533,100 +536,199 @@ onMounted(async () => {
</template>
</SplitLayout>
<el-dialog v-model="dialogVisible" :title="editId == null ? '新增' + billTypeName : '编辑' + billTypeName" width="580px">
<el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
<el-form-item label="仓库" prop="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="warehouseSelectOptions"
placeholder="请选择仓库"
clearable
style="width: 100%"
/>
</el-form-item>
<el-form-item :label="billTypeName + '类型'" prop="type">
<el-select v-model="form.type" style="width: 100%">
<el-option v-for="o in TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</el-form-item>
<el-form-item v-if="editId != null" label="状态" prop="status">
<el-select v-model="form.status" style="width: 100%">
<el-option v-for="(label, val) in STATUS_LABELS" :key="val" :label="label" :value="Number(val)" />
</el-select>
</el-form-item>
<el-form-item :label="partyLabel" prop="party">
<el-input v-model="form.party" placeholder="选填" />
</el-form-item>
<el-form-item label="操作人" prop="operator">
<el-input v-model="form.operator" placeholder="选填" />
</el-form-item>
<el-form-item label="单据金额" prop="total_amount">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</el-dialog>
<TaskPanelDialog
v-model="dialogVisible"
:title="editId == null ? '新增' + billTypeName : '编辑' + billTypeName"
subtitle="单据头信息;保存后在下方明细区维护商品行"
width="min(580px, 92vw)"
body-max-height="62vh"
>
<el-form
ref="formRef"
:model="form"
:rules="rules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__grid task-panel__grid--single">
<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="warehouse_id">
<VirtualSelect
v-model="form.warehouse_id"
:options="warehouseSelectOptions"
placeholder="请选择仓库"
clearable
style="width: 100%"
/>
</el-form-item>
</div>
</div>
<el-dialog
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">{{ billTypeName }}类型</span>
<div class="task-panel__field-form">
<el-form-item prop="type">
<el-select v-model="form.type" style="width: 100%">
<el-option v-for="o in TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
</el-select>
</el-form-item>
</div>
</div>
<div v-if="editId != null" 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="form.status" style="width: 100%">
<el-option
v-for="(label, val) in STATUS_LABELS"
:key="val"
:label="label"
:value="Number(val)"
/>
</el-select>
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label">{{ partyLabel }}</span>
<div class="task-panel__field-form">
<el-form-item prop="party">
<el-input v-model="form.party" 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="operator">
<el-input v-model="form.operator" 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="total_amount">
<el-input-number v-model="form.total_amount" :min="0" :precision="2" style="width: 100%" />
</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>
<div class="task-panel__field-form">
<el-form-item prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
</div>
</div>
</div>
</el-form>
<template #hint>单号由系统生成(前缀视单据类型而定)</template>
<template #actions>
<el-button size="small" @click="dialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitForm">保存</el-button>
</template>
</TaskPanelDialog>
<TaskPanelDialog
v-model="itemDialogVisible"
:title="itemEditId == null ? '新增明细' : '编辑明细'"
width="520px"
append-to-body
subtitle="可先选系统商品自动带出名称/编码/规格,也可手工填写"
width="min(560px, 92vw)"
body-max-height="62vh"
>
<el-form :model="itemForm" label-width="100px">
<el-form-item label="系统商品">
<el-select
v-model="itemForm.product_id"
filterable
remote
clearable
:remote-method="remoteSearchProduct"
:loading="productSearching"
placeholder="输入编码/货物编码/条码/名称搜索(仅启用商品)"
style="width: 100%"
@change="onProductChange"
>
<el-option
v-for="p in productOptions"
:key="p.id"
:label="`${p.item_code} ${p.item_name}`"
:value="p.id"
/>
</el-select>
</el-form-item>
<el-form-item label="商品名称">
<el-input v-model="itemForm.name" placeholder="商品名称" />
</el-form-item>
<el-form-item label="商品编码">
<el-input v-model="itemForm.code" placeholder="选填" />
</el-form-item>
<el-form-item label="规格">
<el-input v-model="itemForm.spec" placeholder="选填" />
</el-form-item>
<el-form-item label="单位">
<el-input v-model="itemForm.unit" placeholder="选填,如 件/箱" />
</el-form-item>
<el-form-item label="数量">
<el-input-number v-model="itemForm.quantity" :min="0" :precision="0" style="width: 100%" />
</el-form-item>
<el-form-item label="单价">
<el-input-number v-model="itemForm.price" :min="0" :precision="2" style="width: 100%" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="itemForm.remark" type="textarea" :rows="2" placeholder="选填" />
</el-form-item>
<el-form :model="itemForm" class="task-panel__form" @submit.prevent>
<div class="task-panel__grid task-panel__grid--single">
<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="itemForm.product_id"
filterable
remote
clearable
:remote-method="remoteSearchProduct"
:loading="productSearching"
placeholder="输入编码/货物编码/条码/名称搜索(仅启用商品)"
style="width: 100%"
@change="onProductChange"
>
<el-option
v-for="p in productOptions"
:key="p.id"
:label="`${p.item_code} ${p.item_name}`"
:value="p.id"
/>
</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-input v-model="itemForm.name" placeholder="商品名称" />
</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="itemForm.code" placeholder="选填" />
</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="itemForm.spec" placeholder="选填" />
</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="itemForm.unit" placeholder="选填,如 件/箱" />
</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-number v-model="itemForm.quantity" :min="0" :precision="0" style="width: 100%" />
</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-number v-model="itemForm.price" :min="0" :precision="2" style="width: 100%" />
</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-form">
<el-input v-model="itemForm.remark" type="textarea" :rows="2" placeholder="选填" />
</div>
</div>
</div>
</el-form>
<template #footer>
<el-button @click="itemDialogVisible = false">取消</el-button>
<el-button type="primary" :loading="itemSubmitting" @click="submitItem">保存</el-button>
<template #hint>数量与单价影响单据金额合计</template>
<template #actions>
<el-button size="small" @click="itemDialogVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="itemSubmitting" @click="submitItem">保存</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
</el-card>
</template>

View File

@ -6,6 +6,7 @@ import { useAuthStore } from '@/store/auth'
import { updateProfile, changePassword } from '@/api/user'
import { formatDateTime } from '@/utils/datetime'
import QrCode from '@/components/QrCode.vue'
import TaskPanelDialog from '@/components/TaskPanelDialog.vue'
import {
createWechatBindCode,
getWechatBind,
@ -176,7 +177,8 @@ async function refreshWechatQrcode() {
wechatQr.value = res
startWechatPolling(res.state)
} catch (error) {
wechatHint.value = (error as Error)?.message || '获取微信二维码失败'
const err = error as { response?: { data?: { message?: string } }; message?: string }
wechatHint.value = err?.response?.data?.message || err?.message || '获取微信二维码失败'
} finally {
wechatLoading.value = false
}
@ -193,6 +195,7 @@ async function handleUnbind() {
type: 'warning',
confirmButtonText: '确定解绑',
cancelButtonText: '取消',
customClass: 'app-confirm-box',
})
} catch {
return
@ -210,66 +213,107 @@ onUnmounted(stopWechatPolling)
</script>
<template>
<el-card>
<el-card class="profile-card">
<template #header>
<div class="page-header">
<span>我的</span>
<div class="page-actions">
<el-button size="small" @click="openPwd">修改密码</el-button>
<el-button size="small" type="primary" :loading="submitting" @click="submitProfile">保存资料</el-button>
</div>
</div>
</template>
<el-descriptions :column="2" border class="info-block">
<el-descriptions-item label="登录账号">{{ auth.user?.username || '-' }}</el-descriptions-item>
<el-descriptions-item label="用户ID">{{ auth.user?.id ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="状态">
<el-tag :type="auth.user?.status === 1 ? 'success' : 'info'">
{{ auth.user?.status === 1 ? '启用' : '禁用' }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="最后登录">{{ auth.user?.last_login_at ? formatDateTime(auth.user.last_login_at) : '暂无' }}</el-descriptions-item>
</el-descriptions>
<div class="profile-body">
<el-form ref="formRef" :model="form" :rules="rules" class="task-panel__form" scroll-to-error @submit.prevent>
<div class="task-panel__section">账号信息</div>
<div class="task-panel__grid">
<div class="task-panel__field">
<span class="task-panel__field-label">登录账号</span>
<strong class="task-panel__field-value">{{ auth.user?.username || '-' }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">用户ID</span>
<strong class="task-panel__field-value">{{ auth.user?.id ?? '-' }}</strong>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">状态</span>
<span class="task-panel__field-value">
<el-tag :type="auth.user?.status === 1 ? 'success' : 'info'" size="small">
{{ auth.user?.status === 1 ? '启用' : '禁用' }}
</el-tag>
</span>
</div>
<div class="task-panel__field">
<span class="task-panel__field-label">最后登录</span>
<strong class="task-panel__field-value">
{{ auth.user?.last_login_at ? formatDateTime(auth.user.last_login_at) : '暂无' }}
</strong>
</div>
</div>
<el-divider content-position="left">修改资料</el-divider>
<div class="task-panel__section">联系方式</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="email">
<el-input v-model="form.email" 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="phone">
<el-input v-model="form.phone" placeholder="选填" />
</el-form-item>
</div>
</div>
</div>
<p class="task-panel__form-tip">邮箱与手机号用于接收通知与账号找回,填写后点击右上角「保存资料」生效。</p>
</el-form>
<el-form ref="formRef" :model="form" :rules="rules" label-width="96px" class="profile-form">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" placeholder="选填" />
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="选填" />
</el-form-item>
<el-form-item>
<el-button type="primary" :loading="submitting" @click="submitProfile">保存资料</el-button>
<el-button @click="openPwd">修改密码</el-button>
</el-form-item>
</el-form>
<el-divider content-position="left">微信绑定</el-divider>
<div class="wechat-bind">
<div class="wechat-bind-text">
<template v-if="wechatBind.bound">
<el-tag type="success" size="small">已绑定</el-tag>
<span class="wechat-openid">{{ wechatBind.openid }}</span>
<span class="wechat-sub">
绑定时间 {{ wechatBind.bound_at ? formatDateTime(wechatBind.bound_at) : '-' }}
</span>
</template>
<template v-else>
<el-tag type="info" size="small">未绑定</el-tag>
<span class="wechat-sub">
{{ wechatEnabled ? '绑定后可直接在登录页微信扫码登录' : '管理员尚未配置微信登录网关,暂不可用' }}
</span>
</template>
</div>
<div class="wechat-bind-actions">
<el-button v-if="!wechatBind.bound" type="primary" :disabled="!wechatEnabled" @click="openWechatBind">
绑定微信
</el-button>
<el-button v-else type="danger" plain @click="handleUnbind">解绑微信</el-button>
<div class="task-panel__form">
<div class="task-panel__section">微信绑定</div>
<div class="task-panel__field wechat-bind">
<span class="task-panel__field-label">微信</span>
<div class="wechat-info">
<el-tag v-if="wechatBind.bound" type="success" size="small">已绑定</el-tag>
<el-tag v-else type="info" size="small">未绑定</el-tag>
<span v-if="wechatBind.bound" class="wechat-openid">{{ wechatBind.openid }}</span>
<span class="wechat-sub">
{{
wechatBind.bound
? `绑定时间 ${wechatBind.bound_at ? formatDateTime(wechatBind.bound_at) : '-'}`
: wechatEnabled
? '绑定后可直接在登录页微信扫码登录'
: '管理员尚未配置微信登录网关,暂不可用'
}}
</span>
</div>
<el-button
v-if="!wechatBind.bound"
size="small"
type="primary"
:disabled="!wechatEnabled"
@click="openWechatBind"
>
绑定微信
</el-button>
<el-button v-else size="small" type="danger" plain @click="handleUnbind">解绑微信</el-button>
</div>
</div>
</div>
<el-dialog v-model="wechatVisible" title="绑定微信" width="380px" @closed="stopWechatPolling">
<TaskPanelDialog
v-model="wechatVisible"
title="绑定微信"
subtitle="使用微信扫码并在手机上确认后绑定到当前账号"
width="min(420px, 92vw)"
body-max-height="60vh"
@closed="stopWechatPolling"
>
<div class="wechat-dialog">
<div class="wechat-qr">
<QrCode v-if="wechatQr" :value="wechatQr.page_url" :size="180" />
@ -279,36 +323,63 @@ onUnmounted(stopWechatPolling)
</div>
</div>
<p class="wechat-hint">请使用微信扫描二维码,并在手机上确认绑定</p>
<p class="wechat-hint wechat-sub">绑定成功后窗口会自动关闭</p>
<el-button text type="primary" :loading="wechatLoading" @click="refreshWechatQrcode">
刷新二维码
</el-button>
</div>
</el-dialog>
<el-dialog v-model="pwdVisible" title="修改密码" width="480px">
<el-alert
type="info"
:closable="false"
title="需验证原密码;修改成功后原密码立即失效,下次登录请使用新密码"
style="margin-bottom: 16px"
/>
<el-form ref="pwdFormRef" :model="pwdForm" :rules="pwdRules" label-width="96px">
<el-form-item label="原密码" prop="old_password">
<el-input v-model="pwdForm.old_password" type="password" show-password placeholder="请输入当前密码" />
</el-form-item>
<el-form-item label="新密码" prop="password">
<el-input v-model="pwdForm.password" type="password" show-password placeholder="不少于 6 位" />
</el-form-item>
<el-form-item label="确认密码" prop="confirm">
<el-input v-model="pwdForm.confirm" type="password" show-password placeholder="再次输入新密码" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="pwdVisible = false">取消</el-button>
<el-button type="primary" :loading="pwdSubmitting" @click="submitPwd">确定</el-button>
<template #hint>绑定成功后窗口会自动关闭</template>
<template #actions>
<el-button size="small" :loading="wechatLoading" @click="refreshWechatQrcode">刷新二维码</el-button>
<el-button size="small" @click="wechatVisible = false">关闭</el-button>
</template>
</el-dialog>
</TaskPanelDialog>
<TaskPanelDialog
v-model="pwdVisible"
title="修改密码"
subtitle="需验证原密码;修改成功后原密码立即失效"
width="min(480px, 92vw)"
body-max-height="56vh"
>
<el-form
ref="pwdFormRef"
:model="pwdForm"
:rules="pwdRules"
class="task-panel__form"
scroll-to-error
@submit.prevent
>
<div class="task-panel__grid task-panel__grid--single">
<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="old_password">
<el-input v-model="pwdForm.old_password" type="password" show-password placeholder="请输入当前密码" />
</el-form-item>
</div>
</div>
<div class="task-panel__field task-panel__field--input">
<span class="task-panel__field-label is-required">新密码</span>
<div class="task-panel__field-form">
<el-form-item prop="password">
<el-input v-model="pwdForm.password" type="password" show-password placeholder="不少于 6 位" />
</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="confirm">
<el-input v-model="pwdForm.confirm" type="password" show-password placeholder="再次输入新密码" />
</el-form-item>
</div>
</div>
</div>
<p class="task-panel__form-tip">新密码长度不少于 6 位;修改成功后下次登录请使用新密码。</p>
</el-form>
<template #hint>修改成功后当前登录状态仍然有效</template>
<template #actions>
<el-button size="small" @click="pwdVisible = false">取消</el-button>
<el-button size="small" type="primary" :loading="pwdSubmitting" @click="submitPwd">确定</el-button>
</template>
</TaskPanelDialog>
</el-card>
</template>
@ -319,35 +390,41 @@ onUnmounted(stopWechatPolling)
justify-content: space-between;
font-weight: 600;
}
.info-block {
margin-bottom: 8px;
.page-actions {
display: flex;
align-items: center;
gap: 6px;
}
.profile-form {
max-width: 560px;
/* 页面型表单:分组之间留出比弹窗更大的间距 */
.profile-body {
display: flex;
flex-direction: column;
gap: 4px;
max-width: 880px;
}
.profile-body .task-panel__section {
margin-top: 12px;
}
.profile-body .task-panel__section:first-child {
margin-top: 0;
}
.wechat-bind {
display: flex;
align-items: center;
justify-content: space-between;
gap: 12px;
max-width: 560px;
flex-wrap: wrap;
}
.wechat-bind-text {
.wechat-info {
flex: 1;
min-width: 0;
display: flex;
align-items: center;
gap: 8px;
flex-wrap: wrap;
}
.wechat-openid {
font-family: var(--el-font-family);
font-size: 13px;
color: var(--el-text-color-regular);
}
.wechat-sub {
font-size: 12px;
color: var(--el-text-color-secondary);