feat():月度报工统计;

master
jiyufei 2 months ago
parent bcf3e9a280
commit 346414db7a

@ -2,7 +2,9 @@ package jnpf.service;
import jnpf.model.yysdaylogs.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -34,6 +36,7 @@ public interface YysDayLogsService extends IService<YysDayLogsEntity> {
/**
*
*
* @param entity
* @param productType
*/
@ -41,8 +44,17 @@ public interface YysDayLogsService extends IService<YysDayLogsEntity> {
/**
*
*
* @param entity
* @param productType
*/
void syncPackage(YysPackageReportEntity entity, String productType);
/**
*
*
* @param yysDayLogsPagination
* @return
*/
List<YysDayLogsEntity> getListByMonth(YysDayLogsPagination yysDayLogsPagination);
}

@ -176,7 +176,6 @@ public class YysDayLogsServiceImpl extends ServiceImpl<YysDayLogsMapper, YysDayL
}
if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getProductCode())) {
yysDayLogsNum++;
@ -385,4 +384,231 @@ public class YysDayLogsServiceImpl extends ServiceImpl<YysDayLogsMapper, YysDayL
properties.setId(mainId);
this.save(properties);
}
@Override
public List<YysDayLogsEntity> getListByMonth(YysDayLogsPagination yysDayLogsPagination) {
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 ? YysDayLogsConstant.getAppColumnData() : YysDayLogsConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total = 0;
int yysDayLogsNum = 0;
QueryWrapper<YysDayLogsEntity> yysDayLogsQueryWrapper = new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp = "";
if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = yysDayLogsPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<YysDayLogsEntity> yysDayLogsSuperWrapper = new QueryWrapper<>();
yysDayLogsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayLogsSuperWrapper, YysDayLogsEntity.class, queryJson, "0"));
int yysDayLogsNum1 = yysDayLogsSuperWrapper.getExpression().getNormal().size();
if (yysDayLogsNum1 > 0) {
List<String> yysDayLogsList = this.list(yysDayLogsSuperWrapper).stream().map(YysDayLogsEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysDayLogsList);
intersectionSuperList.add(yysDayLogsList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
} else {
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<YysDayLogsEntity> yysDayLogsSuperWrapper = new QueryWrapper<>();
yysDayLogsSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(yysDayLogsSuperWrapper, YysDayLogsEntity.class, ruleJson, "0"));
int yysDayLogsNum1 = yysDayLogsSuperWrapper.getExpression().getNormal().size();
if (yysDayLogsNum1 > 0) {
List<String> yysDayLogsList = this.list(yysDayLogsSuperWrapper).stream().map(YysDayLogsEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysDayLogsList);
intersectionRuleList.add(yysDayLogsList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
} else {
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = false;
boolean appPermission = false;
if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysDayLogsObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayLogsQueryWrapper, YysDayLogsEntity.class, yysDayLogsPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysDayLogsObj)) {
return new ArrayList<>();
} else {
yysDayLogsQueryWrapper = (QueryWrapper<YysDayLogsEntity>) yysDayLogsObj;
if (yysDayLogsQueryWrapper.getExpression().getNormal().size() > 0) {
yysDayLogsNum++;
}
}
}
}
if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()) {
Object yysDayLogsObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysDayLogsQueryWrapper, YysDayLogsEntity.class, yysDayLogsPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysDayLogsObj)) {
return new ArrayList<>();
} else {
yysDayLogsQueryWrapper = (QueryWrapper<YysDayLogsEntity>) yysDayLogsObj;
if (yysDayLogsQueryWrapper.getExpression().getNormal().size() > 0) {
yysDayLogsNum++;
}
}
}
}
if (isPc) {
if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getManufactureTime())) {
yysDayLogsNum++;
List ManufactureTimeList = JsonUtil.getJsonToList(yysDayLogsPagination.getManufactureTime(), String.class);
Long fir = Long.valueOf(String.valueOf(ManufactureTimeList.get(0)));
Long sec = Long.valueOf(String.valueOf(ManufactureTimeList.get(1)));
yysDayLogsQueryWrapper.lambda().ge(YysDayLogsEntity::getManufactureTime, new Date(fir))
.le(YysDayLogsEntity::getManufactureTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getYears())) {
yysDayLogsNum++;
long firstDayOfMonthTimestamp = Long.parseLong(yysDayLogsPagination.getYears().toString());
Date firstDayOfMonth = new Date(firstDayOfMonthTimestamp);
Calendar cal = Calendar.getInstance();
cal.setTime(firstDayOfMonth);
cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
cal.set(Calendar.HOUR_OF_DAY, 23);
cal.set(Calendar.MINUTE, 59);
cal.set(Calendar.SECOND, 59);
Date lastDayOfMonth = cal.getTime();
yysDayLogsQueryWrapper.lambda()
.ge(YysDayLogsEntity::getManufactureTime, firstDayOfMonth)
.le(YysDayLogsEntity::getManufactureTime, lastDayOfMonth);
}
if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getProductCode())) {
yysDayLogsNum++;
String value = yysDayLogsPagination.getProductCode() instanceof List ?
JsonUtil.getObjectToString(yysDayLogsPagination.getProductCode()) :
String.valueOf(yysDayLogsPagination.getProductCode());
yysDayLogsQueryWrapper.lambda().like(YysDayLogsEntity::getProductCode, value);
}
if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getProductName())) {
yysDayLogsNum++;
String value = yysDayLogsPagination.getProductName() instanceof List ?
JsonUtil.getObjectToString(yysDayLogsPagination.getProductName()) :
String.valueOf(yysDayLogsPagination.getProductName());
yysDayLogsQueryWrapper.lambda().like(YysDayLogsEntity::getProductName, value);
}
if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getDeviceName())) {
yysDayLogsNum++;
String value = yysDayLogsPagination.getDeviceName() instanceof List ?
JsonUtil.getObjectToString(yysDayLogsPagination.getDeviceName()) :
String.valueOf(yysDayLogsPagination.getDeviceName());
yysDayLogsQueryWrapper.lambda().like(YysDayLogsEntity::getDeviceName, value);
}
if (ObjectUtil.isNotEmpty(yysDayLogsPagination.getReportMember())) {
yysDayLogsNum++;
List<String> idList = new ArrayList<>();
try {
String[][] reportMember = JsonUtil.getJsonToBean(yysDayLogsPagination.getReportMember(), String[][].class);
for (int i = 0; i < reportMember.length; i++) {
if (reportMember[i].length > 0) {
idList.add(JsonUtil.getObjectToString(Arrays.asList(reportMember[i])));
}
}
} catch (Exception e1) {
try {
List<String> reportMember = JsonUtil.getJsonToList(yysDayLogsPagination.getReportMember(), String.class);
if (reportMember.size() > 0) {
idList.addAll(reportMember);
}
} catch (Exception e2) {
idList.add(String.valueOf(yysDayLogsPagination.getReportMember()));
}
}
yysDayLogsQueryWrapper.lambda().and(t -> {
idList.forEach(tt -> {
t.like(YysDayLogsEntity::getReportMember, tt).or();
});
});
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total > 0) {
if (intersection.size() == 0) {
intersection.add("jnpfNullList");
}
yysDayLogsQueryWrapper.lambda().in(YysDayLogsEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
yysDayLogsQueryWrapper.lambda().and(t -> t.in(YysDayLogsEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
yysDayLogsQueryWrapper.lambda().and(t -> t.in(YysDayLogsEntity::getId, finalAllRuleIDlist));
}
if (ObjectUtil.isNotNull(yysDayLogsPagination.getProductType())) {
yysDayLogsQueryWrapper.lambda().eq(YysDayLogsEntity::getProductType, yysDayLogsPagination.getProductType());
}
//假删除标志
yysDayLogsQueryWrapper.lambda().isNull(YysDayLogsEntity::getDeleteMark);
if ("0".equals(yysDayLogsPagination.getDataType())) {
if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<YysDayLogsEntity> page = new Page<>(yysDayLogsPagination.getCurrentPage(), yysDayLogsPagination.getPageSize());
IPage<YysDayLogsEntity> userIPage = this.page(page, yysDayLogsQueryWrapper);
return yysDayLogsPagination.setData(userIPage.getRecords(), userIPage.getTotal());
} else {
List<YysDayLogsEntity> list = new ArrayList();
return yysDayLogsPagination.setData(list, list.size());
}
} else {
return this.list(yysDayLogsQueryWrapper);
}
}
}

