From 65f35360c70f00318c56f6fcb5138bdb0d7e589e Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 24 十一月 2025 08:41:39 +0800
Subject: [PATCH] 提交
---
项目代码/WIDESEA_WMSClient/src/views/outbound/PickingConfirm.vue | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/PickingConfirm.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/PickingConfirm.vue"
index a1be799..b3adcc0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/PickingConfirm.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/outbound/PickingConfirm.vue"
@@ -26,11 +26,11 @@
@keyup.enter.native="onBarcodeScan">
</el-input>
<el-button type="success" @click="confirmPicking">纭鎷ｉ��</el-button>
- <el-button type="warning" @click="openSplitDialog">鎷嗗寘</el-button>
- <el-button type="info" @click="openRevertSplitDialog">鎾ら攢鎷嗗寘</el-button>
+ <!-- <el-button type="warning" @click="openSplitDialog">鎷嗗寘</el-button>
+ <el-button type="info" @click="openRevertSplitDialog">鎾ら攢鎷嗗寘</el-button> -->
<el-button type="primary" @click="openBatchReturnDialog">鍥炲簱</el-button>
- <el-button type="danger" @click="handleDirectOutbound">鐩存帴鍑哄簱</el-button>
+ <!-- <el-button type="danger" @click="handleDirectOutbound">鐩存帴鍑哄簱</el-button> -->
</div>
</el-card>
@@ -42,7 +42,7 @@
<div class="summary-info">
<el-tag type="warning">鏈嫞閫夋潯鏁�: {{summary.unpickedCount}}</el-tag>
<el-tag type="danger">鏈嫞閫夋暟閲�: {{summary.unpickedQuantity}}</el-tag>
- <el-tag type="success">宸叉嫞閫夋潯鏁�: {{summary.pickedCount}}</el-tag>
+ <!-- <el-tag type="success">宸叉嫞閫夋潯鏁�: {{summary.pickedCount}}</el-tag> -->
<el-tag type="info">鎵樼洏鐘舵��: {{palletStatus}}</el-tag>
</div>
</el-card>
@@ -291,6 +291,7 @@
</div>
</div>
</div>
+ <print-view ref="childs" @parentcall="parentcall"></print-view>
</template>
<script>
@@ -298,12 +299,11 @@
import { ref, defineComponent } from "vue";
import { ElMessage } from 'element-plus'
import { useRoute } from 'vue-router'
+import printView from "@/extension/outbound/extend/printView.vue"
export default defineComponent({
name: 'PickingConfirm',
- components: {
-
- },
+ components: {printView},
props: {
orderNo: {
type: String,
@@ -552,7 +552,7 @@
}
},
- // 鎵归噺鍥炲簱鎵樼洏鐮佹壂鐮�
+ // 鍥炲簱鎵樼洏鐮佹壂鐮�
onBatchReturnPalletScan() {
if (!this.batchReturnForm.palletCode) return;
@@ -564,7 +564,7 @@
}
},
- // 鎵归噺鍥炲簱纭
+ // 鍥炲簱纭
async handleBatchReturnConfirm() {
// 琛ㄥ崟楠岃瘉
if (this.$refs.batchReturnFormRef) {
@@ -587,25 +587,25 @@
}
},
- // 鎻愪氦鎵归噺鍥炲簱璇锋眰
+ // 鎻愪氦鍥炲簱璇锋眰
async submitBatchReturn() {
this.batchReturnLoading = true;
try {
- const res = await this.http.post('/api/OutboundPicking/batch-return-to-stock', {
+ const res = await this.http.post('/api/OutboundPicking/return-to-stock', {
orderNo: this.batchReturnForm.orderNo,
palletCode: this.batchReturnForm.palletCode
});
if (res.status) {
- this.$message.success('鎵归噺鍥炲簱鎴愬姛');
+ this.$message.success(res.message);
this.showBatchReturnDialog = false;
this.loadData();
} else {
- this.$message.error(res.message || '鎵归噺鍥炲簱澶辫触');
+ this.$message.error(res.message || '鍥炲簱澶辫触');
}
} catch (error) {
- this.$message.error('鎵归噺鍥炲簱澶辫触');
+ this.$message.error('鍥炲簱澶辫触');
} finally {
this.batchReturnLoading = false;
}
@@ -844,7 +844,12 @@
this.$message.success('鎷ｉ�夌‘璁ゆ垚鍔�');
this.scanData.barcode = ''; // 娓呯┖鐗╂枡鏉＄爜
this.loadData();
-
+ console.log(res.data.splitResults)
+ if(res.data && res.data.splitResults.length>0){
+ // 璋冪敤瀛愮粍浠舵墦鍗版柟娉�
+ this.$refs.childs.open(res.data.splitResults);
+ //this.$refs.childs.printSplitLabel(res.data.splitResults);
+ }
// 鎴愬姛鍚庣户缁仛鐒﹀埌鐗╂枡鏉＄爜杈撳叆妗嗭紝鍑嗗涓嬩竴涓壂鐮�
this.$nextTick(() => {
this.$refs.barcodeInput.focus();
@@ -979,7 +984,7 @@
barcode: this.returnForm.barcode
});
- if (res.success) {
+ if (res.status) {
this.$message.success('鍥炲簱鎴愬姛');
this.showReturnDialog = false;
this.resetReturnForm();
@@ -1068,12 +1073,15 @@
if (res.status) {
this.$message.success('鎷嗗寘鎴愬姛');
this.showSplitDialog = false;
+ this.splitLoading = false;
this.resetSplitForm();
this.loadData();
} else {
+ this.splitLoading = false;
this.$message.error(res.message || '鎷嗗寘澶辫触');
}
} catch (error) {
+ this.splitLoading = false;
this.$message.error('鎷嗗寘澶辫触');
}
},
@@ -1121,12 +1129,15 @@
if (res.status) {
this.$message.success('鎾ら攢鎷嗗寘鎴愬姛');
this.showRevertSplitDialog = false;
+ this.revertSplitLoading = false;
this.revertSplitForm.originalBarcode = '';
this.loadData();
} else {
+ this.revertSplitLoading = false;
this.$message.error(res.message || '鎾ら攢鎷嗗寘澶辫触');
}
} catch (error) {
+ this.revertSplitLoading = false;
this.$message.error('鎾ら攢鎷嗗寘澶辫触');
}
},
--
Gitblit v1.9.3