xy 2 weeks ago
commit 322892892d
  1. 7
      jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
  2. 10
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/disciplinefieid/controller/DisciplineFieidController.java
  3. 58
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
  4. 10
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/ExpCmsVo.java
  5. 3
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/entity/Expert.java
  6. 44
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
  7. 15
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrumenttype/controller/InstrumentTypeController.java
  8. 17
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java
  9. 4
      jeecgboot-vue3/src/router/helper/mainOut.ts
  10. 87
      jeecgboot-vue3/src/views/expert/adminback/Expert.api.ts
  11. 84
      jeecgboot-vue3/src/views/expert/adminback/Expert.data.ts
  12. 305
      jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue
  13. 26
      jeecgboot-vue3/src/views/expert/adminback/V20240926_1__menu_insert_Expert.sql
  14. 26
      jeecgboot-vue3/src/views/expert/adminback/V20240929_1__menu_insert_Expert.sql
  15. 26
      jeecgboot-vue3/src/views/expert/adminback/V20240930_1__menu_insert_Expert.sql
  16. 189
      jeecgboot-vue3/src/views/expert/adminback/components/ExpertForm.vue
  17. 77
      jeecgboot-vue3/src/views/expert/adminback/components/ExpertModal.vue
  18. 5
      jeecgboot-vue3/src/views/instrument/InstrumentList2.vue
  19. 11
      jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4CaiZhengList.vue
  20. 12
      jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4FaRenList.vue
  21. 11
      jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4KejijuList.vue
  22. 12
      jeecgboot-vue3/src/views/projectApplication/productAudit/projectAudit4QuXianList.vue
  23. 20
      jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
  24. 20
      jeecgboot-vue3/src/views/projectLog/ProjectLog.data.ts
  25. 65
      jeecgboot-vue3/src/views/projectLog/ProjectLogBasicModal.vue
  26. 377
      jeecgboot-vue3/src/views/projectLog/ProjectLogList.vue

@ -84,6 +84,13 @@ public class ShiroConfig {
}
// 配置不会被拦截的链接 顺序判断
filterChainDefinitionMap.put("/instrument/instrument/listcms", "anon"); //cms仪器资源接口
filterChainDefinitionMap.put("/instrument/instrument/queryByIdCms", "anon"); //cms仪器资源接口
filterChainDefinitionMap.put("/disciplinefieid/disciplineFieid/listcms", "anon"); //cms学科领域接口
filterChainDefinitionMap.put("/instrumenttype/instrumentType/listcms", "anon"); //cms仪器分类接口
filterChainDefinitionMap.put("/expert/expert/listadminCMS", "anon"); //cms专家模块不拦截
filterChainDefinitionMap.put("/expert/expert/directioncalListCMS", "anon"); //cms专家模块不拦截
filterChainDefinitionMap.put("/expert/expert/CMSexpinfo", "anon"); //cms专家模块不拦截
filterChainDefinitionMap.put("/cms/front/**", "anon"); //cms不拦截
filterChainDefinitionMap.put("/newsWebsocket/**", "anon");//CMS模块
filterChainDefinitionMap.put("/expert/expert/userRegisterexp", "anon"); //专家注册

