feat():工厂日历设置;

master
jiyufei 3 months ago
parent 17f53c44aa
commit a482311352

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

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

@ -0,0 +1,43 @@
package jnpf.service;
import jnpf.model.yyscalendar.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* yysCalendar
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-08-05
*/
public interface YysCalendarService extends IService<YysCalendarEntity> {
List<YysCalendarEntity> getList(YysCalendarPagination yysCalendarPagination);
List<YysCalendarEntity> getTypeList(YysCalendarPagination yysCalendarPagination, String dataType);
YysCalendarEntity getInfo(String id);
void delete(YysCalendarEntity entity);
void create(YysCalendarEntity entity);
boolean update(String id, YysCalendarEntity entity);
//子表方法
//副表数据方法
String checkForm(YysCalendarForm form, int i);
String saveOrUpdate(YysCalendarForm yysCalendarForm, String id, boolean isSave);
/**
*
*
* @param yysCalendarForm
*/
void updateStatus(YysCalendarForm yysCalendarForm);
}

@ -0,0 +1,35 @@
package jnpf.service;
import jnpf.model.yysgroup.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* yysGroup
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-08-05
*/
public interface YysGroupService extends IService<YysGroupEntity> {
List<YysGroupEntity> getList(YysGroupPagination yysGroupPagination);
List<YysGroupEntity> getTypeList(YysGroupPagination yysGroupPagination,String dataType);
YysGroupEntity getInfo(String id);
void delete(YysGroupEntity entity);
void create(YysGroupEntity entity);
boolean update(String id, YysGroupEntity entity);
//子表方法
//副表数据方法
String checkForm(YysGroupForm form,int i);
void saveOrUpdate(YysGroupForm yysGroupForm,String id, boolean isSave) throws Exception;
}

@ -0,0 +1,324 @@
package jnpf.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import jnpf.base.UserInfo;
import jnpf.base.model.ColumnDataModel;
import jnpf.database.model.superQuery.SuperJsonModel;
import jnpf.entity.YysCalendarEntity;
import jnpf.mapper.YysCalendarMapper;
import jnpf.model.QueryModel;
import jnpf.model.yyscalendar.YysCalendarConstant;
import jnpf.model.yyscalendar.YysCalendarForm;
import jnpf.model.yyscalendar.YysCalendarPagination;
import jnpf.service.YysCalendarService;
import jnpf.util.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.lang.reflect.Field;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.time.temporal.ChronoField;
import java.time.temporal.TemporalAccessor;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* yysCalendar
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-08-05
*/
@Service
@Slf4j
public class YysCalendarServiceImpl extends ServiceImpl<YysCalendarMapper, YysCalendarEntity> implements YysCalendarService {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Override
public List<YysCalendarEntity> getList(YysCalendarPagination yysCalendarPagination) {
return getTypeList(yysCalendarPagination, yysCalendarPagination.getDataType());
}
/**
*
*/
@Override
public List<YysCalendarEntity> getTypeList(YysCalendarPagination yysCalendarPagination, 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 ? YysCalendarConstant.getAppColumnData() : YysCalendarConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total = 0;
int yysCalendarNum = 0;
QueryWrapper<YysCalendarEntity> yysCalendarQueryWrapper = new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp = "";
if (ObjectUtil.isNotEmpty(yysCalendarPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = yysCalendarPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<YysCalendarEntity> yysCalendarSuperWrapper = new QueryWrapper<>();
yysCalendarSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysCalendarSuperWrapper, YysCalendarEntity.class, queryJson, "0"));
int yysCalendarNum1 = yysCalendarSuperWrapper.getExpression().getNormal().size();
if (yysCalendarNum1 > 0) {
List<String> yysCalendarList = this.list(yysCalendarSuperWrapper).stream().map(YysCalendarEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysCalendarList);
intersectionSuperList.add(yysCalendarList);
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<YysCalendarEntity> yysCalendarSuperWrapper = new QueryWrapper<>();
yysCalendarSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysCalendarSuperWrapper, YysCalendarEntity.class, ruleJson, "0"));
int yysCalendarNum1 = yysCalendarSuperWrapper.getExpression().getNormal().size();
if (yysCalendarNum1 > 0) {
List<String> yysCalendarList = this.list(yysCalendarSuperWrapper).stream().map(YysCalendarEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysCalendarList);
intersectionRuleList.add(yysCalendarList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
} else {
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = false;
boolean appPermission = false;
if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysCalendarObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysCalendarQueryWrapper, YysCalendarEntity.class, yysCalendarPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysCalendarObj)) {
return new ArrayList<>();
} else {
yysCalendarQueryWrapper = (QueryWrapper<YysCalendarEntity>) yysCalendarObj;
if (yysCalendarQueryWrapper.getExpression().getNormal().size() > 0) {
yysCalendarNum++;
}
}
}
}
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysCalendarObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysCalendarQueryWrapper, YysCalendarEntity.class, yysCalendarPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysCalendarObj)) {
return new ArrayList<>();
} else {
yysCalendarQueryWrapper = (QueryWrapper<YysCalendarEntity>) yysCalendarObj;
if (yysCalendarQueryWrapper.getExpression().getNormal().size() > 0) {
yysCalendarNum++;
}
}
}
}
if (isPc) {
if (ObjectUtil.isNotEmpty(yysCalendarPagination.getYears())) {
yysCalendarNum++;
// List YearsList = JsonUtil.getJsonToList(yysCalendarPagination.getYears(), String.class);
// Long fir = Long.valueOf(String.valueOf(YearsList.get(0)));
// Long sec = Long.valueOf(String.valueOf(YearsList.get(1)));
//
// yysCalendarQueryWrapper.lambda().ge(YysCalendarEntity::getYears, new Date(fir))
// .le(YysCalendarEntity::getYears, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
yysCalendarQueryWrapper.lambda().eq(YysCalendarEntity::getYears, yysCalendarPagination.getYears().toString());
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total > 0) {
if (intersection.size() == 0) {
intersection.add("jnpfNullList");
}
yysCalendarQueryWrapper.lambda().in(YysCalendarEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
yysCalendarQueryWrapper.lambda().and(t -> t.in(YysCalendarEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
yysCalendarQueryWrapper.lambda().and(t -> t.in(YysCalendarEntity::getId, finalAllRuleIDlist));
}
//假删除标志
yysCalendarQueryWrapper.lambda().isNull(YysCalendarEntity::getDeleteMark);
//排序
if (StringUtil.isEmpty(yysCalendarPagination.getSidx())) {
yysCalendarQueryWrapper.lambda().orderByDesc(YysCalendarEntity::getId);
} else {
try {
String sidx = yysCalendarPagination.getSidx();
String[] strs = sidx.split("_name");
YysCalendarEntity yysCalendarEntity = new YysCalendarEntity();
Field declaredField = yysCalendarEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
yysCalendarQueryWrapper = "asc".equals(yysCalendarPagination.getSort().toLowerCase()) ? yysCalendarQueryWrapper.orderByAsc(value) : yysCalendarQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<YysCalendarEntity> page = new Page<>(yysCalendarPagination.getCurrentPage(), yysCalendarPagination.getPageSize());
IPage<YysCalendarEntity> userIPage = this.page(page, yysCalendarQueryWrapper);
return yysCalendarPagination.setData(userIPage.getRecords(), userIPage.getTotal());
} else {
List<YysCalendarEntity> list = new ArrayList();
return yysCalendarPagination.setData(list, list.size());
}
} else {
return this.list(yysCalendarQueryWrapper);
}
}
@Override
public YysCalendarEntity getInfo(String id) {
QueryWrapper<YysCalendarEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysCalendarEntity::getId, id);
return this.getOne(queryWrapper);
}
@Override
public void create(YysCalendarEntity entity) {
this.save(entity);
}
@Override
public boolean update(String id, YysCalendarEntity entity) {
return this.updateById(entity);
}
@Override
public void delete(YysCalendarEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
}
}
/**
* i-0-1
*/
@Override
public String checkForm(YysCalendarForm form, int i) {
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id = "";
String countRecover = "";
if (isUp) {
id = form.getId();
}
//主表字段验证
return countRecover;
}
/**
* ()
*
* @param id
* @param yysCalendarForm
* @return
*/
@Override
@Transactional
public String saveOrUpdate(YysCalendarForm yysCalendarForm, String id, boolean isSave) throws Exception {
UserInfo userInfo = userProvider.get();
YysCalendarEntity entity = BeanUtil.copyProperties(yysCalendarForm, YysCalendarEntity.class);
LambdaQueryWrapper<YysCalendarEntity> wrapper = new LambdaQueryWrapper<>(YysCalendarEntity.class)
.eq(YysCalendarEntity::getYears, yysCalendarForm.getYears());
if (CollectionUtils.isNotEmpty(this.list(wrapper))) {
return "所选年月已被创建";
}
List<YysCalendarEntity> list = Lists.newArrayList();
//根据年月判断多少天 然后循环创建多少条数据
int countedDays = this.countDays(yysCalendarForm.getYears());
for (int i = 1; i <= countedDays; i++) {
String mainId = RandomUtil.uuId();
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setId(mainId);
entity.setVersion(0);
entity.setDay(String.valueOf(i));
list.add(entity);
}
boolean result = this.saveBatch(list);
if (result) {
return "创建成功";
}
return "创建失败";
}
@Override
public void updateStatus(YysCalendarForm yysCalendarForm) {
log.info("根据条件更新状态,yysCalendarForm:{}", yysCalendarForm);
YysCalendarEntity calendar = this.getById(yysCalendarForm.getId());
if (ObjectUtil.isNull(calendar)) {
return;
}
calendar.setIsHoliday(yysCalendarForm.getIsHoliday());
calendar.setLastModifyTime(DateUtil.getNowDate());
calendar.setLastModifyUserId(userProvider.get().getUserId());
this.updateById(calendar);
}
private int countDays(String dateStr) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
TemporalAccessor parsed = formatter.parse(dateStr);
LocalDate date = LocalDate.of(parsed.get(ChronoField.YEAR), parsed.get(ChronoField.MONTH_OF_YEAR), 1);
// 获取这个月的天数
return date.lengthOfMonth();
}
}

