From 0cec3c80e65d67e9c468a2191a5ecf0a7aadd443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com> Date: Thu, 7 Nov 2024 18:02:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/demo/expert/entity/Expert.java | 7 ++- .../src/views/expert/admin/Expert.data.ts | 23 +++++--- .../src/views/expert/admin/ExpertList.vue | 39 ++++++++++++- .../expert/admin/components/ExpertForm.vue | 20 ++++--- .../src/views/expert/adminback/Expert.data.ts | 23 +++++--- .../src/views/expert/adminback/ExpertList.vue | 4 +- .../src/views/expert/county/Expert.data.ts | 23 +++++--- .../src/views/expert/county/ExpertList.vue | 57 ++++++++++++------- .../expert/county/components/ExpertForm.vue | 17 ++++-- .../src/views/expert/firm/Expert.data.ts | 23 +++++--- .../src/views/expert/firm/ExpertList.vue | 43 ++++++++++++-- .../expert/firm/components/ExpertForm.vue | 19 ++++--- .../src/views/expert/self/Expert.data.ts | 24 +++++--- .../src/views/expert/self/ExpertList.vue | 4 +- .../expert/self/components/ExpertForm.vue | 19 ++++--- .../src/views/expert/selfback/Expert.data.ts | 23 +++++--- .../src/views/expert/selfback/ExpertList.vue | 14 ++--- .../expert/selfback/components/ExpertForm.vue | 2 +- .../views/expproject/admin/Expproject.data.ts | 7 ++- .../views/expproject/admin/ExpprojectList.vue | 20 ++++++- .../admin/components/ExpprojectForm.vue | 16 +++--- .../views/expproject/self/Expproject.data.ts | 7 ++- .../self/components/ExpprojectForm.vue | 2 +- 23 files changed, 308 insertions(+), 128 deletions(-) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java index 77343cd..16b8a8e 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java @@ -78,6 +78,7 @@ public class Expert implements Serializable { private String research; /**学历*/ @Excel(name = "学历", width = 15) + @Dict(dicCode = "xl") @ApiModelProperty(value = "学历") private String educationcal; /**专家简介*/ @@ -132,6 +133,10 @@ public class Expert implements Serializable { @Dict(dicCode = "examstures") @ApiModelProperty(value = "管理员审核") private java.lang.String adminopen; - + /**职称*/ + @Excel(name = "职称", width = 15, dicCode = "zc") + @Dict(dicCode = "zc") + @ApiModelProperty(value = "职称") + private java.lang.String zc; } diff --git a/jeecgboot-vue3/src/views/expert/admin/Expert.data.ts b/jeecgboot-vue3/src/views/expert/admin/Expert.data.ts index 9039ccf..9ecca63 100644 --- a/jeecgboot-vue3/src/views/expert/admin/Expert.data.ts +++ b/jeecgboot-vue3/src/views/expert/admin/Expert.data.ts @@ -6,9 +6,17 @@ import { getWeekMonthQuarterYear } from '/src/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '用户名', + title: '姓名', align: "center", - dataIndex: 'seusername' + dataIndex: 'realname' + }, + { + title: '性别', + align: "center", + dataIndex: 'sex', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'男',value:'1'},{text:'女',value:'2'}]); + }, }, { title: '毕业院校', @@ -21,7 +29,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'major' }, { - title: '研究方向', + title: '研究领域', align: "center", dataIndex: 'directioncal_dictText' }, @@ -33,12 +41,12 @@ export const columns: BasicColumn[] = [ { title: '学历', align: "center", - dataIndex: 'educationcal' + dataIndex: 'educationcal_dictText' }, { - title: '专家简介', + title: '职称', align: "center", - dataIndex: 'expinfo' + dataIndex: 'zc_dictText' }, { @@ -75,10 +83,9 @@ export const superQuerySchema = { seusername: {title: '用户名',order: 0,view: 'text', type: 'string',}, colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',}, major: {title: '专业',order: 2,view: 'text', type: 'string',}, - directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',}, + directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',}, research: {title: '研究类型',order: 4,view: 'text', type: 'string',}, educationcal: {title: '学历',order: 5,view: 'text', type: 'string',}, - expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',}, compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',}, adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',}, }; diff --git a/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue b/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue index 21c4163..07e619a 100644 --- a/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue +++ b/jeecgboot-vue3/src/views/expert/admin/ExpertList.vue @@ -12,8 +12,8 @@ - - + + @@ -72,7 +72,7 @@ @@ -220,6 +220,31 @@ label: '编辑', onClick: handleEdit.bind(null, record), }, + { + label: '详情', + onClick: handleDetail.bind(null, record), + }, { + label: '删除', + popConfirm: { + title: '是否确认删除', + confirm: handleDelete.bind(null, record), + placement: 'topLeft', + }, + }, { + label: '通过审核', + popConfirm: { + title: '是否通过审核', + confirm: handleupadmin.bind(null, record), + placement: 'topLeft', + }, + }, { + label: '驳回审核', + popConfirm: { + title: '是否v', + confirm: handlebackadmin.bind(null, record), + placement: 'topLeft', + }, + } ]; } @@ -302,4 +327,12 @@ width: 100%; } } + :deep(.ant-table-wrapper .ant-table-tbody >tr >td){ + height: 140px; + } + :deep(.jeecg-basic-table-action){ + height: 140px; + flex-wrap: wrap; + justify-content: center; + } diff --git a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue index 76971b4..51a5f87 100644 --- a/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue +++ b/jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue @@ -70,8 +70,8 @@ - - + + @@ -79,11 +79,16 @@ - - - - - + + + + + + + + + + @@ -155,6 +160,7 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload compopen: '', adminopen: '', backinfo: '', + zc: '', }); const { createMessage } = useMessage(); const labelCol = ref({ xs: { span: 24 }, sm: { span: 5 } }); diff --git a/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts b/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts index 9039ccf..9ecca63 100644 --- a/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts +++ b/jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts @@ -6,9 +6,17 @@ import { getWeekMonthQuarterYear } from '/src/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '用户名', + title: '姓名', align: "center", - dataIndex: 'seusername' + dataIndex: 'realname' + }, + { + title: '性别', + align: "center", + dataIndex: 'sex', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'男',value:'1'},{text:'女',value:'2'}]); + }, }, { title: '毕业院校', @@ -21,7 +29,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'major' }, { - title: '研究方向', + title: '研究领域', align: "center", dataIndex: 'directioncal_dictText' }, @@ -33,12 +41,12 @@ export const columns: BasicColumn[] = [ { title: '学历', align: "center", - dataIndex: 'educationcal' + dataIndex: 'educationcal_dictText' }, { - title: '专家简介', + title: '职称', align: "center", - dataIndex: 'expinfo' + dataIndex: 'zc_dictText' }, { @@ -75,10 +83,9 @@ export const superQuerySchema = { seusername: {title: '用户名',order: 0,view: 'text', type: 'string',}, colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',}, major: {title: '专业',order: 2,view: 'text', type: 'string',}, - directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',}, + directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',}, research: {title: '研究类型',order: 4,view: 'text', type: 'string',}, educationcal: {title: '学历',order: 5,view: 'text', type: 'string',}, - expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',}, compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',}, adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',}, }; diff --git a/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue b/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue index 81274cb..f4fae3d 100644 --- a/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue +++ b/jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue @@ -12,8 +12,8 @@ - - + + diff --git a/jeecgboot-vue3/src/views/expert/county/Expert.data.ts b/jeecgboot-vue3/src/views/expert/county/Expert.data.ts index ff4120a..9f8d1cd 100644 --- a/jeecgboot-vue3/src/views/expert/county/Expert.data.ts +++ b/jeecgboot-vue3/src/views/expert/county/Expert.data.ts @@ -6,9 +6,17 @@ import { getWeekMonthQuarterYear } from '/src/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '用户名', + title: '姓名', align: "center", - dataIndex: 'seusername' + dataIndex: 'realname' + }, + { + title: '性别', + align: "center", + dataIndex: 'sex', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'男',value:'1'},{text:'女',value:'2'}]); + }, }, { title: '毕业院校', @@ -21,7 +29,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'major' }, { - title: '研究方向', + title: '研究领域', align: "center", dataIndex: 'directioncal_dictText' }, @@ -33,12 +41,12 @@ export const columns: BasicColumn[] = [ { title: '学历', align: "center", - dataIndex: 'educationcal' + dataIndex: 'educationcal_dictText' }, { - title: '专家简介', + title: '职称', align: "center", - dataIndex: 'expinfo' + dataIndex: 'zc_dictText' }, { title: '部门审核', @@ -58,10 +66,9 @@ export const superQuerySchema = { seusername: {title: '用户名',order: 0,view: 'text', type: 'string',}, colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',}, major: {title: '专业',order: 2,view: 'text', type: 'string',}, - directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',}, + directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',}, research: {title: '研究类型',order: 4,view: 'text', type: 'string',}, educationcal: {title: '学历',order: 5,view: 'text', type: 'string',}, - expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',}, compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',}, adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',}, }; diff --git a/jeecgboot-vue3/src/views/expert/county/ExpertList.vue b/jeecgboot-vue3/src/views/expert/county/ExpertList.vue index 8e753df..954748e 100644 --- a/jeecgboot-vue3/src/views/expert/county/ExpertList.vue +++ b/jeecgboot-vue3/src/views/expert/county/ExpertList.vue @@ -12,8 +12,8 @@ - - + + @@ -22,23 +22,6 @@ - @@ -79,7 +62,7 @@ @@ -227,6 +210,31 @@ label: '编辑', onClick: handleEdit.bind(null, record), }, + { + label: '详情', + onClick: handleDetail.bind(null, record), + }, { + label: '删除', + popConfirm: { + title: '是否确认删除', + confirm: handleDelete.bind(null, record), + placement: 'topLeft', + }, + }, { + label: '通过审核', + popConfirm: { + title: '是否确认通过审核', + confirm: handleup.bind(null, record), + placement: 'topLeft', + }, + }, { + label: '驳回', + popConfirm: { + title: '是否确认通过审核', + confirm: handlebackcount.bind(null, record), + placement: 'topLeft', + }, + } ]; } @@ -309,4 +317,13 @@ width: 100%; } } + :deep(.ant-table-wrapper .ant-table-tbody >tr >td){ + height: 140px; + } + :deep(.jeecg-basic-table-action){ + height: 140px; + flex-wrap: wrap; + justify-content: center; + } + diff --git a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue index ae0c6da..61674d1 100644 --- a/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue +++ b/jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue @@ -70,8 +70,8 @@ - - + + @@ -79,10 +79,15 @@ - - - - + + + + + + + + + diff --git a/jeecgboot-vue3/src/views/expert/firm/Expert.data.ts b/jeecgboot-vue3/src/views/expert/firm/Expert.data.ts index e5bf07c..28c0130 100644 --- a/jeecgboot-vue3/src/views/expert/firm/Expert.data.ts +++ b/jeecgboot-vue3/src/views/expert/firm/Expert.data.ts @@ -6,9 +6,17 @@ import { getWeekMonthQuarterYear } from '/src/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '用户名', + title: '姓名', align: "center", - dataIndex: 'seusername' + dataIndex: 'realname' + }, + { + title: '性别', + align: "center", + dataIndex: 'sex', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'男',value:'1'},{text:'女',value:'2'}]); + }, }, { title: '毕业院校', @@ -21,7 +29,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'major' }, { - title: '研究方向', + title: '研究领域', align: "center", dataIndex: 'directioncal_dictText' }, @@ -33,12 +41,12 @@ export const columns: BasicColumn[] = [ { title: '学历', align: "center", - dataIndex: 'educationcal' + dataIndex: 'educationcal_dictText' }, { - title: '专家简介', + title: '职称', align: "center", - dataIndex: 'expinfo' + dataIndex: 'zc_dictText' }, { title: '部门审核', @@ -59,10 +67,9 @@ export const superQuerySchema = { seusername: {title: '用户名',order: 0,view: 'text', type: 'string',}, colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',}, major: {title: '专业',order: 2,view: 'text', type: 'string',}, - directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',}, + directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',}, research: {title: '研究类型',order: 4,view: 'text', type: 'string',}, educationcal: {title: '学历',order: 5,view: 'text', type: 'string',}, - expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',}, compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',}, adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',}, }; diff --git a/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue b/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue index d64a5fb..09334d4 100644 --- a/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue +++ b/jeecgboot-vue3/src/views/expert/firm/ExpertList.vue @@ -12,8 +12,8 @@ - - + + @@ -76,7 +76,7 @@ @@ -222,8 +222,33 @@ { label: '编辑', onClick: handleEdit.bind(null, record), - }, - ]; + },{ + label: '详情', + onClick: handleDetail.bind(null, record), + }, { + label: '删除', + popConfirm: { + title: '是否确认删除', + confirm: handleDelete.bind(null, record), + placement: 'topLeft', + }, + }, { + label: '通过审查', + popConfirm: { + title: '通过审查', + confirm: handleup.bind(null, record), + placement: 'topLeft', + }, + }, { + label: '驳回审查', + popConfirm: { + title: '驳回审查', + confirm: handleback.bind(null, record), + placement: 'topLeft', + }, + } + + ]; } /** @@ -305,4 +330,12 @@ width: 100%; } } + :deep(.ant-table-wrapper .ant-table-tbody >tr >td){ + height: 140px; + } + :deep(.jeecg-basic-table-action){ + height: 140px; + flex-wrap: wrap; + justify-content: center; + } diff --git a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue index 74c5838..094e242 100644 --- a/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue +++ b/jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue @@ -70,8 +70,8 @@ - - + + @@ -79,11 +79,16 @@ - - - - - + + + + + + + + + + diff --git a/jeecgboot-vue3/src/views/expert/self/Expert.data.ts b/jeecgboot-vue3/src/views/expert/self/Expert.data.ts index 6d17dd8..f4352a5 100644 --- a/jeecgboot-vue3/src/views/expert/self/Expert.data.ts +++ b/jeecgboot-vue3/src/views/expert/self/Expert.data.ts @@ -6,9 +6,17 @@ import { getWeekMonthQuarterYear } from '/src/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '用户名', + title: '姓名', align: "center", - dataIndex: 'seusername' + dataIndex: 'realname' + }, + { + title: '性别', + align: "center", + dataIndex: 'sex', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'男',value:'1'},{text:'女',value:'2'}]); + }, }, { title: '毕业院校', @@ -21,7 +29,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'major' }, { - title: '研究方向', + title: '研究领域', align: "center", dataIndex: 'directioncal_dictText' }, @@ -33,12 +41,12 @@ export const columns: BasicColumn[] = [ { title: '学历', align: "center", - dataIndex: 'educationcal' + dataIndex: 'educationcal_dictText' }, { - title: '专家简介', + title: '职称', align: "center", - dataIndex: 'expinfo' + dataIndex: 'zc_dictText' }, { title: '部门审核', @@ -54,13 +62,11 @@ export const columns: BasicColumn[] = [ // 高级查询数据 export const superQuerySchema = { - seusername: {title: '用户名',order: 0,view: 'text', type: 'string',}, colleges: {title: '毕业院校',order: 1,view: 'text', type: 'string',}, major: {title: '专业',order: 2,view: 'text', type: 'string',}, - directioncal: {title: '研究方向',order: 3,view: 'text', type: 'string',}, + directioncal: {title: '研究领域',order: 3,view: 'text', type: 'string',}, research: {title: '研究类型',order: 4,view: 'text', type: 'string',}, educationcal: {title: '学历',order: 5,view: 'text', type: 'string',}, - expinfo: {title: '专家简介',order: 6,view: 'text', type: 'string',}, compopen: {title: '部门审核',order: 7,view: 'switch', type: 'string',}, adminopen: {title: '管理员审核',order: 8,view: 'switch', type: 'string',}, }; diff --git a/jeecgboot-vue3/src/views/expert/self/ExpertList.vue b/jeecgboot-vue3/src/views/expert/self/ExpertList.vue index 6213bbd..1c83d29 100644 --- a/jeecgboot-vue3/src/views/expert/self/ExpertList.vue +++ b/jeecgboot-vue3/src/views/expert/self/ExpertList.vue @@ -12,8 +12,8 @@ - - + +