JayChou 1 week ago
commit 8be0a42d63
  1. 2
      jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
  2. 28
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/appointmentrecord/controller/AppointmentRecordController.java
  3. 50
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cms/controller/CmsArticleController.java
  4. 31
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/depsbncz/controller/DepsbnczController.java
  5. 7
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/controller/ExpertController.java
  6. 2
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expert/mapper/ExpertMapper.java
  7. 2
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/expproject/controller/ExpprojectController.java
  8. 6
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
  9. 22
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java
  10. 2
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/service/impl/ProjectServiceImpl.java
  11. 6
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java
  12. 21
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
  13. 1
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  14. 16
      jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/vo/QuXianDepartVo.java
  15. 5
      jeecgboot-vue3/src/api/sys/user.ts
  16. 3
      jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecord.api.ts
  17. 302
      jeecgboot-vue3/src/views/appointmentrecord/AppointmentRecordList2.vue
  18. 77
      jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.api.ts
  19. 173
      jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle.data.ts
  20. 249
      jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleList.vue
  21. 249
      jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticleListzwh.vue
  22. 26
      jeecgboot-vue3/src/views/cms/admin/articelJSJL/CmsArticle_menu_insert.sql
  23. 70
      jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleForm.vue
  24. 66
      jeecgboot-vue3/src/views/cms/admin/articelJSJL/components/CmsArticleModal.vue
  25. 37
      jeecgboot-vue3/src/views/declarant/declarantList.vue
  26. 5
      jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue
  27. 2
      jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts
  28. 18
      jeecgboot-vue3/src/views/depsbncz/DepsbnczList.vue
  29. 7
      jeecgboot-vue3/src/views/depsbncz/components/DepsbnczForm.vue
  30. 23
      jeecgboot-vue3/src/views/expert/admin/ExpertList.vue
  31. 23
      jeecgboot-vue3/src/views/expert/adminback/ExpertList.vue
  32. 23
      jeecgboot-vue3/src/views/expert/county/ExpertList.vue
  33. 29
      jeecgboot-vue3/src/views/expert/firm/ExpertList.vue
  34. 35
      jeecgboot-vue3/src/views/expert/self/ExpertList.vue
  35. 35
      jeecgboot-vue3/src/views/expert/selfback/ExpertList.vue
  36. 4
      jeecgboot-vue3/src/views/expproject/self/Expproject.data.ts
  37. 2
      jeecgboot-vue3/src/views/projectApplication/kejigongguan/data.ts
  38. 19
      jeecgboot-vue3/src/views/projectApplication/kejigongguan/projectApplicationList.vue
  39. 66
      jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue
  40. 3
      jeecgboot-vue3/src/views/projectType/ProjectType.api.ts
  41. 4
      jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
  42. 27
      jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue
  43. 8
      jeecgboot-vue3/src/views/system/usersetting/BaseSetting.vue

@ -191,6 +191,8 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/sys/sysDepart/queryDepartTreeSync4FaRen", "anon");//法人注册时,选择部门列表 filterChainDefinitionMap.put("/sys/sysDepart/queryDepartTreeSync4FaRen", "anon");//法人注册时,选择部门列表
filterChainDefinitionMap.put("/sys/sysDepart/getDepartList4Quxian", "anon");//法人注册时,获取区县级别部门列表

@ -116,6 +116,34 @@ public class AppointmentRecordController extends JeecgController<AppointmentReco
return Result.OK(pageList); return Result.OK(pageList);
} }
/**
* 分页列表查询
*
* @param appointmentRecord
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "仪器预约审核记录表-分页列表查询")
@ApiOperation(value="仪器预约审核记录表-分页列表查询", notes="仪器预约审核记录表-分页列表查询")
@GetMapping(value = "/list2")
public Result<IPage<AppointmentRecord>> queryPageList2(AppointmentRecord appointmentRecord,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
//LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为:LIKE_WITH_OR
customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<AppointmentRecord> queryWrapper = QueryGenerator.initQueryWrapper(appointmentRecord, req.getParameterMap(),customeRuleMap);
//queryWrapper.eq("affiliated_unit",loginUser.getOrgId());
Page<AppointmentRecord> page = new Page<AppointmentRecord>(pageNo, pageSize);
IPage<AppointmentRecord> pageList = appointmentRecordService.page(page, queryWrapper);
return Result.OK(pageList);
}
/** /**
* 添加 * 添加
* *

@ -73,6 +73,19 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl
return Result.OK(pageList); return Result.OK(pageList);
} }
@ApiOperation(value = "文章-分页列表查询", notes = "文章-分页列表查询")
@GetMapping(value = "/listJSJLNEW")
public Result<IPage<CmsArticle>> queryPlistJSJLNEWageList(CmsArticle cmsArticle,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<CmsArticle> queryWrapper = QueryGenerator.initQueryWrapper(cmsArticle, req.getParameterMap());
queryWrapper.eq("column_id","1855427069138923522");
Page<CmsArticle> page = new Page<CmsArticle>(pageNo, pageSize);
IPage<CmsArticle> pageList = cmsArticleService.page(page, queryWrapper);
return Result.OK(pageList);
}
/** /**
@ -134,6 +147,43 @@ public class CmsArticleController extends JeecgController<CmsArticle, ICmsArticl
return Result.OK("添加成功!"); return Result.OK("添加成功!");
} }
/**
* 添加
*
* @param cmsArticle
* @return
*/
@AutoLog(value = "文章-添加")
@ApiOperation(value = "文章-添加", notes = "文章-添加")
// @RequiresPermissions("cms:cms_article:add")
@PostMapping(value = "/addJSJLNEW")
public Result<String> addJSJLNEW(@RequestBody CmsArticle cmsArticle) {
LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
cmsArticle.setCreateBy(principal.getUsername());
/*CmsColumn cmsColumn = cmsColumnService.getById(cmsArticle.getColumnId());*/
/*cmsArticle.setColumnName(cmsColumn.getName());*/
// if (StringUtils.equals("1", cmsArticle.getStatus())) {
cmsArticle.setPublishTime(new Date());
cmsArticle.setStatus("1");
cmsArticle.setColumnId("1855427069138923522");
cmsArticle.setColumnName("技术交流");
// }
/*QueryWrapper<Subweside> subwesideQueryWrapper = new QueryWrapper<>();
subwesideQueryWrapper.in("compadminid", principal.getId());
List<Subweside> subwesideList = subwesideService.list(subwesideQueryWrapper);
if (!subwesideList.isEmpty()) {
List<String> subnames = subwesideList.stream()
.map(Subweside::getSubname) // 将每个Subweside对象映射到其subname字段
.collect(Collectors.toList()); // 收集结果到List<String>
String joinedString = String.join(", ", subnames);
cmsArticle.setSource("来自子站:"+joinedString);
}else {
cmsArticle.setSource("");
}*/
cmsArticleService.save(cmsArticle);
return Result.OK("添加成功!");
}
@ApiOperation(value = "文章管理-发布/取消发布", notes = "文章管理-发布/取消发布") @ApiOperation(value = "文章管理-发布/取消发布", notes = "文章管理-发布/取消发布")
@PostMapping(value = "/operationStatus") @PostMapping(value = "/operationStatus")
public Result<?> operationStatus(@RequestBody CmsArticle cmsArticle) { public Result<?> operationStatus(@RequestBody CmsArticle cmsArticle) {

@ -120,16 +120,19 @@ public class DepsbnczController extends JeecgController<Depsbncz, IDepsbnczServi
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
depsbncz.setUserid(user.getId()); depsbncz.setUserid(user.getId());
String depiid = depadminlxService.getdepid(user.getId()); String depiid = depadminlxService.getdepid(user.getId());
// 获取当前日期 if (depiid == null || depiid.isEmpty()){
LocalDate currentDate = LocalDate.now(); return Result.error("请确定自己的单位信息是否完整");
// 获取当前年份并直接转换为字符串 }
String currentYearString = String.valueOf(currentDate.getYear()); List<Depsbncz> depsbnczList =depsbnczService.query().eq("annualid",depsbncz.getAnnualid()).eq("depid",depiid).list();
Annual annual = annualService.query().eq("annual_name",currentYearString).one(); int a=0;
List<Depsbncz> depsbnczs=depsbnczService.query().eq("annualid",annual.getId()).eq("depid",depiid).list(); if (depsbnczList == null || depsbnczList.isEmpty()) {
if (depsbnczs.size()>0){
} else {
a=depsbnczList.size();
}
if (a>0){
return Result.error("本年度已经添加过了"); return Result.error("本年度已经添加过了");
}else { }else {
depsbncz.setAnnualid(annual.getId());
depsbncz.setDepid(depiid); depsbncz.setDepid(depiid);
depsbnczService.save(depsbncz); depsbnczService.save(depsbncz);
return Result.OK("添加成功!"); return Result.OK("添加成功!");
@ -146,6 +149,18 @@ public class DepsbnczController extends JeecgController<Depsbncz, IDepsbnczServi
@ApiOperation(value="上年度(末)主要财务数据-编辑", notes="上年度(末)主要财务数据-编辑") @ApiOperation(value="上年度(末)主要财务数据-编辑", notes="上年度(末)主要财务数据-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody Depsbncz depsbncz) { public Result<String> edit(@RequestBody Depsbncz depsbncz) {
List<Depsbncz> depsbnczList =depsbnczService.query().eq("annualid",depsbncz.getAnnualid()).eq("depid",depsbncz.getDepid()).list();
int a=0;
if (depsbnczList == null || depsbnczList.isEmpty()) {
} else {
a=depsbnczList.size();
}
if (a>0){
return Result.error("每年度仅可添加一次");
}
depsbnczService.updateById(depsbncz); depsbnczService.updateById(depsbncz);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }

@ -173,7 +173,12 @@ public class ExpertController extends JeecgController<Expert, IExpertService> {
//开始对比两个List获取相同部分,获取的交叉id就是需要的id //开始对比两个List获取相同部分,获取的交叉id就是需要的id
List<String> commonElements = userdepids.stream().filter(userbyrole::contains).collect(Collectors.toList()); List<String> commonElements = userdepids.stream().filter(userbyrole::contains).collect(Collectors.toList());
//根据查询的userid去获取username //根据查询的userid去获取username
List<SysUser> sysUserList = sysUserService.query().in("id",commonElements).list(); List<SysUser> sysUserList =new ArrayList<>();
if(commonElements!=null && !commonElements.isEmpty()) {
sysUserList = sysUserService.query().in("id", commonElements).list();
} else{
return Result.error("目前没有专家注册。");
}
//根据查询的结果获取username的list //根据查询的结果获取username的list
List<String> usernames = sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList()); List<String> usernames = sysUserList.stream().map(SysUser::getUsername).collect(Collectors.toList());

@ -60,5 +60,5 @@ public interface ExpertMapper extends BaseMapper<Expert> {
void handlebackcount(String id); void handlebackcount(String id);
@Update("UPDATE sys_user SET sex = #{sex} , avatar = #{topPic} WHERE username = #{seusername}") @Update("UPDATE sys_user SET sex = #{sex} , avatar = #{topPic} WHERE username = #{seusername}")
void updateuser(String topPic, Integer sex, String seusername); void updateuser(@Param("topPic") String topPic, @Param("sex") Integer sex,@Param("seusername") String seusername);
} }

@ -126,7 +126,7 @@ public class ExpprojectController {
IPage<Expproject> pageList = expprojectService.page(page, queryWrapper); IPage<Expproject> pageList = expprojectService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} else { } else {
return Result.error("未发现数据"); return Result.error("您还没参加项目。");
} }
} }

