From 2bdda9b2bedb8f084e364e92627f19e1938dceca Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期二, 21 四月 2026 11:05:57 +0800
Subject: [PATCH] 1
---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue | 487 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 304 insertions(+), 183 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue"
index 55145a5..a8d5da4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue"
@@ -1,9 +1,10 @@
<template>
<div>
+ <!-- 搴撳瓨鎸囧畾寮圭獥 -->
<vol-box
v-model="showDetialBox"
:lazy="true"
- width="60%"
+ width="80%"
:padding="15"
title="鎸囧畾搴撳瓨"
>
@@ -11,26 +12,21 @@
<el-alert :closable="false" style="width: 100%">
<el-row>
<el-col :span="16">
+ <span class="less-style">鍗曟嵁缂栧彿锛歿{ mainOrderNo }}</span>
+ <el-divider direction="vertical"></el-divider>
<span class="less-style">鐗╂枡鍚嶇О锛� {{ row.materielName }} </span>
<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">
+ 闇�姹傛暟閲忥細 {{ requireQuantity }}
</span>
<el-divider direction="vertical"></el-divider>
- <span :class="selectionClass"
- >宸查�夋暟閲忥細 {{ selectionSum }}
+ <span :class="selectionClass">
+ 宸查�夋暟閲忥細 {{ selectionSum }}
</span>
</el-col>
<el-col :span="8">
- <!-- <el-link
- type="primary"
- size="small"
- style="float: right; height: 20px"
- @click="getData(false)"
- >{{ kcname }}</el-link
- > -->
<el-link
type="primary"
size="small"
@@ -38,13 +34,6 @@
@click="getData"
>鍒锋柊</el-link
>
- <!-- <el-link
- type="primary"
- size="small"
- style="float: right; height: 20px; margin-right: 10px"
- @click="revokeAssign"
- >鎾ら攢鍒嗛厤</el-link
- > -->
</el-col>
</el-row>
</el-alert>
@@ -58,8 +47,9 @@
@row-click="handleRowClick"
height="500px"
@selection-change="handleSelectionChange"
+ @select="selectRowChange"
+ @select-all="selectAllChange"
>
- >
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column
label="搴忓彿"
@@ -76,134 +66,255 @@
: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>
+ <template #default="scoped">
+ <div 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>
+ </div>
+ <div v-else-if="item.type == 'tag'">
+ <el-tag size="small">
+ {{ getDictionary(scoped.row, item) }}
+ </el-tag>
+ </div>
+ <div v-else>
+ {{ scoped.row[item.prop] }}
+ </div>
</template>
</el-table-column>
</el-table>
</div>
<template #footer>
- <!-- <el-button type="primary" size="small" @click="outbound"
+ <el-button type="primary" size="small" @click="openStationDialog"
>鐩存帴鍑哄簱</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>
+
+ <!-- 绔欏彴閫夋嫨寮圭獥 -->
+ <el-dialog
+ v-model="showStationDialog"
+ title="閫夋嫨鍑哄簱绔欏彴"
+ width="500px"
+ :close-on-click-modal="false"
+ >
+ <div class="station-dialog-content">
+ <el-form :model="stationForm" label-width="100px">
+ <el-form-item label="閫夋嫨绔欏彴锛�" required>
+ <el-select
+ v-model="stationForm.selectedPlatform"
+ placeholder="璇烽�夋嫨鍑哄簱绔欏彴"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in stations"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍑哄簱鏁伴噺锛�">
+ <el-input
+ v-model="selectionSum"
+ readonly
+ style="width: 100%"
+ ></el-input>
+ </el-form-item>
+ <el-form-item label="鐗╂枡淇℃伅锛�">
+ <div style="font-size: 12px; color: #666; line-height: 1.5">
+ <div>鐗╂枡缂栧彿锛歿{ row.materielCode }}</div>
+ <div>鐗╂枡鍚嶇О锛歿{ row.materielName }}</div>
+ </div>
+ </el-form-item>
+ </el-form>
+ </div>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="showStationDialog = false">鍙栨秷</el-button>
+ <el-button type="primary" @click="confirmOutbound">纭鍑哄簱</el-button>
+ </span>
+ </template>
+ </el-dialog>
</div>
</template>
+
<script>
import VolBox from "@/components/basic/VolBox.vue";
-import { fa } from "element-plus/es/locales.mjs";
+import { stationManager } from "@/../src/uitils/stationManager";
+
export default {
components: { VolBox },
data() {
return {
row: null,
kcname: "",
+ mainOrderNo: "",
pkcx: false,
showDetialBox: false,
+ showStationDialog: false,
tableData: [],
+ dictionaryList: null,
tableColumns: [
+ { prop: "materielCode", title: "鐗╂枡缂栧彿", type: "string", width: 150 },
+ { prop: "materielName", title: "鐗╂枡鍚嶇О", type: "string", width: 150 },
+ { prop: "palletCode", title: "鎵樼洏缂栧彿", type: "string", width: 150 },
+ { prop: "barcode", title: "鏉＄爜", type: "string", width: 150 },
+ { prop: "locationCode", title: "璐т綅缂栧彿", type: "string", width: 180 },
+ { prop: "useableQuantity", title: "鍙敤鏁伴噺", type: "string" },
+ { prop: "supplyCode", title: "渚涘簲鍟�", type: "string" },
+ { prop: "batchNo", title: "鎵规鍙�", type: "string" },
{
- prop: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 150,
+ prop: "stockStatus",
+ title: "搴撳瓨鏄庣粏鐘舵��",
+ type: "tag",
+ width: 90,
+ bindKey: "stockStatusEmun",
},
- {
- prop: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 150,
- },
- {
- prop: "palletCode",
- title: "鎵樼洏缂栧彿",
- type: "string",
- width: 150,
- },
- {
- prop: "locationCode",
- title: "璐т綅缂栧彿",
- type: "string",
- width: 180,
- },
- {
- prop: "useableQuantity",
- title: "鍙敤鏁伴噺",
- type: "string",
- },
+ { prop: "stockId", title: "搴撳瓨涓婚敭", type: "string" },
+ { prop: "orderDetailId", title: "鍗曟嵁鏄庣粏涓婚敭", type: "string" },
],
selection: [],
selectionSum: 0,
selectionClass: "less-style",
originalQuantity: 0,
+
+ stations: [
+ { label: "绔欏彴2", value: "2-1" },
+ { label: "绔欏彴3", value: "3-1" },
+ ],
+ stationForm: {
+ selectedPlatform: "",
+ },
+ isProcessingSelect: false,
};
},
+ computed: {
+ requireQuantity() {
+ if (!this.row) return 0;
+ return this.row.orderQuantity - this.row.lockQuantity - (this.row.moveQty || 0);
+ },
+ isFull() {
+ return this.selectionSum >= this.requireQuantity && this.requireQuantity > 0;
+ }
+ },
methods: {
- open(row) {
- console.log(row);
+ open(row, orderNo) {
this.row = row;
+ this.mainOrderNo = orderNo;
this.showDetialBox = true;
- this.originalQuantity = this.row.lockQuantity;
- this.selectionSum = this.row.lockQuantity;
+
+ this.originalQuantity = 0;
+ this.selectionSum = 0;
+ this.selection = [];
+
+ this.getDictionaryData();
this.getData();
- if (this.selectionSum == this.row.orderQuantity) {
- this.selectionClass = "equle-style";
- } else if (this.selectionSum < this.row.orderQuantity) {
- this.selectionClass = "less-style";
- } else {
- this.selectionClass = "more-style";
- }
+ this.updateSelectionStyle();
},
- lockStock() {
+
+ getDictionaryData() {
+ if (this.dictionaryList) {
+ return;
+ }
+ var param = [];
+ this.tableColumns.forEach((x) => {
+ if (x.type == "tag" && x.bindKey != "") {
+ param.push(x.bindKey);
+ }
+ });
this.http
- .post(
- "api/OutboundOrderDetail/LockOutboundStock?id=" + this.row.id,
- this.selection,
- "鏁版嵁澶勭悊涓�"
- )
+ .post("api/Sys_Dictionary/GetVueDictionary", param, "鏌ヨ涓�")
.then((x) => {
- if (!x.status) return this.$message.error(x.message);
- this.$message.success("鎿嶄綔鎴愬姛");
- this.showDetialBox = false;
- this.$emit("parentCall", ($vue) => {
- $vue.getData();
- });
+ if (x.length > 0) {
+ this.dictionaryList = x;
+ }
});
},
- outbound() {
+
+ getDictionary(row, column) {
+ if (this.dictionaryList) {
+ var item = this.dictionaryList.find((x) => x.dicNo == column.bindKey);
+ if (item) {
+ var dicItem = item.data.find((x) => x.key == row[column.prop]);
+ if (dicItem) {
+ return dicItem.value;
+ } else {
+ return row[column.prop];
+ }
+ }
+ }
+ return row[column.prop];
+ },
+
+ openStationDialog() {
if (this.selection.length <= 0) {
- return this.$message.error("璇峰嬀閫�");
+ return this.$message.error("璇峰厛鍕鹃�夎鍑哄簱鐨勫簱瀛�");
}
- let url = this.pkcx
- ? "api/Task/GenerateOutboundTask?orderDetailId="
- : "api/Task/GenerateOutboundTask?orderDetailId=";
- this.http
- .post(url + this.row.id, this.selection, "鏁版嵁澶勭悊涓�")
- .then((x) => {
- if (!x.status) return this.$message.error(x.message);
- this.$message.success("鎿嶄綔鎴愬姛");
- this.showDetialBox = false;
- this.$emit("parentCall", ($vue) => {
- $vue.getData();
- });
- });
+ const cachedStation = stationManager.getStation();
+ this.stationForm.selectedPlatform = cachedStation || "";
+ this.showStationDialog = true;
},
+
+ async confirmOutbound() {
+ if (!this.stationForm.selectedPlatform) {
+ return this.$message.error("璇烽�夋嫨鍑哄簱绔欏彴");
+ }
+
+ const requestParams = {
+ detailIds: [this.row.id],
+ outboundTargetLocation: this.stationForm.selectedPlatform,
+ outboundQuantity: this.selectionSum,
+ operator: this.getCurrentOperator(),
+ orderNo: this.mainOrderNo,
+ stockDetailIds: this.selection.map((item) => item.stockId),
+ };
+
+ try {
+ const x = await this.http.post(
+ "api/Outbound/ProcessPickingOutbound",
+ requestParams,
+ "鏁版嵁澶勭悊涓�"
+ );
+ if (!x.status) {
+ return this.$message.error(x.message);
+ }
+ this.$message.success("鍑哄簱浠诲姟鍒涘缓鎴愬姛");
+ this.showStationDialog = false;
+ this.showDetialBox = false;
+ this.$emit("parentCall", ($vue) => {
+ $vue.getData();
+ });
+ } catch (error) {
+ this.$message.error(error.message || "鍑哄簱澶勭悊澶辫触");
+ }
+ },
+
+ getCurrentOperator() {
+ try {
+ const userInfo = JSON.parse(localStorage.getItem("userInfo") || "{}");
+ if (userInfo.userName) {
+ return userInfo.userName;
+ }
+ if (this.$store && this.$store.state.user) {
+ return this.$store.state.user.userName;
+ }
+ } catch (error) {
+ console.error("鑾峰彇鎿嶄綔浜轰俊鎭け璐�:", error);
+ }
+ return "admin";
+ },
+
getData(a) {
if (!a) this.pkcx = !this.pkcx;
let url = this.pkcx
@@ -218,101 +329,111 @@
)
.then((x) => {
this.tableData = x;
+ this.clearSelection();
});
},
- revokeAssign() {
- console.log(this.row);
- this.http
- .post(
- "api/OutboundOrderDetail/RevokeLockOutboundStock?id=" + this.row.id,
- null,
- "鏁版嵁澶勭悊涓�"
- )
- .then((x) => {
- if (!x.status) return this.$message.error(x.message);
- this.$message.success("鎿嶄綔鎴愬姛");
- this.showDetialBox = false;
- this.$emit("parentCall", ($vue) => {
- $vue.getData();
- });
- });
+
+ // 鐐瑰嚮琛屽嬀閫� - 鏈�缁堜慨澶嶇増
+ handleRowClick(row) {
+ // 鍒ゆ柇褰撳墠琛屾槸鍚﹀凡閫変腑
+ const isSelected = this.selection.some(s => s.stockId === row.stockId);
+
+ // 宸查�変腑 鈫� 鍏佽鍙栨秷鍕鹃��
+ if (isSelected) {
+ this.$refs.singleTable.toggleRowSelection(row);
+ return;
+ }
+
+ // 鏈�変腑 + 宸叉弧 鈫� 绂佹鏂板锛屾姤閿�
+ if (this.isFull) {
+ this.$message.error(`宸茶揪鍒伴渶姹傛暟閲� ${this.requireQuantity}锛屾棤娉曞啀鍕鹃�夊簱瀛橈紒`);
+ return;
+ }
+
+ // 姝ｅ父鍕鹃��
+ this.$refs.singleTable.toggleRowSelection(row);
},
- handleSelectionChange(val) {
- this.selection = val;
- this.selectionSum =
- val.reduce(
- (accumulator, currentValue) =>
- accumulator + currentValue["useableQuantity"],
- 0
- ) + this.originalQuantity;
- if (this.selectionSum == this.row.orderQuantity) {
- this.selectionClass = "equle-style";
- } else if (this.selectionSum < this.row.orderQuantity) {
- this.selectionClass = "less-style";
- } else {
- this.selectionClass = "more-style";
+
+ // 鍕鹃�夋閫夋嫨 - 鏈�缁堜慨澶嶇増
+ selectRowChange(selection, row) {
+ if (this.isProcessingSelect) return;
+
+ const isAdding = selection.some(x => x.stockId === row.stockId);
+
+ // 鏂板鍕鹃�� + 宸叉弧 鈫� 鎷︽埅
+ if (isAdding && this.isFull) {
+ this.isProcessingSelect = true;
+ this.$message.error(`宸茶揪鍒伴渶姹傛暟閲� ${this.requireQuantity}锛屾棤娉曞啀鍕鹃�夛紒`);
+ this.$nextTick(() => {
+ this.$refs.singleTable.toggleRowSelection(row, false);
+ this.isProcessingSelect = false;
+ });
}
},
- toggleSelection(rows) {
- if (rows) {
- rows.forEach((row) => {
- this.$refs.singleTable.toggleRowSelection(row);
- });
- } else {
+
+ // 鍏ㄩ�� - 鏈�缁堜慨澶嶇増
+ selectAllChange(selection) {
+ if (this.isProcessingSelect) return;
+
+ const allTotal = this.tableData.reduce((sum, item) => sum + (item.useableQuantity || 0), 0);
+ const need = this.requireQuantity;
+
+ if (allTotal > need && selection.length > 0) {
+ this.isProcessingSelect = true;
+ this.$message.error(`鍏ㄩ�夋暟閲忚秴鍑洪渶姹傦紝宸叉竻绌洪�夋嫨锛乣);
+
this.$refs.singleTable.clearSelection();
+ this.selection = [];
+ this.selectionSum = 0;
+ this.updateSelectionStyle();
+
+ this.$nextTick(() => {
+ this.isProcessingSelect = false;
+ });
}
},
+
+ // 閫夋嫨璁＄畻
+ handleSelectionChange(val) {
+ if (this.isProcessingSelect) return;
+
+ let total = val.reduce((s, i) => s + (i.useableQuantity || 0), 0);
+ const need = this.requireQuantity;
+
+ this.selectionSum = total >= need ? need : total;
+ this.selection = val;
+ this.updateSelectionStyle();
+ },
+
+ updateSelectionStyle() {
+ if (this.isFull) {
+ this.selectionClass = "equle-style";
+ } else {
+ this.selectionClass = "less-style";
+ }
+ },
+
clearSelection() {
this.$refs.singleTable.clearSelection();
- },
- handleRowClick(row) {
- this.$refs.singleTable.toggleRowSelection(row);
+ this.selection = [];
+ this.selectionSum = 0;
+ this.updateSelectionStyle();
},
},
};
</script>
+
<style scoped>
-.less-style {
- color: black;
-}
-
-.equle-style {
- color: green;
-}
-
-.more-style {
- color: red;
-}
-</style>
-
-<style>
-.text-button:hover {
- background-color: #f0f9eb !important;
-}
-
-.el-table .warning-row {
- background: oldlace;
-}
-
-.box-table .el-table tbody tr:hover > td {
- background-color: #d8e0d4 !important;
- /* color: #ffffff; */
-}
-
-.box-table .el-table tbody tr.current-row > td {
- background-color: #f0f9eb !important;
- /* color: #ffffff; */
-}
-
-.el-table .success-row {
- background: #f0f9eb;
-}
-
-.box-table .el-table {
- border: 1px solid #ebeef5;
-}
-
-.box-head .el-alert__content {
- width: 100%;
-}
+.less-style { color: black; }
+.equle-style { color: green; }
+.more-style { color: red; }
+.station-dialog-content { padding: 10px 0; }
+.dialog-footer { display: flex; justify-content: flex-end; gap: 10px; }
+.text-button:hover { background-color: #f0f9eb !important; }
+.el-table .warning-row { background: oldlace; }
+.box-table .el-table tbody tr:hover > td { background-color: #d8e0d4 !important; }
+.box-table .el-table tbody tr.current-row > td { background-color: #f0f9eb !important; }
+.el-table .success-row { background: #f0f9eb; }
+.box-table .el-table { border: 1px solid #ebeef5; }
+.box-head .el-alert__content { width: 100%; }
</style>
\ No newline at end of file
--
Gitblit v1.9.3