项目书-功能完善 功能添加 10.23

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cooperationdepart/entity/CooperationDepart.java

@@ -62,9 +62,9 @@ public class CooperationDepart implements Serializable {
     /**
      * 部门表id
      */
-    @Excel(name = "部门表id", width = 15)
+    @Excel(name = "项目表id", width = 15)
-    @ApiModelProperty(value = "部门表id")
+    @ApiModelProperty(value = "项目表id")
-    private java.lang.String departId;
+    private java.lang.String projectId;
     /**
      * 区域
      */

jeecgboot-vue3/src/views/cooperationDepart/components/CooperationDepartModal.vue

@@ -9,6 +9,8 @@
     import {BasicModal, useModalInner} from '/@/components/Modal';
     import {BasicForm, useForm} from '/@/components/Form/index';
     import {formSchema} from '../CooperationDepart.data';
+    import {useRoute} from "vue-router";
+    const route = useRoute();
     import {saveOrUpdate} from '../CooperationDepart.api';
     // Emits声明
     const emit = defineEmits(['register','success']);
@@ -43,7 +45,8 @@
     async function handleSubmit(v) {
         try {
             let values = await validate();
-            setModalProps({confirmLoading: true});
+          values.projectId= route.query.id;
+          setModalProps({confirmLoading: true});
             //提交表单
             await saveOrUpdate(values, isUpdate.value);
             //关闭弹窗
@@ -73,4 +76,4 @@
   :deep(.ant-calendar-picker) {
     width: 100%;
   }
-</style>
+</style>

jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/FuJianDemo.vue

@@ -37,18 +37,20 @@ import {columns, searchFormSchema, superQuerySchema} from '/@/views/projectFile/
 import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from '/@/views/projectFile/ProjectFile.api';
 import { downloadFile } from '/@/utils/common/renderUtils';
 import { useUserStore } from '/@/store/modules/user';
-import {useRouter} from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 const queryParam = reactive<any>({});
 const checkedKeys = ref<Array<string | number>>([]);
 const userStore = useUserStore();
 const {back} = useRouter();
+const route = useRoute();
 //注册model
 const [registerModal, {openModal}] = useModal();
 //注册table数据
 const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
   tableProps:{
     title: '项目书附件',
-    api: list,
+    api: listByProjectId,
+    // api: list,
     columns,
     canResize:false,
     formConfig: {
@@ -85,6 +87,15 @@ const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
 // 高级查询配置
 const superQueryConfig = reactive(superQuerySchema);
 
+async function listByProjectId() {
+  let params = {
+    projectId: route.query.id,
+    fileFlag: 'fujian',
+  };
+  console.log(JSON.stringify(params));
+  return await list(params);
+}
+
 function goBack() {
   back();
 };

jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/HeZuoDanWeiDemo.vue

@@ -51,8 +51,8 @@ import CooperationDepartModal from '/@/views/cooperationDepart/components/Cooper
 import {columns, searchFormSchema, superQuerySchema} from '/@/views/cooperationDepart/CooperationDepart.data';
 import {batchDelete, deleteOne, getExportUrl, getImportUrl, list} from '/@/views/cooperationDepart/CooperationDepart.api';
 import {useUserStore} from '/@/store/modules/user';
-import { useRouter } from 'vue-router';
+import { useRouter,useRoute} from 'vue-router';
-
+const route = useRoute();
 const { back } = useRouter();
 const queryParam = reactive<any>({});
 const checkedKeys = ref<Array<string | number>>([]);
@@ -63,7 +63,7 @@ const [registerModal, {openModal}] = useModal();
 const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
   tableProps: {
     title: '合作单位',
-    api: list,
+    api: listByProjectId,
     columns,
     canResize: false,
     formConfig: {
@@ -98,6 +98,14 @@ const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
 // 高级查询配置
 const superQueryConfig = reactive(superQuerySchema);
 
+async function listByProjectId() {
+  let params = {
+    projectId: route.query.id,
+  };
+  console.log(JSON.stringify(params));
+  return await list(params);
+}
+
 function goBack(){
   back();
 };

jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/XiangMuJiXiaoMuBiaoDemo.vue

@@ -48,9 +48,9 @@ import {useListPage} from '/@/hooks/system/useListPage'
 import {columns, searchFormSchema, superQuerySchema} from '/@/views/projectObjective/ProjectObjective.data';
 import {batchDelete, deleteOne, getExportUrl, getImportUrl, list} from '/@/views/projectObjective/ProjectObjective.api';
 import {useUserStore} from '/@/store/modules/user';
-import { useRouter } from 'vue-router';
+import { useRouter,useRoute } from 'vue-router';
 import ProjectObjectiveModal from "@/views/projectObjective/components/ProjectObjectiveModal.vue";
-
+const route = useRoute();
 const { back } = useRouter();
 const queryParam = reactive<any>({});
 const checkedKeys = ref<Array<string | number>>([]);
@@ -61,7 +61,7 @@ const [registerModal, {openModal}] = useModal();
 const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
   tableProps: {
     title: '合作单位',
-    api: list,
+    api: listByProjectId,
     columns,
     canResize: false,
     formConfig: {
@@ -95,6 +95,13 @@ const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
 
 // 高级查询配置
 const superQueryConfig = reactive(superQuerySchema);
+async function listByProjectId() {
+  let params = {
+    projectId: route.query.id,
+  };
+  console.log(JSON.stringify(params));
+  return await list(params);
+}
 
 function goBack(){
   back();

jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/YiJianDemo.vue

@@ -59,9 +59,9 @@ import {
   list
 } from '/@/views/projectOpinion/ProjectOpinion.api';
 import {useUserStore} from '/@/store/modules/user';
-import {useRouter} from 'vue-router';
+import {useRouter,useRoute} from 'vue-router';
 import ProjectOpinionModal from "@/views/projectOpinion/components/ProjectOpinionModal.vue";
-
+const route = useRoute();
 const {back} = useRouter();
 const queryParam = reactive<any>({});
 const checkedKeys = ref<Array<string | number>>([]);
@@ -72,7 +72,7 @@ const [registerModal, {openModal}] = useModal();
 const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
   tableProps: {
     title: '合作单位',
-    api: list,
+    api: listByProjectId,
     columns,
     canResize: false,
     formConfig: {
@@ -107,6 +107,14 @@ const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
 // 高级查询配置
 const superQueryConfig = reactive(superQuerySchema);
 
+async function listByProjectId() {
+  let params = {
+    projectId: route.query.id,
+  };
+  console.log(JSON.stringify(params));
+  return await list(params);
+}
+
 function goBack() {
   back();
 };

jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhengWenDemo.vue

@@ -98,8 +98,8 @@ async function listByProjectId() {
     fileFlag: 'zhengwen',
   };
   console.log(JSON.stringify(params));
-  await list(params);
+ return await list(params);
-}
+};
 
 /**
  * 高级查询事件

jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhuYaoRenYuanDemo.vue

@@ -60,9 +60,11 @@ import {
 } from '/@/views/projectMember/ProjectMember.api';
 import {useUserStore} from '/@/store/modules/user';
 import {useRouter} from 'vue-router';
-import ProjectOpinionModal from '/@/views/projectMember/components/ProjectMemberModal.vue';
+import {useRoute} from "vue-router";
-
+const route = useRoute();
 const {back} = useRouter();
+
+import ProjectOpinionModal from '/@/views/projectMember/components/ProjectMemberModal.vue';
 const queryParam = reactive<any>({});
 const checkedKeys = ref<Array<string | number>>([]);
 const userStore = useUserStore();
@@ -72,7 +74,7 @@ const [registerModal, {openModal}] = useModal();
 const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
   tableProps: {
     title: '合作单位',
-    api: list,
+    api: listByProjectId,
     columns,
     canResize: false,
     formConfig: {
@@ -107,6 +109,14 @@ const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
 // 高级查询配置
 const superQueryConfig = reactive(superQuerySchema);
 
+async function listByProjectId() {
+  let params = {
+    projectId: route.query.id,
+  };
+  console.log(JSON.stringify(params));
+  return await list(params);
+}
+
 function goBack() {
   back();
 };

jeecgboot-vue3/src/views/projectFile/ProjectFileList.vue

@@ -60,7 +60,7 @@
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
            title: '项目书附件',
-           api: listByProjectId,
+           api: list,
            columns,
            canResize:false,
            formConfig: {
@@ -107,14 +107,6 @@
     reload();
   }
 
-  async function listByProjectId() {
-    let params = {
-      projectId: router.qu,
-      fileFlag: 'zhengwen',
-    };
-    console.log(JSON.stringify(params));
-    await list(params);
-  }
    /**
     * 新增事件
     */

jeecgboot-vue3/src/views/projectFile/components/ProjectFileModal.vue

@@ -46,7 +46,7 @@
         try {
             let values = await validate();
             //设置项目id
-            values.porjectId = route.query.id
+            values.projectId = route.query.id
             values.fileFlag = 'fujian'
             setModalProps({confirmLoading: true});
             //提交表单

jeecgboot-vue3/src/views/projectMember/ProjectMember.data.ts

@@ -66,11 +66,11 @@ export const searchFormSchema: FormSchema[] = [
 ];
 //表单数据
 export const formSchema: FormSchema[] = [
-  {
+  /*{
     label: '申报表id',
     field: 'projectId',
     component: 'Input',
-  },
+  },*/
   {
     label: '姓名',
     field: 'name',

jeecgboot-vue3/src/views/projectMember/components/ProjectMemberModal.vue

@@ -9,6 +9,8 @@
     import {BasicModal, useModalInner} from '/@/components/Modal';
     import {BasicForm, useForm} from '/@/components/Form/index';
     import {formSchema} from '../ProjectMember.data';
+    import {useRoute} from "vue-router";
+    const route = useRoute();
     import {saveOrUpdate} from '../ProjectMember.api';
     // Emits声明
     const emit = defineEmits(['register','success']);
@@ -43,7 +45,8 @@
     async function handleSubmit(v) {
         try {
             let values = await validate();
-            setModalProps({confirmLoading: true});
+          values.projectId= route.query.id;
+          setModalProps({confirmLoading: true});
             //提交表单
             await saveOrUpdate(values, isUpdate.value);
             //关闭弹窗
@@ -73,4 +76,4 @@
   :deep(.ant-calendar-picker) {
     width: 100%;
   }
-</style>
+</style>

jeecgboot-vue3/src/views/projectObjective/components/ProjectObjectiveModal.vue

@@ -9,6 +9,8 @@
     import {BasicModal, useModalInner} from '/@/components/Modal';
     import {BasicForm, useForm} from '/@/components/Form/index';
     import {formSchema} from '../ProjectObjective.data';
+    import {useRoute} from "vue-router";
+    const route = useRoute();
     import {saveOrUpdate} from '../ProjectObjective.api';
     // Emits声明
     const emit = defineEmits(['register','success']);
@@ -43,7 +45,8 @@
     async function handleSubmit(v) {
         try {
             let values = await validate();
-            setModalProps({confirmLoading: true});
+          values.projectId= route.query.id;
+          setModalProps({confirmLoading: true});
             //提交表单
             await saveOrUpdate(values, isUpdate.value);
             //关闭弹窗
@@ -73,4 +76,4 @@
   :deep(.ant-calendar-picker) {
     width: 100%;
   }
-</style>
+</style>