@ -0,0 +1,307 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.YysGroupMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.yysgroup.*;
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;
/**
*
* yysGroup
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-08-05
*/
@Service
public class YysGroupServiceImpl extends ServiceImpl<YysGroupMapper, YysGroupEntity> implements YysGroupService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Override
public List<YysGroupEntity> getList(YysGroupPagination yysGroupPagination){
return getTypeList(yysGroupPagination,yysGroupPagination.getDataType());
}
/** 列表查询 */
@Override
public List<YysGroupEntity> getTypeList(YysGroupPagination yysGroupPagination,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 ? YysGroupConstant.getAppColumnData() : YysGroupConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int yysGroupNum =0;
QueryWrapper<YysGroupEntity> yysGroupQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(yysGroupPagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = yysGroupPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<YysGroupEntity> yysGroupSuperWrapper = new QueryWrapper<>();
yysGroupSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysGroupSuperWrapper,YysGroupEntity.class,queryJson,"0"));
int yysGroupNum1 = yysGroupSuperWrapper.getExpression().getNormal().size();
if (yysGroupNum1>0){
List<String> yysGroupList =this.list(yysGroupSuperWrapper).stream().map(YysGroupEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysGroupList);
intersectionSuperList.add(yysGroupList);
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<YysGroupEntity> yysGroupSuperWrapper = new QueryWrapper<>();
yysGroupSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysGroupSuperWrapper,YysGroupEntity.class,ruleJson,"0"));
int yysGroupNum1 = yysGroupSuperWrapper.getExpression().getNormal().size();
if (yysGroupNum1>0){
List<String> yysGroupList =this.list(yysGroupSuperWrapper).stream().map(YysGroupEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysGroupList);
intersectionRuleList.add(yysGroupList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if(ruleOp.equalsIgnoreCase("and")){
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = false;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysGroupObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysGroupQueryWrapper,YysGroupEntity.class,yysGroupPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysGroupObj)){
return new ArrayList<>();
} else {
yysGroupQueryWrapper = (QueryWrapper<YysGroupEntity>)yysGroupObj;
if( yysGroupQueryWrapper.getExpression().getNormal().size()>0){
yysGroupNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysGroupObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysGroupQueryWrapper,YysGroupEntity.class,yysGroupPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysGroupObj)){
return new ArrayList<>();
} else {
yysGroupQueryWrapper = (QueryWrapper<YysGroupEntity>)yysGroupObj;
if( yysGroupQueryWrapper.getExpression().getNormal().size()>0){
yysGroupNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(yysGroupPagination.getGroupName())){
yysGroupNum++;
String value = yysGroupPagination.getGroupName() instanceof List ?
JsonUtil.getObjectToString(yysGroupPagination.getGroupName()) :
String.valueOf(yysGroupPagination.getGroupName());
yysGroupQueryWrapper.lambda().like(YysGroupEntity::getGroupName,value);
}
if(ObjectUtil.isNotEmpty(yysGroupPagination.getEnabledStatus())){
yysGroupNum++;
List<String> idList = new ArrayList<>();
try {
String[][] enabledStatus = JsonUtil.getJsonToBean(yysGroupPagination.getEnabledStatus(),String[][].class);
for(int i=0;i<enabledStatus.length;i++){
if(enabledStatus[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(enabledStatus[i])));
}
}
}catch (Exception e1){
try {
List<String> enabledStatus = JsonUtil.getJsonToList(yysGroupPagination.getEnabledStatus(),String.class);
if(enabledStatus.size()>0){
idList.addAll(enabledStatus);
}
}catch (Exception e2){
idList.add(String.valueOf(yysGroupPagination.getEnabledStatus()));
}
}
yysGroupQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(YysGroupEntity::getEnabledStatus, tt).or();
});
});
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
intersection.add("jnpfNullList");
}
yysGroupQueryWrapper.lambda().in(YysGroupEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
yysGroupQueryWrapper.lambda().and(t->t.in(YysGroupEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
yysGroupQueryWrapper.lambda().and(t->t.in(YysGroupEntity::getId, finalAllRuleIDlist));
}
//假删除标志
yysGroupQueryWrapper.lambda().isNull(YysGroupEntity::getDeleteMark);
//排序
if(StringUtil.isEmpty(yysGroupPagination.getSidx())){
yysGroupQueryWrapper.lambda().orderByDesc(YysGroupEntity::getId);
}else{
try {
String sidx = yysGroupPagination.getSidx();
String[] strs= sidx.split("_name");
YysGroupEntity yysGroupEntity = new YysGroupEntity();
Field declaredField = yysGroupEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
yysGroupQueryWrapper="asc".equals(yysGroupPagination.getSort().toLowerCase())?yysGroupQueryWrapper.orderByAsc(value):yysGroupQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<YysGroupEntity> page=new Page<>(yysGroupPagination.getCurrentPage(), yysGroupPagination.getPageSize());
IPage<YysGroupEntity> userIPage=this.page(page, yysGroupQueryWrapper);
return yysGroupPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<YysGroupEntity> list = new ArrayList();
return yysGroupPagination.setData(list, list.size());
}
}else{
return this.list(yysGroupQueryWrapper);
}
}
@Override
public YysGroupEntity getInfo(String id){
QueryWrapper<YysGroupEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(YysGroupEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(YysGroupEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, YysGroupEntity entity){
entity.setDeleteTime(DateUtil.getNowDate());
return this.updateById(entity);
}
@Override
public void delete(YysGroupEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(YysGroupForm 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.getGroupName())){
return "班组名称不能为空";
}
return countRecover;
}
/**
* ()
* @param id
* @param yysGroupForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(YysGroupForm yysGroupForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
yysGroupForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(YysGroupConstant.getFormData(),yysGroupForm),YysGroupForm.class);
YysGroupEntity entity = JsonUtil.getJsonToBean(yysGroupForm, YysGroupEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setCreatorTime(DateUtil.getNowDate());
entity.setCreatorUserId(userInfo.getUserId());
entity.setId(mainId);
entity.setVersion(0);
}else{
entity.setLastModifyTime(DateUtil.getNowDate());
entity.setLastModifyUserId(userInfo.getUserId());
}
this.saveOrUpdate(entity);
}
}

@ -0,0 +1,338 @@
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.yyscalendar.*;
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.web.multipart.MultipartFile;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
import cn.xuyanwu.spring.file.storage.FileInfo;
import lombok.Cleanup;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import org.springframework.transaction.annotation.Transactional;
/**
* yysCalendar
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Slf4j
@RestController
@Tag(name = "yysCalendar", description = "example")
@RequestMapping("/api/example/YysCalendar")
public class YysCalendarController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private YysCalendarService yysCalendarService;
@Autowired
private ConfigValueUtil configValueUtil;
/**
*
*
* @param yysCalendarPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody YysCalendarPagination yysCalendarPagination) throws IOException {
List<YysCalendarEntity> list = yysCalendarService.getList(yysCalendarPagination);
List<Map<String, Object>> realList = new ArrayList<>();
for (YysCalendarEntity entity : list) {
Map<String, Object> yysCalendarMap = JsonUtil.entityToMap(entity);
yysCalendarMap.put("id", yysCalendarMap.get("id"));
//副表数据
//子表数据
realList.add(yysCalendarMap);
}
//数据转换
// realList = generaterSwapUtil.swapDataList(realList, YysCalendarConstant.getFormData(), YysCalendarConstant.getColumnData(), yysCalendarPagination.getModuleId(),false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(yysCalendarPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param yysCalendarForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid YysCalendarForm yysCalendarForm) {
String b = yysCalendarService.checkForm(yysCalendarForm, 0);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
return ActionResult.success(yysCalendarService.saveOrUpdate(yysCalendarForm, null, true));
}
/**
* Excel
*
* @return
*/
@Operation(summary = "导出Excel")
@PostMapping("/Actions/Export")
public ActionResult Export(@RequestBody YysCalendarPagination yysCalendarPagination) {
if (StringUtil.isEmpty(yysCalendarPagination.getSelectKey())) {
return ActionResult.fail("请选择导出字段");
}
List<YysCalendarEntity> list = yysCalendarService.getList(yysCalendarPagination);
List<Map<String, Object>> realList = new ArrayList<>();
for (YysCalendarEntity entity : list) {
Map<String, Object> yysCalendarMap = JsonUtil.entityToMap(entity);
yysCalendarMap.put("id", yysCalendarMap.get("id"));
//副表数据
//子表数据
realList.add(yysCalendarMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, YysCalendarConstant.getFormData(), YysCalendarConstant.getColumnData(), yysCalendarPagination.getModuleId(), false);
String[] keys = !StringUtil.isEmpty(yysCalendarPagination.getSelectKey()) ? yysCalendarPagination.getSelectKey() : new String[0];
UserInfo userInfo = userProvider.get();
DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), realList, keys, userInfo);
return ActionResult.success(vo);
}
/**
*
*/
public DownloadVO creatModelExcel(String path, List<Map<String, Object>> list, String[] keys, UserInfo userInfo) {
DownloadVO vo = DownloadVO.builder().build();
List<ExcelExportEntity> entitys = new ArrayList<>();
if (keys.length > 0) {
for (String key : keys) {
switch (key) {
case "years":
entitys.add(new ExcelExportEntity("年月", "years"));
break;
default:
break;
}
}
}
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try {
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size() > 0) {
if (list.size() == 0) {
list.add(new HashMap<>());
}
//去除空数据
List<Map<String, Object>> dataList = new ArrayList<>();
for (Map<String, Object> map : list) {
int i = 0;
for (String key : keys) {
//子表
if (key.toLowerCase().startsWith("tablefield")) {
String tableField = key.substring(0, key.indexOf("-"));
String field = key.substring(key.indexOf("-") + 1);
Object o = map.get(tableField);
if (o != null) {
List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
for (Map<String, Object> childMap : childList) {
if (childMap.get(field) != null) {
i++;
}
}
}
} else {
Object o = map.get(key);
if (o != null) {
i++;
}
}
}
if (i > 0) {
dataList.add(map);
}
}
//复杂表头-表头和数据处理
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(YysCalendarConstant.getColumnData(), ColumnDataModel.class);
List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
}
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
}
String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
String temporaryFilePath = configValueUtil.getTemporaryFilePath();
FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
vo.setName(fileInfo.getFilename());
vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
} catch (Exception e) {
log.error("信息导出Excel错误:{}", e.getMessage());
e.printStackTrace();
}
return vo;
}
/**
*
*
* @param id
* @param yysCalendarForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid YysCalendarForm yysCalendarForm,
@RequestParam(value = "isImport", required = false) boolean isImport) {
yysCalendarForm.setId(id);
if (!isImport) {
String b = yysCalendarService.checkForm(yysCalendarForm, 1);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
}
YysCalendarEntity entity = yysCalendarService.getInfo(id);
if (entity != null) {
try {
yysCalendarService.saveOrUpdate(yysCalendarForm, 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) {
YysCalendarEntity entity = yysCalendarService.getInfo(id);
if (entity != null) {
//假删除
entity.setDeleteMark(1);
entity.setDeleteTime(DateUtil.getNowDate());
yysCalendarService.update(id, entity);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
*
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id) {
YysCalendarEntity entity = yysCalendarService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> yysCalendarMap = JsonUtil.entityToMap(entity);
yysCalendarMap.put("id", yysCalendarMap.get("id"));
//副表数据
//子表数据
yysCalendarMap = generaterSwapUtil.swapDataDetail(yysCalendarMap, YysCalendarConstant.getFormData(), "590186598289642885", false);
return ActionResult.success(yysCalendarMap);
}
/**
* ()
* 使-
*
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id) {
YysCalendarEntity entity = yysCalendarService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> yysCalendarMap = JsonUtil.entityToMap(entity);
yysCalendarMap.put("id", yysCalendarMap.get("id"));
//副表数据
//子表数据
// yysCalendarMap = generaterSwapUtil.swapDataForm(yysCalendarMap,YysCalendarConstant.getFormData(),YysCalendarConstant.TABLEFIELDKEY,YysCalendarConstant.TABLERENAMES);
return ActionResult.success(yysCalendarMap);
}
@Operation(summary = "更新状态")
@PostMapping("/updateStatus")
public ActionResult updateStatus(@RequestBody YysCalendarForm yysCalendarForm) {
yysCalendarService.updateStatus(yysCalendarForm);
return ActionResult.success();
}
}

@ -0,0 +1,331 @@
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.yysgroup.*;
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.web.multipart.MultipartFile;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
import cn.xuyanwu.spring.file.storage.FileInfo;
import lombok.Cleanup;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import org.springframework.transaction.annotation.Transactional;
/**
* yysGroup
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Slf4j
@RestController
@Tag(name = "yysGroup" , description = "example")
@RequestMapping("/api/example/YysGroup")
public class YysGroupController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private YysGroupService yysGroupService;
@Autowired
private ConfigValueUtil configValueUtil;
/**
*
*
* @param yysGroupPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody YysGroupPagination yysGroupPagination)throws IOException{
List<YysGroupEntity> list= yysGroupService.getList(yysGroupPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (YysGroupEntity entity : list) {
Map<String, Object> yysGroupMap=JsonUtil.entityToMap(entity);
yysGroupMap.put("id", yysGroupMap.get("id"));
//副表数据
//子表数据
realList.add(yysGroupMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, YysGroupConstant.getFormData(), YysGroupConstant.getColumnData(), yysGroupPagination.getModuleId(),false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(yysGroupPagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param yysGroupForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid YysGroupForm yysGroupForm) {
String b = yysGroupService.checkForm(yysGroupForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
try{
yysGroupService.saveOrUpdate(yysGroupForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
* Excel
*
* @return
*/
@Operation(summary = "导出Excel")
@PostMapping("/Actions/Export")
public ActionResult Export(@RequestBody YysGroupPagination yysGroupPagination) throws IOException {
if (StringUtil.isEmpty(yysGroupPagination.getSelectKey())){
return ActionResult.fail("请选择导出字段");
}
List<YysGroupEntity> list= yysGroupService.getList(yysGroupPagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (YysGroupEntity entity : list) {
Map<String, Object> yysGroupMap=JsonUtil.entityToMap(entity);
yysGroupMap.put("id", yysGroupMap.get("id"));
//副表数据
//子表数据
realList.add(yysGroupMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, YysGroupConstant.getFormData(), YysGroupConstant.getColumnData(), yysGroupPagination.getModuleId(),false);
String[]keys=!StringUtil.isEmpty(yysGroupPagination.getSelectKey())?yysGroupPagination.getSelectKey():new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
return ActionResult.success(vo);
}
/**
*
*/
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
DownloadVO vo=DownloadVO.builder().build();
List<ExcelExportEntity> entitys=new ArrayList<>();
if(keys.length>0){
for(String key:keys){
switch(key){
case "groupName" :
entitys.add(new ExcelExportEntity("班组名称" ,"groupName"));
break;
case "groupType" :
entitys.add(new ExcelExportEntity("班组类型" ,"groupType"));
break;
case "leader" :
entitys.add(new ExcelExportEntity("组长" ,"leader"));
break;
case "member" :
entitys.add(new ExcelExportEntity("成员" ,"member"));
break;
case "enabledStatus" :
entitys.add(new ExcelExportEntity("启用状态" ,"enabledStatus"));
break;
default:
break;
}
}
}
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try{
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){
if (list.size()==0){
list.add(new HashMap<>());
}
//去除空数据
List<Map<String, Object>> dataList = new ArrayList<>();
for (Map<String, Object> map : list) {
int i = 0;
for (String key : keys) {
//子表
if (key.toLowerCase().startsWith("tablefield")) {
String tableField = key.substring(0, key.indexOf("-" ));
String field = key.substring(key.indexOf("-" ) + 1);
Object o = map.get(tableField);
if (o != null) {
List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
for (Map<String, Object> childMap : childList) {
if (childMap.get(field) != null) {
i++;
}
}
}
} else {
Object o = map.get(key);
if (o != null) {
i++;
}
}
}
if (i > 0) {
dataList.add(map);
}
}
//复杂表头-表头和数据处理
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(YysGroupConstant.getColumnData(), ColumnDataModel.class);
List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
}
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
}
String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
String temporaryFilePath = configValueUtil.getTemporaryFilePath();
FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
vo.setName(fileInfo.getFilename());
vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
} catch (Exception e) {
log.error("信息导出Excel错误:{}", e.getMessage());
e.printStackTrace();
}
return vo;
}
/**
*
* @param id
* @param yysGroupForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysGroupForm yysGroupForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
yysGroupForm.setId(id);
if (!isImport) {
String b = yysGroupService.checkForm(yysGroupForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
}
YysGroupEntity entity= yysGroupService.getInfo(id);
if(entity!=null){
try{
yysGroupService.saveOrUpdate(yysGroupForm,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){
YysGroupEntity entity= yysGroupService.getInfo(id);
if(entity!=null){
//假删除
entity.setDeleteMark(1);
yysGroupService.update(id,entity);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
YysGroupEntity entity= yysGroupService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> yysGroupMap=JsonUtil.entityToMap(entity);
yysGroupMap.put("id", yysGroupMap.get("id"));
//副表数据
//子表数据
yysGroupMap = generaterSwapUtil.swapDataDetail(yysGroupMap,YysGroupConstant.getFormData(),"590181470316795141",false);
return ActionResult.success(yysGroupMap);
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
YysGroupEntity entity= yysGroupService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> yysGroupMap=JsonUtil.entityToMap(entity);
yysGroupMap.put("id", yysGroupMap.get("id"));
//副表数据
//子表数据
yysGroupMap = generaterSwapUtil.swapDataForm(yysGroupMap,YysGroupConstant.getFormData(),YysGroupConstant.TABLEFIELDKEY,YysGroupConstant.TABLERENAMES);
return ActionResult.success(yysGroupMap);
}
}

@ -0,0 +1,51 @@
package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Data
@TableName("yys_calendar")
public class YysCalendarEntity {
@TableId(value ="ID" )
private String id;
@TableField(value = "YEARS" , updateStrategy = FieldStrategy.IGNORED)
private String years;
@TableField("DAY")
private String day;
@TableField("IS_HOLIDAY")
private String isHoliday;
@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("COMPANY_ID")
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("ORGANIZE_JSON_ID")
private String organizeJsonId;
@TableField("F_VERSION")
private Integer version;
@TableField("F_FLOW_ID")
private String flowId;
}

@ -0,0 +1,55 @@
package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Data
@TableName("yys_group")
public class YysGroupEntity {
@TableId(value ="ID" )
private String id;
@TableField(value = "GROUP_NAME" , updateStrategy = FieldStrategy.IGNORED)
private String groupName;
@TableField(value = "GROUP_TYPE" , updateStrategy = FieldStrategy.IGNORED)
private String groupType;
@TableField(value = "LEADER" , updateStrategy = FieldStrategy.IGNORED)
private String leader;
@TableField(value = "MEMBER" , updateStrategy = FieldStrategy.IGNORED)
private String member;
@TableField(value = "ENABLED_STATUS" , updateStrategy = FieldStrategy.IGNORED)
private String enabledStatus;
@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("COMPANY_ID")
private String companyId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("ORGANIZE_JSON_ID")
private String organizeJsonId;
@TableField("F_VERSION")
private Integer version;
@TableField("F_FLOW_ID")
private String flowId;
}

@ -0,0 +1,37 @@
package jnpf.model.yyscalendar;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* yysCalendar
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Data
public class YysCalendarForm {
/**
*
*/
private String id;
/**
*
**/
@JsonProperty("version")
private Integer version;
/**
*
**/
@JsonProperty("years")
private String years;
private String isHoliday;
}

