From d89c4f466c0922287ff88d4f61bfba71461cdbf0 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 02 十二月 2025 15:37:58 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 57 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 39 insertions(+), 18 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 47ab893..5a444d3 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,37 @@
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",
},
],
]);
@@ -153,7 +165,7 @@
type: "string",
width: 160,
align: "left",
- // link: true,
+ link: true,
},
{
field: "upperOrderNo",
@@ -255,7 +267,7 @@
]);
const detail = ref({
cnName: "鍑哄簱鏄庣粏鍗�",
- table: "OnboundOrderDetail",
+ table: "Details",
columns: [
{
field: "id",
@@ -320,13 +332,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",
@@ -348,7 +367,9 @@
type: "string",
width: 180,
align: "left",
+ edit: { type: "select" },
bind: { key: "orderDetailStatusEnum", data: [] },
+ required: true,
},
{
field: "creater",
--
Gitblit v1.9.3