HIA24016N_PipeLineDemo.git

			@@ -9,6 +9,7 @@
			import { columns } from './Config'
			import TdButton from '@/components/TdButton/TdButton'
			import { vPermission } from '@/libs/Permission/Permission'
			import dayjs from 'dayjs'
			import {
			getWmsEnumData,
			getWmsDataList,
			@@ -22,6 +23,8 @@
			ElFormItem,
			} from 'element-plus'
			import { injectModel } from '@/libs/Provider/Provider'
			import { FILTER_MODE_OPTIONS_STRING } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
			import WmsMaterialQueryDrawer from '../Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer'

			interface RenderTableType {
			url?: string
			@@ -43,6 +46,7 @@
			dataSource,
			contextMenu,
			dialogConfig,
			dialogConfigForQuery,
			tableRef,
			current,
			search,
			@@ -51,6 +55,7 @@
			onError,
			onSearch,
			onRowClick,
			onAdvancedQuery,
			onConfirmWmsMaterial,
			onCheck,
			onAddWmsMaterial,
			@@ -60,45 +65,46 @@
			onBeforeUpload,
			} = useWmsMaterial(props, ctx)

			//定义高级查询引用
			const wmsMaterialQueryDrawerRef = ref(null)
			// 新增的查询条件
			const queryForm = ref({
			materialNo: '',
			materialName: '',
			materialType: '',
			purchaseType: '',
			filter: '',
			searchVal: '',
			str_searchFormInputAttrs: [],
			searchVal_FilterMode: '',
			})

			const queryParams = computed(() => ({
			...queryForm.value,
			materialType: queryForm.value.materialType \|\| '', // 处理下拉
			purchaseType: queryForm.value.purchaseType \|\| '',
			}))
			//定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题)
			const _searchFormInputAttrs = ref(['MaterialNo', 'MaterialName'])
			const searchFormInputAttrs_Placeholder = ref('请输入物料编号/物料名称')

			// 动态枚举选项
			const enumOptions = reactive({
			materialType: [] as Array<{ label: string; value: any }>,
			purchaseType: [] as Array<{ label: string; value: any }>,
			materialType: [] as Array<{ label: string; value: any }>,
			isMainBranch: [] as Array<{ label: string; value: any }>,
			})

			// 获取枚举数据
			const fetchEnumData = async () => {
			try {
			// 获取物料类型枚举
			const materialTypeData = await getWmsEnumData({
			EnumName: 'MaterialTypeEnum',
			const purchaseTypeEnumData = await getWmsEnumData({
			EnumName: 'PurchaseTypeEnum',
			})
			enumOptions.materialType = materialTypeData.map((item) => ({
			enumOptions.purchaseType = purchaseTypeEnumData.map((item) => ({
			label: item.description,
			value: item.value,
			}))

			// 获取采购类型枚举
			const purchaseTypeData = await getWmsEnumData({
			EnumName: 'PurchaseTypeEnum',
			const materialTypeEnumData = await getWmsEnumData({
			EnumName: 'MaterialTypeEnum',
			})
			enumOptions.purchaseType = purchaseTypeData.map((item) => ({
			enumOptions.materialType = materialTypeEnumData.map((item) => ({
			label: item.description,
			value: item.value,
			}))
			const yesNoEnumData = await getWmsEnumData({
			EnumName: 'YesNoEnum',
			})
			enumOptions.isMainBranch = yesNoEnumData.map((item) => ({
			label: item.description,
			value: item.value,
			}))
			@@ -107,27 +113,79 @@
			}
			}

			// 定义响应式查询数据
			const _curHighQueryData = ref({
			searchVal: '',
			str_searchFormInputAttrs: [],
			searchVal_FilterMode: '',
			})
			// 组件挂载时获取枚举数据
			onMounted(() => {
			fetchEnumData()
			queryForm.value.searchVal_FilterMode =
			FILTER_MODE_OPTIONS_STRING[0]?.value \|\| ''
			_curHighQueryData.value.searchVal_FilterMode =
			queryForm.value.searchVal_FilterMode
			_curHighQueryData.value.str_searchFormInputAttrs =
			_searchFormInputAttrs.value
			})

			// 新增的查询方法
			const handleQuery = async () => {
			console.log('查询条件:', queryParams.value)
			// tableRef.value.getTableList()
			tableRef.value.getList(queryParams.value)
			// 新版的查询方法（主页面中的按钮【查询】）
			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)
			}

			// 重置查询条件
			// 新版的查询方法（高级查询中的按钮【查询】）
			const handleQuery = async (extraParams = {}) => {
			let filteredData = commonGetHighQueryForm(extraParams)
			commonSaveCurHighQueryData(filteredData)
			tableRef.value.getList(filteredData)
			}
			// 新版的查询重置
			const resetQuery = () => {
			queryForm.value = {
			materialNo: '',
			materialName: '',
			materialType: '',
			purchaseType: '',
			filter: '',
			}
			queryForm.value.searchVal = ''
			queryForm.value.searchVal_FilterMode =
			FILTER_MODE_OPTIONS_STRING[0]?.value \|\| ''
			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.searchVal_FilterMode =
			queryForm.value.searchVal_FilterMode
			_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.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
			filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
			return filteredData
			}

			/**
			@@ -153,7 +211,7 @@
			<BaseTable
			ref={tableRef}
			url={url}
			sortUrlTpl="/api/v1/hIAWms/wmsMaterial/{id}/adjustsort/{sort}"
			sortUrlTpl="/api/v1/HIAWms/wmsMaterial/{id}/adjustsort/{sort}"
			v-model:dataSource={dataSource.value}
			columns={columns}
			contextMenu={contextMenu}
			@@ -166,6 +224,57 @@
			isHidePagination={isHidePagination}
			pageSize={20}
			v-slots={{
			isDisabled: ({ row }: any) => {
			return (
			<div>
			{row.isDisabled != null
			? row.isDisabled
			? '是'
			: '否'
			: '-'}
			</div>
			)
			},
			creationTime: ({ row }: any) => {
			return (
			<div>
			{row.creationTime != null
			? dayjs(row.creationTime).format('YYYY-MM-DD HH:mm:ss')
			: '-'}
			</div>
			)
			},
			lastModificationTime: ({ row }: any) => {
			return (
			<div>
			{row.lastModificationTime != null
			? dayjs(row.lastModificationTime).format(
			'YYYY-MM-DD HH:mm:ss'
			)
			: '-'}
			</div>
			)
			},
			isDeleted: ({ row }: any) => {
			return (
			<div>
			{row.isDeleted != null
			? row.isDeleted
			? '是'
			: '否'
			: '-'}
			</div>
			)
			},
			deletionTime: ({ row }: any) => {
			return (
			<div>
			{row.deletionTime != null
			? dayjs(row.deletionTime).format('YYYY-MM-DD HH:mm:ss')
			: '-'}
			</div>
			)
			},
			name: ({ row }: any) => {
			return row?.name ? (
			<TdButton
			@@ -198,95 +307,17 @@
			sort={sort.value}
			onConfirm={onConfirmWmsMaterial}
			/>

			{/* 新增的查询表单 */}
			<ElForm
			inline
			model={queryForm.value}
			class={styles.queryForm}
			label-width="80px"
			>
			<ElFormItem label="关键字">
			<ElInput
			v-model={queryForm.value.filter}
			placeholder="请输入关键字搜索"
			clearable
			class={styles.formItem}
			/>
			</ElFormItem>
			<ElFormItem label="物料编码">
			<ElInput
			v-model={queryForm.value.materialNo}
			placeholder="请输入物料编码"
			clearable
			class={styles.formItem}
			/>
			</ElFormItem>
			<ElFormItem label="物料名称">
			<ElInput
			v-model={queryForm.value.materialName}
			placeholder="请输入物料名称"
			clearable
			class={styles.formItem}
			/>
			</ElFormItem>
			<ElFormItem label="物料类型">
			<ElSelect
			v-model={queryForm.value.materialType}
			placeholder="请选择物料类型"
			clearable
			loading={enumOptions.materialType.length === 0}
			class={styles.formItem}
			>
			{enumOptions.materialType.map((option) => (
			<ElOption
			key={option.value}
			label={option.label}
			value={option.value}
			/>
			))}
			</ElSelect>
			</ElFormItem>
			<ElFormItem label="采购类型">
			<ElSelect
			v-model={queryForm.value.purchaseType}
			placeholder="请选择采购类型"
			clearable
			loading={enumOptions.purchaseType.length === 0}
			class={styles.formItem}
			>
			{enumOptions.purchaseType.map((option) => (
			<ElOption
			key={option.value}
			label={option.label}
			value={option.value}
			/>
			))}
			</ElSelect>
			</ElFormItem>
			{/* <ElFormItem label="日期范围">
			<ElDatePicker
			v-model={queryForm.value.dateRange}
			type="daterange"
			range-separator="至"
			start-placeholder="开始日期"
			end-placeholder="结束日期"
			value-format="YYYY-MM-DD"
			/>
			</ElFormItem> */}
			<ElFormItem>
			<IconButton type="primary" icon="search" onClick={handleQuery}>
			查询
			</IconButton>
			<IconButton
			style="margin-left: 10px;"
			icon="refresh"
			onClick={resetQuery}
			>
			重置
			</IconButton>
			</ElFormItem>
			</ElForm>
			{/* 高级查询 */}
			<WmsMaterialQueryDrawer
			ref="wmsMaterialQueryDrawerRef"
			v-model={dialogConfigForQuery.visible}
			title={dialogConfigForQuery.title}
			row={current.value}
			sort={sort.value}
			onConfirmQuery={handleQuery}
			onRestQuery={resetQuery}
			onClose={closeQuery}
			/>

			<div class={styles.headerContent}>
			<div class={styles.header}>
			@@ -299,6 +330,7 @@
			添加
			</IconButton>
			<el-divider direction="vertical" />

			<el-upload
			v-permission="wmsMaterial-import"
			name="file"
			@@ -308,7 +340,7 @@
			onSuccess={onSuccess}
			before-upload={onBeforeUpload}
			headers={headers.value}
			action="/api/v1/hIAWms/wmsMaterial/import"
			action="/api/v1/HIAWms/wmsMaterial/import"
			>
			<IconButton icon="in">导入</IconButton>
			</el-upload>
			@@ -316,21 +348,65 @@
			<IconButton
			v-permission="wmsMaterial-output"
			icon="out"
			onClick={onExport}
			onClick={handleExport}
			>
			导出
			</IconButton>
			</div>
			{/* <Search
			placeholder="请输入关键字"
			v-model={search.value}
			onConfirm={onSearch}
			style={{ marginTop: '-1px' }}
			/> */}
			<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.map((option) => (
			<ElOption
			key={option.value}
			label={option.label}
			value={option.value}
			/>
			))}
			</ElSelect>
			</ElFormItem>
			<IconButton
			type="primary"
			icon="search"
			onClick={handleQueryForMain}
			>
			查询
			</IconButton>
			{/* <IconButton style="" icon="refresh" onClick={resetQuery}>
			重置
			</IconButton> */}
			<IconButton
			v-permission="wmsMaterial-add"
			icon="search"
			onClick={onAdvancedQuery}
			type="primary"
			>
			高级查询
			</IconButton>
			</ElFormItem>
			</div>

			<RenderBaseTable
			url="/api/v1/hIAWms/wmsMaterial/page"
			url="/api/v1/HIAWms/wmsMaterial/page"
			dataSource={dataSource}
			isChecked={true}
			isDrag={true}