@ -228,8 +228,12 @@ public class InstrumentController extends JeecgController<Instrument, IInstrumen
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<String> add(@RequestBody Instrument instrument) { public Result<String> add(@RequestBody Instrument instrument) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
SysDepart sysDepart = sysDepartService.getById(loginUser.getOrgId());
if(sysDepart.getStatus().equals("0")){
return Result.error("该用户单位冻结,无法申请");
}
instrument.setDeclarationUnit(loginUser.getOrgId()); instrument.setDeclarationUnit(loginUser.getOrgId());
if(sysDepartService.getById(loginUser.getOrgId()).getOrgCategory().equals("3")){ if(sysDepart.getOrgCategory().equals("3")){
instrument.setFlag("1"); instrument.setFlag("1");
}else{ }else{
instrument.setFlag("0"); instrument.setFlag("0");

@ -124,7 +124,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
/** /**
* @description: 申报列表不同角色可见数据 * @description: 申报列表不同角色可见数据
* @param: [project, pageNo, pageSize, req] * @param: [project, pageNo, pageSize, req]
* @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage<org.jeecg.modules.demo.project.entity.Project>> * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage < org.jeecg.modules.demo.project.entity.Project>>
* @author: z.h.c * @author: z.h.c
* @date: 24/11/7 14:56 * @date: 24/11/7 14:56
*/ */
@ -303,11 +303,10 @@ public class ProjectController extends JeecgController<Project, IProjectService>
queryWrapper.in("project_status", 12); queryWrapper.in("project_status", 12);
} }
if ("kejiju_admin".equals(loginUser.getRoleCode())) { if ("kejiju_admin".equals(loginUser.getRoleCode())) {
queryWrapper.in("budget_status", 11,12); queryWrapper.in("budget_status", 11, 12);
} }
IPage<Project> pageList = projectService.page(page, queryWrapper); IPage<Project> pageList = projectService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
@ -357,7 +356,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
queryWrapper.in("project_status", 13); queryWrapper.in("project_status", 13);
} }
if ("kejiju_admin".equals(loginUser.getRoleCode())) { if ("kejiju_admin".equals(loginUser.getRoleCode())) {
queryWrapper.in("budget_status", 12,13); queryWrapper.in("budget_status", 12, 13);
} }
IPage<Project> pageList = projectService.page(page, queryWrapper); IPage<Project> pageList = projectService.page(page, queryWrapper);
@ -420,7 +419,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid()); ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid());
project.setAnnualName(projectType.getAnnualName()); project.setAnnualName(projectType.getAnnualName());
project.setProjectTypeName(projectType.getTypeName()); project.setProjectTypeName(projectType.getTypeName());
SysDepart sysDepart = iSysDepartService.getById(project.getSysOrgCode()); SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode,project.getSysOrgCode()));
project.setDepartName(sysDepart.getDepartName()); project.setDepartName(sysDepart.getDepartName());
SysUser sysUser = iSysUserService.getById(project.getProjectCharger()); SysUser sysUser = iSysUserService.getById(project.getProjectCharger());
project.setProjectCharger(sysUser.getRealname()); project.setProjectCharger(sysUser.getRealname());
@ -434,7 +433,8 @@ public class ProjectController extends JeecgController<Project, IProjectService>
ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid()); ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid());
project.setAnnualName(projectType.getAnnualName()); project.setAnnualName(projectType.getAnnualName());
project.setProjectTypeName(projectType.getTypeName()); project.setProjectTypeName(projectType.getTypeName());
SysDepart sysDepart = iSysDepartService.getById(project.getSysOrgCode()); // SysDepart sysDepart = iSysDepartService.getById(project.getSysOrgCode());
SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode,project.getSysOrgCode()));
project.setDepartName(sysDepart.getDepartName()); project.setDepartName(sysDepart.getDepartName());
SysUser sysUser = iSysUserService.getById(project.getProjectCharger()); SysUser sysUser = iSysUserService.getById(project.getProjectCharger());
project.setProjectCharger(sysUser.getRealname()); project.setProjectCharger(sysUser.getRealname());
@ -519,11 +519,15 @@ public class ProjectController extends JeecgController<Project, IProjectService>
.eq(DepartExt::getDepartId, sysDepart.getId()) .eq(DepartExt::getDepartId, sysDepart.getId())
.eq(DepartExt::getProjectId, para.getId()) .eq(DepartExt::getProjectId, para.getId())
); );
Depadminlx depadminlx = iDepadminlxService.getOne(new LambdaQueryWrapper<Depadminlx>().eq(Depadminlx::getDepid, project.getSysOrgCode())); Depadminlx depadminlx = iDepadminlxService.getOne(new LambdaQueryWrapper<Depadminlx>().eq(Depadminlx::getSysOrgCode, project.getSysOrgCode()));
DepartExtDto2 dto = new DepartExtDto2(); DepartExtDto2 dto = new DepartExtDto2();
BeanUtils.copyProperties(sysDepart, dto); BeanUtils.copyProperties(sysDepart, dto);
BeanUtils.copyProperties(departExt, dto); if (ObjectUtil.isNotEmpty(departExt)) {
BeanUtils.copyProperties(depadminlx, dto); BeanUtils.copyProperties(departExt, dto);
}
if (ObjectUtil.isNotEmpty(depadminlx)) {
BeanUtils.copyProperties(depadminlx, dto);
}
ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid()); ProjectType projectType = iProjectTypeService.getById(project.getProjectTypeid());
dto.setAnnualName(projectType.getAnnualName()); dto.setAnnualName(projectType.getAnnualName());
List<DictModel> dictModels = sysBaseApi.queryDictItemsByCode("depart_type"); List<DictModel> dictModels = sysBaseApi.queryDictItemsByCode("depart_type");

