From 1963e40fab4e4c8b3597a1853ce5a03264d7897f Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 13 十二月 2025 17:43:51 +0800
Subject: [PATCH] 1
---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue | 508 +++++++++++++++++--------------------------------------
1 files changed, 160 insertions(+), 348 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 8e14b29..55145a5 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"
@@ -15,11 +15,22 @@
<el-divider direction="vertical"></el-divider>
<span class="less-style">鐗╂枡缂栧彿锛� {{ row.materielCode }} </span>
<el-divider direction="vertical"></el-divider>
- <span class="less-style">闇�姹傛暟閲忥細 {{ row.qty }} </span>
+ <span class="less-style"
+ >闇�姹傛暟閲忥細 {{ row.orderQuantity }}
+ </span>
<el-divider direction="vertical"></el-divider>
- <span :class="selectionClass">宸查�夋暟閲忥細 {{ selectionSum }} </span>
+ <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"
@@ -27,64 +38,17 @@
@click="getData"
>鍒锋柊</el-link
>
- <el-link
+ <!-- <el-link
type="primary"
size="small"
style="float: right; height: 20px; margin-right: 10px"
- @click="openOutboundDialog"
- >鐩存帴鍑哄簱</el-link
- >
+ @click="revokeAssign"
+ >鎾ら攢鍒嗛厤</el-link
+ > -->
</el-col>
</el-row>
</el-alert>
</div>
-
- <!-- 鏂板绛涢�夊尯鍩� -->
- <div class="filter-area" style="margin: 10px 0; padding: 10px; background: #f8f9fa; border-radius: 4px;">
- <el-form :model="filterForm" inline @submit.prevent>
- <el-form-item label="鐗╂枡缂栧彿锛�">
- <el-input
- v-model="filterForm.materielCode"
- placeholder="妯＄硦绛涢�夌墿鏂欑紪鍙�"
- clearable
- style="width: 180px"
- @input="filterTable"
- ></el-input>
- </el-form-item>
- <el-form-item label="鐗╂枡鏉＄爜锛�">
- <el-input
- v-model="filterForm.barcode"
- placeholder="妯＄硦绛涢�夌墿鏂欐潯鐮�"
- clearable
- style="width: 180px"
- @input="filterTable"
- ></el-input>
- </el-form-item>
- <el-form-item label="鎵樼洏缂栧彿锛�">
- <el-input
- v-model="filterForm.palletCode"
- placeholder="妯＄硦绛涢�夋墭鐩樼紪鍙�"
- clearable
- style="width: 180px"
- @input="filterTable"
- ></el-input>
- </el-form-item>
- <el-form-item label="璐т綅缂栧彿锛�">
- <el-input
- v-model="filterForm.locationCode"
- placeholder="妯＄硦绛涢�夎揣浣嶇紪鍙�"
- clearable
- style="width: 180px"
- @input="filterTable"
- ></el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" @click="filterTable">鎼滅储</el-button>
- <el-button @click="resetFilter">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
- </div>
-
<div class="box-table" style="margin-top: 1%">
<el-table
ref="singleTable"
@@ -95,6 +59,7 @@
height="500px"
@selection-change="handleSelectionChange"
>
+ >
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column
label="搴忓彿"
@@ -127,334 +92,185 @@
</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
>
</template>
</vol-box>
-
- <!-- 鍑哄簱绔欏彴閫夋嫨寮圭獥锛堥潤鎬佹ā鏉垮疄鐜帮級 -->
- <el-dialog
- v-model="showOutboundDialog"
- title="鍑哄簱鎿嶄綔 - 閫夋嫨鍑哄簱绔欏彴"
- width="500px"
- :append-to-body="true"
- >
- <el-form
- :model="outboundForm"
- :rules="outboundRules"
- ref="outboundFormRef"
- label-width="100px"
- style="padding: 0 20px"
- >
- <el-form-item label="鍑哄簱绔欏彴" prop="selectedPlatform" style="margin-bottom: 24px">
- <el-select
- v-model="outboundForm.selectedPlatform"
- placeholder="璇烽�夋嫨鍑哄簱绔欏彴锛�3-12锛�"
- style="width: 100%; height: 40px"
- >
- <el-option
- v-for="platform in platformOptions"
- :key="platform.value"
- :label="platform.label"
- :value="platform.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-form>
- <template #footer>
- <el-button @click="showOutboundDialog = false" style="margin-right: 8px">鍙栨秷</el-button>
- <el-button type="primary" @click="confirmOutbound">纭畾鍑哄簱</el-button>
- </template>
- </el-dialog>
</div>
</template>
-
<script>
import VolBox from "@/components/basic/VolBox.vue";
-import { ElMessage } from "element-plus";
-
+import { fa } from "element-plus/es/locales.mjs";
export default {
components: { VolBox },
data() {
return {
- row: null, // 鎺ユ敹鐖剁粍浠朵紶閫掔殑瀹屾暣鏁版嵁锛堝寘鍚槑缁咺D闆嗗悎锛�
+ row: null,
+ kcname: "",
+ pkcx: false,
showDetialBox: false,
tableData: [],
- originalTableData: [], // 瀛樺偍鍘熷鏁版嵁锛岀敤浜庣瓫閫�
tableColumns: [
- { prop: "materielCode", title: "鐗╂枡缂栧彿", type: "string", width: 150 },
- { prop: "barcode", 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: "materielCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 150,
+ },
+ {
+ 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",
+ },
],
- selection: [], // 閫変腑鐨勫簱瀛樻暟鎹�
- selectionSum: 0, // 宸查�夋暟閲忔�诲拰
+ selection: [],
+ selectionSum: 0,
selectionClass: "less-style",
originalQuantity: 0,
-
- // 绛涢�夎〃鍗曟暟鎹�
- filterForm: {
- materielCode: "",
- barcode: "",
- palletCode: "",
- locationCode: ""
- },
-
- // 鍑哄簱寮圭獥鐩稿叧鏁版嵁
- showOutboundDialog: false,
- outboundForm: { selectedPlatform: "" }, // 琛ㄥ崟缁戝畾鏁版嵁
- outboundRules: {
- selectedPlatform: [
- { required: true, message: "璇烽�夋嫨鍑哄簱绔欏彴", trigger: "change" },
- ],
- },
- platformOptions: [
- { label: "绔欏彴2", value: "2-1" },
- { label: "绔欏彴3", value: "3-1" },
- ],
- pkcx: false, // 鏂板锛氶粯璁alse锛堝鏋滈渶瑕佸彲浠庣埗缁勪欢浼犻�掞級
};
},
methods: {
- // 鎺ユ敹鐖剁粍浠朵紶閫掔殑鏁版嵁锛堝寘鍚槑缁咺D闆嗗悎鍜岀墿鏂欎俊鎭級
- open(data) {
- this.row = data; // data缁撴瀯锛歿materielCode, materielName, qty, orderNo, detailIds, mainOrderId, groupRow}
+ open(row) {
+ console.log(row);
+ this.row = row;
this.showDetialBox = true;
- this.getData(); // 鍔犺浇搴撳瓨鏁版嵁
- this.updateSelectionClass(); // 鍒濆鍖栧凡閫夋暟閲忔牱寮�
- console.log("鎺ユ敹鐨勫垎缁勬槑缁咺D闆嗗悎锛�", this.row.detailIds);
- console.log("鏌ヨ搴撳瓨鐨勭墿鏂欑紪鐮侊細", this.row.materielCode);
- },
-
- // 鎵撳紑鍑哄簱寮圭獥
- openOutboundDialog() {
- if (this.selection.length === 0) {
- return ElMessage.error("璇烽�夋嫨搴撳瓨鏁版嵁");
- }
- // 鏍￠獙鏄庣粏ID闆嗗悎
- if (!this.row?.detailIds || this.row.detailIds.length === 0) {
- return ElMessage.error("娌℃湁鑾峰彇鍒板崟鎹槑缁咺D锛屾棤娉曞嚭搴�");
- }
- // 閲嶇疆琛ㄥ崟閬垮厤娈嬬暀鍊�
- this.outboundForm.selectedPlatform = "";
- this.showOutboundDialog = true;
- },
-
- // 鏍稿績淇敼锛歎RL鎷兼帴浼犻�抜nt[] orderDetailId锛堥噸澶嶅弬鏁板悕锛夊拰station锛岃姹備綋浼犲簱瀛樻暟鎹�
- confirmOutbound() {
- this.$refs.outboundFormRef.validate((valid) => {
- if (!valid) return;
-
- // 鏍￠獙閫変腑搴撳瓨鍜屾槑缁咺D
- if (this.selection.length <= 0) {
- return this.$message.error("璇峰嬀閫夊簱瀛樻暟鎹�");
- }
- if (!this.row?.detailIds || this.row.detailIds.length === 0) {
- return this.$message.error("娌℃湁鑾峰彇鍒板崟鎹槑缁咺D锛屾棤娉曞嚭搴�");
- }
-
- try {
- // 1. 杞崲ID涓烘暣鏁版暟缁勶紙纭繚鍚庣鑳借瘑鍒负int[]锛�
- const orderDetailId = this.row.detailIds.map(id => {
- const num = Number(id);
- if (isNaN(num) || !Number.isInteger(num)) {
- throw new Error(`ID ${id} 涓嶆槸鏈夋晥鐨勬暣鏁癭);
- }
- return num;
- });
-
- // 2. 鎷兼帴URL锛歩nt[] 鐢ㄩ噸澶嶅弬鏁板悕鏍煎紡锛�?orderDetailId=1&orderDetailId=2&...锛�
- let url = "api/Task/GenerateOutboundTask";
- // 鎷兼帴ID鏁扮粍鍙傛暟
- const idParams = orderDetailId.map(id => `orderDetailId=${id}`).join("&");
- // 鎷兼帴绔欏彴鍙傛暟
- const stationParam = `station=${encodeURIComponent(this.outboundForm.selectedPlatform)}`;
- // 瀹屾暣URL锛堝鐞嗗弬鏁版嫾鎺ラ�昏緫锛�
- const fullUrl = idParams
- ? `${url}?${idParams}&${stationParam}`
- : `${url}?${stationParam}`;
-
- console.log("鍑哄簱璇锋眰URL锛�", fullUrl);
-
- // 3. 鍙戦�佽姹傦細URL鎷兼帴ID鍜岀珯鍙帮紝璇锋眰浣撲紶搴撳瓨鏁版嵁锛堥�傞厤FromBody锛�
- this.http
- .post(fullUrl, 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(); // 鍒锋柊鐖剁粍浠舵暟鎹�
- });
- })
- .catch((err) => {
- console.error("鍑哄簱澶辫触锛�", err);
- this.$message.error(`鍑哄簱澶辫触锛�${err.message || '璇风◢鍚庨噸璇�'}`);
- });
- } catch (err) {
- this.$message.error(err.message);
- }
- });
- },
-
- // 鎸夌涓�涓墿鏂欑紪鐮佹煡璇㈠簱瀛樻暟鎹�
- getData() {
- const url = "api/StockInfo/GetSelectViewDTOs?materielCode=";
- // 浣跨敤鐖剁粍浠朵紶閫掔殑鐗╂枡缂栫爜锛堢涓�涓槑缁嗙殑缂栫爜锛�
- this.http
- .post(
- url + this.row.materielCode + "&orderNo=" + (this.row.upperOrderNo || this.row.orderNo),
- null,
- "鏌ヨ涓�"
- )
- .then((x) => {
- this.tableData = x || [];
- this.originalTableData = [...this.tableData]; // 淇濆瓨鍘熷鏁版嵁
- // 鍒锋柊鍚庢竻绌轰箣鍓嶇殑閫夋嫨鍜岃鏁�
- this.clearSelection();
- this.selectionSum = 0;
- this.originalQuantity = 0;
- this.updateSelectionClass();
- // 鍒锋柊鍚庨噸缃瓫閫夋潯浠�
- this.resetFilter();
- })
- .catch((err) => {
- console.error("搴撳瓨鏌ヨ澶辫触锛�", err);
- ElMessage.error("搴撳瓨鏌ヨ澶辫触锛岃绋嶅悗閲嶈瘯");
- this.tableData = [];
- this.originalTableData = [];
- });
- },
-
- // 鎾ら攢鎸囧畾搴撳瓨锛堝鏋滈渶瑕侊級
- revokeAssign() {
- if (!this.row?.detailIds || this.row.detailIds.length === 0) {
- return ElMessage.error("娌℃湁鑾峰彇鍒板崟鎹槑缁咺D锛屾棤娉曟挙閿�");
- }
-
- try {
- // ID杞负鏁存暟鏁扮粍锛屾嫾鎺RL
- const detailIds = this.row.detailIds.map(id => Number(id));
- const idParams = detailIds.map(id => `detailIds=${id}`).join("&");
- const url = `api/OutboundOrderDetail/RevokeLockOutboundStock?id=${this.row.mainOrderId}&${idParams}`;
-
- this.http
- .post(url, null, "鏁版嵁澶勭悊涓�")
- .then((x) => {
- if (!x.status) return ElMessage.error(x.message);
- ElMessage.success("鎾ら攢鎴愬姛");
- this.showDetialBox = false;
- this.$emit("parentCall", ($vue) => {
- $vue.getData();
- });
- });
- } catch (err) {
- this.$message.error(`鎾ら攢澶辫触锛�${err.message}`);
- }
- },
-
- // 澶勭悊琛ㄦ牸閫夋嫨鍙樺寲锛堣绠楀凡閫夋暟閲忥級
- handleSelectionChange(val) {
- this.selection = val;
- // 璁＄畻宸查�夋暟閲忥紙杞暟瀛楅伩鍏嶅瓧绗︿覆鎷兼帴锛�
- this.selectionSum = val.reduce(
- (acc, curr) => acc + Number(curr.useableQuantity || 0),
- 0
- ) + this.originalQuantity;
- this.updateSelectionClass();
- },
-
- // 鏇存柊宸查�夋暟閲忔牱寮忥紙瀵规瘮鍒嗙粍鎬婚渶姹傛暟閲忥級
- updateSelectionClass() {
- if (!this.row) return;
- if (this.selectionSum === this.row.qty) {
+ this.originalQuantity = this.row.lockQuantity;
+ this.selectionSum = this.row.lockQuantity;
+ this.getData();
+ if (this.selectionSum == this.row.orderQuantity) {
this.selectionClass = "equle-style";
- } else if (this.selectionSum < this.row.qty) {
+ } else if (this.selectionSum < this.row.orderQuantity) {
this.selectionClass = "less-style";
} else {
this.selectionClass = "more-style";
}
},
-
- // 鍒囨崲琛ㄦ牸閫夋嫨
- toggleSelection(rows) {
- rows
- ? rows.forEach((row) => this.$refs.singleTable.toggleRowSelection(row))
- : this.clearSelection();
+ lockStock() {
+ this.http
+ .post(
+ "api/OutboundOrderDetail/LockOutboundStock?id=" + 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();
+ });
+ });
},
-
- // 娓呯┖閫夋嫨
- clearSelection() {
- if (this.$refs.singleTable) {
+ outbound() {
+ if (this.selection.length <= 0) {
+ 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();
+ });
+ });
+ },
+ getData(a) {
+ if (!a) this.pkcx = !this.pkcx;
+ let url = this.pkcx
+ ? "api/StockInfo/GetStockSelectViews?materielCode="
+ : "api/StockInfo/GetStockSelectViews?materielCode=";
+ this.kcname = this.pkcx ? "绔嬪簱搴撳瓨" : "骞冲簱搴撳瓨";
+ this.http
+ .post(
+ url + this.row.materielCode + "&orderId=" + this.row.orderId,
+ null,
+ "鏌ヨ涓�"
+ )
+ .then((x) => {
+ this.tableData = x;
+ });
+ },
+ 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();
+ });
+ });
+ },
+ 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";
+ }
+ },
+ toggleSelection(rows) {
+ if (rows) {
+ rows.forEach((row) => {
+ this.$refs.singleTable.toggleRowSelection(row);
+ });
+ } else {
this.$refs.singleTable.clearSelection();
}
},
-
- // 琛岀偣鍑讳簨浠�
+ clearSelection() {
+ this.$refs.singleTable.clearSelection();
+ },
handleRowClick(row) {
this.$refs.singleTable.toggleRowSelection(row);
},
-
- // 鍥炬爣鎸夐挳鐐瑰嚮鍗犱綅鏂规硶锛堝彲鏍规嵁闇�姹傛墿灞曪級
- tableButtonClick(row, item) {
- console.log("鍥炬爣鎸夐挳鐐瑰嚮锛�", item.title, row);
- },
-
- // 绛涢�夎〃鏍兼暟鎹�
- filterTable() {
- if (!this.originalTableData.length) return;
-
- // 瑙ｆ瀯绛涢�夋潯浠跺苟杞负灏忓啓锛堝拷鐣ュぇ灏忓啓锛�
- const { materielCode, barcode, palletCode, locationCode } = this.filterForm;
- const mc = materielCode.toLowerCase().trim();
- const bc = barcode.toLowerCase().trim();
- const pc = palletCode.toLowerCase().trim();
- const lc = locationCode.toLowerCase().trim();
-
- // 妯＄硦绛涢�夐�昏緫
- this.tableData = this.originalTableData.filter(item => {
- // 姣忎釜瀛楁閮藉仛绌哄�煎鐞嗗拰灏忓啓杞崲锛屾敮鎸佹ā绯婂尮閰�
- const itemMc = (item.materielCode || "").toLowerCase();
- const itemBc = (item.barcode || "").toLowerCase();
- const itemPc = (item.palletCode || "").toLowerCase();
- const itemLc = (item.locationCode || "").toLowerCase();
-
- return (
- itemMc.includes(mc) &&
- itemBc.includes(bc) &&
- itemPc.includes(pc) &&
- itemLc.includes(lc)
- );
- });
-
- // 绛涢�夊悗娓呯┖閫夋嫨鐘舵��
- this.clearSelection();
- this.selectionSum = 0;
- this.updateSelectionClass();
- },
-
- // 閲嶇疆绛涢�夋潯浠�
- resetFilter() {
- this.filterForm = {
- materielCode: "",
- barcode: "",
- palletCode: "",
- locationCode: ""
- };
- // 鎭㈠鍘熷鏁版嵁
- this.tableData = [...this.originalTableData];
- // 閲嶇疆閫夋嫨鐘舵��
- this.clearSelection();
- this.selectionSum = 0;
- this.updateSelectionClass();
- }
},
};
</script>
-
<style scoped>
.less-style {
color: black;
@@ -466,12 +282,6 @@
.more-style {
color: red;
-}
-
-/* 绛涢�夊尯鍩熸牱寮忎紭鍖� */
-.filter-area :deep(.el-form-item) {
- margin-bottom: 0;
- margin-right: 10px;
}
</style>
@@ -486,10 +296,12 @@
.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 {
--
Gitblit v1.9.3