From 13f8c1efe9aaf7b7d1e4e77107de61a56d6f9646 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 08:42:20 +0800
Subject: [PATCH] 222

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx |  138 +++++++++++++++++++++++-----------------------
 1 files changed, 69 insertions(+), 69 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/WmsMaterialDrawer.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/WmsMaterialDrawer.tsx"
index 6776fa5..b44aba5 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/WmsMaterialDrawer.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/WmsMaterialDrawer.tsx"
@@ -94,32 +94,15 @@
                  options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] 
                 }, 
                 { 
-                   label: '鐗╂枡鍚嶇О', 
-                   prop: 'materialName', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�', 
-              rules: [{required: true, message: '鐗╂枡鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }], 
-                }, 
-                { 
-                   label: '鏁伴噺', 
+                   label: '鏄惁鑷骇', 
                    prop: 'isSelfMade', 
                    el: 'select', 
                    //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ユ暟閲�', 
+                   placeholder: '璇疯緭鍏ユ槸鍚﹁嚜浜�', 
                  options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] 
                 }, 
                 { 
-                   label: '閲囪喘绫诲瀷锛堟灇涓惧�硷級', 
-                   prop: 'purchaseType', 
-                   el: 'select', 
-                   options: [], 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ラ噰璐被鍨嬶紙鏋氫妇鍊硷級', 
-              rules: [{required: true, message: '閲囪喘绫诲瀷锛堟灇涓惧�硷級涓嶈兘涓虹┖', trigger: 'blur' }], 
-                }, 
-                { 
-                   label: '鏄惁鏈夋晥鐗╂枡', 
+                   label: '鏁伴噺', 
                    prop: 'num', 
                    el: (props: any, { attrs }: SetupContext) => { 
                      return h(inputNumber, {  
@@ -132,17 +115,8 @@
                    step: 1,
                    precision: 0, 
                    //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�', 
-              rules: [{required: true, message: '鏄惁鏈夋晥鐗╂枡涓嶈兘涓虹┖', trigger: 'blur' }], 
-                }, 
-                { 
-                   label: '鐗╂枡绫诲瀷锛堟灇涓惧�硷級', 
-                   prop: 'materialType', 
-                   el: 'select', 
-                   options: [], 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ョ墿鏂欑被鍨嬶紙鏋氫妇鍊硷級', 
-              rules: [{required: true, message: '鐗╂枡绫诲瀷锛堟灇涓惧�硷級涓嶈兘涓虹┖', trigger: 'blur' }], 
+                   placeholder: '璇疯緭鍏ユ暟閲�', 
+              rules: [{required: true, message: '鏁伴噺涓嶈兘涓虹┖', trigger: 'blur' }], 
                 }, 
                 { 
                    label: '鑷湁鏁伴噺', 
@@ -161,18 +135,12 @@
                    placeholder: '璇疯緭鍏ヨ嚜鏈夋暟閲�', 
                 }, 
                 { 
-                   label: '涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�', 
-                   prop: 'primaryUnit', 
+                   label: '鐗╂枡鍚嶇О', 
+                   prop: 'materialName', 
                    el: 'input', 
                    //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ヤ富鍗曚綅锛堝锛歬g銆乵銆佷釜锛�', 
-                }, 
-                { 
-                   label: '瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�', 
-                   prop: 'standard', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ヨ鏍�/鏍囧噯锛堝锛欸B/T 8163-2018锛�', 
+                   placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�', 
+              rules: [{required: true, message: '鐗╂枡鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }], 
                 }, 
                 { 
                    label: '', 
@@ -189,6 +157,38 @@
                    precision: 2, 
                    //disabled: disabled, 
                    placeholder: '璇疯緭鍏�', 
+                }, 
+                { 
+                   label: '閲囪喘绫诲瀷锛堟灇涓惧�硷級', 
+                   prop: 'purchaseType', 
+                   el: 'select', 
+                   options: [], 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ラ噰璐被鍨嬶紙鏋氫妇鍊硷級', 
+              rules: [{required: true, message: '閲囪喘绫诲瀷锛堟灇涓惧�硷級涓嶈兘涓虹┖', trigger: 'blur' }], 
+                }, 
+                { 
+                   label: '鐗╂枡绫诲瀷锛堟灇涓惧�硷級', 
+                   prop: 'materialType', 
+                   el: 'select', 
+                   options: [], 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ョ墿鏂欑被鍨嬶紙鏋氫妇鍊硷級', 
+              rules: [{required: true, message: '鐗╂枡绫诲瀷锛堟灇涓惧�硷級涓嶈兘涓虹┖', trigger: 'blur' }], 
+                }, 
+                { 
+                   label: '涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�', 
+                   prop: 'primaryUnit', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ヤ富鍗曚綅锛堝锛歬g銆乵銆佷釜锛�', 
+                }, 
+                { 
+                   label: '瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�', 
+                   prop: 'standard', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ヨ鏍�/鏍囧噯锛堝锛欸B/T 8163-2018锛�', 
                 }, 
                 { 
                    label: '澶栧緞锛堝崟浣嶏細mm锛�', 
@@ -314,6 +314,20 @@
                    placeholder: '璇疯緭鍏ヤ慨鏀逛汉', 
                 }, 
                 { 
+                   label: '鎿嶄綔澶囨敞', 
+                   prop: 'operationRemark', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ユ搷浣滃娉�', 
+                }, 
+                { 
+                   label: '鍒犻櫎澶囨敞', 
+                   prop: 'deleteRemark', 
+                   el: 'input', 
+                   //disabled: disabled, 
+                   placeholder: '璇疯緭鍏ュ垹闄ゅ娉�', 
+                }, 
+                { 
                    label: '鎵╁睍瀛楁1', 
                    prop: 'extraField1', 
                    el: 'input', 
@@ -333,20 +347,6 @@
                    el: 'input', 
                    //disabled: disabled, 
                    placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�3', 
-                }, 
-                { 
-                   label: '鎿嶄綔澶囨敞', 
-                   prop: 'operationRemark', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ユ搷浣滃娉�', 
-                }, 
-                { 
-                   label: '鍒犻櫎澶囨敞', 
-                   prop: 'deleteRemark', 
-                   el: 'input', 
-                   //disabled: disabled, 
-                   placeholder: '璇疯緭鍏ュ垹闄ゅ娉�', 
                 },  
   ]) 
   /** 
@@ -385,15 +385,15 @@
     const data = { 
       materialCode: formData.value.materialCode, 
 isValid: formData.value.isValid, 
-materialName: formData.value.materialName, 
 isSelfMade: formData.value.isSelfMade, 
-purchaseType: formData.value.purchaseType, 
 num: formData.value.num, 
-materialType: formData.value.materialType, 
 selfNum: formData.value.selfNum, 
+materialName: formData.value.materialName, 
+nullLength: formData.value.nullLength, 
+purchaseType: formData.value.purchaseType, 
+materialType: formData.value.materialType, 
 primaryUnit: formData.value.primaryUnit, 
 standard: formData.value.standard, 
-nullLength: formData.value.nullLength, 
 outerDiameter: formData.value.outerDiameter, 
 wallThickness: formData.value.wallThickness, 
 materialQuality: formData.value.materialQuality, 
@@ -407,11 +407,11 @@
 remark: formData.value.remark, 
 creatorName: formData.value.creatorName, 
 lastModifierName: formData.value.lastModifierName, 
+operationRemark: formData.value.operationRemark, 
+deleteRemark: formData.value.deleteRemark, 
 extraField1: formData.value.extraField1, 
 extraField2: formData.value.extraField2, 
-extraField3: formData.value.extraField3, 
-operationRemark: formData.value.operationRemark, 
-deleteRemark: formData.value.deleteRemark,  
+extraField3: formData.value.extraField3,  
     } 
     if (!current.value) { 
       await wmsMaterialDrawer.addWmsMaterial(data) 
@@ -468,15 +468,15 @@
       formData.value = { 
         materialCode: res.materialCode, 
 isValid: res.isValid, 
-materialName: res.materialName, 
 isSelfMade: res.isSelfMade, 
-purchaseType: res.purchaseType, 
 num: res.num, 
-materialType: res.materialType, 
 selfNum: res.selfNum, 
+materialName: res.materialName, 
+nullLength: res.nullLength, 
+purchaseType: res.purchaseType, 
+materialType: res.materialType, 
 primaryUnit: res.primaryUnit, 
 standard: res.standard, 
-nullLength: res.nullLength, 
 outerDiameter: res.outerDiameter, 
 wallThickness: res.wallThickness, 
 materialQuality: res.materialQuality, 
@@ -490,11 +490,11 @@
 remark: res.remark, 
 creatorName: res.creatorName, 
 lastModifierName: res.lastModifierName, 
+operationRemark: res.operationRemark, 
+deleteRemark: res.deleteRemark, 
 extraField1: res.extraField1, 
 extraField2: res.extraField2, 
-extraField3: res.extraField3, 
-operationRemark: res.operationRemark, 
-deleteRemark: res.deleteRemark,  
+extraField3: res.extraField3,  
         id: res.id, 
       } 
       disabled.value = true 

--
Gitblit v1.9.3