zhc077
/
zmd_kejiju
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修改

Browse Source
master
王家东 2 weeks ago
parent 267adf748e
commit 0cec3c80e6
23 changed files with 308 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java
  2. 23
      jeecgboot-vue3/src/views/expert/admin/Expert.data.ts
  3. 39
      jeecgboot-vue3/src/views/expert/admin/ExpertList.vue
  4. 12
      jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
  5. 23
      jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts
  6. 4
      jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue
  7. 23
      jeecgboot-vue3/src/views/expert/county/Expert.data.ts
  8. 57
      jeecgboot-vue3/src/views/expert/county/ExpertList.vue
  9. 11
      jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
  10. 23
      jeecgboot-vue3/src/views/expert/firm/Expert.data.ts
  11. 39
      jeecgboot-vue3/src/views/expert/firm/ExpertList.vue
  12. 11
      jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
  13. 24
      jeecgboot-vue3/src/views/expert/self/Expert.data.ts
  14. 4
      jeecgboot-vue3/src/views/expert/self/ExpertList.vue
  15. 11
      jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue
  16. 23
      jeecgboot-vue3/src/views/expert/selfback/Expert.data.ts
  17. 14
      jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue
  18. 2
      jeecgboot-vue3/src/views/expert/selfback/components/ExpertForm.vue
  19. 7
      jeecgboot-vue3/src/views/expproject/admin/Expproject.data.ts
  20. 20
      jeecgboot-vue3/src/views/expproject/admin/ExpprojectList.vue
  21. 8
      jeecgboot-vue3/src/views/expproject/admin/components/ExpprojectForm.vue
  22. 7
      jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts
  23. 2
      jeecgboot-vue3/src/views/expproject/self/components/ExpprojectForm.vue

7
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java
Unescape View File

@ -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;
}

23
jeecgboot-vue3/src/views/expert/admin/Expert.data.ts
Unescape View File

@ -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',},
};

39
jeecgboot-vue3/src/views/expert/admin/ExpertList.vue
Unescape View File

@ -12,8 +12,8 @@
</a-col>
<a-col :lg="6">
<a-form-item name="directioncal">
<template #label><span title="研究方向">研究方向</span></template>
<a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
<template #label><span title="研究领域">研究领域</span></template>
<a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
@ -72,7 +72,7 @@
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
<TableAction :actions="getTableAction(record)" />
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
@ -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;
}
</style>

12
jeecgboot-vue3/src/views/expert/admin/components/ExpertForm.vue
Unescape View File

@ -70,8 +70,8 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="研究方向" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
<j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究方向" allow-clear />
<a-form-item label="研究领域" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
<j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究领域" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
@ -81,7 +81,12 @@
</a-col>
<a-col :span="24">
<a-form-item label="学历" v-bind="validateInfos.educationcal" id="ExpertForm-educationcal" name="educationcal">
<a-input v-model:value="formData.educationcal" placeholder="请输入学历" allow-clear ></a-input>
<j-dict-select-tag v-model:value="formData.educationcal" dictCode="xl" placeholder="请选择学历" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="职称" v-bind="validateInfos.zc" id="ExpertForm-zc" name="zc">
<j-dict-select-tag v-model:value="formData.zc" dictCode="zc" placeholder="请选择职称" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
@ -155,6 +160,7 @@ import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload
compopen: '',
adminopen: '',
backinfo: '',
zc: '',
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

23
jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts
Unescape View File

@ -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',},
};

4
jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue
Unescape View File

@ -12,8 +12,8 @@
</a-col>
<a-col :lg="6">
<a-form-item name="directioncal">
<template #label><span title="研究方向">研究方向</span></template>
<a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
<template #label><span title="研究领域">研究领域</span></template>
<a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">

23
jeecgboot-vue3/src/views/expert/county/Expert.data.ts
Unescape View File

@ -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',},
};

57
jeecgboot-vue3/src/views/expert/county/ExpertList.vue
Unescape View File

@ -12,8 +12,8 @@
</a-col>
<a-col :lg="6">
<a-form-item name="directioncal">
<template #label><span title="研究方向">研究方向</span></template>
<a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
<template #label><span title="研究领域">研究领域</span></template>
<a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
@ -22,23 +22,6 @@
<j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" allow-clear />
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="6">
<a-form-item name="research">
<template #label><span title="研究类型">研究类型</span></template>
<a-input placeholder="请输入研究类型" v-model:value="queryParam.research" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="adminopen">
<template #label><span title="管理员审核">管理员审</span></template>
<j-switch placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" query />
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
@ -79,7 +62,7 @@
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
<TableAction :actions="getTableAction(record)" />
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
@ -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;
}
</style>

