From 07960993ee4eb27c8791d828cca5439e055fb0a6 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Fri, 18 Oct 2024 17:54:58 +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=2010.18?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectServiceImpl.java      | 13 ++++-
 .../projectApplication/kejigongguan/data.ts   | 47 +++++++++++++++++--
 .../kejigongguan/projectApplicationList.vue   |  3 +-
 3 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/service/impl/ProjectServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/service/impl/ProjectServiceImpl.java
index 2a134e4..93b685c 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/service/impl/ProjectServiceImpl.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/service/impl/ProjectServiceImpl.java
@@ -11,6 +11,8 @@ import org.jeecg.modules.demo.project.dto.ProjectShenBaoDto;
 import org.jeecg.modules.demo.project.entity.Project;
 import org.jeecg.modules.demo.project.mapper.ProjectMapper;
 import org.jeecg.modules.demo.project.service.IProjectService;
+import org.jeecg.modules.demo.projectType.entity.ProjectType;
+import org.jeecg.modules.demo.projectType.service.IProjectTypeService;
 import org.jeecg.modules.demo.userext.entity.UserExt;
 import org.jeecg.modules.demo.userext.service.IUserExtService;
 import org.jeecg.modules.system.entity.SysDepart;
@@ -43,10 +45,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     @Autowired
     private IUserExtService iUserExtService;
 
+    @Autowired
+    private IProjectTypeService iProjectTypeService;
+
     @Override
     public void save4shenbao(ProjectShenBaoDto dto) {
         log.info(">>> the 新增项目审报 reqParams:{}", JSON.toJSONString(dto));
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
+
 //        SysDepart sysDepart = new SysDepart();
         DepartExt departExt = new DepartExt();
 //        SysUser sysUser = new SysUser();
@@ -58,9 +65,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 //        BeanUtils.copyProperties(dto, sysUser);
         BeanUtils.copyProperties(dto, userExt);
         BeanUtils.copyProperties(dto, project);
-
+        project.setSysOrgCode(loginUser.getOrgId());
         //负责人
         project.setProjectCharger(loginUser.getId());
+        //申请人待提交
+        project.setProjectStatus("5");
+        // 预算书不存在
+        project.setBudgetStatus("10");
         this.save(project);
         userExt.setUserId(loginUser.getId());
         this.iUserExtService.save(userExt);
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
index ef8b944..7e4fe58 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
@@ -8,7 +8,8 @@ export const projectBaseInfoSchemas: FormSchema[] = [
     field: 'projectTypeid',
     component: 'Input',
     dynamicDisabled: true,
-    defaultValue: '科技攻关',
+    // defaultValue: '科技攻关',
+    defaultValue: '1846744340708184065',
   },
   {
     field: 'annualId',
@@ -159,11 +160,29 @@ export const departSchemas: FormSchema[] = [
     field: 'registerDate',
     component: 'DatePicker',
     label: '注册时间',
-    component: 'DatePicker',
-    // componentProps: {
+    // component: 'DatePicker',
+    componentProps: {
+      valueFormat: 'YYYY-MM-DD',
+      format: 'YYYY-MM-DD',
+    },
+    // edit: true,
+    // editComponent: 'DatePicker',
+    // editComponentProps: {
     //   valueFormat: 'YYYY-MM-DD',
+    //   format: 'YYYY-MM-DD',
     // },
+    // width: 200,
   },
+  // {
+  //   field: 'date',
+  //   label: '注册时间2',
+  //   component: 'DatePicker',
+  //   editComponentProps: {
+  //     valueFormat: 'YYYY-MM-DD',
+  //     format: 'YYYY-MM-DD',
+  //   },
+  //   width: 200,
+  // },
   {
     field: 'departNameAbbr',
     component: 'Input',
@@ -260,4 +279,26 @@ export const departSchemas: FormSchema[] = [
       ];
     },
   },
+  {
+    label: '项目书状态',
+    field: 'projectStatus',
+    component: 'Input',
+    componentProps: {
+      dictCode: "project_status"
+    },
+    defaultValue: '5', //申请人待提交
+    // dynamicDisabled: true,
+    ifShow: false,
+  },
+  {
+    label: '预算书状态',
+    field: 'budgetStatus',
+    component: 'JDictSelectTag',
+    componentProps: {
+      dictCode: "budget_status"
+    },
+    defaultValue: "10", //默认 预算书不存在
+    // dynamicDisabled: true,
+    ifShow: false,
+  },
 ];
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
index fe1e455..742b7cb 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
@@ -18,7 +18,6 @@
 <script lang="ts">
   import { BasicForm, useForm } from '@/components/Form';
   import { defineComponent, ref } from 'vue';
-  // import PersonTable from './PersonTable.vue';
   import { PageWrapper } from '@/components/Page';
   import { projectBaseInfoSchemas, userSchemas, departSchemas } from './data';
   import { Card } from 'ant-design-vue';
@@ -63,7 +62,7 @@
         try {
           Promise.all([validateProjectInfoForm(), validateUserForm(), validateDepartForm()]).then(function (results) {
             const params = {...results[0], ...results[1], ...results[2]}
-            console.log('results', params);
+            console.log('results', JSON.stringify(params));
             save4shenbao(params);
           });
         } catch (error) {}