From d01658c63cd541fe4ea5cec5c4bd7f23b9408cdb Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 18 十月 2025 15:04:56 +0800
Subject: [PATCH] 前端，pda，后端接口更改，新增，优化
---
WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue | 152 +++++++++++++++++++++++++++++++-------------------
1 files changed, 94 insertions(+), 58 deletions(-)
diff --git a/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue b/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue
index f3c37e5..b35fb25 100644
--- a/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue
+++ b/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue
@@ -32,35 +32,26 @@
locationName: "",
});
const editFormOptions = ref([
- [
- {
- title: "鎵樼洏缂栧彿",
- required: true,
- field: "palletCode",
- type: "string",
- },
- {
- title: "璐т綅缂栧彿",
- required: true,
- field: "locationCode",
- type: "string",
- },
- {
- title: "璐т綅鍚嶇О",
- required: true,
- field: "locationName",
- type: "string",
- },
- ],
+
]);
const searchFormFields = ref({
palletCode: "",
- locationCode: "",
+ // locationCode: "",
+ materielCode:"",
+ batchNo:""
});
const searchFormOptions = ref([
[
- { title: "鎵樼洏缂栧彿", field: "palletCode" },
- { title: "璐т綅缂栧彿", field: "locationCode" },
+ { title: "鎵樼洏缂栧彿", field: "palletCode",type: "like" },
+ { title: "璐т綅缂栧彿", field: "locationCode",type: "like" },
+ { title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
+ { title: "搴撳瓨鐘舵��", field: "stockStatus",type: "select",dataKey: "stockStatusEmun",data: [],},
+ ],
+ [
+ { title: "鐗╂枡缂栧彿", field: "materielCode",type: "like"},
+ { title: "鎵规鍙�", field: "batchNo",type: "like"},
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "select",dataKey: "warehouses",data: [],},
+ { title: "搴撳瓨鍒涘缓鏃堕棿",field: "createDate",type: "datetime"},
],
]);
const columns = ref([
@@ -86,21 +77,51 @@
field: "locationCode",
title: "璐т綅缂栧彿",
type: "string",
- width: 180,
+ width: 200,
align: "left",
},
{
field: "locationName",
title: "璐т綅鍚嶇О",
type: "string",
- width: 220,
+ width: 270,
align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "鎵�灞炰粨搴�",
+ type: "string",
+ width: 80,
+ align: "left",
+ bind: { key: "warehouses", data: [] },
},
{
field: "roadwayNo",
title: "宸烽亾缂栧彿",
type: "decimal",
- width: 90,
+ width: 100,
+ align: "left",
+ hidden:true
+ },
+ {
+ field: "materielCode",
+ title: "鎵�鍚墿鏂欑紪鍙�",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "batchNo",
+ title: "鎵�鍚墿鏂欐壒娆�",
+ type: "string",
+ width: 200,
+ align: "left"
+ },
+ {
+ field: "sumStock",
+ title: "鎬诲簱瀛�",
+ type: "string",
+ width: 140,
align: "left",
},
{
@@ -143,11 +164,12 @@
align: "left",
bind: { key: "stockStatusEmun", data: [] },
},
+
{
field: "locationType",
title: "璐т綅绫诲瀷",
type: "string",
- width: 120,
+ width: 100,
align: "left",
bind:{key: "locationTypeEnum", data: []}
},
@@ -155,7 +177,7 @@
field: "locationStatus",
title: "璐т綅鐘舵��",
type: "string",
- width: 200,
+ width: 120,
align: "left",
bind: { key: "locationStatusEnum", data: [] },
},
@@ -163,18 +185,9 @@
field: "enalbeStatus",
title: "绂佺敤鐘舵��",
type: "string",
- width: 180,
+ width: 80,
align: "left",
bind: { key: "enableStatusEnum", data: [] },
- },
- {
- field: "isFull",
- title: "鏄惁婊＄洏",
- type: "string",
- width: 150,
- align: "left",
- hidden: true,
- bind: { key: "yesno", data: [] },
},
{
field: "creater",
@@ -210,6 +223,7 @@
type: "string",
width: 100,
align: "left",
+ hidden:true
},
]);
const detail = ref({
@@ -232,39 +246,42 @@
type: "string",
width: 90,
align: "left",
- sort:true,
+ hidden: true
},
{
field: "materielCode",
title: "鐗╂枡缂栧彿",
type: "string",
- width: 150,
+ width: 110,
align: "left",
- sort:true,
},
{
field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 150,
+ width: 130,
align: "left",
- sort:true,
},
{
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "decimal",
- width: 90,
+ width: 130,
align: "left",
- sort:true,
},
{
field: "batchNo",
title: "鎵规鍙�",
type: "string",
- width: 90,
+ width: 180,
align: "left",
- sort:true,
+ },
+ {
+ field: "materielSpec",
+ title: "瑙勬牸鍨嬪彿",
+ type: "string",
+ width: 180,
+ align: "left",
},
{
field: "serialNumber",
@@ -272,23 +289,42 @@
type: "int",
width: 120,
align: "left",
- sort:true,
+ hidden: true,
},
{
field: "stockQuantity",
title: "搴撳瓨鏁伴噺",
type: "string",
- width: 200,
+ width: 80,
align: "left",
- sort:true,
},
{
field: "outboundQuantity",
title: "鍑哄簱鏁伴噺",
type: "string",
- width: 180,
+ width: 80,
align: "left",
- sort:true,
+ },
+ {
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 50,
+ align: "left",
+ },
+ {
+ field: "productionDate",
+ title: "鐢熶骇鏃ユ湡",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "effectiveDate",
+ title: "鏈夋晥鏃ユ湡",
+ type: "string",
+ width: 120,
+ align: "left",
},
{
field: "status",
@@ -296,7 +332,7 @@
type: "string",
width: 120,
align: "left",
- sort:true,
+ bind: { key: "stockStatusEmun", data: [] }
},
{
field: "creater",
@@ -304,7 +340,7 @@
type: "string",
width: 90,
align: "left",
- sort:true,
+ hidden: true
},
{
field: "createDate",
@@ -312,7 +348,7 @@
type: "datetime",
width: 160,
align: "left",
- sort:true,
+ hidden: true
},
{
field: "modifier",
@@ -320,7 +356,7 @@
type: "string",
width: 100,
align: "left",
- sort:true,
+ hidden: true
},
{
field: "modifyDate",
@@ -328,7 +364,7 @@
type: "datetime",
width: 160,
align: "left",
- sort:true,
+ hidden: true
},
{
field: "remark",
@@ -336,7 +372,7 @@
type: "string",
width: 100,
align: "left",
- sort:true,
+ hidden: true
},
],
sortName: "id",
--
Gitblit v1.9.3