From 70551b35cac6dd0262f644cb248ba1d03ff2fa08 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 22 五月 2026 14:53:10 +0800
Subject: [PATCH] feat: 质量管理检验员筛选和传递优化 1. 检验员下拉框筛选：过程检验、出厂检验、原材料检验的检验员下拉框只显示 roleIds 包含 106 的用户，包括列表页的"检验"弹窗、"分配检验员"弹窗，以及新增/编辑弹窗 2. 检验员默认值优化：点击"检验"按钮时检验员默认为当前登录用户；选择"不合格"打开详情页时检验员从上个页面带入，修复 closeQuickCheck() 重置表单导致检验员值丢失的问题 3. 材料信息新增行修复：生产工单绑定工艺路线弹窗中，新增材料行时根据 productById 是否有值判断显示选择器还是文本
---
src/layout/components/AppMain.vue | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 045e49f..1e7a78b 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -2,9 +2,12 @@
<section class="app-main">
<router-view v-slot="{ Component, route }">
<transition name="fade-transform" mode="out-in">
- <keep-alive :include="tagsViewStore.cachedViews">
- <component v-if="!route.meta.link" :is="Component" :key="route.path"/>
- </keep-alive>
+ <div v-if="!route.meta.link" class="route-view-wrapper">
+ <keep-alive :include="tagsViewStore.cachedViews">
+ <component :is="Component" :key="route.path"/>
+ </keep-alive>
+ </div>
+ <div v-else class="route-view-wrapper"></div>
</transition>
</router-view>
<iframe-toggle />
@@ -15,7 +18,22 @@
import iframeToggle from "./IframeToggle/index"
import useTagsViewStore from '@/store/modules/tagsView'
+const route = useRoute()
const tagsViewStore = useTagsViewStore()
+
+onMounted(() => {
+ addIframe()
+})
+
+watchEffect(() => {
+ addIframe()
+})
+
+function addIframe() {
+ if (route.meta.link) {
+ useTagsViewStore().addIframeView(route)
+ }
+}
</script>
<style lang="scss" scoped>
@@ -25,6 +43,12 @@
width: 100%;
position: relative;
overflow: hidden;
+ background: #F5F7FB;
+}
+
+.route-view-wrapper {
+ width: 100%;
+ height: 100%;
}
.fixed-header + .app-main {
@@ -47,7 +71,22 @@
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
- padding-right: 17px;
+ padding-right: 6px;
}
}
-</style>
\ No newline at end of file
+
+::-webkit-scrollbar {
+ width: 6px;
+ height: 6px;
+}
+
+::-webkit-scrollbar-track {
+ background-color: #f1f1f1;
+}
+
+::-webkit-scrollbar-thumb {
+ background-color: #c0c0c0;
+ border-radius: 3px;
+}
+</style>
+
--
Gitblit v1.9.3