diff --git a/src/views/professional/teacherbase/index.vue b/src/views/professional/teacherbase/index.vue index d9d2b52..729395b 100644 --- a/src/views/professional/teacherbase/index.vue +++ b/src/views/professional/teacherbase/index.vue @@ -717,7 +717,7 @@ - + { + if (!value || !Array.isArray(value) || value.length === 0) { + callback(new Error('请选择部门')) + } else { + callback() + } + }, + trigger: 'change' + } ] } const rules = { @@ -2072,7 +2085,14 @@ return } - // 两个子标签页都验证通过,执行保存 + // 两个子标签页都验证通过,处理数据并执行保存 + // 将 deptCodeList 数组的最后一项赋值给 form.baseInfo.deptCode + if (form.professionalStationRelation.deptCodeList && + Array.isArray(form.professionalStationRelation.deptCodeList) && + form.professionalStationRelation.deptCodeList.length > 0) { + form.baseInfo.deptCode = form.professionalStationRelation.deptCodeList[form.professionalStationRelation.deptCodeList.length - 1] + } + addInformation(form).then((response: any) => { const data = response.data; message.success('保存成功') @@ -2332,6 +2352,10 @@ proData.value = []; workData.value = []; dialogFromVisible.value = true; + // 清除表单验证提示 + nextTick(() => { + baseForm.value?.clearValidate() + }) } const handleEdit = (row: any, index: any) => { @@ -2456,9 +2480,17 @@ form.professionalStationRelation.deptCodeList[1] = dept.deptCode } dialogFromVisible.value = true + // 清除表单验证提示 + nextTick(() => { + baseForm.value?.clearValidate() + }) }) } else { dialogFromVisible.value = true + // 清除表单验证提示 + nextTick(() => { + baseForm.value?.clearValidate() + }) } }); } diff --git a/src/views/professional/teacherpayslip/index.vue b/src/views/professional/teacherpayslip/index.vue index 7a5b4a0..c8eb0eb 100755 --- a/src/views/professional/teacherpayslip/index.vue +++ b/src/views/professional/teacherpayslip/index.vue @@ -56,12 +56,12 @@ /> - + { // 设置可查询/不可查询 const canSearch = (val: number) => { - if (selectList.value.length === 0) { - message.warning("请至少选择一名人员") - return - } - - const params = { - canSearch: val, - selectList: selectList.value - } + + + search.canSearch=val + search.selectList=selectList.value messageBox.confirm('确认设置?').then(async () => { try { - await setCanSearch(params) + await setCanSearch(search) message.success("设置成功") getDataList(false) // 设置后保持当前页 } catch (error: any) { diff --git a/src/views/professional/teachersalary/index.vue b/src/views/professional/teachersalary/index.vue index bfa7c7c..ca856ab 100755 --- a/src/views/professional/teachersalary/index.vue +++ b/src/views/professional/teachersalary/index.vue @@ -61,12 +61,12 @@ /> - + { // 设置可查询/不可查询 const canSearch = (val: number) => { - if (selectList.value.length === 0) { - message.warning("请至少选择一名人员") - return - } - - const params = { - canSearch: val, - selectList: selectList.value - } + // if (selectList.value.length === 0) { + // message.warning("请至少选择一名人员") + // return + // } + search.canSearch=val + search.selectList=selectList.value + + messageBox.confirm('确认设置?').then(async () => { try { - await setCanSearch(params) + await setCanSearch(search) message.success("设置成功") getDataList(false) // 设置后保持当前页 } catch (error: any) {