diff --git a/src/auto-import.d.ts b/src/auto-import.d.ts index 44bf070..8095d30 100644 --- a/src/auto-import.d.ts +++ b/src/auto-import.d.ts @@ -5,6 +5,7 @@ export {} declare global { const EffectScope: typeof import("vue")["EffectScope"]; + const ElMessage: typeof import("element-plus/es")["ElMessage"]; const computed: typeof import("vue")["computed"]; const createApp: typeof import("vue")["createApp"]; const customRef: typeof import("vue")["customRef"]; diff --git a/src/components/ProTable/index.vue b/src/components/ProTable/index.vue index c0df4c9..8a537b2 100644 --- a/src/components/ProTable/index.vue +++ b/src/components/ProTable/index.vue @@ -158,6 +158,9 @@ const { selectionChange, selectedList, selectedListIds, isSelected } = useSelect // 清空选中数据列表 const clearSelection = () => tableRef.value!.clearSelection(); + +console.log(props.initParam, "=props.initParam="); + // 表格操作 Hooks const { tableData, pageable, searchParam, searchInitParam, getTableList, search, reset, handleSizeChange, handleCurrentChange } = useTable( diff --git a/src/components/SearchForm/components/SearchFormItem.vue b/src/components/SearchForm/components/SearchFormItem.vue index 85a761d..bc98ed7 100644 --- a/src/components/SearchForm/components/SearchFormItem.vue +++ b/src/components/SearchForm/components/SearchFormItem.vue @@ -384,6 +384,16 @@ const handleEmitClear = (item: any) => { $Bus.emit("clearBoxMarkIndexCreator"); } }; +// +// $Bus.on("setBarCodeFormCreateUser", () => { +// if (routeName.value === "boxCode" || routeName.value === "barCode" || routeName.value === "antiCode") { +// _searchParam.value.createUser = userStore.userInfo.nickname; +// console.log(_searchParam.value, "= _searchParam.value.createUser="); +// } +// if (routeName.value === "boxMarkIndex") { +// _searchParam.value.creator = userStore.userInfo.nickname; +// } +// });