diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts index b7a47a5..6bb6731 100644 --- a/src/views/measure/file/file-interface.ts +++ b/src/views/measure/file/file-interface.ts @@ -51,4 +51,9 @@ pid: string value: string } +// 文件类别状态列表 +export interface menuType { + name: string + comp: any +} diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts index b7a47a5..6bb6731 100644 --- a/src/views/measure/file/file-interface.ts +++ b/src/views/measure/file/file-interface.ts @@ -51,4 +51,9 @@ pid: string value: string } +// 文件类别状态列表 +export interface menuType { + name: string + comp: any +} diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue index a1c6722..293b325 100644 --- a/src/views/measure/file/quality.vue +++ b/src/views/measure/file/quality.vue @@ -5,33 +5,40 @@ import programFile from './components/programFile.vue' // 程序文件 import qualityManual from './components/qualityManual.vue'// 质量手册 import technicalCapability from './components/technicalCapability.vue' // 技术能力 -export interface menuType { - name: string - comp: any -} -const menu = shallowRef([ - { name: '计量法规', comp: statute }, - { name: '质量手册', comp: qualityManual }, - { name: '程序文件', comp: programFile }, - { name: '作业文件', comp: homeworkFile }, - { name: '技术能力', comp: technicalCapability }, - { name: 'CNAS文件', comp: CNASfile }, +import type { menuType } from './file-interface' +import { getDictByCode } from '@/api/system/dict' +// 菜单 - 文件类别 +const menu = ref([ + { name: '', comp: statute }, + { name: '', comp: qualityManual }, + { name: '', comp: programFile }, + { name: '', comp: homeworkFile }, + { name: '', comp: technicalCapability }, + { name: '', comp: CNASfile }, ]) +// 文件类别列表 +const getMenuList = async () => { + const response = await getDictByCode('fileType') + menu.value.forEach((item: menuType, index: Number) => { + item.name = response.data[index].name + }) + console.log(menu, 'menu') +} const current = ref('计量法规') const currentComp = shallowRef(statute) watch(current, (newValue) => { - console.log(newValue, 'newValue') - currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp + currentComp.value = menu.value.filter(item => item.name === newValue)[0]?.comp }, { - immediate: true, deep: true, }) +// 保存当前状态信息 onUnmounted(() => { sessionStorage.setItem('fileMenu', current.value) }) -onMounted(() => { - current.value = sessionStorage.getItem('fileMenu') || '计量法规' +onMounted(async () => { + await getMenuList() // 获取状态列表 + current.value = sessionStorage.getItem('fileMenu') || '计量法规' // 赋值上次的状态信息 sessionStorage.getItem('fileMenu') ? sessionStorage.removeItem('fileMenu') : '' }) diff --git a/src/views/measure/file/file-interface.ts b/src/views/measure/file/file-interface.ts index b7a47a5..6bb6731 100644 --- a/src/views/measure/file/file-interface.ts +++ b/src/views/measure/file/file-interface.ts @@ -51,4 +51,9 @@ pid: string value: string } +// 文件类别状态列表 +export interface menuType { + name: string + comp: any +} diff --git a/src/views/measure/file/quality.vue b/src/views/measure/file/quality.vue index a1c6722..293b325 100644 --- a/src/views/measure/file/quality.vue +++ b/src/views/measure/file/quality.vue @@ -5,33 +5,40 @@ import programFile from './components/programFile.vue' // 程序文件 import qualityManual from './components/qualityManual.vue'// 质量手册 import technicalCapability from './components/technicalCapability.vue' // 技术能力 -export interface menuType { - name: string - comp: any -} -const menu = shallowRef([ - { name: '计量法规', comp: statute }, - { name: '质量手册', comp: qualityManual }, - { name: '程序文件', comp: programFile }, - { name: '作业文件', comp: homeworkFile }, - { name: '技术能力', comp: technicalCapability }, - { name: 'CNAS文件', comp: CNASfile }, +import type { menuType } from './file-interface' +import { getDictByCode } from '@/api/system/dict' +// 菜单 - 文件类别 +const menu = ref([ + { name: '', comp: statute }, + { name: '', comp: qualityManual }, + { name: '', comp: programFile }, + { name: '', comp: homeworkFile }, + { name: '', comp: technicalCapability }, + { name: '', comp: CNASfile }, ]) +// 文件类别列表 +const getMenuList = async () => { + const response = await getDictByCode('fileType') + menu.value.forEach((item: menuType, index: Number) => { + item.name = response.data[index].name + }) + console.log(menu, 'menu') +} const current = ref('计量法规') const currentComp = shallowRef(statute) watch(current, (newValue) => { - console.log(newValue, 'newValue') - currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp + currentComp.value = menu.value.filter(item => item.name === newValue)[0]?.comp }, { - immediate: true, deep: true, }) +// 保存当前状态信息 onUnmounted(() => { sessionStorage.setItem('fileMenu', current.value) }) -onMounted(() => { - current.value = sessionStorage.getItem('fileMenu') || '计量法规' +onMounted(async () => { + await getMenuList() // 获取状态列表 + current.value = sessionStorage.getItem('fileMenu') || '计量法规' // 赋值上次的状态信息 sessionStorage.getItem('fileMenu') ? sessionStorage.removeItem('fileMenu') : '' }) diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue index 4fc3aa9..08fccab 100644 --- a/src/views/measure/person/components/addPerson.vue +++ b/src/views/measure/person/components/addPerson.vue @@ -165,6 +165,7 @@ const confirmPerson = (row: userType) => { ruleForm.value.name = row.name ruleForm.value.account = row.account + ruleForm.value.deptId = row.deptId ruleFormRef.value?.clearValidate('name') } // 上传请求