项目书-意见&主要参加人员功能添加 10.21

1 month ago · 27142a630f
parent 0569890ada
commit 27142a630f
14 changed files with 1195 additions and 119 deletions
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/controller/ProjectOpinionController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/controller/ProjectOpinionController.java
@ -0,0 +1,162 @@
+package org.jeecg.modules.demo.projectOpinion.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.demo.projectOpinion.entity.ProjectOpinion;
+import org.jeecg.modules.demo.projectOpinion.service.IProjectOpinionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * @Description: 意见
+ * @Author: jeecg-boot
+ * @Date: 2024-10-21
+ * @Version: V1.0
+ */
+@Api(tags = "意见")
+@RestController
+@RequestMapping("/projectOpinion/projectOpinion")
+@Slf4j
+public class ProjectOpinionController extends JeecgController<ProjectOpinion, IProjectOpinionService> {
+    @Autowired
+    private IProjectOpinionService projectOpinionService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param projectOpinion
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "意见-分页列表查询")
+    @ApiOperation(value = "意见-分页列表查询", notes = "意见-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<ProjectOpinion>> queryPageList(ProjectOpinion projectOpinion,
+                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                       HttpServletRequest req) {
+        QueryWrapper<ProjectOpinion> queryWrapper = QueryGenerator.initQueryWrapper(projectOpinion, req.getParameterMap());
+        Page<ProjectOpinion> page = new Page<ProjectOpinion>(pageNo, pageSize);
+        IPage<ProjectOpinion> pageList = projectOpinionService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param projectOpinion
+     * @return
+     */
+    @AutoLog(value = "意见-添加")
+    @ApiOperation(value = "意见-添加", notes = "意见-添加")
+//    @RequiresPermissions("projectOpinion:project_opinion:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody ProjectOpinion projectOpinion) {
+        projectOpinionService.save(projectOpinion);
+        return Result.OK("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param projectOpinion
+     * @return
+     */
+    @AutoLog(value = "意见-编辑")
+    @ApiOperation(value = "意见-编辑", notes = "意见-编辑")
+//    @RequiresPermissions("projectOpinion:project_opinion:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody ProjectOpinion projectOpinion) {
+        projectOpinionService.updateById(projectOpinion);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "意见-通过id删除")
+    @ApiOperation(value = "意见-通过id删除", notes = "意见-通过id删除")
+//    @RequiresPermissions("projectOpinion:project_opinion:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        projectOpinionService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "意见-批量删除")
+    @ApiOperation(value = "意见-批量删除", notes = "意见-批量删除")
+//    @RequiresPermissions("projectOpinion:project_opinion:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.projectOpinionService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "意见-通过id查询")
+    @ApiOperation(value = "意见-通过id查询", notes = "意见-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<ProjectOpinion> queryById(@RequestParam(name = "id", required = true) String id) {
+        ProjectOpinion projectOpinion = projectOpinionService.getById(id);
+        if (projectOpinion == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(projectOpinion);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param projectOpinion
+     */
+//    @RequiresPermissions("projectOpinion:project_opinion:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ProjectOpinion projectOpinion) {
+        return super.exportXls(request, projectOpinion, ProjectOpinion.class, "意见");
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequiresPermissions("projectOpinion:project_opinion:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ProjectOpinion.class);
+    }
+
+}
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/entity/ProjectOpinion.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/entity/ProjectOpinion.java
@ -0,0 +1,80 @@
+package org.jeecg.modules.demo.projectOpinion.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 意见
+ * @Author: jeecg-boot
+ * @Date: 2024-10-21
+ * @Version: V1.0
+ */
+@Data
+@TableName("project_opinion")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "project_opinion对象", description = "意见")
+public class ProjectOpinion implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+    /**
+     * 更新人
+     */
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /**
+     * 项目id
+     */
+    @Excel(name = "项目id", width = 15)
+    @ApiModelProperty(value = "项目id")
+    private String projectId;
+    /**
+     * 申请单位意见
+     */
+    @Excel(name = "申请单位意见", width = 15)
+    @ApiModelProperty(value = "申请单位意见")
+    private String applyDepartPinion;
+    /**
+     * 推荐部门意见
+     */
+    @Excel(name = "推荐部门意见", width = 15)
+    @ApiModelProperty(value = "推荐部门意见")
+    private String presentDepartOpinion;
+}
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/mapper/ProjectOpinionMapper.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/mapper/ProjectOpinionMapper.java
@ -0,0 +1,17 @@
+package org.jeecg.modules.demo.projectOpinion.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.demo.projectOpinion.entity.ProjectOpinion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 意见
+ * @Author: jeecg-boot
+ * @Date:   2024-10-21
+ * @Version: V1.0
+ */
+public interface ProjectOpinionMapper extends BaseMapper<ProjectOpinion> {
+
+}
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/mapper/xml/ProjectOpinionMapper.xml
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/mapper/xml/ProjectOpinionMapper.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.projectOpinion.mapper.ProjectOpinionMapper">
+
+</mapper>
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/service/IProjectOpinionService.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/service/IProjectOpinionService.java
@ -0,0 +1,14 @@
+package org.jeecg.modules.demo.projectOpinion.service;
+
+import org.jeecg.modules.demo.projectOpinion.entity.ProjectOpinion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 意见
+ * @Author: jeecg-boot
+ * @Date:   2024-10-21
+ * @Version: V1.0
+ */
+public interface IProjectOpinionService extends IService<ProjectOpinion> {
+
+}
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/service/impl/ProjectOpinionServiceImpl.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectOpinion/service/impl/ProjectOpinionServiceImpl.java
@ -0,0 +1,19 @@
+package org.jeecg.modules.demo.projectOpinion.service.impl;
+
+import org.jeecg.modules.demo.projectOpinion.entity.ProjectOpinion;
+import org.jeecg.modules.demo.projectOpinion.mapper.ProjectOpinionMapper;
+import org.jeecg.modules.demo.projectOpinion.service.IProjectOpinionService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 意见
+ * @Author: jeecg-boot
+ * @Date:   2024-10-21
+ * @Version: V1.0
+ */
+@Service
+public class ProjectOpinionServiceImpl extends ServiceImpl<ProjectOpinionMapper, ProjectOpinion> implements IProjectOpinionService {
+
+}
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/YiJianDemo.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/YiJianDemo.vue
@ -1,129 +1,221 @@
 <template>
