From c38154df95a2c2fa1bd32c45f6be9c0d98e37440 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:52:14 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue | 74 +++++++++++++++++++++++++++++--------
1 files changed, 58 insertions(+), 16 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
index 06bdac5..528ef98 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielCodeInfo.vue"
@@ -27,17 +27,40 @@
sortName: "id",
});
const editFormFields = ref({
- purchaseOrderNo:""
+ lotNo: "",
+ warehouseId: "",
+ purchaseOrderNo: "",
+ materielCode: "",
+ productionDate: "",
+ effectiveDate: "",
});
const editFormOptions = ref([
[
{
+ title: "浠撳簱",
+ field: "warehouseId",
+ type: "select",
+ dataKey: "areainfo",
+ data: [],
+ required: true,
+ },
+ ],
+ [
+
+ {
title: "鐗╂枡缂栫爜",
field: "materielCode",
- type: "select",
- dataKey: "MaterielCodes",
- data: [],
+ type: "string",
},
+ ],
+ [
+ {
+ title: "閲囪喘鍗曞彿",
+ field: "purchaseOrderNo",
+ type: "string",
+ },
+ ],
+ [
{
title: "鎵规鍙�",
field: "lotNo",
@@ -46,30 +69,24 @@
],
[
{
- title: "閲囪喘鍗曞彿",
- field: "purchaseOrderNo",
- type:"select",
- // dataKey: "purchaseOrderNos",
- data: [],
- required: true,
- },
- {
title: "鏁伴噺",
field: "quantity",
- required: true,
+ type:"int"
},
],
[
{
title: "鐢熶骇鏃ユ湡",
field: "productionDate",
- type: "date",
+ // type: "date",
required: true,
},
+ ],
+ [
{
title: "鏈夋晥鏈�",
field: "effectiveDate",
- type: "date",
+ // type: "date",
required: true,
},
],
@@ -78,7 +95,10 @@
palletCode: "",
});
const searchFormOptions = ref([
- [{ title: "鎵规鍙�", field: "lotNo", type: "like" }],
+ [
+ { title: "閲囪喘鍗曞彿", field: "purchaseOrderNo", type: "like" },
+ { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
+ ],
]);
const columns = ref([
{
@@ -99,6 +119,21 @@
align: "left",
},
{
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind: { key: "areainfo", data: [] },
+ },
+ {
field: "purchaseOrderNo",
title: "閲囪喘鍗曞彿",
type: "string",
@@ -106,6 +141,13 @@
align: "left",
},
{
+ field: "supplierCode",
+ title: "渚涘簲鍟嗙紪鍙�",
+ type: "string",
+ width: 160,
+ align: "left",
+ },
+ {
field: "lotNo",
title: "鎵规鍙�",
type: "string",
--
Gitblit v1.9.3