@ -0,0 +1,33 @@
package jnpf.model.yyscalendar;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
/**
*
* yysCalendar
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Data
public class YysCalendarPagination 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("years")
private Object years;
}

@ -0,0 +1,38 @@
package jnpf.model.yysgroup;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* yysGroup
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Data
public class YysGroupForm {
/** 主键 */
private String id;
/** 乐观锁 **/
@JsonProperty("version")
private Integer version;
/** 班组名称 **/
@JsonProperty("groupName")
private String groupName;
/** 班组类型 **/
@JsonProperty("groupType")
private Object groupType;
/** 组长 **/
@JsonProperty("leader")
private Object leader;
/** 成员 **/
@JsonProperty("member")
private Object member;
/** 启用状态 **/
@JsonProperty("enabledStatus")
private Object enabledStatus;
}

@ -0,0 +1,36 @@
package jnpf.model.yysgroup;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
/**
*
* yysGroup
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-08-05
*/
@Data
public class YysGroupPagination 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("groupName")
private Object groupName;
/** 启用状态 */
@JsonProperty("enabledStatus")
private Object enabledStatus;
}

@ -0,0 +1,91 @@
<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="years" >
<p>{{dataForm.years}}</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 :'',
years : 1722441600000,
},
}
},
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/example/YysCalendar/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
},
}
</script>

