From 18ca3750ce28d407afb518cadecdd29d79876c8b Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 09 十二月 2025 19:40:15 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 120 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 82 insertions(+), 38 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index d32b939..99010c3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -54,14 +54,6 @@
const editFormOptions = ref([
[
{
- title: "鍗曟嵁绫诲瀷",
- required: true,
- field: "orderType",
- type: "select",
- dataKey: "outOrderType",
- data: [],
- },
- {
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
@@ -81,17 +73,40 @@
readonly: true,
},
{
- title: "浠撳簱",
- field: "warehouseId",
- type: "select",
- dataKey: "warehouses",
- data: [],
- required: true,
+ title: "鍘傚尯",
+ field: "factoryArea",
+ type: "string",
},
+ ],
+ [
{
title: "澶囨敞",
field: "remark",
type: "textarea",
+ },
+ {
+ title: "涓氬姟绫诲瀷",
+ field: "businessType",
+ type: "select",
+ dataKey: "businessType",
+ data: [],
+ require: true,
+ },
+ {
+ title: "鏄惁鍒嗘壒",
+ field: "isBatch",
+ type: "select",
+ dataKey: "enable",
+ data: [],
+ require: true,
+ },
+ {
+ title: "鎿嶄綔鑰�",
+ field: "operator",
+ type: "string",
+ hidden:true,
+ readonly: true,
+
},
],
]);
@@ -109,10 +124,10 @@
{ title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
{ title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
- title: "鍗曟嵁绫诲瀷",
- field: "orderType",
+ title: "涓氬姟绫诲瀷",
+ field: "businessType",
type: "select",
- dataKey: "outOrderType",
+ dataKey: "documentTypeEmun",
data: [],
},
{
@@ -147,20 +162,11 @@
align: "left",
},
{
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind:{key: "warehouses", data: []}
- },
- {
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
width: 160,
align: "left",
- // link: true,
},
{
field: "upperOrderNo",
@@ -176,6 +182,15 @@
width: 150,
align: "left",
bind: { key: "outOrderType", data: [] },
+ hidden:true
+ },
+ {
+ field: "businessType",
+ title: "涓氬姟绫诲瀷",
+ type: "string",
+ width: 150,
+ align: "left",
+ bind: { key: "businessType", data: [] },
},
{
field: "orderStatus",
@@ -194,6 +209,26 @@
bind: { key: "createType", data: [] },
},
{
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 180,
+ align: "left"
+ },
+ {
+ field: "returnToMESStatus",
+ title: "鍥炰紶MES鐘舵��",
+ width: 120,
+ bind: { key: "createType", data:[{key:0, value:"鏈洖浼�"},{key:1, value:"宸插洖浼犳垚鍔�"},{key:2, value:"鍥炰紶澶辫触"}]},
+ },
+ {
+ field: "factoryArea",
+ title: "鍘傚尯",
+ type: "string",
+ width: 120,
+ align: "left"
+ },
+ {
field: "departmentCode",
title: "淇敼鏃堕棿",
type: "string",
@@ -206,6 +241,13 @@
title: "閮ㄩ棬鍚嶇О",
type: "string",
width: 160,
+ align: "left",
+ },
+ {
+ field: "operator",
+ title: "鎿嶄綔浜�",
+ type: "string",
+ width: 120,
align: "left",
},
{
@@ -236,17 +278,10 @@
width: 160,
align: "left",
},
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
]);
const detail = ref({
cnName: "鍑哄簱鏄庣粏鍗�",
- table: "OnboundOrderDetail",
+ table: "Details",
columns: [
{
field: "id",
@@ -290,7 +325,6 @@
width: 90,
align: "left",
edit: { type: "string" },
- required: true,
},
{
field: "supplyCode",
@@ -299,7 +333,6 @@
width: 90,
align: "left",
edit: { type: "string" },
- required: true,
},
{
field: "orderQuantity",
@@ -311,13 +344,22 @@
required: true,
},
{
- field: "rowNo",
+ field: "lineNo",
title: "琛屽彿",
type: "string",
width: 90,
align: "left",
edit: { type: "number" },
- required: true,
+ readonly:true
+ },
+ {
+ field: "rowNo",
+ title: "琛屽彿2",
+ type: "int",
+ width: 90,
+ align: "left",
+ edit: { type: "number" },
+ readonly:true
},
{
field: "lockQuantity",
@@ -339,7 +381,9 @@
type: "string",
width: 180,
align: "left",
+ edit: { type: "select" },
bind: { key: "orderDetailStatusEnum", data: [] },
+ readonly:true
},
{
field: "creater",
--
Gitblit v1.9.3