From 0705cb6170a9ba77ba48bbb6dcebb9cf3d73cbea Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 14 十月 2025 02:12:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 74 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
index eed82b6..f4d0f57 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
@@ -24,7 +24,7 @@
cnName: "搴撳瓨淇℃伅",
name: "stockInfo",
url: "/StockInfo/",
- sortName: "CreateDate",
+ sortName: "id",
});
const editFormFields = ref({
deviceCode: "",
@@ -37,7 +37,29 @@
deviceRemark: "",
});
const editFormOptions = ref([
-
+ [
+ { title: "鎵樼洏缂栧彿", field: "palletCode", type :"string"},
+ { title: "璐т綅缂栧彿", field: "locationCode",type:"string",readonly: true, },
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "select",dataKey: "warehouses",data: [],readonly: true,},
+ {title: "搴撳瓨鏄庣粏鐘舵��",field: "stockStatus",type: "select",dataKey:"stockStatusEmun", data: [],readonly: true,},
+
+ ],
+ [
+ { title: "鎵樼洏绫诲瀷", field: "palletType", type :"select",dataKey:"locationTypeEnum",data:[]},
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ readonly: true,
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ readonly: true,
+ },
+
+ ]
]);
const searchFormFields = ref({
palletCode: "",
@@ -45,8 +67,10 @@
});
const searchFormOptions = ref([
[
- { title: "鎵樼洏缂栧彿", field: "palletCode" },
- { title: "璐т綅缂栧彿", field: "locationCode" },
+ { title: "鎵樼洏缂栧彿", field: "palletCode", type :"like"},
+ { title: "璐т綅缂栧彿", field: "locationCode",type:"like" },
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "select",dataKey: "warehouses",data: [],},
+ {title: "搴撳瓨鏄庣粏鐘舵��",field: "status",type: "select",dataKey:"stockStatusEmun", data: []},
],
]);
const columns = ref([
@@ -61,12 +85,27 @@
align: "left",
},
{
+ field: "id",
+ title: "搴撳瓨涓婚敭",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
width: 90,
align: "left",
},
+ {
+ field: "palletType",
+ title: "鎵樼洏绫诲瀷",
+ type: "select",
+ width: 120,
+ align: "left",
+ bind: { key: "locationTypeEnum", data: [] },
+ },
{
field: "locationCode",
title: "璐т綅缂栧彿",
@@ -75,12 +114,28 @@
align: "left",
},
{
- field: "isFull",
- title: "鏄惁婊＄洏",
- type: "string",
- width: 150,
+ field: "stockStatus",
+ title: "搴撳瓨鏄庣粏鐘舵��",
+ type: "string",
+ width: 120,
+ align: "left",
+ bind: { key: "stockStatusEmun", data: [] },
+ },
+ // {
+ // field: "isFull",
+ // title: "鏄惁婊＄洏",
+ // type: "string",
+ // width: 150,
+ // align: "left",
+ // bind: { key: "yesno", data: [] },
+ // },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "select",
+ width: 100,
align: "left",
- bind: { key: "yesno", data: [] },
+ bind: { key: "warehouses", data: [] },
},
{
field: "creater",
@@ -116,6 +171,7 @@
type: "string",
width: 100,
align: "left",
+ hidden:true
},
]);
const detail = ref({
--
Gitblit v1.9.3