From 02b446aa2aa0c6afc1a0744ea9620273e2da9114 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期一, 01 十二月 2025 15:19:33 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
index 6183f76..f9549a1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
@@ -5,10 +5,11 @@
import { ElDialog, ElForm, ElFormItem, ElInput, ElButton, ElMessage, ElSelect, ElOption } from 'element-plus';
import gridBody from './extend/outOrderDetail.vue'
+import gridHeader from './extend/NoStockOut.vue'
let extension = {
components: {
//鏌ヨ鐣岄潰鎵╁睍缁勪欢
- gridHeader: '',
+ gridHeader: gridHeader,
gridBody: gridBody,
gridFooter: '',
//鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
@@ -326,6 +327,43 @@
this.$refs.gridBody.open(row);
}
});
+ let BatchOrderFeedbackToMesBtn = this.buttons.find(x => x.value == 'BatchOrderFeedbackToMes');
+ if (BatchOrderFeedbackToMesBtn) {
+ const _this = this;
+ BatchOrderFeedbackToMesBtn.onClick = function () {
+ let selectedRows = _this.$refs.table.getSelected();
+
+ // 鏍￠獙鏄惁鏈夐�変腑鏁版嵁
+ if (!selectedRows || selectedRows.length === 0) {
+ return _this.$Message.warning('璇峰厛閫夋嫨闇�瑕佸鐞嗙殑鍗曟嵁');
+ }
+ const requestParams = {
+ orderNos: selectedRows.map(row => row.orderNo),
+ inout: 2
+ };
+ _this.http
+ .post("api/InboundOrder/BatchOrderFeedbackToMes", requestParams, "鏁版嵁澶勭悊涓�...")
+ .then((x) => {
+ if (x.status) {
+ _this.$Message.success('鍒嗘嫞鍑哄簱鍥炶皟瀹屾垚');
+ _this.refresh();
+ } else {
+ return _this.$Message.error(x.message);
+ }
+ })
+ .catch((error) => {
+ // 澧炲姞寮傚父鎹曡幏锛屽鐞嗙綉缁滈敊璇瓑鎯呭喌
+ _this.$Message.error('璇锋眰澶辫触锛�' + (error.message || '鏈煡閿欒'));
+ });
+ };
+ }
+ let TaskHandCompletedBtn = this.buttons.find(x => x.value == 'NoStockOut');
+ if (TaskHandCompletedBtn) {
+ TaskHandCompletedBtn.onClick = function () {
+ this.$refs.gridHeader.open();
+ }
+ }
+
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
@@ -335,15 +373,16 @@
searchBefore(param) {
//鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
//杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
-
- let wheres = [{
- 'name': 'orderType',
- 'value': '0',
- 'displayType': 'text'}];
-
- param.wheres.push(...wheres);
- return true;
+ let wheres = [{
+ 'name': 'orderType',
+ 'value': '0',
+ 'displayType': 'text'
+ }];
+
+
+ param.wheres.push(...wheres);
+ return true;
return true;
},
--
Gitblit v1.9.3