From 56538e602b927c232ac5b991ef84175edd2ce3ce Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期五, 24 四月 2026 14:20:20 +0800
Subject: [PATCH] feat(WMS/WCS): 增加机器人历史信息记录 fix(WMS/WCS): 修复前端bug
---
Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 57 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
index 96fae1f..789e395 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
@@ -1,21 +1,12 @@
<template>
- <view-grid
- ref="grid"
- :columns="columns"
- :detail="detail"
- :editFormFields="editFormFields"
- :editFormOptions="editFormOptions"
- :searchFormFields="searchFormFields"
- :searchFormOptions="searchFormOptions"
- :table="table"
- :tableExpand="tableExpand"
- :extend="extend"
- >
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :tableExpand="tableExpand" :extend="extend">
</view-grid>
</template>
<script>
-import extend from "@/extension/stock/stockInfo.js";
+import extend from "@/extension/stock/stockInfo.jsx";
import {
defineComponent,
getCurrentInstance,
@@ -28,7 +19,9 @@
const TEXT = {
pageName: "搴撳瓨淇℃伅",
palletCode: "鎵樼洏缂栧彿",
+ stockStatus: "搴撳瓨鐘舵��",
locationCode: "璐т綅缂栧彿",
+ outboundDate: "鍑哄簱鏃堕棿",
warehouse: "浠撳簱",
creator: "鍒涘缓浜�",
createDate: "鍒涘缓鏃堕棿",
@@ -65,24 +58,33 @@
const editFormFields = ref({
palletCode: "",
+ palletType: 0,
+ warehouseId: 0,
+ mesUploadStatus: "",
+ stockStatus: "",
locationCode: "",
+ locationDetails: ""
});
+
const editFormOptions = ref([
[
{ field: "palletCode", title: TEXT.palletCode, type: "string" },
+ { field: "stockStatus", title: TEXT.stockStatus, type: "select", dataKey: "stockStatusEmun", data: [] },
{ field: "locationCode", title: TEXT.locationCode, type: "string" },
],
]);
const searchFormFields = ref({
palletCode: "",
+ stockStatus: "",
locationCode: "",
});
const searchFormOptions = ref([
[
{ title: TEXT.palletCode, field: "palletCode", type: "like" },
+ { title: TEXT.stockStatus, field: "stockStatus", type: "selectList", dataKey: "stockStatusEmun", data: [] },
{ title: TEXT.locationCode, field: "locationCode", type: "like" },
],
]);
@@ -102,14 +104,37 @@
field: "palletCode",
title: TEXT.palletCode,
type: "string",
- width: 120,
+ width: 150,
align: "left",
},
+ {
+ field: "stockStatus",
+ title: TEXT.stockStatus,
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "stockStatusEmun", data: [] },
+ },
+ {
+ field: "mesUploadStatus",
+ title: "MES鐘舵��",
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "mesUploadStatusEnum", data: [] },
+ },
+ {
+ field: "outboundDate",
+ title: TEXT.outboundDate,
+ type: "string",
+ width: 150,
+ align: "left",
+ },
{
field: "locationCode",
title: TEXT.locationCode,
type: "string",
- width: 150,
+ width: 120,
align: "left",
},
{
@@ -223,7 +248,7 @@
const loadStockStatusOptions = async () => {
try {
- const result = await proxy.http.post("/api/Sys_Dictionary/GetVueDictionary", ["stockStatusEmun"]);
+ const result = await proxy.http.post("/api/Sys_Dictionary/GetVueDictionary", ["stockStatusEmun", "mesUploadStatusEnum"]);
const matched = (result || []).find((item) => item.dicNo === "stockStatusEmun");
stockStatusOptions.value = matched ? matched.data || [] : [];
} catch (error) {
--
Gitblit v1.9.3