From d741e7a7ad7de5045e5c6b6145d9da1783cadecd Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 13 一月 2026 09:55:03 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/takeStockOrder.js | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/takeStockOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/takeStockOrder.js"
index cae7d0a..3f11655 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/takeStockOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/takeStockOrder.js"
@@ -1,12 +1,14 @@
// 鑷畾涔夋墿灞曚笟鍔′唬鐮�
import gridBody from "./extend/OrderStockTake.vue";
+import gridHeader from "./extend/TakeStockSelect.vue";
+import gridFooter from "./extend/StockTakeGroupPallet.vue";
let extension = {
components: {
// 鏌ヨ鐣岄潰鎵╁睍缁勪欢锛氬皢鑷畾涔夊脊绐楁敞鍐屼负 gridBody 缁勪欢
- gridHeader: '',
+ gridHeader: gridHeader,
gridBody: gridBody, // 瀵瑰簲浣犵殑鐩樼偣寮圭獥缁勪欢
- gridFooter: '',
+ gridFooter: gridFooter,
// 鏂板缓/缂栬緫寮瑰嚭妗嗘墿灞曠粍浠讹紙姝ゅ涓嶇敤锛岀暀绌猴級
modelHeader: '',
modelBody: '',
@@ -16,21 +18,27 @@
buttons: { view: [], box: [], detail: [] }, // 鎵╁睍鎸夐挳锛堝闇�棰濆娣诲姞鍙湪姝ら厤缃級
methods: {
onInit() {
- // 鎵惧埌 value 涓� "OrderStockTake" 鐨勬寜閽紙闇�鍦ㄦ鏋朵腑鎻愬墠閰嶇疆璇ユ寜閽級
let OrderStockTakeBtn = this.buttons.find(x => x.value === 'OrderStockTake');
if (OrderStockTakeBtn) {
// 閲嶅啓鎸夐挳鐐瑰嚮浜嬩欢
OrderStockTakeBtn.onClick = function () {
- // 1. 鑾峰彇琛ㄦ牸閫変腑琛屾暟鎹�
- let rows = this.$refs.table.getSelected();
- if (rows.length === 0) return this.$error("璇烽�夋嫨涓�鏉＄洏鐐瑰崟鎹暟鎹紒");
- if (rows.length > 1) return this.$error("鍙兘閫夋嫨涓�鏉＄洏鐐瑰崟鎹暟鎹紒");
-
- const selectedReceiptNo = rows[0].orderNo;
- if (!selectedReceiptNo) return this.$error("閫変腑鐨勫崟鎹己灏戞湁鏁堢殑鍗曟嵁鍙凤紒");
+ this.$refs.gridBody.open();
+ };
+ }
+ let OutOrderStockTakeBtn = this.buttons.find(x => x.value === 'OutOrderStockTake');
+ if (OutOrderStockTakeBtn) {
+ // 閲嶅啓鎸夐挳鐐瑰嚮浜嬩欢
+ OutOrderStockTakeBtn.onClick = function () {
- // 3. 璋冪敤鑷畾涔夊脊绐楃殑 open 鏂规硶锛屽苟浼犻�掑崟鎹彿锛堟牳蹇冿細缁欏脊绐椾紶鍙傦級
- this.$refs.gridBody.open(selectedReceiptNo);
+ this.$refs.gridHeader.open();
+ };
+ }
+ let StockTakeGroupPalletBtn = this.buttons.find(x => x.value === 'StockTakeGroupPallet');
+ if (StockTakeGroupPalletBtn) {
+ // 閲嶅啓鎸夐挳鐐瑰嚮浜嬩欢
+ StockTakeGroupPalletBtn.onClick = function () {
+
+ this.$refs.gridFooter.open();
};
}
--
Gitblit v1.9.3