From 90c84f7521d4979b2e40965e7255e196d07d9e75 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 13 5月 2025 11:21:27 +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 | 239 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 128 insertions(+), 111 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 342b6c5..7244d18 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,6 +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';
export const useWmsMaterialQueryDrawer = (props: any, ctx?: any) => {
const wmsMaterialDrawer = injectModel<WmsMaterialDrawer>('WmsMaterialDrawer')
@@ -84,6 +93,12 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ョ墿鏂欑紪鐮侊紙鍞竴鏍囪瘑锛�',
+ highSelectAttrs:{
+ prop: 'materialCode_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_STRING,
+ }
},
{
label: '鏄惁鏈夋晥鐗╂枡',
@@ -91,34 +106,27 @@
el: 'select',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}],
+ selectOptions: [{label: '鐪�',value: true}, {label: '鍋囧晩',value: false}]
},
{
- label: '鐗╂枡鍚嶇О',
- prop: 'materialName',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
- },
- {
- label: '鏁伴噺',
+ label: '鏄惁鑷骇',
prop: 'isSelfMade',
el: 'select',
//disabled: disabled,
- placeholder: '璇疯緭鍏ユ暟閲�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ placeholder: '璇疯緭鍏ユ槸鍚﹁嚜浜�',
+ options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}] ,
+ selectOptions: [{label: '鐪�',value: true}, {label: '鍋囧晩',value: false}]
},
{
- label: '閲囪喘绫诲瀷锛堟灇涓惧�硷級',
- prop: 'purchaseType',
- el: 'select',
- option: [],
- //disabled: disabled,
- placeholder: '璇疯緭鍏ラ噰璐被鍨嬶紙鏋氫妇鍊硷級',
- },
- {
- label: '鏄惁鏈夋晥鐗╂枡',
+ label: '鏁伴噺',
prop: 'num',
+ highSelectAttrs:{
+ prop: 'num_FilterMode',
+ el: 'select',
+ placeholder: '璇烽�夋嫨',
+ options:FILTER_MODE_OPTIONS_NUM,
+ },
el: (props: any, { attrs }: SetupContext) => {
return h(inputNumber, {
...props,
@@ -130,15 +138,7 @@
step: 1,
precision: 0,
//disabled: disabled,
- placeholder: '璇疯緭鍏ユ槸鍚︽湁鏁堢墿鏂�',
- },
- {
- label: '鐗╂枡绫诲瀷锛堟灇涓惧�硷級',
- prop: 'materialType',
- el: 'select',
- option: [],
- //disabled: disabled,
- placeholder: '璇疯緭鍏ョ墿鏂欑被鍨嬶紙鏋氫妇鍊硷級',
+ placeholder: '璇疯緭鍏ユ暟閲�',
},
{
label: '鑷湁鏁伴噺',
@@ -157,21 +157,14 @@
placeholder: '璇疯緭鍏ヨ嚜鏈夋暟閲�',
},
{
- label: '涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�',
- prop: 'primaryUnit',
+ label: '鐗╂枡鍚嶇О',
+ prop: 'materialName',
el: 'input',
//disabled: disabled,
- placeholder: '璇疯緭鍏ヤ富鍗曚綅锛堝锛歬g銆乵銆佷釜锛�',
+ placeholder: '璇疯緭鍏ョ墿鏂欏悕绉�',
},
{
- 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, {
@@ -184,7 +177,37 @@
step: 0.01,
precision: 2,
//disabled: disabled,
- placeholder: '璇疯緭鍏�',
+ placeholder: '璇疯緭鍏ュ彲绌洪暱搴�',
+ },
+ {
+ label: '閲囪喘绫诲瀷锛堟灇涓惧�硷級',
+ prop: 'purchaseType',
+ el: 'select',
+ option: [],
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ラ噰璐被鍨嬶紙鏋氫妇鍊硷級',
+ },
+ {
+ label: '鐗╂枡绫诲瀷锛堟灇涓惧�硷級',
+ prop: 'materialType',
+ el: 'select',
+ option: [],
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ョ墿鏂欑被鍨嬶紙鏋氫妇鍊硷級',
+ },
+ {
+ 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锛�',
@@ -285,20 +308,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: 'remark',
el: 'input',
@@ -311,7 +320,44 @@
el: 'select',
//disabled: disabled,
placeholder: '璇疯緭鍏ユ槸鍚︾鐢�',
- options: [{label: '鏄�',value: true}, {label: '鍚�',value: false}]
+ options:BOOLEAN_OPTIONS
+ },
+ {
+ label: '鎵╁睍灞炴��',
+ prop: 'extraProperties',
+ el: 'input',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ユ墿灞曞睘鎬�',
+ },
+ {
+ label: '鍒涘缓鏃堕棿',
+ prop: 'creationTime',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(dateTimePickerRange, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ュ垱寤烘椂闂�',
+ },
+ {
+ label: '淇敼鏃堕棿',
+ prop: 'lastModificationTime',
+ isDateControl: true, // 鏄惧紡鏍囪涓烘棩鏈熸帶浠�
+ el: (props: any, { attrs }: SetupContext) => {
+ return h(dateTimePickerRange, {
+ ...props,
+ clearable: true,
+ ...attrs,
+ })
+ },
+ width: '100%',
+ //disabled: disabled,
+ placeholder: '璇疯緭鍏ヤ慨鏀规椂闂�',
},
{
label: '鍒涘缓浜�',
@@ -326,41 +372,6 @@
el: 'input',
//disabled: disabled,
placeholder: '璇疯緭鍏ヤ慨鏀逛汉',
- },
- {
- label: '鎵╁睍瀛楁1',
- prop: 'extraField1',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�1',
- },
- {
- label: '鎵╁睍瀛楁2',
- prop: 'extraField2',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�2',
- },
- {
- label: '鎵╁睍瀛楁3',
- prop: 'extraField3',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ墿灞曞瓧娈�3',
- },
- {
- label: '鎿嶄綔澶囨敞',
- prop: 'operationRemark',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ユ搷浣滃娉�',
- },
- {
- label: '鍒犻櫎澶囨敞',
- prop: 'deleteRemark',
- el: 'input',
- //disabled: disabled,
- placeholder: '璇疯緭鍏ュ垹闄ゅ娉�',
},
])
/**
@@ -374,18 +385,20 @@
return check
}
const commonGetFormData=()=>{
+ //alert(formData.value.materialCode_FilterMode)
const data = {
materialCode: formData.value.materialCode || '',
+ materialCode_FilterMode: formData.value.materialCode_FilterMode || '',
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 || '',
@@ -396,16 +409,13 @@
redundantField1: formData.value.redundantField1 || '',
redundantField2: formData.value.redundantField2 || '',
redundantField3: formData.value.redundantField3 || '',
-creationTime: formData.value.creationTime || '',
remark: formData.value.remark || '',
isDisabled: formData.value.isDisabled || '',
+extraProperties: formData.value.extraProperties || '',
+creationTime: formData.value.creationTime || '',
+lastModificationTime: formData.value.lastModificationTime || '',
creatorName: formData.value.creatorName || '',
-lastModifierName: formData.value.lastModifierName || '',
-extraField1: formData.value.extraField1 || '',
-extraField2: formData.value.extraField2 || '',
-extraField3: formData.value.extraField3 || '',
-operationRemark: formData.value.operationRemark || '',
-deleteRemark: formData.value.deleteRemark || '',
+lastModifierName: formData.value.lastModifierName || '',
}
return data;
}
@@ -424,21 +434,28 @@
ctx.emit('confirmQuery', data)
}
/**
+ * 閲嶇疆鍏叡select鏌ヨ
+ */
+ const onResetForHighSelect = async () => {
+ formData.value.materialCode_FilterMode = 1
+ }
+ /**
* 閲嶇疆鏌ヨ
*/
const onReset = async () => {
formData.value = {}
+ onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
formData.value.MaterialCode = ''
formData.value.IsValid = ''
-formData.value.MaterialName = ''
formData.value.IsSelfMade = ''
-formData.value.PurchaseType = ''
formData.value.Num = ''
-formData.value.MaterialType = ''
formData.value.SelfNum = ''
+formData.value.MaterialName = ''
+formData.value.NullLength = ''
+formData.value.PurchaseType = ''
+formData.value.MaterialType = ''
formData.value.PrimaryUnit = ''
formData.value.Standard = ''
-formData.value.NullLength = ''
formData.value.OuterDiameter = ''
formData.value.WallThickness = ''
formData.value.MaterialQuality = ''
@@ -450,13 +467,12 @@
formData.value.RedundantField2 = ''
formData.value.RedundantField3 = ''
formData.value.Remark = ''
-formData.value.CreatorName = ''
-formData.value.LastModifierName = ''
+formData.value.DeletionTime = ''
+formData.value.OperationRemark = ''
+formData.value.DeleteRemark = ''
formData.value.ExtraField1 = ''
formData.value.ExtraField2 = ''
-formData.value.ExtraField3 = ''
-formData.value.OperationRemark = ''
-formData.value.DeleteRemark = ''
+formData.value.ExtraField3 = ''
//鍚戠埗缁勪欢鍙戦�佽嚜瀹氫箟浜嬩欢
ctx.emit('restQuery');
}
@@ -496,6 +512,7 @@
}
commonQueryEnumForFrom()
+ onResetForHighSelect();//閲嶇疆鍏叡select鏌ヨ
/**
* 寮圭獥鎵撳紑鑾峰彇璇︽儏
*/
--
Gitblit v1.9.3