From 638a684258fb4bc6adf76a1964bdf0d7f99e404f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 31 三月 2025 02:18:54 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue | 155 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 110 insertions(+), 45 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
index aaacaa0..97ab61e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue"
@@ -38,9 +38,11 @@
[
{
title: "浠撳簱",
- required: true,
field: "warehouseId",
- type: "string",
+ type: "select",
+ dataKey: "warehouses",
+ data: [],
+ required: true,
},
{
title: "鐗╂枡缂栧彿",
@@ -48,27 +50,74 @@
field: "materielCode",
type: "string",
},
- {
+ ],
+ [
+ {
title: "鐗╂枡鍚嶇О",
required: true,
field: "materielName",
type: "string",
},
{
- title: "璁￠噺鍗曚綅",
+ title: "鐗╂枡瑙勬牸",
required: true,
- field: "unit",
+ field: "materielSpec",
type: "string",
},
],
[
-
- {
- title: "鐗╂枡鎻忚堪",
- field: "materielDes",
- type: "textarea",
+ {
+ title: "鐗╂枡鍩烘湰鍒嗙被",
+ required: true,
+ field: "materielType",
+ type: "select",
+ dataKey:"materielTypeEnum",
+ data:[]
+
},
+ {
+ field: "materielSourceType",
+ title: "鐗╂枡灞炴�у垎绫�",
+ required: true,
+ type: "select",
+ dataKey:"materielSourceTypeEnum",
+ data:[]
+ },
],
+ [
+ {
+ title: "鍩烘湰鍗曚綅",
+ required: true,
+ field: "materielUnit",
+ type: "string",
+ },
+ {
+ title: "鐗╂枡鐘舵��",
+ required: true,
+ field: "materielState",
+ type: "select",
+ dataKey:"enableEnum",
+ data:[]
+ },
+
+ ],
+ [
+ {
+ title: "搴撳瓨缁勭粐",
+ required: true,
+ field: "materielInvOrgId",
+ type: "string",
+ },
+ {
+ title: "鏄惁闇�瑕佽川妫�",
+ required: true,
+ field: "isCheck",
+ type: "select",
+ dataKey:"yesno",
+ data:[]
+ },
+ ]
+
]);
const searchFormFields = ref({
materielCode: "",
@@ -78,6 +127,7 @@
[
{ title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
{ title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
+ {title: "鎵�灞炰粨搴�", field:"warehouseId",type:"select",dataKey:"warehouses",data:[]}
],
]);
const columns = ref([
@@ -114,57 +164,78 @@
align: "left",
},
{
- field: "materielDes",
- title: "鐗╂枡鎻忚堪",
- type: "decimal",
- width: 90,
- align: "left",
- },
- {
- field: "cotainerType",
- title: "瀹瑰櫒绫诲瀷",
+ field: "materielSpec",
+ title: "鐗╂枡瑙勬牸",
type: "string",
- width: 90,
+ width: 240,
align: "left",
- hidden:true
},
{
- field: "packspes",
- title: "鍖呰瑙勬牸",
- type: "int",
+ field: "materielSourceType",
+ title: "鐗╂枡灞炴�у垎绫�",
+ type: "string",
width: 120,
align: "left",
- hidden:true
+ bind: { key: "materielSourceTypeEnum", data: [] },
},
{
- field: "attribute",
- title: "鐗╂枡灞炴��",
+ field: "materielType",
+ title: "鐗╂枡鍩烘湰鍒嗙被",
type: "string",
- width: 200,
+ width: 120,
align: "left",
- hidden:true
+
},
{
- field: "unit",
- title: "璁￠噺鍗曚綅",
+ field: "materielUnit",
+ title: "鍩烘湰鍗曚綅",
type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "materielSize",
+ title: "鐗╂枡灏哄",
+ type: "float",
width: 180,
align: "left",
},
{
- field: "validity",
- title: "鏈夋晥鏈�",
- type: "string",
+ field: "materielLength",
+ title: "鐗╂枡闀垮害",
+ type: "float",
width: 120,
align: "left",
},
{
- field: "safetyStock",
- title: "瀹夊叏搴撳瓨",
- type: "string",
+ field: "materielThickness",
+ title: "鐗╂枡鍘氬害",
+ type: "float",
width: 120,
align: "left",
- hidden:true
+ },
+ {
+ field: "materielState",
+ title: "鐗╂枡鐘舵��",
+ type: "select",
+ width: 100,
+ bind:{key:"",data: [{key:'Enable',value:'鍚敤'},{key:'Disable',value:'绂佺敤'}] },
+ align: "left",
+ },
+ {
+ field: "materielInvOrgId",
+ title: "搴撳瓨缁勭粐",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "isCheck",
+ title: "鏄惁闇�瑕佽川妫�",
+ type: "int",
+ bind:{key:"",data: [{key:'False',value:'鍚�'},{key:'True',value:'鏄�'}] },
+ width: 100,
+ align: "left",
},
{
field: "creater",
@@ -196,13 +267,7 @@
align: "left",
hidden:true
},
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
+
]);
const detail = ref({
cnName: "#detailCnName",
--
Gitblit v1.9.3