From 5f8b822b8f4d0555778e8b819b2b28faa7b5f195 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Wed, 13 Nov 2024 14:56:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E6=80=81=E7=A7=91=E6=8A=80=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=2011.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectApplication/kejigongguan/data.ts   |  2 +-
 .../kejigongguan/projectApplicationList.vue   | 19 ++++--
 .../project/ProjectList.vue                   | 66 +++++++++++--------
 .../src/views/projectType/ProjectType.api.ts  |  3 +
 4 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
index 2604c23..7e8325b 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
@@ -14,7 +14,7 @@ export const projectBaseInfoSchemas: FormSchema[] = [
     },
     dynamicDisabled: true,
     // defaultValue: '科技攻关',
-    defaultValue: '1846744340708184065',
+    // defaultValue: '1846744340708184065',
   },
   {
     field: 'annualId',
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
index 5234854..4cda7e7 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
@@ -18,20 +18,21 @@
 </template>
 <script lang="ts">
   import { BasicForm, useForm } from '@/components/Form';
-  import {defineComponent, ref} from 'vue';
+  import {defineComponent, ref,nextTick,onMounted} from 'vue';
   import { PageWrapper } from '@/components/Page';
   import { projectBaseInfoSchemas, userSchemas, departSchemas } from './data';
   import { Card } from 'ant-design-vue';
   import {defHttp} from "@/utils/http/axios";
   import {save4shenbao} from './data.api';
-  import { useRouter } from 'vue-router';
+  import { useRouter, useRoute } from 'vue-router';
 
   export default defineComponent({
     name: 'FormHightPage',
     components: { BasicForm, PageWrapper, [Card.name]: Card },
     setup() {
+      const route = useRoute();
       const { currentRoute, back } = useRouter();
-      const [registerProjectInfo, { validate: validateProjectInfoForm }] = useForm({
+      const [registerProjectInfo, { validate: validateProjectInfoForm, setFieldsValue }] = useForm({
         baseColProps: {
           span: 6,
         },
@@ -40,7 +41,13 @@
         schemas: projectBaseInfoSchemas,
         showActionButtonGroup: false,
       });
-
+      const setformValue1 = async () => {
+        // console.log(route,'route')
+        await setFieldsValue({projectTypeid: route.query.projectTypeId})
+      };
+      nextTick(() => {
+        setformValue1();
+      });
       const [registerUser, { validate: validateUserForm }] = useForm({
         baseColProps: {
           span: 6,
@@ -77,11 +84,9 @@
         back();
       };
 
-      function getUserDepart(){
-        projectBaseInfoSchemas.se
-      }
       return { registerProjectInfo, registerUser, registerDepart, submitAll, goBack };
     },
+
   });
 </script>
 <style lang="less" scoped>
diff --git a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
index 675a4f3..7a7af65 100644
--- a/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
@@ -10,26 +10,16 @@
 <!--        <j-upload-button type="primary" v-auth="'project:project:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown>
           <template #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="go_xinjianshenbao">
-                <Icon icon="ant-design:plus-outlined"></Icon>
-                科技攻关
-              </a-menu-item>
-<!--              <a-menu-item v-for="opt of RANGE_OPTIONS" :key="opt.key">
+            <a-menu @click="go_xinjianshenbao">
+            <a-menu-item v-for="opt of projectTypeList" :key="opt.key">
                 {{ opt.label }}
-              </a-menu-item>-->
-              <!--<a-menu-item key="1" @click="go_xinjianshenbao">
-                <Icon icon="ant-design:plus-outlined"></Icon>
-                xxx
-              </a-menu-item>-->
+              </a-menu-item>
             </a-menu>
           </template>
           <a-button type="primary">新建申报
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
-        <!-- 高级查询
-        <super-query :config="superQueryConfig" @search="handleSuperQuery" />-->
       </template>
       <!--操作栏-->
       <template #action="{ record }">
@@ -51,22 +41,24 @@ import {useModal} from '/@/components/Modal';
 import { useListPage } from '/@/hooks/system/useListPage'
 import ProjectModal from './components/ProjectModal.vue'
 import {columns, searchFormSchema, superQuerySchema} from './Project.data';
-  import {
-    list,
-    deleteOne,
-    rollbackOne,
-    submitOne,
-    batchDelete,
-    getImportUrl,
-    getExportUrl,
-    getProjectTypeList
-  } from './Project.api';
+import {
+  list,
+  deleteOne,
+  rollbackOne,
+  submitOne,
+  batchDelete,
+  getImportUrl,
+  getExportUrl,
+} from './Project.api';
+
+import {getProjectTypeList} from '../../projectType/ProjectType.api';
 import { downloadFile } from '/@/utils/common/renderUtils';
 import { useGo } from '/@/hooks/web/usePage';
 
 import { useUserStore } from '/@/store/modules/user';
 import {getUserData} from "@/views/system/usersetting/UserSetting.api";
   import {useTimeoutFn} from "@/hooks/core/useTimeout";
+import {departList4Quxian} from "@/api/sys/user";
 const go = useGo();
 
 const queryParam = reactive<any>({});
@@ -110,8 +102,7 @@ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
 })
 
   // 日期范围选项
-  // 日期范围选项
-  const RANGE_OPTIONS = [
+  /*const projectTypeList = [
     {key: 'TODAY', label: '今天'},
     {key: 'YESTERDAY', label: '昨天'},
     {key: 'TOMORROW', label: '明天'},
@@ -122,13 +113,16 @@ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
     {key: 'THIS_MONTH', label: '本月'},
     {key: 'LAST_MONTH', label: '上月'},
     {key: 'NEXT_MONTH', label: '下月'},
-  ];
+  ];*/
+
+const projectTypeList =ref([]);
 
 const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
 
 // 高级查询配置
 const superQueryConfig = reactive(superQuerySchema);
 
+getProjectType();
 /**
  * 高级查询事件
  */
@@ -149,9 +143,10 @@ function handleAdd() {
 }
 
 //跳转到新建申报页面
-function go_xinjianshenbao() {
-  // go('/comp/jeecg/basic');
-  go('/projectApplication/index?projectTypeId='+'1846744340708184065');
+function go_xinjianshenbao(event: Recordable) {
+  // alert("选择的荐类型id: "+event.key)
+  // 根据不的项目类型跳到不同的页面
+  go('/projectApplication/index?projectTypeId='+event.key);
 }
 
 //跳转到项目书页面
@@ -171,7 +166,20 @@ function go_projectLog(record) {
   go('/projectLog/projectLogList?id='+record.id);
 }
 
+async function getProjectType(){
+
+  let params = {
+    status: '1',
+  };
 
+  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}
+    })
+    console.log(JSON.stringify(projectTypeList));
+  })
+}
 
 /**
  * 编辑事件
diff --git a/jeecgboot-vue3/src/views/projectType/ProjectType.api.ts b/jeecgboot-vue3/src/views/projectType/ProjectType.api.ts
index ed5fa89..c925929 100644
--- a/jeecgboot-vue3/src/views/projectType/ProjectType.api.ts
+++ b/jeecgboot-vue3/src/views/projectType/ProjectType.api.ts
@@ -31,6 +31,9 @@ export const getImportUrl = Api.importExcel;
  */
 export const list = (params) => defHttp.get({ url: Api.list, params });
 
+// export const getProjectTypeList = (params) => defHttp.get({ url: Api.getProjectTypeList, params });
+export const getProjectTypeList = (params) => defHttp.get({ url: Api.list, params });
+
 /**
  * 删除单个
  * @param params