@ -106,7 +106,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
BeanUtils.copyProperties(dto, sysDepart); BeanUtils.copyProperties(dto, sysDepart);
BeanUtils.copyProperties(dto, userExt); BeanUtils.copyProperties(dto, userExt);
BeanUtils.copyProperties(dto, project); BeanUtils.copyProperties(dto, project);
project.setSysOrgCode(loginUser.getOrgId()); project.setSysOrgCode(loginUser.getOrgCode());
this.updateById(project); this.updateById(project);
userExt.setUserId(loginUser.getId()); userExt.setUserId(loginUser.getId());

@ -154,9 +154,9 @@ public class ProjectAnnualBudgetController extends JeecgController<ProjectAnnual
@GetMapping(value = "/queryByProjectId/{projectId}") @GetMapping(value = "/queryByProjectId/{projectId}")
public Result<ProjectAnnualBudget> queryByProjectId(@PathVariable("projectId") String projectId) { public Result<ProjectAnnualBudget> queryByProjectId(@PathVariable("projectId") String projectId) {
ProjectAnnualBudget projectAnnualBudget = projectAnnualBudgetService.getOne(new LambdaQueryWrapper<ProjectAnnualBudget>().eq(ProjectAnnualBudget::getProjectId,projectId)); ProjectAnnualBudget projectAnnualBudget = projectAnnualBudgetService.getOne(new LambdaQueryWrapper<ProjectAnnualBudget>().eq(ProjectAnnualBudget::getProjectId,projectId));
if (projectAnnualBudget == null) { /*if (projectAnnualBudget == null) {
return Result.error("未找到对应数据"); return Result.error("暂无数据");
} }*/
return Result.OK(projectAnnualBudget); return Result.OK(projectAnnualBudget);
} }

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
@ -25,6 +26,7 @@ import org.jeecg.modules.system.model.SysDepartTreeModel;
import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.system.service.ISysUserDepartService; import org.jeecg.modules.system.service.ISysUserDepartService;
import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.QuXianDepartVo;
import org.jeecg.modules.system.vo.SysDepartExportVo; import org.jeecg.modules.system.vo.SysDepartExportVo;
import org.jeecg.modules.system.vo.lowapp.ExportDepartVo; import org.jeecg.modules.system.vo.lowapp.ExportDepartVo;
import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.ExcelImportUtil;
@ -198,6 +200,21 @@ public class SysDepartController {
return result; return result;
} }
@ApiOperation(value = "法人注册时,获取区县级别部门", notes = "法人注册时,获取区县级别部门")
@GetMapping(value = "/getDepartList4Quxian")
public Result<List<QuXianDepartVo>> getDepartList4Quxian() {
SysDepart sysDepart = sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getDelFlag, "0").eq(SysDepart::getParentId, ""));
List<SysDepart> departList4Quxian = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getParentId, sysDepart.getId()));
List<QuXianDepartVo> quXianDepartVos = new ArrayList<>();
Optional.ofNullable(departList4Quxian).orElse(new LinkedList<>()).stream().forEach(depart -> {
QuXianDepartVo vo = new QuXianDepartVo();
vo.setDepName(depart.getDepartName());
vo.setDepId(depart.getId());
quXianDepartVos.add(vo);
});
return Result.OK(quXianDepartVos);
}
/** /**
* 获取某个部门的所有父级部门的ID * 获取某个部门的所有父级部门的ID
* *
@ -247,8 +264,8 @@ public class SysDepartController {
} else if ("quxian_admin".equals(user.getRoleCode())) { } else if ("quxian_admin".equals(user.getRoleCode())) {
queryWrapper.eq("parent_id", user.getOrgId()); queryWrapper.eq("parent_id", user.getOrgId());
} else if ("kejiju_admin".equals(user.getRoleCode())) {// 查询所有法人级部门 } else if ("kejiju_admin".equals(user.getRoleCode())) {// 查询所有法人级部门
queryWrapper.ne("depart_name_abbr","null"); queryWrapper.ne("depart_name_abbr", "null");
queryWrapper.ne("depart_name_abbr",""); queryWrapper.ne("depart_name_abbr", "");
} }
return sysDepartService.queryPageList(req, queryWrapper, pageSize, pageNo); return sysDepartService.queryPageList(req, queryWrapper, pageSize, pageNo);

@ -2024,6 +2024,7 @@ public class SysUserController {
user.setSalt(salt); user.setSalt(salt);
user.setUsername(username); user.setUsername(username);
user.setWorkNo(workon); user.setWorkNo(workon);
user.setOrgCode(depart.getOrgCode());
user.setRealname(realname); user.setRealname(realname);
user.setPassword(passwordEncode); user.setPassword(passwordEncode);
//user.setEmail(email); //user.setEmail(email);

@ -0,0 +1,16 @@
package org.jeecg.modules.system.vo;
import lombok.Data;
/**
* @Description: TODO
* @Author: Z.H.C
* @CreateTime: 2024-11-12 11:20
* @Version: 1.0
*/
@Data
public class QuXianDepartVo {
private String depId;
private String depName;
}

