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/WmsTask/Views/Pages/WmsTask/WmsTask.tsx | 78 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx b/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
index f4cf6aa..7ce7e00 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx
@@ -5,6 +5,7 @@
import { useWmsTask } from '../../../Controllers/WmsTask'
import IconButton from '@/components/IconButton/IconButton'
import WmsTaskDrawer from '../Dialog/WmsTaskDrawer/WmsTaskDrawer'
+import ChangeToPlaceDialog from '../Dialog/ChangeToPlaceDialog/ChangeToPlaceDialog'
import WmsTaskQueryDrawer from '../Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer'
import Search from '@/components/Search/Search'
import { columns } from './Config'
@@ -21,6 +22,7 @@
ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
+import { FILTER_MODE_OPTIONS_STRING_KEY } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
interface RenderTableType {
url?: string
@@ -43,6 +45,7 @@
contextMenu,
dialogConfig,
dialogConfigForQuery,
+ dialogChangeToPlaceConfig,
tableRef,
current,
search,
@@ -67,15 +70,19 @@
const queryForm = ref({
searchVal: '',
str_searchFormInputAttrs: [],
+ searchVal_FilterMode: '',
})
//瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
- const _searchFormInputAttrs = ref(['TaskNo', 'ContainerNo'])
- const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ヤ换鍔＄紪鐮�/鎵樼洏缂栫爜')
+ const _searchFormInputAttrs = ref(['taskNo', 'SourcePlace', 'ToPlace'])
+ const searchFormInputAttrs_Placeholder =
+ ref('璇疯緭鍏ヤ换鍔″彿/璧峰搴撲綅鍙�/鐩爣搴撲綅鍙�')
// 鍔ㄦ�佹灇涓鹃�夐」
const enumOptions = reactive({
taskType: [] as Array<{ label: string; value: any }>,
taskStatus: [] as Array<{ label: string; value: any }>,
+ dodevicetype: [] as Array<{ label: string; value: any }>,
+ taskDodeviceStatus: [] as Array<{ label: string; value: any }>,
sonTaskType: [] as Array<{ label: string; value: any }>,
})
@@ -96,6 +103,20 @@
label: item.description,
value: item.value,
}))
+ const dodevicetypeEnumData = await getWmsEnumData({
+ EnumName: 'DodevicetypeEnum',
+ })
+ enumOptions.dodevicetype = dodevicetypeEnumData.map((item) => ({
+ label: item.description,
+ value: item.value,
+ }))
+ const taskDodeviceStatusData = await getWmsEnumData({
+ EnumName: 'TaskDodeviceStatus',
+ })
+ enumOptions.taskDodeviceStatus = taskDodeviceStatusData.map((item) => ({
+ label: item.description,
+ value: item.value,
+ }))
const sonTaskTypeEnumData = await getWmsEnumData({
EnumName: 'SonTaskTypeEnum',
})
@@ -108,19 +129,28 @@
}
}
- // 缁勪欢鎸傝浇鏃惰幏鍙栨灇涓炬暟鎹�
- onMounted(() => {
- fetchEnumData()
- })
-
// 瀹氫箟鍝嶅簲寮忔煡璇㈡暟鎹�
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 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)
@@ -134,6 +164,8 @@
// 鏂扮増鐨勬煡璇㈤噸缃�
const resetQuery = () => {
queryForm.value.searchVal = ''
+ queryForm.value.searchVal_FilterMode =
+ FILTER_MODE_OPTIONS_STRING_KEY[0]?.value || ''
queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
}
//鏂扮増鐨勫鍑烘柟娉�
@@ -151,6 +183,8 @@
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
}
@@ -165,6 +199,7 @@
)
//缁勫悎妯＄硦鏌ヨ
filteredData.searchVal = queryForm.value.searchVal
+ filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
return filteredData
}
@@ -264,6 +299,16 @@
onRestQuery={resetQuery}
onClose={closeQuery}
/>
+ <ChangeToPlaceDialog
+ ref="changeToPlace"
+ v-model={dialogChangeToPlaceConfig.visible}
+ title={dialogChangeToPlaceConfig.title}
+ row={current.value}
+ sort={sort.value}
+ onConfirmQuery={handleQuery}
+ onRestQuery={resetQuery}
+ onClose={closeQuery}
+ />
<div class={styles.headerContent}>
<div class={styles.header}>
@@ -292,7 +337,7 @@
<IconButton icon="in">瀵煎叆</IconButton>
</el-upload> */}
- <IconButton
+ {/* <IconButton
v-permission="wmsTask-output"
icon="out"
onClick={handleExport}
@@ -305,7 +350,7 @@
onClick={handleExport}
>
鍙栨秷
- </IconButton>
+ </IconButton> */}
</div>
<ElFormItem style={{ marginTop: '15px' }}>
<ElFormItem label="鍏抽敭瀛�">
@@ -316,6 +361,21 @@
class={styles.formItem}
/>
</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"
--
Gitblit v1.9.3