diff --git a/src/styles/index.scss b/src/styles/index.scss index a41b505..97d3b34 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -101,6 +101,7 @@ div:focus { .el-input__inner, .el-input__inner:hover, .el-input__inner:focus { // border: none; box-shadow: none; + background-color: transparent; } } diff --git a/src/views/Training/AnnualInspectionApplicants/components/addTrainerDialog.vue b/src/views/Training/AnnualInspectionApplicants/components/addTrainerDialog.vue new file mode 100644 index 0000000..e3e02fc --- /dev/null +++ b/src/views/Training/AnnualInspectionApplicants/components/addTrainerDialog.vue @@ -0,0 +1,138 @@ + + + + + diff --git a/src/views/Training/AnnualInspectionApplicants/components/selectTtaningDialog.vue b/src/views/Training/AnnualInspectionApplicants/components/selectTtaningDialog.vue new file mode 100644 index 0000000..c6843b3 --- /dev/null +++ b/src/views/Training/AnnualInspectionApplicants/components/selectTtaningDialog.vue @@ -0,0 +1,77 @@ + + + diff --git a/src/views/Training/AnnualInspectionApplicants/index.vue b/src/views/Training/AnnualInspectionApplicants/index.vue index 25d8e79..0152bfc 100644 --- a/src/views/Training/AnnualInspectionApplicants/index.vue +++ b/src/views/Training/AnnualInspectionApplicants/index.vue @@ -151,4 +151,4 @@ const tabHeightFn = () => { .el-loading-mask { background: rgba(0, 0, 0, 0.5) !important; } - \ No newline at end of file + diff --git a/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue b/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue index 1baecef..cd9fb32 100644 --- a/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue +++ b/src/views/securityManagement/examManagement/components/viewAndUploadDialog.vue @@ -1,9 +1,9 @@ @@ -46,7 +51,9 @@ const title = ref('保安线下考试详情') const loading = ref(false) const disabled = ref(false) const FormRef = ref(null) -const viewAndUploadVisible = ref(true) +const visible = ref(true) +const viewAndUploadRef = ref(null) +const viewAndUploadVisible = ref(false) const props = defineProps({ modelValue: { @@ -104,13 +111,12 @@ const open = (row = {}, type = 'add') => { disabled.value = false dialogVisible.value = true formData.value = { ...row } - if (type === 'add') { - title.value = '新增从业人员' + if (type === 'view') { + title.value = '保安线下考试详情' + visible.value = true } else if (type === 'edit') { - title.value = '编辑从业人员' - } else { - disabled.value = true - title.value = '查看详情' + title.value = '保安证申请' + visible.value = false } } @@ -129,6 +135,10 @@ const save = () => { }); } +const addEdit = (type, row) => { + viewAndUploadRef.value?.open(row, type) +} + defineExpose({ open }) diff --git a/src/views/securityManagement/examManagement/index.vue b/src/views/securityManagement/examManagement/index.vue index 5419b96..abc83c8 100644 --- a/src/views/securityManagement/examManagement/index.vue +++ b/src/views/securityManagement/examManagement/index.vue @@ -39,11 +39,10 @@ import Search from '@/components/aboutTable/Search.vue'; import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js"; import PageTitle from "@/components/aboutTable/PageTitle.vue"; import ViewExamDetalis from "./components/viewExamDetalis.vue"; -// import AddTrainerDialog from "./components/addTrainerDialog.vue"; const trainerRef = ref(null); const queryFrom = ref({}); -const isVisible = ref(true); +const isVisible = ref(false); const searchBox = ref(null); const D_BZ_BXDLX = ref([]); const searchConfiger = ref([ @@ -62,7 +61,7 @@ const searchConfiger = ref([ ]); const pageData = reactive({ - tableData: [], + tableData: [{}], keyCount: 0, tableConfiger: { rowHieght: 61, @@ -127,5 +126,9 @@ onMounted(() => { diff --git a/src/views/securityManagement/trainingManagement/trainingProject/components/prejectDetailsDialog.vue b/src/views/securityManagement/trainingManagement/trainingProject/components/prejectDetailsDialog.vue new file mode 100644 index 0000000..fe4fb51 --- /dev/null +++ b/src/views/securityManagement/trainingManagement/trainingProject/components/prejectDetailsDialog.vue @@ -0,0 +1,169 @@ + + + + + diff --git a/src/views/securityManagement/trainingManagement/trainingProject/components/viewProjectDetailsDialog.vue b/src/views/securityManagement/trainingManagement/trainingProject/components/viewProjectDetailsDialog.vue new file mode 100644 index 0000000..1e64233 --- /dev/null +++ b/src/views/securityManagement/trainingManagement/trainingProject/components/viewProjectDetailsDialog.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/securityManagement/trainingManagement/trainingProject/index.vue b/src/views/securityManagement/trainingManagement/trainingProject/index.vue index 5b6c734..cbecea1 100644 --- a/src/views/securityManagement/trainingManagement/trainingProject/index.vue +++ b/src/views/securityManagement/trainingManagement/trainingProject/index.vue @@ -27,7 +27,8 @@ }"> - + + @@ -38,11 +39,14 @@ import Pages from '@/components/aboutTable/Pages.vue'; import Search from '@/components/aboutTable/Search.vue'; import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js"; import PageTitle from "@/components/aboutTable/PageTitle.vue"; -// import AddTrainerDialog from "./components/addTrainerDialog.vue"; +import ViewProjectDetailsDialog from "./components/viewProjectDetailsDialog.vue"; +import PrejectDetailsDialog from "./components/prejectDetailsDialog.vue"; -const trainerRef = ref(null); +const prejectDetailsRef = ref(null); +const viewProjectDetailsRef = ref(null) const queryFrom = ref({}); const isVisible = ref(false); +const dialogVisible = ref(false) const searchBox = ref(null); const D_BZ_BXDLX = ref([]); const searchConfiger = ref([ @@ -61,7 +65,7 @@ const searchConfiger = ref([ ]); const pageData = reactive({ - tableData: [], + tableData: [{}], keyCount: 0, tableConfiger: { rowHieght: 61, @@ -93,7 +97,11 @@ const tabHeightFn = () => { }; const addEdit = (type, row) => { - trainerRef.value.open(row, type); + if (type === 'view') { + prejectDetailsRef.value.open(row, type); + return + } + viewProjectDetailsRef.value.open(row, type); }; const onSearch = (value) => { diff --git a/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue b/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue new file mode 100644 index 0000000..02c3412 --- /dev/null +++ b/src/views/securityManagement/unitInformation/components/viewDetailsDialog.vue @@ -0,0 +1,157 @@ + + + + + diff --git a/src/views/securityManagement/unitInformation/index.vue b/src/views/securityManagement/unitInformation/index.vue index 95e2a2a..743d205 100644 --- a/src/views/securityManagement/unitInformation/index.vue +++ b/src/views/securityManagement/unitInformation/index.vue @@ -40,6 +40,7 @@ import MyTable from '@/components/aboutTable/MyTable.vue'; import Pages from '@/components/aboutTable/Pages.vue'; import Search from '@/components/aboutTable/Search.vue'; import PageTitle from '@/components/aboutTable/PageTitle.vue'; +import viewDetailsDialog from "./components/viewDetailsDialog.vue"; import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js"; const searchBox = ref(null); @@ -60,7 +61,7 @@ const searchConfiger = ref([ ]); const pageData = reactive({ - tableData: [], + tableData: [{}], keyCount: 0, tableConfiger: { rowHieght: 61,