From 07871b95890e567943ef13dfcd848488e5163cd7 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期三, 17 十二月 2025 21:33:58 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue | 165 ++++++++++++++-----------------------------------------
1 files changed, 42 insertions(+), 123 deletions(-)
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 1c48097..7ee6b4a 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"
@@ -1,12 +1,6 @@
<template>
<div>
- <vol-box
- v-model="showDetialBox"
- :lazy="true"
- width="75%"
- :padding="15"
- title="鍗曟嵁鏄庣粏淇℃伅"
- >
+ <vol-box v-model="showDetialBox" :lazy="true" width="75%" :padding="15" title="鍗曟嵁鏄庣粏淇℃伅">
<div class="box-head">
<el-alert :closable="false" style="width: 100%">
<el-row>
@@ -14,89 +8,33 @@
<span>宸查�変腑 {{ selection.length }} 椤�</span>
</el-col>
<el-col :span="8">
- <el-link
- type="primary"
- size="small"
- v-if="isBatch === 0"
- style="float: right; height: 20px"
- @click="handleOpenPicking"
- >鎷ｉ��</el-link
- >
- <el-link
- type="primary"
- size="small"
- style="float: right; height: 20px; margin-right: 10px"
- v-if="isBatch === 1"
- @click="handleOpenBatchPicking"
- >鍒嗘壒鎷ｉ��</el-link
- >
- <el-link
- type="primary"
- size="small"
- v-if="isBatch === 0"
- style="float: right; height: 20px; margin-right: 10px"
- @click="outbound"
- >鐩存帴鍑哄簱</el-link
- >
- <el-link
- type="primary"
- size="small"
- v-if="isBatch === 1"
- style="float: right; height: 20px; margin-right: 10px"
- @click="outboundbatch"
- >鍒嗘壒鍑哄簱</el-link
- >
- <el-link
- type="primary"
- size="small"
- style="float: right; height: 20px; margin-right: 10px"
- @click="getData"
- >鍒锋柊</el-link
- >
+ <el-link type="primary" size="small" v-if="isBatch === 0" style="float: right; height: 20px"
+ @click="handleOpenPicking">鎷ｉ��</el-link>
+ <el-link type="primary" size="small" style="float: right; height: 20px; margin-right: 10px"
+ v-if="isBatch === 1" @click="handleOpenBatchPicking">鍒嗘壒鎷ｉ��</el-link>
+ <el-link type="primary" size="small" v-if="isBatch === 0"
+ style="float: right; height: 20px; margin-right: 10px" @click="outbound">鐩存帴鍑哄簱</el-link>
+ <el-link type="primary" size="small" v-if="isBatch === 1"
+ style="float: right; height: 20px; margin-right: 10px" @click="outboundbatch">鍒嗘壒鍑哄簱</el-link>
+ <el-link type="primary" size="small" style="float: right; height: 20px; margin-right: 10px"
+ @click="getData">鍒锋柊</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
- @current-change="handleCurrentChange"
- height="500px"
- @row-click="handleRowClick"
- @selection-change="handleSelectionChange"
- >
+ <el-table ref="singleTable" :data="tableData" style="width: 100%; height: 100%" highlight-current-row
+ @current-change="handleCurrentChange" height="500px" @row-click="handleRowClick"
+ @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">
<div v-if="item.type == 'icon'">
- <el-tooltip
- class="item"
- effect="dark"
- :content="item.title"
- placement="bottom"
- >
- <el-link
- type="primary"
- :disabled="getButtonEnable(item.prop, scoped.row)"
- @click="tableButtonClick(scoped.row, item)"
- >
+ <el-tooltip class="item" effect="dark" :content="item.title" placement="bottom">
+ <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>
@@ -115,10 +53,7 @@
</div>
</vol-box>
<stock-select ref="child" @parentCall="parentCall"></stock-select>
- <selected-stock
- ref="selectedStock"
- @parentCall="parentCall"
- ></selected-stock>
+ <selected-stock ref="selectedStock" @parentCall="parentCall"></selected-stock>
<NoStockOut ref="NoStockOut" @parentCall="parentCall"></NoStockOut>
</div>
</template>
@@ -129,7 +64,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,
@@ -317,17 +251,6 @@
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(
@@ -335,7 +258,7 @@
);
if (assignStockColumn) {
// businessType涓�22鏃舵樉绀猴紝鍚﹀垯闅愯棌
- assignStockColumn.hidden = this.mainBusinessType !=='22';
+ assignStockColumn.hidden = this.mainBusinessType !== '22';
}
},
open(row) {
@@ -391,19 +314,17 @@
},
handleOpenPicking() {
this.$router.push({
- path: "/outbound/picking",
+ path: "/outbound/outPicking",
query: { orderId: this.row.id, orderNo: this.row.orderNo },
});
},
handleOpenBatchPicking() {
this.$router.push({
- path: "/outbound/batchpicking",
+ path: "/outbound/outPicking",
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("璇烽�夋嫨鍗曟嵁鏄庣粏");
}
@@ -418,9 +339,6 @@
selectedPlatform: platformOptions[0].value,
});
- if (savedStation) {
- formData.selectedPlatform = savedStation;
- }
const vnode = createVNode(
ElDialog,
{
@@ -511,13 +429,16 @@
const keys = this.selection.map((item) => item.id);
const requestParams = {
- taskIds: keys,
- outboundPlatform: formData.selectedPlatform,
+ detailIds: keys,
+ outboundTargetLocation: formData.selectedPlatform,
+ outboundQuantity: 1,
+ operator: "",
+ orderNo: this.row.orderNo,
};
this.http
.post(
- "api/Task/GenerateOutboundTasks",
+ "api/Outbound/ProcessPickingOutbound",
requestParams,
"鏁版嵁澶勭悊涓�"
)
@@ -531,9 +452,9 @@
render(null, mountNode);
document.body.removeChild(mountNode);
})
- .catch(() => {
- ElMessage.error("璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯");
- });
+ // .catch(() => {
+ // ElMessage.error("璇锋眰澶辫触锛岃绋嶅悗閲嶈瘯");
+ // });
},
style: {
borderRadius: "4px",
@@ -549,8 +470,6 @@
render(vnode, mountNode);
},
outboundbatch() {
- const savedStation = stationManager.getStation();
- console.log(savedStation);
if (this.selection.length === 0) {
return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
}
@@ -568,9 +487,7 @@
selectedPlatform: platformOptions[0].value,
outboundDecimal: "",
});
- if (savedStation) {
- formData.selectedPlatform = savedStation;
- }
+
const vnode = createVNode(
ElDialog,
{
@@ -700,14 +617,16 @@
const keys = this.selection.map((item) => item.id);
const requestParams = {
- orderDetailId: keys[0],
- outboundPlatform: formData.selectedPlatform,
- batchQuantity: formData.outboundDecimal,
+ detailIds: keys,
+ outboundTargetLocation: formData.selectedPlatform,
+ outboundQuantity: formData.outboundDecimal,
+ operator: "",
+ orderNo: this.row.orderNo,
};
this.http
.post(
- "api/Task/GenerateOutboundBatchTasks",
+ "api/Outbound/ProcessPickingOutbound",
requestParams,
"鏁版嵁澶勭悊涓�"
)
@@ -824,11 +743,11 @@
background: oldlace;
}
-.box-table .el-table tbody tr:hover > td {
+.box-table .el-table tbody tr:hover>td {
background-color: #d8e0d4 !important;
}
-.box-table .el-table tbody tr.current-row > td {
+.box-table .el-table tbody tr.current-row>td {
background-color: #f0f9eb !important;
}
--
Gitblit v1.9.3