From b5d60a301038646695c7bda682ac59fa311cfbbf Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周二, 13 5月 2025 12:55:50 +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 | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 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..6bb0efc 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, @@ -85,23 +86,6 @@ 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) } @@ -200,6 +184,7 @@ isHidePagination={isHidePagination} pageSize={20} v-slots={{ + $QueryTableListForBool$ name: ({ row }: any) => { return row?.name ? ( <TdButton @@ -256,7 +241,6 @@ </IconButton> <el-divider direction="vertical" /> - <el-divider direction="vertical" /> <el-upload v-permission="$PageMenuInstanceName$-import" name="file" @@ -281,12 +265,19 @@ </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> <IconButton type="primary" icon="search" onClick={handleQueryForMain}> 查询 -- Gitblit v1.9.3