Merge branch 'master' of http://182.92.169.222:3000/zhc077/zmd_kejiju

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<List<QuXianDepartVo>> getDepartList4Quxian() {
         SysDepart sysDepart = sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getDelFlag, "0").eq(SysDepart::getParentId, ""));
-        List<SysDepart> departList4Quxian = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getParentId, sysDepart.getId()));
+        List<SysDepart> departList4Quxian = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getParentId, sysDepart.getId()).eq(SysDepart::getDelFlag, "0"));
         List<QuXianDepartVo> quXianDepartVos = new ArrayList<>();
         Optional.ofNullable(departList4Quxian).orElse(new LinkedList<>()).stream().forEach(depart -> {
             QuXianDepartVo vo = new QuXianDepartVo();

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',

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();

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));
   })
 }