From 2b25f973bb6d72ce6971d6f9c3cdccf51b7962ab Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期六, 06 九月 2025 14:27:08 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu --- 项目代码/WMS/WMSClient/src/views/basic/materielInfo.vue | 47 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 15 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/materielInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/materielInfo.vue" index 6dd7d86..b83e09c 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/materielInfo.vue" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/basic/materielInfo.vue" @@ -38,7 +38,8 @@ materielWide: "", materielState: "", isCheck: "", - materielInvOrgId: "" + materielInvOrgId: "", + materierlWeight: "", }); const editFormOptions = ref([ @@ -62,9 +63,7 @@ required: true, field: "materielName", type: "string", - } - ], - [ + }, { title: "鐗╂枡鍒嗙被", field: "materielSourceType", @@ -73,6 +72,9 @@ data: [], required: true, }, + ], + [ + { title: "鐗╂枡瑙勬牸", required: true, @@ -83,10 +85,10 @@ title: "鍩烘湰鍗曚綅", required: true, field: "materielUnit", - type: "string", + type: "select", + dataKey:"materielUnitEnum", + data:[] }, - ], - [ { title: "搴撳瓨缁勭粐", required: true, @@ -103,16 +105,13 @@ dataKey:"enableEnum", data:[] }, - { - title: "鏄惁璐ㄦ", - required: true, - field: "isCheck", - type: "select", - dataKey:"yesno", - data:[] - }, ], [ + { + title: "鐗╂枡閲嶉噺", + field: "materielWeight", + type: "float", + }, { title: "鐗╂枡闀垮害", field: "materielLength", @@ -127,6 +126,16 @@ title: "鐗╂枡瀹藉害", field: "materielWide", type: "float", + }, + ], + [ + { + title: "鏄惁璐ㄦ", + required: true, + field: "isCheck", + type: "select", + dataKey:"enableEnum", + data:[] }, ] ]); @@ -205,6 +214,7 @@ type: "string", width: 120, align: "left", + bind: { key: "materielUnitEnum", data: [] }, }, { field: "materielState", @@ -223,6 +233,13 @@ align: "left", }, { + field: "materielWeight", + title: "鐗╂枡閲嶉噺", + type: "float", + width: 180, + align: "left", + }, + { field: "materielLength", title: "鐗╂枡闀垮害", type: "float", -- Gitblit v1.9.3