diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index e97c8a3..c033d85 100644 --- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -204,7 +204,7 @@ public class SysDepartController { @GetMapping(value = "/getDepartList4Quxian") public Result> getDepartList4Quxian() { SysDepart sysDepart = sysDepartService.getOne(new LambdaQueryWrapper().eq(SysDepart::getDelFlag, "0").eq(SysDepart::getParentId, "")); - List departList4Quxian = sysDepartService.list(new LambdaQueryWrapper().eq(SysDepart::getParentId, sysDepart.getId())); + List departList4Quxian = sysDepartService.list(new LambdaQueryWrapper().eq(SysDepart::getParentId, sysDepart.getId()).eq(SysDepart::getDelFlag, "0")); List quXianDepartVos = new ArrayList<>(); Optional.ofNullable(departList4Quxian).orElse(new LinkedList<>()).stream().forEach(depart -> { QuXianDepartVo vo = new QuXianDepartVo(); diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts index 7e8325b..5dd5ac3 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts +++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts @@ -18,10 +18,13 @@ export const projectBaseInfoSchemas: FormSchema[] = [ }, { field: 'annualId', - component: 'Input', + component: 'JDictSelectTag', + componentProps: { + dictCode: 'project_type,annual_name,id', + }, label: '计划年度', dynamicDisabled: true, - defaultValue: '2025', + // defaultValue: '2025', }, { field: 'batchNo', diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue index 4cda7e7..1e906ab 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue +++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue @@ -44,6 +44,7 @@ const setformValue1 = async () => { // console.log(route,'route') await setFieldsValue({projectTypeid: route.query.projectTypeId}) + await setFieldsValue({annualId: route.query.projectTypeId}) }; nextTick(() => { setformValue1(); diff --git a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue index 7a7af65..382b31d 100644 --- a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue +++ b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue @@ -175,9 +175,9 @@ async function getProjectType(){ await getProjectTypeList(params).then(res=>{ console.log("getProjectType is invoke-----------",JSON.stringify(res.records)) projectTypeList.value = res.records.map(item => { - return {label:item.typeName,key:item.id} + return {label:item.typeName, key:item.id, annualId:item.annualName} }) - console.log(JSON.stringify(projectTypeList)); + console.log("the projectTypeList :",JSON.stringify(projectTypeList)); }) }