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
---
HIAWms/hiawms_web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx | 344 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 210 insertions(+), 134 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx b/HIAWms/hiawms_web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx
index a2e2c16..af9a6ca 100644
--- a/HIAWms/hiawms_web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx
+++ b/HIAWms/hiawms_web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx
@@ -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_KEY } 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({
- materialCode: '',
- 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_KEY[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 = {
- materialCode: '',
- materialName: '',
- materialType: '',
- purchaseType: '',
- filter: '',
- }
+ queryForm.value.searchVal = ''
+ queryForm.value.searchVal_FilterMode =
+ FILTER_MODE_OPTIONS_STRING_KEY[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.materialCode}
- 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_KEY.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}
--
Gitblit v1.9.3