@ -50,6 +50,7 @@ enum Api {
// //
getQrcodeToken = '/sys/getQrcodeToken', getQrcodeToken = '/sys/getQrcodeToken',
getdepdataapi= '/expert/expert/getdepdata', getdepdataapi= '/expert/expert/getdepdata',
getDepartList4Quxian = '/sys/sysDepart/getDepartList4Quxian',
} }
/** /**
@ -244,4 +245,8 @@ export async function validateCasLogin(params) {
export async function getdepdata(params) { export async function getdepdata(params) {
let url = Api.getdepdataapi; let url = Api.getdepdataapi;
return defHttp.get({ url: url, params }); return defHttp.get({ url: url, params });
}export async function departList4Quxian(params) {
return defHttp.get({ url: Api.getDepartList4Quxian, params });
} }

@ -6,6 +6,7 @@ const { createConfirm } = useMessage();
enum Api { enum Api {
list = '/appointmentrecord/appointmentRecord/list', list = '/appointmentrecord/appointmentRecord/list',
list1 = '/appointmentrecord/appointmentRecord/list1', list1 = '/appointmentrecord/appointmentRecord/list1',
list2 = '/appointmentrecord/appointmentRecord/list2',
save='/appointmentrecord/appointmentRecord/add', save='/appointmentrecord/appointmentRecord/add',
edit='/appointmentrecord/appointmentRecord/edit', edit='/appointmentrecord/appointmentRecord/edit',
edit1='/appointmentrecord/appointmentRecord/edit1', edit1='/appointmentrecord/appointmentRecord/edit1',
@ -53,6 +54,8 @@ export const list = (params) => defHttp.get({ url: Api.list, params });
*/ */
export const list1 = (params) => defHttp.get({ url: Api.list1, params }); export const list1 = (params) => defHttp.get({ url: Api.list1, params });
export const list2 = (params) => defHttp.get({ url: Api.list2, params });
/** /**
* 删除单个 * 删除单个
* @param params * @param params

@ -0,0 +1,302 @@
<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="instrumentName">
<template #label><span title="仪器名称">仪器名称</span></template>
<a-input placeholder="请输入仪器名称" v-model:value="queryParam.instrumentName" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="appointmentUnit">
<template #label><span title="预约单位">预约单位</span></template>
<j-select-dept placeholder="请选择预约单位" v-model:value="queryParam.appointmentUnit" checkStrictly allow-clear />
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :lg="6">
<a-form-item name="affiliatedUnit">
<template #label><span title="仪器所属单位">仪器所属</span></template>
<j-select-dept placeholder="请选择仪器所属单位" v-model:value="queryParam.affiliatedUnit" checkStrictly allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="status">
<template #label><span title="预约审核状态">预约审核</span></template>
<j-select-multiple placeholder="请选择预约审核状态" v-model:value="queryParam.status" dictCode="appointment_status" allow-clear />
</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>
&lt;!&ndash; 高级查询 &ndash;&gt;
<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>
<!-- 表单区域 -->
<AppointmentRecordModal ref="registerModal" @success="handleSuccess"></AppointmentRecordModal>
<AppointmentRecordModal1 ref="registerModal1" @success="handleSuccess"></AppointmentRecordModal1>
</div>
</template>
<script lang="ts" name="appointmentrecord-appointmentRecord" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns, superQuerySchema } from './AppointmentRecord.data';
import { list2, deleteOne, batchDelete, getImportUrl, getExportUrl,tgyy,jsyy } from './AppointmentRecord.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import AppointmentRecordModal from './components/AppointmentRecordModal.vue'
import AppointmentRecordModal1 from './components/AppointmentRecordModal1.vue'
import { useUserStore } from '/@/store/modules/user';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const registerModal1 = ref();
const userStore = useUserStore();
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '仪器预约审核记录表',
api: list2,
columns,
canResize:false,
useSearchForm: false,
actionColumn: {
width: 180,
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 batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 通过事件
*/
async function tgcz(record) {
await tgyy({id: record.id}, handleSuccess);
}
/**
* 拒绝事件
*/
function handleReject(record: Recordable) {
registerModal1.value.disableSubmit = false;
registerModal1.value.edit(record);
}
/**
* 结束事件
*/
async function jscz(record) {
await jsyy({id: record.id}, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
/**
* 操作栏
*/
function getTableAction(record) {
const actions = [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}
];
return actions;
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.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,77 @@
import {defHttp} from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
listzwh = '/cms/cmsArticle/listzwh',
list = '/cms/cmsArticle/listJSJLNEW',
save='/cms/cmsArticle/addJSJLNEW',
edit='/cms/cmsArticle/edit',
deleteOne = '/cms/cmsArticle/delete',
deleteBatch = '/cms/cmsArticle/deleteBatch',
importExcel = '/cms/cmsArticle/importExcel',
exportXls = '/cms/cmsArticle/exportXls',
operationStatus = '/cms/cmsArticle/operationStatus',
}
/**
* 导出api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* 导入api
*/
export const getImportUrl = Api.importExcel;
export const updateStatus = (params) => defHttp.post({url: Api.operationStatus, params});
/**
* 列表接口
* @param params
*/
export const list = (params) =>
defHttp.get({url: Api.list, params});
/**
* 列表接口
* @param params
*/
export const listzwh = (params) =>
defHttp.get({url: Api.listzwh, params});
/**
* 删除单个
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
* 批量删除
* @param params
*/
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
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({url: url, params});
}

@ -0,0 +1,173 @@
import {BasicColumn} from '/@/components/Table';
import {FormSchema} from '/@/components/Table';
// import { rules} from '/@/utils/helper/validator';
// import { render } from '/@/utils/common/renderUtils';
//
export const columns: BasicColumn[] = [
{
title: '所属栏目',
align: "center",
dataIndex: 'columnName'
},
{
title: '文章标题',
align: "center",
dataIndex: 'title',
// slots: {customRender: 'htmlSlot'},
},
{
title: '作者',
align: "center",
dataIndex: 'createBy_dictText'
},
{
title: '来源',
align: "center",
dataIndex: 'source'
},
{
title: '状态',
align: "center",
dataIndex: 'status_dictText'
},
{
title: '发布时间',
align: "center",
dataIndex: 'publishTime'
},
// {
// title: 'url',
// align: "center",
// dataIndex: 'originUrl'
// },
];
//
export const searchFormSchema: FormSchema[] = [
{
label: "所属栏目",
field: 'columnId',
component: 'JDictSelectTag',
componentProps: {
dictCode: "cms_column,name,id"
},
colProps: {span: 6},
},
{
label: "文章标题",
field: 'title',
component: 'Input',
colProps: {span: 6},
},
{
label: "是否发布",
field: 'status',
component: 'JDictSelectTag',
componentProps: {
dictCode: "captain_code"
},
colProps: {span: 3},
},
];
//
export const formSchema: FormSchema[] = [
{
label: '文章标题',
field: 'title',
component: 'Input',
dynamicRules: ({model, schema}) => {
return [
{required: true, message: '请输入文章标题!'},
];
},
},
/* {
label: '所属栏目',
field: 'columnId',
component: 'JDictSelectTag',
componentProps: {
dictCode: "cms_column,name,id"
},
dynamicRules: ({model, schema}) => {
return [
{required: true, message: '请输入所属栏目!'},
];
},
},*/
{
label: '文章内容',
field: 'content',
component: 'JEditor',
},
// {
// label: '',
// field: 'columnName',
// component: 'Input',
// },
{
label: '发布时间',
field: 'publishTime',
component: 'DatePicker',
componentProps: {
showTime: true,
valueFormat: 'YYYY-MM-DD HH:mm:ss'
},
},
{
label: '来源',
field: 'source',
component: 'Input',
},
{
label: '源url',
field: 'originUrl',
component: 'Input',
},
{
label: '文章图片',
field: 'comimg',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '文章文件',
field: 'comfile',
component: 'JUpload',
componentProps:{
},
},
{
label: '简介',
field: 'info',
component: 'InputTextArea',
},
/* {
label: '文章来源',
field: 'artfrom',
component: 'JSearchSelect',
componentProps:{
dict: "subweside,subname,id"
},
},*/
// TODO ID
{
label: '',
field: 'id',
component: 'Input',
show: false
},
];
/**
* 流程表单调用这个方法获取formSchema
* @param param
*/
export function getBpmFormSchema(_formData): FormSchema[] {
// formSchema
return formSchema;
}

@ -0,0 +1,249 @@
<template>
<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>-->
</template>
<!--操作栏-->
<template #action="{ record }">
<!-- <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>-->
<TableAction :actions="getTableAction(record)"/>
<!--<TableAction
:stopButtonPropagation="true"
:actions="[
{
label: '1',
// type: 'link',
size: 'small',
icon: 'ant-design:plus-circle-outlined',
onClick: add.bind(null, record),
},
{
label: '2',
// type: 'link',
size: 'small',
icon: 'fa6-regular:pen-to-square',
onClick: editor.bind(null, record),
},
{
label: '3',
// color: 'error',
icon: 'ic:outline-delete-outline',
popConfirm: {
title: '确定删除该数据吗?',
confirm: del.bind(null, record),
},
},
]"
/>-->
</template>
<!--字段回显插槽-->
<template #htmlSlot="{text}">
<div v-html="text"></div>
</template>
<!--省市区字段回显插槽-->
<template #pcaSlot="{text}">
{{ getAreaTextByCode(text) }}
</template>
<template #fileSlot="{text}">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined"
size="small" @click="downloadFile(text)">下载
</a-button>
</template>
</BasicTable>
<!-- 表单区域 -->
<CmsArticleModal @register="registerModal" @success="handleSuccess"></CmsArticleModal>
</div>
</template>
<script lang="ts" name="cms-cmsArticle" setup>
import {ref} from 'vue';
import {BasicTable, TableAction} from '/@/components/Table';
import {useModal} from '/@/components/Modal';
import {useListPage} from '/@/hooks/system/useListPage'
import CmsArticleModal from './components/CmsArticleModal.vue'
import {columns, searchFormSchema} from './CmsArticle.data';
import {
batchDelete,
deleteOne,
getExportUrl,
getImportUrl,
list,
updateStatus
} from './CmsArticle.api';
// import {updateStatus} from './CmsArticle.api';
import {Update} from "/@/views/topic/Topic.api";
import {defHttp} from "/@/utils/http/axios";
// import { downloadFile } from '/@/utils/common/renderUtils';
const checkedKeys = ref<Array<string | number>>([]);
//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: 180,
fixed: 'right'
},
},
exportConfig: {
name: "文章",
url: getExportUrl,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
})
const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
function update2(record: Recordable, val) {
record.status = val;
updateStatus(record)
//2
// defHttp.post({ url: '/cms/cmsArticle/operationStatus', params: record });
reload()
}
/**
* 详情
*/
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) {
const actions = [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
}
];
if (record.status == "1") {
actions.unshift({
label: '取消发布',
onClick: update2.bind(null,record, "0"),
});
}
if (record.status == "0") {
actions.unshift({
label: '发布',
onClick: update2.bind(null,record, "1"),
});
}
return actions;
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
}
]
}
</script>
<style scoped>
</style>

