From a0088a63163bd3467529306f98a8cdb98b497e33 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 09 5月 2025 14:12:29 +0800
Subject: [PATCH] 增加排序
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx | 162 ++++++++++++++++++++++++++---------------------------
1 files changed, 80 insertions(+), 82 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..a777cf9 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,21 +135,15 @@
placeholder: '璇疯緭鍏ヨ嚜鏈夋暟閲�',
},
{
- label: '涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�',
- prop: 'primaryUnit',
+ label: '鐗╂枡鍚嶇О',
+ prop: 'materialName',
el: 'input',
//disabled: disabled,
- placeholder: '璇疯緭鍏ヤ富鍗曚綅锛堝锛歬g銆乵銆佷釜锛�',
+ placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+ rules: [{required: true, message: '鐗╂枡鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
},
{
- label: '瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�',
- prop: 'standard',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ヨ鏍�/鏍囧噯锛堝锛欸B/T 8163-2018锛�',
- },
- {
- label: '',
+ label: '鍙┖闀垮害',
prop: 'nullLength',
el: (props: any, { attrs }: SetupContext) => {
return h(inputNumber, {
@@ -188,7 +156,39 @@
step: 0.01,
precision: 2,
//disabled: disabled,
- placeholder: '璇疯緭鍏�',
+ 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锛�',
@@ -300,18 +300,32 @@
placeholder: '璇疯緭鍏ュ娉�',
},
{
- label: '鍒涘缓浜�',
- prop: 'creatorName',
- el: 'input',
+ label: '鍒犻櫎鏃堕棿',
+ prop: 'deletionTime',
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(datePicker, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
//disabled: disabled,
- placeholder: '璇疯緭鍏ュ垱寤轰汉',
+ placeholder: '璇疯緭鍏ュ垹闄ゆ椂闂�',
},
{
- label: '淇敼浜�',
- prop: 'lastModifierName',
+ label: '鎿嶄綔澶囨敞',
+ prop: 'operationRemark',
el: 'input',
//disabled: disabled,
- placeholder: '璇疯緭鍏ヤ慨鏀逛汉',
+ placeholder: '璇疯緭鍏ユ搷浣滃娉�',
+ },
+ {
+ label: '鍒犻櫎澶囨敞',
+ prop: 'deleteRemark',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ垹闄ゅ娉�',
},
{
label: '鎵╁睍瀛楁1',
@@ -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,
@@ -405,13 +405,12 @@
redundantField2: formData.value.redundantField2,
redundantField3: formData.value.redundantField3,
remark: formData.value.remark,
-creatorName: formData.value.creatorName,
-lastModifierName: formData.value.lastModifierName,
+deletionTime: formData.value.deletionTime,
+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 +467,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,
@@ -488,13 +487,12 @@
redundantField2: res.redundantField2,
redundantField3: res.redundantField3,
remark: res.remark,
-creatorName: res.creatorName,
-lastModifierName: res.lastModifierName,
+deletionTime: res.deletionTime,
+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