From 1f121db427cc068eee97b699c410d1b5f320e867 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期六, 06 九月 2025 14:26:27 +0800 Subject: [PATCH] 最新代码提交 --- 项目代码/WMS/WMSClient/src/views/basic/materielInfo.vue | 187 ++++++++++++++++++++++++++-------------------- 1 files changed, 105 insertions(+), 82 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 97ab61e..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" @@ -30,9 +30,17 @@ warehouseId: "", materielCode: "", materielName: "", - materielDes: "", - isMixBatch: "", - isMixMateriel: "", + materielSourceType: "", + materielSpec: "", + materielUnit: "", + materielLength: "", + materielThickness: "", + materielWide: "", + materielState: "", + isCheck: "", + materielInvOrgId: "", + materierlWeight: "", + }); const editFormOptions = ref([ [ @@ -50,46 +58,44 @@ field: "materielCode", type: "string", }, - ], - [ - { + { title: "鐗╂枡鍚嶇О", required: true, field: "materielName", type: "string", }, { + title: "鐗╂枡鍒嗙被", + field: "materielSourceType", + type: "select", + dataKey: "materielTypeEnum", + data: [], + required: true, + }, + ], + [ + + { title: "鐗╂枡瑙勬牸", required: true, field: "materielSpec", type: "string", }, - ], - [ - { - 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", + type: "select", + dataKey:"materielUnitEnum", + data:[] + }, + { + title: "搴撳瓨缁勭粐", + required: true, + field: "materielInvOrgId", + type: "select", + dataKey:"materielInvOrgEnum", + data:[] }, { title: "鐗╂枡鐘舵��", @@ -99,25 +105,39 @@ dataKey:"enableEnum", data:[] }, - ], [ { - title: "搴撳瓨缁勭粐", - required: true, - field: "materielInvOrgId", - type: "string", + title: "鐗╂枡閲嶉噺", + field: "materielWeight", + type: "float", }, { - title: "鏄惁闇�瑕佽川妫�", + title: "鐗╂枡闀垮害", + field: "materielLength", + type: "float", + }, + { + title: "鐗╂枡鍘氬害", + field: "materielThickness", + type: "float", + }, + { + title: "鐗╂枡瀹藉害", + field: "materielWide", + type: "float", + }, + ], + [ + { + title: "鏄惁璐ㄦ", required: true, field: "isCheck", type: "select", - dataKey:"yesno", + dataKey:"enableEnum", data:[] }, ] - ]); const searchFormFields = ref({ materielCode: "", @@ -127,6 +147,7 @@ [ { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" }, { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" }, + {title: "搴撳瓨缁勭粐", field:"materielInvOrgId",type:"select",dataKey:"materielInvOrgEnum",data:[]}, {title: "鎵�灞炰粨搴�", field:"warehouseId",type:"select",dataKey:"warehouses",data:[]} ], ]); @@ -150,6 +171,14 @@ bind: { key: "warehouses", data: [] }, }, { + field: "materielInvOrgId", + title: "搴撳瓨缁勭粐", + type: "string", + width: 100, + align: "left", + bind: { key: "materielInvOrgEnum", data: [] }, + }, + { field: "materielCode", title: "鐗╂枡缂栧彿", type: "string", @@ -164,27 +193,20 @@ align: "left", }, { + field: "materielSourceType", + title: "鐗╂枡鍒嗙被", + type: "string", + width: 100, + align: "left", + bind: { key: "materielTypeEnum", data: [] }, + }, + + { field: "materielSpec", title: "鐗╂枡瑙勬牸", type: "string", - width: 240, + width: 180, align: "left", - }, - { - field: "materielSourceType", - title: "鐗╂枡灞炴�у垎绫�", - type: "string", - width: 120, - align: "left", - bind: { key: "materielSourceTypeEnum", data: [] }, - }, - { - field: "materielType", - title: "鐗╂枡鍩烘湰鍒嗙被", - type: "string", - width: 120, - align: "left", - }, { field: "materielUnit", @@ -192,27 +214,7 @@ type: "string", width: 120, align: "left", - }, - { - field: "materielSize", - title: "鐗╂枡灏哄", - type: "float", - width: 180, - align: "left", - }, - { - field: "materielLength", - title: "鐗╂枡闀垮害", - type: "float", - width: 120, - align: "left", - }, - { - field: "materielThickness", - title: "鐗╂枡鍘氬害", - type: "float", - width: 120, - align: "left", + bind: { key: "materielUnitEnum", data: [] }, }, { field: "materielState", @@ -223,18 +225,39 @@ align: "left", }, { - field: "materielInvOrgId", - title: "搴撳瓨缁勭粐", - type: "string", + field: "isCheck", + title: "鏄惁璐ㄦ", + type: "int", + bind:{key:"",data: [{key:'False',value:'鍚�'},{key:'True',value:'鏄�'}] }, width: 100, align: "left", }, { - field: "isCheck", - title: "鏄惁闇�瑕佽川妫�", - type: "int", - bind:{key:"",data: [{key:'False',value:'鍚�'},{key:'True',value:'鏄�'}] }, - width: 100, + field: "materielWeight", + title: "鐗╂枡閲嶉噺", + type: "float", + width: 180, + align: "left", + }, + { + field: "materielLength", + title: "鐗╂枡闀垮害", + type: "float", + width: 180, + align: "left", + }, + { + field: "materielThickness", + title: "鐗╂枡鍘氬害", + type: "float", + width: 180, + align: "left", + }, + { + field: "materielWide", + title: "鐗╂枡瀹藉害", + type: "float", + width: 180, align: "left", }, { -- Gitblit v1.9.3