@ -0,0 +1,249 @@
<template>
<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>-->
</template>
<!--操作栏-->
<template #action="{ record }">
<!-- <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>-->
<TableAction :actions="getTableAction(record)"/>
<!--<TableAction
:stopButtonPropagation="true"
:actions="[
{
label: '1',
// type: 'link',
size: 'small',
icon: 'ant-design:plus-circle-outlined',
onClick: add.bind(null, record),
},
{
label: '2',
// type: 'link',
size: 'small',
icon: 'fa6-regular:pen-to-square',
onClick: editor.bind(null, record),
},
{
label: '3',
// color: 'error',
icon: 'ic:outline-delete-outline',
popConfirm: {
title: '确定删除该数据吗?',
confirm: del.bind(null, record),
},
},
]"
/>-->
</template>
<!--字段回显插槽-->
<template #htmlSlot="{text}">
<div v-html="text"></div>
</template>
<!--省市区字段回显插槽-->
<template #pcaSlot="{text}">
{{ getAreaTextByCode(text) }}
</template>
<template #fileSlot="{text}">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined"
size="small" @click="downloadFile(text)">下载
</a-button>
</template>
</BasicTable>
<!-- 表单区域 -->
<CmsArticleModal @register="registerModal" @success="handleSuccess"></CmsArticleModal>
</div>
</template>
<script lang="ts" name="cms-cmsArticle" setup>
import {ref} from 'vue';
import {BasicTable, TableAction} from '/@/components/Table';
import {useModal} from '/@/components/Modal';
import {useListPage} from '/@/hooks/system/useListPage'
import CmsArticleModal from './components/CmsArticleModal.vue'
import {columns, searchFormSchema} from './CmsArticle.data';
import {
batchDelete,
deleteOne,
getExportUrl,
getImportUrl,
listzwh,
updateStatus
} from './CmsArticle.api';
// import {updateStatus} from './CmsArticle.api';
import {Update} from "/@/views/topic/Topic.api";
import {defHttp} from "/@/utils/http/axios";
// import { downloadFile } from '/@/utils/common/renderUtils';
const checkedKeys = ref<Array<string | number>>([]);
//model
const [registerModal, {openModal}] = useModal();
//table
const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
tableProps: {
title: '文章',
api: listzwh,
columns,
canResize: false,
formConfig: {
//labelWidth: 120,
schemas: searchFormSchema,
autoSubmitOnEnter: true,
showAdvancedButton: true,
fieldMapToNumber: [],
fieldMapToTime: [],
},
actionColumn: {
width: 180,
fixed: 'right'
},
},
exportConfig: {
name: "文章",
url: getExportUrl,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
})
const [registerTable, {reload}, {rowSelection, selectedRowKeys}] = tableContext
/**
* 新增事件
*/
function handleAdd() {
openModal(true, {
isUpdate: false,
showFooter: true,
});
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
openModal(true, {
record,
isUpdate: true,
showFooter: true,
});
}
function update2(record: Recordable, val) {
record.status = val;
updateStatus(record)
//2
// defHttp.post({ url: '/cms/cmsArticle/operationStatus', params: record });
reload()
}
/**
* 详情
*/
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) {
const actions = [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
}
];
if (record.status == "1") {
actions.unshift({
label: '取消发布',
onClick: update2.bind(null,record, "0"),
});
}
if (record.status == "0") {
actions.unshift({
label: '发布',
onClick: update2.bind(null,record, "1"),
});
}
return actions;
}
/**
* 下拉操作栏
*/
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
}, {
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
}
}
]
}
</script>
<style scoped>
</style>

