From edceeafe481c877567c8439f270d6f1315b45a0a Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Tue, 26 May 2026 15:22:23 +0800
Subject: [PATCH] 1
---
package-lock.json | 4 +-
src/api/orderItem.ts | 5 +-
src/router/index.ts | 4 +-
src/views/biz/orderItem/index.vue | 80 +++++++++++++------------------
4 files changed, 39 insertions(+), 54 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index bd4e620..30b5d4e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
{
- "name":"csy-ui",
+ "name": "mes",
"version": "1.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
- "name": "csy-ui",
+ "name": "mes",
"version": "1.0.0",
"dependencies": {
"@vicons/ionicons5": "^0.12.0",
diff --git a/src/api/orderItem.ts b/src/api/orderItem.ts
index 5f38d6a..ed689d0 100644
--- a/src/api/orderItem.ts
+++ b/src/api/orderItem.ts
@@ -2,8 +2,8 @@ import { request } from '@/utils/request'
// 生产订单 类型定义
export interface OrderItem {
- id?: number
-
+ id?: number,
+ productionCode?: string
name?: string
code?: string
@@ -13,6 +13,7 @@ export interface OrderItem {
quantity?: number
projectId?: number
+ projectName?: string
parentId?: number
diff --git a/src/router/index.ts b/src/router/index.ts
index ae21a99..e585ff7 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -118,9 +118,9 @@ const routes: RouteRecordRaw[] = [
},
//运营管理
{
- path: 'biz/product',
+ path: 'biz/orderItem',
name: 'product',
- component: () => import('@/views/biz/product/index.vue'),
+ component: () => import('@/views/biz/orderItem/index.vue'),
meta: { title: '商品管理', icon: 'ListOutline' }
},
{
diff --git a/src/views/biz/orderItem/index.vue b/src/views/biz/orderItem/index.vue
index e2dbc24..44bcd03 100644
--- a/src/views/biz/orderItem/index.vue
+++ b/src/views/biz/orderItem/index.vue
@@ -36,20 +36,20 @@
- 新增
+ 新增/补单
-
+
+
@@ -70,57 +70,39 @@
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -198,11 +180,14 @@ const modalTitle = ref('')
const importModalVisible = ref(false)
const formRef = ref()
const defaultFormData: OrderItem = {
+ id: undefined,
+ productionCode:'',
name: '',
code: '',
sort: undefined,
quantity: undefined,
projectId: undefined,
+ projectName:'',
parentId: undefined,
sfProduct: undefined,
procurement: undefined,
@@ -227,26 +212,25 @@ const formRules = {
// 表格列
const columns: DataTableColumns = [
{ type: 'selection' },
- { title: '主键id', key: 'id' },
+ { title: '产品名称', key: 'projectName' },
{ title: '物料名称', key: 'name' },
{ title: '物料编码', key: 'code' },
{ title: '产品序列', key: 'sort' },
{ title: '生产数量', key: 'quantity' },
- { title: '产品id', key: 'projectId' },
- { title: '是否半成品, 1是 0不是', key: 'sfProduct' },
- { title: '是否采购, 1是 0不是', key: 'procurement' },
+ { title: '是否半成品', key: 'sfProduct' },
+ { title: '是否采购', key: 'procurement' },
{ title: '开始时间', key: 'beginTime' },
{ title: '结束时间', key: 'endTime' },
{ title: '实际开始时间', key: 'actualStartTime' },
{ title: '实际结束时间', key: 'actualEndTime' },
- { title: '备注', key: 'remark' },
- { title: '创建时间', key: 'createTime', width: 180 },
- { title: '创建人', key: 'createBy' },
- { title: '派工接收人', key: 'assingWorkId' },
+ { title: '派工操作人', key: 'assingWorkOperationName' },
+ { title: '派工操作时间', key: 'assingWorkOperationTime' },
+ { title: '派工接收人', key: 'assingWorkName' },
{ title: '派工时间', key: 'assingWorkTime' },
- { title: '派工操作人', key: 'assingWorkOperationId' },
- { title: '派工操作时间;派工操作时间', key: 'assingWorkOperationTime' },
- { title: '是否开工;是否开工', key: 'starter' },
+ { title: '是否开工', key: 'starter' },
+ { title: '备注', key: 'remark' },
+ // { title: '创建时间', key: 'createTime', width: 100 },
+ // { title: '创建人', key: 'createBy' },
{
title: '操作',
key: 'actions',
@@ -258,7 +242,7 @@ const columns: DataTableColumns = [
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) }), ' 删除']
+ default: () => [h(NIcon, null, { default: () => h(TrashOutline) }), ' 派工']
})
])
}