申请入驻和价格修改

master
CJYXTX\27961 6 months ago
parent 9349912bfe
commit a4dcd298bf

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.mapper.NxManagerMapper">
</mapper>

@ -469,204 +469,419 @@ public class OrganizeController extends SuperController<OrganizeService, Organiz
if (organizeService.isExistByFullName(entity, false, false)) {
return ActionResult.fail("公司名称不能重复");
}
boolean areEqual = organizeCrForm.getCode().equals("000000");
if (areEqual==false) {
boolean areEqual = organizeCrForm.getCode().equals("000000");
if (areEqual == false) {
return ActionResult.fail("验证码必须为000000");
}
// if (organizeService.isExistByEnCode(entity.getEnCode(), entity.getId())) {
// return ActionResult.fail("公司编码不能重复");
// }
// 通过组织id获取父级组织
String organizeIdTree = getOrganizeIdTree(entity);
entity.setOrganizeIdTree(organizeIdTree);
organizeService.create(entity);
//申请入住新建组织自动添加用户
UserCrForm userCrForm =new UserCrForm();
userCrForm.setRealName(entity.getFullName()); //商户名称变为用户名称
userCrForm.setAccount(organizeCrForm.getPropertyJson().getManagerTelePhone()); //Json手机号为账户
userCrForm.setGender(3); //默认保密
userCrForm.setOrganizeId(entity.id);
userCrForm.setEnabledMark(1);
userCrForm.setIsAdministrator(1); //新增租户变成管理员
userCrForm.setMobilePhone(organizeCrForm.getPropertyJson().getManagerTelePhone());
UserEntity userEntity = JsonUtil.getJsonToBean(userCrForm, UserEntity.class);
userEntity.setPassword("4a7d1ed414474e4033ac29ccb8653d9b");
if (userService.isExistByAccount(userCrForm.getAccount())) {
return ActionResult.fail("账户名称不能重复");
}
userService.create(userEntity);
//申请入住赋予分级权限
// ActionResult<OrganizeAdministratorSelectedVO> vo = new ActionResult<OrganizeAdministratorSelectedVO>();
OrganizeAdministratorSelectedVO vo = new OrganizeAdministratorSelectedVO();
vo= organizeAdministratorController.getSelectors(userEntity.id);
OrganizeAdministratorSelectorVO vo1 = vo.getOrgAdminList().get(0);
OrganizeAdministratorCrModel organizeAdministratorCrModel=new OrganizeAdministratorCrModel();
List<OrganizeAdministratorCrModel> organizeAdministratorCrModelList=new ArrayList<>();
organizeAdministratorCrModelList.add(organizeAdministratorCrModel);
OrganizeAdminIsTratorCrForm organizeAdminIsTratorCrForm =new OrganizeAdminIsTratorCrForm();
organizeAdminIsTratorCrForm.setModuleIds(vo.getModuleIds());
organizeAdminIsTratorCrForm.setSystemIds(vo.getSystemIds());
organizeAdminIsTratorCrForm.setUserId(userEntity.id);
organizeAdminIsTratorCrForm.setOrgAdminModelCheck(vo.getOrgAdminList());
if (organizeCrForm.getEnabledMark() == 1) {
// 通过组织id获取父级组织
String organizeIdTree = getOrganizeIdTree(entity);
entity.setOrganizeIdTree(organizeIdTree);
organizeService.create(entity);
//申请入住新建组织自动添加用户
UserCrForm userCrForm = new UserCrForm();
userCrForm.setRealName(entity.getFullName()); //商户名称变为用户名称
userCrForm.setAccount(organizeCrForm.getPropertyJson().getManagerTelePhone()); //Json手机号为账户
userCrForm.setGender(3); //默认保密
userCrForm.setOrganizeId(entity.id);
userCrForm.setEnabledMark(1);
userCrForm.setIsAdministrator(1); //新增租户变成管理员
userCrForm.setMobilePhone(organizeCrForm.getPropertyJson().getManagerTelePhone());
UserEntity userEntity = JsonUtil.getJsonToBean(userCrForm, UserEntity.class);
userEntity.setPassword("4a7d1ed414474e4033ac29ccb8653d9b");
if (userService.isExistByAccount(userCrForm.getAccount())) {
return ActionResult.fail("账户名称不能重复");
}
userService.create(userEntity);
//申请入住赋予分级权限
OrganizeAdministratorSelectedVO vo = new OrganizeAdministratorSelectedVO();
vo = organizeAdministratorController.getSelectors(userEntity.id);
OrganizeAdministratorSelectorVO vo1 = vo.getOrgAdminList().get(0);
OrganizeAdministratorCrModel organizeAdministratorCrModel = new OrganizeAdministratorCrModel();
List<OrganizeAdministratorCrModel> organizeAdministratorCrModelList = new ArrayList<>();
organizeAdministratorCrModelList.add(organizeAdministratorCrModel);
OrganizeAdminIsTratorCrForm organizeAdminIsTratorCrForm = new OrganizeAdminIsTratorCrForm();
organizeAdminIsTratorCrForm.setModuleIds(vo.getModuleIds());
// organizeAdminIsTratorCrForm.setSystemIds(vo.getSystemIds());
organizeAdminIsTratorCrForm.setUserId(userEntity.id);
organizeAdminIsTratorCrForm.setOrgAdminModelCheck(vo.getOrgAdminList());
// organizeAdministratorController.saveCheck(organizeAdminIsTratorCrForm);
String userId = organizeAdminIsTratorCrForm.getUserId();
List<OrganizeAdministratorSelectorVO> list = new ArrayList<>(16);
// 递归得到所有的数组
getOrganizeAdminIsTratorModelCheck(list, organizeAdminIsTratorCrForm.getOrgAdminModelCheck());
List<OrganizeAdministratorEntity> jsonToList = JsonUtil.getJsonToList(list, OrganizeAdministratorEntity.class);
// 处理应用
List<String> systemIds = organizeAdminIsTratorCrForm.getSystemIds();
systemIds.forEach(t -> {
OrganizeAdministratorEntity organizeAdministratorEntity = new OrganizeAdministratorEntity();
organizeAdministratorEntity.setOrganizeType(jnpf.constant.PermissionConst.SYSTEM);
organizeAdministratorEntity.setOrganizeId(t);
organizeAdministratorEntity.setThisLayerSelect(1);
jsonToList.add(organizeAdministratorEntity);
});
// 处理菜单
List<String> moduleIds = organizeAdminIsTratorCrForm.getModuleIds();
moduleIds.forEach(t -> {
OrganizeAdministratorEntity organizeAdministratorEntity = new OrganizeAdministratorEntity();
organizeAdministratorEntity.setOrganizeType(jnpf.constant.PermissionConst.MODULE);
organizeAdministratorEntity.setOrganizeId(t);
organizeAdministratorEntity.setThisLayerSelect(1);
jsonToList.add(organizeAdministratorEntity);
});
organizeAdminIsTratorService.createList(jsonToList, userId);
//查询组织id和人员
QueryWrapper<OrganizeAdministratorEntity> administratorQueryWrapper = new QueryWrapper<>();
administratorQueryWrapper.lambda().eq(OrganizeAdministratorEntity::getUserId,userEntity.id);
administratorQueryWrapper.lambda().eq(OrganizeAdministratorEntity::getOrganizeId,entity.id);
administratorQueryWrapper.lambda().eq(OrganizeAdministratorEntity::getThisLayerAdd,0);
administratorQueryWrapper.lambda().select(OrganizeAdministratorEntity::getId);
//替代前台传值,显示组织权限
List<String> organizeAdminIsTratorList = organizeAdminIsTratorService.listObjs(administratorQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
if (organizeAdminIsTratorList.size()>0){
List<OrganizeAdministratorEntity> organizeAdministratorEntityList = organizeAdminIsTratorService.listByIds(organizeAdminIsTratorList);
for (OrganizeAdministratorEntity oEntity: organizeAdministratorEntityList) {
oEntity.setThisLayerAdd(1);
oEntity.setThisLayerEdit(1);
oEntity.setThisLayerDelete(1);
oEntity.setSubLayerAdd(1);
oEntity.setSubLayerEdit(1);
oEntity.setSubLayerDelete(1);
oEntity.setThisLayerSelect(1);
oEntity.setSubLayerSelect(1);
String userId = organizeAdminIsTratorCrForm.getUserId();
List<OrganizeAdministratorSelectorVO> list = new ArrayList<>(16);
// 递归得到所有的数组
getOrganizeAdminIsTratorModelCheck(list, organizeAdminIsTratorCrForm.getOrgAdminModelCheck());
List<OrganizeAdministratorEntity> jsonToList = JsonUtil.getJsonToList(list, OrganizeAdministratorEntity.class);
// 处理应用
// List<String> systemIds = organizeAdminIsTratorCrForm.getSystemIds();
// systemIds.forEach(t -> {
// OrganizeAdministratorEntity organizeAdministratorEntity = new OrganizeAdministratorEntity();
// organizeAdministratorEntity.setOrganizeType(jnpf.constant.PermissionConst.SYSTEM);
// organizeAdministratorEntity.setOrganizeId(t);
// organizeAdministratorEntity.setThisLayerSelect(1);
// jsonToList.add(organizeAdministratorEntity);
// });
// 处理菜单
List<String> moduleIds = organizeAdminIsTratorCrForm.getModuleIds();
moduleIds.forEach(t -> {
OrganizeAdministratorEntity organizeAdministratorEntity = new OrganizeAdministratorEntity();
organizeAdministratorEntity.setOrganizeType(jnpf.constant.PermissionConst.MODULE);
organizeAdministratorEntity.setOrganizeId(t);
organizeAdministratorEntity.setThisLayerSelect(1);
jsonToList.add(organizeAdministratorEntity);
});
organizeAdminIsTratorService.createList(jsonToList, userId);
//查询组织id和人员
QueryWrapper<OrganizeAdministratorEntity> administratorQueryWrapper = new QueryWrapper<>();
administratorQueryWrapper.lambda().eq(OrganizeAdministratorEntity::getUserId, userEntity.id);
administratorQueryWrapper.lambda().eq(OrganizeAdministratorEntity::getOrganizeId, entity.id);
administratorQueryWrapper.lambda().eq(OrganizeAdministratorEntity::getThisLayerAdd, 0);
administratorQueryWrapper.lambda().select(OrganizeAdministratorEntity::getId);
//替代前台传值,显示组织权限
List<String> organizeAdminIsTratorList = organizeAdminIsTratorService.listObjs(administratorQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
if (organizeAdminIsTratorList.size() > 0) {
List<OrganizeAdministratorEntity> organizeAdministratorEntityList = organizeAdminIsTratorService.listByIds(organizeAdminIsTratorList);
for (OrganizeAdministratorEntity oEntity : organizeAdministratorEntityList) {
oEntity.setThisLayerAdd(1);
oEntity.setThisLayerEdit(1);
oEntity.setThisLayerDelete(1);
oEntity.setSubLayerAdd(1);
oEntity.setSubLayerEdit(1);
oEntity.setSubLayerDelete(1);
oEntity.setThisLayerSelect(1);
oEntity.setSubLayerSelect(1);
}
organizeAdminIsTratorService.updateBatchById(organizeAdministratorEntityList);
}
organizeAdminIsTratorService.updateBatchById(organizeAdministratorEntityList);
}
//添加权限
PermissionGroupModel model =new PermissionGroupModel();
//公司名称为权限名称
model.setFullName(organizeCrForm.getFullName()+"权限");
model.setEnCode(organizeCrForm.getPropertyJson().getManagerTelePhone()+"Code");//Json手机号为编码
model.setSortCode(0L);
model.setEnabledMark(1);
PermissionGroupEntity permissionGroupEntity = JsonUtil.getJsonToBean(model, PermissionGroupEntity.class);
if (permissionGroupService.isExistByFullName(permissionGroupEntity.getId(), permissionGroupEntity)) {
return ActionResult.fail(MsgCode.EXIST001.get());
}
if (permissionGroupService.isExistByEnCode(permissionGroupEntity.getId(), permissionGroupEntity)) {
return ActionResult.fail(MsgCode.EXIST002.get());
}
permissionGroupService.create(permissionGroupEntity);
//添加权限
PermissionGroupModel model = new PermissionGroupModel();
//公司名称为权限名称
model.setFullName(organizeCrForm.getFullName() + "权限");
model.setEnCode(organizeCrForm.getPropertyJson().getManagerTelePhone() + "Code");//Json手机号为编码
model.setSortCode(0L);
model.setEnabledMark(1);
PermissionGroupEntity permissionGroupEntity = JsonUtil.getJsonToBean(model, PermissionGroupEntity.class);
if (permissionGroupService.isExistByFullName(permissionGroupEntity.getId(), permissionGroupEntity)) {
return ActionResult.fail(MsgCode.EXIST001.get());
}
if (permissionGroupService.isExistByEnCode(permissionGroupEntity.getId(), permissionGroupEntity)) {
return ActionResult.fail(MsgCode.EXIST002.get());
}
permissionGroupService.create(permissionGroupEntity);
//权限赋予成员
PermissionGroupEntity permissionGroupEntity1 = permissionGroupService.info(permissionGroupEntity.id);
String permissionId = permissionGroupEntity.id;
if (entity == null) {
return ActionResult.fail(MsgCode.FA003.get());
}
UserIdModel userIdModel =new UserIdModel();
StringJoiner stringJoiner = new StringJoiner(",");
userIdModel.setIds(entity.id+"--company");
List<String> userIdUserIdModel = userIdModel.getIds();
userIdUserIdModel.forEach(t -> {
stringJoiner.add(t);
});
permissionGroupEntity1.setPermissionMember(stringJoiner.toString());
// 修改前的用户
List<String> member = permissionGroupService.list(Collections.singletonList(permissionId))
.stream().filter(t -> StringUtil.isNotEmpty(t.getPermissionMember())).map(PermissionGroupEntity::getPermissionMember).collect(Collectors.toList());
// 新的用户
member.addAll(userIdUserIdModel);
member = member.stream().distinct().collect(Collectors.toList());
List<String> userIdList = userService.getUserIdList(member, null);
permissionGroupService.update(permissionId, permissionGroupEntity1);
userService.delCurUser(userIdList.stream().toArray(String[]::new));
//查询所有的菜单
DataValuesQuery dataValuesQuery=new DataValuesQuery();
dataValuesQuery.setType("system");
AuthorizeVO authorizeVO = authorizeController.getValuesDatas(permissionId,dataValuesQuery);
//给业务平台id
List<String> systemBaeModelList =new ArrayList<>();
for (SystemBaeModel systemBaeModel:authorizeVO.getSystemList()){
systemBaeModelList.add(systemBaeModel.getId());
}
//给菜单id
List<String> moduleModelList =new ArrayList<>();
for (ModuleModel moduleModel:authorizeVO.getModuleList()){
moduleModelList.add(moduleModel.getId());
}
//给按钮id
List<String> buttonModelList =new ArrayList<>();
for (ButtonModel buttonModel:authorizeVO.getButtonList()){
buttonModelList.add(buttonModel.getId());
}
//给权限id
List<String> resourceModelList =new ArrayList<>();
for (ResourceModel resourceModel:authorizeVO.getResourceList()){
resourceModelList.add(resourceModel.getId());
}
//权限赋予成员
PermissionGroupEntity permissionGroupEntity1 = permissionGroupService.info(permissionGroupEntity.id);
String permissionId = permissionGroupEntity.id;
if (entity == null) {
return ActionResult.fail(MsgCode.FA003.get());
}
UserIdModel userIdModel = new UserIdModel();
StringJoiner stringJoiner = new StringJoiner(",");
userIdModel.setIds(entity.id + "--company");
List<String> userIdUserIdModel = userIdModel.getIds();
userIdUserIdModel.forEach(t -> {
stringJoiner.add(t);
});
permissionGroupEntity1.setPermissionMember(stringJoiner.toString());
// 修改前的用户
List<String> member = permissionGroupService.list(Collections.singletonList(permissionId))
.stream().filter(t -> StringUtil.isNotEmpty(t.getPermissionMember())).map(PermissionGroupEntity::getPermissionMember).collect(Collectors.toList());
// 新的用户
member.addAll(userIdUserIdModel);
member = member.stream().distinct().collect(Collectors.toList());
List<String> userIdList = userService.getUserIdList(member, null);
permissionGroupService.update(permissionId, permissionGroupEntity1);
userService.delCurUser(userIdList.stream().toArray(String[]::new));
//查询所有的菜单
DataValuesQuery dataValuesQuery = new DataValuesQuery();
dataValuesQuery.setType("system");
AuthorizeVO authorizeVO = authorizeController.getValuesDatas(permissionId, dataValuesQuery);
//给业务平台id
List<String> systemBaeModelList = new ArrayList<>();
for (SystemBaeModel systemBaeModel : authorizeVO.getSystemList()) {
systemBaeModelList.add(systemBaeModel.getId());
}
//给菜单id
List<String> moduleModelList = new ArrayList<>();
for (ModuleModel moduleModel : authorizeVO.getModuleList()) {
// moduleModelList.add(moduleModel.getId());
if (moduleModel.getId().equals("549936226388435525")==true){
moduleModelList.add(moduleModel.getId());
}else if (moduleModel.getId().equals("539722444282269573")==true){
moduleModelList.add(moduleModel.getId());
}else if (moduleModel.getId().equals("539722119542476677")==true){
moduleModelList.add(moduleModel.getId());
}
// else if (moduleModel.getId().equals("539724075967188869")==true){
// moduleModelList.add(moduleModel.getId());
// }
}
//给按钮id
List<String> buttonModelList = new ArrayList<>();
for (ButtonModel buttonModel : authorizeVO.getButtonList()) {
// buttonModelList.add(buttonModel.getId());
if (buttonModel.getId().equals("549936226388435525")==true){
buttonModelList.add(buttonModel.getId());
}else if (buttonModel.getId().equals("539722444282269573")==true){
buttonModelList.add(buttonModel.getId());
}else if (buttonModel.getId().equals("539722119542476677")==true){
buttonModelList.add(buttonModel.getId());
}
}
//给权限id
List<String> resourceModelList = new ArrayList<>();
for (ResourceModel resourceModel : authorizeVO.getResourceList()) {
// resourceModelList.add(resourceModel.getId());
if (resourceModel.getId().equals("549937669757493829")==true){
resourceModelList.add(resourceModel.getId());
}
}
for (ResourceModel resourceModel:authorizeVO.getResourceList()){
QueryWrapper<ModuleEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(ModuleEntity::getId,resourceModel.getModuleId());
List<ModuleEntity> moduleEntityList= moduleService.list(queryWrapper);
if (moduleEntityList.size()>0){
resourceModelList.add(moduleEntityList.get(0).getId());
QueryWrapper<ModuleEntity> queryWrapper1=new QueryWrapper<>();
queryWrapper1.lambda().eq(ModuleEntity::getId,moduleEntityList.get(0).getParentId());
List<ModuleEntity> moduleEntityList1= moduleService.list(queryWrapper1);
if (moduleEntityList1.size()>0){
resourceModelList.add(moduleEntityList1.get(0).getId());
for (ResourceModel resourceModel : authorizeVO.getResourceList()) {
QueryWrapper<ModuleEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ModuleEntity::getId, resourceModel.getModuleId());
List<ModuleEntity> moduleEntityList = moduleService.list(queryWrapper);
if (moduleEntityList.size() > 0) {
// resourceModelList.add(moduleEntityList.get(0).getId());
QueryWrapper<ModuleEntity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(ModuleEntity::getId, moduleEntityList.get(0).getParentId());
List<ModuleEntity> moduleEntityList1 = moduleService.list(queryWrapper1);
if (moduleEntityList1.size() > 0) {
// resourceModelList.add(moduleEntityList1.get(0).getId());
if (moduleEntityList1.get(0).getId().equals("549936226388435525")==true){
resourceModelList.add(moduleEntityList1.get(0).getId());
}else if (moduleEntityList1.get(0).getId().equals("539722444282269573")==true){
resourceModelList.add(moduleEntityList1.get(0).getId());
}else if (moduleEntityList1.get(0).getId().equals("539722119542476677")==true){
resourceModelList.add(moduleEntityList1.get(0).getId());
}
}
}
}
}
//去重菜单id
List<String> newList = new ArrayList<>();
for (String id : resourceModelList) {
if (!newList.contains(id)){
newList.add(id);
//去重菜单id
List<String> newList = new ArrayList<>();
for (String id : resourceModelList) {
if (!newList.contains(id)) {
newList.add(id);
}
}
}
//string转为 String[]
String[] arraySystem = systemBaeModelList.toArray(new String[0]);
String[] arrayModuleList = moduleModelList.toArray(new String[0]);
String[] arrayButtonList = buttonModelList.toArray(new String[0]);
String[] arrayResourceList = newList.toArray(new String[0]);
//赋值
AuthorizeDataUpForm authorizeDataUpForm = new AuthorizeDataUpForm();
authorizeDataUpForm.setSystemIds(arraySystem);
authorizeDataUpForm.setModule(arrayModuleList);
authorizeDataUpForm.setButton(arrayButtonList);
authorizeDataUpForm.setResource(arrayResourceList);
//添加权限
authorizeService.save(permissionId, authorizeDataUpForm);
// String[] arraySystem1 = authorizeVO.getSystemList().toArray(new String[0]);
//取消租户的管理员
UserEntity userEntityAdmin = new UserEntity();
userEntityAdmin.setIsAdministrator(0);
userService.update(userEntity.id, userEntity);
return ActionResult.success(MsgCode.SU001.get());
} else if (organizeCrForm.getEnabledMark() == 2) {
// 通过组织id获取父级组织
String organizeIdTree = getOrganizeIdTree(entity);
entity.setOrganizeIdTree(organizeIdTree);
organizeService.create(entity);
//申请入住新建组织自动添加用户
UserCrForm userCrForm = new UserCrForm();
userCrForm.setRealName(entity.getFullName()); //商户名称变为用户名称
userCrForm.setAccount(organizeCrForm.getPropertyJson().getManagerTelePhone()); //Json手机号为账户
userCrForm.setGender(3); //默认保密
userCrForm.setOrganizeId(entity.id);
userCrForm.setEnabledMark(1);
userCrForm.setIsAdministrator(1); //新增租户变成管理员
userCrForm.setMobilePhone(organizeCrForm.getPropertyJson().getManagerTelePhone());
UserEntity userEntity = JsonUtil.getJsonToBean(userCrForm, UserEntity.class);
userEntity.setPassword("4a7d1ed414474e4033ac29ccb8653d9b");
if (userService.isExistByAccount(userCrForm.getAccount())) {
return ActionResult.fail("账户名称不能重复");
}
userService.create(userEntity);
//申请入住赋予分级权限
// ActionResult<OrganizeAdministratorSelectedVO> vo = new ActionResult<OrganizeAdministratorSelectedVO>();
OrganizeAdministratorSelectedVO vo = new OrganizeAdministratorSelectedVO();
vo = organizeAdministratorController.getSelectors(userEntity.id);
OrganizeAdministratorSelectorVO vo1 = vo.getOrgAdminList().get(0);
OrganizeAdministratorCrModel organizeAdministratorCrModel = new OrganizeAdministratorCrModel();
List<OrganizeAdministratorCrModel> organizeAdministratorCrModelList = new ArrayList<>();
organizeAdministratorCrModelList.add(organizeAdministratorCrModel);
OrganizeAdminIsTratorCrForm organizeAdminIsTratorCrForm = new OrganizeAdminIsTratorCrForm();
organizeAdminIsTratorCrForm.setModuleIds(vo.getModuleIds());
organizeAdminIsTratorCrForm.setSystemIds(vo.getSystemIds());
organizeAdminIsTratorCrForm.setUserId(userEntity.id);
organizeAdminIsTratorCrForm.setOrgAdminModelCheck(vo.getOrgAdminList());
// organizeAdministratorController.saveCheck(organizeAdminIsTratorCrForm);
String userId = organizeAdminIsTratorCrForm.getUserId();
List<OrganizeAdministratorSelectorVO> list = new ArrayList<>(16);
// 递归得到所有的数组
getOrganizeAdminIsTratorModelCheck(list, organizeAdminIsTratorCrForm.getOrgAdminModelCheck());
List<OrganizeAdministratorEntity> jsonToList = JsonUtil.getJsonToList(list, OrganizeAdministratorEntity.class);
// 处理应用
List<String> systemIds = organizeAdminIsTratorCrForm.getSystemIds();
systemIds.forEach(t -> {
OrganizeAdministratorEntity organizeAdministratorEntity = new OrganizeAdministratorEntity();
organizeAdministratorEntity.setOrganizeType(jnpf.constant.PermissionConst.SYSTEM);
organizeAdministratorEntity.setOrganizeId(t);
organizeAdministratorEntity.setThisLayerSelect(1);
jsonToList.add(organizeAdministratorEntity);
});
// 处理菜单
List<String> moduleIds = organizeAdminIsTratorCrForm.getModuleIds();
moduleIds.forEach(t -> {
OrganizeAdministratorEntity organizeAdministratorEntity = new OrganizeAdministratorEntity();
organizeAdministratorEntity.setOrganizeType(jnpf.constant.PermissionConst.MODULE);
organizeAdministratorEntity.setOrganizeId(t);
organizeAdministratorEntity.setThisLayerSelect(1);
jsonToList.add(organizeAdministratorEntity);
});
organizeAdminIsTratorService.createList(jsonToList, userId);
//查询组织id和人员
QueryWrapper<OrganizeAdministratorEntity> administratorQueryWrapper = new QueryWrapper<>();
administratorQueryWrapper.lambda().eq(OrganizeAdministratorEntity::getUserId, userEntity.id);
administratorQueryWrapper.lambda().eq(OrganizeAdministratorEntity::getOrganizeId, entity.id);
administratorQueryWrapper.lambda().eq(OrganizeAdministratorEntity::getThisLayerAdd, 0);
administratorQueryWrapper.lambda().select(OrganizeAdministratorEntity::getId);
//替代前台传值,显示组织权限
List<String> organizeAdminIsTratorList = organizeAdminIsTratorService.listObjs(administratorQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList());
if (organizeAdminIsTratorList.size() > 0) {
List<OrganizeAdministratorEntity> organizeAdministratorEntityList = organizeAdminIsTratorService.listByIds(organizeAdminIsTratorList);
for (OrganizeAdministratorEntity oEntity : organizeAdministratorEntityList) {
oEntity.setThisLayerAdd(1);
oEntity.setThisLayerEdit(1);
oEntity.setThisLayerDelete(1);
oEntity.setSubLayerAdd(1);
oEntity.setSubLayerEdit(1);
oEntity.setSubLayerDelete(1);
oEntity.setThisLayerSelect(1);
oEntity.setSubLayerSelect(1);
}
organizeAdminIsTratorService.updateBatchById(organizeAdministratorEntityList);
}
//添加权限
PermissionGroupModel model = new PermissionGroupModel();
//公司名称为权限名称
model.setFullName(organizeCrForm.getFullName() + "权限");
model.setEnCode(organizeCrForm.getPropertyJson().getManagerTelePhone() + "Code");//Json手机号为编码
model.setSortCode(0L);
model.setEnabledMark(1);
PermissionGroupEntity permissionGroupEntity = JsonUtil.getJsonToBean(model, PermissionGroupEntity.class);
if (permissionGroupService.isExistByFullName(permissionGroupEntity.getId(), permissionGroupEntity)) {
return ActionResult.fail(MsgCode.EXIST001.get());
}
if (permissionGroupService.isExistByEnCode(permissionGroupEntity.getId(), permissionGroupEntity)) {
return ActionResult.fail(MsgCode.EXIST002.get());
}
permissionGroupService.create(permissionGroupEntity);
//string转为 String[]
String[] arraySystem = systemBaeModelList.toArray(new String[0]);
String[] arrayModuleList = moduleModelList.toArray(new String[0]);
String[] arrayButtonList = buttonModelList.toArray(new String[0]);
String[] arrayResourceList = newList.toArray(new String[0]);
//赋值
AuthorizeDataUpForm authorizeDataUpForm =new AuthorizeDataUpForm();
authorizeDataUpForm.setSystemIds(arraySystem);
authorizeDataUpForm.setModule(arrayModuleList);
authorizeDataUpForm.setButton(arrayButtonList);
authorizeDataUpForm.setResource(arrayResourceList);
//添加权限
authorizeService.save(permissionId, authorizeDataUpForm);
// String[] arraySystem1 = authorizeVO.getSystemList().toArray(new String[0]);
//权限赋予成员
PermissionGroupEntity permissionGroupEntity1 = permissionGroupService.info(permissionGroupEntity.id);
String permissionId = permissionGroupEntity.id;
if (entity == null) {
return ActionResult.fail(MsgCode.FA003.get());
}
UserIdModel userIdModel = new UserIdModel();
StringJoiner stringJoiner = new StringJoiner(",");
userIdModel.setIds(entity.id + "--company");
List<String> userIdUserIdModel = userIdModel.getIds();
userIdUserIdModel.forEach(t -> {
stringJoiner.add(t);
});
permissionGroupEntity1.setPermissionMember(stringJoiner.toString());
// 修改前的用户
List<String> member = permissionGroupService.list(Collections.singletonList(permissionId))
.stream().filter(t -> StringUtil.isNotEmpty(t.getPermissionMember())).map(PermissionGroupEntity::getPermissionMember).collect(Collectors.toList());
// 新的用户
member.addAll(userIdUserIdModel);
member = member.stream().distinct().collect(Collectors.toList());
List<String> userIdList = userService.getUserIdList(member, null);
permissionGroupService.update(permissionId, permissionGroupEntity1);
userService.delCurUser(userIdList.stream().toArray(String[]::new));
//查询所有的菜单
DataValuesQuery dataValuesQuery = new DataValuesQuery();
dataValuesQuery.setType("system");
AuthorizeVO authorizeVO = authorizeController.getValuesDatas(permissionId, dataValuesQuery);
//给业务平台id
List<String> systemBaeModelList = new ArrayList<>();
for (SystemBaeModel systemBaeModel : authorizeVO.getSystemList()) {
systemBaeModelList.add(systemBaeModel.getId());
}
//给菜单id
List<String> moduleModelList = new ArrayList<>();
for (ModuleModel moduleModel : authorizeVO.getModuleList()) {
moduleModelList.add(moduleModel.getId());
}
//给按钮id
List<String> buttonModelList = new ArrayList<>();
for (ButtonModel buttonModel : authorizeVO.getButtonList()) {
buttonModelList.add(buttonModel.getId());
}
//给权限id
List<String> resourceModelList = new ArrayList<>();
for (ResourceModel resourceModel : authorizeVO.getResourceList()) {
resourceModelList.add(resourceModel.getId());
}
//取消租户的管理员
UserEntity userEntityAdmin =new UserEntity();
userEntityAdmin.setIsAdministrator(0);
userService.update(userEntity.id,userEntity);
for (ResourceModel resourceModel : authorizeVO.getResourceList()) {
QueryWrapper<ModuleEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ModuleEntity::getId, resourceModel.getModuleId());
List<ModuleEntity> moduleEntityList = moduleService.list(queryWrapper);
if (moduleEntityList.size() > 0) {
resourceModelList.add(moduleEntityList.get(0).getId());
QueryWrapper<ModuleEntity> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.lambda().eq(ModuleEntity::getId, moduleEntityList.get(0).getParentId());
List<ModuleEntity> moduleEntityList1 = moduleService.list(queryWrapper1);
if (moduleEntityList1.size() > 0) {
resourceModelList.add(moduleEntityList1.get(0).getId());
}
}
}
//去重菜单id
List<String> newList = new ArrayList<>();
for (String id : resourceModelList) {
if (!newList.contains(id)) {
newList.add(id);
}
}
//string转为 String[]
String[] arraySystem = systemBaeModelList.toArray(new String[0]);
String[] arrayModuleList = moduleModelList.toArray(new String[0]);
String[] arrayButtonList = buttonModelList.toArray(new String[0]);
String[] arrayResourceList = newList.toArray(new String[0]);
//赋值
AuthorizeDataUpForm authorizeDataUpForm = new AuthorizeDataUpForm();
authorizeDataUpForm.setSystemIds(arraySystem);
authorizeDataUpForm.setModule(arrayModuleList);
authorizeDataUpForm.setButton(arrayButtonList);
authorizeDataUpForm.setResource(arrayResourceList);
//添加权限
authorizeService.save(permissionId, authorizeDataUpForm);
// String[] arraySystem1 = authorizeVO.getSystemList().toArray(new String[0]);
//取消租户的管理员
UserEntity userEntityAdmin = new UserEntity();
userEntityAdmin.setIsAdministrator(0);
userService.update(userEntity.id, userEntity);
return ActionResult.success(MsgCode.SU001.get());
}
return ActionResult.success(MsgCode.SU001.get());
}

@ -89,4 +89,10 @@ public class OrganizeEntity extends PermissionEntityBase{
*/
@TableField("FUND")
private BigDecimal fund;
/**
* (1/2-)
*/
@TableField("MERCHANT_TYPE")
private Integer merchantType;
}

@ -39,4 +39,7 @@ public class OrganizeCrForm {
private Object pictures;
private String code;
private BigDecimal fund;
@NotNull(message = "商户类型不能为空")
private Integer merchantType;
}

@ -0,0 +1,16 @@
package jnpf.mapper;
import jnpf.entity.NxManagerEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* nxManager
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-04-16
*/
public interface NxManagerMapper extends BaseMapper<NxManagerEntity> {
}

@ -0,0 +1,35 @@
package jnpf.service;
import jnpf.model.nxmanager.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* nxManager
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-04-16
*/
public interface NxManagerService extends IService<NxManagerEntity> {
List<NxManagerEntity> getList(NxManagerPagination nxManagerPagination);
List<NxManagerEntity> getTypeList(NxManagerPagination nxManagerPagination,String dataType);
NxManagerEntity getInfo(String id);
void delete(NxManagerEntity entity);
void create(NxManagerEntity entity);
boolean update(String id, NxManagerEntity entity);
//子表方法
//副表数据方法
String checkForm(NxManagerForm form,int i);
void saveOrUpdate(NxManagerForm nxManagerForm,String id, boolean isSave) throws Exception;
}

@ -0,0 +1,332 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.NxManagerMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.nxmanager.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* nxManager
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-04-16
*/
@Service
public class NxManagerServiceImpl extends ServiceImpl<NxManagerMapper, NxManagerEntity> implements NxManagerService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Override
public List<NxManagerEntity> getList(NxManagerPagination nxManagerPagination){
return getTypeList(nxManagerPagination,nxManagerPagination.getDataType());
}
/** 列表查询 */
@Override
public List<NxManagerEntity> getTypeList(NxManagerPagination nxManagerPagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? NxManagerConstant.getAppColumnData() : NxManagerConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int nxManagerNum =0;
QueryWrapper<NxManagerEntity> nxManagerQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(nxManagerPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = nxManagerPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<NxManagerEntity> nxManagerSuperWrapper = new QueryWrapper<>();
nxManagerSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(nxManagerSuperWrapper,NxManagerEntity.class,queryJson,"0"));
int nxManagerNum1 = nxManagerSuperWrapper.getExpression().getNormal().size();
if (nxManagerNum1>0){
List<String> nxManagerList =this.list(nxManagerSuperWrapper).stream().map(NxManagerEntity::getId).collect(Collectors.toList());
allSuperList.addAll(nxManagerList);
intersectionSuperList.add(nxManagerList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if(superOp.equalsIgnoreCase("and")){
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)){
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<NxManagerEntity> nxManagerSuperWrapper = new QueryWrapper<>();
nxManagerSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(nxManagerSuperWrapper,NxManagerEntity.class,ruleJson,"0"));
int nxManagerNum1 = nxManagerSuperWrapper.getExpression().getNormal().size();
if (nxManagerNum1>0){
List<String> nxManagerList =this.list(nxManagerSuperWrapper).stream().map(NxManagerEntity::getId).collect(Collectors.toList());
allRuleList.addAll(nxManagerList);
intersectionRuleList.add(nxManagerList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if(ruleOp.equalsIgnoreCase("and")){
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object nxManagerObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxManagerQueryWrapper,NxManagerEntity.class,nxManagerPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(nxManagerObj)){
return new ArrayList<>();
} else {
nxManagerQueryWrapper = (QueryWrapper<NxManagerEntity>)nxManagerObj;
if( nxManagerQueryWrapper.getExpression().getNormal().size()>0){
nxManagerNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object nxManagerObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(nxManagerQueryWrapper,NxManagerEntity.class,nxManagerPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(nxManagerObj)){
return new ArrayList<>();
} else {
nxManagerQueryWrapper = (QueryWrapper<NxManagerEntity>)nxManagerObj;
if( nxManagerQueryWrapper.getExpression().getNormal().size()>0){
nxManagerNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(nxManagerPagination.getName())){
nxManagerNum++;
String value = nxManagerPagination.getName() instanceof List ?
JsonUtil.getObjectToString(nxManagerPagination.getName()) :
String.valueOf(nxManagerPagination.getName());
nxManagerQueryWrapper.lambda().like(NxManagerEntity::getName,value);
}
if(ObjectUtil.isNotEmpty(nxManagerPagination.getDepartment())){
nxManagerNum++;
String value = nxManagerPagination.getDepartment() instanceof List ?
JsonUtil.getObjectToString(nxManagerPagination.getDepartment()) :
String.valueOf(nxManagerPagination.getDepartment());
nxManagerQueryWrapper.lambda().like(NxManagerEntity::getDepartment,value);
}
if(ObjectUtil.isNotEmpty(nxManagerPagination.getMobilePhone())){
nxManagerNum++;
String value = nxManagerPagination.getMobilePhone() instanceof List ?
JsonUtil.getObjectToString(nxManagerPagination.getMobilePhone()) :
String.valueOf(nxManagerPagination.getMobilePhone());
nxManagerQueryWrapper.lambda().like(NxManagerEntity::getMobilePhone,value);
}
if(ObjectUtil.isNotEmpty(nxManagerPagination.getStatus())){
nxManagerNum++;
nxManagerQueryWrapper.lambda().eq(NxManagerEntity::getStatus,nxManagerPagination.getStatus());
}
if(ObjectUtil.isNotEmpty(nxManagerPagination.getCreatorTime())){
nxManagerNum++;
List CreatorTimeList = JsonUtil.getJsonToList(nxManagerPagination.getCreatorTime(),String.class);
Long fir = Long.valueOf(String.valueOf(CreatorTimeList.get(0)));
Long sec = Long.valueOf(String.valueOf(CreatorTimeList.get(1)));
nxManagerQueryWrapper.lambda().ge(NxManagerEntity::getCreatorTime, new Date(fir))
.le(NxManagerEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
intersection.add("jnpfNullList");
}
nxManagerQueryWrapper.lambda().in(NxManagerEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
nxManagerQueryWrapper.lambda().and(t->t.in(NxManagerEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
nxManagerQueryWrapper.lambda().and(t->t.in(NxManagerEntity::getId, finalAllRuleIDlist));
}
//排序
if(StringUtil.isEmpty(nxManagerPagination.getSidx())){
nxManagerQueryWrapper.lambda().orderByDesc(NxManagerEntity::getId);
}else{
try {
String sidx = nxManagerPagination.getSidx();
String[] strs= sidx.split("_name");
NxManagerEntity nxManagerEntity = new NxManagerEntity();
Field declaredField = nxManagerEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
nxManagerQueryWrapper="asc".equals(nxManagerPagination.getSort().toLowerCase())?nxManagerQueryWrapper.orderByAsc(value):nxManagerQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<NxManagerEntity> page=new Page<>(nxManagerPagination.getCurrentPage(), nxManagerPagination.getPageSize());
IPage<NxManagerEntity> userIPage=this.page(page, nxManagerQueryWrapper);
return nxManagerPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<NxManagerEntity> list = new ArrayList();
return nxManagerPagination.setData(list, list.size());
}
}else{
return this.list(nxManagerQueryWrapper);
}
}
@Override
public NxManagerEntity getInfo(String id){
QueryWrapper<NxManagerEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(NxManagerEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(NxManagerEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, NxManagerEntity entity){
return this.updateById(entity);
}
@Override
public void delete(NxManagerEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(NxManagerForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
String countRecover = "";
if (isUp){
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getName())){
return "名称不能为空";
}
if(StringUtil.isEmpty(form.getDepartment())){
return "所属部门不能为空";
}
if(StringUtil.isEmpty(form.getDuties())){
return "职务不能为空";
}
if(StringUtil.isEmpty(form.getMobilePhone())){
return "手机不能为空";
}
if(StringUtil.isNotEmpty(form.getMobilePhone())){
if(!Pattern.compile("^1[3456789]\\d{9}$").matcher(String.valueOf(form.getMobilePhone())).matches()){
return "请输入正确的手机号码";
}
}
return countRecover;
}
/**
* ()
* @param id
* @param nxManagerForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(NxManagerForm nxManagerForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
nxManagerForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(NxManagerConstant.getFormData(),nxManagerForm),NxManagerForm.class);
NxManagerEntity entity = JsonUtil.getJsonToBean(nxManagerForm, NxManagerEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
entity.setId(mainId);
}else{
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setLastModifyTime(null);
entity.setLastModifyUserId(null);
}
this.saveOrUpdate(entity);
}
}

@ -0,0 +1,190 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.nxmanager.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional;
/**
* nxManager
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-04-16
*/
@Slf4j
@RestController
@Tag(name = "nxManager" , description = "scm")
@RequestMapping("/api/scm/NxManager")
public class NxManagerController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private NxManagerService nxManagerService;
/**
*
*
* @param nxManagerPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody NxManagerPagination nxManagerPagination)throws IOException{
List<NxManagerEntity> list= nxManagerService.getList(nxManagerPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (NxManagerEntity entity : list) {
Map<String, Object> nxManagerMap=JsonUtil.entityToMap(entity);
nxManagerMap.put("id", nxManagerMap.get("id"));
//副表数据
//子表数据
realList.add(nxManagerMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, NxManagerConstant.getFormData(), NxManagerConstant.getColumnData(), nxManagerPagination.getModuleId(),false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(nxManagerPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param nxManagerForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid NxManagerForm nxManagerForm) {
String b = nxManagerService.checkForm(nxManagerForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
try{
nxManagerService.saveOrUpdate(nxManagerForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
*
* @param id
* @param nxManagerForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid NxManagerForm nxManagerForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
nxManagerForm.setId(id);
if (!isImport) {
String b = nxManagerService.checkForm(nxManagerForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
}
NxManagerEntity entity= nxManagerService.getInfo(id);
if(entity!=null){
try{
nxManagerService.saveOrUpdate(nxManagerForm,id,false);
}catch(Exception e){
return ActionResult.fail("修改数据失败");
}
return ActionResult.success("更新成功");
}else{
return ActionResult.fail("更新失败,数据不存在");
}
}
/**
*
* @param id
* @return
*/
@Operation(summary = "删除")
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
NxManagerEntity entity= nxManagerService.getInfo(id);
if(entity!=null){
//主表数据删除
nxManagerService.delete(entity);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
NxManagerEntity entity= nxManagerService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> nxManagerMap=JsonUtil.entityToMap(entity);
nxManagerMap.put("id", nxManagerMap.get("id"));
//副表数据
//子表数据
nxManagerMap = generaterSwapUtil.swapDataDetail(nxManagerMap,NxManagerConstant.getFormData(),"549906462084718981",false);
return ActionResult.success(nxManagerMap);
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
NxManagerEntity entity= nxManagerService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> nxManagerMap=JsonUtil.entityToMap(entity);
nxManagerMap.put("id", nxManagerMap.get("id"));
//副表数据
//子表数据
nxManagerMap = generaterSwapUtil.swapDataForm(nxManagerMap,NxManagerConstant.getFormData(),NxManagerConstant.TABLEFIELDKEY,NxManagerConstant.TABLERENAMES);
return ActionResult.success(nxManagerMap);
}
}

@ -8,6 +8,7 @@ import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.permission.service.UserService;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
@ -75,11 +76,14 @@ public class NxPriceController {
private NxPriceProductService nxPriceProductService;
@Autowired
private NxPriceRecycleService nxPriceRecycleService;
@Autowired
private EnterpriserecyclestationService enterpriserecyclestationService;
@Autowired
private ConfigValueUtil configValueUtil;
@Autowired
private UserService userService;
/**
*
*
@ -112,6 +116,35 @@ public class NxPriceController {
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param
* @return
*/
@Operation(summary = "获取回收站列表")
@PostMapping("/getListRecycleStation")
public ActionResult listRecycleStation()throws IOException{
String userId=userProvider.get().getUserId();
QueryWrapper<UserEntity> userEntityQueryWrapper=new QueryWrapper<>();
userEntityQueryWrapper.lambda().eq(UserEntity::getId,userId);
List<UserEntity> userEntityList =userService.list(userEntityQueryWrapper);
PageListVO vo = new PageListVO();
if (userEntityList!=null&&userEntityList.size()>0){
userEntityList.get(0).getOrganizeId();
QueryWrapper<EnterpriserecyclestationEntity> enterpriserecyclestationQueryWrapper=new QueryWrapper<>();
enterpriserecyclestationQueryWrapper.lambda().eq(EnterpriserecyclestationEntity::getCompanyId,userEntityList.get(0).getOrganizeId());
List<EnterpriserecyclestationEntity> enterpriserecyclestationList=enterpriserecyclestationService.list(enterpriserecyclestationQueryWrapper);
vo.setList(enterpriserecyclestationList);
// PaginationVO page = JsonUtil.getJsonToBean(nxPricePagination, PaginationVO.class);
// vo.setPagination(page);
}
//返回对象
return ActionResult.success(vo);
}
/**
*
*
@ -126,6 +159,25 @@ public class NxPriceController {
return ActionResult.fail(b );
}
try{
//后台添加回收站
String userId=userProvider.get().getUserId();
QueryWrapper<UserEntity> userEntityQueryWrapper=new QueryWrapper<>();
userEntityQueryWrapper.lambda().eq(UserEntity::getId,userId);
List<UserEntity> userEntityList =userService.list(userEntityQueryWrapper);
if (userEntityList!=null&&userEntityList.size()>0) {
userEntityList.get(0).getOrganizeId();
QueryWrapper<EnterpriserecyclestationEntity> enterpriserecyclestationQueryWrapper = new QueryWrapper<>();
enterpriserecyclestationQueryWrapper.lambda().eq(EnterpriserecyclestationEntity::getCompanyId, userEntityList.get(0).getOrganizeId());
List<EnterpriserecyclestationEntity> enterpriserecyclestationList = enterpriserecyclestationService.list(enterpriserecyclestationQueryWrapper);
List<NxPriceRecycleModel> recycleModelList=new ArrayList<>();
for (EnterpriserecyclestationEntity entity:enterpriserecyclestationList){
NxPriceRecycleModel nxPriceRecycleModel=new NxPriceRecycleModel();
nxPriceRecycleModel.setRecycleId(entity.getId());
recycleModelList.add(nxPriceRecycleModel);
}
nxPriceForm.setNxPriceRecycleList(recycleModelList);
}
nxPriceService.saveOrUpdate(nxPriceForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");

@ -116,6 +116,7 @@ public class NxProductController {
List<NxProductEntity> list= nxProductService.getList(nxProductPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (NxProductEntity entity : list) {
entity.setParent(entity.getParentId());
Map<String, Object> nxProductMap=JsonUtil.entityToMap(entity);
nxProductMap.put("id", nxProductMap.get("id"));
//副表数据

@ -0,0 +1,57 @@
package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-04-16
*/
@Data
@TableName("nx_manager")
public class NxManagerEntity {
@TableId(value ="ID" )
private String id;
@TableField(value = "NAME" , updateStrategy = FieldStrategy.IGNORED)
private String name;
@TableField(value = "DEPARTMENT" , updateStrategy = FieldStrategy.IGNORED)
private String department;
@TableField(value = "DUTIES" , updateStrategy = FieldStrategy.IGNORED)
private String duties;
@TableField(value = "MOBILE_PHONE" , updateStrategy = FieldStrategy.IGNORED)
private String mobilePhone;
@TableField(value = "REMARK" , updateStrategy = FieldStrategy.IGNORED)
private String remark;
@TableField(value = "STATUS" , updateStrategy = FieldStrategy.IGNORED)
private String status;
@TableField("F_CREATOR_TIME")
private Date creatorTime;
@TableField("F_CREATOR_USER_ID")
private String creatorUserId;
@TableField("F_LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("F_LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("F_DELETE_TIME")
private Date deleteTime;
@TableField("F_DELETE_USER_ID")
private String deleteUserId;
@TableField("F_DELETE_MARK")
private Integer deleteMark;
@TableField("F_TENANT_ID")
private String tenantId;
@TableField("F_VERSION")
private Integer version;
@TableField("F_FLOW_ID")
private String flowId;
@TableField("COMPANY_ID")
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("ORGANIZE_JSON_ID")
private String organizeJsonId;
}

@ -57,4 +57,7 @@ public class NxProductEntity {
private String departmentId;
@TableField(value = "organize_json_id" , fill = FieldFill.INSERT)
private String organizeJsonId;
@TableField(exist = false)
private String parent;
}

@ -0,0 +1,50 @@
package jnpf.model.nxmanager;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* nxManager
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-04-16
*/
@Data
public class NxManagerForm {
/** 主键 */
private String id;
/** 名称 **/
@JsonProperty("name")
private String name;
/** 所属部门 **/
@JsonProperty("department")
private String department;
/** 职务 **/
@JsonProperty("duties")
private String duties;
/** 手机 **/
@JsonProperty("mobilePhone")
private String mobilePhone;
/** 有效标志 **/
@JsonProperty("status")
private String status;
/** 备注 **/
@JsonProperty("remark")
private String remark;
/** 创建时间 **/
@JsonProperty("creatorTime")
private String creatorTime;
/** 创建用户 **/
@JsonProperty("creatorUserId")
private String creatorUserId;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
/** 修改用户 **/
@JsonProperty("lastModifyUserId")
private String lastModifyUserId;
}

@ -0,0 +1,45 @@
package jnpf.model.nxmanager;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
/**
*
* nxManager
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-04-16
*/
@Data
public class NxManagerPagination extends Pagination {
/** 查询key */
private String[] selectKey;
/** json */
private String json;
/** 数据类型 0-当前页1-全部数据 */
private String dataType;
/** 高级查询 */
private String superQueryJson;
/** 功能id */
private String moduleId;
/** 菜单id */
private String menuId;
/** 名称 */
@JsonProperty("name")
private Object name;
/** 所属部门 */
@JsonProperty("department")
private Object department;
/** 手机 */
@JsonProperty("mobilePhone")
private Object mobilePhone;
/** 有效标志 */
@JsonProperty("status")
private Object status;
/** 创建时间 */
@JsonProperty("creatorTime")
private Object creatorTime;
}

@ -126,10 +126,23 @@
<el-form-item label="验证码" prop="code">
<el-input v-model="dataForm.code" disabled></el-input>
</el-form-item>
<el-form-item label="商户名称" prop="name">
<el-input v-model="dataForm.fullName"></el-input>
</el-form-item>
<el-form-item label="商户类型">
<template>
<div>
<el-radio-group v-model="dataForm.merchantType">
<el-radio-button label="1" value="1">单位/企业</el-radio-button>
<el-radio-button label="2" value="2">回收商</el-radio-button>
</el-radio-group>
</div>
</template>
</el-form-item>
<!-- <el-form-item label="商户编码" prop="enCode">
<el-input v-model="dataForm.enCode"></el-input>
</el-form-item> -->
@ -261,6 +274,7 @@ export default {
active: 1,
dataForm: {
merchantType: "",
id: "",
parentId: "96240625-934F-490B-8AA6-0BC775B18468", //id
fullName: "", //

@ -0,0 +1,132 @@
<template>
<el-dialog title="详情"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="24" >
<jnpf-form-tip-item label="名称"
prop="name" >
<p>{{dataForm.name}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="所属部门"
prop="department" >
<p>{{dataForm.department}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="职务"
prop="duties" >
<p>{{dataForm.duties}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="手机"
prop="mobilePhone" >
<p>{{dataForm.mobilePhone}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="有效标志"
prop="status" >
<p>{{ dataForm.status }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="备注"
prop="remark" >
<p>{{dataForm.remark}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id :'',
name : '',
department : '',
duties : "回收负责人",
mobilePhone : "",
status : "1",
remark : '',
creatorTime : "",
creatorUserId : "",
lastModifyTime : "",
lastModifyUserId : "",
},
statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
statusProps:{"label":"fullName","value":"id" },
}
},
computed: {},
watch: {},
created() {
},
mounted() {},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/scm/NxManager/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
},
}
</script>

File diff suppressed because one or more lines are too long

@ -0,0 +1,489 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' :'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="24" >
<jnpf-form-tip-item
label="名称" prop="name" >
<JnpfInput v-model="dataForm.name" @change="changeData('name',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="所属部门" prop="department" >
<JnpfInput v-model="dataForm.department" @change="changeData('department',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="职务" prop="duties" >
<JnpfInput v-model="dataForm.duties" @change="changeData('duties',-1)"
placeholder="请输入" disabled clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="手机" prop="mobilePhone" >
<JnpfInput v-model="dataForm.mobilePhone" @change="changeData('mobilePhone',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="有效标志" prop="status" >
<JnpfRadio v-model="dataForm.status" @change="changeData('status',-1)"
optionType="button" direction="horizontal" size="medium" :options="statusOptions" :props="statusProps" >
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="备注" prop="remark" >
<JnpfTextarea v-model="dataForm.remark" @change="changeData('remark',-1)"
placeholder="请输入" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' >
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{'上一条'}}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{'下一条'}}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import {mapGetters} from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { },
props: [],
data() {
return {
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
prevDis: false,
nextDis: false,
allList: [],
visible: false,
loading: false,
btnLoading: false,
formRef: 'formRef',
setting:{},
eventType: '',
userBoxVisible:false,
selectDialogVisible: false,
currTableConf:{},
dataValueAll:{},
addTableConf:{
},
//
ableAll:{
},
tableRows:{
},
Vmodel:"",
currVmodel:"",
dataForm: {
name : undefined,
department : undefined,
duties : "回收负责人",
mobilePhone : undefined,
status : "1",
remark : undefined,
creatorTime : undefined,
creatorUserId : undefined,
lastModifyTime : undefined,
lastModifyUserId : undefined,
},
tableRequiredData: {},
dataRule:
{
name: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
department: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
duties: [
{
required: true,
message: '请至少选择一个',
trigger: 'blur'
},
],
mobilePhone: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
{
pattern: /^1[3456789]\d{9}$/,
message: '请输入正确的手机号码',
trigger: 'blur'
},
],
status: [
{
required: true,
message: '请至少选择一个',
trigger: 'change'
},
],
},
statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
statusProps:{"label":"fullName","value":"id" },
childIndex:-1,
isEdit:false,
interfaceRes: {
name:[] ,
department:[] ,
duties:[] ,
mobilePhone:[] ,
status:[] ,
remark:[] ,
creatorTime:[] ,
creatorUserId:[] ,
lastModifyTime:[] ,
lastModifyUserId:[] ,
},
}
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() {},
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
next() {
this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/scm/NxManager/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
this[options]()
}
this.changeData(key, index)
}
}
}
}
},
changeDataFormData(type, data, model,index,defaultValue) {
if(!this.isEdit) {
if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) {
this.dataForm[data][i][model] = defaultValue
} else if (index == i) {
this.dataForm[data][i][model] = defaultValue
}
}
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll(){
},
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
}
} else {
this.prevDis = true
this.nextDis = true
}
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/scm/NxManager/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
}else{
this.clearData()
this.initDefaultData()
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/scm/NxManager',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(()=>{
this.btnLoading = false
this.continueBtnLoading = false
})
}else{
request({
url: '/api/scm/NxManager/'+this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(()=>{
this.btnLoading = false
this.continueBtnLoading = false
})
}
},
openSelectDialog(key) {
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if(this['get'+this.currVmodel]){
this['get'+this.currVmodel](t)
}
}
},
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeDataValue = null;
let timeValue = Number(timeValueData)
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = new Date().getTime()
} else if (timeType == 4) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getBeforeData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
}
} else if (timeType == 5) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getLaterData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
}
}
}
return timeDataValue;
},
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
let timeDataValue = null
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue || '00:00:00'
if (timeDataValue.split(':').length == 3) {
timeDataValue = timeDataValue
} else {
timeDataValue = timeDataValue + ':00'
}
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
}
}
return timeDataValue;
},
dataList(){
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex=-1
},
},
}
</script>

