From a7b15461d3dc6d07c18e065fa3a6acd234c2d7c8 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 09 十二月 2025 19:51:55 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue | 69 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 24 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
index 9fddac1..ccad4ca 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/Dt_AllocateOrder.vue"
@@ -1,6 +1,7 @@
<template>
<view-grid
- ref="gridRef"
+ ref="grid"
+ @openPalletDialog="handleOpenPalletDialog"
:columns="columns"
:detail="detail"
:editFormFields="editFormFields"
@@ -11,30 +12,36 @@
:extend="extend"
>
</view-grid>
+ <!-- 2. 缁勭洏寮圭獥锛氱‘淇漰rops鍜屼簨浠剁粦瀹氭纭� -->
+ <PalletDialog
+ v-model:visible="palletVisible"
+ :docNo="currentPalletDocNo"
+ @back-success="handlePalletBackSuccess"
+ ></PalletDialog>
+
</template>
-
-<script>
-import extend from "@/extension/inbound/Dt_AllocateOrder.js";
-import ViewGrid from '@/components/basic/ViewGrid/ViewGrid.vue';
+ <script>
+import extend from "@/extension/inbound/Dt_AllocateOrder.js";
+import ViewGrid from '@/components/basic/ViewGrid/ViewGrid.vue';
import { ref, defineComponent } from "vue";
-
+import PalletDialog from "@/extension/inbound/extend/AllocatedPallet.vue";
export default defineComponent({
- components: {
- viewGrid: ViewGrid,
- PalletDialog
+ components: {
+ // 鍏抽敭淇2锛氱粍浠舵敞鍐屽悕涓庢ā鏉挎爣绛惧悕閫傞厤锛坘ebab-case瀵瑰簲view-grid锛�
+ viewGrid: ViewGrid, // 娉ㄥ唽涓簁ebab-case锛屾ā鏉跨敤<view-grid>
+ PalletDialog // 娉ㄥ唽缁勭洏寮圭獥
+
},
setup() {
- // 琛ㄦ牸鍩虹閰嶇疆锛氬榻愯皟鎷ㄥ崟瀹炰綋
const table = ref({
key: "id",
footer: "Foots",
cnName: "璋冩嫧鍗�",
- name: "allocateOrder",
- url: "/allocateOrder/", // 鍚庣鎺ュ彛璺緞闇�涓庤皟鎷ㄥ崟鎺ュ彛鍖归厤
+ name: "AllocateOrder",
+ url: "/AllocateOrder/",
sortName: "id",
});
- // 缂栬緫琛ㄥ崟瀛楁锛氬搴擠t_AllocateOrder鍙紪杈戝睘鎬�
const editFormFields = ref({
orderNo: "",
upperOrderNo: "",
@@ -48,7 +55,6 @@
remark: "",
});
- // 缂栬緫琛ㄥ崟閰嶇疆锛氭寜瀹炰綋瀛楁绫诲瀷璁剧疆缁勪欢
const editFormOptions = ref([
[
{
@@ -72,7 +78,7 @@
title: "璁㈠崟绫诲瀷",
field: "orderType",
type: "select",
- dataKey: "allocateOrderType", // 璋冩嫧鍗曚笓灞炴灇涓緆ey
+ dataKey: "allocateOrderType",
data: [],
required: true,
},
@@ -88,7 +94,7 @@
title: "鏉ユ簮浠撳簱",
field: "fromWarehouse",
type: "select",
- dataKey: "warehouses", // 浠撳簱鏋氫妇key锛堝鐢ㄦ垨鍗曠嫭閰嶇疆锛�
+ dataKey: "warehouses",
data: [],
required: true,
},
@@ -121,7 +127,7 @@
],
]);
- // 鎼滅储琛ㄥ崟瀛楁锛氬搴擠t_AllocateOrder鏌ヨ灞炴��
+
const searchFormFields = ref({
orderNo: "",
upperOrderNo: "",
@@ -137,7 +143,7 @@
createDate: "",
});
- // 鎼滅储琛ㄥ崟閰嶇疆锛氭寜鏌ヨ闇�姹傝缃瓧娈电被鍨�
+
const searchFormOptions = ref([
[
{ title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
@@ -179,7 +185,7 @@
],
]);
- // 涓昏〃鏍煎垪閰嶇疆锛氬畬鍏ㄥ榻怐t_AllocateOrder瀛楁
+
const columns = ref([
{
field: "id",
@@ -196,7 +202,6 @@
type: "string",
width: 120,
align: "left",
- link: true,
},
{
field: "upperOrderNo",
@@ -338,11 +343,11 @@
width: 150,
align: "left",
required: true,
- dataKey: "materielCodes", // 鐗╂枡缂栫爜鏋氫妇key
+ dataKey: "materielCodes",
data: [],
},
{
- field: "materielName", // 瀹炰綋涓棤璇ュ瓧娈碉紝闇�鍚庣鍏宠仈杩斿洖鎴栬皟鏁翠负bind鏄犲皠
+ field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
width: 100,
@@ -458,6 +463,21 @@
key: "id",
});
+ // 6. 缁勭洏寮圭獥鑱斿姩锛堟墍鏈夊彉閲忓繀椤昏繑鍥烇級
+ const palletVisible = ref(false);
+ const currentPalletDocNo = ref("");
+
+ const handleOpenPalletDialog = (docNo) => {
+ console.log('涓荤粍浠舵敹鍒扮粍鐩樹簨浠讹紝鍗曟嵁鍙凤細', docNo);
+ currentPalletDocNo.value = docNo;
+ palletVisible.value = true;
+ };
+
+ const handlePalletBackSuccess = () => {
+ console.log('缁勭洏鍥炰紶鎴愬姛锛屽埛鏂拌〃鏍�');
+ grid.value?.refresh(); // 姝ゆ椂gridRef宸叉寕杞斤紝鍙皟鐢ㄦ柟娉�
+ };
+
return {
table,
extend,
@@ -467,11 +487,12 @@
searchFormOptions,
columns,
detail,
+ // 缁勭洏寮圭獥鐩稿叧
+ PalletDialog, // 寮圭獥缁勪欢锛堟棤闇�杩斿洖锛屾敞鍐屽嵆鍙紝浣嗗彉閲忛渶杩斿洖锛�
palletVisible,
currentPalletDocNo,
handleOpenPalletDialog,
- handlePalletBackSuccess,
- gridRef
+ handlePalletBackSuccess
};
},
});
--
Gitblit v1.9.3