-  <div class="p-4">
-    <div class="p-4 bg-white">
-<!--      <a-button-group class="j-table-operator">-->
-<!--        <a-button type="primary" @click="setDis(0)">启用</a-button>-->
-<!--        <a-button type="primary" @click="setDis(1)">禁用</a-button>-->
-<!--        <a-button type="primary" @click="getValues()">校验表单并获取值</a-button>-->
-<!--        <a-button type="primary" @click="setValues()">设置值</a-button>-->
-<!--      </a-button-group>-->
-      <BasicForm @register="register" @submit="handleSubmit" />
-    </div>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
+        </a-button>
+        <!--          <a-button  type="primary" v-auth="'cooperationdepart:cooperation_depart:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+                  <j-upload-button type="primary" v-auth="'cooperationdepart:cooperation_depart:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+                  <a-dropdown v-if="selectedRowKeys.length > 0">
+                      <template #overlay>
+                        <a-menu>
+                          <a-menu-item key="1" @click="batchHandleDelete">
+                            <Icon icon="ant-design:delete-outlined"></Icon>
+                            删除
+                          </a-menu-item>
+                        </a-menu>
+                      </template>
+                      <a-button v-auth="'cooperationdepart:cooperation_depart:deleteBatch'">批量操作
+                        <Icon icon="mdi:chevron-down"></Icon>
+                      </a-button>
+                </a-dropdown>-->
+        <!-- 高级查询 -->
+        <!--        <super-query :config="superQueryConfig" @search="handleSuperQuery" />-->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"
+                     :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ProjectOpinionModal @register="registerModal" @success="handleSuccess"></ProjectOpinionModal>
  </div>