@ -75,6 +75,16 @@ public class DisciplineFieidController extends JeecgController<DisciplineFieid,
return Result.OK(pageList);
}
@ApiOperation(value="学科领域-分页列表查询", notes="学科领域-分页列表查询")
@GetMapping(value = "/listcms")
public Result<List<DisciplineFieid>> listcms() {
QueryWrapper<DisciplineFieid> queryWrapper = new QueryWrapper();
List<DisciplineFieid> pageList = disciplineFieidService.list(queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*

@ -17,6 +17,9 @@ import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.PasswordUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.disciplinefieid.entity.DisciplineFieid;
import org.jeecg.modules.demo.disciplinefieid.service.IDisciplineFieidService;
import org.jeecg.modules.demo.expert.entity.ExpCmsVo;
import org.jeecg.modules.demo.expert.entity.Expert;
import org.jeecg.modules.demo.expert.service.IExpertService;
@ -63,6 +66,8 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
private ISysUserService sysUserService;
@Autowired
private ISysDepartService sysDepartService;
@Autowired
private IDisciplineFieidService disciplineFieidService;
/**
* 分页列表查询
@ -681,4 +686,57 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
expertService.save(expert);
return Result.OK("注册成功");
}
//专家CMS列表
@ApiOperation(value="专家CMS列表,参数为一个对象Expert,Expert里面就一个参数directioncal。directioncal就是研究方向", notes="专家CMS列表,Expert里面就一个参数directioncal。directioncal就是研究方向")
@GetMapping(value = "/listadminCMS")
public Result<IPage<Expert>> listadminCMS(Expert expert,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
//用于查看所有信息无论是否审核,无论哪个部门
QueryWrapper<Expert> queryWrapper = QueryGenerator.initQueryWrapper(expert, req.getParameterMap());
if(expert.getDirectioncal()!=null){
queryWrapper.eq("directioncal",expert.getDirectioncal());
}
Page<Expert> page = new Page<Expert>(pageNo, pageSize);
IPage<Expert> pageList = expertService.page(page, queryWrapper);
pageList.getRecords().forEach(experttemp -> {
//开始用于修改数据
SysUser sysUser = sysUserService.query().eq("username",experttemp.getSeusername()).one();
String depid = expertService.getdeps(sysUser.getId());
SysDepart sysDepart = sysDepartService.getById(depid);
experttemp.setRealname(sysUser.getRealname());
experttemp.setWorkon(sysUser.getWorkNo());
experttemp.setSex(sysUser.getSex());
experttemp.setTopPic(sysUser.getAvatar());
experttemp.setPhone(sysUser.getPhone());
experttemp.setEmails(sysUser.getEmail());
experttemp.setSsdep(sysDepart.getDepartName());
experttemp.setPsd(sysUser.getPassword());
experttemp.setSepsd(sysUser.getPassword());
experttemp.setAvatar(sysUser.getAvatar());
});
return Result.OK(pageList);
}
@ApiOperation(value="专家列表研究方向CMS列表", notes="专家列表研究方向CMS列表")
@GetMapping(value = "/directioncalListCMS")
public Result<List<DisciplineFieid>> directioncalListCMS() {
List<DisciplineFieid> disciplineFieid =disciplineFieidService.list();
return Result.OK(disciplineFieid);
}
@ApiOperation(value="专家CMS详细信息需要的,参数为专家的id", notes="专家CMS详细信息需要的,参数为专家的id")
@GetMapping(value = "/CMSexpinfo")
public Result<ExpCmsVo> CMSexpinfo(@RequestParam(name="id",required=true) String id) {
Expert expert = expertService.getById(id);
SysUser sysUser=sysUserService.query().eq("username",expert.getSeusername()).one();
ExpCmsVo expCmsVo = new ExpCmsVo();
expCmsVo.setUserinfo(expert.getExpinfo());
expCmsVo.setAvatar(sysUser.getAvatar());
expCmsVo.setRealname(sysUser.getRealname());
return Result.OK(expCmsVo);
}
}

@ -0,0 +1,10 @@
package org.jeecg.modules.demo.expert.entity;
import lombok.Data;
@Data
public class ExpCmsVo {
private String realname;
private String avatar;
private String userinfo;
}

@ -103,6 +103,9 @@ public class Expert implements Serializable {
private String emails;
@TableField(exist = false)
private Integer sex;
@TableField(exist = false)
private String avatar;
/**提交审核*/
// @Excel(name = "提交审核", width = 15,replace = {"是_Y","否_N"} )

@ -94,6 +94,47 @@ public class InstrumentController extends JeecgController<Instrument, IInstrumen
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param instrument
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "仪器信息表-分页列表查询")
@ApiOperation(value="仪器信息表-分页列表查询", notes="仪器信息表-分页列表查询")
@GetMapping(value = "/listcms")
public Result<IPage<Instrument>> listcms(Instrument instrument,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Instrument> queryWrapper = QueryGenerator.initQueryWrapper(instrument, req.getParameterMap());
queryWrapper.eq("state","3");
Page<Instrument> page = new Page<Instrument>(pageNo, pageSize);
IPage<Instrument> pageList = instrumentService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "仪器信息表-通过id查询")
@ApiOperation(value="仪器信息表-通过id查询", notes="仪器信息表-通过id查询")
@GetMapping(value = "/queryByIdCms")
public Result<Instrument> queryByIdCms(@RequestParam(name="id",required=true) String id) {
Instrument instrument = instrumentService.getById(id);
if(instrument==null) {
return Result.error("未找到对应数据");
}
return Result.OK(instrument);
}
/**
* 分页列表查询
*
@ -349,8 +390,7 @@ public class InstrumentController extends JeecgController<Instrument, IInstrumen
if(instrument.getFlag().equals("1")){
instrument.setState("2");
instrument.setFlag("2");
}
if(instrument.getFlag().equals("2")&&instrument.getState().equals("2")){
}else if(instrument.getFlag().equals("2")&&instrument.getState().equals("2")){
instrument.setState("3");
}
//instrument.setFlag("2");

@ -75,6 +75,21 @@ public class InstrumentTypeController extends JeecgController<InstrumentType, II
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @return
*/
//@AutoLog(value = "仪器分类-分页列表查询")
@ApiOperation(value="仪器分类-分页列表查询", notes="仪器分类-分页列表查询")
@GetMapping(value = "/listcms")
public Result<List<InstrumentType>> listcms() {
QueryWrapper<InstrumentType> queryWrapper = new QueryWrapper();
List<InstrumentType> pageList = instrumentTypeService.list(queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*

@ -122,8 +122,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
}
/**
* @description:
* //('科技主管部门待提交', '1');
* @description: //('科技主管部门待提交', '1');
* //('科技主管部门已提交', '2');
* //('不受理', '3');
* //('已受理', '4');
@ -170,19 +169,19 @@ public class ProjectController extends JeecgController<Project, IProjectService>
//申请单位数据
if ("faren_admin".equals(loginUser.getRoleCode())) {
queryWrapper.eq("sys_org_code", loginUser.getOrgCode());
queryWrapper.in("project_status", 6,1,7,8,9,10);
queryWrapper.in("project_status", 6, 1, 7, 8, 9, 10);
}
// 区/县管理员数据
if ("quxian_admin".equals(loginUser.getRoleCode())) {
queryWrapper.likeRight("sys_org_code", loginUser.getOrgCode());
queryWrapper.in("project_status", 1,7,8,9,10);
queryWrapper.in("project_status", 1, 7, 8, 9, 10);
}
if ("kejiju_admin".equals(loginUser.getRoleCode())) {
queryWrapper.in("project_status", 7,8,9,10);
queryWrapper.in("project_status", 7, 8, 9, 10);
}
if ("caizheng_admin".equals(loginUser.getRoleCode())) {
queryWrapper.in("budget_status", 8,9,10);
queryWrapper.in("budget_status", 8, 9, 10);
}
IPage<Project> pageList = projectService.page(page, queryWrapper);
return Result.OK(pageList);
@ -471,7 +470,11 @@ public class ProjectController extends JeecgController<Project, IProjectService>
log.setOperationTime(new Date());
log.setProjectStatus("5");
log.setBudgetStatus("5");
log.setOperationMark("审核取回");
if ("shenbaoren_role".equals(loginUser.getRoleCode())) {
log.setOperationMark("申请人取回项目书,申请人取回预算书");
} else {
log.setOperationMark("审核驳回");
}
iProjectLogService.save(log);
return Result.OK("操作成功!");
}

@ -75,7 +75,7 @@ export const mainOutRoutes: AppRouteModule[] = [
{
path: '/main-home/newsList',
name: 'NewsList',
component: () => import('/@/views/demo/main-home/components/newsList/index.vue'),
component: () => import('/@/views/demo/main-home/components/NewsList/index.vue'),
meta: {
title: '新闻列表',
ignoreAuth: true,
@ -86,7 +86,7 @@ export const mainOutRoutes: AppRouteModule[] = [
{
path: '/main-home/newsInfo',
name: 'NewsIndo',
component: () => import('/@/views/demo/main-home/components/newsInFo/index.vue'),
component: () => import('/@/views/demo/main-home/components/newsInfo/index.vue'),
meta: {
title: '新闻详情',
ignoreAuth: true,

@ -0,0 +1,87 @@
import { defHttp } from '/src/utils/http/axios';
import { useMessage } from "/src/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
list = '/expert/expert/listadmin',
save='/expert/expert/add',
edit='/expert/expert/edit',
deleteOne = '/expert/expert/delete',
deleteBatch = '/expert/expert/deleteBatch',
importExcel = '/expert/expert/importExcel',
exportXls = '/expert/expert/exportXls',
handleadminback = '/expert/expert/handleadminback',
handleadminup = '/expert/expert/handleadminup',
}
/**
* 导出api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* 导入api
*/
export const getImportUrl = Api.importExcel;
/**
* 列表接口
* @param params
*/
export const handleadminup = (params) => defHttp.get({ url: Api.handleadminup, params });
/**
* 管理员驳回
* @param params
*/
export const handleadminback = (params) => defHttp.get({ url: Api.handleadminback, params });
/**
* 管理员通过审核
* @param params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
/**
* 删除单个
* @param params
* @param handleSuccess
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
* 批量删除
* @param params
* @param handleSuccess
*/
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
* @param isUpdate
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
}

@ -0,0 +1,84 @@
import {BasicColumn} from '/src/components/Table';
import {FormSchema} from '/src/components/Table';
import { rules} from '/src/utils/helper/validator';
import { render } from '/src/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/src/utils';
//
export const columns: BasicColumn[] = [
{
title: '用户名',
align: "center",
dataIndex: 'seusername'
},
{
title: '毕业院校',
align: "center",
dataIndex: 'colleges'
},
{
title: '专业',
align: "center",
dataIndex: 'major'
},
{
title: '研究方向',
align: "center",
dataIndex: 'directioncal_dictText'
},
{
title: '研究类型',
align: "center",
dataIndex: 'research'
},
{
title: '学历',
align: "center",
dataIndex: 'educationcal'
},
{
title: '专家简介',
align: "center",
dataIndex: 'expinfo'
},
{
title: '部门审核',
align: "center",
dataIndex: 'compopen_dictText'
},
{
title: '管理员审核',
align: "center",
dataIndex: 'adminopen_dictText'
},
{
title: '是否完善信息',
align: "center",
dataIndex: 'isdone',
customRender:({text}) => {
return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]);
},
},
{
title: '专家状态',
align: "center",
dataIndex: 'expsture',
customRender:({text}) => {
return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]);
},
},
];
//
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',},
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',},
};

