Merge remote-tracking branch 'origin/master'

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