feat():前端样式调整,后端接口完善;

master
jiyufei 2 months ago
parent 51d7a11f61
commit ce1a4df30e

@ -5,18 +5,26 @@ import jnpf.mapper.YysMaterialProcurementPlanMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.yysmaterialprocurementplan.*;
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;
@ -25,13 +33,17 @@ 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;
/**
*
* YysMaterialProcurementPlan
* V3.5
* https://www.jnpfsoft.com
@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity;
* 2024-08-08
*/
@Service
public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMaterialProcurementPlanMapper, YysMaterialProcurementPlanEntity> implements YysMaterialProcurementPlanService{
public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMaterialProcurementPlanMapper, YysMaterialProcurementPlanEntity> implements YysMaterialProcurementPlanService {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@ -48,341 +60,363 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
@Autowired
private YysMaterialProcurementItemService yysMaterialProcurementItemService;
@Override
public List<YysMaterialProcurementPlanEntity> getList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination){
return getTypeList(yysMaterialProcurementPlanPagination,yysMaterialProcurementPlanPagination.getDataType());
public List<YysMaterialProcurementPlanEntity> getList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) {
return getTypeList(yysMaterialProcurementPlanPagination, yysMaterialProcurementPlanPagination.getDataType());
}
/** 列表查询 */
/**
*
*/
@Override
public List<YysMaterialProcurementPlanEntity> getTypeList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>();
public List<YysMaterialProcurementPlanEntity> getTypeList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination, 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 ? YysMaterialProcurementPlanConstant.getAppColumnData() : YysMaterialProcurementPlanConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int yysMaterialProcurementPlanNum =0;
QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanQueryWrapper=new QueryWrapper<>();
int yysMaterialProcurementItemNum =0;
QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper=new QueryWrapper<>();
int total = 0;
int yysMaterialProcurementPlanNum = 0;
QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanQueryWrapper = new QueryWrapper<>();
int yysMaterialProcurementItemNum = 0;
QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper = new QueryWrapper<>();
long yysMaterialProcurementItemcount = yysMaterialProcurementItemService.count();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getSuperQueryJson())){
String superOp = "";
if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = yysMaterialProcurementPlanPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>();
yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper,YysMaterialProcurementPlanEntity.class,queryJson,"0"));
yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper, YysMaterialProcurementPlanEntity.class, queryJson, "0"));
int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size();
if (yysMaterialProcurementPlanNum1>0){
List<String> yysMaterialProcurementPlanList =this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList());
if (yysMaterialProcurementPlanNum1 > 0) {
List<String> yysMaterialProcurementPlanList = this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysMaterialProcurementPlanList);
intersectionSuperList.add(yysMaterialProcurementPlanList);
superNum++;
}
String YysMaterialProcurementItemTable = "yys_material_procurement_item";
boolean YysMaterialProcurementItemHasSql = queryJson.contains(YysMaterialProcurementItemTable);
List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable , queryJson, null);
if (YysMaterialProcurementItemHasSql){
List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable, queryJson, null);
if (YysMaterialProcurementItemHasSql) {
allSuperList.addAll(yysMaterialProcurementItemList);
intersectionSuperList.add(yysMaterialProcurementItemList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if(superOp.equalsIgnoreCase("and")){
if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{
} else {
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)){
String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>();
yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper,YysMaterialProcurementPlanEntity.class,ruleJson,"0"));
yysMaterialProcurementPlanSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysMaterialProcurementPlanSuperWrapper, YysMaterialProcurementPlanEntity.class, ruleJson, "0"));
int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size();
if (yysMaterialProcurementPlanNum1>0){
List<String> yysMaterialProcurementPlanList =this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList());
if (yysMaterialProcurementPlanNum1 > 0) {
List<String> yysMaterialProcurementPlanList = this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysMaterialProcurementPlanList);
intersectionRuleList.add(yysMaterialProcurementPlanList);
ruleNum++;
}
String YysMaterialProcurementItemTable = "yys_material_procurement_item";
boolean YysMaterialProcurementItemHasSql = ruleJson.contains(YysMaterialProcurementItemTable);
List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable , ruleJson, null);
if (YysMaterialProcurementItemHasSql){
List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable, ruleJson, null);
if (YysMaterialProcurementItemHasSql) {
allRuleList.addAll(yysMaterialProcurementItemList);
intersectionRuleList.add(yysMaterialProcurementItemList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if(ruleOp.equalsIgnoreCase("and")){
if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{
} else {
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysMaterialProcurementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper,YysMaterialProcurementPlanEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)){
return new ArrayList<>();
} else {
yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>)yysMaterialProcurementPlanObj;
if( yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size()>0){
yysMaterialProcurementPlanNum++;
}
}
Object yysMaterialProcurementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper,YysMaterialProcurementItemEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)){
return new ArrayList<>();
} else {
yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>)yysMaterialProcurementItemObj;
if( yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size()>0){
yysMaterialProcurementItemNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object yysMaterialProcurementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper,YysMaterialProcurementPlanEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)){
return new ArrayList<>();
} else {
yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>)yysMaterialProcurementPlanObj;
if( yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size()>0){
yysMaterialProcurementPlanNum++;
}
boolean pcPermission = true;
boolean appPermission = false;
if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysMaterialProcurementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper, YysMaterialProcurementPlanEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)) {
return new ArrayList<>();
} else {
yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>) yysMaterialProcurementPlanObj;
if (yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementPlanNum++;
}
}
Object yysMaterialProcurementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper, YysMaterialProcurementItemEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)) {
return new ArrayList<>();
} else {
yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>) yysMaterialProcurementItemObj;
if (yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementItemNum++;
}
}
}
}
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysMaterialProcurementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper, YysMaterialProcurementPlanEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)) {
return new ArrayList<>();
} else {
yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>) yysMaterialProcurementPlanObj;
if (yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementPlanNum++;
}
}
Object yysMaterialProcurementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper,YysMaterialProcurementItemEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)){
return new ArrayList<>();
} else {
yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>)yysMaterialProcurementItemObj;
if( yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size()>0){
yysMaterialProcurementItemNum++;
}
}
Object yysMaterialProcurementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper, YysMaterialProcurementItemEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)) {
return new ArrayList<>();
} else {
yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>) yysMaterialProcurementItemObj;
if (yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementItemNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementNumber())){
yysMaterialProcurementPlanNum++;
}
}
if (isPc) {
if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementNumber())) {
yysMaterialProcurementPlanNum++;
String value = yysMaterialProcurementPlanPagination.getProcurementNumber() instanceof List ?
JsonUtil.getObjectToString(yysMaterialProcurementPlanPagination.getProcurementNumber()) :
String.valueOf(yysMaterialProcurementPlanPagination.getProcurementNumber());
yysMaterialProcurementPlanQueryWrapper.lambda().like(YysMaterialProcurementPlanEntity::getProcurementNumber,value);
JsonUtil.getObjectToString(yysMaterialProcurementPlanPagination.getProcurementNumber()) :
String.valueOf(yysMaterialProcurementPlanPagination.getProcurementNumber());
yysMaterialProcurementPlanQueryWrapper.lambda().like(YysMaterialProcurementPlanEntity::getProcurementNumber, value);
}
if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementYearMonth())){
yysMaterialProcurementPlanNum++;
if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementYearMonth())) {
yysMaterialProcurementPlanNum++;
List ProcurementYearMonthList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementYearMonth(),String.class);
Long fir = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(0)));
Long sec = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(1)));
List ProcurementYearMonthList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementYearMonth(), String.class);
Long fir = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(0)));
Long sec = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(1)));
yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementYearMonth, new Date(fir))
.le(YysMaterialProcurementPlanEntity::getProcurementYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementYearMonth, new Date(fir))
.le(YysMaterialProcurementPlanEntity::getProcurementYearMonth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementDate())){
yysMaterialProcurementPlanNum++;
if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementDate())) {
yysMaterialProcurementPlanNum++;
List ProcurementDateList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementDate(),String.class);
Long fir = Long.valueOf(String.valueOf(ProcurementDateList.get(0)));
Long sec = Long.valueOf(String.valueOf(ProcurementDateList.get(1)));
List ProcurementDateList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementDate(), String.class);
Long fir = Long.valueOf(String.valueOf(ProcurementDateList.get(0)));
Long sec = Long.valueOf(String.valueOf(ProcurementDateList.get(1)));
yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementDate, new Date(fir))
.le(YysMaterialProcurementPlanEntity::getProcurementDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
yysMaterialProcurementPlanQueryWrapper.lambda().ge(YysMaterialProcurementPlanEntity::getProcurementDate, new Date(fir))
.le(YysMaterialProcurementPlanEntity::getProcurementDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
}
if(yysMaterialProcurementItemNum>0){
List<String> yysMaterialProcurementItemIdList = yysMaterialProcurementItemService.list(yysMaterialProcurementItemQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getMaterialProcurementPlanId())).map(t->t.getMaterialProcurementPlanId()).collect(Collectors.toList());
if (yysMaterialProcurementItemNum > 0) {
List<String> yysMaterialProcurementItemIdList = yysMaterialProcurementItemService.list(yysMaterialProcurementItemQueryWrapper).stream().filter(t -> StringUtil.isNotEmpty(t.getMaterialProcurementPlanId())).map(t -> t.getMaterialProcurementPlanId()).collect(Collectors.toList());
long count = yysMaterialProcurementItemService.count();
if (count>0){
intersectionList.add(yysMaterialProcurementItemIdList);
if (count > 0) {
intersectionList.add(yysMaterialProcurementItemIdList);
}
AllIdList.addAll(yysMaterialProcurementItemIdList);
}
total+=yysMaterialProcurementItemNum;
}
total += yysMaterialProcurementItemNum;
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
if (total > 0) {
if (intersection.size() == 0) {
intersection.add("jnpfNullList");
}
yysMaterialProcurementPlanQueryWrapper.lambda().in(YysMaterialProcurementPlanEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
yysMaterialProcurementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialProcurementPlanEntity::getId, finalAllSuperIDlist));
yysMaterialProcurementPlanQueryWrapper.lambda().and(t -> t.in(YysMaterialProcurementPlanEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
yysMaterialProcurementPlanQueryWrapper.lambda().and(t->t.in(YysMaterialProcurementPlanEntity::getId, finalAllRuleIDlist));
yysMaterialProcurementPlanQueryWrapper.lambda().and(t -> t.in(YysMaterialProcurementPlanEntity::getId, finalAllRuleIDlist));
}
//假删除标志
yysMaterialProcurementPlanQueryWrapper.lambda().isNull(YysMaterialProcurementPlanEntity::getDeleteMark);
//排序
if(StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSidx())){
if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSidx())) {
yysMaterialProcurementPlanQueryWrapper.lambda().orderByDesc(YysMaterialProcurementPlanEntity::getProcurementDate);
}else{
} else {
try {
String sidx = yysMaterialProcurementPlanPagination.getSidx();
String[] strs= sidx.split("_name");
String[] strs = sidx.split("_name");
YysMaterialProcurementPlanEntity yysMaterialProcurementPlanEntity = new YysMaterialProcurementPlanEntity();
Field declaredField = yysMaterialProcurementPlanEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
yysMaterialProcurementPlanQueryWrapper="asc".equals(yysMaterialProcurementPlanPagination.getSort().toLowerCase())?yysMaterialProcurementPlanQueryWrapper.orderByAsc(value):yysMaterialProcurementPlanQueryWrapper.orderByDesc(value);
yysMaterialProcurementPlanQueryWrapper = "asc".equals(yysMaterialProcurementPlanPagination.getSort().toLowerCase()) ? yysMaterialProcurementPlanQueryWrapper.orderByAsc(value) : yysMaterialProcurementPlanQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<YysMaterialProcurementPlanEntity> page=new Page<>(yysMaterialProcurementPlanPagination.getCurrentPage(), yysMaterialProcurementPlanPagination.getPageSize());
IPage<YysMaterialProcurementPlanEntity> userIPage=this.page(page, yysMaterialProcurementPlanQueryWrapper);
return yysMaterialProcurementPlanPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
if ("0".equals(dataType)) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<YysMaterialProcurementPlanEntity> page = new Page<>(yysMaterialProcurementPlanPagination.getCurrentPage(), yysMaterialProcurementPlanPagination.getPageSize());
IPage<YysMaterialProcurementPlanEntity> userIPage = this.page(page, yysMaterialProcurementPlanQueryWrapper);
return yysMaterialProcurementPlanPagination.setData(userIPage.getRecords(), userIPage.getTotal());
} else {
List<YysMaterialProcurementPlanEntity> list = new ArrayList();
return yysMaterialProcurementPlanPagination.setData(list, list.size());
}
}else{
} else {
return this.list(yysMaterialProcurementPlanQueryWrapper);
}
}
@Override
public YysMaterialProcurementPlanEntity getInfo(String id){
QueryWrapper<YysMaterialProcurementPlanEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialProcurementPlanEntity::getId,id);
public YysMaterialProcurementPlanEntity getInfo(String id) {
QueryWrapper<YysMaterialProcurementPlanEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialProcurementPlanEntity::getId, id);
return this.getOne(queryWrapper);
}
@Override
public void create(YysMaterialProcurementPlanEntity entity){
public void create(YysMaterialProcurementPlanEntity entity) {
this.save(entity);
}
@Override
public boolean update(String id, YysMaterialProcurementPlanEntity entity){
public boolean update(String id, YysMaterialProcurementPlanEntity entity) {
return this.updateById(entity);
}
@Override
public void delete(YysMaterialProcurementPlanEntity entity){
if(entity!=null){
public void delete(YysMaterialProcurementPlanEntity entity) {
if (entity != null) {
this.removeById(entity.getId());
}
}
/** YysMaterialProcurementItem子表方法 */
/**
* YysMaterialProcurementItem
*/
@Override
public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id,YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination){
Map<String, Object> newtabMap=YysMaterialProcurementPlanConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey()));
String tableName="yysMaterialProcurementItem";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString();
public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id, YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) {
Map<String, Object> newtabMap = YysMaterialProcurementPlanConstant.TABLEFIELDKEY.entrySet()
.stream().collect(Collectors.toMap(e -> e.getValue(), e -> e.getKey()));
String tableName = "yysMaterialProcurementItem";
tableName = newtabMap.get(tableName) == null ? tableName : newtabMap.get(tableName).toString();
QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = yysMaterialProcurementItemService.getChild(yysMaterialProcurementPlanPagination,queryWrapper);
queryWrapper = yysMaterialProcurementItemService.getChild(yysMaterialProcurementPlanPagination, queryWrapper);
queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id);
generaterSwapUtil.wrapperHandle(YysMaterialProcurementPlanConstant.getColumnData(), YysMaterialProcurementPlanConstant.getAppColumnData(), queryWrapper,YysMaterialProcurementItemEntity.class,"sub",tableName);
generaterSwapUtil.wrapperHandle(YysMaterialProcurementPlanConstant.getColumnData(), YysMaterialProcurementPlanConstant.getAppColumnData(), queryWrapper, YysMaterialProcurementItemEntity.class, "sub", tableName);
return yysMaterialProcurementItemService.list(queryWrapper);
}
/** YysMaterialProcurementItem子表方法 */
/**
* YysMaterialProcurementItem
*/
@Override
public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id){
public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id) {
QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id);
return yysMaterialProcurementItemService.list(queryWrapper);
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
/**
* i-0-1
*/
@Override
public String checkForm(YysMaterialProcurementPlanForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
public String checkForm(YysMaterialProcurementPlanForm form, int i) {
boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id = "";
String countRecover = "";
if (isUp){
if (isUp) {
id = form.getId();
}
//主表字段验证
//子表字段验证
if (form.getYysMaterialProcurementItemList()!=null){
}
if (form.getYysMaterialProcurementItemList() != null) {
}
return countRecover;
}
/**
* ()
* @param id
* @param yysMaterialProcurementPlanForm
* @return
*/
* ()
*
* @param id
* @param yysMaterialProcurementPlanForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
public void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm, String id, boolean isSave) throws Exception {
UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
yysMaterialProcurementPlanForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(YysMaterialProcurementPlanConstant.getFormData(),yysMaterialProcurementPlanForm),YysMaterialProcurementPlanForm.class);
generaterSwapUtil.swapDatetime(YysMaterialProcurementPlanConstant.getFormData(), yysMaterialProcurementPlanForm), YysMaterialProcurementPlanForm.class);
YysMaterialProcurementPlanEntity entity = JsonUtil.getJsonToBean(yysMaterialProcurementPlanForm, YysMaterialProcurementPlanEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
if (isSave) {
String mainId = RandomUtil.uuId();
entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
entity.setId(mainId);
}else{
//entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
} else {
//entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
}
this.saveOrUpdate(entity);
//YysMaterialProcurementItem子表数据新增修改
if(!isSave){
if (!isSave) {
QueryWrapper<YysMaterialProcurementItemEntity> YysMaterialProcurementItemqueryWrapper = new QueryWrapper<>();
YysMaterialProcurementItemqueryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, entity.getId());
yysMaterialProcurementItemService.remove(YysMaterialProcurementItemqueryWrapper);
}
if (yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList()!=null){
List<YysMaterialProcurementItemEntity> tableField107 = JsonUtil.getJsonToList(yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList(),YysMaterialProcurementItemEntity.class);
for(YysMaterialProcurementItemEntity entitys : tableField107){
if (yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList() != null) {
List<YysMaterialProcurementItemEntity> tableField107 = JsonUtil.getJsonToList(yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList(), YysMaterialProcurementItemEntity.class);
for (YysMaterialProcurementItemEntity entitys : tableField107) {
entitys.setId(RandomUtil.uuId());
entitys.setMaterialProcurementPlanId(entity.getId());
if(isSave){
}else{
if (isSave) {
} else {
}
yysMaterialProcurementItemService.saveOrUpdate(entitys);
}
//每次修改的时候去修改下 采购表的修改时间和创建用户 其次统计数量
entity.setLastModifyTime(DateUtil.getNowDate());
entity.setLastModifyUserId(userInfo.getUserId());
this.saveOrUpdate(entity);
}
}
}

@ -183,6 +183,10 @@ public class YysDeviceUpkeepController {
}
Map<String, Object> yysDeviceUpkeepMap = JsonUtil.entityToMap(entity);
yysDeviceUpkeepMap.put("id", yysDeviceUpkeepMap.get("id"));
yysDeviceUpkeepMap.put("creatorUserId", userService.getInfo(yysDeviceUpkeepMap.get("creatorUserId").toString()).getRealName());
if (yysDeviceUpkeepMap.containsKey("lastModifyUserId")){
yysDeviceUpkeepMap.put("lastModifyUserId", userService.getInfo(yysDeviceUpkeepMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据
//子表数据
List<YysdeviceunkeeplogsEntity> yysdeviceunkeeplogsList = yysDeviceUpkeepService.getYysdeviceunkeeplogsList(entity.getId());
@ -208,7 +212,9 @@ public class YysDeviceUpkeepController {
Map<String, Object> yysDeviceUpkeepMap = JsonUtil.entityToMap(entity);
yysDeviceUpkeepMap.put("id", yysDeviceUpkeepMap.get("id"));
yysDeviceUpkeepMap.put("creatorUserId", userService.getInfo(yysDeviceUpkeepMap.get("creatorUserId").toString()).getRealName());
yysDeviceUpkeepMap.put("lastModifyUserId", userService.getInfo(yysDeviceUpkeepMap.get("lastModifyUserId").toString()).getRealName());
if (yysDeviceUpkeepMap.containsKey("lastModifyUserId")){
yysDeviceUpkeepMap.put("lastModifyUserId", userService.getInfo(yysDeviceUpkeepMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据
//子表数据
List<YysdeviceunkeeplogsEntity> yysdeviceunkeeplogsList = yysDeviceUpkeepService.getYysdeviceunkeeplogsList(entity.getId());

@ -8,23 +8,30 @@ import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.permission.service.UserService;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.yysmaterialprocurementplan.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
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;
@ -36,7 +43,9 @@ 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;
@ -51,6 +60,7 @@ import org.springframework.transaction.annotation.Transactional;
/**
* YysMaterialProcurementPlan
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
@ -58,7 +68,7 @@ import org.springframework.transaction.annotation.Transactional;
*/
@Slf4j
@RestController
@Tag(name = "YysMaterialProcurementPlan" , description = "example")
@Tag(name = "YysMaterialProcurementPlan", description = "example")
@RequestMapping("/api/example/YysMaterialProcurementPlan")
public class YysMaterialProcurementPlanController {
@ -78,28 +88,34 @@ public class YysMaterialProcurementPlanController {
@Autowired
private ConfigValueUtil configValueUtil;
@Resource
private UserService userService;
/**
*
*
* @param yysMaterialProcurementPlanPagination
* @return
*/
*
*
* @param yysMaterialProcurementPlanPagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination)throws IOException{
List<YysMaterialProcurementPlanEntity> list= yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination);
List<Map<String, Object>> realList=new ArrayList<>();
public ActionResult list(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) throws IOException {
List<YysMaterialProcurementPlanEntity> list = yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination);
List<Map<String, Object>> realList = new ArrayList<>();
for (YysMaterialProcurementPlanEntity entity : list) {
Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
//副表数据
//子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(),yysMaterialProcurementPlanPagination);
yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
if (StringUtils.isNoneBlank(yysMaterialProcurementPlanMap.get("creatorUserId").toString())) {
yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName());
}
//副表数据
//子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(), yysMaterialProcurementPlanPagination);
yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
realList.add(yysMaterialProcurementPlanMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(),false);
realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(), false);
//返回对象
PageListVO vo = new PageListVO();
@ -108,108 +124,110 @@ public class YysMaterialProcurementPlanController {
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param yysMaterialProcurementPlanForm
* @return
*/
*
*
* @param yysMaterialProcurementPlanForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm) {
String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm, 0);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
try{
yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, null ,true);
}catch(Exception e){
try {
yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, null, true);
} catch (Exception e) {
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
* Excel
*
* @return
*/
* Excel
*
* @return
*/
@Operation(summary = "导出Excel")
@PostMapping("/Actions/Export")
public ActionResult Export(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) throws IOException {
if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())){
if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())) {
return ActionResult.fail("请选择导出字段");
}
List<YysMaterialProcurementPlanEntity> list= yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination);
List<Map<String, Object>> realList=new ArrayList<>();
List<YysMaterialProcurementPlanEntity> list = yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination);
List<Map<String, Object>> realList = new ArrayList<>();
for (YysMaterialProcurementPlanEntity entity : list) {
Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
//副表数据
//子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(),yysMaterialProcurementPlanPagination);
yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
//副表数据
//子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(), yysMaterialProcurementPlanPagination);
yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
realList.add(yysMaterialProcurementPlanMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(),false);
String[]keys=!StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())?yysMaterialProcurementPlanPagination.getSelectKey():new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
realList = generaterSwapUtil.swapDataList(realList, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.getColumnData(), yysMaterialProcurementPlanPagination.getModuleId(), false);
String[] keys = !StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey()) ? yysMaterialProcurementPlanPagination.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){
ExcelExportEntity tableField107ExcelEntity = new ExcelExportEntity("物料明细","tableField107");
*
*/
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) {
ExcelExportEntity tableField107ExcelEntity = new ExcelExportEntity("物料明细", "tableField107");
List<ExcelExportEntity> tableField107List = new ArrayList<>();
for(String key:keys){
switch(key){
case "procurementNumber" :
entitys.add(new ExcelExportEntity("采购计划单号" ,"procurementNumber"));
break;
case "procurementDate" :
entitys.add(new ExcelExportEntity("单据日期" ,"procurementDate"));
break;
case "procurementYearMonth" :
entitys.add(new ExcelExportEntity("年月" ,"procurementYearMonth"));
break;
case "planNumber" :
entitys.add(new ExcelExportEntity("物料需求计划单号" ,"planNumber"));
break;
case "reamrk" :
entitys.add(new ExcelExportEntity("备注" ,"reamrk"));
break;
for (String key : keys) {
switch (key) {
case "procurementNumber":
entitys.add(new ExcelExportEntity("采购计划单号", "procurementNumber"));
break;
case "procurementDate":
entitys.add(new ExcelExportEntity("单据日期", "procurementDate"));
break;
case "procurementYearMonth":
entitys.add(new ExcelExportEntity("年月", "procurementYearMonth"));
break;
case "planNumber":
entitys.add(new ExcelExportEntity("物料需求计划单号", "planNumber"));
break;
case "reamrk":
entitys.add(new ExcelExportEntity("备注", "reamrk"));
break;
case "tableField107-materialCode":
tableField107List.add(new ExcelExportEntity("物料编码" ,"materialCode"));
break;
tableField107List.add(new ExcelExportEntity("物料编码", "materialCode"));
break;
case "tableField107-materialName":
tableField107List.add(new ExcelExportEntity("物料名称" ,"materialName"));
break;
tableField107List.add(new ExcelExportEntity("物料名称", "materialName"));
break;
case "tableField107-materialType":
tableField107List.add(new ExcelExportEntity("物料类型" ,"materialType"));
break;
tableField107List.add(new ExcelExportEntity("物料类型", "materialType"));
break;
case "tableField107-specification":
tableField107List.add(new ExcelExportEntity("规格型号" ,"specification"));
break;
tableField107List.add(new ExcelExportEntity("规格型号", "specification"));
break;
case "tableField107-lackNumber":
tableField107List.add(new ExcelExportEntity("欠缺量" ,"lackNumber"));
break;
tableField107List.add(new ExcelExportEntity("欠缺量", "lackNumber"));
break;
case "tableField107-procurementPlanNumber":
tableField107List.add(new ExcelExportEntity("拟采购量" ,"procurementPlanNumber"));
break;
tableField107List.add(new ExcelExportEntity("拟采购量", "procurementPlanNumber"));
break;
case "tableField107-unit":
tableField107List.add(new ExcelExportEntity("计量单位" ,"unit"));
break;
tableField107List.add(new ExcelExportEntity("计量单位", "unit"));
break;
default:
break;
break;
}
}
if(tableField107List.size() > 0){
if (tableField107List.size() > 0) {
tableField107ExcelEntity.setList(tableField107List);
entitys.add(tableField107ExcelEntity);
}
@ -217,10 +235,10 @@ public class YysMaterialProcurementPlanController {
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try{
try {
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){
if (list.size()==0){
if (entitys.size() > 0) {
if (list.size() == 0) {
list.add(new HashMap<>());
}
//去除空数据
@ -230,8 +248,8 @@ public class YysMaterialProcurementPlanController {
for (String key : keys) {
//子表
if (key.toLowerCase().startsWith("tablefield")) {
String tableField = key.substring(0, key.indexOf("-" ));
String field = key.substring(key.indexOf("-" ) + 1);
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;
@ -257,7 +275,7 @@ public class YysMaterialProcurementPlanController {
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);
dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
}
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
@ -274,94 +292,110 @@ public class YysMaterialProcurementPlanController {
}
return vo;
}
/**
*
* @param id
* @param yysMaterialProcurementPlanForm
* @return
*/
*
*
* @param id
* @param yysMaterialProcurementPlanForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,
@RequestParam(value = "isImport", required = false) boolean isImport) {
yysMaterialProcurementPlanForm.setId(id);
if (!isImport) {
String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm, 1);
if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b);
}
}
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id);
if(entity!=null){
try{
yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm,id,false);
}catch(Exception e){
YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if (entity != null) {
try {
yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, id, false);
} catch (Exception e) {
return ActionResult.fail("修改数据失败");
}
return ActionResult.success("更新成功");
}else{
} else {
return ActionResult.fail("更新失败,数据不存在");
}
}
/**
*
* @param id
* @return
*/
*
*
* @param id
* @return
*/
@Operation(summary = "删除")
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id);
if(entity!=null){
public ActionResult delete(@PathVariable("id") String id) {
YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if (entity != null) {
//假删除
entity.setDeleteMark(1);
yysMaterialProcurementPlanService.update(id,entity);
yysMaterialProcurementPlanService.update(id, entity);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
* @param id
* @return
*/
* ()
* 使-
*
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id);
if(entity==null){
public ActionResult detailInfo(@PathVariable("id") String id) {
YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity);
Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName());
if (yysMaterialProcurementPlanMap.containsKey("lastModifyUserId")) {
yysMaterialProcurementPlanMap.put("lastModifyUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据
//子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId());
yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialProcurementPlanMap,YysMaterialProcurementPlanConstant.getFormData(),"590930391657874309",false);
yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialProcurementPlanMap, YysMaterialProcurementPlanConstant.getFormData(), "590930391657874309", false);
return ActionResult.success(yysMaterialProcurementPlanMap);
}
/**
* ()
* 使-
* @param id
* @return
*/
* ()
* 使-
*
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id);
if(entity==null){
public ActionResult info(@PathVariable("id") String id) {
YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if (entity == null) {
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity);
Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
yysMaterialProcurementPlanMap.put("creatorUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("creatorUserId").toString()).getRealName());
if (yysMaterialProcurementPlanMap.containsKey("lastModifyUserId")) {
yysMaterialProcurementPlanMap.put("lastModifyUserId", userService.getInfo(yysMaterialProcurementPlanMap.get("lastModifyUserId").toString()).getRealName());
}
//副表数据
//子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId());
yysMaterialProcurementPlanMap.put("yysMaterialProcurementItemList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialProcurementPlanMap,YysMaterialProcurementPlanConstant.getFormData(),YysMaterialProcurementPlanConstant.TABLEFIELDKEY,YysMaterialProcurementPlanConstant.TABLERENAMES);
yysMaterialProcurementPlanMap.put("yysMaterialProcurementItemList", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialProcurementPlanMap, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.TABLEFIELDKEY, YysMaterialProcurementPlanConstant.TABLERENAMES);
return ActionResult.success(yysMaterialProcurementPlanMap);
}

@ -51,6 +51,8 @@
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border>
<el-table-column prop="manufactureTime" label="生产日期" align="center">

@ -1,260 +1,242 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<div class="options">
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
<jnpf-form-tip-item label="设备编码"
prop="deviceCode" >
<p>{{dataForm.deviceCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备名称"
prop="deviceName" >
<p>{{dataForm.deviceName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="购入日期"
prop="buyTime" >
<p>{{dataForm.buyTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="所属部门"
prop="deviceDept" >
<p>{{dataForm.deviceDept}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="维修次数"
prop="repairsNum" >
<JnpfNumber v-model="dataForm.repairsNum"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="保养次数"
prop="unkeepNum" >
<JnpfNumber v-model="dataForm.unkeepNum"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>检修记录</h2>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-table :data="dataForm.tableField108" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="unkeepType" label="维保类型" >
<template slot-scope="scope">
<p>{{ scope.row.unkeepType}}</p>
</template>
</el-table-column>
<el-table-column prop="startTime" label="维保开始时间" >
<template slot-scope="scope">
<p>{{scope.row.startTime}}</p>
</template>
</el-table-column>
<el-table-column prop="endTime" label="维保结束时间" >
<template slot-scope="scope">
<p>{{scope.row.endTime}}</p>
</template>
</el-table-column>
<el-table-column prop="hours" label="总耗时" >
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.hours"
placeholder="总耗时" disabled
:step="1" >
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="unkeepDetails" label="维保详细内容" >
<template slot-scope="scope">
<p>{{scope.row.unkeepDetails}}</p>
</template>
</el-table-column>
<el-table-column prop="solution" label="解决办法" >
<template slot-scope="scope">
<p>{{scope.row.solution}}</p>
</template>
</el-table-column>
<el-table-column prop="unkeepMember" label="维保人员" >
<template slot-scope="scope">
<p>{{scope.row.unkeepMember}}</p>
</template>
</el-table-column>
<el-table-column prop="changePartName" label="更换零配件名称" >
<template slot-scope="scope">
<p>{{scope.row.changePartName}}</p>
</template>
</el-table-column>
<el-table-column prop="models" label="规格型号" >
<template slot-scope="scope">
<p>{{scope.row.models}}</p>
</template>
</el-table-column>
<el-table-column prop="changNum" label="更换数量" >
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.changNum"
placeholder="更换数量" disabled
:step="1" >
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="unkeepDeviceStatus" label="维保后设备状态" >
<template slot-scope="scope">
<p>{{ scope.row.unkeepDeviceStatus}}</p>
</template>
</el-table-column>
<el-table-column prop="leader" label="操作组长" >
<template slot-scope="scope">
<p>{{scope.row.leader}}</p>
</template>
</el-table-column>
<el-table-column prop="estimatedTime" label="预估下次维保时间" >
<template slot-scope="scope">
<p>{{scope.row.estimatedTime}}</p>
</template>
</el-table-column>
<el-table-column prop="remarks" label="备注" >
<template slot-scope="scope">
<p>{{scope.row.remarks}}</p>
</template>
</el-table-column>
</el-table>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" >
<jnpf-form-tip-item label="创建人"
prop="creatorUserId" >
<p>{{dataForm.creatorUserId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" >
<jnpf-form-tip-item label="创建时间"
prop="creatorTime" >
<p>{{dataForm.creatorTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" >
<jnpf-form-tip-item label="修改人"
prop="lastModifyUserId" >
<p>{{dataForm.lastModifyUserId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" >
<jnpf-form-tip-item label="修改时间"
prop="lastModifyTime" >
<p>{{dataForm.lastModifyTime}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="8">
<jnpf-form-tip-item label="设备编码" prop="deviceCode">
<p>{{ dataForm.deviceCode }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="设备名称" prop="deviceName">
<p>{{ dataForm.deviceName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="购入日期" prop="buyTime">
<p>{{ dataForm.buyTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="所属部门" prop="deviceDept">
<p>{{ dataForm.deviceDept }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="维修次数" prop="repairsNum">
<JnpfNumber v-model="dataForm.repairsNum" placeholder="数字文本" disabled :step="1">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="保养次数" prop="unkeepNum">
<JnpfNumber v-model="dataForm.unkeepNum" placeholder="数字文本" disabled :step="1">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>检修记录</h2>
</div>
<el-table :data="dataForm.tableField108" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="unkeepType" label="维保类型">
<template slot-scope="scope">
<p>{{ scope.row.unkeepType }}</p>
</template>
</el-table-column>
<el-table-column prop="startTime" label="维保开始时间">
<template slot-scope="scope">
<p>{{ scope.row.startTime }}</p>
</template>
</el-table-column>
<el-table-column prop="endTime" label="维保结束时间">
<template slot-scope="scope">
<p>{{ scope.row.endTime }}</p>
</template>
</el-table-column>
<el-table-column prop="hours" label="总耗时">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.hours" placeholder="总耗时" disabled :step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="unkeepDetails" label="维保详细内容">
<template slot-scope="scope">
<p>{{ scope.row.unkeepDetails }}</p>
</template>
</el-table-column>
<el-table-column prop="solution" label="解决办法">
<template slot-scope="scope">
<p>{{ scope.row.solution }}</p>
</template>
</el-table-column>
<el-table-column prop="unkeepMember" label="维保人员">
<template slot-scope="scope">
<p>{{ scope.row.unkeepMember }}</p>
</template>
</el-table-column>
<el-table-column prop="changePartName" label="更换零配件名称">
<template slot-scope="scope">
<p>{{ scope.row.changePartName }}</p>
</template>
</el-table-column>
<el-table-column prop="models" label="规格型号">
<template slot-scope="scope">
<p>{{ scope.row.models }}</p>
</template>
</el-table-column>
<el-table-column prop="changNum" label="更换数量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.changNum" placeholder="更换数量" disabled
:step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="unkeepDeviceStatus" label="维保后设备状态">
<template slot-scope="scope">
<p>{{ scope.row.unkeepDeviceStatus }}</p>
</template>
</el-table-column>
<el-table-column prop="leader" label="操作组长">
<template slot-scope="scope">
<p>{{ scope.row.leader }}</p>
</template>
</el-table-column>
<el-table-column prop="estimatedTime" label="预估下次维保时间">
<template slot-scope="scope">
<p>{{ scope.row.estimatedTime }}</p>
</template>
</el-table-column>
<el-table-column prop="remarks" label="备注">
<template slot-scope="scope">
<p>{{ scope.row.remarks }}</p>
</template>
</el-table-column>
</el-table>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建人" prop="creatorUserId">
<p>{{ dataForm.creatorUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<p>{{ dataForm.creatorTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改人" prop="lastModifyUserId">
<p>{{ dataForm.lastModifyUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<p>{{ dataForm.lastModifyTime }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</template>
<script>
import request from '@/utils/request'
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,
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 :'',
deviceCode : '',
deviceName : '',
buyTime : '',
deviceDept : '',
repairsNum : 0,
unkeepNum : 0,
creatorUserId : '',
creatorTime : '',
lastModifyUserId : '',
lastModifyTime : '',
enabledStatus : "",
yysdeviceunkeeplogsList:[],
id: '',
deviceCode: '',
deviceName: '',
buyTime: '',
deviceDept: '',
repairsNum: 0,
unkeepNum: 0,
creatorUserId: '',
creatorTime: '',
lastModifyUserId: '',
lastModifyTime: '',
enabledStatus: "",
yysdeviceunkeeplogsList: [],
},
enabledStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"未启用","id":"2"}],
enabledStatusProps:{"label":"fullName","value":"id" },
enabledStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "未启用", "id": "2" }],
enabledStatusProps: { "label": "fullName", "value": "id" },
unkeepTypeOptions:[{"fullName":"维修","id":"1"},{"fullName":"保养","id":"2"}],
unkeepTypeProps:{"label":"fullName","value":"id" },
unkeepDeviceStatusOptions:[{"fullName":"运行正常","id":"1"},{"fullName":"运行异常","id":"2"}],
unkeepDeviceStatusProps:{"label":"fullName","value":"id" },
unkeepTypeOptions: [{ "fullName": "维修", "id": "1" }, { "fullName": "保养", "id": "2" }],
unkeepTypeProps: { "label": "fullName", "value": "id" },
unkeepDeviceStatusOptions: [{ "fullName": "运行正常", "id": "1" }, { "fullName": "运行异常", "id": "2" }],
unkeepDeviceStatusProps: { "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
},
computed: {},
watch: {},
created() {
goBack() {
this.$emit('refresh')
},
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)
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/example/YysDeviceUpkeep/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysDeviceUpkeep/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
}
})
},
})
},
}
},
}
</script>

@ -1,177 +1,198 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<div class="options">
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
<jnpf-form-tip-item label="采购计划单号"
prop="procurementNumber" >
<p>{{dataForm.procurementNumber}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="单据日期"
prop="procurementDate" >
<p>{{dataForm.procurementDate}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="年月"
prop="procurementYearMonth" >
<p>{{dataForm.procurementYearMonth}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="物料需求计划单号"
prop="planNumber" >
<p>{{dataForm.planNumber}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="备注"
prop="reamrk" >
<p>{{dataForm.reamrk}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>物料明细</h2>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-table :data="dataForm.tableField107" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="materialCode" label="物料编码" >
<template slot-scope="scope">
<p>{{scope.row.materialCode}}</p>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称" >
<template slot-scope="scope">
<p>{{scope.row.materialName}}</p>
</template>
</el-table-column>
<el-table-column prop="materialType" label="物料类型" >
<template slot-scope="scope">
<p>{{scope.row.materialType}}</p>
</template>
</el-table-column>
<el-table-column prop="specification" label="规格型号" >
<template slot-scope="scope">
<p>{{scope.row.specification}}</p>
</template>
</el-table-column>
<el-table-column prop="lackNumber" label="欠缺量" >
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.lackNumber"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="procurementPlanNumber" label="拟采购量" >
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.procurementPlanNumber"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="unit" label="计量单位" >
<template slot-scope="scope">
<p>{{scope.row.unit}}</p>
</template>
</el-table-column>
</el-table>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right">
<template v-if="!loading">
<el-col :span="8">
<jnpf-form-tip-item label="采购计划单号" prop="procurementNumber">
<p>{{ dataForm.procurementNumber }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="单据日期" prop="procurementDate">
<p>{{ dataForm.procurementDate }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="年月" prop="procurementYearMonth">
<p>{{ dataForm.procurementYearMonth }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="物料需求计划单号" prop="planNumber">
<p>{{ dataForm.planNumber }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="备注" prop="reamrk">
<p>{{ dataForm.reamrk }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>物料明细</h2>
</div>
<el-table :data="dataForm.tableField107" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="materialCode" label="物料编码">
<template slot-scope="scope">
<p>{{ scope.row.materialCode }}</p>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope">
<p>{{ scope.row.materialName }}</p>
</template>
</el-table-column>
<el-table-column prop="materialType" label="物料类型">
<template slot-scope="scope">
<p>{{ scope.row.materialType }}</p>
</template>
</el-table-column>
<el-table-column prop="specification" label="规格型号">
<template slot-scope="scope">
<p>{{ scope.row.specification }}</p>
</template>
</el-table-column>
<el-table-column prop="lackNumber" label="欠缺量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.lackNumber" placeholder="数字文本" disabled
:step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="procurementPlanNumber" label="拟采购量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.procurementPlanNumber" placeholder="数字文本"
disabled :step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="unit" label="计量单位">
<template slot-scope="scope">
<p>{{ scope.row.unit }}</p>
</template>
</el-table-column>
</el-table>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建人" prop="creatorUserId">
<p>{{ dataForm.creatorUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<p>{{ formatDeliveryTime(dataForm.creatorTime) }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改人" prop="lastModifyUserId">
<p>{{ dataForm.lastModifyUserId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<p>{{ formatDeliveryTime(dataForm.lastModifyTime) }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</template>
<script>
import request from '@/utils/request'
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,
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 :'',
procurementNumber : '',
procurementDate : '',
procurementYearMonth : '',
planNumber : "",
reamrk : '',
yysmaterialprocurementitemList:[],
id: '',
procurementNumber: '',
procurementDate: '',
procurementYearMonth: '',
planNumber: "",
reamrk: '',
yysmaterialprocurementitemList: [],
},
}
},
computed: {},
watch: {},
created() {
},
computed: {},
watch: {},
created() {
},
mounted() { },
methods: {
formatDeliveryTime(creatorTime) {
if (creatorTime != null) {
const date = new Date(creatorTime);
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
}
},
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)
})
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
},
})
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysMaterialProcurementPlan/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/example/YysMaterialProcurementPlan/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
})
},
}
},
}
</script>

@ -1,36 +1,27 @@
<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.procurementNumber" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="年月">
<JnpfDateRangePicker v-model="query.procurementYearMonth"
format="yyyy-MM" startPlaceholder="开始日期"
endPlaceholder="结束日期" >
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据日期">
<JnpfDateRangePicker v-model="query.procurementDate"
format="yyyy-MM-dd" startPlaceholder="开始日期"
endPlaceholder="结束日期" >
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="采购计划单号">
<el-input v-model="query.procurementNumber" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="年月">
<JnpfDateRangePicker v-model="query.procurementYearMonth" format="yyyy-MM"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据日期">
<JnpfDateRangePicker v-model="query.procurementDate" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
@ -42,438 +33,439 @@
<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" v-has="'btn_add'" @click="addOrUpdateHandle()">
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'" >导出
</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>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</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="procurementNumber"
label="采购计划单号" align="left"
>
</el-table-column>
<el-table-column
prop="procurementDate"
label="单据日期" align="left"
>
</el-table-column>
<el-table-column
prop="procurementYearMonth"
label="年月" align="left"
>
</el-table-column>
<el-table-column
prop="planNumber"
label="物料需求计划单号" align="left"
>
</el-table-column>
<el-table-column
prop="reamrk"
label="备注" align="left"
>
</el-table-column>
<el-table-column label="操作"
fixed="right" width="150" >
<template slot-scope="scope" >
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'" >编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">
</el-button>
<el-button type="text" v-has="'btn_detail'"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
:span-method="arraySpanMethod" border>
<el-table-column prop="procurementYearMonth" label="年月" align="center">
</el-table-column>
<el-table-column prop="procurementNumber" label="采购计划单号" align="center">
</el-table-column>
<el-table-column prop="planNumber" label="物料需求计划单号" align="center">
</el-table-column>
<el-table-column prop="procurementDate" label="单据日期" align="center">
</el-table-column>
<el-table-column prop="creatorUserId" label="创建人" align="center">
</el-table-column>
<el-table-column prop="creatorTime" label="创建日期" align="center" :formatter="formatDeliveryTime">
</el-table-column>
<el-table-column label="单据状态" prop="procurementStatus" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.procurementStatus == '1'"></el-tag>
<el-tag type="success" v-else-if="scope.row.procurementStatus == '2'">已提交</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)" v-has="'btn_edit'">
</el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" v-has="'btn_detail'" @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>
<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"/>
<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"/>
<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" />
<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'
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 {
export default {
components: {
JNPFForm,
Detail,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
keyword:'',
expandsTree: true,
refreshTree: true,
toFormDetailVisible:false,
expandObj:{},
columnOptions: [],
mergeList: [],
exportList:[],
columnList,
keyword: '',
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList: [],
columnList,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
procurementNumber:undefined,
procurementYearMonth:undefined,
procurementDate:undefined,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
procurementNumber: undefined,
procurementYearMonth: undefined,
procurementDate: undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
total: 0,
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "procurementDate",
sidx: "procurementDate",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
interfaceRes: {
planNumber:[] ,
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
interfaceRes: {
planNumber: [],
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
formatDeliveryTime(row, column) {
if (row.creatorTime != null) {
const date = new Date(row.creatorTime);
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
}
},
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)
})
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
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
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
}
}
})
},
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] || ''
}
}
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]
}
//
let query = {
paramList: config.treeTemplateJson || [],
}
},
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
})
}
})
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
resolve([]);
}
})
},
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])
}
},
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
}
} 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:'590930391657874309',
type:1,
};
request({
url: `/api/example/YysMaterialProcurementPlan/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/YysMaterialProcurementPlan/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
}
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
})
}
})
}).catch(() => {
});
},
handelUpload(){
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("","example/YysMaterialProcurementPlan")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
},
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}
}
})
},
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: '590930391657874309',
type: 1,
};
request({
url: `/api/example/YysMaterialProcurementPlan/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/YysMaterialProcurementPlan/Actions/Export`,
method: 'post',
data: query
url: `/api/example/YysMaterialProcurementPlan/${id}`,
method: 'DELETE'
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
},
search() {
this.listQuery.currentPage=1
this.listQuery.pageSize=20
this.listQuery.sort="desc"
this.listQuery.sidx="procurementDate"
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()
},
}
}).catch(() => {
});
},
handelUpload() {
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("", "example/YysMaterialProcurementPlan")
})
},
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/YysMaterialProcurementPlan/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 = "procurementDate"
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>

@ -1,203 +1,192 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<div class="options">
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right" >
<template v-if="!loading">
<el-col :span="12" >
<jnpf-form-tip-item label="物料需求计划单号"
prop="planNumber" >
<p>{{dataForm.planNumber}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" >
<jnpf-form-tip-item label="年月"
prop="planYearMonth" >
<p>{{dataForm.planYearMonth}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" >
<jnpf-form-tip-item label="单据日期"
prop="orderDate" >
<p>{{dataForm.orderDate}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12" >
<jnpf-form-tip-item label="是否生成采购计划"
prop="isCreatePlan" >
<p>{{ dataForm.isCreatePlan }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="备注"
prop="reamrk" >
<p>{{dataForm.reamrk}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>设计子表</h2>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-table :data="dataForm.tableField119" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="materialCode" label="物料编码" >
<template slot-scope="scope">
<p>{{scope.row.materialCode}}</p>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称" >
<template slot-scope="scope">
<p>{{scope.row.materialName}}</p>
</template>
</el-table-column>
<el-table-column prop="materialType" label="物料类型" >
<template slot-scope="scope">
<p>{{scope.row.materialType}}</p>
</template>
</el-table-column>
<el-table-column prop="specification" label="规格型号" >
<template slot-scope="scope">
<p>{{scope.row.specification}}</p>
</template>
</el-table-column>
<el-table-column prop="unit" label="计量单位" >
<template slot-scope="scope">
<p>{{scope.row.unit}}</p>
</template>
</el-table-column>
<el-table-column prop="requirementNumber" label="需求数量" >
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.requirementNumber"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="inventoryNumber" label="库存" >
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.inventoryNumber"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="inventorySafetyNumber" label="库存安全" >
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.inventorySafetyNumber"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="notIntoNumber" label="采购未入库" >
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.notIntoNumber"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="lackNumber" label="欠缺量" >
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.lackNumber"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</template>
</el-table-column>
</el-table>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right">
<template v-if="!loading">
<el-col :span="12">
<jnpf-form-tip-item label="物料需求计划单号" prop="planNumber">
<p>{{ dataForm.planNumber }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="年月" prop="planYearMonth">
<p>{{ dataForm.planYearMonth }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="单据日期" prop="orderDate">
<p>{{ dataForm.orderDate }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="是否生成采购计划" prop="isCreatePlan">
<p>{{ dataForm.isCreatePlan }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="备注" prop="reamrk">
<p>{{ dataForm.reamrk }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title">
<h2>物料明细</h2>
</div>
<el-table :data="dataForm.tableField119" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="materialCode" label="物料编码">
<template slot-scope="scope">
<p>{{ scope.row.materialCode }}</p>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope">
<p>{{ scope.row.materialName }}</p>
</template>
</el-table-column>
<el-table-column prop="materialType" label="物料类型">
<template slot-scope="scope">
<p>{{ scope.row.materialType }}</p>
</template>
</el-table-column>
<el-table-column prop="specification" label="规格型号">
<template slot-scope="scope">
<p>{{ scope.row.specification }}</p>
</template>
</el-table-column>
<el-table-column prop="unit" label="计量单位">
<template slot-scope="scope">
<p>{{ scope.row.unit }}</p>
</template>
</el-table-column>
<el-table-column prop="requirementNumber" label="需求数量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.requirementNumber" placeholder="数字文本"
disabled :step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="inventoryNumber" label="库存">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.inventoryNumber" placeholder="数字文本" disabled
:step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="inventorySafetyNumber" label="库存安全">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.inventorySafetyNumber" placeholder="数字文本"
disabled :step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="notIntoNumber" label="采购未入库">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.notIntoNumber" placeholder="数字文本" disabled
:step="1">
</JnpfNumber>
</template>
</el-table-column>
<el-table-column prop="lackNumber" label="欠缺量">
<template slot-scope="scope">
<JnpfNumber v-model="scope.row.lackNumber" placeholder="数字文本" disabled
:step="1">
</JnpfNumber>
</template>
</el-table-column>
</el-table>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</template>
<script>
import request from '@/utils/request'
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,
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 :'',
planNumber : '',
planYearMonth : "",
orderDate : '',
isCreatePlan : "",
reamrk : '',
yysmaterialrequirementitemList:[],
id: '',
planNumber: '',
planYearMonth: "",
orderDate: '',
isCreatePlan: "",
reamrk: '',
yysmaterialrequirementitemList: [],
},
isCreatePlanOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"2"}],
isCreatePlanProps:{"label":"fullName","value":"id" },
isCreatePlanOptions: [{ "fullName": "是", "id": "1" }, { "fullName": "否", "id": "2" }],
isCreatePlanProps: { "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
},
computed: {},
watch: {},
created() {
goBack() {
this.$emit('refresh')
},
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)
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/example/YysMaterialRequirementPlan/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysMaterialRequirementPlan/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
}
})
},
})
},
}
},
}
</script>

@ -55,16 +55,6 @@
v-has="'btn_download'">导出
</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" border>
@ -76,7 +66,7 @@
</el-table-column>
<el-table-column prop="creatorUserId" label="创建人" align="center">
</el-table-column>
<el-table-column prop="creatorTime" label="创建日期" align="center">
<el-table-column prop="creatorTime" label="创建日期" align="center" :formatter="formatDeliveryTime">
</el-table-column>
<el-table-column label="是否生成采购计划" prop="isCreatePlan" align="center">
<!-- <template slot-scope="scope">
@ -96,6 +86,8 @@
</el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button>
</template>
</el-table-column>
</JNPF-table>
@ -205,6 +197,15 @@ export default {
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
formatDeliveryTime(row, column) {
if (row.creatorTime != null) {
const date = new Date(row.creatorTime);
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')}`;
}
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {

Loading…
Cancel
Save