From 59c8d02d2bc7c7d9651edbd755ad73e4e7843ed8 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 09:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue | 102 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 80 insertions(+), 22 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue"
index 1a2ce9d..86d7f1c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue"
@@ -1,6 +1,12 @@
<template>
<div>
- <vol-box v-model="showDetialBox" :lazy="true" width="60%" :padding="15" title="鎸囧畾搴撳瓨">
+ <vol-box
+ v-model="showDetialBox"
+ :lazy="true"
+ width="60%"
+ :padding="15"
+ title="鎸囧畾搴撳瓨"
+ >
<div class="box-head">
<el-alert :closable="false" style="width: 100%">
<el-row>
@@ -9,41 +15,87 @@
<el-divider direction="vertical"></el-divider>
<span class="less-style">鐗╂枡缂栧彿锛� {{ row.materielCode }} </span>
<el-divider direction="vertical"></el-divider>
- <span class="less-style">闇�姹傛暟閲忥細 {{ row.orderQuantity }}
+ <span class="less-style"
+ >闇�姹傛暟閲忥細 {{ row.orderQuantity }}
</span>
<el-divider direction="vertical"></el-divider>
- <span :class="selectionClass">宸查�夋暟閲忥細 {{ selectionSum }}
+ <span :class="selectionClass"
+ >宸查�夋暟閲忥細 {{ selectionSum }}
</span>
</el-col>
<el-col :span="2">
- <el-link type="primary" size="small" style="float: right; height: 20px"
- @click="getData">鍒锋柊</el-link></el-col>
+ <el-link
+ type="primary"
+ size="small"
+ style="float: right; height: 20px"
+ @click="getData"
+ >鍒锋柊</el-link
+ ></el-col
+ >
<el-col :span="2">
- <el-link type="primary" size="small" style="float: right; height: 20px"
- @click="revokeAssign">鎾ら攢鍒嗛厤</el-link></el-col>
+ <el-link
+ type="primary"
+ size="small"
+ style="float: right; height: 20px"
+ @click="revokeAssign"
+ >鎾ら攢鍒嗛厤</el-link
+ ></el-col
+ >
</el-row>
</el-alert>
</div>
<div class="box-table" style="margin-top: 1%">
- <el-table ref="singleTable" :data="tableData" style="width: 100%; height: 100%" highlight-current-row
- @row-click="handleRowClick" height="500px" @selection-change="handleSelectionChange">
+ <el-table
+ ref="singleTable"
+ :data="tableData"
+ style="width: 100%; height: 100%"
+ highlight-current-row
+ @row-click="handleRowClick"
+ height="500px"
+ @selection-change="handleSelectionChange"
+ >
>
<el-table-column type="selection" width="55"> </el-table-column>
- <el-table-column label="搴忓彿" type="index" fixed="left" width="55" align="center"></el-table-column>
- <el-table-column v-for="(item, index) in tableColumns.filter((x) => !x.hidden)" :key="index" :prop="item.prop"
- :label="item.title" :width="item.width" align="center">
+ <el-table-column
+ label="搴忓彿"
+ type="index"
+ fixed="left"
+ width="55"
+ align="center"
+ ></el-table-column>
+ <el-table-column
+ v-for="(item, index) in tableColumns.filter((x) => !x.hidden)"
+ :key="index"
+ :prop="item.prop"
+ :label="item.title"
+ :width="item.width"
+ align="center"
+ >
<template #default="scoped" v-if="item.type == 'icon'">
- <el-tooltip class="item" effect="dark" :content="item.title" placement="bottom"><el-button type="text"
- @click="tableButtonClick(scoped.row, item)"><i :class="item.icon"
- style="font-size: 22px"></i></el-button></el-tooltip>
+ <el-tooltip
+ class="item"
+ effect="dark"
+ :content="item.title"
+ placement="bottom"
+ ><el-button
+ type="text"
+ @click="tableButtonClick(scoped.row, item)"
+ ><i :class="item.icon" style="font-size: 22px"></i></el-button
+ ></el-tooltip>
</template>
</el-table-column>
</el-table>
</div>
<template #footer>
- <el-button type="primary" size="small" @click="outbound">鐩存帴鍑哄簱</el-button>
- <el-button type="primary" size="small" @click="lockStock">閿佸畾搴撳瓨</el-button>
- <el-button type="danger" size="small" @click="showDetialBox = false">鍏抽棴</el-button>
+ <el-button type="primary" size="small" @click="outbound"
+ >鐩存帴鍑哄簱</el-button
+ >
+ <el-button type="primary" size="small" @click="lockStock"
+ >閿佸畾搴撳瓨</el-button
+ >
+ <el-button type="danger" size="small" @click="showDetialBox = false"
+ >鍏抽棴</el-button
+ >
</template>
</vol-box>
</div>
@@ -96,6 +148,7 @@
},
methods: {
open(row) {
+ console.log(row);
this.row = row;
this.showDetialBox = true;
this.originalQuantity = this.row.lockQuantity;
@@ -126,9 +179,12 @@
});
},
outbound() {
+ if(this.selection.length<=0){
+ return this.$message.error("璇峰嬀閫�");
+ }
this.http
.post(
- "api/Task/GenerateOutboundTask?id=" + this.row.id,
+ "api/Task/GenerateOutboundTask?orderDetailId=" + this.row.id,
this.selection,
"鏁版嵁澶勭悊涓�"
)
@@ -145,7 +201,9 @@
this.http
.post(
"api/StockInfo/GetStockSelectViews?materielCode=" +
- this.row.materielCode,
+ this.row.materielCode +
+ "&orderId=" +
+ this.row.orderId,
null,
"鏌ヨ涓�"
)
@@ -227,12 +285,12 @@
background: oldlace;
}
-.box-table .el-table tbody tr:hover>td {
+.box-table .el-table tbody tr:hover > td {
background-color: #d8e0d4 !important;
/* color: #ffffff; */
}
-.box-table .el-table tbody tr.current-row>td {
+.box-table .el-table tbody tr.current-row > td {
background-color: #f0f9eb !important;
/* color: #ffffff; */
}
--
Gitblit v1.9.3