-  <div type="primary" class="button-container">
-    <a-button  @click="goBack">返回 </a-button>
-    <a-button type="primary"  @click="saveYiJian">保存 </a-button>
+  <div class="button-container">
+    <a-button type="primary" @click="goBack">返回</a-button>
  </div>
 </template>

-<script lang="ts">
-  export default {
-    title: '富文本 | Markdown',
-    name: 'MarkdownDemo',
-  };
-</script>
-
-<script lang="ts" setup>
-  import { FormSchema, useForm, BasicForm } from '@/components/Form';
-  import { useMessage } from '@/hooks/web/useMessage';
-  import { defineComponent, onMounted, ref } from 'vue';
-  import {getTenantId} from "@/utils/auth";
-  import { useRouter } from 'vue-router';
-
-  const { back } = useRouter();
-  const { createMessage, createSuccessModal } = useMessage();
+<script lang="ts" name="projectObjective-projectObjective" setup>
+import {reactive, ref} from 'vue';
+import {BasicTable, TableAction} from '/@/components/Table';
+import {useModal} from '/@/components/Modal';
+import {useListPage} from '/@/hooks/system/useListPage'
+import {
+  columns,
+  searchFormSchema,
+  superQuerySchema
+} from '/@/views/projectOpinion/ProjectOpinion.data';
+import {
+  batchDelete,
+  deleteOne,
+  getExportUrl,
+  getImportUrl,
+  list
+} from '/@/views/projectOpinion/ProjectOpinion.api';
+import {useUserStore} from '/@/store/modules/user';
+import {useRouter} from 'vue-router';
+import ProjectOpinionModal from "@/views/projectOpinion/components/ProjectOpinionModal.vue";

-  const schemas: FormSchema[] = [
-    {
-      field: 'shenqingdanwei_feedback',
-      label: '申请单位意见',
-      component: 'InputTextArea',
-      componentProps: {
-        // placeholder: '请输入公司地址',
-        rows: 5,
-      }
+const {back} = useRouter();
+const queryParam = reactive<any>({});
+const checkedKeys = ref<Array<string | number>>([]);
+const userStore = useUserStore();
+//注册model
+const [registerModal, {openModal}] = useModal();
+//注册table数据
+const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
+  tableProps: {
+    title: '合作单位',
+    api: list,
+    columns,
+    canResize: false,
+    formConfig: {
+      //labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      showAdvancedButton: true,
+      fieldMapToNumber: [],
+      fieldMapToTime: [],
    },
-    {
-      field: 'tuijiandanwei_feedback',
-      // component: 'JEditor',
-      label: '推荐部门意见',
-      component: 'InputTextArea',
-      componentProps: {
-        // placeholder: '请输入公司地址',
-        rows: 5,
-      }
+    actionColumn: {
+      width: 120,
+      fixed: 'right'
    },
-/*    {
-      field: 'markdown',
-      component: 'JMarkdownEditor',
-      label: 'Markdown',
-      defaultValue: '# 张三',
-      required: true,
-      componentProps: {
-        height: 300,
-      },
-    },*/
-  ];
-
-  const [register, { setProps, validate, setFieldsValue }] = useForm({
-    labelWidth: 120,
-    schemas: schemas,
-    actionColOptions: {
-      span: 24,
+    beforeFetch: (params) => {
+      return Object.assign(params, queryParam);
    },
-    compact: true,
-    showResetButton: false,
-    showSubmitButton: false,
-    showAdvancedButton: false,
-    disabled: false,
+  },
+  exportConfig: {
+    name: "合作单位",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+})
+
+const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
+
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
+
+function goBack() {
+  back();
+};
+
+/**
+ * 高级查询事件
+ */
+function handleSuperQuery(params) {
+  Object.keys(params).map((k) => {
+    queryParam[k] = params[k];
  });
+  reload();
+}

-  function handleSubmit(values) {
-    console.log(values);
-  }
-
-  function setDis(flag) {
-    setProps({ disabled: !!flag });
-  }
-
-  async function getValues() {
-    try {
-      const values = await validate();
-      console.log(values);
-      createSuccessModal({
-        title: '校验通过',
-        content: `${JSON.stringify(values)}`,
-      });
-    } catch (error) {
-      createMessage.warning('检验不通过');
-    }
-  }
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  openModal(true, {
+    isUpdate: false,
+    showFooter: true,
+  });
+}

-  function setValues() {
-    setFieldsValue({
-      tinymce: '本项目有以下产学研合作基础：\n' +
-        '（1）2019年，项目负责人与河南省高新技术企业驻马店市易创网络科技有限公司签订横向课题开发协议，完成了《基于知识图谱的教育云平台》项目的研发工作，经费50万元。该项目研发过程中，对知识图谱的存储、处理、二维显示等技术进行了深入的研究和应用，为本课题的三维知识图谱可视化技术的研发奠定了扎实的基础。\n' +
-        '（2）项目负责人作为其它项目主持人或主要参与人，参加过多项大型校企合作项目的研发工作，涉及智能制造和智慧金融方面等领域。一方面积累了的丰富的项目经验；另一方面这些以往完成的项目，可以为本项目的核心功能，三维知识图谱可视化功能，提供应用平台。',
-    });
-  }
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: true,
+  });
+}
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: false,
+  });
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await deleteOne({id: record.id}, handleSuccess);
+}
+
+/**
+ * 批量删除事件
+ */
+async function batchHandleDelete() {
+  await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+}
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}

