This commit is contained in:
andy 2026-06-17 09:50:19 +08:00
parent ab120a1256
commit b70f6b1fac
3 changed files with 696 additions and 0 deletions

View File

@ -20,6 +20,9 @@ importers:
axios: axios:
specifier: ^1.6.5 specifier: ^1.6.5
version: 1.14.0 version: 1.14.0
dhtmlx-gantt:
specifier: ^9.1.4
version: 9.1.4
disable-devtool: disable-devtool:
specifier: ^0.3.9 specifier: ^0.3.9
version: 0.3.9 version: 0.3.9
@ -615,6 +618,9 @@ packages:
resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==} resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
engines: {node: '>=8'} engines: {node: '>=8'}
dhtmlx-gantt@9.1.4:
resolution: {integrity: sha512-XCNA5QUiuV79Xq1ykNpH9LFNR2IVpDZMqnmBV6dsBeOkHyPMOpkyQ/gqAPCcK2GAvYHoN2nGAMYb2LldCWhMuQ==}
disable-devtool@0.3.9: disable-devtool@0.3.9:
resolution: {integrity: sha512-WHCpC8f93Cn2DnTeaq57NFLcdw4921sovh1ammnp/2o8Snb704HK/Vw1/D2D1Pihc0zc8/mVKb5nchHtoadObQ==} resolution: {integrity: sha512-WHCpC8f93Cn2DnTeaq57NFLcdw4921sovh1ammnp/2o8Snb704HK/Vw1/D2D1Pihc0zc8/mVKb5nchHtoadObQ==}
@ -1330,6 +1336,8 @@ snapshots:
detect-libc@2.1.2: detect-libc@2.1.2:
optional: true optional: true
dhtmlx-gantt@9.1.4: {}
disable-devtool@0.3.9: {} disable-devtool@0.3.9: {}
dunder-proto@1.0.1: dunder-proto@1.0.1:

View File

