diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java index 7133fc9..45c8f30 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java @@ -186,6 +186,8 @@ public class ProjectController extends JeecgController DepartExtDto dto = new DepartExtDto(); BeanUtils.copyProperties(sysDepart, dto); BeanUtils.copyProperties(departExt, dto); + ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid()); + dto.setAnnualName(projectType.getAnnualName()); return Result.OK(dto); } diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/dto/DepartBaseInfoDto.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/dto/DepartBaseInfoDto.java new file mode 100644 index 0000000..c390175 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/dto/DepartBaseInfoDto.java @@ -0,0 +1,23 @@ +package org.jeecg.modules.demo.project.dto; + +import lombok.Data; + +/** + * @Description: TODO + * @Author: Z.H.C + * @CreateTime: 2024-10-27 11:56 + * @Version: 1.0 + */ +@Data +public class DepartBaseInfoDto { + + private String annualName; +// private String projectCharger; + private String projectTime; + private String idNO; + private String phone; + private String realName; + private String email; + private String title;; + +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/dto/DepartExtDto.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/dto/DepartExtDto.java index 2b4f9e4..05db0b0 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/dto/DepartExtDto.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/dto/DepartExtDto.java @@ -43,6 +43,9 @@ public class DepartExtDto { @Dict(dicCode = "depart_category") @ApiModelProperty(value = "单位性质") private String category; + + @ApiModelProperty(value = "年度") + private String annualName; /** * 企业登记注册类型 */ diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/DepartBaseInfoDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/DepartBaseInfoDemo.vue new file mode 100644 index 0000000..b749059 --- /dev/null +++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/DepartBaseInfoDemo.vue @@ -0,0 +1,157 @@ + + + diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/ProjectBaseINfo.data.tsx b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/ProjectBaseINfo.data.tsx deleted file mode 100644 index c320c52..0000000 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/ProjectBaseINfo.data.tsx +++ /dev/null @@ -1,100 +0,0 @@ -import { BasicColumn } from '/@/components/Table/src/types/table'; - -import { Badge } from 'ant-design-vue'; - -export const refundTimeTableSchema: BasicColumn[] = [ - { - title: '指标类别(参考分值) ', - align:"center", - dataIndex: 'indexClass_dictText' - }, - { - title: '序号', - align:"center", - dataIndex: 'seq' - }, - { - title: '指标名称 ', - align:"center", - dataIndex: 'indexName' - }, - { - title: '预期指标名称(参考举例)', - align:"center", - dataIndex: 'expectIndexName' - }, - { - title: '考核方式方法', - align:"center", - dataIndex: 'checkMethod' - }, - { - title: '考核指标分值', - align:"center", - dataIndex: 'indexVal' - }, - { - title: '备注', - align:"center", - dataIndex: 'remark' - }, - /*{ - title: '时间', - width: 150, - dataIndex: 't1', - }, - { - title: '当前进度', - width: 150, - dataIndex: 't2', - }, - { - title: '状态', - width: 150, - dataIndex: 't3', - customRender: ({ record }) => { - return ; - }, - }, - { - title: '操作员ID ', - width: 150, - dataIndex: 't4', - }, - { - title: '耗时', - width: 150, - dataIndex: 't5', - },*/ -]; - -export const refundTimeTableData: any[] = [ - { - t1: '2017-10-01 14:10', - t2: '联系客户', - t3: '进行中', - t4: '取货员 ID1234', - t5: '5mins', - }, - { - t1: '2017-10-01 14:10', - t2: '取货员出发', - t3: '成功', - t4: '取货员 ID1234', - t5: '5mins', - }, - { - t1: '2017-10-01 14:10', - t2: '取货员接单', - t3: '成功', - t4: '系统', - t5: '5mins', - }, - { - t1: '2017-10-01 14:10', - t2: '申请审批通过', - t3: '成功', - t4: '用户', - t5: '1h', - }, -]; diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/index.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/index.vue index 4952ad1..ac8cbcd 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/index.vue +++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/index.vue @@ -5,14 +5,15 @@ + - + - + - + @@ -26,7 +27,7 @@ import FengMianDemo from './FengMianDemo.vue'; import TianBaoShuMingDemo from './TianBaoShuMingDemo.vue'; import ProjectBaseInfoDemo from './ProjectBaseInfoDemo.vue'; - import JiBenXinXiDemo from '../xiangmushu/JiBenXinXiDemo.vue'; + import DepartBaseInfoDemo from './DepartBaseInfoDemo.vue'; import XiangMuJiXiaoMuBiaoDemo from '../xiangmushu/XiangMuJiXiaoMuBiaoDemo.vue'; import YiJianDemo from '../xiangmushu/YiJianDemo.vue'; import HeZuoDanWeiDemo from '../xiangmushu/HeZuoDanWeiDemo.vue'; @@ -48,6 +49,7 @@ TianBaoShuMingDemo: TianBaoShuMingDemo, FengMianDemo: FengMianDemo, ProjectBaseInfoDemo: ProjectBaseInfoDemo, + DepartBaseInfoDemo: DepartBaseInfoDemo, ZhengWenDemo: ZhengWenDemo, XiangMuHeZuoKaiFaDemo: XiangMuHeZuoKaiFaDemo, XiangMuJiXiaoMuBiaoDemo: XiangMuJiXiaoMuBiaoDemo, diff --git a/jeecgboot-vue3/src/views/projectApplication/project/Project.api.ts b/jeecgboot-vue3/src/views/projectApplication/project/Project.api.ts index 89f01fe..bae57da 100644 --- a/jeecgboot-vue3/src/views/projectApplication/project/Project.api.ts +++ b/jeecgboot-vue3/src/views/projectApplication/project/Project.api.ts @@ -6,6 +6,7 @@ const {createConfirm} = useMessage(); enum Api { list = '/project/project/list', projectType = '/projectType/getProjectTypeList', + departBaseInfo = '/projectType/getDepartBaseInfo', save = '/project/project/add', edit = '/project/project/edit', deleteOne = '/project/project/delete', @@ -34,6 +35,10 @@ export const list = (params) => export const getProjectTypeList = (params) => defHttp.get({url: Api.projectType, params}); + +export const getDepartBaseInfo = (params) => + defHttp.get({url: Api.departBaseInfo, params}); + /** * 删除单个 */