-  function saveYiJian(){
-    alert("保存意见")
-  };
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  return [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+      // auth: 'cooperationdepart:cooperation_depart:edit'
+    }
+  ]
+}

-  function goBack(){
-    back();
-  };
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
+      },
+      // auth: 'cooperationdepart:cooperation_depart:delete'
+    }
+  ]
+}

-  // onMounted(() => {
-  //   // alert("项目合作开发情况")
-  //   setValues();
-  // });

 </script>

-<style scoped>
-  .button-container {
-    text-align: center;
-  }
+<style lang="less" scoped>
+:deep(.ant-picker), :deep(.ant-input-number) {
+  width: 100%;
+}
+
+.button-container {
+  text-align: center;
+}
 </style>
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhuYaoRenYuanDemo.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhuYaoRenYuanDemo.vue
@ -0,0 +1,221 @@
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable" :rowSelection="rowSelection">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增
+        </a-button>
+        <!--          <a-button  type="primary" v-auth="'cooperationdepart:cooperation_depart:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+                  <j-upload-button type="primary" v-auth="'cooperationdepart:cooperation_depart:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+                  <a-dropdown v-if="selectedRowKeys.length > 0">
+                      <template #overlay>
+                        <a-menu>
+                          <a-menu-item key="1" @click="batchHandleDelete">
+                            <Icon icon="ant-design:delete-outlined"></Icon>
+                            删除
+                          </a-menu-item>
+                        </a-menu>
+                      </template>
+                      <a-button v-auth="'cooperationdepart:cooperation_depart:deleteBatch'">批量操作
+                        <Icon icon="mdi:chevron-down"></Icon>
+                      </a-button>
+                </a-dropdown>-->
+        <!-- 高级查询 -->
+        <!--        <super-query :config="superQueryConfig" @search="handleSuperQuery" />-->
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"
+                     :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ProjectOpinionModal @register="registerModal" @success="handleSuccess"></ProjectOpinionModal>
+  </div>
+  <div class="button-container">
+    <a-button type="primary" @click="goBack">返回</a-button>
+  </div>
+</template>
+
+<script lang="ts" name="projectObjective-projectObjective" setup>
+import {reactive, ref} from 'vue';
+import {BasicTable, TableAction} from '/@/components/Table';
+import {useModal} from '/@/components/Modal';
+import {useListPage} from '/@/hooks/system/useListPage'
+import {
+  columns,
+  searchFormSchema,
+  superQuerySchema
+} from '/@/views/projectMember/ProjectMember.data';
+import {
+  batchDelete,
+  deleteOne,
+  getExportUrl,
+  getImportUrl,
+  list
+} from '/@/views/projectMember/ProjectMember.api';
+import {useUserStore} from '/@/store/modules/user';
+import {useRouter} from 'vue-router';
+import ProjectOpinionModal from '/@/views/projectMember/components/ProjectMemberModal.vue';
+
+const {back} = useRouter();
+const queryParam = reactive<any>({});
+const checkedKeys = ref<Array<string | number>>([]);
+const userStore = useUserStore();
+//注册model
+const [registerModal, {openModal}] = useModal();
+//注册table数据
+const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
+  tableProps: {
+    title: '合作单位',
+    api: list,
+    columns,
+    canResize: false,
+    formConfig: {
+      //labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      showAdvancedButton: true,
+      fieldMapToNumber: [],
+      fieldMapToTime: [],
+    },
+    actionColumn: {
+      width: 120,
+      fixed: 'right'
+    },
+    beforeFetch: (params) => {
+      return Object.assign(params, queryParam);
+    },
+  },
+  exportConfig: {
+    name: "合作单位",
+    url: getExportUrl,
+    params: queryParam,
+  },
+  importConfig: {
+    url: getImportUrl,
+    success: handleSuccess
+  },
+})
+
+const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
+
+// 高级查询配置
+const superQueryConfig = reactive(superQuerySchema);
+
+function goBack() {
+  back();
+};
+
+/**
+ * 高级查询事件
+ */
+function handleSuperQuery(params) {
+  Object.keys(params).map((k) => {
+    queryParam[k] = params[k];
+  });
+  reload();
+}
+
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  openModal(true, {
+    isUpdate: false,
+    showFooter: true,
+  });
+}
+
+/**
+ * 编辑事件
+ */
+function handleEdit(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: true,
+  });
+}
+
+/**
+ * 详情
+ */
+function handleDetail(record: Recordable) {
+  openModal(true, {
+    record,
+    isUpdate: true,
+    showFooter: false,
+  });
+}
+
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await deleteOne({id: record.id}, handleSuccess);
+}
+
+/**
+ * 批量删除事件
+ */
+async function batchHandleDelete() {
+  await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+}
+
+/**
+ * 成功回调
+ */
+function handleSuccess() {
+  (selectedRowKeys.value = []) && reload();
+}
+
+/**
+ * 操作栏
+ */
+function getTableAction(record) {
+  return [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record),
+      // auth: 'cooperationdepart:cooperation_depart:edit'
+    }
+  ]
+}
+
+/**
+ * 下拉操作栏
+ */
+function getDropDownAction(record) {
+  return [
+    {
+      label: '详情',
+      onClick: handleDetail.bind(null, record),
+    }, {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record),
+        placement: 'topLeft',
+      },
+      // auth: 'cooperationdepart:cooperation_depart:delete'
+    }
+  ]
+}
+
+
+</script>
+
+<style lang="less" scoped>
+:deep(.ant-picker), :deep(.ant-input-number) {
+  width: 100%;
+}
+
+.button-container {
+  text-align: center;
+}
+</style>
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/index.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/index.vue
@ -5,10 +5,11 @@
        <a-tab-pane key="TianBaoShuMingDemo" tab="填报说明" force-render></a-tab-pane>
        <a-tab-pane key="XiangMuHeZuoKaiFaDemo" tab="项目合作开发情况"></a-tab-pane>
        <a-tab-pane key="HeZuoDanWeiDemo" tab="合作单位"></a-tab-pane>
