From b596fb76fd8e0602123e736657ffe4fab5013c1c Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Wed, 16 Oct 2024 18:04:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=94=B3=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectApplication/kejigongguan/data.ts   | 204 +++++++++++++-----
 .../kejigongguan/projectApplicationList.vue   |  54 +++--
 2 files changed, 181 insertions(+), 77 deletions(-)

diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
index 187f3cb..5d63245 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
@@ -1,12 +1,12 @@
 import { FormSchema } from '@/components/Form';
 
-const basicOptions: LabelValueOptions = [
+/*const basicOptions: LabelValueOptions = [
   {
-    label: '付晓晓',
+    label: '付晓晓222',
     value: '1',
   },
   {
-    label: '周毛毛',
+    label: '周毛毛333',
     value: '2',
   },
 ];
@@ -20,19 +20,39 @@ const storeTypeOptions: LabelValueOptions = [
     label: '公开',
     value: '2',
   },
-];
+];*/
 
-export const schemas: FormSchema[] = [
+//项目基本信息schema
+export const projectBaseInfoSchemas: FormSchema[] = [
+  {
+    field: 'projectType',
+    component: 'Input',
+    label: '项目类别',
+    required: true,
+  },
   {
-    field: 'f1',
+    field: 'annualId',
     component: 'Input',
-    label: '仓库名',
+    label: '计划年度',
     required: true,
   },
   {
+    field: 'batchNo',
+    component: 'Input',
+    label: '批次',
+    defaultValue: 1,
+    required: true,
+  },
+  {
+    field: 'projectName',
+    component: 'Input',
+    label: '项目名称',
+    required: true,
+  },
+  /*{
     field: 'f2',
     component: 'Input',
-    label: '仓库域名',
+    label: '仓库域名2',
     required: true,
     componentProps: {
       addonBefore: 'http://',
@@ -41,11 +61,10 @@ export const schemas: FormSchema[] = [
     colProps: {
       offset: 2,
     },
-  },
-  {
+  },{
     field: 'f3',
     component: 'Select',
-    label: '仓库管理员',
+    label: '仓库管理员2',
     componentProps: {
       options: basicOptions,
     },
@@ -53,8 +72,7 @@ export const schemas: FormSchema[] = [
     colProps: {
       offset: 2,
     },
-  },
-  {
+  },{
     field: 'f4',
     component: 'Select',
     label: '审批人',
@@ -62,17 +80,17 @@ export const schemas: FormSchema[] = [
       options: basicOptions,
     },
     required: true,
-  },
+  },*/
   {
     field: 'f5',
     component: 'RangePicker',
     label: '生效日期',
     required: true,
-    colProps: {
+    /*colProps: {
       offset: 2,
-    },
+    },*/
   },
-  {
+  /*{
     field: 'f6',
     component: 'Select',
     label: '仓库类型',
@@ -83,67 +101,143 @@ export const schemas: FormSchema[] = [
     colProps: {
       offset: 2,
     },
-  },
+  },*/
 ];
-export const taskSchemas: FormSchema[] = [
+
+//项目负责人schema
+export const userSchemas: FormSchema[] = [
   {
-    field: 't1',
+    field: 'name',
     component: 'Input',
-    label: '任务名',
+    label: '姓名',
     required: true,
   },
   {
-    field: 't2',
+    field: 'sex',
+    label: '性别',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: 'sex',
+      // stringToNumber: true,
+    },
+  },
+  {
+    field: 'age',
     component: 'Input',
-    label: '任务描述',
+    label: '年龄',
     required: true,
-    colProps: {
-      offset: 2,
-    },
+    // colProps: { span: 6 },
   },
   {
-    field: 't3',
-    component: 'Select',
-    label: '执行人',
+    label: '名族',
+    field: 'nation',
+    component: 'JDictSelectTag',
     componentProps: {
-      options: basicOptions,
-    },
-    required: true,
-    colProps: {
-      offset: 2,
+      dictCode: 'nation',
+      // stringToNumber: true,
     },
+    //colProps: { span: 6 },
   },
   {
-    field: 't4',
-    component: 'Select',
-    label: '责任人',
+    label: '党派',
+    field: 'political',
+    component: 'JDictSelectTag',
     componentProps: {
-      options: basicOptions,
+      dictCode: 'political',
+      // stringToNumber: true,
     },
-    required: true,
+    //colProps: { span: 6 },
   },
   {
-    field: 't5',
-    component: 'TimePicker',
-    label: '生效日期',
-    required: true,
+    field: 'title',
+    component: 'Input',
+    label: '职称',
+    // required: true,
+    // colProps: { span: 6 },
+  },
+  {
+    field: 'job',
+    component: 'Input',
+    label: '职务',
+    // required: true,
+    // colProps: { span: 6 },
+  },
+  {
+    field: 'currentPerfession',
+    component: 'Input',
+    label: '现从事专业',
+    // required: true,
+    // colProps: { span: 6 },
+  },
+];
+
+//单位信息schema
+export const departSchemas: FormSchema[] = [
+  {
+    field: 'org_name',
+    component: 'Input',
+    label: '单位名称',
+    // required: true,
+  },
+  {
+    field: 'category',
+    component: 'JDictSelectTag',
+    label: '单位性质',
     componentProps: {
-      style: { width: '100%' },
-    },
-    colProps: {
-      offset: 2,
+      dictCode: 'depart_category',
+      // stringToNumber: true,
     },
   },
   {
-    field: 't6',
-    component: 'Select',
-    label: '任务类型',
+    field: 'type',
+    component: 'JDictSelectTag',
+    label: '企业登记注册类型',
     componentProps: {
-      options: storeTypeOptions,
-    },
-    required: true,
-    colProps: {
-      offset: 2,
+      dictCode: 'depart_type',
+      // stringToNumber: true,
     },
+    // colProps: { span: 6 },
+  },
+  {
+    field: 'address',
+    component: 'Input',
+    label: '注册地址',
+    // required: true,
+    // colProps: { span: 6 },
+  },
+  {
+    field: 'fax',
+    component: 'Input',
+    label: '传真',
+    // required: true,
+    // colProps: { span: 6 },
+  },
+  {
+    field: 'bankName',
+    component: 'Input',
+    label: '开户银行',
+    // required: true,
+    // colProps: { span: 6 },
+  },
+  {
+    field: 'bankNo',
+    component: 'Input',
+    label: '账号',
+    // required: true,
+    // colProps: { span: 6 },
+  },
+  {
+    field: 'employeeNum',
+    component: 'Input',
+    label: '职工总数',
+    // required: true,
+    // colProps: { span: 6 },
+  },
+  {
+    field: 'lastYearFee',
+    component: 'Input',
+    label: '上年度研发经费',
+    // required: true,
+    // colProps: { span: 6 },
   },
 ];
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
index cd76e1d..ac08d62 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
@@ -1,13 +1,13 @@
 <template>
-  <PageWrapper class="high-form" title="高级表单" content=" 高级表单常见于一次性输入和提交大批量数据的场景。">
-    <a-card title="仓库管理" :bordered="false">
-      <BasicForm @register="register" />
+  <PageWrapper title="基本信息">
+    <a-card title="项目概况" :bordered="false">
+      <BasicForm @register="registerProjectInfo" />
     </a-card>
-    <a-card title="任务管理" :bordered="false" class="!mt-5">
-      <BasicForm @register="registerTask" />
+    <a-card title="项目负责人" :bordered="false" class="!mt-5">
+      <BasicForm @register="registerUser" />
     </a-card>
-    <a-card title="成员管理" :bordered="false">
-      <PersonTable ref="tableRef" />
+    <a-card title="申请单位概况" :bordered="false" class="!mt-5">
+      <BasicForm @register="registerDepart" />
     </a-card>
 
     <template #rightFooter>
@@ -18,49 +18,59 @@
 <script lang="ts">
   import { BasicForm, useForm } from '@/components/Form';
   import { defineComponent, ref } from 'vue';
-  import PersonTable from './PersonTable.vue';
+  // import PersonTable from './PersonTable.vue';
   import { PageWrapper } from '@/components/Page';
-  import { schemas, taskSchemas } from './data';
+  import { projectBaseInfoSchemas, userSchemas, departSchemas } from './data';
   import { Card } from 'ant-design-vue';
 
   export default defineComponent({
     name: 'FormHightPage',
-    components: { BasicForm, PersonTable, PageWrapper, [Card.name]: Card },
+    components: { BasicForm, PageWrapper, [Card.name]: Card },
     setup() {
-      const tableRef = ref<{ getDataSource: () => any } | null>(null);
+      const [registerProjectInfo, { validate: validateProjectInfoForm }] = useForm({
+        baseColProps: {
+          span: 6,
+        },
+        labelWidth: 200,
+        layout: 'vertical',
+        schemas: projectBaseInfoSchemas,
+        showActionButtonGroup: false,
+      });
 
-      const [register, { validate }] = useForm({
+      const [registerUser, { validate: validateUserForm }] = useForm({
         baseColProps: {
           span: 6,
         },
         labelWidth: 200,
         layout: 'vertical',
-        schemas: schemas,
+        schemas: userSchemas,
         showActionButtonGroup: false,
       });
 
-      const [registerTask, { validate: validateTaskForm }] = useForm({
+      const [registerDepart, { validate: validateDepartForm }] = useForm({
         baseColProps: {
           span: 6,
         },
         labelWidth: 200,
         layout: 'vertical',
-        schemas: taskSchemas,
+        schemas: departSchemas,
         showActionButtonGroup: false,
       });
 
       async function submitAll() {
         try {
-          if (tableRef.value) {
-            console.log('table data:', tableRef.value.getDataSource());
-          }
-
-          const [values, taskValues] = await Promise.all([validate(), validateTaskForm()]);
-          console.log('form data:', values, taskValues);
+          // if (tableRef.value) {
+          //   console.log('table data:', tableRef.value.getDataSource());
+          // }
+          const [projectBaseInfoValues, userValues, deaprtValues] = await Promise.all([validateProjectInfoForm(), validateUserForm(), validateDepartForm()]);
+          console.log('projectBaseInfoValues form data:', projectBaseInfoValues);
+          console.log('userValuesform data:', userValues);
+          console.log('deaprtValues form data:', deaprtValues);
         } catch (error) {}
       }
 
-      return { register, registerTask, submitAll, tableRef };
+      // return { register, registerUser, registerDepart, submitAll, tableRef };
+      return { registerProjectInfo, registerUser, registerDepart, submitAll };
     },
   });
 </script>