@ -1,5 +1,6 @@
package jnpf.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
@ -13,18 +14,27 @@ import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.yysdaylogs.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.time.LocalDate;
import java.time.ZoneId;
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.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile;
@ -36,7 +46,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 +63,7 @@ import org.springframework.transaction.annotation.Transactional;
/**
* yysDayLogs
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
@ -72,7 +85,6 @@ public class YysDayLogsController {
private YysDayLogsService yysDayLogsService;
@Autowired
private ConfigValueUtil configValueUtil;
@ -104,6 +116,58 @@ public class YysDayLogsController {
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param yysDayLogsPagination
* @return
*/
@Operation(summary = "获取月度报工统计列表")
@PostMapping("/getListByMonth")
public ActionResult getListByMonth(@RequestBody YysDayLogsPagination yysDayLogsPagination) {
List<YysDayLogsEntity> list = yysDayLogsService.getListByMonth(yysDayLogsPagination);
List<Map<String, Object>> realList = new ArrayList<>();
PageListVO vo = new PageListVO();
PaginationVO page = JsonUtil.getJsonToBean(yysDayLogsPagination, PaginationVO.class);
vo.setPagination(page);
if (CollectionUtils.isEmpty(list)) {
vo.setList(realList);
return ActionResult.success(vo);
}
Map<String, YysDayLogsDTO> mergedLogs = new ConcurrentHashMap<>();
for (YysDayLogsEntity logs : list) {
YysDayLogsDTO dto = BeanUtil.copyProperties(logs, YysDayLogsDTO.class);
LocalDate date = logs.getManufactureTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
String yearMonth = date.getYear() + "-" + (date.getMonthValue() < 10 ? "0" : "") + date.getMonthValue();
String key = yearMonth + "_" + logs.getReportMember() + "_" + logs.getProductCode() + "_" + logs.getProductType();
dto.setYears(yearMonth);
if (mergedLogs.containsKey(key)) {
YysDayLogsDTO mergedLog = mergedLogs.getOrDefault(key, new YysDayLogsDTO());
int qualifiedNum = Integer.parseInt(mergedLog.getQualifiedNum()) + Integer.parseInt(logs.getQualifiedNum());
dto.setQualifiedNum(String.valueOf(qualifiedNum));
dto.setCompensatoryHour(mergedLog.getCompensatoryHour().add(logs.getCompensatoryHour()));
mergedLogs.put(key, mergedLog);
}
mergedLogs.put(key, dto);
}
List<YysDayLogsDTO> resultList = new ArrayList<>(mergedLogs.values());
for (YysDayLogsDTO entity : resultList) {
Map<String, Object> yysDayLogsMap = JsonUtil.entityToMap(entity);
yysDayLogsMap.put("id", yysDayLogsMap.get("id"));
//副表数据
//子表数据
realList.add(yysDayLogsMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, YysDayLogsConstant.getFormData(), YysDayLogsConstant.getColumnData(), yysDayLogsPagination.getModuleId(), false);
//返回对象
vo.setList(realList);
return ActionResult.success(vo);
}
/**
* Excel
*
@ -115,8 +179,37 @@ public class YysDayLogsController {
if (StringUtil.isEmpty(yysDayLogsPagination.getSelectKey())) {
return ActionResult.fail("请选择导出字段");
}
String name;
List<YysDayLogsEntity> list = yysDayLogsService.getList(yysDayLogsPagination);
List<Map<String, Object>> realList = new ArrayList<>();
if ("1".equals(yysDayLogsPagination.getExportType())) {
name = "年月";
Map<String, YysDayLogsDTO> mergedLogs = new ConcurrentHashMap<>();
for (YysDayLogsEntity logs : list) {
YysDayLogsDTO dto = BeanUtil.copyProperties(logs, YysDayLogsDTO.class);
LocalDate date = logs.getManufactureTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
String yearMonth = date.getYear() + "-" + (date.getMonthValue() < 10 ? "0" : "") + date.getMonthValue();
String key = yearMonth + "_" + logs.getReportMember() + "_" + logs.getProductCode() + "_" + logs.getProductType();
dto.setYears(yearMonth);
if (mergedLogs.containsKey(key)) {
YysDayLogsDTO mergedLog = mergedLogs.getOrDefault(key, new YysDayLogsDTO());
int qualifiedNum = Integer.parseInt(mergedLog.getQualifiedNum()) + Integer.parseInt(logs.getQualifiedNum());
dto.setQualifiedNum(String.valueOf(qualifiedNum));
dto.setCompensatoryHour(mergedLog.getCompensatoryHour().add(logs.getCompensatoryHour()));
mergedLogs.put(key, mergedLog);
}
mergedLogs.put(key, dto);
}
List<YysDayLogsDTO> resultList = new ArrayList<>(mergedLogs.values());
for (YysDayLogsDTO entity : resultList) {
Map<String, Object> yysDayLogsMap = JsonUtil.entityToMap(entity);
yysDayLogsMap.put("id", yysDayLogsMap.get("id"));
//副表数据
//子表数据
realList.add(yysDayLogsMap);
}
} else {
name = "生产日期";
for (YysDayLogsEntity entity : list) {
Map<String, Object> yysDayLogsMap = JsonUtil.entityToMap(entity);
yysDayLogsMap.put("id", yysDayLogsMap.get("id"));
@ -124,25 +217,76 @@ public class YysDayLogsController {
//子表数据
realList.add(yysDayLogsMap);
}
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, YysDayLogsConstant.getFormData(), YysDayLogsConstant.getColumnData(), yysDayLogsPagination.getModuleId(), false);
String[] keys = !StringUtil.isEmpty(yysDayLogsPagination.getSelectKey()) ? yysDayLogsPagination.getSelectKey() : new String[0];
UserInfo userInfo = userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), realList, keys, userInfo, name);
return ActionResult.success(vo);
}
/**
*
*/
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
public DownloadVO creatModelExcel(String path, List<Map<String, Object>> list, String[] keys, UserInfo userInfo, String name) {
DownloadVO vo = DownloadVO.builder().build();
List<ExcelExportEntity> entitys = new ArrayList<>();
if (keys.length > 0) {
if ("年月".equals(name)){
for (String key : keys) {
switch (key) {
case "years":
entitys.add(new ExcelExportEntity(name, "years"));
break;
case "deviceCode":
entitys.add(new ExcelExportEntity("设备编码", "deviceCode"));
break;
case "deviceName":
entitys.add(new ExcelExportEntity("设备名称", "deviceName"));
break;
case "sort":
entitys.add(new ExcelExportEntity("顺序号", "sort"));
break;
case "post":
entitys.add(new ExcelExportEntity("班次", "post"));
break;
case "startTime":
entitys.add(new ExcelExportEntity("开始时间", "startTime"));
break;
case "endTime":
entitys.add(new ExcelExportEntity("结束时间", "endTime"));
break;
case "productCode":
entitys.add(new ExcelExportEntity("产品编码", "productCode"));
break;
case "productName":
entitys.add(new ExcelExportEntity("产品名称", "productName"));
break;
case "models":
entitys.add(new ExcelExportEntity("规格型号", "models"));
break;
case "measurementUnit":
entitys.add(new ExcelExportEntity("计量单位", "measurementUnit"));
break;
case "reportMember":
entitys.add(new ExcelExportEntity("报工成员", "reportMember"));
break;
case "qualifiedNum":
entitys.add(new ExcelExportEntity("报工数量", "qualifiedNum"));
break;
case "compensatoryHour":
entitys.add(new ExcelExportEntity("补偿工时", "compensatoryHour"));
break;
default:
break;
}
}
}else {
for (String key : keys) {
switch (key) {
case "manufactureTime":
entitys.add(new ExcelExportEntity("生产日期" ,"manufactureTime"));
entitys.add(new ExcelExportEntity(name, "manufactureTime"));
break;
case "deviceCode":
entitys.add(new ExcelExportEntity("设备编码", "deviceCode"));
@ -189,6 +333,8 @@ public class YysDayLogsController {
}
}
}
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try {
@ -248,6 +394,7 @@ public class YysDayLogsController {
}
return vo;
}
/**
*
*
@ -268,8 +415,10 @@ public class YysDayLogsController {
}
return ActionResult.success("创建成功");
}
/**
*
*
* @param id
* @param yysDayLogsForm
* @return
@ -297,8 +446,10 @@ public class YysDayLogsController {
return ActionResult.fail("更新失败,数据不存在");
}
}
/**
*
*
* @param id
* @return
*/
@ -314,9 +465,11 @@ public class YysDayLogsController {
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
*
* @param id
* @return
*/
@ -334,9 +487,11 @@ public class YysDayLogsController {
yysDayLogsMap = generaterSwapUtil.swapDataDetail(yysDayLogsMap, YysDayLogsConstant.getFormData(), "591260101755544965", false);
return ActionResult.success(yysDayLogsMap);
}
/**
* ()
* 使-
*
* @param id
* @return
*/
@ -354,5 +509,4 @@ public class YysDayLogsController {
yysDayLogsMap = generaterSwapUtil.swapDataForm(yysDayLogsMap, YysDayLogsConstant.getFormData(), YysDayLogsConstant.TABLEFIELDKEY, YysDayLogsConstant.TABLERENAMES);
return ActionResult.success(yysDayLogsMap);
}
}

@ -0,0 +1,28 @@
package jnpf.model.yysdaylogs;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class YysDayLogsDTO implements Serializable {
private String id;
private Date manufactureTime;
private String deviceCode;
private String deviceName;
private Integer sort;
private String post;
private String startTime;
private String endTime;
private String productCode;
private String productName;
private String models;
private String measurementUnit;
private String qualifiedNum;
private BigDecimal compensatoryHour;
private String reportMember;
private String productType;
private String years;
}

@ -47,4 +47,10 @@ public class YysDayLogsPagination extends Pagination {
*/
@JsonProperty("productType")
private Object productType;
/** 年月 */
@JsonProperty("years")
private Object years;
/** 导出类型 */
@JsonProperty("exportType")
private Object exportType;
}

@ -0,0 +1,190 @@
<template>
<el-dialog title="详情"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
<jnpf-form-tip-item label="生产日期"
prop="manufactureTime" >
<p>{{dataForm.manufactureTime}}</p>
</jnpf-form-tip-item>
</el-col>
<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="sort" >
<JnpfNumber v-model="dataForm.sort"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="班次"
prop="post" >
<p>{{ dataForm.post }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="开始时间"
prop="startTime" >
<p>{{dataForm.startTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="结束时间"
prop="endTime" >
<p>{{dataForm.endTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="产品编码"
prop="productCode" >
<p>{{dataForm.productCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="产品名称"
prop="productName" >
<p>{{dataForm.productName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="规格型号"
prop="models" >
<p>{{dataForm.models}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="计量单位"
prop="measurementUnit" >
<p>{{dataForm.measurementUnit}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="报工成员"
prop="reportMember" >
<p>{{dataForm.reportMember}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="报工数量"
prop="qualifiedNum" >
<p>{{dataForm.qualifiedNum}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="补偿工时"
prop="compensatoryHour" >
<JnpfNumber v-model="dataForm.compensatoryHour"
placeholder="数字文本" disabled
:step="1" :precision="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id :'',
manufactureTime : '',
deviceCode : '',
deviceName : '',
sort : '',
post : "",
startTime : '',
endTime : '',
productCode : '',
productName : '',
models : '',
measurementUnit : '',
reportMember : '',
qualifiedNum : '',
compensatoryHour : '',
},
postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季夜班","id":"2"}],
postProps:{"label":"fullName","value":"id" },
}
},
computed: {},
watch: {},
created() {
},
mounted() {},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysDayLogs/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
},
}
</script>

File diff suppressed because one or more lines are too long

@ -0,0 +1,525 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' :'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8" >
<jnpf-form-tip-item
label="生产日期" prop="manufactureTime" >
<JnpfDatePicker v-model="dataForm.manufactureTime" @change="changeData('manufactureTime',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" >
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="设备编码" prop="deviceCode" >
<JnpfInput v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="设备名称" prop="deviceName" >
<JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="顺序号" prop="sort" >
<JnpfInputNumber v-model="dataForm.sort" @change="changeData('sort',-1)"
placeholder="数字文本" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="班次" prop="post" >
<JnpfSelect v-model="dataForm.post" @change="changeData('post',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="postOptions" :props="postProps" >
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="开始时间" prop="startTime" >
<JnpfTimePicker v-model="dataForm.startTime" @change="changeData('startTime',-1)"
:startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable :style='{"width":"100%"}' format="HH:mm" >
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="结束时间" prop="endTime" >
<JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime',-1)"
:startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable :style='{"width":"100%"}' format="HH:mm" >
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="产品编码" prop="productCode" >
<JnpfInput v-model="dataForm.productCode" @change="changeData('productCode',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="产品名称" prop="productName" >
<JnpfInput v-model="dataForm.productName" @change="changeData('productName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="规格型号" prop="models" >
<JnpfInput v-model="dataForm.models" @change="changeData('models',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="计量单位" prop="measurementUnit" >
<JnpfInput v-model="dataForm.measurementUnit" @change="changeData('measurementUnit',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="报工成员" prop="reportMember" >
<JnpfUserSelect v-model="dataForm.reportMember" @change="changeData('reportMember',-1)"
placeholder="请选择" selectType="all" :ableIds="ableAll.reportMemberableIds" clearable :style='{"width":"100%"}'>
</JnpfUserSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="报工数量" prop="qualifiedNum" >
<JnpfInput v-model="dataForm.qualifiedNum" @change="changeData('qualifiedNum',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="补偿工时" prop="compensatoryHour" >
<JnpfInputNumber v-model="dataForm.compensatoryHour" @change="changeData('compensatoryHour',-1)"
placeholder="数字文本" :precision="1" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{'上一条'}}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{'下一条'}}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import {mapGetters} from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { },
props: [],
data() {
return {
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
prevDis: false,
nextDis: false,
allList: [],
visible: false,
loading: false,
btnLoading: false,
formRef: 'formRef',
setting:{},
eventType: '',
userBoxVisible:false,
selectDialogVisible: false,
currTableConf:{},
dataValueAll:{},
addTableConf:{
},
//
ableAll:{
},
tableRows:{
},
Vmodel:"",
currVmodel:"",
dataForm: {
manufactureTime : undefined,
deviceCode : undefined,
deviceName : undefined,
sort : undefined,
post : undefined,
startTime : undefined,
endTime : undefined,
productCode : undefined,
productName : undefined,
models : undefined,
measurementUnit : undefined,
reportMember : undefined,
qualifiedNum : undefined,
compensatoryHour : undefined,
version: 0,
},
tableRequiredData: {},
dataRule:
{
},
postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季夜班","id":"2"}],
postProps:{"label":"fullName","value":"id" },
childIndex:-1,
isEdit:false,
interfaceRes: {
manufactureTime:[] ,
deviceCode:[] ,
deviceName:[] ,
sort:[] ,
post:[] ,
startTime:[] ,
endTime:[] ,
productCode:[] ,
productName:[] ,
models:[] ,
measurementUnit:[] ,
reportMember:[] ,
qualifiedNum:[] ,
compensatoryHour:[] ,
},
}
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() {},
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
next() {
this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/YysDayLogs/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
this[options]()
}
this.changeData(key, index)
}
}
}
}
},
changeDataFormData(type, data, model,index,defaultValue) {
if(!this.isEdit) {
if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) {
this.dataForm[data][i][model] = defaultValue
} else if (index == i) {
this.dataForm[data][i][model] = defaultValue
}
}
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll(){
},
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
}
} else {
this.prevDis = true
this.nextDis = true
}
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysDayLogs/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
}else{
this.clearData()
this.initDefaultData()
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/YysDayLogs',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(()=>{
this.btnLoading = false
this.continueBtnLoading = false
})
}else{
request({
url: '/api/example/YysDayLogs/'+this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(()=>{
this.btnLoading = false
this.continueBtnLoading = false
})
}
},
openSelectDialog(key) {
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if(this['get'+this.currVmodel]){
this['get'+this.currVmodel](t)
}
}
},
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeDataValue = null;
let timeValue = Number(timeValueData)
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = new Date().getTime()
} else if (timeType == 4) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getBeforeData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
}
} else if (timeType == 5) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getLaterData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
}
}
}
return timeDataValue;
},
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
let timeDataValue = null
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue || '00:00:00'
if (timeDataValue.split(':').length == 3) {
timeDataValue = timeDataValue
} else {
timeDataValue = timeDataValue + ':00'
}
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
}
}
return timeDataValue;
},
dataList(){
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex=-1
},
},
}
</script>