@ -0,0 +1,2 @@
const columnList = [{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM","fullName":"年月","label":"年月","sortable":false,"align":"left","type":"month","__config__":{"endRelationField":"","defaultValue":1722441600000,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"yys_calendar","renderKey":1722847742112,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":101,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"年月","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"prop":"years","width":0,"__vModel__":"years","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"years","placeholder":"请选择年月","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}]
export default columnList

@ -0,0 +1,402 @@
<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="years">
<JnpfDatePicker v-model="dataForm.years" @change="changeData('years', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择年月" clearable :style='{ "width": "100%" }' type="month"
format="yyyy-MM">
</JnpfDatePicker>
</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: {
years: 1722441600000,
version: 0,
},
tableRequiredData: {},
dataRule:
{
years: [
{
required: true,
message: '请至少选择一个',
trigger: 'change'
},
],
},
childIndex: -1,
isEdit: false,
interfaceRes: {
years: [],
},
}
},
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/example/YysCalendar/' + 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/example/YysCalendar/' + 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/example/YysCalendar',
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/example/YysCalendar/' + 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;
let aaa = _data.years;
const date = new Date(aaa);
const year = date.getFullYear().toString();
const month = (date.getMonth() + 1).toString().padStart(2, '0');
_data.years = `${year}${month}`;
return _data;
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex = -1
},
},
}
</script>