11
jeecgboot-vue3/src/views/expert/county/components/ExpertForm.vue
Unescape View File

@ -70,8 +70,8 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="研究方向" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
<j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究方向" allow-clear />
<a-form-item label="研究领域" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
<j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究领域" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
@ -81,7 +81,12 @@
</a-col>
<a-col :span="24">
<a-form-item label="学历" v-bind="validateInfos.educationcal" id="ExpertForm-educationcal" name="educationcal">
<a-input v-model:value="formData.educationcal" placeholder="请输入学历" allow-clear ></a-input>
<j-dict-select-tag v-model:value="formData.educationcal" dictCode="xl" placeholder="请选择学历" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="职称" v-bind="validateInfos.zc" id="ExpertForm-zc" name="zc">
<j-dict-select-tag v-model:value="formData.zc" dictCode="zc" placeholder="请选择职称" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">

23
jeecgboot-vue3/src/views/expert/firm/Expert.data.ts
Unescape View File

@ -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',},
};

39
jeecgboot-vue3/src/views/expert/firm/ExpertList.vue
Unescape View File

@ -12,8 +12,8 @@
</a-col>
<a-col :lg="6">
<a-form-item name="directioncal">
<template #label><span title="研究方向">研究方向</span></template>
<a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
<template #label><span title="研究领域">研究领域</span></template>
<a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
</a-form-item>
<a-col :lg="6">
<a-form-item name="compopen">
@ -76,7 +76,7 @@
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
<TableAction :actions="getTableAction(record)" />
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
@ -222,7 +222,32 @@
{
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;
}
</style>

11
jeecgboot-vue3/src/views/expert/firm/components/ExpertForm.vue
Unescape View File

@ -70,8 +70,8 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="研究方向" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
<j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究方向" allow-clear />
<a-form-item label="研究领域" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
<j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究领域" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
@ -81,7 +81,12 @@
</a-col>
<a-col :span="24">
<a-form-item label="学历" v-bind="validateInfos.educationcal" id="ExpertForm-educationcal" name="educationcal">
<a-input v-model:value="formData.educationcal" placeholder="请输入学历" allow-clear ></a-input>
<j-dict-select-tag v-model:value="formData.educationcal" dictCode="xl" placeholder="请选择学历" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="职称" v-bind="validateInfos.zc" id="ExpertForm-zc" name="zc">
<j-dict-select-tag v-model:value="formData.zc" dictCode="zc" placeholder="请选择职称" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">

24
jeecgboot-vue3/src/views/expert/self/Expert.data.ts
Unescape View File

@ -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',},
};

4
jeecgboot-vue3/src/views/expert/self/ExpertList.vue
Unescape View File

@ -12,8 +12,8 @@
</a-col>
<a-col :lg="6">
<a-form-item name="directioncal">
<template #label><span title="研究方向">研究方向</span></template>
<a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
<template #label><span title="研究领域">研究领域</span></template>
<a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">

11
jeecgboot-vue3/src/views/expert/self/components/ExpertForm.vue
Unescape View File

@ -68,8 +68,8 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="研究方向" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
<j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究方向" allow-clear />
<a-form-item label="研究领域" v-bind="validateInfos.directioncal" id="ExpertForm-directioncal" name="directioncal">
<j-dict-select-tag v-model:value="formData.directioncal" dictCode="discipline_fieid,name,id" placeholder="请选择研究领域" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
@ -79,7 +79,12 @@
</a-col>
<a-col :span="24">
<a-form-item label="学历" v-bind="validateInfos.educationcal" id="ExpertForm-educationcal" name="educationcal">
<a-input v-model:value="formData.educationcal" placeholder="请输入学历" allow-clear ></a-input>
<j-dict-select-tag v-model:value="formData.educationcal" dictCode="xl" placeholder="请选择学历" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="职称" v-bind="validateInfos.zc" id="ExpertForm-zc" name="zc">
<j-dict-select-tag v-model:value="formData.zc" dictCode="zc" placeholder="请选择职称" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">

