From 18ca3750ce28d407afb518cadecdd29d79876c8b Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 09 十二月 2025 19:40:15 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 f4bdcb2..10582cf 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"
@@ -87,15 +87,14 @@
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
+ { title: "鎵弿鍗曟嵁缂栧彿鎴栨潯鐮�", field: "inboundOrderNo", type: "like" },
{ title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
- title: "鍗曟嵁绫诲瀷",
- field: "orderType",
+ title: "涓氬姟绫诲瀷",
+ field: "businessType",
type: "select",
- dataKey: "inOrderType",
- data: [0],
- hidden:true
+ dataKey: "documentTypeEmun",
+ data: [],
},
{
title: "鍗曟嵁鐘舵��",
@@ -184,6 +183,19 @@
bind: { key: "createType", data: [] },
},
{
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 180,
+ align: "left"
+ },
+ {
+ field: "returnToMESStatus",
+ title: "鍥炰紶MES鐘舵��",
+ width: 120,
+ bind: { key: "createType", data:[{key:0, value:"鏈洖浼�"},{key:1, value:"宸插洖浼犳垚鍔�"},{key:2, value:"鍥炰紶澶辫触"}]},
+ },
+ {
field: "factoryArea",
title: "鍘傚尯",
type: "string",
@@ -216,13 +228,6 @@
title: "淇敼鏃堕棿",
type: "datetime",
width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
align: "left",
},
]);
--
Gitblit v1.9.3