From e0f3ef553c8cfb185b68fae245bfdf37c1496834 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 13:09:42 +0800
Subject: [PATCH] 优化
---
Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt | 29 +++++++++++++-
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial导出模板.xlsx | 0
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Views/Pages/WmsMaterial/WmsMaterial.tsx | 58 ++++++++++++++---------------
3 files changed, 55 insertions(+), 32 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/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
index 6bb0efc..cd5479b 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/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
@@ -23,6 +23,10 @@
ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
+// 引入公共选项配置
+import {
+ FILTER_MODE_OPTIONS_STRING
+} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
interface RenderTableType {
url?: string
@@ -68,7 +72,8 @@
// 新增的查询条件
const queryForm = ref({
searchVal: '',
- str_searchFormInputAttrs:[]
+ str_searchFormInputAttrs:[],
+ searchVal_FilterMode:''
})
//定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题)
const _searchFormInputAttrs = ref([
@@ -94,13 +99,15 @@
// 组件挂载时获取枚举数据
onMounted(() => {
fetchEnumData()
+ queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
})
// 定义响应式查询数据
- const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] });
+ const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
// 新版的查询方法（主页面中的按钮【查询】）
const handleQueryForMain = async () => {
_curHighQueryData.value.searchVal = queryForm.value.searchVal;
+ _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;
_curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
tableRef.value.getList(_curHighQueryData.value)
}
@@ -113,6 +120,7 @@
// 新版的查询重置
const resetQuery = () => {
queryForm.value.searchVal = ''
+ queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value;
}
//新版的导出方法
@@ -130,6 +138,7 @@
const commonSaveCurHighQueryData=(filteredData={})=>{
_curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData };
_curHighQueryData.value.searchVal = queryForm.value.searchVal
+ _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
_curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value;
}
//获取高级查询弹出框的查询值
@@ -143,6 +152,7 @@
)
//组合模糊查询
filteredData.searchVal = queryForm.value.searchVal
+ filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value;
return filteredData;
}
@@ -279,6 +289,21 @@
/>
</el-tooltip>
</ElFormItem>
+ <ElFormItem label="" style="width:100px;">
+ <ElSelect
+ v-model={queryForm.value.searchVal_FilterMode}
+ placeholder="请选择"
+ class={styles.formItem}
+ >
+ {FILTER_MODE_OPTIONS_STRING.map((option) => (
+ <ElOption
+ key={option.value}
+ label={option.label}
+ value={option.value}
+ />
+ ))}
+ </ElSelect>
+ </ElFormItem>
<IconButton type="primary" icon="search" onClick={handleQueryForMain}>
查询
</IconButton>
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/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "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/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
index c542f05..65df394 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/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ "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/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
Binary files differ
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/Views/Pages/WmsMaterial/WmsMaterial.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/Views/Pages/WmsMaterial/WmsMaterial.tsx"
index 3c08d0a..c3411d3 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/Views/Pages/WmsMaterial/WmsMaterial.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/Views/Pages/WmsMaterial/WmsMaterial.tsx"
@@ -23,10 +23,10 @@
ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
-// 寮曞叆鍏叡閫夐」閰嶇疆
-import {
- FILTER_MODE_OPTIONS_STRING
-} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import {
+ FILTER_MODE_OPTIONS_STRING
+} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
interface RenderTableType {
url?: string
@@ -72,8 +72,8 @@
// 鏂板鐨勬煡璇㈡潯浠�
const queryForm = ref({
searchVal: '',
- str_searchFormInputAttrs:[],
- searchVal_FilterMode:''
+ str_searchFormInputAttrs:[],
+ searchVal_FilterMode:''
})
//瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
const _searchFormInputAttrs = ref([
@@ -122,15 +122,15 @@
// 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
onMounted(() => {
fetchEnumData()
- queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
+ queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
})
// 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
- const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
+ const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
// 鏂扮増鐨勬煡璇㈡柟娉曪紙涓婚〉闈腑鐨勬寜閽�愭煡璇€�戯級
const handleQueryForMain = async () => {
_curHighQueryData.value.searchVal = queryForm.value.searchVal;
- _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;
+ _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode;
_curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
tableRef.value.getList(_curHighQueryData.value)
}
@@ -143,7 +143,7 @@
// 鏂扮増鐨勬煡璇㈤噸缃�
const resetQuery = () => {
queryForm.value.searchVal = ''
- queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
+ queryForm.value.searchVal_FilterMode = FILTER_MODE_OPTIONS_STRING[0]?.value || '';
queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value;
}
//鏂扮増鐨勫鍑烘柟娉�
@@ -161,7 +161,7 @@
const commonSaveCurHighQueryData=(filteredData={})=>{
_curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData };
_curHighQueryData.value.searchVal = queryForm.value.searchVal
- _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
+ _curHighQueryData.value.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
_curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value;
}
//鑾峰彇楂樼骇鏌ヨ寮瑰嚭妗嗙殑鏌ヨ鍊�
@@ -175,7 +175,7 @@
)
//缁勫悎妯＄硦鏌ヨ
filteredData.searchVal = queryForm.value.searchVal
- filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
+ filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value;
return filteredData;
}
@@ -351,14 +351,13 @@
</IconButton>
</div>
<ElFormItem style={{ marginTop: '15px' }}>
- <ElFormItem label="鍏抽敭瀛�" >
+ <ElFormItem label="鍏抽敭瀛�">
<el-tooltip
class="box-item"
effect="dark"
content={searchFormInputAttrs_Placeholder.value}
placement="top-start"
>
- {/* <ElSelect></ElSelect> */}
<ElInput
v-model={queryForm.value.searchVal}
placeholder={searchFormInputAttrs_Placeholder.value}
@@ -367,22 +366,21 @@
/>
</el-tooltip>
</ElFormItem>
- <ElFormItem label="" style="width:100px;">
- <ElSelect
- v-model={queryForm.value.searchVal_FilterMode}
- placeholder="璇烽�夋嫨"
- class={styles.formItem}
- >
- {FILTER_MODE_OPTIONS_STRING.map((option) => (
- <ElOption
- key={option.value}
- label={option.label}
- value={option.value}
- />
- ))}
- </ElSelect>
- </ElFormItem>
-
+ <ElFormItem label="" style="width:100px;">
+ <ElSelect
+ v-model={queryForm.value.searchVal_FilterMode}
+ placeholder="璇烽�夋嫨"
+ class={styles.formItem}
+ >
+ {FILTER_MODE_OPTIONS_STRING.map((option) => (
+ <ElOption
+ key={option.value}
+ label={option.label}
+ value={option.value}
+ />
+ ))}
+ </ElSelect>
+ </ElFormItem>
<IconButton type="primary" icon="search" onClick={handleQueryForMain}>
鏌ヨ
</IconButton>
--
Gitblit v1.9.3