From 95e39ae7aecd6e1016c71cf5ae70a680d8f569bb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:48:30 +0800
Subject: [PATCH] 上传最新代码
---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue | 125 +++++++++++++++++++++--------------------
1 files changed, 65 insertions(+), 60 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue"
index 9895779..e389f02 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesProInOrder.vue"
@@ -27,33 +27,12 @@
sortName: "id",
});
const editFormFields = ref({
- orderType: "",
- inboundOrderNo: "",
- upperOrderNo: "",
remark: "",
});
const editFormOptions = ref([
[
{
- title: "鍗曟嵁绫诲瀷",
- required: true,
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- },
- {
- field: "inboundOrderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- },
- {
- title: "涓婃父鍗曟嵁缂栧彿",
- field: "upperOrderNo",
- type: "string",
- },
- {
- title: "澶囨敞",
+ title: "淇℃伅澶囨敞",
field: "remark",
type: "textarea",
},
@@ -67,27 +46,45 @@
createType: "",
creater: "",
createDate: "",
+ upErpStatus:"",
+ warehouseId:"",
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
- { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
- {
- title: "鍗曟嵁绫诲瀷",
- field: "orderType",
- type: "select",
- dataKey: "inOrderType",
- data: [],
- },
+ { title: "鍗曟嵁缂栧彿", field: "proInOrderNo", type: "like" },
+ // { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
+ // {
+ // title: "鍗曟嵁绫诲瀷",
+ // field: "orderType",
+ // type: "select",
+ // dataKey: "inOrderType",
+ // data: [],
+ // },
+ { title: "鑳舵鐮�", field: "batchNo", type: "like" },
{
title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
+ field: "mesProStatus",
type: "select",
dataKey: "inboundState",
data: [],
},
+ {
+ title: "浠撳簱",
+ field: "warehouseId",
+ type: "select",
+ dataKey: "warehouses",
+ data: [],
+ required: true,
+ },
],
[
+ {
+ title: "涓婁紶ERP鐘舵��",
+ field: "upErpStatus",
+ type: "select",
+ dataKey: "enable",
+ data: [],
+ },
{
title: "鍒涘缓鏂瑰紡",
field: "createType",
@@ -130,7 +127,7 @@
field: "batchNo",
title: "鑳舵鐮�",
type: "string",
- width: 150,
+ width: 120,
align: "left",
},
@@ -138,9 +135,9 @@
field: "mesProStatus",
title: "鍏ュ簱鍗曠姸鎬�",
type: "string",
- width: 150,
+ width: 120,
align: "left",
- // bind: { key: "inOrderType", data: [] },
+ bind: { key: "inboundState", data: [] },
},
{
field: "unPackStock",
@@ -148,6 +145,7 @@
type: "decimal",
width: 90,
align: "left",
+ hidden:true
},
{
field: "workCenter",
@@ -165,11 +163,20 @@
bind: { key: "createType", data: [] },
},
{
+ field: "upErpStatus",
+ title: "涓婁紶ERP鐘舵��",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind:{key:"enable",data:[]}
+ },
+ {
field: "creater",
title: "鍒涘缓浜�",
type: "string",
width: 90,
align: "left",
+ hidden:true
},
{
field: "createDate",
@@ -184,6 +191,7 @@
type: "string",
width: 100,
align: "left",
+ hidden: true,
},
{
field: "modifyDate",
@@ -191,10 +199,11 @@
type: "datetime",
width: 160,
align: "left",
+ hidden: true,
},
{
field: "remark",
- title: "澶囨敞",
+ title: "淇℃伅澶囨敞",
type: "string",
width: 100,
align: "left",
@@ -204,28 +213,28 @@
cnName: "鍏ュ簱鍗曟槑缁�",
table: "mesProInOrderDetail",
columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "orderId",
- title: "鍏ュ簱鍗曚富閿�",
- type: "string",
- width: 90,
- align: "left",
- },
+ // {
+ // field: "id",
+ // title: "Id",
+ // type: "int",
+ // width: 90,
+ // hidden: true,
+ // readonly: true,
+ // require: true,
+ // align: "left",
+ // },
+ // {
+ // field: "orderId",
+ // title: "鍏ュ簱鍗曚富閿�",
+ // type: "string",
+ // width: 90,
+ // align: "left",
+ // },
{
field: "bagNo",
title: "鍐呭寘鍙�",
type: "string",
- width: 150,
+ width: 180,
align: "left",
},
{
@@ -325,12 +334,6 @@
type: "string",
width: 200,
align: "left",
- }, {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 200,
- align: "left",
},
{
field: "creater",
@@ -352,6 +355,7 @@
type: "string",
width: 100,
align: "left",
+ hidden: true,
},
{
field: "modifyDate",
@@ -359,6 +363,7 @@
type: "datetime",
width: 160,
align: "left",
+ hidden: true,
},
{
field: "remark",
--
Gitblit v1.9.3