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/views/inbound/inboundOrder.vue | 2
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/StockSelect.vue | 508 +++++++++--------------------
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue | 487 +++++++++++-----------------
3 files changed, 356 insertions(+), 641 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 {
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 1a7d1a0..cc9b8be 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"
@@ -60,7 +60,7 @@
<div class="box-table" style="margin-top: 1%">
<el-table
ref="singleTable"
- :data="groupedTableData"
+ :data="tableData"
style="width: 100%; height: 100%"
highlight-current-row
@current-change="handleCurrentChange"
@@ -77,127 +77,38 @@
align="center"
></el-table-column>
<el-table-column
- prop="materielCode"
- label="鐗╂枡缂栧彿"
- width="120"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="materielName"
- label="鐗╂枡鍚嶇О"
- width="150"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="batchNo"
- label="鎵规鍙�"
- width="90"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="supplyCode"
- label="渚涘簲鍟嗙紪鍙�"
- width="90"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="orderQuantity"
- label="鍗曟嵁鏁伴噺"
- width="90"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="lockQuantity"
- label="閿佸畾鏁伴噺"
- width="90"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="overOutQuantity"
- label="宸插嚭鏁伴噺"
- width="90"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="moveQty"
- label="鎸枡鏁伴噺"
- width="90"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="unit"
- label="鍗曚綅"
- width="80"
- align="center"
- ></el-table-column>
- <el-table-column
- prop="orderDetailStatus"
- label="璁㈠崟鏄庣粏鐘舵��"
- width="90"
+ 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">
- <el-tag size="small">
- {{ getDictionaryForGroup(scoped.row) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column
- prop="assignStock"
- label="鎸囧畾搴撳瓨"
- width="90"
- align="center"
- :hidden="mainBusinessType !== '22'"
- >
- <template #default="scoped">
- <el-tooltip
- class="item"
- effect="dark"
- content="鎸囧畾搴撳瓨"
- placement="bottom"
- >
- <el-link
- type="primary"
- :disabled="getButtonEnable('assignStock', scoped.row)"
- @click="handleAssignStock(scoped.row)"
+ <div v-if="item.type == 'icon'">
+ <el-tooltip
+ class="item"
+ effect="dark"
+ :content="item.title"
+ placement="bottom"
>
- <i class="el-icon-s-grid" style="font-size: 22px"></i>
- </el-link>
- </el-tooltip>
- </template>
- </el-table-column>
- <el-table-column
- prop="viewDetail"
- label="鍑哄簱璇︾粏"
- width="90"
- align="center"
- >
- <template #default="scoped">
- <el-tooltip
- class="item"
- effect="dark"
- content="鏌ョ湅鍑哄簱璇︾粏"
- placement="bottom"
- >
- <el-link
- type="primary"
- @click="handleViewDetail(scoped.row)"
- >
- <i class="el-icon-s-operation" style="font-size: 22px"></i>
- </el-link>
- </el-tooltip>
- </template>
- </el-table-column>
- <el-table-column
- prop="detailCount"
- label="鏄庣粏鏁伴噺"
- width="80"
- align="center"
- >
- <template #default="scoped">
- <el-tag type="info" size="small">
- {{ scoped.row.detailCount }}
- </el-tag>
+ <el-link
+ type="primary"
+ :disabled="getButtonEnable(item.prop, scoped.row)"
+ @click="tableButtonClick(scoped.row, item)"
+ >
+ <i :class="item.icon" style="font-size: 22px"></i>
+ </el-link>
+ </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>
@@ -218,7 +129,6 @@
import StockSelect from "./StockSelect.vue";
import SelectedStock from "./SelectedStock.vue";
import NoStockOut from "./NoStockOut.vue";
-import { stationManager, STATION_STORAGE_KEY } from "@/../src/uitils/stationManager";
import { h, createVNode, render, reactive } from "vue";
import {
ElDialog,
@@ -241,9 +151,129 @@
flag: false,
currentRow: null,
selection: [],
- tableData: [], // 鍘熷鏁版嵁
- groupedTableData: [], // 鍒嗙粍鍚庣殑鏁版嵁
- mainBusinessType: null, // 瀛樺偍涓诲崟鎹殑businessType
+ tableData: [],
+ mainBusinessType: null, // 鏂板锛氬瓨鍌ㄤ富鍗曟嵁鐨刡usinessType
+ tableColumns: [
+ {
+ prop: "id",
+ title: "Id",
+ type: "int",
+ width: 90,
+ hidden: true,
+ },
+ {
+ prop: "orderId",
+ title: "鍑哄簱鍗曚富閿�",
+ type: "string",
+ width: 90,
+ hidden: true,
+ },
+ {
+ prop: "materielCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 120,
+ },
+ {
+ prop: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ },
+ {
+ prop: "batchNo",
+ title: "鎵规鍙�",
+ type: "string",
+ width: 90,
+ },
+ {
+ prop: "supplyCode",
+ title: "渚涘簲鍟嗙紪鍙�",
+ type: "string",
+ width: 90,
+ },
+ {
+ prop: "orderQuantity",
+ title: "鍗曟嵁鏁伴噺",
+ type: "string",
+ width: 90,
+ },
+ {
+ prop: "lockQuantity",
+ title: "閿佸畾鏁伴噺",
+ type: "int",
+ width: 90,
+ },
+ {
+ prop: "overOutQuantity",
+ title: "宸插嚭鏁伴噺",
+ type: "string",
+ width: 90,
+ },
+ {
+ prop: "moveQty",
+ title: "鎸枡鏁伴噺",
+ type: "string",
+ width: 90,
+ },
+ {
+ prop: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 80,
+ },
+ {
+ prop: "orderDetailStatus",
+ title: "璁㈠崟鏄庣粏鐘舵��",
+ type: "tag",
+ width: 90,
+ bindKey: "orderDetailStatusEnum",
+ },
+ {
+ prop: "assignStock",
+ title: "鎸囧畾搴撳瓨",
+ type: "icon",
+ width: 90,
+ hidden: true, // 榛樿闅愯棌
+ icon: "el-icon-s-grid",
+ },
+ {
+ prop: "viewDetail",
+ title: "鍑哄簱璇︾粏",
+ type: "icon",
+ width: 90,
+ icon: "el-icon-s-operation",
+ },
+ {
+ prop: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 90,
+ },
+ {
+ prop: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ },
+ {
+ prop: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ },
+ {
+ prop: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ },
+ {
+ prop: "remark",
+ title: "澶囨敞",
+ type: "string",
+ },
+ ],
paginations: {
sort: "id",
order: "desc",
@@ -286,62 +316,16 @@
dictionaryList: null,
};
},
- onMounted() {
- // 浠庢湰鍦板瓨鍌ㄥ姞杞戒繚瀛樼殑绔欏彴鍊�
- const savedStation = stationManager.getStation();
- console.log(savedStation);
- if (savedStation) {
- outboundForm.selectedPlatform = savedStation;
- } else if (stationOptions.length > 0) {
- // 濡傛灉娌℃湁淇濆瓨鐨勫�硷紝浣跨敤绗竴涓�夐」
- //stationValue.value = stationOptions[0].value;
+ methods: {
+ toggleAssignStockColumn() {
+ const assignStockColumn = this.tableColumns.find(
+ (item) => item.prop === "assignStock"
+ );
+ if (assignStockColumn) {
+ // businessType涓�22鏃舵樉绀猴紝鍚﹀垯闅愯棌
+ assignStockColumn.hidden = this.mainBusinessType !=='22';
}
},
- methods: {
- // 鏍规嵁鐗╂枡缂栧彿銆佹壒娆°�佷緵搴斿晢鍒嗙粍鏁版嵁
- groupDataByMaterial() {
- const groups = {};
-
- this.tableData.forEach(item => {
- // 鏋勫缓鍒嗙粍閿紝鎵规鍜屼緵搴斿晢鍙互涓虹┖
- const groupKey = `${item.materielCode}_${item.batchNo || ''}_${item.supplyCode || ''}`;
-
- if (!groups[groupKey]) {
- // 鍒涘缓鏂板垎缁�
- groups[groupKey] = {
- materielCode: item.materielCode,
- materielName: item.materielName,
- batchNo: item.batchNo || '-',
- supplyCode: item.supplyCode || '-',
- orderQuantity: 0,
- lockQuantity: 0,
- overOutQuantity: 0,
- moveQty: 0,
- unit: item.unit,
- orderDetailStatus: item.orderDetailStatus,
- detailCount: 0,
- originalDetails: [] // 淇濆瓨鍘熷鏄庣粏鏁版嵁
- };
- }
-
- // 绱姞鏁伴噺
- groups[groupKey].orderQuantity += item.orderQuantity || 0;
- groups[groupKey].lockQuantity += item.lockQuantity || 0;
- groups[groupKey].overOutQuantity += item.overOutQuantity || 0;
- groups[groupKey].moveQty += item.moveQty || 0;
- groups[groupKey].detailCount += 1;
- groups[groupKey].originalDetails.push(item);
-
- // 濡傛灉鐘舵�佷笉鍚岋紝鍙互鐢ㄧ涓�涓姸鎬佹垨鐗规畩澶勭悊
- // 杩欓噷浣跨敤绗竴涓槑缁嗙殑鐘舵��
- });
-
- // 杞崲涓烘暟缁�
- this.groupedTableData = Object.values(groups);
-
- console.log('鍒嗙粍鍚庣殑鏁版嵁:', this.groupedTableData);
- },
-
open(row) {
this.row = row;
this.showDetialBox = true;
@@ -350,8 +334,8 @@
this.mainBusinessType = row.businessType;
this.getDictionaryData();
this.getData();
+ this.toggleAssignStockColumn();
},
-
getData() {
var wheres = [{ name: "orderId", value: this.row.id }];
var param = {
@@ -365,66 +349,25 @@
.post("api/OutboundOrderDetail/GetPageData", param, "鏌ヨ涓�")
.then((x) => {
this.tableData = x.rows;
- // 鍒嗙粍鏁版嵁
- this.groupDataByMaterial();
+ this.toggleAssignStockColumn(); // 鏁版嵁鍔犺浇鍚庨噸鏂扮‘璁ゅ垪鏄鹃殣
});
},
-
- // 閲嶇偣淇敼锛氬鐞嗘寚瀹氬簱瀛樼偣鍑讳簨浠� - 浼犻�掑畬鏁寸殑鍒嗙粍鏄庣粏淇℃伅
- handleAssignStock(row) {
- // 浼犻�掑畬鏁寸殑鍒嗙粍鏄庣粏鏁版嵁锛堝寘鍚墍鏈夊師濮嬫槑缁咺D鍜岀墿鏂欎俊鎭級
- if (row.originalDetails && row.originalDetails.length > 0) {
- this.$refs.child.open({
- // 鐗╂枡鍩烘湰淇℃伅锛堝彇绗竴涓槑缁嗙殑淇℃伅锛�
- materielCode: row.originalDetails[0].materielCode,
- materielName: row.originalDetails[0].materielName,
- // 鍒嗙粍鍚庣殑鎬婚渶姹傛暟閲�
- qty: row.orderQuantity,
- // 涓诲崟鎹紪鍙�
- upperOrderNo: this.row.upperOrderNo,
- // 鍏抽敭锛氬綋鍓嶅垎缁勭殑鎵�鏈夋槑缁咺D闆嗗悎
- detailIds: row.originalDetails.map(detail => detail.id),
- // 涓诲崟鎹甀D
- mainOrderId: this.row.id,
- // 瀹屾暣鍒嗙粍琛屼俊鎭紙澶囩敤锛�
- groupRow: row
- });
+ tableButtonClick(row, column) {
+ if (column.prop == "assignStock") {
+ this.$refs.child.open(row);
+ } else if (column.prop == "NoStockOut") {
+ this.$refs.NoStockOut.open(row);
} else {
- ElMessage.warning("璇ュ垎缁勬病鏈夋槑缁嗘暟鎹紝鏃犳硶鎸囧畾搴撳瓨");
+ this.$refs.selectedStock.open(row);
}
},
-
- handleViewDetail(row) {
- // 鏌ョ湅鍒嗙粍鏄庣粏鐨勮缁嗕俊鎭�
- if (row.originalDetails && row.originalDetails.length > 0) {
- // 杩欓噷鍙互鎵撳紑涓�涓柊鐨勫脊绐楁樉绀烘墍鏈夋槑缁嗭紝鎴栬�呬娇鐢ㄧ涓�涓槑缁�
- this.$refs.selectedStock.open(row.originalDetails[0]);
- }
- },
-
lockstocks() {
if (this.selection.length === 0) {
return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
}
-
- // 鑾峰彇鎵�鏈夐�変腑鍒嗙粍鐨勫師濮嬫槑缁咺D
- const detailIds = [];
- this.selection.forEach(group => {
- if (group.originalDetails && group.originalDetails.length > 0) {
- group.originalDetails.forEach(detail => {
- if (detail.id) {
- detailIds.push(detail.id);
- }
- });
- }
- });
-
- if (detailIds.length === 0) {
- return this.$message.error("娌℃湁鎵惧埌鍙攣瀹氱殑鏄庣粏");
- }
-
+ var keys = this.selection.map((item) => item.id);
this.http
- .post("api/OutboundOrderDetail/LockOutboundStocks", detailIds, "鏁版嵁澶勭悊涓�")
+ .post("api/OutboundOrderDetail/LockOutboundStocks", keys, "鏁版嵁澶勭悊涓�")
.then((x) => {
if (!x.status) return this.$message.error(x.message);
this.$message.success("鎿嶄綔鎴愬姛");
@@ -434,44 +377,22 @@
});
});
},
-
handleOpenPicking() {
this.$router.push({
path: "/outbound/picking",
query: { orderId: this.row.id, orderNo: this.row.orderNo },
});
},
-
handleOpenBatchPicking() {
this.$router.push({
path: "/outbound/batchpicking",
query: { orderId: this.row.id, orderNo: this.row.orderNo },
});
},
-
outbound() {
- const savedStation = stationManager.getStation();
- console.log(savedStation);
if (this.selection.length === 0) {
return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
}
-
- // 鑾峰彇鎵�鏈夐�変腑鍒嗙粍鐨勫師濮嬫槑缁咺D
- const detailIds = [];
- this.selection.forEach(group => {
- if (group.originalDetails && group.originalDetails.length > 0) {
- group.originalDetails.forEach(detail => {
- if (detail.id) {
- detailIds.push(detail.id);
- }
- });
- }
- });
-
- if (detailIds.length === 0) {
- return this.$message.error("娌℃湁鎵惧埌鍙嚭搴撶殑鏄庣粏");
- }
-
const platformOptions = [
{ label: "绔欏彴2", value: "2-1" },
{ label: "绔欏彴3", value: "3-1" },
@@ -483,9 +404,6 @@
selectedPlatform: platformOptions[0].value,
});
- if (savedStation) {
- formData.selectedPlatform = savedStation;
- }
const vnode = createVNode(
ElDialog,
{
@@ -530,7 +448,7 @@
},
}, [
h(ElSelect, {
- placeholder: "璇烽�夋嫨鍑哄簱绔欏彴",
+ placeholder: "璇烽�夋嫨鍑哄簱绔欏彴锛�3-12锛�",
modelValue: formData.selectedPlatform,
"onUpdate:modelValue": (val) => {
formData.selectedPlatform = val;
@@ -574,8 +492,9 @@
return;
}
+ const keys = this.selection.map((item) => item.id);
const requestParams = {
- taskIds: detailIds,
+ taskIds: keys,
outboundPlatform: formData.selectedPlatform,
};
@@ -612,26 +531,13 @@
vnode.appContext = this.$.appContext;
render(vnode, mountNode);
},
-
outboundbatch() {
- const savedStation = stationManager.getStation();
- console.log(savedStation);
if (this.selection.length === 0) {
return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
}
if (this.selection.length > 1) {
return this.$message.error("鍙兘閫夋嫨涓�鏉″崟鎹槑缁嗚繘琛屽垎鎵瑰嚭搴�");
}
-
- const selectedGroup = this.selection[0];
- if (!selectedGroup.originalDetails || selectedGroup.originalDetails.length === 0) {
- return this.$message.error("娌℃湁鎵惧埌鏄庣粏鏁版嵁");
- }
-
- // 鍒嗘壒鍑哄簱閫氬父閽堝鍗曚釜鏄庣粏
- // 杩欓噷浣跨敤绗竴涓槑缁�
- const selectedDetail = selectedGroup.originalDetails[0];
-
const platformOptions = [
{ label: "绔欏彴2", value: "2-1" },
{ label: "绔欏彴3", value: "3-1" },
@@ -643,9 +549,7 @@
selectedPlatform: platformOptions[0].value,
outboundDecimal: "",
});
- if (savedStation) {
- formData.selectedPlatform = savedStation;
- }
+
const vnode = createVNode(
ElDialog,
{
@@ -704,7 +608,7 @@
},
}, [
h(ElSelect, {
- placeholder: "璇烽�夋嫨鍑哄簱绔欏彴",
+ placeholder: "璇烽�夋嫨鍑哄簱绔欏彴锛�3-12锛�",
modelValue: formData.selectedPlatform,
"onUpdate:modelValue": (val) => {
formData.selectedPlatform = val;
@@ -742,7 +646,6 @@
step: "0.01",
precision: 2,
min: 0.01,
- max: selectedDetail.orderQuantity - selectedDetail.overOutQuantity - selectedDetail.lockQuantity - selectedDetail.moveQty,
}),
]),
h("div", {
@@ -774,8 +677,9 @@
return;
}
+ const keys = this.selection.map((item) => item.id);
const requestParams = {
- orderDetailId: selectedDetail.id,
+ orderDetailId: keys[0],
outboundPlatform: formData.selectedPlatform,
batchQuantity: formData.outboundDecimal,
};
@@ -810,52 +714,52 @@
}
);
- vnode.appContext = this.$appContext;
+ vnode.appContext = this.$.appContext;
render(vnode, mountNode);
},
-
setCurrent(row) {
this.$refs.singleTable.setCurrentRow(row);
},
-
handleCurrentChange(val) {
this.currentRow = val;
},
-
getButtonEnable(propName, row) {
if (propName == "assignStock") {
if (
row.orderDetailStatus !== 0 &&
- row.orderDetailStatus !== 70
+ row.orderDetailStatus !== 60 &&
+ row.orderDetailStatus !== 70 &&
+ row.orderDetailStatus !== 80
) {
- return false;
- } else {
return true;
+ } else {
+ return false;
}
}
return false;
},
-
parentCall(fun) {
if (typeof fun != "function") {
return console.log("鎵╁睍缁勪欢闇�瑕佷紶鍏ヤ竴涓洖璋冩柟娉曟墠鑳借幏鍙栫埗绾ue瀵硅薄");
}
fun(this);
},
-
handleRowClick(row) {
this.$refs.singleTable.toggleRowSelection(row);
},
-
handleSelectionChange(val) {
this.selection = val;
},
-
getDictionaryData() {
if (this.dictionaryList) {
return;
}
- var param = ["orderDetailStatusEnum"];
+ var param = [];
+ this.tableColumns.forEach((x) => {
+ if (x.type == "tag" && x.bindKey != "") {
+ param.push(x.bindKey);
+ }
+ });
this.http
.post("api/Sys_Dictionary/GetVueDictionary", param, "鏌ヨ涓�")
.then((x) => {
@@ -864,22 +768,21 @@
}
});
},
-
- getDictionaryForGroup(row) {
+ getDictionary(row, column) {
if (this.dictionaryList) {
- var item = this.dictionaryList.find((x) => x.dicNo == "orderDetailStatusEnum");
+ var item = this.dictionaryList.find((x) => x.dicNo == column.bindKey);
if (item) {
- var dicItem = item.data.find((x) => x.key == row.orderDetailStatus);
+ var dicItem = item.data.find((x) => x.key == row[column.prop]);
if (dicItem) {
return dicItem.value;
} else {
- return row.orderDetailStatus;
+ return row[column.prop];
}
} else {
- return row.orderDetailStatus;
+ return row[column.prop];
}
}
- return row.orderDetailStatus;
+ return row[column.prop];
},
},
};
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index 10582cf..c59e488 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -87,7 +87,7 @@
});
const searchFormOptions = ref([
[
- { title: "鎵弿鍗曟嵁缂栧彿鎴栨潯鐮�", field: "inboundOrderNo", type: "like" },
+ { title: "鎵弿鍗曟嵁鎴栨潯鐮�", field: "inboundOrderNo", type: "like" },
{ title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
title: "涓氬姟绫诲瀷",
--
Gitblit v1.9.3