From 5ccef03578cac085fecb4afd96e48bdf42df3aef Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期四, 04 十二月 2025 10:23:30 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 94 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 68 insertions(+), 26 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 cbe4d0b..bae03fa 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,
+
},
],
]);
@@ -114,6 +129,7 @@
type: "select",
dataKey: "outOrderType",
data: [],
+ hidden:true
},
{
title: "鍗曟嵁鐘舵��",
@@ -147,20 +163,12 @@
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,
+ link: true,
},
{
field: "upperOrderNo",
@@ -176,6 +184,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",
@@ -192,6 +209,13 @@
width: 120,
align: "left",
bind: { key: "createType", data: [] },
+ },
+ {
+ field: "factoryArea",
+ title: "鍘傚尯",
+ type: "string",
+ width: 120,
+ align: "left"
},
{
field: "departmentCode",
@@ -246,7 +270,7 @@
]);
const detail = ref({
cnName: "鍑哄簱鏄庣粏鍗�",
- table: "OnboundOrderDetail",
+ table: "Details",
columns: [
{
field: "id",
@@ -293,6 +317,15 @@
required: true,
},
{
+ field: "supplyCode",
+ title: "渚涘簲鍟嗙紪鍙�",
+ type: "string",
+ width: 90,
+ align: "left",
+ edit: { type: "string" },
+ required: true,
+ },
+ {
field: "orderQuantity",
title: "鍗曟嵁鏁伴噺",
type: "string",
@@ -302,13 +335,20 @@
required: true,
},
{
- field: "rowNo",
+ field: "lineNo",
title: "琛屽彿",
type: "string",
width: 90,
align: "left",
edit: { type: "number" },
- required: true,
+ },
+ {
+ field: "rowNo",
+ title: "琛屽彿2",
+ type: "int",
+ width: 90,
+ align: "left",
+ edit: { type: "number" },
},
{
field: "lockQuantity",
@@ -330,7 +370,9 @@
type: "string",
width: 180,
align: "left",
+ edit: { type: "select" },
bind: { key: "orderDetailStatusEnum", data: [] },
+ required: true,
},
{
field: "creater",
--
Gitblit v1.9.3