@ -0,0 +1,467 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="年月">
<JnpfDatePicker v-model="query.years" format="yyyy-MM" startPlaceholder="开始日期"
endPlaceholder="结束日期">
</JnpfDatePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品编码">
<el-input v-model="query.productCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品名称">
<el-input v-model="query.productName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="报工成员">
<JnpfUserSelect selectType="all" v-model="query.reportMember" placeholder="请选择"
clearable multiple />
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()">
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border>
<el-table-column prop="years" label="年月" align="center">
</el-table-column>
<el-table-column prop="productCode" label="产品编码" align="center">
</el-table-column>
<el-table-column prop="productName" label="产品名称" align="center">
</el-table-column>
<el-table-column prop="models" label="规格型号" align="center">
</el-table-column>
<el-table-column prop="measurementUnit" label="计量单位" align="center">
</el-table-column>
<el-table-column prop="reportMember" label="报工成员" align="center">
</el-table-column>
<el-table-column prop="qualifiedNum" label="报工数量" align="center">
</el-table-column>
<el-table-column prop="compensatoryHour" label="补偿工时" align="center">
<template slot-scope="scope" v-if="scope.row.compensatoryHour">
<JnpfNumber v-model="scope.row.compensatoryHour" :thousands="false" />
</template>
</el-table-column>
</JNPF-table>
<!-- <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" /> -->
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form'
import Detail from './Detail'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
components: {
JNPFForm,
Detail,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
keyword: '',
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList: [],
columnList,
showAll: false,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
years: undefined,
productCode: undefined,
productName: undefined,
deviceName: undefined,
reportMember: undefined,
exportType:'1',
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }],
postProps: { "label": "fullName", "value": "id" },
interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data
const config = {
treeInterfaceId: "",
treeTemplateJson: []
}
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ''
}
}
//
let query = {
paramList: config.treeTemplateJson || [],
}
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
}
}
this.getMergeList(list)
this.getExportList(list)
return list
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
}
},
getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list))
newList.forEach(item => {
if (item.children && item.children.length) {
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
}
})
},
getExportList(list) {
let exportList = []
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === 'table') {
for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j])
}
} else {
exportList.push(list[i])
}
}
this.exportList = exportList
},
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
const now = new Date();
this.query.years= new Date(now.getFullYear(), now.getMonth(), 1).getTime();
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '591260101755544965',
type: 1,
};
request({
url: `/api/example/YysDayLogs/getListByMonth`,
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/YysDayLogs/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
handelUpload() {
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("", "example/YysDayLogs")
})
},
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/YysDayLogs/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
}
}
</script>

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save