From 3762d139e17f5c39f968dccad53d88cff85c863d Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期五, 05 十二月 2025 09:52:02 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/components/basic/ViewGrid/methods.js | 4 +---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs | 4 ++--
项目代码/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 14 ++++++++++----
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/components/basic/ViewGrid/methods.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/components/basic/ViewGrid/methods.js"
index f592a5e..4a48ee0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/components/basic/ViewGrid/methods.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/components/basic/ViewGrid/methods.js"
@@ -874,9 +874,7 @@
// if (_button) {
// _button.name = isAdd ? this.continueAddName : '淇� 瀛�';
// }
- this.boxButtons.forEach(x=>{
- btn.hidden=true
- })
+ this.boxButtons.forEach(x=>{})
},
resetAdd() {
if (this.hasDetail) {
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 bae03fa..3e16cc5 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"
@@ -168,7 +168,6 @@
type: "string",
width: 160,
align: "left",
- link: true,
},
{
field: "upperOrderNo",
@@ -230,6 +229,13 @@
title: "閮ㄩ棬鍚嶇О",
type: "string",
width: 160,
+ align: "left",
+ },
+ {
+ field: "operator",
+ title: "鎿嶄綔浜�",
+ type: "string",
+ width: 120,
align: "left",
},
{
@@ -314,7 +320,6 @@
width: 90,
align: "left",
edit: { type: "string" },
- required: true,
},
{
field: "supplyCode",
@@ -323,7 +328,6 @@
width: 90,
align: "left",
edit: { type: "string" },
- required: true,
},
{
field: "orderQuantity",
@@ -341,6 +345,7 @@
width: 90,
align: "left",
edit: { type: "number" },
+ readonly:true
},
{
field: "rowNo",
@@ -349,6 +354,7 @@
width: 90,
align: "left",
edit: { type: "number" },
+ readonly:true
},
{
field: "lockQuantity",
@@ -372,7 +378,7 @@
align: "left",
edit: { type: "select" },
bind: { key: "orderDetailStatusEnum", data: [] },
- required: true,
+ readonly:true
},
{
field: "creater",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs"
index af9e5f0..7b5c385 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs"
@@ -47,7 +47,7 @@
/// <summary>
/// 琛屽彿
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "琛屽彿")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "琛屽彿", DefaultValue = "0")]
public int RowNo { get; set; }
/// <summary>
@@ -71,7 +71,7 @@
/// <summary>
/// 璁㈠崟鏄庣粏鐘舵��
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��", DefaultValue = "0")]
public int OrderDetailStatus { get; set; }
/// <summary>
/// 鍗曚綅
--
Gitblit v1.9.3