-        <a-tab-pane key="JeecgComponents" tab="下拉选择组件"></a-tab-pane>
-        <a-tab-pane key="JEditorDemo" tab="富文本&MakeDown"></a-tab-pane>
-        <a-tab-pane key="ImgDragSort" tab="图片拖拽"></a-tab-pane>
-        <a-tab-pane key="ImgTurnPage" tab="图片翻页"></a-tab-pane>
+        <a-tab-pane key="ZhuYaoRenYuanDemo" tab="项目主要参加人员"></a-tab-pane>
+<!--        <a-tab-pane key="JeecgComponents" tab="下拉选择组件"></a-tab-pane>-->
+<!--        <a-tab-pane key="JEditorDemo" tab="富文本&MakeDown"></a-tab-pane>-->
+<!--        <a-tab-pane key="ImgDragSort" tab="图片拖拽"></a-tab-pane>-->
+<!--        <a-tab-pane key="ImgTurnPage" tab="图片翻页"></a-tab-pane>-->
        <a-tab-pane key="JeecgPdfView" tab="PDF预览"></a-tab-pane>
        <a-tab-pane key="XiangMuJiXiaoMuBiaoDemo" tab="项目绩效目标"></a-tab-pane>
        <a-tab-pane key="YiJianDemo" tab="意见"></a-tab-pane>
