From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt | 146 ++++++++++++++++++++++--------------------------
1 files changed, 66 insertions(+), 80 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 0b6abb3..83af498 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"
@@ -10,9 +10,10 @@
import { columns } from './Config'
import TdButton from '@/components/TdButton/TdButton'
import { vPermission } from '@/libs/Permission/Permission'
+import dayjs from 'dayjs'
import {
getWmsEnumData
-} from '@/widgets/$NameSpacePath$/Models/Service/$EntityName$Drawer'
+} from '@/widgets/$EntityName$/Models/Service/$EntityName$Drawer'
import {
ElInput,
ElSelect,
@@ -22,6 +23,12 @@
ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
+// 引入公共选项配置
+import {
+ FILTER_MODE_OPTIONS_STRING_KEY
+} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
+// 引入公共高级查询工具文件
+import { commonSaveCurHighQueryData,setValueForCurHighQueryData,commonGetHighQueryForm,initQueryForm,GetFilteredData } from '@/utils/myHighQueryUtils';
interface RenderTableType {
url?: string
@@ -64,11 +71,7 @@
//定义高级查询引用
const $PageMenuInstanceName$QueryDrawerRef=ref(null);
- // 新增的查询条件
- const queryForm = ref({
- searchVal: '',
- str_searchFormInputAttrs:[]
- })
+
//定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题)
const _searchFormInputAttrs = ref([
$LikeQueryAttrs$
@@ -85,84 +88,45 @@
const fetchEnumData = async () => {
try {
$EntityNameClass_fetchEnumData$
- // 获取物料类型枚举
- const materialTypeData = await getWmsEnumData({
- EnumName: 'MaterialTypeEnum',
- })
- enumOptions.materialType = materialTypeData.map((item) => ({
- label: item.description,
- value: item.value,
- }))
-
- // 获取采购类型枚举
- const purchaseTypeData = await getWmsEnumData({
- EnumName: 'PurchaseTypeEnum',
- })
- enumOptions.purchaseType = purchaseTypeData.map((item) => ({
- label: item.description,
- value: item.value,
- }))
} catch (error) {
console.error('获取枚举数据失败:', error)
}
}
- // 组件挂载时获取枚举数据
- onMounted(() => {
- fetchEnumData()
- })
-
- // 定义响应式查询数据
- const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] });
- // 新版的查询方法（主页面中的按钮【查询】）
- const handleQueryForMain = async () => {
- _curHighQueryData.value.searchVal = queryForm.value.searchVal;
- _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value;
- tableRef.value.getList(_curHighQueryData.value)
- }
- // 新版的查询方法（高级查询中的按钮【查询】）
- const handleQuery = async (extraParams = {}) => {
- let filteredData = commonGetHighQueryForm(extraParams);
- commonSaveCurHighQueryData(filteredData);
- tableRef.value.getList(filteredData)
- }
- // 新版的查询重置
- const resetQuery = () => {
- queryForm.value.searchVal = ''
- queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value;
- }
- //新版的导出方法
- const handleExport=()=>{
- onExport(_curHighQueryData.value);
- }
- // 新版的查询弹出框关闭方法
- const closeQuery = (extraParams={}) => {
- let filteredData = commonGetHighQueryForm(extraParams);
- console.log("closeQuery方法");
- console.log(filteredData);
- commonSaveCurHighQueryData(filteredData);
- }
- //保存查询值
- const commonSaveCurHighQueryData=(filteredData={})=>{
- _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData };
- _curHighQueryData.value.searchVal = queryForm.value.searchVal
- _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value;
- }
- //获取高级查询弹出框的查询值
- const commonGetHighQueryForm=(extraParams={})=>{
- // 过滤掉 undefined 的值
- let filteredData = Object.assign(
- {},
- ...Object.entries(extraParams).map(([key, value]) =>
- value !== undefined ? { [key]: value } : {}
- )
- )
- //组合模糊查询
- filteredData.searchVal = queryForm.value.searchVal
- filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value;
- return filteredData;
- }
-
+ /*******************************************************[高级查询]开始********************************************************************************* */
+ // 组件挂载时获取枚举数据
+ onMounted(() => {
+ fetchEnumData()
+ resetQuery();
+ })
+ // 新增的查询条件
+ const queryForm = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
+ // 定义响应式查询数据
+ const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[],searchVal_FilterMode:'' });
+ // 新版的查询方法（主页面中的按钮【查询】）
+ const handleQueryForMain = async () => {
+ setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);
+ tableRef.value.getList(_curHighQueryData.value)
+ }
+ // 新版的查询方法（高级查询中的按钮【查询】）
+ const handleQuery = async (extraParams = {}) => {
+ let filteredData = GetFilteredData(extraParams,queryForm,_searchFormInputAttrs,_curHighQueryData);
+ tableRef.value.getList(filteredData)
+ }
+ // 新版的查询重置
+ const resetQuery = () => {
+ initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING_KEY);
+ setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);
+ }
+ //新版的导出方法
+ const handleExport=()=>{
+ onExport(_curHighQueryData.value);
+ }
+ // 新版的查询弹出框关闭方法
+ const closeQuery = (extraParams={}) => {
+ GetFilteredData(extraParams,queryForm,_searchFormInputAttrs,_curHighQueryData);
+ }
+ /*******************************************************[高级查询]结束********************************************************************************* */
/**
* @returns 表格
@@ -200,6 +164,7 @@
isHidePagination={isHidePagination}
pageSize={20}
v-slots={{
+ $QueryTableListForBool$
name: ({ row }: any) => {
return row?.name ? (
<TdButton
@@ -256,7 +221,6 @@
</IconButton>
<el-divider direction="vertical" />
- <el-divider direction="vertical" />
<el-upload
v-permission="$PageMenuInstanceName$-import"
name="file"
@@ -281,13 +245,35 @@
</div>
<ElFormItem style={{ marginTop: '15px' }}>
<ElFormItem label="关键字">
+ <el-tooltip
+ class="box-item"
+ effect="dark"
+ content={searchFormInputAttrs_Placeholder.value}
+ placement="top-start"
+ >
<ElInput
v-model={queryForm.value.searchVal}
placeholder={searchFormInputAttrs_Placeholder.value}
clearable
class={styles.formItem}
/>
+ </el-tooltip>
</ElFormItem>
+ <ElFormItem label="" style="width:100px;">
+ <ElSelect
+ v-model={queryForm.value.searchVal_FilterMode}
+ placeholder="请选择"
+ class={styles.formItem}
+ >
+ {FILTER_MODE_OPTIONS_STRING_KEY.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