From 4559602601ccf374b1f50914010b865693a84379 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期五, 27 三月 2026 16:37:11 +0800
Subject: [PATCH] 解决老厂生管排程出库详情不能正常显示的问题，添加老厂生管排程明细信息页面
---
项目代码/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue | 5
项目代码/WMS/WMSClient/src/router/viewGird.js | 4 +
项目代码/WMS/WMSClient/src/views/outbound/outSGOrder.vue | 2
项目代码/WMS/WMSClient/src/views/outbound/outSGOrderDetail.vue | 200 ++++++++++++++++++++++++++-----------------------
4 files changed, 113 insertions(+), 98 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue"
index 2b10b84..702d8b4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue"
@@ -208,11 +208,12 @@
{ label: '鍑哄簱涓�', value: 1 },
{ label: '鍑哄簱瀹屾垚', value: 2 },
{ label: '鎷ｉ�夊畬鎴�', value: 3 },
- { label: '鎾ら攢', value: 99 }
+ { label: '鎾ら攢', value: 99 },
+ { label: '鍏抽棴', value: 100 }
]
this.tableData=x.map((i) => ({
...i,
- status:label.find((j) => j.value === i.status).label
+ status:label.find((j) => j.value === i.status)?.label || i.status
}))
});
},
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
index 5f1898d..fc8783e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/router/viewGird.js"
@@ -279,6 +279,10 @@
path: '/outMESOrder',
name: 'outMESOrder',
component: () => import('@/views/outbound/outMESOrder.vue')
+ },{
+ path: '/outSGOrderDetail',
+ name: 'outSGOrderDetail',
+ component: () => import('@/views/outbound/outSGOrderDetail.vue')
}
]
export default viewgird
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue"
index 3097896..4b933cc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrder.vue"
@@ -42,7 +42,7 @@
[
{ title: "WMS鍗曞彿", field: "outSGOrderNo", type: "like" },
{ title: "鍑哄簱涓婃父ID", field: "boardMpsId", type: "like" },
- { title: "涓婃父鐢熶骇鍗曞彿", field: "orderId", type: "like" },
+ { title: "鎺掔▼鍙�", field: "orderId", type: "like" },
{
title: "鍗曟嵁鐘舵��",
field: "outSGOrderStatus",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrderDetail.vue"
index edeb32a..680c7bf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/outbound/outSGOrderDetail.vue"
@@ -18,79 +18,26 @@
sortName: "id",
});
const editFormFields = ref({
- deviceCode: "",
- deviceName: "",
- deviceType: "",
- deviceStatus: "",
- deviceIp: "",
- devicePort: "",
- devicePlcType: "",
- deviceRemark: "",
});
const editFormOptions = ref([
- [
- {
- title: "璁惧缂栧彿",
- required: true,
- field: "deviceCode",
- type: "string",
- },
- {
- title: "璁惧鍚嶇О",
- required: true,
- field: "deviceName",
- type: "string",
- },
- {
- title: "璁惧绫诲瀷",
- required: true,
- field: "deviceType",
- type: "string",
- },
- {
- title: "璁惧鐘舵��",
- required: true,
- field: "deviceStatus",
- type: "string",
- },
- ],
- [
- { title: "璁惧IP", required: true, field: "deviceIp", type: "string" },
- {
- title: "璁惧绔彛",
- required: true,
- field: "devicePort",
- type: "string",
- },
- {
- title: "PLC绫诲瀷",
- required: true,
- field: "devicePlcType",
- type: "string",
- },
- {
- title: "澶囨敞",
- field: "deviceRemark",
- type: "string",
- },
- ],
]);
const searchFormFields = ref({
- deviceCode: "",
- deviceType: "",
- deviceStatus: "",
});
const searchFormOptions = ref([
[
- { title: "璁惧缂栧彿", field: "deviceCode" },
- { title: "璁惧绫诲瀷", field: "deviceType" },
- { title: "璁惧鐘舵��", field: "deviceStatus" },
+ { title: "鍑哄簱鍗曚富閿�", field: "outSGOrderId" },
+ { title: "鐗╂枡缂栧彿", field: "materialNo" },
+ { title: "妤炲埆", field: "boardFluteNo" },
+ { title: "鏈哄彴浣�", field: "machineName" },
+ ],
+ [
+ { title: "璁㈠崟鏄庣粏鐘舵��", field: "outSGOrderDetailStatus" },
],
]);
const columns = ref([
{
field: "id",
- title: "Id",
+ title: "ID",
type: "int",
width: 90,
hidden: true,
@@ -100,72 +47,134 @@
{
field: "outSGOrderId",
title: "鍑哄簱鍗曚富閿�",
- type: "string",
- width: 90,
+ type: "int",
+ width: 120,
align: "left",
- hidden: true,
},
{
- field: "MaterialNo",
+ field: "boardMpsId",
+ title: "涓婃父鍗曟嵁ID",
+ type: "int",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "boardMpsDetailId",
+ title: "涓婃父鏄庣粏ID",
+ type: "int",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "width",
+ title: "骞呭",
+ type: "decimal",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "xqLen",
+ title: "闇�姹傞暱搴�",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "totalUsage",
+ title: "鎬荤敤閲�",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "materialId",
+ title: "鐗╂枡ID",
+ type: "int",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "materialNo",
title: "鐗╂枡缂栧彿",
type: "string",
width: 150,
align: "left",
},
{
- field: "materielName",
+ field: "materialName",
title: "鐗╂枡鍚嶇О",
type: "string",
width: 150,
align: "left",
},
{
- field: "batchNo",
- title: "鎵规鍙�",
+ field: "procurementLength",
+ title: "閲囪喘闀垮害",
type: "decimal",
- width: 90,
- align: "left",
- },
- {
- field: "orderQuantity",
- title: "鍗曟嵁鏁伴噺",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "lockQuantity",
- title: "閿佸畾鏁伴噺",
- type: "int",
width: 120,
align: "left",
},
{
- field: "overOutQuantity",
- title: "宸插嚭鏁伴噺",
+ field: "boardFluteNo",
+ title: "妤炲埆",
type: "string",
- width: 200,
+ width: 100,
align: "left",
},
{
- field: "orderDetailStatus",
- title: "璁㈠崟鏄庣粏鐘舵��",
+ field: "machineName",
+ title: "鏈哄彴浣�",
type: "string",
- width: 180,
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "totalLenth",
+ title: "鎬婚暱搴�",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "assignTotalUsage",
+ title: "宸插垎閰嶇敤閲�",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "outTotalUsage",
+ title: "宸插嚭鐢ㄩ噺",
+ type: "decimal",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "outSGOrderDetailStatus",
+ title: "璁㈠崟鏄庣粏鐘舵��",
+ type: "int",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "number",
+ title: "搴忓彿",
+ type: "int",
+ width: 80,
align: "left",
},
{
field: "creater",
title: "鍒涘缓浜�",
type: "string",
- width: 90,
+ width: 100,
align: "left",
},
{
field: "createDate",
title: "鍒涘缓鏃堕棿",
type: "datetime",
- width: 160,
+ width: 180,
align: "left",
},
{
@@ -179,22 +188,23 @@
field: "modifyDate",
title: "淇敼鏃堕棿",
type: "datetime",
- width: 160,
+ width: 180,
align: "left",
},
{
field: "remark",
title: "澶囨敞",
type: "string",
- width: 100,
+ width: 150,
align: "left",
},
]);
const detail = ref({
- cnName: "#detailCnName",
- table: "",
+ cnName: "鍑哄簱鏄庣粏鍗�",
+ table: "OutSGOrderDetail",
columns: [],
- sortName: "",
+ sortName: "id",
+ key: "id",
});
return {
table,
--
Gitblit v1.9.3