@ -29,6 +30,7 @@
  import XiangMuJiXiaoMuBiaoDemo from './XiangMuJiXiaoMuBiaoDemo.vue';
  import YiJianDemo from './YiJianDemo.vue';
  import HeZuoDanWeiDemo from './HeZuoDanWeiDemo.vue';
+  import ZhuYaoRenYuanDemo from './ZhuYaoRenYuanDemo.vue';
  import XiangMuHeZuoKaiFaDemo from './XiangMuHeZuoKaiFaDemo.vue';
  import ImgDragSort from './ImgDragSort.vue';
  import ImgTurnPage from './ImgTurnPage.vue';
@ -39,7 +41,6 @@
  export default defineComponent({
    name: 'comp-jeecg-basic',
    setup() {
-      // const activeKey = ref('JeecgComponents');
      const { back } = useRouter();
      const activeKey = ref('TianBaoShuMingDemo');
      const currentComponent = computed(() => {
@ -49,10 +50,11 @@
          XiangMuJiXiaoMuBiaoDemo: XiangMuJiXiaoMuBiaoDemo,
          YiJianDemo: YiJianDemo,
          HeZuoDanWeiDemo: HeZuoDanWeiDemo,
-          JeecgComponents: JeecgComponents,
-          JEditorDemo: JEditorDemo,
-          ImgDragSort: ImgDragSort,
-          ImgTurnPage: ImgTurnPage,
+          ZhuYaoRenYuanDemo: ZhuYaoRenYuanDemo,
+          // JeecgComponents: JeecgComponents,
+          // JEditorDemo: JEditorDemo,
+          // ImgDragSort: ImgDragSort,
+          // ImgTurnPage: ImgTurnPage,
          JeecgPdfView: JeecgPdfView,
          JUploadDemo: JUploadDemo,
        };
--- a/jeecgboot-vue3/src/views/projectOpinion/ProjectOpinion.api.ts
+++ b/jeecgboot-vue3/src/views/projectOpinion/ProjectOpinion.api.ts
@ -0,0 +1,64 @@
+import {defHttp} from '/@/utils/http/axios';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
+
+enum Api {
+  list = '/projectOpinion/projectOpinion/list',
+  save='/projectOpinion/projectOpinion/add',
+  edit='/projectOpinion/projectOpinion/edit',
+  deleteOne = '/projectOpinion/projectOpinion/delete',
+  deleteBatch = '/projectOpinion/projectOpinion/deleteBatch',
+  importExcel = '/projectOpinion/projectOpinion/importExcel',
+  exportXls = '/projectOpinion/projectOpinion/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  createConfirm({
+    iconType: 'warning',
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}
--- a/jeecgboot-vue3/src/views/projectOpinion/ProjectOpinion.data.ts
+++ b/jeecgboot-vue3/src/views/projectOpinion/ProjectOpinion.data.ts
@ -0,0 +1,64 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+import { getWeekMonthQuarterYear } from '/@/utils';
+//列表数据
+export const columns: BasicColumn[] = [
+   {
+    title: '申请单位意见',
+    align:"center",
+    dataIndex: 'applyDepartPinion'
+   },
+   {
+    title: '推荐部门意见',
+    align:"center",
+    dataIndex: 'presentDepartOpinion'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '申请单位意见',
+    field: 'applyDepartPinion',
+    component: 'InputTextArea',
+    componentProps: {
+      // placeholder: '请输入公司地址',
+      rows: 5,
+    },
+  },
+  {
+    label: '推荐部门意见',
+    field: 'presentDepartOpinion',
+    component: 'InputTextArea',
+    componentProps: {
+      // placeholder: '请输入公司地址',
+      rows: 5,
+    },
+  },
+	// TODO 主键隐藏字段，目前写死为ID
+	{
+	  label: '',
+	  field: 'id',
+	  component: 'Input',
+	  show: false
+	},
+];
+
+// 高级查询数据
+export const superQuerySchema = {
+  applyDepartPinion: {title: '申请单位意见',order: 0,view: 'text', type: 'string',},
+  presentDepartOpinion: {title: '推荐部门意见',order: 1,view: 'text', type: 'string',},
+};
+
+/**
+* 流程表单调用这个方法获取formSchema
+* @param param
+*/
+export function getBpmFormSchema(_formData): FormSchema[]{
+  // 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema
+  return formSchema;
+}
--- a/jeecgboot-vue3/src/views/projectOpinion/ProjectOpinionList.vue
+++ b/jeecgboot-vue3/src/views/projectOpinion/ProjectOpinionList.vue
@ -0,0 +1,190 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" v-auth="'projectOpinion:project_opinion:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button type="primary" v-auth="'projectOpinion:project_opinion:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button v-auth="'projectOpinion:project_opinion:deleteBatch'">批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+        <!-- 高级查询 -->
+        <super-query :config="superQueryConfig" @search="handleSuperQuery" />
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template v-slot:bodyCell="{ column, record, index, text }">
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <ProjectOpinionModal @register="registerModal" @success="handleSuccess"></ProjectOpinionModal>
+  </div>
+</template>
+
+<script lang="ts" name="projectOpinion-projectOpinion" setup>
+  import {ref, reactive, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import ProjectOpinionModal from './components/ProjectOpinionModal.vue'
+  import {columns, searchFormSchema, superQuerySchema} from './ProjectOpinion.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ProjectOpinion.api';
+  import { downloadFile } from '/@/utils/common/renderUtils';
+  import { useUserStore } from '/@/store/modules/user';
+  const queryParam = reactive<any>({});
+  const checkedKeys = ref<Array<string | number>>([]);
+  const userStore = useUserStore();
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '意见',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              //labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToNumber: [
+              ],
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+               fixed:'right'
+            },
+            beforeFetch: (params) => {
+              return Object.assign(params, queryParam);
+            },
+      },
+       exportConfig: {
+            name:"意见",
+            url: getExportUrl,
+            params: queryParam,
+          },
+          importConfig: {
+            url: getImportUrl,
+            success: handleSuccess
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  // 高级查询配置
+  const superQueryConfig = reactive(superQuerySchema);
+
+  /**
+   * 高级查询事件
+   */
+  function handleSuperQuery(params) {
+    Object.keys(params).map((k) => {
+      queryParam[k] = params[k];
+    });
+    reload();
+  }
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, handleSuccess);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: selectedRowKeys.value}, handleSuccess);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      (selectedRowKeys.value = []) && reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+           auth: 'projectOpinion:project_opinion:edit'
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+       return [
+         {
+           label: '详情',
+           onClick: handleDetail.bind(null, record),
+         }, {
+           label: '删除',
+           popConfirm: {
+             title: '是否确认删除',
+             confirm: handleDelete.bind(null, record),
+             placement: 'topLeft',
+           },
+           auth: 'projectOpinion:project_opinion:delete'
+         }
+       ]
+   }
+
+
+</script>
+
+<style lang="less" scoped>
+  :deep(.ant-picker),:deep(.ant-input-number){
+    width: 100%;
+  }
+</style>
--- a/jeecgboot-vue3/src/views/projectOpinion/components/ProjectOpinionForm.vue
+++ b/jeecgboot-vue3/src/views/projectOpinion/components/ProjectOpinionForm.vue
@ -0,0 +1,70 @@
+<template>
+    <div style="min-height: 400px">
+        <BasicForm @register="registerForm"></BasicForm>
+        <div style="width: 100%;text-align: center" v-if="!formDisabled">
+            <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {computed, defineComponent} from 'vue';
+    import {defHttp} from '/@/utils/http/axios';
+    import { propTypes } from '/@/utils/propTypes';
+    import {getBpmFormSchema} from '../ProjectOpinion.data';
+    import {saveOrUpdate} from '../ProjectOpinion.api';
+    
+    export default defineComponent({
+        name: "ProjectOpinionForm",
+        components:{
+            BasicForm
+        },
+        props:{
+            formData: propTypes.object.def({}),
+            formBpm: propTypes.bool.def(true),
+        },
+        setup(props){
+            const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
+                labelWidth: 150,
+                schemas: getBpmFormSchema(props.formData),
+                showActionButtonGroup: false,
+                baseColProps: {span: 24}
+            });
+
+            const formDisabled = computed(()=>{
+                if(props.formData.disabled === false){
+                    return false;
+                }
+                return true;
+            });
+
+            let formData = {};
+            const queryByIdUrl = '/projectOpinion/projectOpinion/queryById';
+            async function initFormData(){
+                let params = {id: props.formData.dataId};
+                const data = await defHttp.get({url: queryByIdUrl, params});
+                formData = {...data}
+                //设置表单的值
+                await setFieldsValue(formData);
+                //默认是禁用
+                await setProps({disabled: formDisabled.value})
+            }
+
+            async function submitForm() {
+                let data = getFieldsValue();
+                let params = Object.assign({}, formData, data);
+                console.log('表单数据', params)
+                await saveOrUpdate(params, true)
+            }
+
+            initFormData();
+            
+            return {
+                registerForm,
+                formDisabled,
+                submitForm,
+            }
+        }
+    });
+</script>
--- a/jeecgboot-vue3/src/views/projectOpinion/components/ProjectOpinionModal.vue
+++ b/jeecgboot-vue3/src/views/projectOpinion/components/ProjectOpinionModal.vue
@ -0,0 +1,76 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
+      <BasicForm @register="registerForm" name="ProjectOpinionForm" />
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../ProjectOpinion.data';
+    import {saveOrUpdate} from '../ProjectOpinion.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    const isDetail = ref(false);
+    //表单配置
+    const [registerForm, { setProps,resetFields, setFieldsValue, validate, scrollToField }] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+        baseColProps: {span: 24}
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        isDetail.value = !!data?.showFooter;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : !unref(isDetail) ? '详情' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } catch ({ errorFields }) {
+           if (errorFields) {
+             const firstField = errorFields[0];
+             if (firstField) {
+               scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+             }
+           }
+           return Promise.reject(errorFields);
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+	/** 时间和数字输入框样式 */
+  :deep(.ant-input-number) {
+    width: 100%;
+  }
+
+  :deep(.ant-calendar-picker) {
+    width: 100%;
+  }
+</style>