@ -0,0 +1,26 @@
-- 注意该页面对应的前台目录为views/cms文件夹下
-- 如果你想更改到其他目录请修改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 ('2023101212013790550', NULL, '文章', '/cms/cmsArticleList', 'cms/CmsArticleList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 0, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-10-12 12:01:55', 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 ('2023101212013790551', '2023101212013790550', '添加文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', 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 ('2023101212013790552', '2023101212013790550', '编辑文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', 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 ('2023101212013790553', '2023101212013790550', '删除文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', 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 ('2023101212013790554', '2023101212013790550', '批量删除文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', 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 ('2023101212013790555', '2023101212013790550', '导出excel_文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', 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 ('2023101212013790556', '2023101212013790550', '导入excel_文章', NULL, NULL, 0, NULL, NULL, 2, 'cms:cms_article:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-10-12 12:01:55', NULL, NULL, 0, 0, '1', 0);

@ -0,0 +1,70 @@
<template>
<div style="min-height: 400px">
<BasicForm @register="registerForm"></BasicForm>
<div style="width: 100%;text-align: center" v-if="!formDisabled">
<a-button @click="submitForm" pre-icon="ant-design:check" type="primary"> </a-button>
</div>
</div>
</template>
<script lang="ts">
import {BasicForm, useForm} from '/@/components/Form/index';
import {computed, defineComponent} from 'vue';
import {defHttp} from '/@/utils/http/axios';
import { propTypes } from '/@/utils/propTypes';
import {getBpmFormSchema} from '../CmsArticle.data';
import {saveOrUpdate} from '../CmsArticle.api';
export default defineComponent({
name: "CmsArticleForm",
components:{
BasicForm
},
props:{
formData: propTypes.object.def({}),
formBpm: propTypes.bool.def(true),
},
setup(props){
const [registerForm, { setFieldsValue, setProps, getFieldsValue }] = useForm({
labelWidth: 150,
schemas: getBpmFormSchema(props.formData),
showActionButtonGroup: false,
baseColProps: {span: 24}
});
const formDisabled = computed(()=>{
if(props.formData.disabled === false){
return false;
}
return true;
});
let formData = {};
const queryByIdUrl = '/cms/cmsArticle/queryById';
async function initFormData(){
let params = {id: props.formData.dataId};
const data = await defHttp.get({url: queryByIdUrl, params});
formData = {...data}
//
await setFieldsValue(formData);
//
await setProps({disabled: formDisabled.value})
}
async function submitForm() {
let data = getFieldsValue();
let params = Object.assign({}, formData, data);
console.log('表单数据', params)
await saveOrUpdate(params, true)
}
initFormData();
return {
registerForm,
formDisabled,
submitForm,
}
}
});
</script>

@ -0,0 +1,66 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
<BasicForm @register="registerForm"/>
</BasicModal>
</template>
<script lang="ts" setup>
import {ref, computed, unref} from 'vue';
import {BasicModal, useModalInner} from '/@/components/Modal';
import {BasicForm, useForm} from '/@/components/Form/index';
import {formSchema} from '../CmsArticle.data';
import {saveOrUpdate} from '../CmsArticle.api';
// Emits
const emit = defineEmits(['register','success']);
const isUpdate = ref(true);
//
const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
//labelWidth: 150,
schemas: formSchema,
showActionButtonGroup: false,
baseColProps: {span: 24}
});
//
const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
//
await resetFields();
setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
isUpdate.value = !!data?.isUpdate;
if (unref(isUpdate)) {
//
await setFieldsValue({
...data.record,
});
}
//
setProps({ disabled: !data?.showFooter })
});
//
const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
//
async function handleSubmit(v) {
try {
let values = await validate();
setModalProps({confirmLoading: true});
//
await saveOrUpdate(values, isUpdate.value);
//
closeModal();
//
emit('success');
} finally {
setModalProps({confirmLoading: false});
}
}
</script>
<style lang="less" scoped>
/** 时间和数字输入框样式 */
:deep(.ant-input-number){
width: 100%
}
:deep(.ant-calendar-picker){
width: 100%
}
</style>

@ -33,7 +33,7 @@
</template> </template>
<!--操作栏--> <!--操作栏-->
<template #action="{ record }"> <template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" /> <TableAction :actions="getTableAction(record)"/>
</template> </template>
</BasicTable> </BasicTable>
<!--用户抽屉--> <!--用户抽屉-->
@ -69,7 +69,9 @@
import { columns, searchFormSchema } from './user.data'; import { columns, searchFormSchema } from './user.data';
import { listNoCareTenant, deleteUser, batchDeleteUser, getImportUrl, getExportUrl, frozenBatch} from './user.api'; import { listNoCareTenant, deleteUser, batchDeleteUser, getImportUrl, getExportUrl, frozenBatch} from './user.api';
import {usePermission} from "/@/hooks/web/usePermission"; import {usePermission} from "/@/hooks/web/usePermission";
import {useUserStore} from "@/store/modules/user";
const userStore = useUserStore();
console.log("the current user role:",userStore.getUserInfo.roleCode);
const { createMessage, createConfirm } = useMessage(); const { createMessage, createConfirm } = useMessage();
const { isDisabledAuth } = usePermission(); const { isDisabledAuth } = usePermission();
//drawer //drawer
@ -84,7 +86,6 @@
const [registerQuitAgentModal, { openModal: openQuitAgentModal }] = useModal(); const [registerQuitAgentModal, { openModal: openQuitAgentModal }] = useModal();
//model //model
const [registerQuitModal, { openModal: openQuitModal }] = useModal(); const [registerQuitModal, { openModal: openQuitModal }] = useModal();
// //
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
designScope: 'user-list', designScope: 'user-list',
@ -233,7 +234,7 @@
/** /**
* 操作栏 * 操作栏
*/ */
function getTableAction(record): ActionItem[] { /*function getTableAction(record): ActionItem[] {
return [ return [
{ {
label: '编辑', label: '编辑',
@ -241,31 +242,25 @@
// ifShow: () => hasPermission('system:user:edit'), // ifShow: () => hasPermission('system:user:edit'),
}, },
]; ];
} }*/
/** /**
* 下拉操作栏 * 下拉操作栏
*/ */
function getDropDownAction(record): ActionItem[] { // function getDropDownAction(record): ActionItem[] {
function getTableAction(record): ActionItem[] {
return [ return [
{ {
label: '详情', label: '详情',
onClick: handleDetail.bind(null, record), onClick: handleDetail.bind(null, record),
}, },
{ /*{
label: '密码', label: '密码',
//auth: 'user:changepwd', //auth: 'user:changepwd',
onClick: handleChangePassword.bind(null, record.username), onClick: handleChangePassword.bind(null, record.username),
}, },*/
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
},
{ {
label: '驳回', label: '驳回',
ifShow: record.status == 1, ifShow: userStore.getUserInfo.roleCode =='faren_admin' && record.status == 1,
popConfirm: { popConfirm: {
title: '确定驳回吗?', title: '确定驳回吗?',
confirm: handleFrozen.bind(null, record, 2), confirm: handleFrozen.bind(null, record, 2),
@ -273,12 +268,20 @@
}, },
{ {
label: '通过', label: '通过',
ifShow: record.status == 2, ifShow: userStore.getUserInfo.roleCode =='faren_admin' && record.status == 2,
popConfirm: { popConfirm: {
title: '确定通过吗?', title: '确定通过吗?',
confirm: handleFrozen.bind(null, record, 1), confirm: handleFrozen.bind(null, record, 1),
}, },
}, },
{
label: '删除',
ifShow: userStore.getUserInfo.roleCode != 'shenbaoren_role',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
},
// { // {
// label: '', // label: '',
// onClick: handleAgentSettings.bind(null, record.username), // onClick: handleAgentSettings.bind(null, record.username),

@ -196,6 +196,11 @@ function getTableAction(record) {
confirm: handleFrozen.bind(null, record, 1), confirm: handleFrozen.bind(null, record, 1),
}, },
}, },
{
ifShow: userStore.getUserInfo.roleCode =='faren_admin',
label: '编辑',
onClick: handleEdit.bind(null, record),
},
{ {
label: '删除', label: '删除',
ifShow: userStore.getUserInfo.roleCode !='faren_admin', ifShow: userStore.getUserInfo.roleCode !='faren_admin',

@ -92,6 +92,7 @@ export const formSchema: FormSchema[] = [
componentProps:{ componentProps:{
dictCode:"depart_status" dictCode:"depart_status"
}, },
dynamicDisabled: true,
}, },
{ {
label: '名称', label: '名称',
@ -107,6 +108,7 @@ export const formSchema: FormSchema[] = [
label: '编码', label: '编码',
field: 'orgCode', field: 'orgCode',
component: 'Input', component: 'Input',
dynamicDisabled: true,
}, },
{ {
label: '手机号', label: '手机号',

@ -4,6 +4,24 @@
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="annualid">
<template #label><span title="年度">年度</span></template>
<j-search-select placeholder="请选择年度" v-model:value="queryParam.annualid" dict="annual,annual_name,id" allow-clear />
</a-form-item>
</a-col>
<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-row>
</a-form> </a-form>
</div> </div>

@ -4,6 +4,11 @@
<template #detail> <template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="DepsbnczForm"> <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="DepsbnczForm">
<a-row> <a-row>
<a-col :span="24">
<a-form-item label="年度" v-bind="validateInfos.annualid" id="DepsbnczForm-annualid" name="annualid">
<j-search-select v-model:value="formData.annualid" dict="annual,annual_name,id" allow-clear />
</a-form-item>
</a-col>
<!-- <a-col :span="24"> <!-- <a-col :span="24">
<a-form-item label="部门" v-bind="validateInfos.depid" id="DepsbnczForm-depid" name="depid"> <a-form-item label="部门" v-bind="validateInfos.depid" id="DepsbnczForm-depid" name="depid">
<j-search-select v-model:value="formData.depid" dict="sys_depart,depart_name,id" allow-clear /> <j-search-select v-model:value="formData.depid" dict="sys_depart,depart_name,id" allow-clear />
@ -96,6 +101,8 @@
jyzc: '', jyzc: '',
jyjy: '', jyjy: '',
nsze: '', nsze: '',
annualid: '',
}); });
const { createMessage } = useMessage(); const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } }); const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });

@ -7,28 +7,20 @@
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="seusername"> <a-form-item name="seusername">
<template #label><span title="用户名">用户名</span></template> <template #label><span title="用户名">用户名</span></template>
<a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input> <j-search-select placeholder="请选择用户名" v-model:value="queryParam.seusername" dict="sys_user,realname,username" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="directioncal"> <a-form-item name="compopen">
<template #label><span title="研究领域">研究领域</span></template> <template #label><span title="部门审核">部门审核</span></template>
<a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input> <j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
</a-form-item> </a-form-item>
</a-col> </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"> <template v-if="toggleSearchStatus">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="research"> <a-form-item name="adminopen">
<template #label><span title="细分方向">细分方向</span></template> <template #label><span title="管理员审核">管理员审</span></template>
<a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></a-input> <j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
</template> </template>
@ -96,6 +88,7 @@
import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue'; import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue'; import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue';
import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
const formRef = ref(); const formRef = ref();
const queryParam = reactive<any>({}); const queryParam = reactive<any>({});

@ -7,28 +7,20 @@
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="seusername"> <a-form-item name="seusername">
<template #label><span title="用户名">用户名</span></template> <template #label><span title="用户名">用户名</span></template>
<a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input> <j-search-select placeholder="请选择用户名" v-model:value="queryParam.seusername" dict="sys_user,realname,username" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="directioncal"> <a-form-item name="compopen">
<template #label><span title="研究领域">研究领域</span></template> <template #label><span title="部门审核">部门审核</span></template>
<a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input> <j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
</a-form-item> </a-form-item>
</a-col> </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"> <template v-if="toggleSearchStatus">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="research"> <a-form-item name="adminopen">
<template #label><span title="细分方向">细分方向</span></template> <template #label><span title="管理员审核">管理员审</span></template>
<a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></a-input> <j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
</template> </template>
@ -94,6 +86,7 @@
import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue'; import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue'; import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue';
import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
const formRef = ref(); const formRef = ref();
const queryParam = reactive<any>({}); const queryParam = reactive<any>({});

@ -7,21 +7,23 @@
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="seusername"> <a-form-item name="seusername">
<template #label><span title="用户名">用户名</span></template> <template #label><span title="用户名">用户名</span></template>
<a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input> <j-search-select placeholder="请选择用户名" v-model:value="queryParam.seusername" dict="sys_user,realname,username" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="directioncal"> <a-form-item name="compopen">
<template #label><span title="研究领域">研究领域</span></template> <template #label><span title="部门审核">部门审核</span></template>
<a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input> <j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
</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-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus">
<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>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons"> <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6"> <a-col :lg="6">
@ -87,6 +89,7 @@
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue'; import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue'; import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue';
import {handlebackback} from "@/views/expert/firm/Expert.api"; import {handlebackback} from "@/views/expert/firm/Expert.api";
import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
const formRef = ref(); const formRef = ref();
const queryParam = reactive<any>({}); const queryParam = reactive<any>({});

@ -7,32 +7,20 @@
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="seusername"> <a-form-item name="seusername">
<template #label><span title="用户名">用户名</span></template> <template #label><span title="用户名">用户名</span></template>
<a-input placeholder="请输入用户名" v-model:value="queryParam.seusername" allow-clear ></a-input> <j-search-select placeholder="请选择用户名" v-model:value="queryParam.seusername" dict="sys_user,realname,username" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<!-- <a-form-item name="directioncal"> <a-form-item name="compopen">
<template #label><span title="研究领域">研究领域</span></template> <template #label><span title="部门审核">部门审核</span></template>
<a-input placeholder="请输入研究领域" v-model:value="queryParam.directioncal" allow-clear ></a-input> <j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
</a-form-item>--> </a-form-item>
<a-form-item name="compopen">
<template #label><span title="部门审核">部门审核</span></template>
<j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
</a-form-item>
</a-col> </a-col>
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="research"> <a-form-item name="adminopen">
<template #label><span title="细分方向">细分方向</span></template> <template #label><span title="管理员审核">管理员审</span></template>
<a-input placeholder="请输入细分方向" v-model:value="queryParam.research" allow-clear ></a-input> <j-select-multiple placeholder="请选择管理员审核" v-model:value="queryParam.adminopen" dictCode="examstures" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="compopen">
<template #label><span title="部门审核">部门审核</span></template>
<j-select-multiple placeholder="请选择部门审核" v-model:value="queryParam.compopen" dictCode="examstures" allow-clear />
</a-form-item> </a-form-item>
</a-col> </a-col>
</template> </template>
@ -98,6 +86,7 @@
import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/src/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue'; import JSwitch from '/src/components/Form/src/jeecg/components/JSwitch.vue';
import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue'; import JSelectMultiple from '/src/components/Form/src/jeecg/components/JSelectMultiple.vue';
import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
const formRef = ref(); const formRef = ref();
const queryParam = reactive<any>({}); const queryParam = reactive<any>({});

@ -3,40 +3,7 @@
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <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>
<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> </a-form>
</div> </div>
<!--引用表格--> <!--引用表格-->

@ -3,40 +3,7 @@
<!--查询区域--> <!--查询区域-->
<div class="jeecg-basic-table-form-container"> <div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol"> <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>
<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> </a-form>
</div> </div>
<!--引用表格--> <!--引用表格-->

@ -53,7 +53,7 @@ export const expandproColumns: JVxeColumn[] = [
placeholder: '请输入${title}', placeholder: '请输入${title}',
defaultValue:'', defaultValue:'',
}, },
{ /* {
title: '所属领域', title: '所属领域',
key: 'exptype', key: 'exptype',
type: JVxeTypes.input, type: JVxeTypes.input,
@ -61,7 +61,7 @@ export const expandproColumns: JVxeColumn[] = [
width:"200px", width:"200px",
placeholder: '请输入${title}', placeholder: '请输入${title}',
defaultValue:'', defaultValue:'',
}, },*/
/* { /* {
title: '所属单位', title: '所属单位',
key: 'ssdep', key: 'ssdep',

@ -14,7 +14,7 @@ export const projectBaseInfoSchemas: FormSchema[] = [
}, },
dynamicDisabled: true, dynamicDisabled: true,
// defaultValue: '', // defaultValue: '',
defaultValue: '1846744340708184065', // defaultValue: '1846744340708184065',
}, },
{ {
field: 'annualId', field: 'annualId',

@ -18,20 +18,21 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { BasicForm, useForm } from '@/components/Form'; import { BasicForm, useForm } from '@/components/Form';
import {defineComponent, ref} from 'vue'; import {defineComponent, ref,nextTick,onMounted} from 'vue';
import { PageWrapper } from '@/components/Page'; import { PageWrapper } from '@/components/Page';
import { projectBaseInfoSchemas, userSchemas, departSchemas } from './data'; import { projectBaseInfoSchemas, userSchemas, departSchemas } from './data';
import { Card } from 'ant-design-vue'; import { Card } from 'ant-design-vue';
import {defHttp} from "@/utils/http/axios"; import {defHttp} from "@/utils/http/axios";
import {save4shenbao} from './data.api'; import {save4shenbao} from './data.api';
import { useRouter } from 'vue-router'; import { useRouter, useRoute } from 'vue-router';
export default defineComponent({ export default defineComponent({
name: 'FormHightPage', name: 'FormHightPage',
components: { BasicForm, PageWrapper, [Card.name]: Card }, components: { BasicForm, PageWrapper, [Card.name]: Card },
setup() { setup() {
const route = useRoute();
const { currentRoute, back } = useRouter(); const { currentRoute, back } = useRouter();
const [registerProjectInfo, { validate: validateProjectInfoForm }] = useForm({ const [registerProjectInfo, { validate: validateProjectInfoForm, setFieldsValue }] = useForm({
baseColProps: { baseColProps: {
span: 6, span: 6,
}, },
@ -40,7 +41,13 @@
schemas: projectBaseInfoSchemas, schemas: projectBaseInfoSchemas,
showActionButtonGroup: false, showActionButtonGroup: false,
}); });
const setformValue1 = async () => {
// console.log(route,'route')
await setFieldsValue({projectTypeid: route.query.projectTypeId})
};
nextTick(() => {
setformValue1();
});
const [registerUser, { validate: validateUserForm }] = useForm({ const [registerUser, { validate: validateUserForm }] = useForm({
baseColProps: { baseColProps: {
span: 6, span: 6,
@ -77,11 +84,9 @@
back(); back();
}; };
function getUserDepart(){
projectBaseInfoSchemas.se
}
return { registerProjectInfo, registerUser, registerDepart, submitAll, goBack }; return { registerProjectInfo, registerUser, registerDepart, submitAll, goBack };
}, },
}); });
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

@ -10,26 +10,16 @@
<!-- <j-upload-button type="primary" v-auth="'project:project:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>--> <!-- <j-upload-button type="primary" v-auth="'project:project:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
<a-dropdown> <a-dropdown>
<template #overlay> <template #overlay>
<a-menu> <a-menu @click="go_xinjianshenbao">
<a-menu-item key="1" @click="go_xinjianshenbao"> <a-menu-item v-for="opt of projectTypeList" :key="opt.key">
<Icon icon="ant-design:plus-outlined"></Icon>
科技攻关
</a-menu-item>
<!-- <a-menu-item v-for="opt of RANGE_OPTIONS" :key="opt.key">
{{ opt.label }} {{ opt.label }}
</a-menu-item>--> </a-menu-item>
<!--<a-menu-item key="1" @click="go_xinjianshenbao">
<Icon icon="ant-design:plus-outlined"></Icon>
xxx
</a-menu-item>-->
</a-menu> </a-menu>
</template> </template>
<a-button type="primary">新建申报 <a-button type="primary">新建申报
<Icon icon="mdi:chevron-down"></Icon> <Icon icon="mdi:chevron-down"></Icon>
</a-button> </a-button>
</a-dropdown> </a-dropdown>
<!-- 高级查询
<super-query :config="superQueryConfig" @search="handleSuperQuery" />-->
</template> </template>
<!--操作栏--> <!--操作栏-->
<template #action="{ record }"> <template #action="{ record }">
@ -51,22 +41,24 @@ import {useModal} from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage' import { useListPage } from '/@/hooks/system/useListPage'
import ProjectModal from './components/ProjectModal.vue' import ProjectModal from './components/ProjectModal.vue'
import {columns, searchFormSchema, superQuerySchema} from './Project.data'; import {columns, searchFormSchema, superQuerySchema} from './Project.data';
import { import {
list, list,
deleteOne, deleteOne,
rollbackOne, rollbackOne,
submitOne, submitOne,
batchDelete, batchDelete,
getImportUrl, getImportUrl,
getExportUrl, getExportUrl,
getProjectTypeList } from './Project.api';
} from './Project.api';
import {getProjectTypeList} from '../../projectType/ProjectType.api';
import { downloadFile } from '/@/utils/common/renderUtils'; import { downloadFile } from '/@/utils/common/renderUtils';
import { useGo } from '/@/hooks/web/usePage'; import { useGo } from '/@/hooks/web/usePage';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import {getUserData} from "@/views/system/usersetting/UserSetting.api"; import {getUserData} from "@/views/system/usersetting/UserSetting.api";
import {useTimeoutFn} from "@/hooks/core/useTimeout"; import {useTimeoutFn} from "@/hooks/core/useTimeout";
import {departList4Quxian} from "@/api/sys/user";
const go = useGo(); const go = useGo();
const queryParam = reactive<any>({}); const queryParam = reactive<any>({});
@ -110,8 +102,7 @@ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
}) })
// //
// /*const projectTypeList = [
const RANGE_OPTIONS = [
{key: 'TODAY', label: '今天'}, {key: 'TODAY', label: '今天'},
{key: 'YESTERDAY', label: '昨天'}, {key: 'YESTERDAY', label: '昨天'},
{key: 'TOMORROW', label: '明天'}, {key: 'TOMORROW', label: '明天'},
@ -122,13 +113,16 @@ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
{key: 'THIS_MONTH', label: '本月'}, {key: 'THIS_MONTH', label: '本月'},
{key: 'LAST_MONTH', label: '上月'}, {key: 'LAST_MONTH', label: '上月'},
{key: 'NEXT_MONTH', label: '下月'}, {key: 'NEXT_MONTH', label: '下月'},
]; ];*/
const projectTypeList =ref([]);
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
// //
const superQueryConfig = reactive(superQuerySchema); const superQueryConfig = reactive(superQuerySchema);
getProjectType();
/** /**
* 高级查询事件 * 高级查询事件
*/ */
@ -149,9 +143,10 @@ function handleAdd() {
} }
// //
function go_xinjianshenbao() { function go_xinjianshenbao(event: Recordable) {
// go('/comp/jeecg/basic'); // alert("id: "+event.key)
go('/projectApplication/index?projectTypeId='+'1846744340708184065'); //
go('/projectApplication/index?projectTypeId='+event.key);
} }
// //
@ -171,7 +166,20 @@ function go_projectLog(record) {
go('/projectLog/projectLogList?id='+record.id); go('/projectLog/projectLogList?id='+record.id);
} }
async function getProjectType(){
let params = {
status: '1',
};
await getProjectTypeList(params).then(res=>{
console.log("getProjectType is invoke-----------",JSON.stringify(res.records))
projectTypeList.value = res.records.map(item => {
return {label:item.typeName,key:item.id}
})
console.log(JSON.stringify(projectTypeList));
})
}
/** /**
* 编辑事件 * 编辑事件

@ -31,6 +31,9 @@ export const getImportUrl = Api.importExcel;
*/ */
export const list = (params) => defHttp.get({ url: Api.list, params }); export const list = (params) => defHttp.get({ url: Api.list, params });
// export const getProjectTypeList = (params) => defHttp.get({ url: Api.getProjectTypeList, params });
export const getProjectTypeList = (params) => defHttp.get({ url: Api.list, params });
/** /**
* 删除单个 * 删除单个
* @param params * @param params

@ -212,8 +212,8 @@
// //
const formData = reactive<any>({ const formData = reactive<any>({
inputCode: '', inputCode: '',
username: 'admin', username: '',
password: '123456', password: '',
}); });
// //
const phoneFormData = reactive<any>({ const phoneFormData = reactive<any>({

@ -39,10 +39,16 @@
<a-input class="fix-auto-fill" type="text" :placeholder="t('请输法人身份证号')" v-model:value="formData.idNo" /> <a-input class="fix-auto-fill" type="text" :placeholder="t('请输法人身份证号')" v-model:value="formData.idNo" />
</div> </div>
</a-form-item> </a-form-item>
<a-form-item> <!-- <a-form-item>
<div class="aui-input-line"> <div class="aui-input-line">
<JSelectDept4FaRen :placeholder="t('sys.login.selectorgPlaceholder4Kejiju')" v-model:value="formData.department" :multiple="false" /> <JSelectDept4FaRen :placeholder="t('sys.login.selectorgPlaceholder4Kejiju')" v-model:value="formData.department" :multiple="false" />
</div> </div>
</a-form-item>-->
<a-form-item>
<div class="aui-input-line">
<j-search-select :placeholder="t('sys.login.selectorgPlaceholder4Kejiju')" v-model:value="formData.department" :dictOptions="dictOptions" />
{{ selectValue }}
</div>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
<div class="aui-input-line"> <div class="aui-input-line">
@ -118,7 +124,7 @@
<script lang="ts" setup name="mini-register"> <script lang="ts" setup name="mini-register">
import { ref, reactive, unref, toRaw,onMounted } from 'vue'; import { ref, reactive, unref, toRaw,onMounted } from 'vue';
import { getCaptcha, registerFaren, getCodeInfo } from '/@/api/sys/user'; import {getCaptcha, registerFaren, getCodeInfo, departList4Quxian} from '/@/api/sys/user';
import { SmsEnum } from '/@/views/sys/login/useLogin'; import { SmsEnum } from '/@/views/sys/login/useLogin';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import logoImg from '/@/assets/loginmini/icon/jeecg_logo.png'; import logoImg from '/@/assets/loginmini/icon/jeecg_logo.png';
@ -129,7 +135,7 @@
import JSelectDept4FaRen from '/@/components/Form/src/jeecg/components/JSelectDept4FaRen.vue'; import JSelectDept4FaRen from '/@/components/Form/src/jeecg/components/JSelectDept4FaRen.vue';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
import codeImg from '/@/assets/images/checkcode.png'; import codeImg from '/@/assets/images/checkcode.png';
import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
const { t } = useI18n(); const { t } = useI18n();
const { notification, createErrorModal, createMessage } = useMessage(); const { notification, createErrorModal, createMessage } = useMessage();
const emit = defineEmits(['go-back', 'success', 'register']); const emit = defineEmits(['go-back', 'success', 'register']);
@ -157,6 +163,21 @@
const pwdIndex = ref<string>('close'); const pwdIndex = ref<string>('close');
// //
const confirmPwdIndex = ref<string>('close'); const confirmPwdIndex = ref<string>('close');
const selectValue=ref('');
const dictOptions=ref([]);
//
function getDepartList4Quxian(){
departList4Quxian().then(res => {
console.log(res,"res")
dictOptions.value = res.map(item => {
return {text:item.depName,value:item.depId}
})
console.log(dictOptions.value,"dictOptions")
})}
getDepartList4Quxian();
/** /**
* 返回 * 返回

@ -39,10 +39,10 @@
<span class="gray-75 item-label">性别</span> <span class="gray-75 item-label">性别</span>
<span class="gray-3">{{ userInfo.sexText }}</span> <span class="gray-3">{{ userInfo.sexText }}</span>
</div> </div>
<div class="margin-bottom-10 nowarp font-size-13"> <!-- <div class="margin-bottom-10 nowarp font-size-13">-->
<span class="gray-75 item-label">职位</span> <!-- <span class="gray-75 item-label">职位</span>-->
<span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span> <!-- <span class="gray-3">{{ userInfo.postText ? userInfo.postText : "未填写" }}</span>-->
</div> <!-- </div>-->
<div class="font-size-13"> <div class="font-size-13">
<span class="item-label"></span> <span class="item-label"></span>
<span class="item-label pointer" style="color:#1e88e5" @click="openEditModal">编辑</span> <span class="item-label pointer" style="color:#1e88e5" @click="openEditModal">编辑</span>

Loading…
Cancel
Save