From 5dfd83bd540c2e43af2e0449c246c79a22cb1296 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 20 一月 2026 16:22:56 +0800
Subject: [PATCH] 1
---
项目代码/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue | 125 ++++++++++++++++++++++++-----------------
1 files changed, 74 insertions(+), 51 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
index ccad4ca..d972c31 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
@@ -128,58 +128,90 @@
]);
+ // const searchFormFields = ref({
+ // orderNo: "",
+ // upperOrderNo: "",
+ // orderType: "117",
+ // orderStatus: "",
+ // createType: "",
+ // fromWarehouse: "",
+ // toWarehouse: "",
+ // factoryArea: "",
+ // creater: "",
+ // createDate: "",
+ // });
+
+
+ // const searchFormOptions = ref([
+ // [
+ // { title: "涓婄骇鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
+ // {
+ // title: "鍗曟嵁鐘舵��",
+ // field: "orderStatus",
+ // type: "select",
+ // dataKey: "allocateOrderStatus",
+ // data: [],
+ // },
+ // {
+ // title: "鍗曟嵁绫诲瀷",
+ // field: "orderType",
+ // type: "select",
+ // dataKey: "outOrderType",
+ // data: [],
+ // },
+ // ],
+ // [
+ // {
+ // title: "鍒涘缓绫诲瀷",
+ // field: "createType",
+ // type: "select",
+ // dataKey: "createType",
+ // data: [],
+ // },
+ // { title: "鏉ユ簮浠撳簱", field: "fromWarehouse", type: "like" },
+ // { title: "鐩爣浠撳簱", field: "toWarehouse", type: "like" },
+ // ],
+ // [
+ // { title: "鍘傚尯", field: "factoryArea", type: "like" },
+ // { title: "鍒涘缓鑰�", field: "creater", type: "like" },
+ // { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ // ],
+ // ]);
const searchFormFields = ref({
orderNo: "",
upperOrderNo: "",
- supplierId: "",
- orderType: "",
+ orderType: "117",
orderStatus: "",
createType: "",
- businessType: "",
- fromWarehouse: "",
- toWarehouse: "",
- factoryArea: "",
creater: "",
createDate: "",
});
-
-
const searchFormOptions = ref([
[
{ title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
- { title: "涓婄骇鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
- { title: "渚涘簲鍟咺D", field: "supplierId", type: "like" },
{
- title: "璁㈠崟绫诲瀷",
+ title: "鍗曟嵁绫诲瀷",
field: "orderType",
type: "select",
- dataKey: "allocateOrderType",
+ dataKey: "outOrderType",
+ data: [],
+ },
+ {
+ title: "鍗曟嵁鐘舵��",
+ field: "orderStatus",
+ type: "select",
+ dataKey: "outboundStatusEnum",
data: [],
},
],
[
{
- title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
- type: "select",
- dataKey: "allocateOrderStatus",
- data: [],
- },
- {
- title: "鍒涘缓绫诲瀷",
+ title: "鍒涘缓鏂瑰紡",
field: "createType",
type: "select",
dataKey: "createType",
data: [],
},
- { title: "涓氬姟绫诲瀷", field: "businessType", type: "like" },
- ],
- [
- { title: "鏉ユ簮浠撳簱", field: "fromWarehouse", type: "like" },
- { title: "鐩爣浠撳簱", field: "toWarehouse", type: "like" },
- { title: "鍘傚尯", field: "factoryArea", type: "like" },
- ],
- [
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
@@ -211,19 +243,12 @@
align: "left",
},
{
- field: "supplierId",
- title: "渚涘簲鍟咺D",
- type: "string",
- width: 120,
- align: "left",
- },
- {
field: "orderType",
title: "璁㈠崟绫诲瀷",
type: "int",
width: 120,
align: "left",
- bind: { key: "allocateOrderType", data: [] },
+ bind: { key: "outOrderType", data: [] },
},
{
field: "orderStatus",
@@ -231,7 +256,7 @@
type: "int",
width: 120,
align: "left",
- bind: { key: "allocateOrderStatus", data: [] },
+ bind: { key: "inboundState", data: [] },
},
{
field: "createType",
@@ -241,20 +266,20 @@
align: "left",
bind: { key: "createType", data: [] },
},
- {
- field: "businessType",
- title: "涓氬姟绫诲瀷",
- type: "string",
- width: 120,
- align: "left",
- },
+ // {
+ // field: "businessType",
+ // title: "涓氬姟绫诲瀷",
+ // type: "string",
+ // width: 120,
+ // align: "left",
+ // bind: { key: "businessType", data: [] },
+ // },
{
field: "fromWarehouse",
title: "鏉ユ簮浠撳簱",
type: "string",
width: 120,
align: "left",
- bind: { key: "warehouses", data: [] },
},
{
field: "toWarehouse",
@@ -262,14 +287,12 @@
type: "string",
width: 120,
align: "left",
- bind: { key: "warehouses", data: [] },
},
{
- field: "isBatch",
- title: "鏄惁鎵规",
- type: "bool",
- width: 100,
- align: "left",
+ field: "returnToMESStatus",
+ title: "鍥炰紶MES鐘舵��",
+ width: 120,
+ bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 3, value: "閮ㄥ垎鍥炰紶鎴愬姛" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" }] },
},
{
field: "factoryArea",
--
Gitblit v1.9.3