From f892002a22d5cc1f09d764c20b812d81a519135a Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 10:00:39 +0800
Subject: [PATCH] 优化查询列表

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx |  166 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 120 insertions(+), 46 deletions(-)

diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
index e629cb1..301eb74 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx"
@@ -86,11 +86,75 @@
                    placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮侊紙鍞竴鏍囪瘑锛�', 
                 }, 
                 { 
+                   label: '鏄惁鏈夋晥鐗╂枡', 
+                   prop: 'isValid', 
+                   el: 'select', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�', 
+                 options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] 
+                }, 
+                { 
+                   label: '鏄惁鑷骇', 
+                   prop: 'isSelfMade', 
+                   el: 'select', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ユ槸鍚﹁嚜浜�', 
+                 options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] 
+                }, 
+                { 
+                   label: '鏁伴噺', 
+                   prop: 'num', 
+                   el: (props: any, { attrs }: SetupContext) => { 
+                     return h(inputNumber, {  
+                       ...props,  
+                       clearable: true,  
+                       ...attrs,  
+                     })  
+                   },
+                   width: '100%',
+                   step: 1,
+                   precision: 0, 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ユ暟閲�', 
+                }, 
+                { 
+                   label: '鑷湁鏁伴噺', 
+                   prop: 'selfNum', 
+                   el: (props: any, { attrs }: SetupContext) => { 
+                     return h(inputNumber, {  
+                       ...props,  
+                       clearable: true,  
+                       ...attrs,  
+                     })  
+                   },
+                   width: '100%',
+                   step: 1,
+                   precision: 0, 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ヨ嚜鏈夋暟閲�', 
+                }, 
+                { 
                    label: '鐗╂枡鍚嶇О', 
                    prop: 'materialName', 
                    el: 'input', 
                    //disabled: disabled, 
                    placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�', 
+                }, 
+                { 
+                   label: '鍙┖闀垮害', 
+                   prop: 'nullLength', 
+                   el: (props: any, { attrs }: SetupContext) => { 
+                     return h(inputNumber, {  
+                       ...props,
+                       clearable: true, 
+                       ...attrs,  
+                     })  
+                   },
+                   width: '100%',
+                   step: 0.01,
+                   precision: 2, 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ュ彲绌洪暱搴�', 
                 }, 
                 { 
                    label: '閲囪喘绫诲瀷锛堟灇涓惧�硷級', 
@@ -221,34 +285,6 @@
                    placeholder: '璇疯緭鍏ュ啑浣欏瓧娈�3 - 棰勭暀鎵╁睍鐢ㄩ��', 
                 }, 
                 { 
-                   label: '鍒涘缓鏃堕棿', 
-                   prop: 'creationTime', 
-                   el: (props: any, { attrs }: SetupContext) => { 
-                     return h(dateTimePickerRange, {  
-                       ...props,
-                       clearable: true, 
-                       ...attrs,  
-                     })  
-                   },
-                   width: '100%',
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ュ垱寤烘椂闂�', 
-                }, 
-                { 
-                   label: '鍒涘缓浜�', 
-                   prop: 'creatorName', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ュ垱寤轰汉', 
-                }, 
-                { 
-                   label: '淇敼浜�', 
-                   prop: 'lastModifierName', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ヤ慨鏀逛汉', 
-                }, 
-                { 
                    label: '澶囨敞', 
                    prop: 'remark', 
                    el: 'input', 
@@ -264,25 +300,53 @@
                  options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] 
                 }, 
                 { 
-                   label: '鎵╁睍瀛楁1', 
-                   prop: 'extraField1', 
+                   label: '鎵╁睍灞炴��', 
+                   prop: 'extraProperties', 
                    el: 'input', 
                    //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�1', 
+                   placeholder: '璇疯緭鍏ユ墿灞曞睘鎬�', 
                 }, 
                 { 
-                   label: '鎵╁睍瀛楁2', 
-                   prop: 'extraField2', 
-                   el: 'input', 
+                   label: '鍒涘缓鏃堕棿', 
+                   prop: 'creationTime', 
+                   el: (props: any, { attrs }: SetupContext) => { 
+                     return h(dateTimePickerRange, {  
+                       ...props,
+                       clearable: true, 
+                       ...attrs,  
+                     })  
+                   },
+                   width: '100%',
                    //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�2', 
+                   placeholder: '璇疯緭鍏ュ垱寤烘椂闂�', 
                 }, 
                 { 
-                   label: '鎵╁睍瀛楁3', 
-                   prop: 'extraField3', 
+                   label: '淇敼鏃堕棿', 
+                   prop: 'lastModificationTime', 
+                   el: (props: any, { attrs }: SetupContext) => { 
+                     return h(dateTimePickerRange, {  
+                       ...props,
+                       clearable: true, 
+                       ...attrs,  
+                     })  
+                   },
+                   width: '100%',
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ヤ慨鏀规椂闂�', 
+                }, 
+                { 
+                   label: '鍒涘缓浜�', 
+                   prop: 'creatorName', 
                    el: 'input', 
                    //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�3', 
+                   placeholder: '璇疯緭鍏ュ垱寤轰汉', 
+                }, 
+                { 
+                   label: '淇敼浜�', 
+                   prop: 'lastModifierName', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ヤ慨鏀逛汉', 
                 },  
   ]) 
   /** 
@@ -298,7 +362,12 @@
   const commonGetFormData=()=>{ 
     const data = { 
       materialCode: formData.value.materialCode || '', 
+isValid: formData.value.isValid || '', 
+isSelfMade: formData.value.isSelfMade || '', 
+num: formData.value.num || '', 
+selfNum: formData.value.selfNum || '', 
 materialName: formData.value.materialName || '', 
+nullLength: formData.value.nullLength || '', 
 purchaseType: formData.value.purchaseType || '', 
 materialType: formData.value.materialType || '', 
 primaryUnit: formData.value.primaryUnit || '', 
@@ -313,14 +382,13 @@
 redundantField1: formData.value.redundantField1 || '', 
 redundantField2: formData.value.redundantField2 || '', 
 redundantField3: formData.value.redundantField3 || '', 
-creationTime: formData.value.creationTime || '', 
-creatorName: formData.value.creatorName || '', 
-lastModifierName: formData.value.lastModifierName || '', 
 remark: formData.value.remark || '', 
 isDisabled: formData.value.isDisabled || '', 
-extraField1: formData.value.extraField1 || '', 
-extraField2: formData.value.extraField2 || '', 
-extraField3: formData.value.extraField3 || '',  
+extraProperties: formData.value.extraProperties || '', 
+creationTime: formData.value.creationTime || '', 
+lastModificationTime: formData.value.lastModificationTime || '', 
+creatorName: formData.value.creatorName || '', 
+lastModifierName: formData.value.lastModifierName || '',  
     } 
     return data; 
   } 
@@ -344,7 +412,12 @@
   const onReset = async () => { 
     formData.value = {} 
     formData.value.MaterialCode = '' 
+formData.value.IsValid = '' 
+formData.value.IsSelfMade = '' 
+formData.value.Num = '' 
+formData.value.SelfNum = '' 
 formData.value.MaterialName = '' 
+formData.value.NullLength = '' 
 formData.value.PurchaseType = '' 
 formData.value.MaterialType = '' 
 formData.value.PrimaryUnit = '' 
@@ -359,9 +432,10 @@
 formData.value.RedundantField1 = '' 
 formData.value.RedundantField2 = '' 
 formData.value.RedundantField3 = '' 
-formData.value.CreatorName = '' 
-formData.value.LastModifierName = '' 
 formData.value.Remark = '' 
+formData.value.DeletionTime = '' 
+formData.value.OperationRemark = '' 
+formData.value.DeleteRemark = '' 
 formData.value.ExtraField1 = '' 
 formData.value.ExtraField2 = '' 
 formData.value.ExtraField3 = ''  

--
Gitblit v1.9.3