From 648f1d13957736ba9e8e41c4f3a8204d876a6730 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854@qq.com> Date: Wed, 23 Oct 2024 10:37:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B9=A6-=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=2010.?= =?UTF-8?q?23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CooperationDepart.java | 6 +++--- .../components/CooperationDepartModal.vue | 7 +++++-- .../kejigongguan/xiangmushu/FuJianDemo.vue | 15 +++++++++++++-- .../kejigongguan/xiangmushu/HeZuoDanWeiDemo.vue | 14 +++++++++++--- .../xiangmushu/XiangMuJiXiaoMuBiaoDemo.vue | 13 ++++++++++--- .../kejigongguan/xiangmushu/YiJianDemo.vue | 14 +++++++++++--- .../kejigongguan/xiangmushu/ZhengWenDemo.vue | 4 ++-- .../xiangmushu/ZhuYaoRenYuanDemo.vue | 16 +++++++++++++--- .../src/views/projectFile/ProjectFileList.vue | 10 +--------- .../projectFile/components/ProjectFileModal.vue | 2 +- .../views/projectMember/ProjectMember.data.ts | 4 ++-- .../components/ProjectMemberModal.vue | 7 +++++-- .../components/ProjectObjectiveModal.vue | 7 +++++-- 13 files changed, 82 insertions(+), 37 deletions(-) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cooperationdepart/entity/CooperationDepart.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cooperationdepart/entity/CooperationDepart.java index 926998d..1dac467 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cooperationdepart/entity/CooperationDepart.java +++ b/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) - @ApiModelProperty(value = "部门表id") - private java.lang.String departId; + @Excel(name = "项目表id", width = 15) + @ApiModelProperty(value = "项目表id") + private java.lang.String projectId; /** * 区域 */ diff --git a/jeecgboot-vue3/src/views/cooperationDepart/components/CooperationDepartModal.vue b/jeecgboot-vue3/src/views/cooperationDepart/components/CooperationDepartModal.vue index a1cea9c..4521616 100644 --- a/jeecgboot-vue3/src/views/cooperationDepart/components/CooperationDepartModal.vue +++ b/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%; } - \ No newline at end of file + diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/FuJianDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/FuJianDemo.vue index 56ad1b9..f6d37d5 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/FuJianDemo.vue +++ b/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({}); const checkedKeys = ref>([]); 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(); }; diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/HeZuoDanWeiDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/HeZuoDanWeiDemo.vue index 31b705d..96bcead 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/HeZuoDanWeiDemo.vue +++ b/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({}); const checkedKeys = ref>([]); @@ -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(); }; diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/XiangMuJiXiaoMuBiaoDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/XiangMuJiXiaoMuBiaoDemo.vue index 4a01730..c8932b3 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/XiangMuJiXiaoMuBiaoDemo.vue +++ b/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({}); const checkedKeys = ref>([]); @@ -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(); diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/YiJianDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/YiJianDemo.vue index fd922c0..6bd691d 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/YiJianDemo.vue +++ b/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({}); const checkedKeys = ref>([]); @@ -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(); }; diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhengWenDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhengWenDemo.vue index 87b7509..94f9630 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhengWenDemo.vue +++ b/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); +}; /** * 高级查询事件 diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhuYaoRenYuanDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhuYaoRenYuanDemo.vue index 3113cd3..cedd50f 100644 --- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/xiangmushu/ZhuYaoRenYuanDemo.vue +++ b/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({}); const checkedKeys = ref>([]); 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(); }; diff --git a/jeecgboot-vue3/src/views/projectFile/ProjectFileList.vue b/jeecgboot-vue3/src/views/projectFile/ProjectFileList.vue index 200b25e..c66d6fe 100644 --- a/jeecgboot-vue3/src/views/projectFile/ProjectFileList.vue +++ b/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); - } /** * 新增事件 */ diff --git a/jeecgboot-vue3/src/views/projectFile/components/ProjectFileModal.vue b/jeecgboot-vue3/src/views/projectFile/components/ProjectFileModal.vue index 240b93e..9f161b7 100644 --- a/jeecgboot-vue3/src/views/projectFile/components/ProjectFileModal.vue +++ b/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}); //提交表单 diff --git a/jeecgboot-vue3/src/views/projectMember/ProjectMember.data.ts b/jeecgboot-vue3/src/views/projectMember/ProjectMember.data.ts index dae9620..8216949 100644 --- a/jeecgboot-vue3/src/views/projectMember/ProjectMember.data.ts +++ b/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', diff --git a/jeecgboot-vue3/src/views/projectMember/components/ProjectMemberModal.vue b/jeecgboot-vue3/src/views/projectMember/components/ProjectMemberModal.vue index ade9556..f93c93e 100644 --- a/jeecgboot-vue3/src/views/projectMember/components/ProjectMemberModal.vue +++ b/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%; } - \ No newline at end of file + diff --git a/jeecgboot-vue3/src/views/projectObjective/components/ProjectObjectiveModal.vue b/jeecgboot-vue3/src/views/projectObjective/components/ProjectObjectiveModal.vue index dc86db7..9bb02b1 100644 --- a/jeecgboot-vue3/src/views/projectObjective/components/ProjectObjectiveModal.vue +++ b/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%; } - \ No newline at end of file +