From 266e4bf654c55ce2f7e9271048e4625f1b8b49f6 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 29 十二月 2025 14:36:08 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 84 +++++++++++++++--------------------------
1 files changed, 31 insertions(+), 53 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index c59e488..27b4795 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -1,38 +1,14 @@
<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>
-
</template>
- <script>
+<script>
import extend from "@/extension/inbound/inboundOrder.js";
-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: {
- // 鍏抽敭淇2锛氱粍浠舵敞鍐屽悕涓庢ā鏉挎爣绛惧悕閫傞厤锛坘ebab-case瀵瑰簲view-grid锛�
- viewGrid: ViewGrid, // 娉ㄥ唽涓簁ebab-case锛屾ā鏉跨敤<view-grid>
- PalletDialog // 娉ㄥ唽缁勭洏寮圭獥
-
- },
setup() {
const table = ref({
key: "id",
@@ -57,7 +33,7 @@
type: "select",
dataKey: "inOrderType",
data: [],
- hidden:true
+ hidden: true
},
{
field: "inboundOrderNo",
@@ -149,7 +125,7 @@
width: 150,
align: "left",
bind: { key: "inOrderType", data: [] },
- hidden:true
+ hidden: true
},
{
field: "businessType",
@@ -193,7 +169,7 @@
field: "returnToMESStatus",
title: "鍥炰紶MES鐘舵��",
width: 120,
- bind: { key: "createType", data:[{key:0, value:"鏈洖浼�"},{key:1, value:"宸插洖浼犳垚鍔�"},{key:2, value:"鍥炰紶澶辫触"}]},
+ bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] },
},
{
field: "factoryArea",
@@ -263,12 +239,12 @@
required: true,
},
{
- field: "materielCode",
+ field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 120,
+ width: 150,
align: "left",
- bind: { key: "MaterielNames", data: [] },
+ bind: { key: "materielInfo", data: [] },
},
{
field: "batchNo",
@@ -329,6 +305,13 @@
align: "left",
},
{
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
field: "orderDetailStatus",
title: "璁㈠崟鏄庣粏鐘舵��",
type: "string",
@@ -336,6 +319,14 @@
align: "left",
bind: { key: "orderDetailStatusEnum", data: [] },
},
+ // {
+ // field: "returnToMESStatus",
+ // title: "鍥炰紶鐘舵��",
+ // type: "string",
+ // width: 90,
+ // align: "left",
+ // bind: { key: "returnStatus", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] }
+ // },
{
field: "creater",
title: "鍒涘缓浜�",
@@ -375,20 +366,7 @@
sortName: "id",
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,
@@ -399,12 +377,12 @@
searchFormOptions,
columns,
detail,
- // 缁勭洏寮圭獥鐩稿叧
- PalletDialog, // 寮圭獥缁勪欢锛堟棤闇�杩斿洖锛屾敞鍐屽嵆鍙紝浣嗗彉閲忛渶杩斿洖锛�
- palletVisible,
- currentPalletDocNo,
- handleOpenPalletDialog,
- handlePalletBackSuccess
+ // // 缁勭洏寮圭獥鐩稿叧
+ // PalletDialog, // 寮圭獥缁勪欢锛堟棤闇�杩斿洖锛屾敞鍐屽嵆鍙紝浣嗗彉閲忛渶杩斿洖锛�
+ // palletVisible,
+ // currentPalletDocNo,
+ // handleOpenPalletDialog,
+ // handlePalletBackSuccess
};
},
});
--
Gitblit v1.9.3