diff --git a/src/views/securityManagement/examManagement/components/viewExamDetalis.vue b/src/views/securityManagement/examManagement/components/viewExamDetalis.vue
index e4f362e..3e0a709 100644
--- a/src/views/securityManagement/examManagement/components/viewExamDetalis.vue
+++ b/src/views/securityManagement/examManagement/components/viewExamDetalis.vue
@@ -3,7 +3,7 @@
@@ -25,10 +25,13 @@
+
+ {{ row.xxpxsc }}h
+
申请证件
-
+
上传成绩
查看成绩
@@ -49,9 +52,7 @@ import viewAndUploadDialog from './viewAndUploadDialog.vue';
const { proxy } = getCurrentInstance()
const { D_BAXX_KSFS } = proxy.$dict("D_BAXX_KSFS")
const title = ref('保安线下考试详情')
-const loading = ref(false)
const disabled = ref(false)
-const FormRef = ref(null)
const visible = ref(true)
const viewAndUploadRef = ref(null)
const viewAndUploadVisible = ref(false)
@@ -96,8 +97,8 @@ const pageData = reactive({
{ label: "姓名", prop: "xm" },
{ label: "证件号码", prop: "sfzh" },
{ label: "联系方式", prop: "lxdh" },
- { label: "线上培训时间", prop: "xspxsc" },
- { label: "线下培训课程", prop: "xxpxsc" },
+ { label: "线上培训时间", prop: "xxpxsc", showSolt: true },
+ { label: "线下培训课程", prop: "xxpxkc" },
{ label: "考试成绩", prop: "ksfs" },
]
});
@@ -113,7 +114,7 @@ const getList = async ({ id = "" }, type = '') => {
const res = await qcckPost({
...pageData.pageConfiger,
// sfcjpx: 1,
- ksglid: id
+ // ksglid: id
}, `/mosty-base/baxx/ksry/list`)
if (res) {
pageData.tableData = res.records || [];
@@ -128,7 +129,7 @@ const open = (row = {}, type = 'add') => {
dialogVisible.value = true
formData.value = { ...row }
if (type === 'view') {
- title.value = '保安线下考试详情'
+ title.value = `保安线${formData.value?.ksfs ==='01' ? '下' : '上'}考试详情`
visible.value = true
} else if (type === 'edit') {
title.value = '保安证申请'
@@ -136,21 +137,6 @@ const open = (row = {}, type = 'add') => {
}
}
-const save = () => {
- FormRef.value.submit(() => {
- loading.value = true;
- const url = !formData.value?.id ? `/mosty-base/baxx/cyry/add` : `/mosty-base/baxx/cyry/edit`;
- qcckPost(formData.value, url).then(() => {
- loading.value = false;
- proxy.$message.success("保存成功");
- emits("refresh");
- close();
- }).catch(() => {
- loading.value = false;
- })
- });
-}
-
const addEdit = (type, row) => {
viewAndUploadRef.value?.open(row, type)
}
@@ -174,8 +160,13 @@ defineExpose({ open })
@import "@/assets/css/layout.scss";
.label {
+ height: 40px;
+ line-height: 40px;
+ text-align: center;
margin-top: 20px;
color: #000;
+ font-weight: bold;
+ background: var(--el-fill-color-light);
}
.cntinfo {
diff --git a/src/views/securityManagement/examManagement/index.vue b/src/views/securityManagement/examManagement/index.vue
index 9856294..13f31e9 100644
--- a/src/views/securityManagement/examManagement/index.vue
+++ b/src/views/securityManagement/examManagement/index.vue
@@ -14,6 +14,9 @@
+
+
+
详情
@@ -79,7 +82,7 @@ const pageData = reactive({
{ label: "考试时间", prop: "kssj" },
{ label: "监考民警", prop: "jkmj" },
{ label: "考试地址", prop: "ksdz" },
- { label: "考试方式", prop: "ksfs" },
+ { label: "考试方式", prop: "ksfs", showSolt: true },
]
});
@@ -111,7 +114,7 @@ const getList = async () => {
}, `/mosty-base/baxx/ksgl/page`)
if(res) {
- pageData.tableData = [{}];
+ pageData.tableData = res.records || [];
pageData.total = res.total;
}
} finally {
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
index 59ef990..165725c 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue
@@ -23,6 +23,8 @@ import { qcckPost } from "@/api/qcckApi.js";
import FormMessage from '@/components/aboutTable/FormMessage.vue'
const { proxy } = getCurrentInstance()
+const { D_BAXX_GWLX } = proxy.$dict("D_BAXX_GWLX")
+
const title = ref('新增培训人员')
const loading = ref(false)
const disabled = ref(false)
@@ -59,7 +61,7 @@ const formList = reactive([
[
{ label: "居住地址", prop: "jzdz", type: "input" },
{ label: "申请时间", prop: "xtCjsj", type: "date" },
- { label: "岗位", prop: "gw", type: "input" },
+ { label: "岗位", prop: "gw", type: "select", options: D_BAXX_GWLX },
],
[
{ label: "身份证正面", prop: "ryzpzm", type: "upload", limit: 1 },
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/uploadDataDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/uploadDataDialog.vue
deleted file mode 100644
index b20d392..0000000
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/uploadDataDialog.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
- 确定
- 取消
-
-
-
-
-
diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
index fcc830a..c860fd2 100644
--- a/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
+++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/index.vue
@@ -13,14 +13,17 @@
- {{ row?.pxgs === '01' ? `是` : `否` }}
+ {{ row?.ryzpzm && row?.ryzpfm && row?.tjbg && row?.wfzzmjl ? `是` : `否` }}
{{ row?.sfpx === '01' ? `否` : `是` }}
+
+
+
- 上传资料
+ 上传资料
删除
详情
提交培训公司
@@ -35,7 +38,6 @@
-
@@ -47,16 +49,14 @@ 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 UploadDataDialog from "./components/uploadDataDialog.vue";
import selectTtaningDialog from "./components/selectTtaningDialog.vue";
const { proxy } = getCurrentInstance();
+const { D_BAXX_GWLX } = proxy.$dict("D_BAXX_GWLX")
const trainerRef = ref(null);
const selectTtaningRef = ref(null);
-const uploadDataRef = ref(null);
const queryFrom = ref({});
const isVisible = ref(false);
-const uploadVisible = ref(false);
const dialogVisible = ref(false);
const searchBox = ref(null);
const searchConfiger = ref([
@@ -98,7 +98,7 @@ const pageData = reactive({
{ label: "姓名", prop: "xm" },
{ label: "证件号码", prop: "zjhm" },
{ label: "联系方式", prop: "lxdh" },
- { label: "岗位", prop: "gw" },
+ { label: "岗位", prop: "gw", showSolt: true },
{ label: "申请时间", prop: "xtCjsj" },
{ label: "是否上传资料", prop: "pxgs", showSolt: true },
{ label: "是否线上培训", prop: "sfpx", showSolt: true },
@@ -117,8 +117,6 @@ const tabHeightFn = () => {
const addEdit = (type, row) => {
if (type === 'select') {
selectTtaningRef.value.open(row, type);
- } else if (type === 'upload') {
- uploadDataRef.value.open(row, type);
} else {
trainerRef.value.open(row, type);
}
diff --git a/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
index 46a0c74..eadd662 100644
--- a/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
+++ b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue
@@ -23,7 +23,7 @@ import { qcckPost } from "@/api/qcckApi.js";
import FormMessage from '@/components/aboutTable/FormMessage.vue'
const { proxy } = getCurrentInstance()
-const { D_BZ_WHCD } = proxy.$dict("D_BZ_WHCD");
+const { D_BZ_WHCD, D_BAXX_GWLX } = proxy.$dict("D_BZ_WHCD", "D_BAXX_GWLX");
const title = ref('新增从业人员')
const loading = ref(false)
const disabled = ref(false)
@@ -64,7 +64,7 @@ const formList = reactive([
{ label: "资格证类型", prop: "zgzlx", type: "input" },
{ label: "资格证起始日期", prop: "zgzKssj", type: "date" },
{ label: "资格证截至日期", prop: "zgzJssj", type: "date" },
- { label: "岗位", prop: "gw", type: "input" },
+ { label: "岗位", prop: "gw", type: "select", options: D_BAXX_GWLX },
],
[
{ label: "外派单位", prop: "wpdw", type: "input" },
diff --git a/src/views/securityManagement/personnelManagement/practitioner/index.vue b/src/views/securityManagement/personnelManagement/practitioner/index.vue
index 3b2254f..94471f2 100644
--- a/src/views/securityManagement/personnelManagement/practitioner/index.vue
+++ b/src/views/securityManagement/personnelManagement/practitioner/index.vue
@@ -13,7 +13,10 @@
-
+
+
+
+
@@ -43,7 +46,7 @@ import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
import AddPractitionerDialog from "./components/addPractitionerDialog.vue";
const { proxy } = getCurrentInstance();
-const { D_BZ_SF } = proxy.$dict("D_BZ_SF");
+const { D_BZ_SF, D_BAXX_GWLX } = proxy.$dict("D_BZ_SF", "D_BAXX_GWLX");
const addPractitionerRef = ref(null);
const queryFrom = ref({});
const isVisible = ref(false);
@@ -94,7 +97,7 @@ const pageData = reactive({
{ label: "姓名", prop: "xm" },
{ label: "证件号码", prop: "sfzh" },
{ label: "联系方式", prop: "lxdh" },
- { label: "岗位", prop: "gw" },
+ { label: "岗位", prop: "gw", showSolt: true },
{ label: "入职时间", prop: "rzsj" },
{ label: "外派单位", prop: "wpdw", },
{ label: "是否在职", prop: "sflz", showSolt: true },
@@ -155,7 +158,8 @@ const getList = async () => {
}, `/mosty-base/baxx/cyry/page`)
if(res) {
- pageData.tableData = res.records || [];
+ // 处理sflz为null默认为0
+ pageData.tableData = res.records?.map(i => ({ ...i, newSflz: i?.sflz === null ? 0 : i.sflz })) || [];
pageData.total = res.total;
}
} finally {
diff --git a/src/views/securityManagement/trainingManagement/personnelTraining/components/viewInfoDialog.vue b/src/views/securityManagement/trainingManagement/personnelTraining/components/viewInfoDialog.vue
index 221623d..0de551d 100644
--- a/src/views/securityManagement/trainingManagement/personnelTraining/components/viewInfoDialog.vue
+++ b/src/views/securityManagement/trainingManagement/personnelTraining/components/viewInfoDialog.vue
@@ -12,7 +12,9 @@
{{ formData.xm }}
{{ formData.sfzh }}
{{ formData.lxdh }}
- {{ formData.ssbags }}
+
+
+
{{ formData.pxsc }}
{{ formData.tjrq }}
@@ -25,6 +27,8 @@ import { ref, computed, getCurrentInstance } from 'vue'
import { qcckPost } from "@/api/qcckApi.js";
const { proxy } = getCurrentInstance()
+const { D_BAXX_DWLX } = proxy.$dict("D_BAXX_DWLX")
+
const title = ref('保安考试申请')
const loading = ref(false)
const disabled = ref(false)
@@ -35,10 +39,6 @@ const props = defineProps({
type: Boolean,
default: false
},
- dic: {
- type: Object,
- default: () => ({})
- }
})
const emits = defineEmits(['update:modelValue'])
diff --git a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
index 51672a6..91f2bb8 100644
--- a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
+++ b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue
@@ -11,8 +11,8 @@
-
-
+
+
@@ -49,7 +49,6 @@ const trainerRef = ref(null);
const queryFrom = ref({});
const isVisible = ref(false);
const searchBox = ref(null);
-const D_BZ_BXDLX = ref([]);
const searchConfiger = ref([
{
label: "姓名",
diff --git a/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue b/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue
index fb4a82d..16483df 100644
--- a/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue
+++ b/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue
@@ -25,6 +25,8 @@ import { qcckPost } from "@/api/qcckApi.js";
import FormMessage from '@/components/aboutTable/FormMessage.vue'
const { proxy } = getCurrentInstance()
+const { D_BAXX_GWLX, D_BAXX_DWLX } = proxy.$dict("D_BAXX_GWLX", "D_BAXX_DWLX")
+
const title = ref('新增培训人员')
const loading = ref(false)
const disabled = ref(false)
@@ -61,10 +63,10 @@ const formList = reactive([
[
{ label: "居住地址", prop: "jzdz", type: "input" },
{ label: "申请时间", prop: "sqsj", type: "date" },
- { label: "岗位", prop: "gw", type: "select" },
+ { label: "岗位", prop: "gw", type: "select", options: D_BAXX_GWLX },
],
[
- { label: "所属保安公司", prop: "ssbags", type: "select" },
+ { label: "所属保安公司", prop: "ssbags", type: "select", options: D_BAXX_DWLX },
],
[
{ label: "身份证正面", prop: "ryzpzm", type: "upload", limit: 1 },
diff --git a/src/views/securityManagement/trainingManagement/trainer/index.vue b/src/views/securityManagement/trainingManagement/trainer/index.vue
index eb85710..210af85 100644
--- a/src/views/securityManagement/trainingManagement/trainer/index.vue
+++ b/src/views/securityManagement/trainingManagement/trainer/index.vue
@@ -12,8 +12,11 @@
-
-
+
+
+
+
+
@@ -42,11 +45,12 @@ import PageTitle from "@/components/aboutTable/PageTitle.vue";
import AddTrainerDialog from "./components/addTrainerDialog.vue";
const { proxy } = getCurrentInstance()
+const { D_BAXX_GWLX, D_BAXX_DWLX } = proxy.$dict("D_BAXX_GWLX", "D_BAXX_DWLX")
+
const trainerRef = ref(null);
const queryFrom = ref({});
const isVisible = ref(false);
const searchBox = ref(null);
-const D_BZ_BXDLX = ref([]);
const searchConfiger = ref([
{
label: "人员姓名",
@@ -86,8 +90,8 @@ const pageData = reactive({
{ label: "姓名", prop: "xm" },
{ label: "证件号码", prop: "sfzh" },
{ label: "联系方式", prop: "lxdh" },
- { label: "岗位", prop: "gw" },
- { label: "所属保安公司", prop: "ssbags" },
+ { label: "岗位", prop: "gw", showSolt: true },
+ { label: "所属保安公司", prop: "ssbags", showSolt: true },
]
});
diff --git a/src/views/securityManagement/trainingManagement/trainingProject/index.vue b/src/views/securityManagement/trainingManagement/trainingProject/index.vue
index f6cb7be..9eabbc1 100644
--- a/src/views/securityManagement/trainingManagement/trainingProject/index.vue
+++ b/src/views/securityManagement/trainingManagement/trainingProject/index.vue
@@ -12,8 +12,8 @@
-
-
+
+
@@ -35,7 +35,7 @@