feat: 🚀 弹窗

This commit is contained in:
2025-08-12 13:35:58 +08:00
parent 3185a66f8c
commit 618666421e
3 changed files with 34 additions and 7 deletions

View File

@@ -6,7 +6,6 @@ export {}
declare global { declare global {
const EffectScope: typeof import("vue")["EffectScope"]; const EffectScope: typeof import("vue")["EffectScope"];
const ElMessage: typeof import("element-plus/es")["ElMessage"]; const ElMessage: typeof import("element-plus/es")["ElMessage"];
const ElMessageBox: typeof import("element-plus/es")["ElMessageBox"];
const computed: typeof import("vue")["computed"]; const computed: typeof import("vue")["computed"];
const createApp: typeof import("vue")["createApp"]; const createApp: typeof import("vue")["createApp"];
const customRef: typeof import("vue")["customRef"]; const customRef: typeof import("vue")["customRef"];

View File

@@ -9,7 +9,7 @@ import { ElMessageBox } from "element-plus";
import { useMsg } from "@/hooks/useMsg"; import { useMsg } from "@/hooks/useMsg";
import { getTransferSnApi, getTransferSnJCApi } from "@/api/modules/barCode"; import { getTransferSnApi, getTransferSnJCApi } from "@/api/modules/barCode";
// const $router = useRouter(); // const $router = useRouter();
import { WarningFilled } from "@element-plus/icons-vue";
const props: any = defineProps<{ const props: any = defineProps<{
selectionList?: any[]; selectionList?: any[];
handleChildBtnCallback?: () => void; handleChildBtnCallback?: () => void;
@@ -123,22 +123,49 @@ const handleBtnClick = async () => {
getTransferSn(ids); getTransferSn(ids);
} else { } else {
ElMessage({ ElMessage({
showClose: true,
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
message: `<div style="line-height:1.5;max-width:800px;max-height: 800px; message: `<div style="line-height:1.5;max-width:800px;max-height: 800px;
overflow-y: auto;">${result.msg || result.message}</div>`, overflow-y: auto; color:red">${result.msg || result.message}</div>`,
type: "error"
icon: WarningFilled,
customClass: "custom-message-error"
// type: "error"
// duration: 100000 // duration: 100000
}); });
} }
}; };
</script> </script>
<style scoped lang="scss"> <style lang="scss">
@import "../index.scss"; @import "../index.scss";
.custom-message-error {
// color: red;
background: var(--el-color-error-light-9) !important;
border-color: var(--el-color-error-light-8) !important;
}
.custom-message-error > .el-message-icon--info {
color: red;
}
// .custom-message-error > .el-message__closeBtn {
// color: #ffffff;
// }
// .el-message { // .el-message {
// width: 800px; // width: 800px;
// height: 800px; // height: 800px;
// overflow-y: auto; // overflow-y: auto;
// } // }
// .custom-message-error > i {
// color: red !important;
// // background-color: var(--el-color-error-light-9) !important;
// // border-color: var(--el-color-error-light-8) !important;
// // -el-message-bg-color: var(--el-color-error-light-9);
// // --el-message-border-color: var(--el-color-error-light-8);
// // --el-message-text-color: var(--el-color-error);
// }
</style> </style>

View File

@@ -408,6 +408,7 @@ let visibleGroupOrder: string[] = [];
// 重置临时跟踪(筛选/分页时调用,保留全局注册表) // 重置临时跟踪(筛选/分页时调用,保留全局注册表)
const resetVisibleGroups = () => { const resetVisibleGroups = () => {
visibleGroupOrder = []; visibleGroupOrder = [];
globalNextGroupId = 0;
}; };
// // 生成组标识(与之前相同) // // 生成组标识(与之前相同)
const getGroupKey = (row: any) => { const getGroupKey = (row: any) => {
@@ -974,10 +975,10 @@ watch(
onMounted(() => { onMounted(() => {
$Bus.on("clearBarCodeCreateUser", () => { $Bus.on("clearBarCodeCreateUser", () => {
resetVisibleGroups();
datas.ruleForm.createUser = ""; datas.ruleForm.createUser = "";
datas.initParam.createUser = ""; datas.initParam.createUser = "";
datas.printCodeRuleFormData.isDownLoad = false; datas.printCodeRuleFormData.isDownLoad = false;
resetVisibleGroups();
}); });
$Bus.on("setBarCodeInputCreateUser", (params: any) => { $Bus.on("setBarCodeInputCreateUser", (params: any) => {
@@ -987,8 +988,8 @@ onMounted(() => {
}); });
//searchBarCodeSsDownLoad //searchBarCodeSsDownLoad
$Bus.on("searchBarCodeSsDownLoad", () => { $Bus.on("searchBarCodeSsDownLoad", () => {
datas.printCodeRuleFormData.isDownLoad = false;
resetVisibleGroups(); resetVisibleGroups();
datas.printCodeRuleFormData.isDownLoad = false;
}); });
}); });
</script> </script>