@ -0,0 +1,518 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="名称">
<el-input v-model="query.name" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="所属部门">
<el-input v-model="query.department" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="手机">
<el-input v-model="query.mobilePhone" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="有效标志">
<JnpfSelect v-model="query.status" placeholder="请选择" clearable
:options="statusOptions"
:props="statusProps" >
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间">
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期" />
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
收起
</el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"
>
<el-table-column
prop="name"
label="名称" align="left"
>
</el-table-column>
<el-table-column
prop="department"
label="所属部门" align="left"
>
</el-table-column>
<el-table-column
prop="duties"
label="职务" align="left"
>
</el-table-column>
<el-table-column
prop="mobilePhone"
label="手机" align="left"
>
</el-table-column>
<el-table-column label="有效标志" prop="status" algin="left"
>
<template slot-scope="scope">
{{ scope.row.status}}
</template>
</el-table-column>
<el-table-column
prop="creatorUserId"
label="创建用户" align="left"
>
</el-table-column>
<el-table-column
prop="creatorTime"
label="创建时间" align="left"
>
</el-table-column>
<el-table-column
prop="lastModifyTime"
label="修改时间" align="left"
>
</el-table-column>
<el-table-column
prop="lastModifyUserId"
label="修改用户" align="left"
>
</el-table-column>
<el-table-column label="操作"
fixed="right" width="150" >
<template slot-scope="scope" >
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" >编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div>
</template>
<script>
import request from '@/utils/request'
import {mapGetters} from "vuex";
import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
import JNPFForm from './form'
import Detail from './Detail'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
components: {
JNPFForm,
Detail,
ExportBox,ToFormDetail , SuperQuery
},
data() {
return {
keyword:'',
expandsTree: true,
refreshTree: true,
toFormDetailVisible:false,
expandObj:{},
columnOptions: [],
mergeList: [],
exportList:[],
columnList,
showAll: false,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
name:undefined,
department:undefined,
mobilePhone:undefined,
status:undefined,
creatorTime:undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
statusProps:{"label":"fullName","value":"id" },
interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data
const config ={
treeInterfaceId:"",
treeTemplateJson:[]
}
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ''
}
}
//
let query = {
paramList: config.treeTemplateJson || [],
}
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
}
}
this.getMergeList(list)
this.getExportList(list)
return list
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
}
},
getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list))
newList.forEach(item => {
if (item.children && item.children.length) {
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length ) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
}
})
},
getExportList(list) {
let exportList = []
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === 'table') {
for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j])
}
} else {
exportList.push(list[i])
}
}
this.exportList = exportList
},
goDetail(id){
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({column, prop, order}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId:this.menuId,
moduleId:'549906462084718981',
type:1,
};
request({
url: `/api/scm/NxManager/getList`,
method: 'post',
data: _query
}).then(res => {
var _list =res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/scm/NxManager/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
handelUpload(){
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("","scm/NxManager")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
})
},
superQuery(queryJson) {
this.listQuery.superQueryJson = queryJson
this.listQuery.currentPage = 1
this.initData()
},
addOrUpdateHandle(row, isDetail) {
let id = row?row.id:""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail,this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
request({
url: `/api/scm/NxManager/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage=1
this.listQuery.pageSize=20
this.listQuery.sort="desc"
this.listQuery.sidx=""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
}
}
</script>

File diff suppressed because one or more lines are too long

@ -161,7 +161,7 @@
</div>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<!-- <el-col :span="24">
<jnpf-form-tip-item>
<JnpfGroupTitle content="适配服务站" contentPosition="left">
</JnpfGroupTitle>
@ -181,7 +181,7 @@
<template slot-scope="scope">
<JnpfPopupSelect v-model="scope.row.recycleId" @change="
changeData('nxpricerecycle-recycleId', scope.$index)
" :rowIndex="scope.$index" :formData="dataForm" :templateJson="interfaceRes.nxpricerecyclerecycleId"
" :rowIndex="scope.$index" :formData="dataForm" :templateJson="interfaceRes.nxpricerecyclerecycleId" disabled
placeholder="请选择" hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField="station_name" :field="'recycleId' + scope.$index"
interfaceId="534688845753483781" :pageSize="20"
@ -189,6 +189,18 @@
</JnpfPopupSelect>
</template>
</el-table-column>
<el-table-column label="回收站名称" prop="stationCode">
<template slot="header" v-if="true">
<span class="required-sign"></span>回收站编码
</template>
<template slot-scope="scope">
<JnpfInput v-model="scope.row.stationCode" placeholder="请输入" disabled clearable
:style="{ width: '100%' }">
</JnpfInput>
</template>
</el-table-column>
<el-table-column label="操作" width="50">
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn"
@ -196,8 +208,9 @@
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addnxpricerecycleList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
<div class="table-actions" @click="addnxpricerecycleList()"
v-if="dataForm.nxPriceRecycleList.length == 0">
<el-button type="text" icon="el-icon-plus">回收站添加</el-button>
</div>
</jnpf-form-tip-item>
</el-col>
@ -207,7 +220,7 @@
:style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
</el-col> -->
<!-- 表单结束 -->
</template>
</el-form>
@ -244,6 +257,7 @@ export default {
props: [],
data() {
return {
list: [],
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
@ -500,15 +514,15 @@ export default {
let isOk = true;
for (let i = 0; i < this.dataForm.nxPriceRecycleList.length; i++) {
const e = this.dataForm.nxPriceRecycleList[i];
if (!e.recycleId) {
this.$message({
message: "回收站不能为空",
type: "error",
duration: 1000,
});
isOk = false;
break;
}
// if (!e.recycleId) {
// this.$message({
// message: "",
// type: "error",
// duration: 1000,
// });
// isOk = false;
// break;
// }
}
return isOk;
},
@ -696,10 +710,60 @@ export default {
this.childIndex = -1;
},
addnxpricerecycleList() {
let item = {
recycleId: "",
};
this.getnxpricerecycleList(item);
request({
url: "/api/scm/NxPrice/getListRecycleStation",
method: "post",
}).then((res) => {
this.list = res.data.list
console.log(this.list);
for (let i = 0; i < this.list.length; i++) {
const e = this.list[i];
let list = {
recycleId: e.id,
stationCode: e.stationCode,
// productId: e.id,
name: e.name,
code: e.code,
spec: e.spec,
unit: e.unit,
// hasSchedule: e.hasSchedule,
// recycleAddress: e.recycleAddress,
};
this.dataForm.nxPriceRecycleList.push(list);
}
// this.dataForm.nxPriceRecycleList.push(res);
this.loading = false;
});
// let item = {
// recycleId: "",
// };
// this.getnxpricerecycleList(item);
// .then((res) => {
// this.$message({
// message: res.msg,
// type: "success",
// duration: 1000,
// onClose: () => {
// if (this.dataFormSubmitType == 2)
// return (this.continueBtnLoading = false);
// this.visible = false;
// this.btnLoading = false;
// this.$emit("refresh", true);
// },
// });
// })
// .catch(() => {
// this.btnLoading = false;
// this.continueBtnLoading = false;
// });
},
delnxpricerecycleList(index) {
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {

@ -1,4 +1,3 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -6,33 +5,21 @@
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="价格编号">
<el-input
v-model="query.priceCode"
placeholder="请输入"
clearable
>
<el-input v-model="query.priceCode" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="商品名称">
<el-input
v-model="query.productName"
placeholder="请输入"
clearable
>
<el-input v-model="query.productName" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="回收站">
<el-input
v-model="query.stationName"
placeholder="请输入"
clearable
>
<el-input v-model="query.stationName" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
@ -40,45 +27,24 @@
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="创建用户">
<JnpfUserSelect
v-model="query.creatorUserId"
placeholder="请选择"
/>
<JnpfUserSelect v-model="query.creatorUserId" placeholder="请选择" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="创建时间">
<JnpfDateRangePicker
v-model="query.creatorTime"
format="yyyy-MM-dd"
startPlaceholder="开始日期"
endPlaceholder="结束日期"
/>
<JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" />
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"
>查询</el-button
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
<el-button
type="text"
icon="el-icon-arrow-down"
@click="showAll = true"
v-if="!showAll"
>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button
type="text"
icon="el-icon-arrow-up"
@click="showAll = false"
v-else
>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
@ -88,98 +54,39 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button
type="primary"
icon="icon-ym icon-ym-btn-add"
@click="addOrUpdateHandle()"
>新增
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-download"
@click="exportData()"
>导出
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()">
</el-button>
<el-button
type="text"
icon="icon-ym icon-ym-btn-clearn"
@click="handleBatchRemoveDel()"
>批量删除
<el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()">
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link
icon="icon-ym icon-ym-filter JNPF-common-head-icon"
:underline="false"
@click="openSuperQuery()"
/>
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip
effect="dark"
:content="$t('common.refresh')"
placement="top"
>
<el-link
icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
:underline="false"
@click="initData()"
/>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
has-c
@selection-change="handleSelectionChange"
:span-method="arraySpanMethod"
>
<el-table-column
prop="productName"
label="商品名称"
align="left"
sortable="custom"
>
<JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod">
<el-table-column prop="productName" label="商品名称" align="left" sortable="custom">
</el-table-column>
>
<el-table-column
prop="recoveryPrice"
label="回收价"
align="left"
sortable="custom"
>
<el-table-column prop="recoveryPrice" label="回收价" align="left" sortable="custom">
</el-table-column>
<el-table-column
prop="unit"
label="单位"
align="left"
sortable="custom"
>
<el-table-column prop="unit" label="单位" align="left" sortable="custom">
</el-table-column>
<el-table-column
prop="stationName"
label="服务站"
align="left"
sortable="custom"
>
<el-table-column prop="stationName" label="服务站" align="left" sortable="custom">
</el-table-column>
<el-table-column
prop="priceStatus"
label="状态"
align="left"
sortable="custom"
>
<el-table-column prop="priceStatus" label="状态" align="left" sortable="custom">
</el-table-column>
<el-table-column
prop="priceCode"
label="价格编码"
align="left"
sortable="custom"
>
<el-table-column prop="priceCode" label="价格编码" align="left" sortable="custom">
</el-table-column>
<!-- <el-table-column
@ -206,94 +113,43 @@
{{ scope.row.priceType }}
</template>
</el-table-column> -->
<el-table-column
prop="creatorUserIds"
label="创建用户"
align="left"
sortable="custom"
>
<el-table-column prop="creatorUserIds" label="创建用户" align="left" sortable="custom">
</el-table-column>
<el-table-column
prop="creatorTime"
label="创建时间"
align="left"
sortable="custom"
>
<el-table-column prop="creatorTime" label="创建时间" align="left" sortable="custom">
</el-table-column>
<el-table-column
prop="lastModifyUserIds"
label="更新人"
align="left"
sortable="custom"
>
<el-table-column prop="lastModifyUserIds" label="更新人" align="left" sortable="custom">
</el-table-column>
<el-table-column
prop="lastModifyTime"
label="更新时间"
align="left"
sortable="custom"
>
<el-table-column prop="lastModifyTime" label="更新时间" align="left" sortable="custom">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
>编辑
<el-button type="text" @click="addOrUpdateHandle(scope.row)">
</el-button>
<el-button
v-if="scope.row.status == 1"
type="text"
@click="addends(scope.row.id)"
>失效
<el-button v-if="scope.row.status == 1" type="text" @click="addends(scope.row.id)">
</el-button>
<el-button
v-if="scope.row.status == 2"
type="text"
@click="addOstarts(scope.row.id)"
>生效
<el-button v-if="scope.row.status == 2" type="text" @click="addOstarts(scope.row.id)">
</el-button>
<el-button
type="text"
class="JNPF-table-delBtn"
@click="handleDel(scope.row.id)"
>删除
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)"
>详情
<el-button type="text" @click="goDetail(scope.row.id)">
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination
:total="total"
:page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize"
@pagination="initData"
/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail
v-if="detailVisible"
ref="Detail"
@refresh="detailVisible = false"
/>
<ToFormDetail
v-if="toFormDetailVisible"
ref="toFormDetail"
@close="toFormDetailVisible = false"
/>
<SuperQuery
v-if="superQueryVisible"
ref="SuperQuery"
:columnOptions="superQueryJson"
@superQuery="superQuery"
/>
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
</div>
</template>
@ -563,7 +419,7 @@ export default {
this.initData();
},
//
async initSearchData() {},
async initSearchData() { },
initData() {
this.listLoading = true;
let _query = {
@ -607,7 +463,7 @@ export default {
});
});
})
.catch(() => {});
.catch(() => { });
},
addends(id) {
@ -628,7 +484,7 @@ export default {
});
});
})
.catch(() => {});
.catch(() => { });
},
addOstarts(id) {
@ -649,7 +505,7 @@ export default {
});
});
})
.catch(() => {});
.catch(() => { });
},
handelUpload() {
@ -690,7 +546,7 @@ export default {
});
});
})
.catch(() => {});
.catch(() => { });
},
openSuperQuery() {
this.superQueryVisible = true;
@ -707,6 +563,7 @@ export default {
let id = row ? row.id : "";
this.formVisible = true;
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list);
});
},

@ -63,16 +63,16 @@
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled="prevDis">
{{ "上一条" }}
</el-button>
<el-button @click="next" :disabled="nextDis">
{{ "下一条" }}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? "确定并新增" : "确定并继续" }}</el-button>
</div> -->
<!-- <el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{ !dataForm.id ? "确定并新增" : "确定并继续" }}</el-button> -->
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">
</el-button>

@ -85,9 +85,12 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">
<!-- {{ scope.row.parentId_id }} -->
<el-button type="text" @click="addOrUpdateHandle(scope.row)"
v-if="scope.row.parentId_id != null || scope.row.parentId_id != undefined">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)"
v-if="scope.row.parentId_id != null || scope.row.parentId_id != undefined">删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">
</el-button>

Loading…
Cancel
Save