From a7b15461d3dc6d07c18e065fa3a6acd234c2d7c8 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 09 十二月 2025 19:51:55 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index 3e16cc5..99010c3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -124,12 +124,11 @@
{ title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
{ title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
- title: "鍗曟嵁绫诲瀷",
- field: "orderType",
+ title: "涓氬姟绫诲瀷",
+ field: "businessType",
type: "select",
- dataKey: "outOrderType",
+ dataKey: "documentTypeEmun",
data: [],
- hidden:true
},
{
title: "鍗曟嵁鐘舵��",
@@ -210,6 +209,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",
@@ -264,13 +276,6 @@
title: "淇敼鏃堕棿",
type: "datetime",
width: 160,
- align: "left",
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
align: "left",
},
]);
--
Gitblit v1.9.3