@ -0,0 +1,686 @@
<template>
<div class="page-container">
<n-card>
<!-- 搜索表单 -->
<div class="search-form">
<n-form inline :model="searchForm" label-placement="left">
<n-form-item label="物料编码">
<n-input v-model:value="searchForm.code" placeholder="请输入物料编码" clearable />
</n-form-item>
<n-form-item label="产品id">
<n-input v-model:value="searchForm.projectId" placeholder="请输入产品id" clearable />
</n-form-item>
<n-form-item label="开始时间">
<n-date-picker v-model:value="searchForm.beginTime" type="datetime" clearable />
</n-form-item>
<n-form-item label="结束时间">
<n-date-picker v-model:value="searchForm.endTime" type="datetime" clearable />
</n-form-item>
<n-form-item>
<n-space>
<n-button type="primary" @click="handleSearch">
<template #icon><n-icon><SearchOutline /></n-icon></template>
搜索
</n-button>
<n-button @click="handleReset">
<template #icon><n-icon><RefreshOutline /></n-icon></template>
重置
</n-button>
</n-space>
</n-form-item>
</n-form>
</div>
<!-- 工具栏 -->
<div class="table-toolbar">
<n-space>
<n-button
type="primary"
size="small"
@click="handleAdd"
>
<template #icon><n-icon><AddOutline /></n-icon></template>
新增/补单
</n-button>
<!-- <n-button @click="importModalVisible = true">
<template #icon><n-icon><CloudUploadOutline /></n-icon></template>
导入
</n-button>
<n-button @click="handleExport">
<template #icon><n-icon><DownloadOutline /></n-icon></template>
导出{{ selectedIds.length > 0 ? `(${selectedIds.length})` : '' }}
</n-button> -->
<!-- <n-button type="error" :disabled="selectedIds.length === 0" @click="handleBatchDelete">
<template #icon><n-icon><TrashOutline /></n-icon></template>
删除
</n-button> -->
</n-space>
</div>
<!-- 表格 -->
<!--:pagination="pagination"
@update:page="handlePageChange"
@update:page-size="handlePageSizeChange"
@update:checked-row-keys="handleCheck"
-->
<n-data-table
size="small"
remote
:bordere="false"
:single-line="false"
:columns="columns"
:data="tableData"
:loading="loading"
/>
<!-- <div class="pagination-container" style="display: flex; justify-content: flex-end; margin-top: 12px">
<n-pagination
v-model:page="pagination.page"
v-model:page-size="pagination.pageSize"
:item-count="pagination.itemCount"
:page-sizes="[10, 20, 50, 100]"
show-size-picker
show-quick-jumper
@update:page="handlePageChange"
@update:page-size="handlePageSizeChange"
>
<template #prefix>
{{ pagination.itemCount }}
</template>
</n-pagination>
</div> -->
</n-card>
<!-- 新增/编辑弹窗 -->
<n-modal v-model:show="modalVisible" preset="card" :title="modalTitle" style="width: 600px">
<n-form ref="formRef" :model="formData" :rules="formRules" label-placement="left" label-width="100px">
<n-form-item label="生产令号" path="productionCode">
<n-input v-model:value="formData.productionCode" placeholder="请输入生产令号" />
</n-form-item>
<n-form-item label="物料名称" path="name">
<n-input v-model:value="formData.name" placeholder="请输入物料名称" readonly />
</n-form-item>
<n-form-item label="物料编码" path="code">
<n-input v-model:value="formData.code" placeholder="请输入物料编码" readonly />
</n-form-item>
<n-form-item label="产品序列" path="sort">
<n-input v-model:value="formData.sort" placeholder="请输入产品序列" readonly />
</n-form-item>
<n-form-item label="生产数量" path="quantity">
<n-input v-model:value="formData.quantity" placeholder="请输入生产数量" readonly />
</n-form-item>
<n-form-item label="产品名称" path="projectName">
<n-input v-model:value="formData.projectName" placeholder="请输入产品名称" readonly />
</n-form-item>
<n-form-item label="是否半成品" path="sfProduct">
<n-input v-model:value="formData.sfProduct" placeholder="请输入是否半成品, 1是 0不是" />
</n-form-item>
<n-form-item label="是否采购" path="procurement">
<n-input v-model:value="formData.procurement" placeholder="请输入是否采购, 1是 0不是" />
</n-form-item>
<n-form-item label="预计开始时间" path="beginTime">
<n-date-picker v-model:value="formData.beginTime" type="datetime" clearable style="width: 100%" />
</n-form-item>
<n-form-item label="预计结束时间" path="endTime">
<n-date-picker v-model:value="formData.endTime" type="datetime" clearable style="width: 100%" />
</n-form-item>
<n-form-item label="派工接收人" path="assingWorkId">
<n-input v-model:value="formData.assingWorkId" placeholder="请输入派工接收人" />
</n-form-item>
</n-form>
<template #footer>
<n-space justify="end">
<n-button @click="modalVisible = false">取消</n-button>
<n-button type="primary" @click="handleSubmit">确定</n-button>
</n-space>
</template>
</n-modal>
<!-- 导入弹窗 -->
<n-modal v-model:show="importModalVisible" preset="card" title="导入生产订单" style="width: 500px">
<n-space vertical>
<n-alert type="info">
<template #header>导入说明</template>
<ul style="margin: 0; padding-left: 16px; line-height: 1.8">
<li>请先下载导入模板按模板格式填写数据</li>
<li>支持 .xlsx .xls 格式</li>
</ul>
</n-alert>
<n-space>
<n-button type="primary" @click="handleDownloadTemplate">
<template #icon><n-icon><DownloadOutline /></n-icon></template>
下载模板
</n-button>
</n-space>
<n-upload :max="1" accept=".xlsx,.xls" :show-file-list="true" :custom-request="handleImportUpload">
<n-upload-dragger>
<div style="margin-bottom: 12px">
<n-icon size="48" :depth="3"><CloudUploadOutline /></n-icon>
</div>
<n-text style="font-size: 16px">点击或拖拽文件到此处上传</n-text>
<n-p depth="3" style="margin: 8px 0 0 0">支持 .xlsx .xls 格式</n-p>
</n-upload-dragger>
</n-upload>
</n-space>
<template #footer>
<n-button @click="importModalVisible = false">关闭</n-button>
</template>
</n-modal>
</div>
</template>
<script setup lang="ts">
import {
ref,
reactive,
h,
onMounted
} from 'vue'
import {
NButton,
NSpace,
NIcon,
NUpload,
useMessage,
useDialog,
type DataTableColumns,
type UploadCustomRequestOptions
} from 'naive-ui'
import {
SearchOutline,
RefreshOutline,
AddOutline,
CloudUploadOutline,
DownloadOutline
} from '@vicons/ionicons5'
import {
orderItemApi,
type OrderItem
} from '@/api/orderItem'
import { useUserStore } from '@/stores/user'
const message = useMessage()
const dialog = useDialog()
const userStore = useUserStore()
//
const hasPermission = (permission: string) => userStore.hasPermission(permission)
//
const searchForm = reactive<any>({
code: '',
projectId: '',
beginTime: '',
endTime: '',
})
//
const tableData = ref<any>([])
const loading = ref(false)
const selectedIds = ref<any>([])
const pagination = reactive<any>({
page: 1,
pageSize: 10,
itemCount: 0,
showSizePicker: true,
pageSizes: [10, 20, 50]
})
//
const modalVisible = ref(false)
const modalTitle = ref('')
const importModalVisible = ref(false)
const formRef = ref()
const defaultFormData = {
id: '',
productionCode:'',
name: '',
code: '',
sort: '',
quantity: '',
projectId: '',
projectName:'',
parentId: '',
sfProduct: '',
procurement: '',
beginTime: '',
endTime: '',
actualStartTime: '',
actualEndTime: '',
assingWorkId: '',
assingWorkTime: '',
assingWorkOperationId: '',
assingWorkOperationTime: '',
starter: ''
}
const formData = reactive<any>({ ...defaultFormData })
// //使
//
const formRules = {
}
//
const columns = [
{ type: 'selection' },
{
align:'center',
minWidth: 150,
title: '产品名称',
key: 'projectName'
},
{
align:'center',
minWidth: 150,
title: '物料名称',
key: 'name'
},
{
align:'center',
minWidth: 150,
title: '物料编码',
key: 'code'
},
{
align:'center',
minWidth: 150,
title: '产品序列',
key: 'sort'
},
{
align:'center',
minWidth: 150,
title: '生产数量',
key: 'quantity'
},
{
align:'center',
minWidth: 150,
title: '是否半成品',
key: 'sfProduct'
},
{
align:'center',
minWidth: 150,
title: '是否采购',
key: 'procurement'
},
{
align:'center',
minWidth: 150,
title: '开始时间',
key: 'beginTime'
},
{
align:'center',
minWidth: 150,
title: '结束时间',
key: 'endTime'
},
{
align:'center',
minWidth: 150,
title: '实际开始时间',
key: 'actualStartTime'
},
{
align:'center',
minWidth: 150,
title: '实际结束时间',
key: 'actualEndTime'
},
{
align:'center',
minWidth: 150,
title: '派工操作人',
key: 'assingWorkOperationName'
},
{
align:'center',
minWidth: 150,
title: '派工操作时间',
key: 'assingWorkOperationTime'
},
{
align:'center',
minWidth: 150,
title: '派工接收人',
key: 'assingWorkName'
},
{
align:'center',
minWidth: 150,
title: '派工时间',
key: 'assingWorkTime'
},
{
align:'center',
minWidth: 150,
title: '是否开工',
key: 'starter'
},
{
align:'center',
minWidth: 150,
title: '备注',
key: 'remark'
},
// { title: '', key: 'createTime', width: 100 },
// { title: '', key: 'createBy' },
{
align:'center',
title: '操作',
key: 'actions',
width: 140,
fixed: 'right',
render(row:any) {
const buttons:any = [
// h(NButton, {
// size: 'small',
// type:'warning',
// ghost:true,
// onClick: () => handleEdit(row) },
// //{ default: () => [h(NIcon, null, { default: () => h(CreateOutline) }), ' ' ]}
// { default: () => ''}
// )
]
if(hasPermission('biz:assingWork:edit')){
buttons.push(h(NButton, {
size: 'small',
type:'primary',
ghost:true,
onClick: () => { handleEdit(row) } },
//{ default: () => [h(NIcon, null, { default: () => h(CreateOutline) }), ' ' ]}
{ default: () => '编辑'}
))
}
if(hasPermission('biz:assingWork:transfer')){
buttons.push(h(NButton, {
size: 'small',
type:'success',
ghost:true,
onClick: () => { handleDelete(row) } },
{ default: () => '派工'}
))
}
// if(hasPermission('biz:assingWork:pauseResume')){
// buttons.push(h(NButton, {
// size: 'small',
// type:'warning',
// ghost:true,
// onClick:()=>{ handlpause(row) }
// },
// { default: () => ''}
// ))
// }
// buttons.push(
// )
return buttons.length > 0 ? h(NSpace, {justify:'center'}, { default: () => buttons }) : '-'
// return h('div', { style: { display: 'flex', alignItems: 'center', gap: '8px', flexWrap: 'nowrap' } }, [
// h(NButton, { size: 'small', quaternary: true, onClick: () => handleEdit(row) }, {
// default: () => [h(NIcon, null, { default: () => h(CreateOutline) }), ' ']
// }),
// h(NButton, { size: 'small', quaternary: true, type: 'error', onClick: () => handleDelete(row) }, {
// default: () => [h(NIcon, null, { default: () => h(TrashOutline) }), ' ']
// })
// ])
}
}
]
//
async function loadData() {
loading.value = true
try {
const res = await orderItemApi.page({
page: pagination.page,
pageSize: pagination.pageSize,
code: searchForm.code,
projectId: searchForm.projectId,
beginTime: searchForm.beginTime,
endTime: searchForm.endTime
})
tableData.value = res.list
pagination.itemCount = res.total
} finally {
loading.value = false
}
}
//
function handleSearch() {
pagination.page = 1
loadData()
}
//
function handleReset() {
searchForm.code = ''
searchForm.projectId = ''
searchForm.beginTime = ''
searchForm.endTime = ''
handleSearch()
}
//
function handlePageChange(page: number) {
pagination.page = page
loadData()
}
function handlePageSizeChange(pageSize: number) {
pagination.pageSize = pageSize
pagination.page = 1
loadData()
}
//
// function handleCheck(keys: Array<string | number>) {
// selectedIds.value = keys as number[]
// }
//
function handleAdd() {
modalTitle.value = '新增生产订单'
Object.assign(formData, defaultFormData)
modalVisible.value = true
}
//
function handleEdit(row: OrderItem) {
modalTitle.value = '编辑生产订单'
Object.assign(formData, row)
if (formData.beginTime && typeof formData.beginTime === 'string') {
formData.beginTime = new Date(formData.beginTime.replace(' ', 'T')).getTime()
}
if (formData.endTime && typeof formData.endTime === 'string') {
formData.endTime = new Date(formData.endTime.replace(' ', 'T')).getTime()
}
if (formData.actualStartTime && typeof formData.actualStartTime === 'string') {
formData.actualStartTime = new Date(formData.actualStartTime.replace(' ', 'T')).getTime()
}
if (formData.actualEndTime && typeof formData.actualEndTime === 'string') {
formData.actualEndTime = new Date(formData.actualEndTime.replace(' ', 'T')).getTime()
}
if (formData.createTime && typeof formData.createTime === 'string') {
formData.createTime = new Date(formData.createTime.replace(' ', 'T')).getTime()
}
if (formData.assingWorkTime && typeof formData.assingWorkTime === 'string') {
formData.assingWorkTime = new Date(formData.assingWorkTime.replace(' ', 'T')).getTime()
}
if (formData.assingWorkOperationTime && typeof formData.assingWorkOperationTime === 'string') {
formData.assingWorkOperationTime = new Date(formData.assingWorkOperationTime.replace(' ', 'T')).getTime()
}
modalVisible.value = true
}
//
async function handleSubmit() {
await formRef.value?.validate()
try {
const submitData = { ...formData } as OrderItem
if (typeof submitData.beginTime === 'number') {
submitData.beginTime = new Date(submitData.beginTime).toISOString().slice(0, 19).replace('T', ' ')
}
if (typeof submitData.endTime === 'number') {
submitData.endTime = new Date(submitData.endTime).toISOString().slice(0, 19).replace('T', ' ')
}
if (typeof submitData.actualStartTime === 'number') {
submitData.actualStartTime = new Date(submitData.actualStartTime).toISOString().slice(0, 19).replace('T', ' ')
}
if (typeof submitData.actualEndTime === 'number') {
submitData.actualEndTime = new Date(submitData.actualEndTime).toISOString().slice(0, 19).replace('T', ' ')
}
if (typeof submitData.createTime === 'number') {
submitData.createTime = new Date(submitData.createTime).toISOString().slice(0, 19).replace('T', ' ')
}
if (typeof submitData.assingWorkTime === 'number') {
submitData.assingWorkTime = new Date(submitData.assingWorkTime).toISOString().slice(0, 19).replace('T', ' ')
}
if (typeof submitData.assingWorkOperationTime === 'number') {
submitData.assingWorkOperationTime = new Date(submitData.assingWorkOperationTime).toISOString().slice(0, 19).replace('T', ' ')
}
if (submitData.id) {
await orderItemApi.update(submitData)
message.success('修改成功')
} else {
await orderItemApi.create(submitData)
message.success('新增成功')
}
modalVisible.value = false
loadData()
} catch (error) {
//
}
}
//
function handleDelete(row:any) {
dialog.warning({
title: '提示',
content: '确定要删除该记录吗?',
positiveText: '确定',
negativeText: '取消',
onPositiveClick: async () => {
try {
await orderItemApi.delete([row.id!])
message.success('删除成功')
loadData()
} catch (error) {
//
}
}
})
}
//
function handleBatchDelete() {
dialog.warning({
title: '提示',
content: `确定要删除选中的 ${selectedIds.value.length} 条记录吗?`,
positiveText: '确定',
negativeText: '取消',
onPositiveClick: async () => {
try {
await orderItemApi.delete(selectedIds.value)
message.success('删除成功')
selectedIds.value = []
loadData()
} catch (error) {
//
}
}
})
}
//
async function handleExport() {
try {
const params: Record<string, any> = {}
if (selectedIds.value.length > 0) params.ids = selectedIds.value
if (searchForm.code) params.code = searchForm.code
if (searchForm.projectId != null) params.projectId = searchForm.projectId
if (searchForm.beginTime != null) params.beginTime = searchForm.beginTime
if (searchForm.endTime != null) params.endTime = searchForm.endTime
const blob = await orderItemApi.export(params)
const url = window.URL.createObjectURL(blob)
const link = document.createElement('a')
link.href = url
link.download = '生产订单数据.xlsx'
link.click()
window.URL.revokeObjectURL(url)
} catch (error) {
//
}
}
//
async function handleDownloadTemplate() {
try {
const blob = await orderItemApi.downloadTemplate()
const url = window.URL.createObjectURL(blob)
const link = document.createElement('a')
link.href = url
link.download = '生产订单导入模板.xlsx'
link.click()
window.URL.revokeObjectURL(url)
} catch (error) {
//
}
}
//
async function handleImportUpload({ file }: UploadCustomRequestOptions) {
if (!file.file) return
try {
const result = await orderItemApi.importData(file.file)
if (result.fail > 0) {
dialog.warning({
title: '导入结果',
content: `成功: ${result.success} 条,失败: ${result.fail}\n错误信息: ${(result.errors || []).join('\n') || '无'}`,
positiveText: '确定'
})
} else {
message.success(`导入成功,共 ${result.success} 条数据`)
importModalVisible.value = false
}
loadData()
} catch (error) {
//
}
}
//
async function loadDictOptions() {
}
onMounted(() => {
loadData()
loadDictOptions()
})
</script>
<style scoped>
.search-form {
margin-bottom: 16px;
}
.table-toolbar {
margin-bottom: 16px;
}
</style>

View File

@ -17,11 +17,13 @@ export default defineConfig({
}, },
server: { server: {
host: "192.168.5.231", host: "192.168.5.231",
//host: true,
port: 3000, port: 3000,
proxy: { proxy: {
'/api': { '/api': {
//target:'http://192.168.6.107:8080', //'http://192.168.5.230:8888', //target:'http://192.168.6.107:8080', //'http://192.168.5.230:8888',
target:'http://192.168.5.230:8888', target:'http://192.168.5.230:8888',
//target:'http://192.168.5.200:8888',
changeOrigin: true changeOrigin: true
}, },
'/druid': { '/druid': {