From 693584e6c84f6292a29ba242aa9e47be200e451e Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期二, 21 四月 2026 15:25:12 +0800
Subject: [PATCH] feat: 更新仓库枚举值和过滤条件，添加不等操作符支持 refactor: 重构任务和库存相关界面的查询逻辑 fix: 修复库存状态过滤条件错误问题 style: 统一代码格式和命名规范
---
Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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..6703a37 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
@@ -15,7 +15,7 @@
</template>
<script>
-import extend from "@/extension/stock/stockInfo.js";
+import extend from "@/extension/stock/stockInfo.jsx";
import {
defineComponent,
getCurrentInstance,
@@ -28,6 +28,7 @@
const TEXT = {
pageName: "搴撳瓨淇℃伅",
palletCode: "鎵樼洏缂栧彿",
+ stockStatus: "搴撳瓨鐘舵��",
locationCode: "璐т綅缂栧彿",
warehouse: "浠撳簱",
creator: "鍒涘缓浜�",
@@ -63,26 +64,35 @@
sortName: "id",
});
- const editFormFields = ref({
+ 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" },
],
]);
@@ -104,6 +114,22 @@
type: "string",
width: 120,
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: "locationCode",
@@ -223,7 +249,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