From 912759e6fe6a15a51c9d25707685bfa148cd1bd9 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期六, 13 十二月 2025 14:53:31 +0800
Subject: [PATCH] 提交
---
项目代码/WIDESEA_WMSClient/src/views/stock/stockView.vue | 303 +++++++++++---------------------------------------
1 files changed, 69 insertions(+), 234 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue"
index fc8b569..fe81dcc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/stock/stockView.vue"
@@ -27,30 +27,31 @@
sortName: "stockId",
});
const editFormFields = ref({
- palletCode: "",
- locationCode: "",
- locationName: "",
+
});
const editFormOptions = ref([
]);
const searchFormFields = ref({
- palletCode: "",
- // locationCode: "",
- materielCode:"",
- batchNo:""
});
const searchFormOptions = ref([
[
{ title: "鎵樼洏缂栧彿", field: "palletCode",type: "like" },
- // { title: "璐т綅缂栧彿", field: "locationCode",type: "like" },
+ { title: "璐т綅缂栧彿", field: "locationCode",type: "like" },
{ title: "璐т綅鐘舵��", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
{ title: "搴撳瓨鐘舵��", field: "stockStatus",type: "selectList",dataKey: "stockStatusEmun",data: [],},
],
[
{ title: "鐗╂枡缂栧彿", field: "materielCode",type: "like"},
{ title: "鎵规鍙�", field: "batchNo",type: "like"},
- { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],},
+ { title: "鎵�灞炰粨搴�", field: "locationType",type: "select",dataKey: "locationType",data: [],},
+ { title: "鎵�鍚潯鐮�", field: "barcode",type: "like"},
+ ],
+ [
+ { title: "渚涘簲鍟嗙紪鍙�", field: "supplyCode",type: "like"},
+ { title: "鎵�鍚崟鎹紪鍙�", field: "orderNo",type: "like"},
+ { title: "搴撳瓨鍒涘缓鏃堕棿", field: "createDate",type: "datetime"},
+
],
]);
const columns = ref([
@@ -65,35 +66,36 @@
align: "left",
},
{
+ field: "locationType",
+ title: "鎵�灞炰粨搴�",
+ type: "string",
+ width: 150,
+ align: "left",
+ bind: { key: "locationType", data: [] },
+ },
+ {
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
width: 150,
- link: true,
+ // link: true,
align: "left",
},
{
field: "locationCode",
title: "璐т綅缂栧彿",
type: "string",
- width: 200,
+ width: 150,
align: "left",
},
{
field: "locationName",
title: "璐т綅鍚嶇О",
type: "string",
- width: 270,
+ width: 120,
align: "left",
},
- {
- field: "warehouseId",
- title: "鎵�灞炰粨搴�",
- type: "string",
- width: 80,
- align: "left",
- bind: { key: "warehouses", data: [] },
- },
+
{
field: "roadwayNo",
title: "宸烽亾缂栧彿",
@@ -103,24 +105,10 @@
hidden:true
},
{
- field: "materielCode",
- title: "鎵�鍚墿鏂欑紪鍙�",
+ field: "orderStatistics",
+ title: "鎵�鍚墿鏂欐槑缁�",
type: "string",
- width: 120,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵�鍚墿鏂欐壒娆�",
- type: "string",
- width: 200,
- align: "left"
- },
- {
- field: "materielInfo",
- title: "鎵�鍚墿鏂欐渶鏃╀复鏈�",
- type: "string",
- width: 140,
+ width: 630,
align: "left",
},
{
@@ -131,69 +119,13 @@
align: "left",
},
{
- field: "row",
- title: "璐т綅琛�",
+ field: "stockOrderNo",
+ title: "鎵�鍚崟鎹�",
type: "string",
- width: 90,
+ width: 140,
align: "left",
- hidden: true,
},
- {
- field: "column",
- title: "璐т綅鍒�",
- type: "int",
- width: 120,
- align: "left",
- hidden: true,
- },
- {
- field: "layer",
- title: "璐т綅灞�",
- type: "string",
- width: 200,
- align: "left",
- hidden: true,
- },
- {
- field: "depth",
- title: "璐т綅娣卞害",
- type: "string",
- width: 180,
- align: "left",
- hidden: true,
- },
- {
- field: "stockStatus",
- title: "搴撳瓨鐘舵��",
- type: "string",
- width: 200,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] },
- },
- {
- field: "locationType",
- title: "璐т綅绫诲瀷",
- type: "string",
- width: 100,
- align: "left",
- bind:{key: "locationTypeEnum", data: []}
- },
- {
- field: "locationStatus",
- title: "璐т綅鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "locationStatusEnum", data: [] },
- },
- {
- field: "enalbeStatus",
- title: "绂佺敤鐘舵��",
- type: "string",
- width: 80,
- align: "left",
- bind: { key: "enableStatusEnum", data: [] },
- },
+
{
field: "creater",
title: "鍒涘缓浜�",
@@ -206,6 +138,45 @@
title: "鍒涘缓鏃堕棿",
type: "datetime",
width: 160,
+ align: "left",
+ },
+ {
+ field: "enalbeStatus",
+ title: "璐т綅绂佺敤鐘舵��",
+ type: "string",
+ width: 140,
+ align: "left",
+ bind: { key: "enableStatusEnum", data: [] },
+ },
+ {
+ field: "locationStatus",
+ title: "璐т綅鐘舵��",
+ type: "string",
+ width: 140,
+ align: "left",
+ bind: { key: "locationStatusEnum", data: [] },
+ },
+ {
+ field: "locationType",
+ title: "璐т綅鍖哄煙",
+ type: "string",
+ width: 140,
+ align: "left",
+ bind:{key: "locationTypeEnum", data: []}
+ },
+ {
+ field: "stockStatus",
+ title: "搴撳瓨鐘舵��",
+ type: "string",
+ width: 140,
+ align: "left",
+ bind:{key: "stockStatusEmun", data: []}
+ },
+ {
+ field: "warehouseId",
+ title: "鎵�灞炰粨搴�",
+ type: "string",
+ width: 80,
align: "left",
},
{
@@ -235,143 +206,7 @@
cnName: "搴撳瓨鏄庣粏淇℃伅",
table: "StockInfoDetail",
columns: [
- {
- field: "id",
- title: "Id",
- type: "int",
- width: 90,
- hidden: true,
- readonly: true,
- require: true,
- align: "left",
- },
- {
- field: "stockId",
- title: "搴撳瓨淇℃伅涓婚敭",
- type: "string",
- width: 90,
- align: "left",
- hidden: true
- },
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 110,
- align: "left",
- },
- {
- field: "materielName",
- title: "鐗╂枡鍚嶇О",
- type: "string",
- width: 130,
- align: "left",
- },
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "decimal",
- width: 130,
- align: "left",
- },
- {
- field: "batchNo",
- title: "鎵规鍙�",
- type: "string",
- width: 180,
- align: "left",
- },
- {
- field: "serialNumber",
- title: "搴忓垪鍙�",
- type: "int",
- width: 120,
- align: "left",
- hidden: true,
- },
- {
- field: "stockQuantity",
- title: "搴撳瓨鏁伴噺",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "outboundQuantity",
- title: "鍑哄簱鏁伴噺",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "unit",
- title: "鍗曚綅",
- type: "string",
- width: 50,
- align: "left",
- },
- {
- field: "productionDate",
- title: "鐢熶骇鏃ユ湡",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "effectiveDate",
- title: "鏈夋晥鏃ユ湡",
- type: "string",
- width: 80,
- align: "left",
- },
- {
- field: "status",
- title: "搴撳瓨鏄庣粏鐘舵��",
- type: "string",
- width: 120,
- align: "left",
- bind: { key: "stockStatusEmun", data: [] }
- },
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- hidden: true
- },
- {
- field: "createDate",
- title: "鍒涘缓鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true
- },
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- hidden: true
- },
- {
- field: "modifyDate",
- title: "淇敼鏃堕棿",
- type: "datetime",
- width: 160,
- align: "left",
- hidden: true
- },
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- hidden: true
- },
+
],
sortName: "id",
key: "id",
--
Gitblit v1.9.3