diff --git a/src/views/Training/AnnualInspectionApplicants/components/addTrainerDialog.vue b/src/views/Training/AnnualInspectionApplicants/components/addTrainerDialog.vue index e3e02fc..bb8cd4e 100644 --- a/src/views/Training/AnnualInspectionApplicants/components/addTrainerDialog.vue +++ b/src/views/Training/AnnualInspectionApplicants/components/addTrainerDialog.vue @@ -55,7 +55,7 @@ const dialogVisible = computed({ const formList = reactive([ [ { label: "姓名", prop: "xm", type: "input" }, - { label: "证件号码", prop: "sfzh", type: "select", options: props.dic.D_BZ_BXDLX }, + { label: "证件号码", prop: "sfzh", type: "input"}, { label: "联系电话", prop: "lxdh", type: "input" }, ], [ diff --git a/src/views/Training/AnnualInspectionApplicants/components/detailForm.vue b/src/views/Training/AnnualInspectionApplicants/components/detailForm.vue index d58a2f9..2c8b73a 100644 --- a/src/views/Training/AnnualInspectionApplicants/components/detailForm.vue +++ b/src/views/Training/AnnualInspectionApplicants/components/detailForm.vue @@ -47,7 +47,7 @@ const formList = reactive([ [ { label: "体检报告", prop: "inspectionReport", type: "upload" }, { label: "无犯罪记录证明", prop: "wfzjlzm", type: "upload" }, - { label: "保安证证", prop: "bazzj", type: "upload" }, + { label: "保安证原件", prop: "bazzj", type: "upload" }, ], ]) diff --git a/src/views/Training/AnnualInspectionApplicants/components/pxApllication.vue b/src/views/Training/AnnualInspectionApplicants/components/pxApllication.vue index d54ee80..3858be5 100644 --- a/src/views/Training/AnnualInspectionApplicants/components/pxApllication.vue +++ b/src/views/Training/AnnualInspectionApplicants/components/pxApllication.vue @@ -42,7 +42,7 @@ const formList = reactive([ ], [ { label: "组织单位", prop: "zzdw", type: "input" }, - { label: "授课教员", prop: "skfcy", type: "input" }, + { label: "授课教员", prop: "skfcy", type: "select" }, { label: "培训内容", prop: "pxnr", type: "input" }, ], { label: "分割线", prop: "diver", type: "slot" }, @@ -53,7 +53,7 @@ const formList = reactive([ ], [ { label: "组织单位", prop: "zzdw", type: "input" }, - { label: "授课教员", prop: "skfcy", type: "input" }, + { label: "授课教员", prop: "skfcy", type: "select" }, { label: "培训内容", prop: "pxnr", type: "input" }, ], { label: "分割线", prop: "diver", type: "slot" }, @@ -64,7 +64,7 @@ const formList = reactive([ ], [ { label: "组织单位", prop: "zzdw", type: "input" }, - { label: "授课教员", prop: "skfcy", type: "input" }, + { label: "授课教员", prop: "skfcy", type: "select" }, { label: "培训内容", prop: "pxnr", type: "input" }, ], diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue index e3e02fc..bb8cd4e 100644 --- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue +++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/addTrainerDialog.vue @@ -55,7 +55,7 @@ const dialogVisible = computed({ const formList = reactive([ [ { label: "姓名", prop: "xm", type: "input" }, - { label: "证件号码", prop: "sfzh", type: "select", options: props.dic.D_BZ_BXDLX }, + { label: "证件号码", prop: "sfzh", type: "input"}, { label: "联系电话", prop: "lxdh", type: "input" }, ], [ diff --git a/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue index e6d220c..534ab7a 100644 --- a/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue +++ b/src/views/securityManagement/personnelManagement/practitioner/components/addPractitionerDialog.vue @@ -3,7 +3,7 @@
{{ title }}
- 保存 + 保存 关闭
@@ -55,29 +55,27 @@ const dialogVisible = computed({ const formList = reactive([ [ { label: "姓名", prop: "xm", type: "input" }, - { label: "证件号码", prop: "sfzh", type: "select", options: props.dic.D_BZ_BXDLX }, + { label: "证件号码", prop: "sfzh", type: "input"}, { label: "联系电话", prop: "lxdh", type: "input" }, { label: "居住地址", prop: "jzdz", type: "input" }, ], [ { label: "入职时间", prop: "rzsj", type: "date" }, - // { label: "离职时间", prop: "lzsj", type: "input" }, + { label: "离职时间", prop: "lzsj", type: "input" }, { label: "文化程度", prop: "ssbmdm", type: "select" }, { label: "资格证编号", prop: "zgzbh", type: "input" }, - { label: "资格证类型", prop: "zgzlx", type: "input" }, ], [ + { label: "资格证类型", prop: "zgzlx", type: "input" }, { label: "资格证起始日期", prop: "zgzKssj", type: "date" }, { label: "资格证截至日期", prop: "zgzJssj", type: "date" }, { label: "岗位", prop: "ssbmdm", type: "input" }, - { label: "外派岗位", prop: "ssbmdm", type: "input" }, ], [ - { label: "从业人员照片", prop: "ssbmdm", type: "upload" }, + { label: "外派单位", prop: "ssbmdm", type: "input" }, ], - [ - { label: "保安证件", prop: "bazzp", type: "upload", limit: 1 }, - ] + { label: "从业人员照片", prop: "ssbmdm", type: "upload" }, + { label: "保安证件", prop: "bazzp", type: "upload", limit: 1 }, ]) const rules = { diff --git a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue index a76d819..9f99b98 100644 --- a/src/views/securityManagement/trainingManagement/personnelTraining/index.vue +++ b/src/views/securityManagement/trainingManagement/personnelTraining/index.vue @@ -72,7 +72,7 @@ const searchConfiger = ref([ ]); const pageData = reactive({ - tableData: [], + tableData: [{}], keyCount: 0, tableConfiger: { rowHieght: 61, diff --git a/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue b/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue index 8a4b5c5..a7bc065 100644 --- a/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue +++ b/src/views/securityManagement/trainingManagement/trainer/components/addTrainerDialog.vue @@ -55,7 +55,7 @@ const dialogVisible = computed({ const formList = reactive([ [ { label: "姓名", prop: "xm", type: "input" }, - { label: "证件号码", prop: "sfzh", type: "select", options: props.dic.D_BZ_BXDLX }, + { label: "证件号码", prop: "sfzh", type: "input"}, { label: "联系电话", prop: "lxdh", type: "input" }, ], [ diff --git a/src/views/securityManagement/trainingManagement/trainingProject/components/addPxxm.vue b/src/views/securityManagement/trainingManagement/trainingProject/components/addPxxm.vue index bf2abf5..857ab2c 100644 --- a/src/views/securityManagement/trainingManagement/trainingProject/components/addPxxm.vue +++ b/src/views/securityManagement/trainingManagement/trainingProject/components/addPxxm.vue @@ -62,7 +62,10 @@ - + + + + diff --git a/src/views/securityManagement/unitInformation/index.vue b/src/views/securityManagement/unitInformation/index.vue index 9777671..092fa53 100644 --- a/src/views/securityManagement/unitInformation/index.vue +++ b/src/views/securityManagement/unitInformation/index.vue @@ -3,10 +3,7 @@
- -
- -
+
{ pageData.tableHeight = - window.innerHeight - searchBox.value.offsetHeight - 250; + window.innerHeight - 240; window.onresize = function () { tabHeightFn(); };