@ -0,0 +1,447 @@
<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="年月">
<JnpfDatePicker v-model="query.years" format="yyyy-MM" startPlaceholder="开始日期"
endPlaceholder="结束日期">
</JnpfDatePicker>
</el-form-item>
</el-col>
<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-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>
<el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()">
</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="years" label="年月" align="center">
</el-table-column>
<el-table-column prop="day" label="日期" align="center">
</el-table-column>
<el-table-column prop="isHoliday" label="是否节假日" align="center">
<template slot-scope="scope">
<el-switch v-model="scope.row.isHoliday" :active-value="1" :inactive-value="2"
@change="handleHolidayChange(scope.$index, scope.row)">
</el-switch>
</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,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
years: undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: false,
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
handleHolidayChange(index, row) {
let _query = {
id: row.id,
isHoliday: row.isHoliday
};
request({
url: `/api/example/YysCalendar/updateStatus`,
method: 'post',
data: _query
}).then(res => {
this.listLoading = false
})
},
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: '590186598289642885',
type: 1,
};
if (_query.years != undefined) {
let aaa = _query.years;
const date = new Date(aaa);
const year = date.getFullYear().toString();
const month = (date.getMonth() + 1).toString().padStart(2, '0');
_query.years = `${year}${month}`;
}
request({
url: `/api/example/YysCalendar/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/example/YysCalendar/${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("", "example/YysCalendar")
})
},
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/example/YysCalendar/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>

@ -0,0 +1,2 @@
const superQueryJson = [{"clearable":true,"format":"yyyy-MM","fullName":"年月","type":"month","__config__":{"endRelationField":"","defaultValue":1722441600000,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"yys_calendar","renderKey":1722847742112,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":101,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"年月","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"__vModel__":"years","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"years","placeholder":"请选择年月","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}]
export default superQueryJson

@ -44,18 +44,18 @@
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod">
<el-table-column prop="classesName" label="班次名称" align="left">
<el-table-column prop="classesName" label="班次名称" align="center">
</el-table-column>
<el-table-column prop="startTime" label="开始时间" align="left">
<el-table-column prop="startTime" label="开始时间" align="center">
</el-table-column>
<el-table-column prop="endTime" label="结束时间" align="left">
<el-table-column prop="endTime" label="结束时间" align="center">
</el-table-column>
<el-table-column prop="classesDuration" label="班次时长(h)" align="left">
<el-table-column prop="classesDuration" label="班次时长(h)" align="center">
<template slot-scope="scope" v-if="scope.row.classesDuration">
<JnpfNumber v-model="scope.row.classesDuration" :thousands="false" />
</template>
</el-table-column>
<el-table-column label="启用状态" prop="enabledStatus" algin="left">
<el-table-column label="启用状态" prop="enabledStatus" align="center">
<!-- <template slot-scope="scope">
{{ scope.row.enabledStatus }}
</template> -->

@ -1,76 +1,68 @@
<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-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" >
<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="deviceCode" >
<jnpf-form-tip-item label="设备编号" prop="deviceCode">
<JnpfInput v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)"
placeholder="请输入设备编号" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="设备名称" prop="deviceName" >
<jnpf-form-tip-item label="设备名称" prop="deviceName">
<JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName', -1)"
placeholder="请输入设备名称" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="所属部门" prop="deviceDept" >
<jnpf-form-tip-item label="所属部门" prop="deviceDept">
<JnpfDepSelect v-model="dataForm.deviceDept" @change="changeData('deviceDept', -1)"
placeholder="请选择所属部门" selectType="all" :ableIds="ableAll.deviceDeptableIds" clearable :style='{"width":"100%"}'>
placeholder="请选择所属部门" selectType="all" :ableIds="ableAll.deviceDeptableIds" clearable
:style='{ "width": "100%" }'>
</JnpfDepSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="8小时产量" prop="eightOutput" >
<jnpf-form-tip-item label="8小时产量" prop="eightOutput">
<JnpfInput v-model="dataForm.eightOutput" @change="changeData('eightOutput', -1)"
placeholder="请输入8小时产量" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="12小时产量" prop="twelveOutput" >
<jnpf-form-tip-item label="12小时产量" prop="twelveOutput">
<JnpfInput v-model="dataForm.twelveOutput" @change="changeData('twelveOutput', -1)"
placeholder="请输入12小时产量" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="设备类型" prop="deivceType" >
<jnpf-form-tip-item label="设备类型" prop="deivceType">
<JnpfSelect v-model="dataForm.deivceType" @change="changeData('deivceType', -1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="deivceTypeOptions" :props="deivceTypeProps" >
placeholder="请选择" clearable :style='{ "width": "100%" }' :options="deivceTypeOptions"
:props="deivceTypeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item
label="启用状态" prop="enabledStatus" >
<jnpf-form-tip-item label="启用状态" prop="enabledStatus">
<JnpfSelect v-model="dataForm.enabledStatus" @change="changeData('enabledStatus', -1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="enabledStatusOptions" :props="enabledStatusProps" >
placeholder="请选择" clearable :style='{ "width": "100%" }' :options="enabledStatusOptions"
:props="enabledStatusProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
<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">
@ -136,7 +128,7 @@
eightOutput: undefined,
twelveOutput: undefined,
deivceType: undefined,
enabledStatus : undefined,
enabledStatus: "1",
},
tableRequiredData: {},
dataRule:

@ -1,10 +1,3 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -18,8 +11,7 @@
<el-col :span="6">
<el-form-item label="启用状态">
<JnpfSelect v-model="query.enabledStatus" placeholder="请选择" clearable
:options="enabledStatusOptions"
:props="enabledStatusProps" multiple >
:options="enabledStatusOptions" :props="enabledStatusProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
@ -36,7 +28,7 @@
<div>
<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="success" icon="icon-ym icon-ym-btn-download" @click="exportData()">
</el-button>
</div>
<div class="JNPF-common-head-right">
@ -51,61 +43,44 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"
>
<el-table-column
prop="deviceCode"
label="设备编号" align="left"
>
:span-method="arraySpanMethod">
<el-table-column prop="deviceCode" label="设备编号" align="center">
</el-table-column>
<el-table-column
prop="deviceName"
label="设备名称" align="left"
>
<el-table-column prop="deviceName" label="设备名称" align="center">
</el-table-column>
<el-table-column
prop="deviceDept"
label="所属部门" align="left"
>
<el-table-column prop="deviceDept" label="所属部门" align="center">
</el-table-column>
<el-table-column
prop="eightOutput"
label="8小时产量" align="left"
>
<el-table-column prop="eightOutput" label="8小时产量" align="center">
</el-table-column>
<el-table-column
prop="twelveOutput"
label="12小时产量" align="left"
>
<el-table-column prop="twelveOutput" label="12小时产量" align="center">
</el-table-column>
<el-table-column label="设备类型" prop="deivceType" algin="left"
>
<el-table-column label="设备类型" prop="deivceType" align="center">
<template slot-scope="scope">
{{ scope.row.deivceType }}
</template>
</el-table-column>
<el-table-column label="启用状态" prop="enabledStatus" algin="left"
>
<template slot-scope="scope">
<el-table-column label="启用状态" prop="enabledStatus" algin="center">
<!-- <template slot-scope="scope">
{{ scope.row.enabledStatus }}
</template> -->
<template slot-scope="scope">
<el-tag v-if="scope.row.enabledStatus == '启用'"></el-tag>
<el-tag type="success" v-else-if="scope.row.enabledStatus == ''">未启用</el-tag>
</template>
</el-table-column>
<el-table-column label="操作"
fixed="right" width="150" >
<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 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" />

@ -0,0 +1,123 @@
<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="groupName" >
<p>{{dataForm.groupName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="班组类型"
prop="groupType" >
<p>{{ dataForm.groupType }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="组长"
prop="leader" >
<p>{{dataForm.leader}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="成员"
prop="member" >
<p>{{dataForm.member}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="启用状态"
prop="enabledStatus" >
<p>{{ dataForm.enabledStatus }} </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 :'',
groupName : '',
groupType : "",
leader : '',
member : "",
enabledStatus : "1",
},
groupTypeOptions:[{"fullName":"生产线","id":"1"},{"fullName":"包装线","id":"2"}],
groupTypeProps:{"label":"fullName","value":"id" },
enabledStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"未启用","id":"2"}],
enabledStatusProps:{"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/example/YysGroup/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,464 @@
<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="700px">
<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="groupName">
<JnpfInput v-model="dataForm.groupName" @change="changeData('groupName', -1)"
placeholder="请输入班组名称" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="班组类型" prop="groupType">
<JnpfSelect v-model="dataForm.groupType" @change="changeData('groupType', -1)"
placeholder="请选择班组类型" clearable :style='{ "width": "100%" }' :options="groupTypeOptions"
:props="groupTypeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="组长" prop="leader">
<JnpfUserSelect v-model="dataForm.leader" @change="changeData('leader', -1)"
placeholder="请选择组长" selectType="all" :ableIds="ableAll.leaderableIds" clearable
:style='{ "width": "100%" }'>
</JnpfUserSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="成员" prop="member">
<JnpfUserSelect v-model="dataForm.member" @change="changeData('member', -1)"
placeholder="请选择成员" selectType="all" :ableIds="ableAll.memberableIds" clearable
:style='{ "width": "100%" }'>
</JnpfUserSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="启用状态" prop="enabledStatus">
<JnpfSelect v-model="dataForm.enabledStatus" @change="changeData('enabledStatus', -1)"
placeholder="请选择启用状态" clearable :style='{ "width": "100%" }'
:options="enabledStatusOptions" :props="enabledStatusProps">
</JnpfSelect>
</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: {
groupName: undefined,
groupType: undefined,
leader: undefined,
member: undefined,
enabledStatus: "1",
version: 0,
},
tableRequiredData: {},
dataRule:
{
groupName: [
{
required: true,
message: '请输入班组名称',
trigger: 'blur'
},
],
groupType: [
{
required: true,
message: '请选择班组类型',
trigger: 'change'
},
],
leader: [
{
required: true,
message: '请选择组长',
trigger: 'change'
},
],
member: [
{
required: true,
message: '请选择成员',
trigger: 'change'
},
],
enabledStatus: [
{
required: true,
message: '请至少选择一个',
trigger: 'change'
},
],
},
groupTypeOptions: [{ "fullName": "生产线", "id": "1" }, { "fullName": "包装线", "id": "2" }],
groupTypeProps: { "label": "fullName", "value": "id" },
enabledStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "未启用", "id": "2" }],
enabledStatusProps: { "label": "fullName", "value": "id" },
childIndex: -1,
isEdit: false,
interfaceRes: {
groupName: [],
groupType: [],
leader: [],
member: [],
enabledStatus: [],
},
}
},
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/example/YysGroup/' + 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/example/YysGroup/' + 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/example/YysGroup',
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/example/YysGroup/' + 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,456 @@
<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.groupName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="启用状态">
<JnpfSelect v-model="query.enabledStatus" placeholder="请选择启用状态" clearable
:options="enabledStatusOptions" :props="enabledStatusProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<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-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>
<el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()">
</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="groupName" label="班组名称" align="center">
</el-table-column>
<el-table-column label="班组类型" prop="groupType" align="center">
<template slot-scope="scope">
{{ scope.row.groupType }}
</template>
</el-table-column>
<el-table-column prop="leader" label="组长" align="center">
</el-table-column>
<el-table-column prop="member" label="成员" align="center">
</el-table-column>
<el-table-column label="启用状态" prop="enabledStatus" align="center">
<!-- <template slot-scope="scope">
{{ scope.row.enabledStatus }}
</template> -->
<template slot-scope="scope">
<el-tag v-if="scope.row.enabledStatus == '启用'"></el-tag>
<el-tag type="success" v-else-if="scope.row.enabledStatus == ''">未启用</el-tag>
</template>
</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,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
groupName: undefined,
enabledStatus: 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,
groupTypeOptions: [{ "fullName": "生产线", "id": "1" }, { "fullName": "包装线", "id": "2" }],
groupTypeProps: { "label": "fullName", "value": "id" },
enabledStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "未启用", "id": "2" }],
enabledStatusProps: { "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: '590181470316795141',
type: 1,
};
request({
url: `/api/example/YysGroup/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/example/YysGroup/${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("", "example/YysGroup")
})
},
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/example/YysGroup/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>

