From 2b25f973bb6d72ce6971d6f9c3cdccf51b7962ab Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 06 九月 2025 14:27:08 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue"
index 9dcd95e..0bab4d2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/outbound/extend/SelectedStock.vue"
@@ -13,14 +13,14 @@
<el-col :span="24">
<span class="less-style">鐗╂枡鍚嶇О锛� {{ row.materielName }} </span>
<el-divider direction="vertical"></el-divider>
- <span class="less-style">鐗╂枡缂栧彿锛� {{ row.materielCode }} </span>
+ <span class="less-style">鐗╂枡缂栧彿锛� {{ row.materialNo }} </span>
<el-divider direction="vertical"></el-divider>
<span class="less-style"
- >闇�姹傛暟閲忥細 {{ row.orderQuantity }}
+ >闇�姹傛暟閲忥細 {{ row.totalUsage }}
</span>
<el-divider direction="vertical"></el-divider>
<span class="less-style"
- >宸插垎閰嶆暟閲忥細 {{ row.lockQuantity }}
+ >宸插垎閰嶆暟閲忥細 {{ row.assignTotalUsage }}
</span>
</el-col>
</el-row>
@@ -81,6 +81,7 @@
data() {
return {
row: null,
+ orderNo:null,
showDetialBox: false,
tableData: [],
tableColumns: [
@@ -105,16 +106,10 @@
hidden: true,
},
{
- prop: "orderType",
- title: "鍗曟嵁绫诲瀷",
+ prop: "materielId",
+ title: "鐗╂枡Id",
type: "string",
width: 90,
- },
- {
- prop: "batchNo",
- title: "鎵规鍙�",
- type: "string",
- width: 120,
},
{
prop: "materielCode",
@@ -136,16 +131,22 @@
hidden: true,
},
{
- prop: "originalQuantity",
- title: "鍘熷搴撳瓨閲�",
+ prop: "orderQuantity",
+ title: "鍗曟嵁闇�姹傞暱搴�",
type: "string",
- width: 100,
+ width: 110,
+ },
+ {
+ prop: "originalQuantity",
+ title: "鍘熷簱瀛橀暱搴�",
+ type: "string",
+ width: 110,
},
{
prop: "assignQuantity",
- title: "鍒嗛厤鍑哄簱閲�",
+ title: "鍒嗛厤鍑哄簱闀垮害",
type: "string",
- width: 100,
+ width: 110,
},
{
prop: "taskNum",
@@ -155,7 +156,7 @@
},
{
prop: "palletCode",
- title: "鎵樼洏缂栧彿",
+ title: "鏉＄爜缂栧彿",
type: "string",
width: 150,
},
@@ -174,15 +175,16 @@
};
},
methods: {
- open(row) {
+ open(row,orderNo) {
this.row = row;
+ this.orderNo=orderNo;
this.showDetialBox = true;
this.getData();
},
getData() {
this.http
.post(
- "api/OutStockLockInfo/GetByOrderDetailId?orderDetailId=" +
+ "api/OutStockLockInfo/GetByOrderDetailId?orderNo="+this.orderNo+"&orderDetailId=" +
this.row.id,
null,
"鏌ヨ涓�"
--
Gitblit v1.9.3