feat: 完成多模块功能迭代与优化
本次提交包含多模块功能更新: 1. 权限系统重构:移除硬编码admin放行逻辑,新增精细化权限控制,完善权限树形结构与用户/角色保护 2. 新增物料导入导出接口,补充台账查询条件 3. 优化列表查询排序逻辑,新增区域编码大小写不敏感搜索 4. 修复帮助抽屉重复弹出问题,补充页面权限控制 5. 新增弱密码提示逻辑,优化MES/WMS用户/角色管理权限 6. 调整路由结构,新增权限校验脚本与前端权限树重构 7. 补充数据库字段与依赖包更新
This commit is contained in:
@@ -8,9 +8,10 @@ import { helpLedger } from '../help'
|
||||
|
||||
const orderNo = ref('')
|
||||
const materialCode = ref('')
|
||||
const materialName = ref('')
|
||||
const status = ref('')
|
||||
const loading = ref(false)
|
||||
const queried = ref(false)
|
||||
const usingDemo = ref(false)
|
||||
const rows = ref([])
|
||||
const total = ref(0)
|
||||
const page = reactive({ current: 1, size: 20 })
|
||||
@@ -19,25 +20,6 @@ function gapOf(row) {
|
||||
return Math.max((row.totalQty || 0) - (row.outQty || 0), 0)
|
||||
}
|
||||
|
||||
// 当真实台账为空(或无符合条件数据)时,注入一组演示记录,方便查看展示效果
|
||||
function demoRows() {
|
||||
const now = Date.now()
|
||||
const mk = (order, code, name, totalQty, outQty, status, remark, days) => ({
|
||||
orderNo: order, materialCode: code, materialName: name,
|
||||
totalQty, outQty, status, remark, isDemo: true, createdAt: now - days * 86400000
|
||||
})
|
||||
return [
|
||||
mk('WO20260903001', 'ST-A100', '结构件-A型立柱', 240, 240, '领料完结', '已全部领料', 0),
|
||||
mk('WO20260903001', 'ST-B200', '结构件-B型横梁', 180, 120, '进行中', '余量 60 待领', 0),
|
||||
mk('WO20260903001', 'ST-C300', '结构件-C型底座', 90, 90, '领料完结', '', 1),
|
||||
mk('WO20260902017', 'PR-S100', '精密件-伺服电机主轴', 56, 36, '进行中', '余量 20 待领', 1),
|
||||
mk('WO20260902017', 'PR-S200', '精密件-编码器', 56, 0, '进行中', '尚未开始领料', 2),
|
||||
mk('WO20260902018', 'ST-D400', '结构件-D型支撑', 300, 210, '进行中', '余量 90 待领', 2),
|
||||
mk('WO20260901045', 'PR-S300', '精密件-减速箱体', 24, 24, '领料完结', '', 5),
|
||||
mk('WO20260901045', 'ST-E500', '结构件-E型端盖', 60, 40, '进行中', '', 5)
|
||||
]
|
||||
}
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try {
|
||||
@@ -45,21 +27,14 @@ async function load() {
|
||||
params: {
|
||||
orderNo: orderNo.value.trim() || undefined,
|
||||
materialCode: materialCode.value.trim() || undefined,
|
||||
materialName: materialName.value.trim() || undefined,
|
||||
status: status.value || undefined,
|
||||
page: page.current,
|
||||
pageSize: page.size
|
||||
}
|
||||
})
|
||||
const real = data?.list || []
|
||||
if (real.length) {
|
||||
rows.value = real
|
||||
total.value = data?.total || 0
|
||||
usingDemo.value = false
|
||||
} else {
|
||||
// 无真实台账 → 展示演示数据(标注),便于查看效果
|
||||
rows.value = demoRows()
|
||||
total.value = rows.value.length
|
||||
usingDemo.value = true
|
||||
}
|
||||
rows.value = data?.list || []
|
||||
total.value = data?.total || 0
|
||||
queried.value = true
|
||||
} finally {
|
||||
loading.value = false
|
||||
@@ -84,11 +59,21 @@ function statusTag(s) {
|
||||
<el-form inline @submit.prevent="search">
|
||||
<el-form-item label="工单号">
|
||||
<el-input v-model="orderNo" placeholder="工单号(可空,查全部)" clearable
|
||||
style="width:210px" @keyup.enter="search" />
|
||||
style="width:200px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料编码">
|
||||
<el-input v-model="materialCode" placeholder="物料编码(可空)" clearable
|
||||
style="width:180px" @keyup.enter="search" />
|
||||
style="width:160px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料名称">
|
||||
<el-input v-model="materialName" placeholder="物料名称(可空)" clearable
|
||||
style="width:160px" @keyup.enter="search" />
|
||||
</el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-select v-model="status" placeholder="全部" clearable style="width:130px" @change="search">
|
||||
<el-option label="进行中" value="进行中" />
|
||||
<el-option label="领料完结" value="领料完结" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="loading" @click="search">查询</el-button>
|
||||
@@ -99,12 +84,12 @@ function statusTag(s) {
|
||||
<el-card v-if="queried" shadow="never">
|
||||
<template #header>
|
||||
工单备料台账(共 {{ total }} 条)
|
||||
<el-tag v-if="usingDemo" type="warning" size="small" style="margin-left:8px">演示数据</el-tag>
|
||||
</template>
|
||||
<el-table :data="rows" border v-loading="loading" empty-text="暂无台账数据">
|
||||
<el-table-column prop="id" label="ID" width="64" align="center" />
|
||||
<el-table-column prop="orderNo" label="工单号" min-width="150" />
|
||||
<el-table-column prop="materialCode" label="物料编码" min-width="150" />
|
||||
<el-table-column prop="materialName" label="物料名称" min-width="150">
|
||||
<el-table-column prop="materialCode" label="物料编码" min-width="140" />
|
||||
<el-table-column prop="materialName" label="物料名称" min-width="160">
|
||||
<template #default="{ row }">{{ row.materialName || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="totalQty" label="需求总量" width="100" align="center" />
|
||||
@@ -135,10 +120,10 @@ function statusTag(s) {
|
||||
<el-skeleton :rows="6" animated />
|
||||
</el-card>
|
||||
</div>
|
||||
<PageHelp :data="helpLedger" />
|
||||
<PageHelp :data="helpLedger" page="Ledger" />
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.mb12 { margin-bottom: 12px; }
|
||||
.pager { display: flex; justify-content: flex-end; margin-top: 10px; }
|
||||
</style>
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user