From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/proOutOrder.vue | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/proOutOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/proOutOrder.vue"
index 46b9965..0811f3f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/proOutOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/proOutOrder.vue"
@@ -89,7 +89,7 @@
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
+ { title: "鍑哄簱鍗曞彿", field: "proOutOrderNo", type: "like" },
{ title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
@@ -151,7 +151,7 @@
type: "string",
width: 150,
align: "left",
- // bind: { key: "outOrderType", data: [] },
+ bind: { key: "proOutOrderType", data: [{key:1,value:"璁㈠崟鍑鸿揣"},,{key:2,value:"閿�鍞嚭搴�"}] },
},
{
field: "proOrderStatus",
@@ -159,7 +159,7 @@
type: "decimal",
width: 90,
align: "left",
- // bind: { key: "outboundStatusEnum", data: [] },
+ bind: { key: "outboundStatusEnum", data: [] },
},
{
field: "plantShipDate",
@@ -168,22 +168,22 @@
width: 160,
align: "left",
},
- {
- field: "createType",
- title: "鍒涘缓鏂瑰紡",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "createType", data: [] },
- },
- {
- field: "departmentCode",
- title: "淇敼鏃堕棿",
- type: "string",
- width: 120,
- align: "left",
- hidden: true,
- },
+ // {
+ // field: "createType",
+ // title: "鍒涘缓鏂瑰紡",
+ // type: "string",
+ // width: 120,
+ // align: "left",
+ // bind: { key: "createType", data: [] },
+ // },
+ // {
+ // field: "departmentCode",
+ // title: "淇敼鏃堕棿",
+ // type: "string",
+ // width: 120,
+ // align: "left",
+ // hidden: true,
+ // },
{
field: "creater",
title: "鍒涘缓浜�",
@@ -198,20 +198,20 @@
width: 160,
align: "left",
},
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- },
+ // {
+ // field: "modifier",
+ // title: "淇敼浜�",
+ // type: "string",
+ // width: 100,
+ // align: "left",
+ // },
+ // {
+ // field: "modifyDate",
+ // title: "淇敼鏃堕棿",
+ // type: "datetime",
+ // width: 160,
+ // align: "left",
+ // },
{
field: "remark",
title: "澶囨敞",
--
Gitblit v1.9.3