@ -0,0 +1,305 @@
<template>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="seusername">
<template #label><span title="用户名">用户名</span></template>
<a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input>
</a-form-item>
</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>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="adminopen">
<template #label><span title="管理员审核">管理员审</span></template>
<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>
</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">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
<a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
</a>
</a-col>
</span>
</a-col>
</a-row>
</a-form>
</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" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<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-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined"></Icon>
删除
</a-menu-item>
</a-menu>
</template>
<a-button>批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
<!-- 高级查询 -->
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" />
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable>
<!-- 表单区域 -->
<ExpertModal ref="registerModal" @success="handleSuccess"></ExpertModal>
</div>
</template>
<script lang="ts" name="expert-expert" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/src/components/Table';
import { useListPage } from '/src/hooks/system/useListPage';
import { columns, superQuerySchema } from './Expert.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl,handleadminup,handleadminback } from './Expert.api';
import { downloadFile } from '/src/utils/common/renderUtils';
import ExpertModal from './components/ExpertModal.vue'
import { useUserStore } from '/src/store/modules/user';
import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue';
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const userStore = useUserStore();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '专家管理',
api: list,
columns,
canResize:false,
useSearchForm: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: async (params) => {
return Object.assign(params, queryParam);
},
},
exportConfig: {
name: "专家管理",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs:24,
sm:4,
xl:6,
xxl:4
});
const wrapperCol = reactive({
xs: 24,
sm: 20,
});
//
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
searchQuery();
}
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 删除事件
*/
async function handlebackadmin(record) {
await handleadminback({ id: record.id }, handleSuccess);
}
/**
* 删除事件
*/
async function handleupadmin(record) {
await handleadminup({ 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),
},
];
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
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',
},
}
]
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//
reload();
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
padding: 0;
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust{
min-width: 100px !important;
}
.query-group-split-cust{
width: 30px;
display: inline-block;
text-align: center
}
.ant-form-item:not(.ant-form-item-with-help){
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
}
</style>

