From df7723690220fb51250f2f186ddb9ae6697dbcf8 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Thu, 24 Oct 2024 15:53:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B9=A6-=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=2010.?=
 =?UTF-8?q?24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectApplication/kejigongguan/data.ts   |  25 ++
 .../kejigongguan/projectApplicationList.vue   |   2 +-
 .../kejigongguan/xiangmushu/JiBenXinXi.ts     | 232 ++++++++++++++++++
 .../xiangmushu/JiBenXinXiDemo.vue             |   2 +-
 4 files changed, 259 insertions(+), 2 deletions(-)

diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
index 7e4fe58..e81f5f1 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
@@ -84,6 +84,20 @@ export const userSchemas: FormSchema[] = [
     // required: true,
     // colProps: { span: 6 },
   },
+  {
+    field: 'idNO',
+    component: 'Input',
+    label: '身份证号',
+    // required: true,
+    // colProps: { span: 6 },
+  },
+  {
+    field: 'phone',
+    component: 'Input',
+    label: '负责人手机号',
+    // required: true,
+    // colProps: { span: 6 },
+  },
   {
     label: '名族',
     field: 'nation',
@@ -94,6 +108,17 @@ export const userSchemas: FormSchema[] = [
     },
     //colProps: { span: 6 },
   },
+  {
+    label: '电子邮箱',
+    field: 'email',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^([\w]+\.*)([\w]+)@[\w]+\.\w{3}(\.\w{2}|)$/, message: '请输入正确的电子邮件!'},
+      ];
+    },
+  },
   {
     label: '党派',
     field: 'political',
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
index 6979504..5234854 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
@@ -1,5 +1,5 @@
 <template>
-  <PageWrapper title="基本信息">
+  <PageWrapper>
     <a-card title="项目概况" :bordered="false">
       <BasicForm @register="registerProjectInfo" />
     </a-card>
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/JiBenXinXi.ts b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/JiBenXinXi.ts
index c21ad97..41bc084 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/JiBenXinXi.ts
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/JiBenXinXi.ts
@@ -11,6 +11,11 @@ export const projectBaseInfoSchemas: FormSchema[] = [
     defaultValue: '科技攻关',
     // defaultValue: '1846744340708184065',
   },
+  /*{
+    label: '项目类别表id',
+    field: 'projectTypeid',
+    component: 'Input',
+  },*/
   {
     field: 'annualId',
     component: 'Input',
@@ -49,6 +54,222 @@ export const projectBaseInfoSchemas: FormSchema[] = [
     // },
     required: true,
   },
+  {
+    label: '项目领域',
+    field: 'projectDomain',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "project_domain",
+      // // type: "radio"
+    },
+  },
+  {
+    label: '新兴产业',
+    field: 'emergingIndustry',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "emerging_industry",
+      // type: "radio"
+    },
+    ifShow: ({ values }) => {
+      return values.traditionalIndustry == null;
+    },
+  },
+  {
+    label: '传统产业',
+    field: 'traditionalIndustry',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode:"traditional_industry",
+      // type: "radio"
+    },
+    ifShow: ({ values }) => {
+      return values.emergingIndustry == null;
+    },
+  },
+  {
+    label: '技术来源',
+    field: 'technicalSource',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "technical_source",
+      // type: "radio"
+    },
+  },
+  {
+    label: '技术水平',
+    field: 'technicalLevel',
+    component: 'JDictSelectTag',
+    componentProps:{
+      dictCode:"technical_level",
+      // type: "radio"
+    },
+  },
+  {
+    label: '预期主要成果形式',
+    field: 'resultForm',
+    component: 'JCheckbox',
+    componentProps:{
+      dictCode:"result_form"
+    },
+  },
+  {
+    label: '无经费是否接受指导项目立项',
+    field: 'isAcceptInitProject',
+    component: 'JSwitch',
+    componentProps: {
+     /* //取值 options
+      options:['Y','N'],
+      //文本option
+      labelOptions:['是', '否'],*/
+      //是否启用下拉
+      // query: true,
+      //是否禁用
+      disabled: false,
+    },
+    defaultValue: 'Y',
+  },
+  {
+    label: '经费投入（万元）',
+    field: 'fundInput',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+      ];
+    },
+  },
+  {
+    label: '申请市财政拨款（万元）',
+    field: 'applyFund',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+      ];
+    },
+  },
+  /*{
+    label: '所属实验室、研究中心',
+    field: 'laboratory',
+    component: 'Input',
+  },*/
+  {
+    label: '地方投入（万元）',
+    field: 'localInput',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+      ];
+    },
+  },
+  {
+    label: '银行贷款（万元）',
+    field: 'bankLoan',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+      ];
+    },
+  },
+  {
+    label: '自筹（万元）',
+    field: 'selfRaise',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+      ];
+    },
+  },
+  {
+    label: '年生产能力（万元）',
+    field: 'yearlyCapacity',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+      ];
+    },
+  },
+  {
+    label: '年销售收入（万元）',
+    field: 'annualSalesRevenue',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+      ];
+    },
+  },
+  {
+    label: '年出口创汇（万元）',
+    field: 'annualExportEarnings',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+      ];
+    },
+  },
+  {
+    label: '年纳税总额（万元）',
+    field: 'totalAnnualTaxPayment',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+      ];
+    },
+  },
+  {
+    label: '年净利润（万元）',
+    field: 'annualProfit',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^(([1-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!'},
+      ];
+    },
+  },
+  {
+    label: '就业人数',
+    field: 'employmentFigure',
+    component: 'InputNumber',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^(([1-9][0-9]*))$/, message: '请输入正确的人数!'},
+      ];
+    },
+  },
+  {
+    label: '申请专利数',
+    field: 'applyPatentNumber',
+    component: 'Input',
+  },
+  {
+    label: '发明专利数',
+    field: 'invevtionPatentNumber',
+    component: 'Input',
+  },
+  {
+    label: '授权专利数',
+    field: 'creditPatentNumber',
+    component: 'Input',
+  },
 ];
 
 //项目负责人schema
@@ -108,6 +329,17 @@ export const userSchemas: FormSchema[] = [
     },
     //colProps: { span: 6 },
   },
+  {
+    label: '电子邮箱',
+    field: 'email',
+    component: 'Input',
+    dynamicRules: ({model,schema}) => {
+      return [
+        { required: false},
+        { pattern: /^([\w]+\.*)([\w]+)@[\w]+\.\w{3}(\.\w{2}|)$/, message: '请输入正确的电子邮件!'},
+      ];
+    },
+  },
   {
     label: '党派',
     field: 'political',
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/JiBenXinXiDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/JiBenXinXiDemo.vue
index 994a56d..3ce9087 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/JiBenXinXiDemo.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/JiBenXinXiDemo.vue
@@ -1,5 +1,5 @@
 <template>
-  <PageWrapper title="基本信息">
+  <PageWrapper>
     <a-card title="项目概况" :bordered="false">
       <BasicForm @register="registerProjectInfo" />
     </a-card>