From 856cdf5c19fcc21255ef06335747040711fce530 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 14 5月 2025 15:14:56 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/hiawms_web/src/widgets/WmsContainer/Views/Pages/WmsContainer/WmsContainer.tsx | 336 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 213 insertions(+), 123 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsContainer/Views/Pages/WmsContainer/WmsContainer.tsx b/HIAWms/hiawms_web/src/widgets/WmsContainer/Views/Pages/WmsContainer/WmsContainer.tsx
index d3fe7d2..4abdbe0 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsContainer/Views/Pages/WmsContainer/WmsContainer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsContainer/Views/Pages/WmsContainer/WmsContainer.tsx
@@ -5,12 +5,24 @@
import { useWmsContainer } from '../../../Controllers/WmsContainer'
import IconButton from '@/components/IconButton/IconButton'
import WmsContainerDrawer from '../Dialog/WmsContainerDrawer/WmsContainerDrawer'
+import WmsContainerQueryDrawer from '../Dialog/WmsContainerQueryDrawer/WmsContainerQueryDrawer'
import Search from '@/components/Search/Search'
import { columns } from './Config'
import TdButton from '@/components/TdButton/TdButton'
import { vPermission } from '@/libs/Permission/Permission'
-import { getWmsEnumData } from '@/widgets/HIAWms/Models/Service/WmsMaterialDrawer'
-import { ElForm, ElFormItem, ElInput, ElOption, ElSelect } from 'element-plus'
+import dayjs from 'dayjs'
+import { getWmsEnumData } from '@/widgets/WmsContainer/Models/Service/WmsContainerDrawer'
+import {
+ ElInput,
+ ElSelect,
+ ElOption,
+ ElDatePicker,
+ ElForm,
+ ElFormItem,
+} from 'element-plus'
+import { injectModel } from '@/libs/Provider/Provider'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import { FILTER_MODE_OPTIONS_STRING } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
interface RenderTableType {
url?: string
@@ -32,6 +44,7 @@
dataSource,
contextMenu,
dialogConfig,
+ dialogConfigForQuery,
tableRef,
current,
search,
@@ -43,25 +56,24 @@
onConfirmWmsContainer,
onCheck,
onAddWmsContainer,
+ onAdvancedQuery,
onExport,
openDetail,
onSuccess,
onBeforeUpload,
} = useWmsContainer(props, ctx)
+ //瀹氫箟楂樼骇鏌ヨ寮曠敤
+ const wmsContainerQueryDrawerRef = ref(null)
// 鏂板鐨勬煡璇㈡潯浠�
const queryForm = ref({
- containerNo: '',
- containerType: '',
- containerStatus: '',
- filter: '',
+ searchVal: '',
+ str_searchFormInputAttrs: [],
+ searchVal_FilterMode: '',
})
-
- const queryParams = computed(() => ({
- ...queryForm.value,
- containerType: queryForm.value.containerType || '', // 澶勭悊涓嬫媺
- containerStatus: queryForm.value.containerStatus || '',
- }))
+ //瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
+ const _searchFormInputAttrs = ref(['ContainerNo'])
+ const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ユ墭鐩樼紪鍙�')
// 鍔ㄦ�佹灇涓鹃�夐」
const enumOptions = reactive({
@@ -72,20 +84,17 @@
// 鑾峰彇鏋氫妇鏁版嵁
const fetchEnumData = async () => {
try {
- // 鑾峰彇鐗╂枡绫诲瀷鏋氫妇
- const containerTypeData = await getWmsEnumData({
+ const containerTypeEnumData = await getWmsEnumData({
EnumName: 'ContainerTypeEnum',
})
- enumOptions.containerType = containerTypeData.map((item) => ({
+ enumOptions.containerType = containerTypeEnumData.map((item) => ({
label: item.description,
value: item.value,
}))
-
- // 鑾峰彇閲囪喘绫诲瀷鏋氫妇
- const containerStatusData = await getWmsEnumData({
+ const containerStatusEnumData = await getWmsEnumData({
EnumName: 'ContainerStatusEnum',
})
- enumOptions.containerStatus = containerStatusData.map((item) => ({
+ enumOptions.containerStatus = containerStatusEnumData.map((item) => ({
label: item.description,
value: item.value,
}))
@@ -94,26 +103,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 = {
- containerNo: '',
- containerType: '',
- containerStatus: '',
- 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
}
/**
@@ -129,7 +191,7 @@
params,
autoHeight,
} = props
- console.log(dataSource.value)
+
return (
<div
class={{
@@ -150,8 +212,59 @@
onCheck={onCheck}
onRowClick={onRowClick}
isHidePagination={isHidePagination}
- pageSize={50}
+ 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
@@ -172,6 +285,7 @@
</div>
)
}
+
return () => {
return (
<div class={styles.wmsContainerContent}>
@@ -183,87 +297,17 @@
sort={sort.value}
onConfirm={onConfirmWmsContainer}
/>
-
- {/* 鏂板鐨勬煡璇㈣〃鍗� */}
- <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.containerNo}
- placeholder="璇疯緭鍏ユ墭鐩樼紪鐮�"
- clearable
- class={styles.formItem}
- />
- </ElFormItem>
- <ElFormItem label="鐗╂枡绫诲瀷">
- <ElSelect
- v-model={queryForm.value.containerType}
- placeholder="璇烽�夋嫨鎵樼洏绫诲瀷"
- clearable
- loading={enumOptions.containerType.length === 0}
- class={styles.formItem}
- >
- {enumOptions.containerType.map((option) => (
- <ElOption
- key={option.value}
- label={option.label}
- value={option.value}
- />
- ))}
- </ElSelect>
- </ElFormItem>
- <ElFormItem label="鎵樼洏鐘舵��">
- <ElSelect
- v-model={queryForm.value.containerStatus}
- placeholder="璇烽�夋嫨鎵樼洏鐘舵��"
- clearable
- loading={enumOptions.containerStatus.length === 0}
- class={styles.formItem}
- >
- {enumOptions.containerStatus.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>
+ {/* 楂樼骇鏌ヨ */}
+ <WmsContainerQueryDrawer
+ ref="wmsContainerQueryDrawerRef"
+ 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}>
@@ -276,6 +320,7 @@
娣诲姞
</IconButton>
<el-divider direction="vertical" />
+
<el-upload
v-permission="wmsContainer-import"
name="file"
@@ -293,20 +338,65 @@
<IconButton
v-permission="wmsContainer-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="wmsContainer-add"
+ icon="search"
+ onClick={onAdvancedQuery}
+ type="primary"
+ >
+ 楂樼骇鏌ヨ
+ </IconButton>
+ </ElFormItem>
</div>
+
<RenderBaseTable
- url="/api/v1/HIAWms/wmsContainer"
+ url="/api/v1/HIAWms/wmsContainer/page"
dataSource={dataSource}
isChecked={true}
isDrag={true}
--
Gitblit v1.9.3