@ -0,0 +1,26 @@
-- 注意该页面对应的前台目录为views/expert文件夹下
-- 如果你想更改到其他目录请修改sql中component字段对应的值
INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
VALUES ('2024092603239210260', NULL, '专家管理', '/expert/expertList', 'expert/ExpertList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0);
-- 权限控制sql
-- 新增
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092603239210261', '2024092603239210260', '添加专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);
-- 编辑
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092603239210262', '2024092603239210260', '编辑专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);
-- 删除
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092603239210263', '2024092603239210260', '删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);
-- 批量删除
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092603239210264', '2024092603239210260', '批量删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);
-- 导出excel
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092603239210265', '2024092603239210260', '导出excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);
-- 导入excel
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092603239210266', '2024092603239210260', '导入excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-26 15:23:26', NULL, NULL, 0, 0, '1', 0);

@ -0,0 +1,26 @@
-- 注意该页面对应的前台目录为views/expert文件夹下
-- 如果你想更改到其他目录请修改sql中component字段对应的值
INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
VALUES ('2024092910425270310', NULL, '专家管理', '/expert/expertList', 'expert/ExpertList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0);
-- 权限控制sql
-- 新增
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092910425270311', '2024092910425270310', '添加专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);
-- 编辑
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092910425270312', '2024092910425270310', '编辑专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);
-- 删除
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092910425270313', '2024092910425270310', '删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);
-- 批量删除
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092910425270314', '2024092910425270310', '批量删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);
-- 导出excel
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092910425270315', '2024092910425270310', '导出excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);
-- 导入excel
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024092910425270316', '2024092910425270310', '导入excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-29 10:42:31', NULL, NULL, 0, 0, '1', 0);

