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/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.tsx | 80 ++++++++++++++++++++++++++++++++-------
1 files changed, 65 insertions(+), 15 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.tsx b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.tsx
index c464fc7..003b4ac 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsInOutStockOrderDetail/Views/Pages/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.tsx
@@ -21,6 +21,8 @@
ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'
+// 寮曞叆鍏叡閫夐」閰嶇疆
+import { FILTER_MODE_OPTIONS_STRING_KEY } from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions'
interface RenderTableType {
url?: string
@@ -62,15 +64,27 @@
} = useWmsInOutStockOrderDetail(props, ctx)
//瀹氫箟楂樼骇鏌ヨ寮曠敤
- const wmsInOutStockOrderDetailQueryDrawerRef = ref(null)
+ const WmsInOutStockOrderDetailQueryDrawerRef = ref(null)
// 鏂板鐨勬煡璇㈡潯浠�
const queryForm = ref({
searchVal: '',
str_searchFormInputAttrs: [],
+ searchVal_FilterMode: '',
})
//瀹氫箟鏁翠綋妯＄硦鏌ヨ鐨勫垪鏁扮粍(娉ㄦ剰锛氬繀椤诲ぇ灏忓啓璺熷悗绔殑瀹炰綋绫诲睘鎬у悕涓�鑷达紝鍚﹀垯浼氬鑷村尮閰嶄笉瀵圭殑闂)
- const _searchFormInputAttrs = ref(['OrderNo', 'MaterialNo', 'MaterialId'])
- const searchFormInputAttrs_Placeholder = ref('璇疯緭鍏ュ崟鎹彿/鐗╂枡缂栧彿/鐗╂枡ID')
+ const _searchFormInputAttrs = ref([
+ 'OrderNo',
+ 'MaterialId',
+ 'MaterialNo',
+ 'MaterialName',
+ 'ContainerNo',
+ 'MaterialModel',
+ 'MaterialBatch',
+ 'Remark',
+ ])
+ const searchFormInputAttrs_Placeholder = ref(
+ '璇疯緭鍏ュ崟鎹紪鍙�/鐗╂枡鍞竴鐮�/鐗╂枡浠跺彿/鐗╂枡鍚嶇О/瀹瑰櫒缂栧彿/鏈哄瀷/鐗╂枡鎵规/澶囨敞'
+ )
// 鍔ㄦ�佹灇涓鹃�夐」
const enumOptions = reactive({
@@ -92,19 +106,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)
@@ -118,6 +141,8 @@
// 鏂扮増鐨勬煡璇㈤噸缃�
const resetQuery = () => {
queryForm.value.searchVal = ''
+ queryForm.value.searchVal_FilterMode =
+ FILTER_MODE_OPTIONS_STRING_KEY[0]?.value || ''
queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
}
//鏂扮増鐨勫鍑烘柟娉�
@@ -135,6 +160,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
}
@@ -149,6 +176,7 @@
)
//缁勫悎妯＄硦鏌ヨ
filteredData.searchVal = queryForm.value.searchVal
+ filteredData.searchVal_FilterMode = queryForm.value.searchVal_FilterMode
filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
return filteredData
}
@@ -297,7 +325,7 @@
<el-divider direction="vertical" />
<el-divider direction="vertical" />
- <el-upload
+ {/* <el-upload
v-permission="wmsInOutStockOrderDetail-import"
name="file"
accept=".xlsx,.xls,.csv"
@@ -317,16 +345,38 @@
onClick={handleExport}
>
瀵煎嚭
- </IconButton>
+ </IconButton> */}
</div>
<ElFormItem style={{ marginTop: '15px' }}>
<ElFormItem label="鍏抽敭瀛�">
- <ElInput
- v-model={queryForm.value.searchVal}
- placeholder={searchFormInputAttrs_Placeholder.value}
- clearable
+ <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"
--
Gitblit v1.9.3