@ -0,0 +1,2 @@
const superQueryJson = [{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"班组名称","addonAfter":"","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"班组名称","trigger":"blur","showLabel":true,"required":true,"tableName":"yys_group","renderKey":1722846415741,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"groupName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"groupName","placeholder":"请输入班组名称","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"班组类型","props":{"label":"fullName","value":"id"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"班组类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"yys_group","renderKey":1722846446702,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"options":[{"fullName":"生产线","id":"1"},{"fullName":"包装线","id":"2"}],"__vModel__":"groupType","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"groupType","placeholder":"请选择班组类型","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"ableIds":[],"multiple":false,"fullName":"组长","relationField":"","__config__":{"formId":103,"visibility":["pc","app"],"jnpfKey":"userSelect","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"组长","trigger":"change","showLabel":true,"required":true,"relationField":"","tableName":"yys_group","renderKey":1722846480279,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","defaultCurrent":false,"tag":"JnpfUserSelect","regList":[],"span":24},"__vModel__":"leader","style":{"width":"100%"},"selectType":"all","disabled":false,"id":"leader","placeholder":"请选择组长","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"ableIds":[],"multiple":false,"fullName":"成员","relationField":"","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"userSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"成员","trigger":"change","showLabel":true,"required":true,"relationField":"","tableName":"yys_group","renderKey":1722846506336,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-user","defaultCurrent":false,"tag":"JnpfUserSelect","regList":[],"span":24},"__vModel__":"member","style":{"width":"100%"},"selectType":"all","disabled":false,"id":"member","placeholder":"请选择成员","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"启用状态","props":{"label":"fullName","value":"id"},"__config__":{"formId":105,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"启用状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"yys_group","renderKey":1722846553507,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"options":[{"fullName":"启用","id":"1"},{"fullName":"未启用","id":"2"}],"__vModel__":"enabledStatus","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"enabledStatus","placeholder":"请选择启用状态","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}]
export default superQueryJson

@ -49,15 +49,15 @@
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod">
<el-table-column prop="postName" label="岗位名称" align="left">
<el-table-column prop="postName" label="岗位名称" align="center">
</el-table-column>
<el-table-column prop="postCode" label="岗位编码" align="left">
<el-table-column prop="postCode" label="岗位编码" align="center">
</el-table-column>
<el-table-column prop="postSort" label="岗位顺序" align="left">
<el-table-column prop="postSort" label="岗位顺序" align="center">
</el-table-column>
<el-table-column prop="reamrk" label="岗位备注" align="left">
<el-table-column prop="reamrk" label="岗位备注" align="center">
</el-table-column>
<el-table-column label="岗位状态" prop="postStatus" algin="left">
<el-table-column label="岗位状态" prop="postStatus" align="center">
<!-- <template slot-scope="scope">
{{ scope.row.postStatus }}
</template> -->

Loading…
Cancel
Save