@ -0,0 +1,26 @@
-- 注意该页面对应的前台目录为views/expert文件夹下
-- 如果你想更改到其他目录请修改sql中component字段对应的值
INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
VALUES ('2024093009506560560', NULL, '专家管理', '/expert/expertList', 'expert/ExpertList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0);
-- 权限控制sql
-- 新增
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024093009506560561', '2024093009506560560', '添加专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);
-- 编辑
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024093009506560562', '2024093009506560560', '编辑专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);
-- 删除
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024093009506560563', '2024093009506560560', '删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);
-- 批量删除
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024093009506560564', '2024093009506560560', '批量删除专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);
-- 导出excel
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024093009506560565', '2024093009506560560', '导出excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);
-- 导入excel
INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
VALUES ('2024093009506560566', '2024093009506560560', '导入excel_专家管理', NULL, NULL, 0, NULL, NULL, 2, 'expert:expert:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2024-09-30 09:50:56', NULL, NULL, 0, 0, '1', 0);

@ -0,0 +1,189 @@
<template>
<a-spin :spinning="confirmLoading">
<JFormContainer :disabled="disabled">
<template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ExpertForm">
<a-row>
<a-col :span="24">
<a-form-item label="专家状态" v-bind="validateInfos.expsture" id="ExpertForm-expsture" name="expsture">
<j-switch v-model:value="formData.expsture" ></j-switch>
</a-form-item>
</a-col>
<a-col :span="24" v-if="formData.expsture === 'Y'">
<a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-errinfo" name="errinfo">
<a-input v-model:value="formData.errinfo" placeholder="请输入异常备注" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="24" v-if="formData.adminopen === '3' || formData.compopen === '3'">
<a-form-item label="异常备注" v-bind="validateInfos.errinfo" id="ExpertForm-backinfo" name="backinfo">
<a-input v-model:value="formData.backinfo" placeholder="请输入异常备注" allow-clear ></a-input>
</a-form-item>
</a-col>
</a-row>
</a-form>
</template>
</JFormContainer>
</a-spin>
</template>
<script lang="ts" setup>
import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSelectDept from '/src/components/Form/src/jeecg/components/JSelectDept.vue';
import JImageUpload from '/src/components/Form/src/jeecg/components/JImageUpload.vue';
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/src/utils/http/axios';
import { useMessage } from '/src/hooks/web/useMessage';
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
import { getValueType } from '/src/utils';
import { saveOrUpdate } from '../Expert.api';
import { Form } from 'ant-design-vue';
import JFormContainer from '/src/components/Form/src/container/JFormContainer.vue';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({})},
formBpm: { type: Boolean, default: true }
});
const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
id: '',
seusername: '',
psd: '',
sepsd: '',
realname: '',
workon: '',
sex: '',
ssdep: '',
topPic: '',
phone: '',
emails: '',
colleges: '',
major: '',
directioncal: '',
research: '',
educationcal: '',
expinfo: '',
compopen: '',
adminopen: '',
backinfo: '',
});
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//
const validatorRules = reactive({
psd: [{ required: true, message: '请输入密码!'},],
sepsd: [{ required: true, message: '请输入确认密码!'},],
workon: [{ required: true, message: '请输入工号!'},],
ssdep: [{ required: true, message: '请输入部门!'},],
emails: [{ required: true, message: '请输入邮箱!'},],
phone: [{ required: true, message: '请输入电话!'},],
seusername: [{ required: true, message: '请输入用户名!'},],
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
//
const disabled = computed(()=>{
if(props.formBpm === true){
if(props.formData.disabled === false){
return false;
}else{
return true;
}
}
return props.formDisabled;
});
/**
* 新增
*/
function add() {
edit({});
}
/**
* 编辑
*/
function edit(record) {
nextTick(() => {
resetFields();
const tmpData = {};
Object.keys(formData).forEach((key) => {
if(record.hasOwnProperty(key)){
tmpData[key] = record[key]
}
})
//
Object.assign(formData, tmpData);
});
}
/**
* 提交数据
*/
async function submitForm() {
try {
//
await validate();
} catch ({ errorFields }) {
if (errorFields) {
const firstField = errorFields[0];
if (firstField) {
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
}
}
return Promise.reject(errorFields);
}
confirmLoading.value = true;
const isUpdate = ref<boolean>(false);
//
let model = formData;
if (model.id) {
isUpdate.value = true;
}
//
for (let data in model) {
//
if (model[data] instanceof Array) {
let valueType = getValueType(formRef.value.getProps, data);
//
if (valueType === 'string') {
model[data] = model[data].join(',');
}
}
}
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
defineExpose({
add,
edit,
submitForm,
});
</script>
<style lang="less" scoped>
.antd-modal-form {
padding: 14px;
}
</style>

@ -0,0 +1,77 @@
<template>
<j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<ExpertForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ExpertForm>
</j-modal>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import ExpertForm from './ExpertForm.vue'
import JModal from '/src/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const width = ref<number>(800);
const visible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const emit = defineEmits(['register', 'success']);
/**
* 新增
*/
function add() {
title.value = '新增';
visible.value = true;
nextTick(() => {
registerForm.value.add();
});
}
/**
* 编辑
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
/**
* form保存回调事件
*/
function submitCallback() {
handleCancel();
emit('success');
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
visible.value = false;
}
defineExpose({
add,
edit,
disableSubmit,
});
</script>
<style lang="less">
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
</style>
<style lang="less" scoped></style>

@ -250,6 +250,7 @@
* 操作栏
*/
function getTableAction(record) {
const oct = userStore.loginInfo.departs[0].orgCategory;
const actions = [
{
label: '详情',
@ -257,7 +258,7 @@
}
];
if(record.state==="1"||record.state==="2"){
if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){
actions.unshift({
label: '通过',
popConfirm: {
@ -266,7 +267,7 @@
}
});
}
if(record.state==="1"||record.state==="2"){
if((oct==="3"&&record.state==="1")||(record.state==="2"&&oct!=="3")){
actions.unshift({
label: '驳回',
popConfirm: {

@ -211,7 +211,12 @@ function getTableAction(record) {
{
label: '详情',
onClick: handleDetail.bind(null, record),
}];
},
{
label: '日志查询',
onClick: go_projectLog.bind(null, record),
}
];
//
if (record.budgetStatus == 9) {
actions.unshift({
@ -236,6 +241,10 @@ function getTableAction(record) {
return actions;
}
function go_projectLog(record) {
// go('/comp/jeecg/basic?id=' +'666');
go('/projectLog/projectLogList?id='+record.id);
}
</script>

@ -211,7 +211,12 @@ function getTableAction(record) {
{
label: '详情',
onClick: handleDetail.bind(null, record),
}];
},
{
label: '日志查询',
onClick: go_projectLog.bind(null, record),
}
];
//
if (record.projectStatus == 6) {
actions.unshift({
@ -235,7 +240,10 @@ function getTableAction(record) {
//('', '8');
return actions;
}
function go_projectLog(record) {
// go('/comp/jeecg/basic?id=' +'666');
go('/projectLog/projectLogList?id='+record.id);
}
</script>

@ -211,7 +211,12 @@ function getTableAction(record) {
{
label: '详情',
onClick: handleDetail.bind(null, record),
}];
},
{
label: '日志查询',
onClick: go_projectLog.bind(null, record),
}
];
//
if (record.projectStatus == 7) {
actions.unshift({
@ -236,6 +241,10 @@ function getTableAction(record) {
return actions;
}
function go_projectLog(record) {
// go('/comp/jeecg/basic?id=' +'666');
go('/projectLog/projectLogList?id='+record.id);
}
</script>

@ -211,7 +211,12 @@ function getTableAction(record) {
{
label: '详情',
onClick: handleDetail.bind(null, record),
}];
},
{
label: '日志查询',
onClick: go_projectLog.bind(null, record),
}
];
if (record.projectStatus == 1) {
actions.unshift({
label: '通过',
@ -235,7 +240,10 @@ function getTableAction(record) {
return actions;
}
function go_projectLog(record) {
// go('/comp/jeecg/basic?id=' +'666');
go('/projectLog/projectLogList?id='+record.id);
}
</script>
<style lang="less" scoped>

@ -42,21 +42,9 @@
<!-- 表单区域 -->
<ProjectModal @register="registerModal" @success="handleSuccess"></ProjectModal>
</div>
<div>
<ProjectLogModal
@register="registerModal"
v-model:value="editCronValue"
:exeStartTime="exeStartTime"
:hideYear="hideYear"
:remote="remote"
:hideSecond="hideSecond"
/>
</div>
</template>
<script lang="ts" name="project-project" setup>
// import EasyCronModal from '/@/components/Form/src/jeecg/components/JEasyCron/EasyCronModal.vue';
import ProjectLogModal from '/@/views/projectLog/ProjectLogBasicModal.vue'
import {ref, reactive, computed, unref, onMounted} from 'vue';
import {BasicTable, useTable, TableAction} from '/@/components/Table';
import {useModal} from '/@/components/Modal';
@ -86,7 +74,6 @@ const checkedKeys = ref<Array<string | number>>([]);
const userStore = useUserStore();
//model
const [registerModal, {openModal}] = useModal();
//table
const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
tableProps:{
title: '项目表',
@ -179,12 +166,13 @@ function go_yusuanshu(record) {
go('/projectApplication/kejigongguan/yusuanshu?id='+record.id);
}
function projectLog(record) {
function go_projectLog(record) {
// go('/comp/jeecg/basic?id=' +'666');
go('/projectApplication/kejigongguan/yusuanshu?id='+record.id);
go('/projectLog/projectLogList?id='+record.id);
}
/**
* 编辑事件
*/
@ -254,7 +242,7 @@ function getTableAction(record){
},
{
label: '日志查询',
onClick: handleDetail.bind(null, record),
onClick: go_projectLog.bind(null, record),
}
];
//()

@ -10,6 +10,11 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'projectName'
},
{
title: '操作人名称',
align:"center",
dataIndex: 'operatorName'
},
{
title: '操作说明',
align:"center",
@ -20,11 +25,6 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'operationTime'
},
{
title: '操作人名称',
align:"center",
dataIndex: 'operatorName'
},
{
title: '项目书状态',
align:"center",
@ -46,6 +46,11 @@ export const formSchema: FormSchema[] = [
field: 'projectName',
component: 'Input',
},
{
label: '操作人名称',
field: 'operatorName',
component: 'Input',
},
{
label: '操作说明',
field: 'operationMark',
@ -60,11 +65,6 @@ export const formSchema: FormSchema[] = [
valueFormat: 'YYYY-MM-DD HH:mm:ss'
},
},
{
label: '操作人名称',
field: 'operatorName',
component: 'Input',
},
{
label: '项目书状态',
field: 'projectStatus',

@ -1,44 +1,61 @@
<template>
<BasicModal @register="registerModal" title="日志" width="1024px" @ok="onOk">
<PageWrapper>
<a-card title="流程进度" :bordered="true">
<a-steps :current="1" progress-dot size="small">
<a-step title="申请人提交">
<template #description> <div>Jeecg</div> <p>2016-12-12 12:32</p> </template>
</a-step>
<a-step title="申请单位提交">
<template #description>
<p>Chad</p>
</template>
</a-step>
<a-step title="科技主管提交" />
<a-step title="市科技局提交" />
<a-step title="财政主管处理" />
</a-steps>
</a-card>
</PageWrapper>
<BasicModal @register="registerProjectLogModal" title="日志" width="1024px" @ok="onOk">
<a-card :current="2" title="流程进度" :bordered="true">
<a-steps size="small">
<a-step title="申请人提交"/>
<a-step title="申请单位提交"/>
<a-step title="科技主管提交"/>
<a-step title="市科技局提交"/>
<a-step title="财政主管处理"/>
</a-steps>
</a-card>
<BasicTable @register="projectLog"/>
</BasicModal>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
import { useAttrs } from '/@/hooks/core/useAttrs';
import { BasicModal, useModalInner } from '/@/components/Modal';
import {defineComponent,defineProps} from 'vue';
import {useAttrs} from '/@/hooks/core/useAttrs';
import {BasicModal, useModalInner} from '/@/components/Modal';
import PageWrapper from "@/components/Page/src/PageWrapper.vue";
import {BasicTable, useTable} from '/@/components/Table';
import {columns} from "@/views/projectLog/ProjectLog.data";
import {list} from "@/views/projectLog/ProjectLog.api";
import {useRoute} from "vue-router";
import {defHttp} from "@/utils/http/axios";
const props = defineProps(['projectId'])
const route = useRoute();
const list2 = () =>{
// console.log("projectId",props.projectId)
let params = {projectId:'1849284130146025473'}
return defHttp.get({url: '/projectLog/projectLog/list', params});
}
export default defineComponent({
name: 'ProjectLogModal',
inheritAttrs: false,
components: {PageWrapper, BasicModal},
components: {BasicTable, PageWrapper, BasicModal},
setup() {
const attrs = useAttrs();
const [registerModal, { closeModal }] = useModalInner();
const [registerProjectLogModal, {closeModal}] = useModalInner();
const [projectLog] = useTable({
label: '项目日志',
columns: columns,
pagination: false,
// dataSource: null,
api: list2,
showIndexColumn: false,
scroll: {y: 300},
});
function onOk() {
closeModal();
}
return { attrs, registerModal, onOk };
return {attrs, registerProjectLogModal, projectLog, onOk};
},
});
</script>

@ -1,190 +1,221 @@
<template>
<div>
<a-card :current="null" title="流程进度" :bordered="false">
<a-steps size="small">
<a-step title="申请人提交"/>
<a-step title="申请单位提交"/>
<a-step title="科技主管提交"/>
<a-step title="市科技局提交"/>
<a-step title="财政主管处理"/>
</a-steps>
</a-card>
<!--引用表格-->
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<template #tableTitle>
<a-button type="primary" v-auth="'projectLog:project_log:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" v-auth="'projectLog:project_log:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" v-auth="'projectLog:project_log: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="'projectLog:project_log: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 @register="registerTable" :rowSelection="rowSelection">
<!--插槽:table标题-->
<!-- <template #tableTitle>
<a-button type="primary" v-auth="'projectLog:project_log:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" v-auth="'projectLog:project_log:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" v-auth="'projectLog:project_log: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="'projectLog:project_log:deleteBatch'">批量操作
<Icon icon="mdi:chevron-down"></Icon>
</a-button>
</a-dropdown>
&lt;!&ndash; 高级查询 &ndash;&gt;
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
</template>
&lt;!&ndash;操作栏&ndash;&gt;
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
</template>
&lt;!&ndash;字段回显插槽&ndash;&gt;
<template v-slot:bodyCell="{ column, record, index, text }">
</template>-->
</BasicTable>
<!-- 表单区域 -->
<ProjectLogModal @register="registerModal" @success="handleSuccess"></ProjectLogModal>
</div>
<div class="button-container">
<a-button type="primary" @click="router.back()">返回</a-button>
</div>
</template>
<script lang="ts" name="projectLog-projectLog" 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 ProjectLogModal from './components/ProjectLogModal.vue'
import {columns, searchFormSchema, superQuerySchema} from './ProjectLog.data';
import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './ProjectLog.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);
},
import {reactive, ref} from 'vue';
import {BasicTable} from '/@/components/Table';
import {useModal} from '/@/components/Modal';
import {useListPage} from '/@/hooks/system/useListPage'
import ProjectLogModal from './components/ProjectLogModal.vue'
import {columns, searchFormSchema, superQuerySchema} from './ProjectLog.data';
import {batchDelete, deleteOne, getExportUrl, getImportUrl} from './ProjectLog.api';
import {useUserStore} from '/@/store/modules/user';
import {useRoute, useRouter} from "vue-router";
import {defHttp} from "@/utils/http/axios";
const queryParam = reactive<any>({});
const checkedKeys = ref<Array<string | number>>([]);
const userStore = useUserStore();
const router = useRouter();
//model
const [registerModal, {openModal}] = useModal();
const route = useRoute();
const listByProjectId = () => {
let params = {projectId: route.query.id}
return defHttp.get({url: '/projectLog/projectLog/list', params});
}
//table
const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
tableProps: {
title: '',
api: listByProjectId,
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: 'projectLog:project_log:edit'
}
]
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
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: 'projectLog:project_log:edit'
}
]
}
/**
* 下拉操作栏
*/
function getDropDownAction(record){
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
auth: 'projectLog:project_log:delete'
}
]
}
auth: 'projectLog:project_log:delete'
}
]
}
</script>
<style lang="less" scoped>
:deep(.ant-picker),:deep(.ant-input-number){
width: 100%;
}
:deep(.ant-picker), :deep(.ant-input-number) {
width: 100%;
}
.button-container {
text-align: center;
}
</style>
Loading…
Cancel
Save