From 0cd95d98fdf7ed22d53398242feb2a3ca185cf09 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 13 5月 2025 15:38:35 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialQueryDrawer.tsx | 329 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 245 insertions(+), 84 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 7244d18..74147d8 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"
@@ -14,15 +14,15 @@
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
-// 寮曞叆鍏叡閫夐」閰嶇疆
-import {
- FILTER_MODE_OPTIONS_STRING,
- FILTER_MODE_OPTIONS_NUM,
- FILTER_MODE_OPTIONS_BOOL
-} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
-import {
- BOOLEAN_OPTIONS
-} from '@/utils/commonOptionConstants';
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import {
+ FILTER_MODE_OPTIONS_STRING,
+ FILTER_MODE_OPTIONS_NUM,
+ FILTER_MODE_OPTIONS_BOOL
+} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
+import {
+ BOOLEAN_OPTIONS
+} from '@/utils/commonOptionConstants';
export const useWmsMaterialQueryDrawer = (props: any, ctx?: any) => {
const wmsMaterialDrawer = injectModel<WmsMaterialDrawer>('WmsMaterialDrawer')
@@ -84,7 +84,7 @@
},
})
/**
- * 娣诲姞鐨刦orm瀛楁
+ * 楂樼骇鏌ヨ鐨刦orm瀛楁
*/
const formItems = reactive([
{
@@ -93,12 +93,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮侊紙鍞竴鏍囪瘑锛�',
- highSelectAttrs:{
- prop: 'materialCode_FilterMode',
- el: 'select',
- placeholder: '璇烽�夋嫨',
- options:FILTER_MODE_OPTIONS_STRING,
- }
+ highSelectAttrs:{
+ prop: 'materialCode_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '鏄惁鏈夋晥鐗╂枡',
@@ -106,8 +106,14 @@
el: 'select',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}],
- selectOptions: [{label: '鐪�',value: true}, {label: '鍋囧晩',value: false}]
+ clearable:true,
+ options: BOOLEAN_OPTIONS,
+ highSelectAttrs:{
+ prop: 'isValid_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_BOOL
+ }
},
{
label: '鏄惁鑷骇',
@@ -115,18 +121,18 @@
el: 'select',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚﹁嚜浜�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] ,
- selectOptions: [{label: '鐪�',value: true}, {label: '鍋囧晩',value: false}]
+ clearable:true,
+ options: BOOLEAN_OPTIONS,
+ highSelectAttrs:{
+ prop: 'isSelfMade_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_BOOL
+ }
},
{
label: '鏁伴噺',
prop: 'num',
- highSelectAttrs:{
- prop: 'num_FilterMode',
- el: 'select',
- placeholder: '璇烽�夋嫨',
- options:FILTER_MODE_OPTIONS_NUM,
- },
el: (props: any, { attrs }: SetupContext) => {
return h(inputNumber, {
...props,
@@ -139,6 +145,12 @@
precision: 0,
//disabled: disabled,
placeholder: '璇疯緭鍏ユ暟閲�',
+ highSelectAttrs:{
+ prop: 'num_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_NUM
+ }
},
{
label: '鑷湁鏁伴噺',
@@ -155,6 +167,12 @@
precision: 0,
//disabled: disabled,
placeholder: '璇疯緭鍏ヨ嚜鏈夋暟閲�',
+ highSelectAttrs:{
+ prop: 'selfNum_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_NUM
+ }
},
{
label: '鐗╂枡鍚嶇О',
@@ -162,6 +180,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
+ highSelectAttrs:{
+ prop: 'materialName_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '鍙┖闀垮害',
@@ -178,22 +202,42 @@
precision: 2,
//disabled: disabled,
placeholder: '璇疯緭鍏ュ彲绌洪暱搴�',
+ highSelectAttrs:{
+ prop: 'nullLength_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_NUM
+ }
},
{
label: '閲囪喘绫诲瀷锛堟灇涓惧�硷級',
prop: 'purchaseType',
el: 'select',
+ clearable:true,
option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ラ噰璐被鍨嬶紙鏋氫妇鍊硷級',
+ highSelectAttrs:{
+ prop: 'purchaseType_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_BOOL
+ }
},
{
label: '鐗╂枡绫诲瀷锛堟灇涓惧�硷級',
prop: 'materialType',
el: 'select',
+ clearable:true,
option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑被鍨嬶紙鏋氫妇鍊硷級',
+ highSelectAttrs:{
+ prop: 'materialType_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_BOOL
+ }
},
{
label: '涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�',
@@ -201,6 +245,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ富鍗曚綅锛堝锛歬g銆乵銆佷釜锛�',
+ highSelectAttrs:{
+ prop: 'primaryUnit_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�',
@@ -208,6 +258,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヨ鏍�/鏍囧噯锛堝锛欸B/T 8163-2018锛�',
+ highSelectAttrs:{
+ prop: 'standard_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '澶栧緞锛堝崟浣嶏細mm锛�',
@@ -224,6 +280,12 @@
precision: 2,
//disabled: disabled,
placeholder: '璇疯緭鍏ュ寰勶紙鍗曚綅锛歮m锛�',
+ highSelectAttrs:{
+ prop: 'outerDiameter_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_NUM
+ }
},
{
label: '澹佸帤锛堝崟浣嶏細mm锛�',
@@ -240,6 +302,12 @@
precision: 2,
//disabled: disabled,
placeholder: '璇疯緭鍏ュ鍘氾紙鍗曚綅锛歮m锛�',
+ highSelectAttrs:{
+ prop: 'wallThickness_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_NUM
+ }
},
{
label: '鏉愯川锛堝锛�304涓嶉攬閽級',
@@ -247,6 +315,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ潗璐紙濡傦細304涓嶉攬閽級',
+ highSelectAttrs:{
+ prop: 'materialQuality_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '闀垮害锛堝崟浣嶏細m锛�',
@@ -263,14 +337,27 @@
precision: 2,
//disabled: disabled,
placeholder: '璇疯緭鍏ラ暱搴︼紙鍗曚綅锛歮锛�',
+ highSelectAttrs:{
+ prop: 'length_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_NUM
+ }
},
{
label: '鏄惁涓轰富鏀',
prop: 'isMainBranch',
el: 'select',
+ clearable:true,
option: [],
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚︿负涓绘敮绠�',
+ highSelectAttrs:{
+ prop: 'isMainBranch_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_BOOL
+ }
},
{
label: '鐢熶骇宸ュ巶',
@@ -278,6 +365,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ敓浜у伐鍘�',
+ highSelectAttrs:{
+ prop: 'factory_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '璇佷功缂栧彿',
@@ -285,6 +378,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヨ瘉涔︾紪鍙�',
+ highSelectAttrs:{
+ prop: 'certification_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��',
@@ -292,6 +391,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ啑浣欏瓧娈�1 - 棰勭暀鎵╁睍鐢ㄩ��',
+ highSelectAttrs:{
+ prop: 'redundantField1_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��',
@@ -299,6 +404,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ啑浣欏瓧娈�2 - 棰勭暀鎵╁睍鐢ㄩ��',
+ highSelectAttrs:{
+ prop: 'redundantField2_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��',
@@ -306,6 +417,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ啑浣欏瓧娈�3 - 棰勭暀鎵╁睍鐢ㄩ��',
+ highSelectAttrs:{
+ prop: 'redundantField3_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '澶囨敞',
@@ -313,26 +430,16 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ娉�',
- },
- {
- label: '鏄惁绂佺敤',
- prop: 'isDisabled',
- el: 'select',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
- options:BOOLEAN_OPTIONS
- },
- {
- label: '鎵╁睍灞炴��',
- prop: 'extraProperties',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ墿灞曞睘鎬�',
+ highSelectAttrs:{
+ prop: 'remark_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '鍒涘缓鏃堕棿',
prop: 'creationTime',
- isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
el: (props: any, { attrs }: SetupContext) => {
return h(dateTimePickerRange, {
...props,
@@ -343,11 +450,11 @@
width: '100%',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ垱寤烘椂闂�',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
},
{
label: '淇敼鏃堕棿',
prop: 'lastModificationTime',
- isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
el: (props: any, { attrs }: SetupContext) => {
return h(dateTimePickerRange, {
...props,
@@ -358,6 +465,7 @@
width: '100%',
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ慨鏀规椂闂�',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
},
{
label: '鍒涘缓浜�',
@@ -365,6 +473,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ュ垱寤轰汉',
+ highSelectAttrs:{
+ prop: 'creatorName_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
{
label: '淇敼浜�',
@@ -372,6 +486,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ慨鏀逛汉',
+ highSelectAttrs:{
+ prop: 'lastModifierName_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING
+ }
},
])
/**
@@ -385,37 +505,57 @@
return check
}
const commonGetFormData=()=>{
- //alert(formData.value.materialCode_FilterMode)
const data = {
materialCode: formData.value.materialCode || '',
- materialCode_FilterMode: formData.value.materialCode_FilterMode || '',
+materialCode_FilterMode: formData.value.materialCode_FilterMode || '',
isValid: formData.value.isValid || '',
+isValid_FilterMode: formData.value.isValid_FilterMode || '',
isSelfMade: formData.value.isSelfMade || '',
+isSelfMade_FilterMode: formData.value.isSelfMade_FilterMode || '',
num: formData.value.num || '',
+num_FilterMode: formData.value.num_FilterMode || '',
selfNum: formData.value.selfNum || '',
+selfNum_FilterMode: formData.value.selfNum_FilterMode || '',
materialName: formData.value.materialName || '',
+materialName_FilterMode: formData.value.materialName_FilterMode || '',
nullLength: formData.value.nullLength || '',
+nullLength_FilterMode: formData.value.nullLength_FilterMode || '',
purchaseType: formData.value.purchaseType || '',
+purchaseType_FilterMode: formData.value.purchaseType_FilterMode || '',
materialType: formData.value.materialType || '',
+materialType_FilterMode: formData.value.materialType_FilterMode || '',
primaryUnit: formData.value.primaryUnit || '',
+primaryUnit_FilterMode: formData.value.primaryUnit_FilterMode || '',
standard: formData.value.standard || '',
+standard_FilterMode: formData.value.standard_FilterMode || '',
outerDiameter: formData.value.outerDiameter || '',
+outerDiameter_FilterMode: formData.value.outerDiameter_FilterMode || '',
wallThickness: formData.value.wallThickness || '',
+wallThickness_FilterMode: formData.value.wallThickness_FilterMode || '',
materialQuality: formData.value.materialQuality || '',
+materialQuality_FilterMode: formData.value.materialQuality_FilterMode || '',
length: formData.value.length || '',
+length_FilterMode: formData.value.length_FilterMode || '',
isMainBranch: formData.value.isMainBranch || '',
+isMainBranch_FilterMode: formData.value.isMainBranch_FilterMode || '',
factory: formData.value.factory || '',
+factory_FilterMode: formData.value.factory_FilterMode || '',
certification: formData.value.certification || '',
+certification_FilterMode: formData.value.certification_FilterMode || '',
redundantField1: formData.value.redundantField1 || '',
+redundantField1_FilterMode: formData.value.redundantField1_FilterMode || '',
redundantField2: formData.value.redundantField2 || '',
+redundantField2_FilterMode: formData.value.redundantField2_FilterMode || '',
redundantField3: formData.value.redundantField3 || '',
+redundantField3_FilterMode: formData.value.redundantField3_FilterMode || '',
remark: formData.value.remark || '',
-isDisabled: formData.value.isDisabled || '',
-extraProperties: formData.value.extraProperties || '',
+remark_FilterMode: formData.value.remark_FilterMode || '',
creationTime: formData.value.creationTime || '',
lastModificationTime: formData.value.lastModificationTime || '',
creatorName: formData.value.creatorName || '',
-lastModifierName: formData.value.lastModifierName || '',
+creatorName_FilterMode: formData.value.creatorName_FilterMode || '',
+lastModifierName: formData.value.lastModifierName || '',
+lastModifierName_FilterMode: formData.value.lastModifierName_FilterMode || '',
}
return data;
}
@@ -433,46 +573,67 @@
const data =commonGetFormData();
ctx.emit('confirmQuery', data)
}
- /**
- * 閲嶇疆鍏叡select鏌ヨ
- */
- const onResetForHighSelect = async () => {
- formData.value.materialCode_FilterMode = 1
- }
+ /**
+ * 閲嶇疆鍏叡select鏌ヨ
+ */
+ const onResetForHighSelect = async () => {
+ formData.value.materialCode_FilterMode = 1
+formData.value.isValid_FilterMode = 2
+formData.value.isSelfMade_FilterMode = 2
+formData.value.num_FilterMode = 2
+formData.value.selfNum_FilterMode = 2
+formData.value.materialName_FilterMode = 1
+formData.value.nullLength_FilterMode = 2
+formData.value.purchaseType_FilterMode = 2
+formData.value.materialType_FilterMode = 2
+formData.value.primaryUnit_FilterMode = 1
+formData.value.standard_FilterMode = 1
+formData.value.outerDiameter_FilterMode = 2
+formData.value.wallThickness_FilterMode = 2
+formData.value.materialQuality_FilterMode = 1
+formData.value.length_FilterMode = 2
+formData.value.isMainBranch_FilterMode = 2
+formData.value.factory_FilterMode = 1
+formData.value.certification_FilterMode = 1
+formData.value.redundantField1_FilterMode = 1
+formData.value.redundantField2_FilterMode = 1
+formData.value.redundantField3_FilterMode = 1
+formData.value.remark_FilterMode = 1
+formData.value.creatorName_FilterMode = 1
+formData.value.lastModifierName_FilterMode = 1
+ }
/**
* 閲嶇疆鏌ヨ
*/
const onReset = async () => {
formData.value = {}
- onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
- 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 = ''
-formData.value.Standard = ''
-formData.value.OuterDiameter = ''
-formData.value.WallThickness = ''
-formData.value.MaterialQuality = ''
-formData.value.Length = ''
-formData.value.IsMainBranch = ''
-formData.value.Factory = ''
-formData.value.Certification = ''
-formData.value.RedundantField1 = ''
-formData.value.RedundantField2 = ''
-formData.value.RedundantField3 = ''
-formData.value.Remark = ''
-formData.value.DeletionTime = ''
-formData.value.OperationRemark = ''
-formData.value.DeleteRemark = ''
-formData.value.ExtraField1 = ''
-formData.value.ExtraField2 = ''
-formData.value.ExtraField3 = ''
+ onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
+ 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 = ''
+formData.value.standard = ''
+formData.value.outerDiameter = ''
+formData.value.wallThickness = ''
+formData.value.materialQuality = ''
+formData.value.length = ''
+formData.value.isMainBranch = ''
+formData.value.factory = ''
+formData.value.certification = ''
+formData.value.redundantField1 = ''
+formData.value.redundantField2 = ''
+formData.value.redundantField3 = ''
+formData.value.remark = ''
+formData.value.creationTime = ''
+formData.value.lastModificationTime = ''
+formData.value.creatorName = ''
+formData.value.lastModifierName = ''
//鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
ctx.emit('restQuery');
}
@@ -512,7 +673,7 @@
}
commonQueryEnumForFrom()
- onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
+ onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
--
Gitblit v1.9.3