From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index fa3313e..cc67dd7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -23,22 +23,20 @@
inboundOrderNo: "",
upperOrderNo: "",
remark: "",
+ orderStatus: "",
+ warehouseId: "",
+ supplierId: "",
+ createType: "",
+ isTestMaterials: "",
+ operator: "",
});
const editFormOptions = ref([
[
{
- title: "鍗曟嵁绫诲瀷",
- required: true,
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- hidden: true
- },
- {
field: "inboundOrderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
+ readonly: true,
},
{
title: "涓婃父鍗曟嵁缂栧彿",
@@ -51,6 +49,29 @@
type: "textarea",
},
],
+ [
+ {
+ title: "涓氬姟绫诲瀷",
+ field: "businessType",
+ type: "select",
+ dataKey: "businessType",
+ data: [],
+ require: true,
+ },
+ {
+ title: "鏄惁鍒嗘壒",
+ field: "isBatch",
+ type: "select",
+ dataKey: "enable",
+ data: [],
+ require: true,
+ },
+ {
+ title: "鍘傚尯",
+ field: "factoryArea",
+ type: "string",
+ },
+ ]
]);
const searchFormFields = ref({
inboundOrderNo: "",
@@ -70,7 +91,7 @@
title: "涓氬姟绫诲瀷",
field: "businessType",
type: "select",
- dataKey: "documentTypeEmun",
+ dataKey: "inboundbusinessType",
data: [],
},
{
@@ -252,7 +273,7 @@
type: "string",
width: 150,
align: "left",
- bind: { key: "materielInfo", data: [] },
+ edit: { type: "" },
},
{
field: "batchNo",
@@ -278,6 +299,7 @@
type: "decimal",
width: 90,
align: "left",
+ edit: { type: "" },
required: true
},
{
@@ -295,7 +317,7 @@
type: "decimal",
width: 90,
align: "left",
- required: true,
+ edit: { type: "" },
},
{
field: "orderQuantity",
@@ -304,6 +326,24 @@
width: 90,
align: "left",
edit: { type: "number" },
+ required: true,
+ },
+ {
+ field: "barcodeQty",
+ title: "鏉＄爜鏁伴噺",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ edit: { type: "number" },
+ required: true,
+ },
+ {
+ field: "barcodeUnit",
+ title: "鏉＄爜鍗曚綅",
+ type: "string",
+ width: 90,
+ align: "left",
+ edit: { type: "" },
required: true,
},
{
@@ -326,6 +366,8 @@
type: "string",
width: 90,
align: "left",
+ edit: { type: "" },
+ required: true,
},
{
field: "orderDetailStatus",
--
Gitblit v1.9.3