From 266e4bf654c55ce2f7e9271048e4625f1b8b49f6 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 29 十二月 2025 14:36:08 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
index 81830f9..7d27ed6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
@@ -166,14 +166,14 @@
width: 90,
bindKey: "orderDetailStatusEnum",
},
- // {
- // prop: "assignStock",
- // title: "鎸囧畾搴撳瓨",
- // type: "icon",
- // width: 90,
- // hidden: true, // 榛樿闅愯棌
- // icon: "el-icon-s-grid",
- // },
+ {
+ prop: "assignStock",
+ title: "鎸囧畾搴撳瓨",
+ type: "icon",
+ width: 90,
+ //hidden: true, // 榛樿闅愯棌
+ icon: "el-icon-s-grid",
+ },
{
prop: "viewDetail",
title: "鍑哄簱璇︾粏",
@@ -258,10 +258,10 @@
const assignStockColumn = this.tableColumns.find(
(item) => item.prop === "assignStock"
);
- if (assignStockColumn) {
- // businessType涓�22鏃舵樉绀猴紝鍚﹀垯闅愯棌
- assignStockColumn.hidden = this.mainBusinessType !== '22';
- }
+ // if (assignStockColumn) {
+ // // businessType涓�22鏃舵樉绀猴紝鍚﹀垯闅愯棌
+ // assignStockColumn.hidden = this.mainBusinessType !== '22';
+ // }
},
open(row) {
this.row = row;
@@ -346,11 +346,11 @@
if (this.selection.length === 0) {
return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
}
-
+
const keys = this.selection.map((item) => item.id);
const requestParams = {
detailIds: keys,
- outboundQuantity: this.selection.length>1?1: this.selection[0].orderQuantity,
+ outboundQuantity: this.selection[0].orderQuantity - this.selection[0].lockQuantity,
operator: "",
orderNo: this.row.orderNo,
isBatch: this.isBatch
--
Gitblit v1.9.3