23
jeecgboot-vue3/src/views/expert/selfback/Expert.data.ts
Unescape View File

@ -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: '部门审核',
@ -70,10 +78,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',},
};

14
jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue
Unescape View File

@ -12,8 +12,8 @@
</a-col>
<a-col :lg="6">
<a-form-item name="directioncal">
<template #label><span title="研究方向">研究方向</span></template>
<a-input placeholder="请输入研究方向" v-model:value="queryParam.directioncal" allow-clear ></a-input>
<template #label><span title="研究领域">研究领域</span></template>
<a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
@ -48,12 +48,12 @@
<j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<!-- <a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</a-menu>-->
</template>
<a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
@ -64,7 +64,7 @@
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
<TableAction :actions="getTableAction(record)" />
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
@ -201,8 +201,8 @@
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
label: '详情',
onClick: handleDetail.bind(null, record),
},
];
}

2
jeecgboot-vue3/src/views/expert/selfback/components/ExpertForm.vue
Unescape View File

@ -4,7 +4,7 @@
<template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ExpertForm">
<a-row>
<a-col :span="24" v-if="formData.adminopen === '3' || formData.compopen === '3'">
<a-col :span="24" >
<a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
<a-input v-model:value="formData.backinfo" placeholder="请输入异常备注" allow-clear disabled="true"></a-input>
</a-form-item>

7
jeecgboot-vue3/src/views/expproject/admin/Expproject.data.ts
Unescape View File

@ -7,7 +7,12 @@ import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '专家类型',
title: '项目名称',
align:"center",
dataIndex: 'proname'
},
{
title: '研究领域',
align:"center",
dataIndex: 'exptype_dictText'
},

20
jeecgboot-vue3/src/views/expproject/admin/ExpprojectList.vue
Unescape View File

@ -56,7 +56,7 @@
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
<TableAction :actions="getTableAction(record)" />
</template>
<!--字段回显插槽-->
<template v-slot:bodyCell="{ column, record, index, text }">
@ -196,6 +196,24 @@
{
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: createexp.bind(null, record),
placement: 'topLeft'
},
}
]
}

8
jeecgboot-vue3/src/views/expproject/admin/components/ExpprojectForm.vue
Unescape View File

@ -10,13 +10,13 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="专家类型" v-bind="validateInfos.exptype" id="ExpprojectForm-exptype" name="exptype">
<a-form-item label="研究领域" v-bind="validateInfos.exptype" id="ExpprojectForm-exptype" name="exptype">
<j-search-select v-model:value="formData.exptype" dict="discipline_fieid,name,id" allow-clear />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="需要专家个数" v-bind="validateInfos.needexp" id="ExpprojectForm-needexp" name="needexp">
<a-input-number v-model:value="formData.needexp" placeholder="请输入需要专家个数" style="width: 100%" />
<a-input-number v-model:value="formData.needexp" placeholder="请输入需要专家个数(正整数)" style="width: 100%" />
</a-form-item>
</a-col>
<a-col :span="24">
@ -105,7 +105,9 @@
//表单验证
const validatorRules = reactive({
needexp: [{ required: false}, { pattern: /^-?\d+$/, message: '请输入整数!'},],
needexp: [{ required: false},
{pattern: /^\d+$/, // 只接受正整数（包括0，如果不需要0，请改为/^[1-9]\d*$/）
message: '请输入正整数!'},],
});
const {resetFields, validate, validateInfos} = useForm(formData, validatorRules, {immediate: false});
const dbData = {};

7
jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts
Unescape View File

@ -7,7 +7,12 @@ import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '专家类型',
title: '项目名称',
align:"center",
dataIndex: 'proname'
},
{
title: '研究领域',
align:"center",
dataIndex: 'exptype_dictText'
},

2
jeecgboot-vue3/src/views/expproject/self/components/ExpprojectForm.vue
Unescape View File

@ -10,7 +10,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="专家类型" v-bind="validateInfos.exptype" id="ExpprojectForm-exptype" name="exptype">
<a-form-item label="研究领域" v-bind="validateInfos.exptype" id="ExpprojectForm-exptype" name="exptype">
<j-search-select v-model:value="formData.exptype" dict="discipline_fieid,name,id" allow-clear />
</a-form-item>
</a-col>

Write Preview
Loading…
Cancel
Save