diff --git a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue index e048c47..cc05518 100644 --- a/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue +++ b/src/views/securityManagement/personnelManagement/applicantPersonnel/components/selectTtaningDialog.vue @@ -47,7 +47,7 @@ const formList = reactive([ ]) const rules = { - pxgs: [{ required: true, message: "请输入考试成绩", trigger: "change" }], + pxgs: [{ required: true, message: "请选择培训公司", trigger: "change" }], } const open = (row = {}, type = 'updata') => { diff --git a/src/views/securityManagement/trainingManagement/trainingProject/components/addPxxm.vue b/src/views/securityManagement/trainingManagement/trainingProject/components/addPxxm.vue index ead757b..d8f64be 100644 --- a/src/views/securityManagement/trainingManagement/trainingProject/components/addPxxm.vue +++ b/src/views/securityManagement/trainingManagement/trainingProject/components/addPxxm.vue @@ -27,13 +27,8 @@ - - - - - - - + + @@ -94,7 +89,7 @@ - + @@ -141,12 +136,15 @@ const pageData = reactive({ ] }); +const defaultSelectKeys = computed(() => { + return pageData.tableData?.map(i => i.id) +}) + const rules = { xmmc: [{ required: true, message: "请输入培训项目名称", trigger: "change" }], pxdz: [{ required: true, message: "请输入培训地址", trigger: "change" }], xxdz: [{ required: true, message: "请输入详细地址", trigger: "change" }], - kssj: [{ required: true, message: "请输入培训开始时间", trigger: "change" }], - jssj: [{ required: true, message: "请输入培训结束时间", trigger: "change" }], + kssjJssj: [{ required: true, message: "请选择开始结束培训时间", trigger: "change" }], pxrq: [{ required: true, message: "请输入培训日期", trigger: "change" }], kcmc: [{ required: true, message: "请输入课程名称", trigger: "change" }], zzdw: [{ required: true, message: "请输入组织单位", trigger: "change" }], @@ -180,6 +178,7 @@ const init = () => { const close = () => { FormRef.value.resetFields() + pageData.tableData = [] showDialog.value = false } @@ -188,18 +187,27 @@ const handleDelItem = (row) => { pageData.tableData.splice(index, 1) } +const handleTimeChange = (val) => { + const [start, end] = val + formData.value.kssj = start + formData.value.jssj = end +} + const handleChange = (val) => { - pageData.tableData = [...pageData.tableData, ...val]?.filter((i, index, arr) => arr?.findIndex(s => i?.id === s?.id) === index) + pageData.tableData = [...pageData.tableData, ...val]?.filter((i, index, arr) => arr?.findIndex(s => i?.id === s?.id) === index) } const save = () => { if (pageData.tableData.length === 0) return proxy.$message.warning('请选择培训保安人员') const ryidList = pageData.tableData?.map(i => i?.id) - const { pxkcList, pxxmid } = formData.value + const { pxkcList, ...rest } = formData.value FormRef.value.validate( async (valid) => { + if (!valid) return + // 新增项目、修改项目 const url = !formData.value?.id ? `/mosty-base/baxx/pxxm/add` : `/mosty-base/baxx/pxxm/edit` - const res = await qcckPost(formData.value, url) - await qcckPost({ pxkcList, pxxmid: res?.id, ryidList }, !formData.value?.id ? `/mosty-base/baxx/pxkc/saveList` : `/mosty-base/baxx/pxkc/updateList`) + const res = await qcckPost({ ...rest }, url) + // 新增课程、修改课程 + await qcckPost({ pxkcList: formData.value.pxkcList, pxxmid: res?.id, ryidList }, !formData.value?.id ? `/mosty-base/baxx/pxkc/saveList` : `/mosty-base/baxx/pxkc/updateList`) proxy.$message.success('新增培训项目成功') emits("refresh"); close() diff --git a/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue b/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue index bde8c51..7e69965 100644 --- a/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue +++ b/src/views/securityManagement/trainingManagement/trainingProject/components/selectPersonnelDialog.vue @@ -24,7 +24,7 @@