feat: 重构 AGV 对接与在制品查询,新增 PLC 手动监控功能

This commit is contained in:
SunYF
2026-10-17 17:49:47 +08:00
parent f65a52d9e1
commit f743cf21fb
96 changed files with 6130 additions and 1781 deletions
@@ -118,7 +118,7 @@ defineExpose({ load })
<el-table-column label="上传时间" width="165" align="center">
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
</el-table-column>
<el-table-column label="操作" width="180" align="center">
<el-table-column label="操作" width="170" align="center">
<template #default="{ row }">
<el-button link type="primary" size="small" @click="preview(row)">查看</el-button>
<el-button link type="primary" size="small" @click="download(row)">下载</el-button>
@@ -355,7 +355,7 @@ onMounted(() => loadZones())
<el-table :data="snList.map((v, i) => ({ i, v }))" size="small" border max-height="320" empty-text="暂无 SN" style="max-width:620px">
<el-table-column type="index" label="#" width="56" align="center" />
<el-table-column prop="v" label="SN 序列号" min-width="220" />
<el-table-column label="操作" width="80" align="center">
<el-table-column label="操作" width="90" align="center">
<template #default="{ row }">
<el-button link type="danger" size="small" @click="removeSn(row.i)">删除</el-button>
</template>
-12
View File
@@ -282,18 +282,6 @@ export const helpReturnOrder = {
]
}
export const helpAgv = {
title: 'AGV 配送',
overview:
'AGV(海康 RCS)配送管理:库房出库后由 AGV 将物料托盘送到产线接驳台。\n\n触发链路:MES 排产时确认送达接驳台(DOCK01~20 产线 / DOCK21 库房)→ 备料单自动带上 target_dock → 本页「下发AGV」由仓库人员勾选待发料行、确认目标接驳台后点击下发 → 系统按目标口分组生成 AGV 任务并调海康 RCS。\n\n接驳台状态:有传感器,PLC 可反馈「是否有托盘」;AGV 到达目标口前系统可查询该口是否空闲,托盘未清走前不会再次下料到该口。\n\n说明:RCS 未配置 appKey/appSecret 时走模拟模式(mock),用于联调完整链路;现场配置后自动切换真实调度。\n\n【当前状态:待现场对接】AGV 默认运行于模拟模式(EnableMock=true),下发/到位/取消均为本地模拟、不驱动真实小车;顶部黄色横幅即此提示。对接真实海康 RCS 时,在服务配置中关闭 EnableMock 并填写 BaseURL / AppKey / AppSecret 即可,业务代码无需改动。',
fields: [
{ name: '接驳台状态', source: '系统维护。DOCK01~20 产线(对应工位 1~20)+ DOCK21 库房。', purpose: '查看每个接驳台当前是否有托盘', fill: '绿色=空闲(无托盘);橙色=有托盘(占用中,AGV 到达前需确认空闲)' },
{ name: 'AGV任务', source: '系统生成。每次下发一个目标口生成一条任务。', purpose: '追踪每批料的搬运进度', fill: '状态:待下发 → 待搬运 → 搬运中 → 已到位;到位后自动回写备料单状态' },
{ name: '下发AGV', source: '勾选 MES 备料单待发料行(含排产时确认的 target_dock)。', purpose: '仓库人员将放好货的托盘交付 AGV 搬运', fill: '行内可改目标接驳台、可批量设同值;确认后按目标口分组生成任务。操作人是当前登录账号' },
{ name: '源点', source: '默认 DOCK21(库房),可改。', purpose: 'AGV 从哪里取货', fill: '下拉选择,默认库房口' }
]
}
export const helpZone = {
title: '区域维护(库位四级)',
overview:
@@ -75,8 +75,7 @@ const menuGroups = [
title: '库存管理', icon: Box, children: [
{ path: '/inventory', title: '库存查询', icon: Search, code: 'inventory:view' },
{ path: '/stocktake', title: '库存盘点', icon: List, code: 'stocktake:view' },
{ path: '/semi', title: '半成品管理', icon: Box, code: 'semi:view' },
{ path: '/agv', title: 'AGV配送', icon: Van, code: 'agv:manage' }
{ path: '/semi', title: '半成品管理', icon: Box, code: 'semi:view' }
]
},
{
-310
View File
@@ -1,310 +0,0 @@
<script setup>
defineOptions({ name: 'Agv' })
import { computed, onMounted, reactive, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import request from '../utils/request'
import { getRealName } from '../utils/auth'
import { fmtTime } from '../utils/format'
import { can } from '../utils/perm'
import PageHelp from '../components/PageHelp.vue'
import { helpAgv } from '../help'
const activeTab = ref('docks') // docks=接驳台状态 / tasks=AGV任务 / dispatch=下发AGV
const operator = getRealName()
/* ===================== 接驳台状态 ===================== */
const docks = ref([])
const loadingDocks = ref(false)
async function loadDocks() {
loadingDocks.value = true
try {
const data = await request.get('/agv/docks')
docks.value = (data?.list || []).sort((a, b) => String(a.dockCode).localeCompare(String(b.dockCode)))
} catch { docks.value = [] }
loadingDocks.value = false
}
/* ===================== AGV 任务列表 ===================== */
const tasks = ref([])
const taskTotal = ref(0)
const taskPage = reactive({ current: 1, size: 20 })
const taskQuery = reactive({ status: '' })
const loadingTasks = ref(false)
const statusOptions = [
{ v: 'PENDING', l: '待下发' }, { v: 'DISPATCHED', l: '待搬运' },
{ v: 'DELIVERING', l: '搬运中' }, { v: 'DONE', l: '已到位' },
{ v: 'FAILED', l: '下发失败' }, { v: 'CANCELLED', l: '已取消' }
]
const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || s
const statusTag = (s) =>
s === 'DONE' ? 'success' : s === 'FAILED' || s === 'CANCELLED' ? 'info' : s === 'DELIVERING' ? 'warning' : s === 'DISPATCHED' ? 'primary' : ''
async function loadTasks() {
loadingTasks.value = true
try {
const data = await request.get('/agv/tasks', { params: { ...taskQuery, page: taskPage.current, pageSize: taskPage.size } })
tasks.value = data?.list || []
taskTotal.value = data?.total || 0
} catch { tasks.value = [] }
loadingTasks.value = false
}
/* ===================== 下发 AGV(仓管操作) ===================== */
const mrs = ref([])
const mrTotal = ref(0)
const mrPage = reactive({ current: 1, size: 20 })
const mrQuery = reactive({ status: 'PENDING' })
const loadingMrs = ref(false)
const selected = ref([])
// DOCK 选项:DOCK01~20 产线 + DOCK21 库房
const dockOptions = Array.from({ length: 21 }, (_, i) => 'DOCK' + String(i + 1).padStart(2, '0'))
const sourceDock = ref('DOCK21')
async function loadMrs() {
loadingMrs.value = true
try {
const data = await request.get('/agv/materials', { params: { ...mrQuery, page: mrPage.current, pageSize: mrPage.size } })
mrs.value = data?.list || []
mrTotal.value = data?.total || 0
} catch { mrs.value = [] }
loadingMrs.value = false
}
// 行级改 DOCK
function changeDock(row, v) {
row.targetDock = v
}
// 批量设同值
async function batchSetDock(v) {
if (!selected.value.length) return ElMessage.warning('请先勾选待发料行')
selected.value.forEach((r) => (r.targetDock = v))
ElMessage.success(`已批量设为 ${v}`)
}
// 按 targetDock 分组统计(下发确认弹窗展示)
const groupPreview = computed(() => {
const g = {}
for (const r of selected.value) {
const d = r.targetDock || '未指定'
g[d] = (g[d] || 0) + 1
}
return Object.entries(g).map(([dock, n]) => ({ dock, n }))
})
async function submitAgv() {
const rows = selected.value.filter((r) => r.targetDock)
if (!rows.length) return ElMessage.warning('请至少选择一行且指定目标接驳台')
const lines = groupPreview.value.map((g) => `· ${g.dock}:${g.n} 行`).join('\n')
await ElMessageBox.confirm(
`确认下发 ${rows.length} 行待发料给 AGV?\n\n按目标接驳台分组:\n${lines}\n\n源点:${sourceDock.value}\n操作人:${operator}`,
'确认下发 AGV',
{ type: 'warning', confirmButtonText: '确认下发', cancelButtonText: '取消' }
)
const res = await request.post('/agv/submit', { rows, sourceDock: sourceDock.value })
ElMessage.success(`已创建 ${res?.created || 0} 个 AGV 任务`)
selected.value = []
mrQuery.status = 'PENDING'
mrPage.current = 1
loadMrs(); loadTasks(); loadDocks()
}
// 刷新任务状态(轮询 RCS)
const refreshing = ref(false)
async function refreshTasks() {
refreshing.value = true
try {
const res = await request.post('/agv/refresh')
if (res?.changed > 0) {
ElMessage.success(`${res.changed} 个任务状态已更新`)
loadTasks(); loadDocks()
}
} catch { /* 忽略 */ }
refreshing.value = false
}
// 表格行多选保留
function onSelectionChange(sel) { selected.value = sel }
function rowKey(row) { return row.requestNo + '-' + row.materialCode + '-' + row.planDate }
/* ===================== 取消任务 / 对接模式 ===================== */
const agvMode = reactive({ mock: false, tip: '' })
function canCancel(status) {
return status === 'PENDING' || status === 'DISPATCHED' || status === 'DELIVERING'
}
async function cancelTask(row) {
const { value: reason } = await ElMessageBox.prompt(
`确认取消 AGV 任务 ${row.taskNo}(${row.sourceDock} → ${row.targetDock})?\n取消后关联的备料单行将退回待发料。`,
'取消 AGV 任务',
{ type: 'warning', confirmButtonText: '确认取消', cancelButtonText: '返回', inputPlaceholder: '取消原因(选填)', inputValue: '' }
).catch(() => ({ value: null }))
if (reason === null) return
await request.post('/agv/cancel', { taskNo: row.taskNo, reason: reason || '' })
ElMessage.success('已取消')
loadTasks(); loadDocks()
}
async function loadMode() {
try {
const m = await request.get('/agv/mode')
agvMode.mock = !!m?.mock
agvMode.tip = m?.tip || ''
} catch { /* 忽略 */ }
}
onMounted(() => { loadDocks(); loadTasks(); loadMode() })
</script>
<template>
<div class="page">
<PageHelp :page="'Agv'" :data="helpAgv" />
<!-- AGV 对接状态(J:维持 mock,标注待现场对接)——置于页签外层,所有页签均可见 -->
<el-alert v-if="agvMode.mock" type="warning" :closable="false" show-icon style="margin-bottom:10px"
title="AGV 待对接:当前为模拟模式(未接真实海康 RCS)"
:description="agvMode.tip || '下发/到位/取消均为本地模拟,任务会立即标记为已到位,不会驱动真实小车。现场对接时在配置中关闭 EnableMock 并填写 RCS 地址 / appKey / appSecret 即切换为真实调度。'" />
<el-tabs v-model="activeTab">
<!-- ① 接驳台状态(默认) -->
<el-tab-pane label="接驳台状态" name="docks">
<div class="toolbar">
<el-button type="primary" :loading="loadingDocks" @click="loadDocks">刷新</el-button>
<span class="tip">● 绿色 = 空闲(无托盘) / 橙色 = 有托盘;AGV 到达前需确认目标口空闲</span>
</div>
<div class="dock-grid">
<div v-for="d in docks" :key="d.dockCode" class="dock-card"
:class="{ busy: d.hasPallet, line: d.dockType === 'line', wh: d.dockType !== 'line' }">
<div class="dock-code">{{ d.dockCode }}</div>
<div class="dock-name">{{ d.name }}</div>
<div class="dock-status">{{ d.hasPallet ? '有托盘' : '空闲' }}</div>
<div class="dock-ref" v-if="d.palletRef">托盘号 {{ d.palletRef }}</div>
</div>
</div>
</el-tab-pane>
<!-- ② AGV 任务列表 -->
<el-tab-pane label="AGV任务" name="tasks" lazy>
<div class="toolbar">
<el-select v-model="taskQuery.status" clearable placeholder="任务状态" style="width: 140px" @change="taskPage.current = 1; loadTasks()">
<el-option v-for="s in statusOptions" :key="s.v" :label="s.l" :value="s.v" />
</el-select>
<el-button type="primary" :loading="refreshing" @click="refreshTasks">刷新状态</el-button>
<el-button @click="taskPage.current = 1; loadTasks()">查询</el-button>
<el-button @click="taskQuery.status=''; taskPage.current=1; loadTasks()">重置</el-button>
</div>
<el-table :data="tasks" v-loading="loadingTasks" border stripe>
<el-table-column prop="id" label="ID" width="70" align="center" />
<el-table-column prop="taskNo" label="任务号" width="150" />
<el-table-column prop="sourceDock" label="源" width="80" align="center" />
<el-table-column prop="targetDock" label="目标" width="80" align="center" />
<el-table-column label="状态" width="100" align="center">
<template #default="{ row }">
<el-tag :type="statusTag(row.status)">{{ statusText(row.status) }}</el-tag>
</template>
</el-table-column>
<el-table-column label="物料" min-width="220">
<template #default="{ row }">
<div v-if="row.materialsJson">
<div v-for="(m, i) in (typeof row.materialsJson === 'string' ? JSON.parse(row.materialsJson) : row.materialsJson)" :key="i">
{{ m.materialName || m.materialCode }} ×{{ m.qty }}
</div>
</div>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="下发时间" width="150">
<template #default="{ row }">{{ row.dispatchedAt ? fmtTime(row.dispatchedAt) : '-' }}</template>
</el-table-column>
<el-table-column label="到位时间" width="150">
<template #default="{ row }">{{ row.arrivedAt ? fmtTime(row.arrivedAt) : '-' }}</template>
</el-table-column>
<el-table-column label="创建时间" width="155" align="center">
<template #default="{ row }">{{ row.createdAt ? fmtTime(row.createdAt) : '-' }}</template>
</el-table-column>
<el-table-column prop="operator" label="下发人" width="100" />
<el-table-column prop="hikTaskCode" label="RCS任务码" width="150" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" min-width="140" show-overflow-tooltip />
<el-table-column label="操作" width="90" align="center" fixed="right">
<template #default="{ row }">
<el-popconfirm v-if="canCancel(row.status)" title="确认取消该 AGV 任务?" @confirm="cancelTask(row)">
<template #reference>
<el-button size="small" type="danger" link>取消</el-button>
</template>
</el-popconfirm>
<span v-else>-</span>
</template>
</el-table-column>
</el-table>
<el-pagination background layout="total, sizes, prev, pager, next" :total="taskTotal"
:current-page="taskPage.current" :page-size="taskPage.size" :page-sizes="[10, 20, 50, 100]"
@current-change="(p) => { taskPage.current = p; loadTasks() }"
@size-change="(s) => { taskPage.size = s; taskPage.current = 1; loadTasks() }" />
</el-tab-pane>
<!-- ③ 下发 AGV(仓管操作) -->
<el-tab-pane label="下发AGV" name="dispatch" lazy>
<div class="toolbar">
<el-select v-model="mrQuery.status" style="width: 130px" placeholder="请选择状态" @change="mrPage.current = 1; loadMrs()">
<el-option label="待发料(PENDING)" value="PENDING" />
<el-option label="已备料(已出库)" value="LOCKED" />
<el-option label="配送中(DELIVERING)" value="DELIVERING" />
<el-option label="已完成(DONE)" value="DONE" />
</el-select>
<el-button @click="mrPage.current = 1; loadMrs()">查询</el-button>
<el-button @click="mrQuery.status='PENDING'; mrPage.current=1; loadMrs()">重置</el-button>
<span class="tip">勾选待发料行 → 行内可改目标接驳台 → 下发</span>
</div>
<div class="toolbar">
<el-select v-model="sourceDock" style="width: 130px" placeholder="请选择接驳台">
<el-option v-for="d in dockOptions" :key="d" :label="d" :value="d" />
</el-select>
<el-button @click="batchSetDock('DOCK01')">批量设 DOCK01</el-button>
<el-button @click="batchSetDock('DOCK02')">批量设 DOCK02</el-button>
<el-button type="primary" :disabled="!selected.length" @click="submitAgv">下发选中</el-button>
<span class="tip" v-if="groupPreview.length">将生成:{{ groupPreview.map((g) => g.dock + '×' + g.n).join(',') }}</span>
</div>
<el-table :data="mrs" v-loading="loadingMrs" border stripe @selection-change="onSelectionChange" :row-key="rowKey">
<el-table-column type="selection" :reserve-selection="true" width="42" />
<el-table-column prop="requestNo" label="备料单号" width="170" />
<el-table-column prop="orderNo" label="工单号" width="140" show-overflow-tooltip />
<el-table-column prop="materialCode" label="图号" width="120" />
<el-table-column prop="materialName" label="物料名称" min-width="140" show-overflow-tooltip />
<el-table-column prop="reqQty" label="数量" width="80" align="right" />
<el-table-column prop="unit" label="单位" width="60" align="center" />
<el-table-column label="目标接驳台" width="130">
<template #default="{ row }">
<el-select :model-value="row.targetDock || ''" placeholder="选择" size="small" @change="(v) => changeDock(row, v)">
<el-option v-for="d in dockOptions" :key="d" :label="d" :value="d" />
</el-select>
</template>
</el-table-column>
<el-table-column prop="planDate" label="排产日期" width="110" />
<el-table-column label="状态" width="90" align="center">
<template #default="{ row }">{{ statusText(row.status) }}</template>
</el-table-column>
</el-table>
<el-pagination background layout="total, sizes, prev, pager, next" :total="mrTotal"
:current-page="mrPage.current" :page-size="mrPage.size" :page-sizes="[10, 20, 50, 100]"
@current-change="(p) => { mrPage.current = p; loadMrs() }"
@size-change="(s) => { mrPage.size = s; mrPage.current = 1; loadMrs() }" />
</el-tab-pane>
</el-tabs>
</div>
</template>
<style scoped>
.toolbar { display: flex; align-items: center; gap: 8px; margin-bottom: 12px; flex-wrap: wrap; }
.tip { color: #909399; font-size: 12px; margin-left: 4px; }
.dock-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 12px; }
.dock-card { border: 1px solid #e4e7ed; border-radius: 8px; padding: 12px; text-align: center; transition: all .2s; }
.dock-card.busy { background: #fdf6ec; border-color: #e6a23c; }
.dock-card.line { border-left: 4px solid #409eff; }
.dock-card.wh { border-left: 4px solid #67c23a; }
.dock-code { font-size: 18px; font-weight: 700; }
.dock-name { font-size: 12px; color: #909399; margin: 4px 0; }
.dock-status { font-size: 13px; font-weight: 600; color: #67c23a; }
.dock-card.busy .dock-status { color: #e6a23c; }
.dock-ref { font-size: 12px; color: #e6a23c; margin-top: 2px; }
</style>
@@ -261,7 +261,7 @@ onActivated(() => load())
<el-tag v-else type="success" size="small">正常</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="120" align="center" fixed="right">
<el-table-column label="操作" width="130" align="center" fixed="right">
<template #default="{ row }">
<el-button type="primary" size="small" :disabled="row.deleted" @click="download(row)">下载</el-button>
<el-popconfirm v-if="can('attachment:manage')" title="确认删除该附件?" @confirm="remove(row)">
+1 -1
View File
@@ -1018,7 +1018,7 @@ async function onMaterialFile(e) {
<el-table-column label="创建时间" width="155" align="center">
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center" fixed="right">
<el-table-column label="操作" width="170" align="center" fixed="right">
<template #default="{ row }">
<el-button v-if="can('material:edit')" type="primary" size="small" @click="openMatEdit(row)">编辑</el-button>
<el-button link type="primary" size="small" @click="openMatAttach(row)">附件</el-button>
@@ -42,7 +42,7 @@
<el-tag v-else type="info" size="small">工位叫料</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center" fixed="right">
<el-table-column label="操作" width="130" align="center" fixed="right">
<template #default="{row}">
<el-button
v-if="can('call:manage')"
+1 -1
View File
@@ -415,7 +415,7 @@ onActivated(() => {
<el-tag v-else type="success" size="small">有效</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="160" align="center" fixed="right">
<el-table-column label="操作" width="170" align="center" fixed="right">
<template #default="{ row }">
<el-button link type="primary" size="small" @click="openDetail(row)">详情</el-button>
<el-button link type="primary" size="small" @click="openAttach(row)">附件</el-button>
@@ -605,7 +605,7 @@ onMounted(() => {
<el-table-column label="入库时间" width="155" align="center">
<template #default="{ row }">{{ row.inboundTime ? fmtTime(row.inboundTime) : '-' }}</template>
</el-table-column>
<el-table-column label="操作" width="120" align="center" fixed="right">
<el-table-column label="操作" width="130" align="center" fixed="right">
<template #default="{ row }">
<el-button link type="primary" size="small" @click="openDetailDrawer(row)">查看明细</el-button>
<el-button type="primary" size="small" @click="sendWhole(row)">整单送检</el-button>
@@ -905,7 +905,7 @@ onMounted(() => {
<el-table-column label="记录日期" width="155" align="center">
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center" fixed="right">
<el-table-column label="操作" width="170" align="center" fixed="right">
<template #default="{ row }">
<el-button v-if="row.status === '不合格'" type="primary" size="small" @click="openDispose(row)">处置</el-button>
<el-button v-if="row.status === '不合格' && row.disposalType && row.disposalType !== 'NONE'" link type="primary" size="small" @click="openResult(row)">处理结果</el-button>
@@ -864,7 +864,7 @@ onMounted(() => {
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
</el-table-column>
<!-- 在库处置:仅「在库」行可发起(出库/锁定/报废行不可处置);不合格在库行可复检(换修闭环) -->
<el-table-column label="操作" width="120" align="center" fixed="right">
<el-table-column label="操作" width="130" align="center" fixed="right">
<template #default="{ row }">
<template v-if="row.status === '在库'">
<el-button v-if="row.qualityStatus === '不合格'" size="small" type="primary" @click="openReinspect(row)">复检</el-button>
+39 -43
View File
@@ -7,7 +7,6 @@ import { fmtTime } from '../utils/format'
import { can } from '../utils/perm'
import { confirmAction } from '../utils/confirm'
import PageHelp from '../components/PageHelp.vue'
import DetailDrawer from '../components/DetailDrawer.vue'
import { helpRole } from '../help'
const loading = ref(false)
@@ -88,6 +87,7 @@ function treeCheckedCodes() {
/* ---------- 新增 / 编辑 弹窗 ---------- */
const dialog = reactive({ show: false, editingId: 0, name: '', code: '', remark: '', checked: [] })
const saving = ref(false)
const editTab = ref('base')
const isEdit = computed(() => dialog.editingId > 0)
function openCreate() {
@@ -174,21 +174,6 @@ function permSummary(arr) {
return names.length > 8 ? `${names.slice(0, 8).join('、')} 等 ${names.length} 项` : names.join('、')
}
// 角色详情抽屉
const detail = reactive({ show: false, title: '', fields: [], row: null })
function openDetail(row) {
detail.row = row
detail.title = `角色详情 · ${row.name}`
detail.fields = [
{ key: 'id', label: 'ID' },
{ key: 'code', label: '编码' },
{ key: 'name', label: '名称' },
{ key: 'remark', label: '备注' },
{ key: 'permissionCodes', label: '权限数', format: (v) => (Array.isArray(v) ? (v.includes('*') ? '全部' : v.length + ' 项') : '-') },
{ key: 'createdAt', label: '创建时间', type: 'time' }
]
detail.show = true
}
</script>
<template>
@@ -240,34 +225,46 @@ function openDetail(row) {
<el-table-column label="创建时间" width="160" align="center">
<template #default="{ row }">{{ fmtTime(row.createdAt) }}</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center" fixed="right">
<el-table-column label="操作" width="130" align="center" fixed="right">
<template #default="{ row }">
<el-button link type="primary" size="small" @click="openDetail(row)">详情</el-button>
<el-button v-if="can('role:edit')" type="primary" size="small" :disabled="row.code === 'admin'" @click="openEdit(row)">编辑权限</el-button>
<el-popconfirm v-if="can('role:delete')" title="确认删除该角色?" @confirm="removeRole(row)">
<template #reference>
<el-button link type="danger" size="small"
:disabled="['admin', 'operator', 'inspector'].includes(row.code)">删除</el-button>
</template>
</el-popconfirm>
<div style="display:flex;align-items:center;justify-content:center;gap:8px">
<el-button v-if="can('role:edit')" link type="primary" size="small"
:disabled="row.code === 'admin'" @click="openEdit(row)">编辑</el-button>
<el-popconfirm v-if="can('role:delete')" title="确认删除该角色?" @confirm="removeRole(row)">
<template #reference>
<el-button link type="danger" size="small"
:disabled="['admin', 'operator', 'inspector'].includes(row.code)">删除</el-button>
</template>
</el-popconfirm>
</div>
</template>
</el-table-column>
</el-table>
</el-card>
<el-dialog v-model="dialog.show" :title="isEdit ? '编辑角色权限' : '新增角色'" width="560px"
<el-drawer v-model="dialog.show" :title="isEdit ? '编辑角色' : '新增角色'" size="520px"
append-to-body destroy-on-close>
<el-form label-width="90px">
<el-form-item label="角色名称" required>
<el-input v-model="dialog.name" placeholder="如 库房管理员" />
</el-form-item>
<el-form-item label="角色编码" required>
<el-input v-model="dialog.code" :disabled="isEdit" placeholder="如 intro-operator(创建后不可改)" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="dialog.remark" placeholder="备注(可空)" />
</el-form-item>
<el-form-item label="权限设置" required>
<el-tabs v-model="editTab">
<el-tab-pane label="基本信息" name="base">
<el-form label-width="90px">
<el-form-item label="ID" v-if="isEdit">
<span>{{ dialog.editingId }}</span>
</el-form-item>
<el-form-item label="角色名称" required>
<el-input v-model="dialog.name" placeholder="如 库房管理员" />
</el-form-item>
<el-form-item label="角色编码" required>
<el-input v-model="dialog.code" :disabled="isEdit" placeholder="如 intro-operator(创建后不可改)" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="dialog.remark" placeholder="备注(可空)" />
</el-form-item>
<el-form-item label="权限数" v-if="isEdit">
<span>{{ (dialog.checked || []).length }}</span>
</el-form-item>
</el-form>
</el-tab-pane>
<el-tab-pane label="权限分配" name="perm">
<div class="perm-tree" v-loading="!perms.length">
<template v-if="perms.length">
<div class="perm-tip">菜单项勾选=可见该菜单;其下按钮勾选=可用该按钮(勾选互不影响)</div>
@@ -277,15 +274,14 @@ function openDetail(row) {
</template>
<el-empty v-else description="暂无权限数据(可先执行初始化)" :image-size="60" />
</div>
</el-form-item>
</el-form>
<template #footer>
</el-tab-pane>
</el-tabs>
<div style="margin-top:16px;display:flex;justify-content:flex-end;gap:8px">
<el-button @click="dialog.show = false">取消</el-button>
<el-button type="primary" :loading="saving" @click="save">保存</el-button>
</template>
</el-dialog>
</div>
</el-drawer>
</div>
<DetailDrawer :visible="detail.show" :title="detail.title" :fields="detail.fields" :data="detail.row" @update:visible="detail.show = $event" />
<PageHelp :data="helpRole" page="RoleManage" />
</template>
@@ -247,7 +247,7 @@ onMounted(() => {
<el-table-column label="创建时间" width="155" align="center">
<template #default="{ row }">{{ row.createdAt ? fmtTime(row.createdAt) : '-' }}</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center" fixed="right">
<el-table-column label="操作" width="170" align="center" fixed="right">
<template #default="{ row }">
<el-button link type="primary" size="small" @click="openDetail(row)">详情</el-button>
<el-button v-if="can('user:edit')" type="primary" size="small" :disabled="row.username === 'admin'"
@@ -20,7 +20,6 @@ const routes = [
{ path: 'inspection-incoming', name: 'InspectionIncoming', component: () => import('../pages/Inspection.vue'), meta: { title: '来料检验', keepAlive: true, componentName: 'InspectionIncoming', inspectionType: 'incoming' } },
{ path: 'stocktake', name: 'Stocktake', component: () => import('../pages/Stocktake.vue'), meta: { title: '库存盘点', keepAlive: true, componentName: 'Stocktake' } },
{ path: 'semi', name: 'Semi', component: () => import('../pages/Semi.vue'), meta: { title: '半成品管理', keepAlive: true, componentName: 'Semi' } },
{ path: 'agv', name: 'Agv', component: () => import('../pages/Agv.vue'), meta: { title: 'AGV配送', keepAlive: true, componentName: 'Agv' } },
{ path: 'zone', name: 'Zone', component: () => import('../pages/BaseData.vue'), props: { mode: 'zone' }, meta: { title: '区域维护', keepAlive: true, componentName: 'BaseData' } },
{ path: 'material', name: 'Material', component: () => import('../pages/BaseData.vue'), props: { mode: 'material' }, meta: { title: '物料档案', keepAlive: true, componentName: 'BaseData' } },
{ path: 'change-password', name: 'ChangePassword', component: () => import('../pages/ChangePassword.vue'), meta: { title: '修改密码' } },