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 | 105 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 81 insertions(+), 24 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 9108816..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: "",
@@ -60,6 +81,7 @@
createType: "",
creater: "",
createDate: "",
+ materielCode: "",
});
const searchFormOptions = ref([
[
@@ -69,7 +91,7 @@
title: "涓氬姟绫诲瀷",
field: "businessType",
type: "select",
- dataKey: "documentTypeEmun",
+ dataKey: "inboundbusinessType",
data: [],
},
{
@@ -90,6 +112,7 @@
},
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
],
]);
const columns = ref([
@@ -147,7 +170,7 @@
field: "orderStatistics",
title: "鍗曟嵁鐗╂枡缁熻",
type: "string",
- width: 230,
+ width: 300,
align: "left",
},
{
@@ -169,7 +192,7 @@
field: "returnToMESStatus",
title: "鍥炰紶MES鐘舵��",
width: 120,
- bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] },
+ bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 3, value: "閮ㄥ垎鍥炰紶鎴愬姛" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" },{ key: 5, value: "鏃犻渶鍥炰紶" }] },
},
{
field: "factoryArea",
@@ -177,6 +200,12 @@
type: "string",
width: 120,
align: "left"
+ },
+ {
+ field: "isTestMaterials",
+ title: "鏄惁璇曚骇",
+ width: 120,
+ bind: { key: "isTestMaterials", data: [{ key: 0, value: "闈炶瘯浜х墿鏂�" }, { key: 1, value: "璇曚骇鐗╂枡" }] },
},
{
field: "creater",
@@ -193,7 +222,7 @@
align: "left",
},
{
- field: "modifier",
+ field: "operator",
title: "淇敼浜�",
type: "string",
width: 100,
@@ -239,12 +268,12 @@
required: true,
},
{
- field: "materielCode",
+ field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 120,
+ width: 150,
align: "left",
- bind: { key: "MaterielNames", data: [] },
+ edit: { type: "" },
},
{
field: "batchNo",
@@ -270,6 +299,7 @@
type: "decimal",
width: 90,
align: "left",
+ edit: { type: "" },
required: true
},
{
@@ -282,12 +312,38 @@
required: true,
},
{
+ field: "outBoxbarcodes",
+ title: "澶栫鏉＄爜",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ edit: { type: "" },
+ },
+ {
field: "orderQuantity",
title: "鍗曟嵁鏁伴噺",
type: "decimal",
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,
},
{
@@ -310,6 +366,8 @@
type: "string",
width: 90,
align: "left",
+ edit: { type: "" },
+ required: true,
},
{
field: "orderDetailStatus",
@@ -319,14 +377,13 @@
align: "left",
bind: { key: "orderDetailStatusEnum", data: [] },
},
- // {
- // field: "returnToMESStatus",
- // title: "鍥炰紶鐘舵��",
- // type: "string",
- // width: 90,
- // align: "left",
- // bind: { key: "returnStatus", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] }
- // },
+ {
+ field: "palletCode",
+ title: "宸茬粍鎵樼洏鍙�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
{
field: "creater",
title: "鍒涘缓浜�",
--
Gitblit v1.9.3