From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue | 76 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 33 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
index 7015bbe..583abee 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
@@ -1,37 +1,24 @@
<template>
- <view-grid
- ref="grid"
- @openPalletDialog="handleOpenPalletDialog"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :extend="extend"
- >
+ <view-grid ref="grid" @openPalletDialog="handleOpenPalletDialog" :columns="columns" :detail="detail"
+ :editFormFields="editFormFields" :editFormOptions="editFormOptions" :searchFormFields="searchFormFields"
+ :searchFormOptions="searchFormOptions" :table="table" :extend="extend">
</view-grid>
- <!-- 2. 缁勭洏寮圭獥锛氱‘淇漰rops鍜屼簨浠剁粦瀹氭纭� -->
- <PalletDialog
- v-model:visible="palletVisible"
- :docNo="currentPalletDocNo"
- @back-success="handlePalletBackSuccess"
- ></PalletDialog>
-
+ <!-- 2. 缁勭洏寮圭獥锛氱‘淇漰rops鍜屼簨浠剁粦瀹氭纭� -->
+ <PalletDialog v-model:visible="palletVisible" :docNo="currentPalletDocNo" @back-success="handlePalletBackSuccess">
+ </PalletDialog>
</template>
- <script>
+<script>
import extend from "@/extension/inbound/allocateinboundOrder.js";
-import ViewGrid from '@/components/basic/ViewGrid/ViewGrid.vue';
+import ViewGrid from '@/components/basic/ViewGrid/ViewGrid.vue';
import { ref, defineComponent } from "vue";
import PalletDialog from "@/extension/inbound/extend/Pallet.vue";
export default defineComponent({
- components: {
+ components: {
// 鍏抽敭淇2锛氱粍浠舵敞鍐屽悕涓庢ā鏉挎爣绛惧悕閫傞厤锛坘ebab-case瀵瑰簲view-grid锛�
viewGrid: ViewGrid, // 娉ㄥ唽涓簁ebab-case锛屾ā鏉跨敤<view-grid>
PalletDialog // 娉ㄥ唽缁勭洏寮圭獥
-
+
},
setup() {
const table = ref({
@@ -86,8 +73,7 @@
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
- { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
+ { title: "璇锋壂鎻忓崟鎹垨鏉＄爜", field: "orderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
field: "orderType",
@@ -105,14 +91,17 @@
],
[
{
- title: "鍒涘缓鏂瑰紡",
- field: "createType",
+ title: "鍥炰紶MES鐘舵��",
+ field: "returnToMESStatus",
type: "select",
- dataKey: "createType",
+ dataKey: "outboundReturnToMESStatus",
data: [],
},
- { title: "鍒涘缓鑰�", field: "creater", type: "like" },
+ { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ [
+ { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
],
]);
const columns = ref([
@@ -156,6 +145,7 @@
width: 150,
align: "left",
bind: { key: "businessType", data: [] },
+ hidden: true,
},
{
field: "orderStatus",
@@ -193,6 +183,11 @@
type: "string",
width: 120,
align: "left"
+ },{
+ field: "returnToMESStatus",
+ title: "鍥炰紶MES鐘舵��",
+ width: 120,
+ bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 3, value: "閮ㄥ垎鍥炰紶鎴愬姛" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" },{ key: 5, value: "鏃犻渶鍥炰紶" }] },
},
{
field: "creater",
@@ -262,12 +257,12 @@
required: true,
},
{
- field: "materielCode",
+ field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
width: 100,
align: "left",
- bind: { key: "MaterielNames", data: [] },
+ bind: { key: "materielInfo", data: [] },
},
{
field: "batchNo",
@@ -305,6 +300,14 @@
required: true,
},
{
+ field: "outBoxbarcodes",
+ title: "澶栫鏉＄爜",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ required: true,
+ },
+ {
field: "orderQuantity",
title: "鍗曟嵁鏁伴噺",
type: "decimal",
@@ -334,6 +337,13 @@
width: 180,
align: "left",
bind: { key: "orderDetailStatusEnum", data: [] },
+ },
+ {
+ field: "pallet",
+ title: "宸茬粍鎵樼洏鍙�",
+ type: "string",
+ width: 180,
+ align: "left",
},
{
field: "creater",
@@ -374,7 +384,7 @@
sortName: "id",
key: "id",
});
- // 6. 缁勭洏寮圭獥鑱斿姩锛堟墍鏈夊彉閲忓繀椤昏繑鍥烇級
+ // 6. 缁勭洏寮圭獥鑱斿姩锛堟墍鏈夊彉閲忓繀椤昏繑鍥烇級
const palletVisible = ref(false);
const currentPalletDocNo = ref("");
@@ -398,7 +408,7 @@
searchFormOptions,
columns,
detail,
- // 缁勭洏寮圭獥鐩稿叧
+ // 缁勭洏寮圭獥鐩稿叧
PalletDialog, // 寮圭獥缁勪欢锛堟棤闇�杩斿洖锛屾敞鍐屽嵆鍙紝浣嗗彉閲忛渶杩斿洖锛�
palletVisible,
currentPalletDocNo,
--
Gitblit v1.9.3