From abd3f4ab0f1331d6e8ae7dcd07ff0c6b7a7b11d8 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期五, 05 十二月 2025 09:03:36 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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 feb607c..da423a5 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"
@@ -24,6 +24,7 @@
<el-link
type="primary"
size="small"
+ v-if="isBatch === 0"
style="float: right; height: 20px"
@click="handleOpenPicking"
>鎷ｉ��</el-link>
@@ -31,11 +32,13 @@
type="primary"
size="small"
style="float: right; height: 20px; margin-right: 10px"
+ v-if="isBatch === 1"
@click="handleOpenBatchPicking"
>鍒嗘壒鎷ｉ��</el-link>
<el-link
type="primary"
size="small"
+ v-if="isBatch === 0"
style="float: right; height: 20px; margin-right: 10px"
@click="outbound"
>鐩存帴鍑哄簱</el-link
@@ -43,6 +46,7 @@
<el-link
type="primary"
size="small"
+ v-if="isBatch === 1"
style="float: right; height: 20px; margin-right: 10px"
@click="outboundbatch"
>鍒嗘壒鍑哄簱</el-link
@@ -133,6 +137,7 @@
data() {
return {
row: null,
+ isBatch :0,
showDetialBox: false,
flag: false,
currentRow: null,
@@ -196,6 +201,12 @@
width: 90,
},
{
+ prop: "overOutQuantity",
+ title: "鎸枡鏁伴噺",
+ type: "string",
+ width: 90,
+ },
+ {
prop: "unit",
title: "鍗曚綅",
type: "string",
@@ -215,13 +226,6 @@
width: 90,
hidden:true,
icon: "el-icon-s-grid",
- },
- {
- prop: "NoStockOut",
- title: "鏃犲簱瀛樺嚭搴�",
- type: "icon",
- width: 100,
- icon: "el-icon-setting",
},
{
prop: "viewDetail",
@@ -307,6 +311,8 @@
open(row) {
this.row = row;
this.showDetialBox = true;
+ console.log(this.row);
+ this.isBatch = row.isBatch;
this.getDictionaryData();
this.getData();
},
@@ -643,18 +649,18 @@
} catch (err) {
return;
}
-
+console.log(this.selection);
// 4. 鏋勯�犺姹傚弬鏁帮紙鏂板灏忔暟瀛楁锛�
const keys = this.selection.map((item) => item.id);
const requestParams = {
- taskIds: keys,
+ orderDetailId: keys[0], // 鍒嗘壒鍑哄簱浠呮敮鎸佸崟鏉℃槑缁�
outboundPlatform: formData.selectedPlatform, // 鍑哄簱绔欏彴
- outboundDecimal: formData.outboundDecimal // 鏂板锛氬皬鏁板瓧娈典紶缁欏悗绔�
+ batchQuantity: formData.outboundDecimal // 鏂板锛氬皬鏁板瓧娈典紶缁欏悗绔�
};
// 5. 璋冪敤鍑哄簱鎺ュ彛
this.http
- .post("api/Task/ ", requestParams, "鏁版嵁澶勭悊涓�")
+ .post("api/Task/GenerateOutboundBatchTasks", requestParams, "鏁版嵁澶勭悊涓�")
.then((x) => {
if (!x.status) return ElMessage.error(x.message);
--
Gitblit v1.9.3