yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
master
jiyufei 2 months ago
parent 51d7a11f61
commit ce1a4df30e
11 changed files with 2570 additions and 2468 deletions
Show Stats Download Patch File Download Diff File

268
jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysMaterialProcurementPlanServiceImpl.java
Unescape View File

@ -5,18 +5,26 @@ import jnpf.mapper.YysMaterialProcurementPlanMapper;
import jnpf.service.*; import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.yysmaterialprocurementplan.*; import jnpf.model.yysmaterialprocurementplan.*;
import java.math.BigDecimal; import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel; import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil; import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel; import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel; import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel; import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import jnpf.model.QueryModel; import jnpf.model.QueryModel;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel; import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage; 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 org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import jnpf.util.*; import jnpf.util.*;
import java.util.*; import java.util.*;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
/** /**
*
* YysMaterialProcurementPlan * YysMaterialProcurementPlan
* 版本： V3.5 * 版本： V3.5
* 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity;
* 日期： 2024-08-08 * 日期： 2024-08-08
*/ */
@Service @Service
public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMaterialProcurementPlanMapper, YysMaterialProcurementPlanEntity> implements YysMaterialProcurementPlanService{ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMaterialProcurementPlanMapper, YysMaterialProcurementPlanEntity> implements YysMaterialProcurementPlanService {
@Autowired @Autowired
private GeneraterSwapUtil generaterSwapUtil; private GeneraterSwapUtil generaterSwapUtil;
@ -48,135 +60,139 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
@Autowired @Autowired
private YysMaterialProcurementItemService yysMaterialProcurementItemService; private YysMaterialProcurementItemService yysMaterialProcurementItemService;
@Override @Override
public List<YysMaterialProcurementPlanEntity> getList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination){ public List<YysMaterialProcurementPlanEntity> getList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) {
return getTypeList(yysMaterialProcurementPlanPagination,yysMaterialProcurementPlanPagination.getDataType()); return getTypeList(yysMaterialProcurementPlanPagination, yysMaterialProcurementPlanPagination.getDataType());
} }
/** 列表查询 */
/**
* 列表查询
*/
@Override @Override
public List<YysMaterialProcurementPlanEntity> getTypeList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination,String dataType){ public List<YysMaterialProcurementPlanEntity> getTypeList(YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination, String dataType) {
String userId=userProvider.get().getUserId(); String userId = userProvider.get().getUserId();
List<String> AllIdList =new ArrayList(); List<String> AllIdList = new ArrayList();
List<List<String>> intersectionList =new ArrayList<>(); List<List<String>> intersectionList = new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? YysMaterialProcurementPlanConstant.getAppColumnData() : YysMaterialProcurementPlanConstant.getColumnData(); String columnData = !isPc ? YysMaterialProcurementPlanConstant.getAppColumnData() : YysMaterialProcurementPlanConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0; int total = 0;
int yysMaterialProcurementPlanNum =0; int yysMaterialProcurementPlanNum = 0;
QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanQueryWrapper=new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanQueryWrapper = new QueryWrapper<>();
int yysMaterialProcurementItemNum =0; int yysMaterialProcurementItemNum = 0;
QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper=new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementItemEntity> yysMaterialProcurementItemQueryWrapper = new QueryWrapper<>();
long yysMaterialProcurementItemcount = yysMaterialProcurementItemService.count(); long yysMaterialProcurementItemcount = yysMaterialProcurementItemService.count();
List<String> allSuperIDlist = new ArrayList<>(); List<String> allSuperIDlist = new ArrayList<>();
String superOp =""; String superOp = "";
if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getSuperQueryJson())){ if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getSuperQueryJson())) {
List<String> allSuperList = new ArrayList<>(); List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>(); List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = yysMaterialProcurementPlanPagination.getSuperQueryJson(); String queryJson = yysMaterialProcurementPlanPagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0; int superNum = 0;
QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>(); 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(); int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size();
if (yysMaterialProcurementPlanNum1>0){ if (yysMaterialProcurementPlanNum1 > 0) {
List<String> yysMaterialProcurementPlanList =this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList()); List<String> yysMaterialProcurementPlanList = this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList());
allSuperList.addAll(yysMaterialProcurementPlanList); allSuperList.addAll(yysMaterialProcurementPlanList);
intersectionSuperList.add(yysMaterialProcurementPlanList); intersectionSuperList.add(yysMaterialProcurementPlanList);
superNum++; superNum++;
} }
String YysMaterialProcurementItemTable = "yys_material_procurement_item"; String YysMaterialProcurementItemTable = "yys_material_procurement_item";
boolean YysMaterialProcurementItemHasSql = queryJson.contains(YysMaterialProcurementItemTable); boolean YysMaterialProcurementItemHasSql = queryJson.contains(YysMaterialProcurementItemTable);
List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable , queryJson, null); List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable, queryJson, null);
if (YysMaterialProcurementItemHasSql){ if (YysMaterialProcurementItemHasSql) {
allSuperList.addAll(yysMaterialProcurementItemList); allSuperList.addAll(yysMaterialProcurementItemList);
intersectionSuperList.add(yysMaterialProcurementItemList); intersectionSuperList.add(yysMaterialProcurementItemList);
superNum++; superNum++;
} }
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or //and or
if(superOp.equalsIgnoreCase("and")){ if (superOp.equalsIgnoreCase("and")) {
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{ } else {
allSuperIDlist = allSuperList; allSuperIDlist = allSuperList;
} }
} }
List<String> allRuleIDlist = new ArrayList<>(); List<String> allRuleIDlist = new ArrayList<>();
String ruleOp =""; String ruleOp = "";
if (ObjectUtil.isNotEmpty(ruleJson)){ if (ObjectUtil.isNotEmpty(ruleJson)) {
List<String> allRuleList = new ArrayList<>(); List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>(); List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0; int ruleNum = 0;
QueryWrapper<YysMaterialProcurementPlanEntity> yysMaterialProcurementPlanSuperWrapper = new QueryWrapper<>(); 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(); int yysMaterialProcurementPlanNum1 = yysMaterialProcurementPlanSuperWrapper.getExpression().getNormal().size();
if (yysMaterialProcurementPlanNum1>0){ if (yysMaterialProcurementPlanNum1 > 0) {
List<String> yysMaterialProcurementPlanList =this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList()); List<String> yysMaterialProcurementPlanList = this.list(yysMaterialProcurementPlanSuperWrapper).stream().map(YysMaterialProcurementPlanEntity::getId).collect(Collectors.toList());
allRuleList.addAll(yysMaterialProcurementPlanList); allRuleList.addAll(yysMaterialProcurementPlanList);
intersectionRuleList.add(yysMaterialProcurementPlanList); intersectionRuleList.add(yysMaterialProcurementPlanList);
ruleNum++; ruleNum++;
} }
String YysMaterialProcurementItemTable = "yys_material_procurement_item"; String YysMaterialProcurementItemTable = "yys_material_procurement_item";
boolean YysMaterialProcurementItemHasSql = ruleJson.contains(YysMaterialProcurementItemTable); boolean YysMaterialProcurementItemHasSql = ruleJson.contains(YysMaterialProcurementItemTable);
List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable , ruleJson, null); List<String> yysMaterialProcurementItemList = generaterSwapUtil.selectIdsByChildCondition(YysMaterialProcurementPlanConstant.getTableList(), YysMaterialProcurementItemTable, ruleJson, null);
if (YysMaterialProcurementItemHasSql){ if (YysMaterialProcurementItemHasSql) {
allRuleList.addAll(yysMaterialProcurementItemList); allRuleList.addAll(yysMaterialProcurementItemList);
intersectionRuleList.add(yysMaterialProcurementItemList); intersectionRuleList.add(yysMaterialProcurementItemList);
ruleNum++; ruleNum++;
} }
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or //and or
if(ruleOp.equalsIgnoreCase("and")){ if (ruleOp.equalsIgnoreCase("and")) {
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{ } else {
allRuleIDlist = allRuleList; allRuleIDlist = allRuleList;
} }
} }
boolean pcPermission = true; boolean pcPermission = true;
boolean appPermission = false; boolean appPermission = false;
if(isPc && pcPermission){ if (isPc && pcPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object yysMaterialProcurementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper,YysMaterialProcurementPlanEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0")); Object yysMaterialProcurementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper, YysMaterialProcurementPlanEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)){ if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>)yysMaterialProcurementPlanObj; yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>) yysMaterialProcurementPlanObj;
if( yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size()>0){ if (yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementPlanNum++; yysMaterialProcurementPlanNum++;
} }
} }
Object yysMaterialProcurementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper,YysMaterialProcurementItemEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0")); Object yysMaterialProcurementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper, YysMaterialProcurementItemEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)){ if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>)yysMaterialProcurementItemObj; yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>) yysMaterialProcurementItemObj;
if( yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size()>0){ if (yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementItemNum++; yysMaterialProcurementItemNum++;
} }
} }
} }
} }
if(!isPc && appPermission){ if (!isPc && appPermission) {
if (!userProvider.get().getIsAdministrator()){ if (!userProvider.get().getIsAdministrator()) {
Object yysMaterialProcurementPlanObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper,YysMaterialProcurementPlanEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0")); Object yysMaterialProcurementPlanObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementPlanQueryWrapper, YysMaterialProcurementPlanEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)){ if (ObjectUtil.isEmpty(yysMaterialProcurementPlanObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>)yysMaterialProcurementPlanObj; yysMaterialProcurementPlanQueryWrapper = (QueryWrapper<YysMaterialProcurementPlanEntity>) yysMaterialProcurementPlanObj;
if( yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size()>0){ if (yysMaterialProcurementPlanQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementPlanNum++; yysMaterialProcurementPlanNum++;
} }
} }
Object yysMaterialProcurementItemObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper,YysMaterialProcurementItemEntity.class,yysMaterialProcurementPlanPagination.getMenuId(),"0")); Object yysMaterialProcurementItemObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(yysMaterialProcurementItemQueryWrapper, YysMaterialProcurementItemEntity.class, yysMaterialProcurementPlanPagination.getMenuId(), "0"));
if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)){ if (ObjectUtil.isEmpty(yysMaterialProcurementItemObj)) {
return new ArrayList<>(); return new ArrayList<>();
} else { } else {
yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>)yysMaterialProcurementItemObj; yysMaterialProcurementItemQueryWrapper = (QueryWrapper<YysMaterialProcurementItemEntity>) yysMaterialProcurementItemObj;
if( yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size()>0){ if (yysMaterialProcurementItemQueryWrapper.getExpression().getNormal().size() > 0) {
yysMaterialProcurementItemNum++; yysMaterialProcurementItemNum++;
} }
} }
@ -184,21 +200,21 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
} }
} }
if(isPc){ if (isPc) {
if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementNumber())){ if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementNumber())) {
yysMaterialProcurementPlanNum++; yysMaterialProcurementPlanNum++;
String value = yysMaterialProcurementPlanPagination.getProcurementNumber() instanceof List ? String value = yysMaterialProcurementPlanPagination.getProcurementNumber() instanceof List ?
JsonUtil.getObjectToString(yysMaterialProcurementPlanPagination.getProcurementNumber()) : JsonUtil.getObjectToString(yysMaterialProcurementPlanPagination.getProcurementNumber()) :
String.valueOf(yysMaterialProcurementPlanPagination.getProcurementNumber()); String.valueOf(yysMaterialProcurementPlanPagination.getProcurementNumber());
yysMaterialProcurementPlanQueryWrapper.lambda().like(YysMaterialProcurementPlanEntity::getProcurementNumber,value); yysMaterialProcurementPlanQueryWrapper.lambda().like(YysMaterialProcurementPlanEntity::getProcurementNumber, value);
} }
if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementYearMonth())){ if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementYearMonth())) {
yysMaterialProcurementPlanNum++; yysMaterialProcurementPlanNum++;
List ProcurementYearMonthList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementYearMonth(),String.class); List ProcurementYearMonthList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementYearMonth(), String.class);
Long fir = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(0))); Long fir = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(0)));
Long sec = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(1))); Long sec = Long.valueOf(String.valueOf(ProcurementYearMonthList.get(1)));
@ -208,10 +224,10 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
} }
if(ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementDate())){ if (ObjectUtil.isNotEmpty(yysMaterialProcurementPlanPagination.getProcurementDate())) {
yysMaterialProcurementPlanNum++; yysMaterialProcurementPlanNum++;
List ProcurementDateList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementDate(),String.class); List ProcurementDateList = JsonUtil.getJsonToList(yysMaterialProcurementPlanPagination.getProcurementDate(), String.class);
Long fir = Long.valueOf(String.valueOf(ProcurementDateList.get(0))); Long fir = Long.valueOf(String.valueOf(ProcurementDateList.get(0)));
Long sec = Long.valueOf(String.valueOf(ProcurementDateList.get(1))); Long sec = Long.valueOf(String.valueOf(ProcurementDateList.get(1)));
@ -222,167 +238,185 @@ public class YysMaterialProcurementPlanServiceImpl extends ServiceImpl<YysMateri
} }
} }
if(yysMaterialProcurementItemNum>0){ if (yysMaterialProcurementItemNum > 0) {
List<String> yysMaterialProcurementItemIdList = yysMaterialProcurementItemService.list(yysMaterialProcurementItemQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getMaterialProcurementPlanId())).map(t->t.getMaterialProcurementPlanId()).collect(Collectors.toList()); List<String> yysMaterialProcurementItemIdList = yysMaterialProcurementItemService.list(yysMaterialProcurementItemQueryWrapper).stream().filter(t -> StringUtil.isNotEmpty(t.getMaterialProcurementPlanId())).map(t -> t.getMaterialProcurementPlanId()).collect(Collectors.toList());
long count = yysMaterialProcurementItemService.count(); long count = yysMaterialProcurementItemService.count();
if (count>0){ if (count > 0) {
intersectionList.add(yysMaterialProcurementItemIdList); intersectionList.add(yysMaterialProcurementItemIdList);
} }
AllIdList.addAll(yysMaterialProcurementItemIdList); AllIdList.addAll(yysMaterialProcurementItemIdList);
} }
total+=yysMaterialProcurementItemNum; total += yysMaterialProcurementItemNum;
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList); List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){ if (total > 0) {
if (intersection.size()==0){ if (intersection.size() == 0) {
intersection.add("jnpfNullList"); intersection.add("jnpfNullList");
} }
yysMaterialProcurementPlanQueryWrapper.lambda().in(YysMaterialProcurementPlanEntity::getId, intersection); yysMaterialProcurementPlanQueryWrapper.lambda().in(YysMaterialProcurementPlanEntity::getId, intersection);
} }
//是否有高级查询 //是否有高级查询
if (StringUtil.isNotEmpty(superOp)){ if (StringUtil.isNotEmpty(superOp)) {
if (allSuperIDlist.size()==0){ if (allSuperIDlist.size() == 0) {
allSuperIDlist.add("jnpfNullList"); allSuperIDlist.add("jnpfNullList");
} }
List<String> finalAllSuperIDlist = allSuperIDlist; 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 (StringUtil.isNotEmpty(ruleOp)) {
if (allRuleIDlist.size()==0){ if (allRuleIDlist.size() == 0) {
allRuleIDlist.add("jnpfNullList"); allRuleIDlist.add("jnpfNullList");
} }
List<String> finalAllRuleIDlist = allRuleIDlist; 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); yysMaterialProcurementPlanQueryWrapper.lambda().isNull(YysMaterialProcurementPlanEntity::getDeleteMark);
//排序 //排序
if(StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSidx())){ if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSidx())) {
yysMaterialProcurementPlanQueryWrapper.lambda().orderByDesc(YysMaterialProcurementPlanEntity::getProcurementDate); yysMaterialProcurementPlanQueryWrapper.lambda().orderByDesc(YysMaterialProcurementPlanEntity::getProcurementDate);
}else{ } else {
try { try {
String sidx = yysMaterialProcurementPlanPagination.getSidx(); String sidx = yysMaterialProcurementPlanPagination.getSidx();
String[] strs= sidx.split("_name"); String[] strs = sidx.split("_name");
YysMaterialProcurementPlanEntity yysMaterialProcurementPlanEntity = new YysMaterialProcurementPlanEntity(); YysMaterialProcurementPlanEntity yysMaterialProcurementPlanEntity = new YysMaterialProcurementPlanEntity();
Field declaredField = yysMaterialProcurementPlanEntity.getClass().getDeclaredField(strs[0]); Field declaredField = yysMaterialProcurementPlanEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); 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) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
if("0".equals(dataType)){ if ("0".equals(dataType)) {
if((total>0 && AllIdList.size()>0) || total==0){ if ((total > 0 && AllIdList.size() > 0) || total == 0) {
Page<YysMaterialProcurementPlanEntity> page=new Page<>(yysMaterialProcurementPlanPagination.getCurrentPage(), yysMaterialProcurementPlanPagination.getPageSize()); Page<YysMaterialProcurementPlanEntity> page = new Page<>(yysMaterialProcurementPlanPagination.getCurrentPage(), yysMaterialProcurementPlanPagination.getPageSize());
IPage<YysMaterialProcurementPlanEntity> userIPage=this.page(page, yysMaterialProcurementPlanQueryWrapper); IPage<YysMaterialProcurementPlanEntity> userIPage = this.page(page, yysMaterialProcurementPlanQueryWrapper);
return yysMaterialProcurementPlanPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return yysMaterialProcurementPlanPagination.setData(userIPage.getRecords(), userIPage.getTotal());
}else{ } else {
List<YysMaterialProcurementPlanEntity> list = new ArrayList(); List<YysMaterialProcurementPlanEntity> list = new ArrayList();
return yysMaterialProcurementPlanPagination.setData(list, list.size()); return yysMaterialProcurementPlanPagination.setData(list, list.size());
} }
}else{ } else {
return this.list(yysMaterialProcurementPlanQueryWrapper); return this.list(yysMaterialProcurementPlanQueryWrapper);
} }
} }
@Override @Override
public YysMaterialProcurementPlanEntity getInfo(String id){ public YysMaterialProcurementPlanEntity getInfo(String id) {
QueryWrapper<YysMaterialProcurementPlanEntity> queryWrapper=new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementPlanEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialProcurementPlanEntity::getId,id); queryWrapper.lambda().eq(YysMaterialProcurementPlanEntity::getId, id);
return this.getOne(queryWrapper); return this.getOne(queryWrapper);
} }
@Override @Override
public void create(YysMaterialProcurementPlanEntity entity){ public void create(YysMaterialProcurementPlanEntity entity) {
this.save(entity); this.save(entity);
} }
@Override @Override
public boolean update(String id, YysMaterialProcurementPlanEntity entity){ public boolean update(String id, YysMaterialProcurementPlanEntity entity) {
return this.updateById(entity); return this.updateById(entity);
} }
@Override @Override
public void delete(YysMaterialProcurementPlanEntity entity){ public void delete(YysMaterialProcurementPlanEntity entity) {
if(entity!=null){ if (entity != null) {
this.removeById(entity.getId()); this.removeById(entity.getId());
} }
} }
/** YysMaterialProcurementItem子表方法 */
/**
* YysMaterialProcurementItem子表方法
*/
@Override @Override
public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id,YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination){ public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id, YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) {
Map<String, Object> newtabMap=YysMaterialProcurementPlanConstant.TABLEFIELDKEY.entrySet() Map<String, Object> newtabMap = YysMaterialProcurementPlanConstant.TABLEFIELDKEY.entrySet()
.stream().collect( Collectors.toMap(e->e.getValue(),e->e.getKey())); .stream().collect(Collectors.toMap(e -> e.getValue(), e -> e.getKey()));
String tableName="yysMaterialProcurementItem"; String tableName = "yysMaterialProcurementItem";
tableName=newtabMap.get(tableName)==null?tableName:newtabMap.get(tableName).toString(); tableName = newtabMap.get(tableName) == null ? tableName : newtabMap.get(tableName).toString();
QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper = yysMaterialProcurementItemService.getChild(yysMaterialProcurementPlanPagination,queryWrapper); queryWrapper = yysMaterialProcurementItemService.getChild(yysMaterialProcurementPlanPagination, queryWrapper);
queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id); 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); return yysMaterialProcurementItemService.list(queryWrapper);
} }
/** YysMaterialProcurementItem子表方法 */ /**
* YysMaterialProcurementItem子表方法
*/
@Override @Override
public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id){ public List<YysMaterialProcurementItemEntity> getYysMaterialProcurementItemList(String id) {
QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id); queryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, id);
return yysMaterialProcurementItemService.list(queryWrapper); return yysMaterialProcurementItemService.list(queryWrapper);
} }
/** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
/**
* 验证表单唯一字段，正则，非空 i-0新增-1修改
*/
@Override @Override
public String checkForm(YysMaterialProcurementPlanForm form,int i) { public String checkForm(YysMaterialProcurementPlanForm form, int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id=""; String id = "";
String countRecover = ""; String countRecover = "";
if (isUp){ if (isUp) {
id = form.getId(); id = form.getId();
} }
//主表字段验证 //主表字段验证
//子表字段验证 //子表字段验证
if (form.getYysMaterialProcurementItemList()!=null){ if (form.getYysMaterialProcurementItemList() != null) {
} }
return countRecover; return countRecover;
} }
/** /**
* 新增修改数据(事务回滚) * 新增修改数据(事务回滚)
*
* @param id * @param id
* @param yysMaterialProcurementPlanForm * @param yysMaterialProcurementPlanForm
* @return * @return
*/ */
@Override @Override
@Transactional @Transactional
public void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,String id, boolean isSave) throws Exception{ public void saveOrUpdate(YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm, String id, boolean isSave) throws Exception {
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
yysMaterialProcurementPlanForm = JsonUtil.getJsonToBean( yysMaterialProcurementPlanForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(YysMaterialProcurementPlanConstant.getFormData(),yysMaterialProcurementPlanForm),YysMaterialProcurementPlanForm.class); generaterSwapUtil.swapDatetime(YysMaterialProcurementPlanConstant.getFormData(), yysMaterialProcurementPlanForm), YysMaterialProcurementPlanForm.class);
YysMaterialProcurementPlanEntity entity = JsonUtil.getJsonToBean(yysMaterialProcurementPlanForm, YysMaterialProcurementPlanEntity.class); YysMaterialProcurementPlanEntity entity = JsonUtil.getJsonToBean(yysMaterialProcurementPlanForm, YysMaterialProcurementPlanEntity.class);
if(isSave){ if (isSave) {
String mainId = RandomUtil.uuId() ; String mainId = RandomUtil.uuId();
entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false)); entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
entity.setId(mainId); entity.setId(mainId);
}else{ } else {
//entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false)); //entity.setProcurementNumber(generaterSwapUtil.getBillNumber("procurementnumber", false));
} }
this.saveOrUpdate(entity); this.saveOrUpdate(entity);
//YysMaterialProcurementItem子表数据新增修改 //YysMaterialProcurementItem子表数据新增修改
if(!isSave){ if (!isSave) {
QueryWrapper<YysMaterialProcurementItemEntity> YysMaterialProcurementItemqueryWrapper = new QueryWrapper<>(); QueryWrapper<YysMaterialProcurementItemEntity> YysMaterialProcurementItemqueryWrapper = new QueryWrapper<>();
YysMaterialProcurementItemqueryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, entity.getId()); YysMaterialProcurementItemqueryWrapper.lambda().eq(YysMaterialProcurementItemEntity::getMaterialProcurementPlanId, entity.getId());
yysMaterialProcurementItemService.remove(YysMaterialProcurementItemqueryWrapper); yysMaterialProcurementItemService.remove(YysMaterialProcurementItemqueryWrapper);
} }
if (yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList()!=null){ if (yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList() != null) {
List<YysMaterialProcurementItemEntity> tableField107 = JsonUtil.getJsonToList(yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList(),YysMaterialProcurementItemEntity.class); List<YysMaterialProcurementItemEntity> tableField107 = JsonUtil.getJsonToList(yysMaterialProcurementPlanForm.getYysMaterialProcurementItemList(), YysMaterialProcurementItemEntity.class);
for(YysMaterialProcurementItemEntity entitys : tableField107){ for (YysMaterialProcurementItemEntity entitys : tableField107) {
entitys.setId(RandomUtil.uuId()); entitys.setId(RandomUtil.uuId());
entitys.setMaterialProcurementPlanId(entity.getId()); entitys.setMaterialProcurementPlanId(entity.getId());
if(isSave){ if (isSave) {
}else{ } else {
} }
yysMaterialProcurementItemService.saveOrUpdate(entitys); yysMaterialProcurementItemService.saveOrUpdate(entitys);
} }
//每次修改的时候去修改下 采购表的修改时间和创建用户 其次统计数量
entity.setLastModifyTime(DateUtil.getNowDate());
entity.setLastModifyUserId(userInfo.getUserId());
this.saveOrUpdate(entity);
} }
} }
} }

6
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceUpkeepController.java
Unescape View File

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

196
jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysMaterialProcurementPlanController.java
Unescape View File

@ -8,23 +8,30 @@ import jnpf.base.ActionResult;
import jnpf.base.UserInfo; import jnpf.base.UserInfo;
import jnpf.exception.DataException; import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity; import jnpf.permission.entity.UserEntity;
import jnpf.permission.service.UserService;
import jnpf.service.*; import jnpf.service.*;
import jnpf.entity.*; import jnpf.entity.*;
import jnpf.util.*; import jnpf.util.*;
import jnpf.model.yysmaterialprocurementplan.*; import jnpf.model.yysmaterialprocurementplan.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.*; import java.util.*;
import jnpf.annotation.JnpfField; import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO; import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO; import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO; import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil; import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity; import jnpf.base.entity.ProvinceEntity;
import java.io.IOException; import java.io.IOException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity; import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException; import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile; 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 cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import java.io.File; import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel; import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel; import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel; import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
@ -51,6 +60,7 @@ import org.springframework.transaction.annotation.Transactional;
/** /**
* YysMaterialProcurementPlan * YysMaterialProcurementPlan
*
* @版本： V3.5 * @版本： V3.5
* @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
* @作者： JNPF开发平台组 * @作者： JNPF开发平台组
@ -58,7 +68,7 @@ import org.springframework.transaction.annotation.Transactional;
*/ */
@Slf4j @Slf4j
@RestController @RestController
@Tag(name = "YysMaterialProcurementPlan" , description = "example") @Tag(name = "YysMaterialProcurementPlan", description = "example")
@RequestMapping("/api/example/YysMaterialProcurementPlan") @RequestMapping("/api/example/YysMaterialProcurementPlan")
public class YysMaterialProcurementPlanController { public class YysMaterialProcurementPlanController {
@ -78,6 +88,9 @@ public class YysMaterialProcurementPlanController {
@Autowired @Autowired
private ConfigValueUtil configValueUtil; private ConfigValueUtil configValueUtil;
@Resource
private UserService userService;
/** /**
* 列表 * 列表
* *
@ -86,20 +99,23 @@ public class YysMaterialProcurementPlanController {
*/ */
@Operation(summary = "获取列表") @Operation(summary = "获取列表")
@PostMapping("/getList") @PostMapping("/getList")
public ActionResult list(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination)throws IOException{ public ActionResult list(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) throws IOException {
List<YysMaterialProcurementPlanEntity> list= yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination); List<YysMaterialProcurementPlanEntity> list = yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination);
List<Map<String, Object>> realList=new ArrayList<>(); List<Map<String, Object>> realList = new ArrayList<>();
for (YysMaterialProcurementPlanEntity entity : list) { for (YysMaterialProcurementPlanEntity entity : list) {
Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity); Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); 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); List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(), yysMaterialProcurementPlanPagination);
yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
realList.add(yysMaterialProcurementPlanMap); 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(); PageListVO vo = new PageListVO();
@ -108,6 +124,7 @@ public class YysMaterialProcurementPlanController {
vo.setPagination(page); vo.setPagination(page);
return ActionResult.success(vo); return ActionResult.success(vo);
} }
/** /**
* 创建 * 创建
* *
@ -117,17 +134,18 @@ public class YysMaterialProcurementPlanController {
@PostMapping() @PostMapping()
@Operation(summary = "创建") @Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm) { public ActionResult create(@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm) {
String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm,0); String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm, 0);
if (StringUtil.isNotEmpty(b)){ if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b ); return ActionResult.fail(b);
} }
try{ try {
yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, null ,true); yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, null, true);
}catch(Exception e){ } catch (Exception e) {
return ActionResult.fail("新增数据失败"); return ActionResult.fail("新增数据失败");
} }
return ActionResult.success("创建成功"); return ActionResult.success("创建成功");
} }
/** /**
* 导出Excel * 导出Excel
* *
@ -136,80 +154,80 @@ public class YysMaterialProcurementPlanController {
@Operation(summary = "导出Excel") @Operation(summary = "导出Excel")
@PostMapping("/Actions/Export") @PostMapping("/Actions/Export")
public ActionResult Export(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) throws IOException { public ActionResult Export(@RequestBody YysMaterialProcurementPlanPagination yysMaterialProcurementPlanPagination) throws IOException {
if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())){ if (StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())) {
return ActionResult.fail("请选择导出字段"); return ActionResult.fail("请选择导出字段");
} }
List<YysMaterialProcurementPlanEntity> list= yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination); List<YysMaterialProcurementPlanEntity> list = yysMaterialProcurementPlanService.getList(yysMaterialProcurementPlanPagination);
List<Map<String, Object>> realList=new ArrayList<>(); List<Map<String, Object>> realList = new ArrayList<>();
for (YysMaterialProcurementPlanEntity entity : list) { for (YysMaterialProcurementPlanEntity entity : list) {
Map<String, Object> yysMaterialProcurementPlanMap=JsonUtil.entityToMap(entity); Map<String, Object> yysMaterialProcurementPlanMap = JsonUtil.entityToMap(entity);
yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id")); yysMaterialProcurementPlanMap.put("id", yysMaterialProcurementPlanMap.get("id"));
//副表数据 //副表数据
//子表数据 //子表数据
List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(),yysMaterialProcurementPlanPagination); List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId(), yysMaterialProcurementPlanPagination);
yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
realList.add(yysMaterialProcurementPlanMap); 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);
String[]keys=!StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey())?yysMaterialProcurementPlanPagination.getSelectKey():new String[0]; String[] keys = !StringUtil.isEmpty(yysMaterialProcurementPlanPagination.getSelectKey()) ? yysMaterialProcurementPlanPagination.getSelectKey() : new String[0];
UserInfo userInfo=userProvider.get(); UserInfo userInfo = userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo); DownloadVO vo = this.creatModelExcel(configValueUtil.getTemporaryFilePath(), realList, keys, userInfo);
return ActionResult.success(vo); 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) {
DownloadVO vo=DownloadVO.builder().build(); DownloadVO vo = DownloadVO.builder().build();
List<ExcelExportEntity> entitys=new ArrayList<>(); List<ExcelExportEntity> entitys = new ArrayList<>();
if(keys.length>0){ if (keys.length > 0) {
ExcelExportEntity tableField107ExcelEntity = new ExcelExportEntity("物料明细","tableField107"); ExcelExportEntity tableField107ExcelEntity = new ExcelExportEntity("物料明细", "tableField107");
List<ExcelExportEntity> tableField107List = new ArrayList<>(); List<ExcelExportEntity> tableField107List = new ArrayList<>();
for(String key:keys){ for (String key : keys) {
switch(key){ switch (key) {
case "procurementNumber" : case "procurementNumber":
entitys.add(new ExcelExportEntity("采购计划单号" ,"procurementNumber")); entitys.add(new ExcelExportEntity("采购计划单号", "procurementNumber"));
break; break;
case "procurementDate" : case "procurementDate":
entitys.add(new ExcelExportEntity("单据日期" ,"procurementDate")); entitys.add(new ExcelExportEntity("单据日期", "procurementDate"));
break; break;
case "procurementYearMonth" : case "procurementYearMonth":
entitys.add(new ExcelExportEntity("年月" ,"procurementYearMonth")); entitys.add(new ExcelExportEntity("年月", "procurementYearMonth"));
break; break;
case "planNumber" : case "planNumber":
entitys.add(new ExcelExportEntity("物料需求计划单号" ,"planNumber")); entitys.add(new ExcelExportEntity("物料需求计划单号", "planNumber"));
break; break;
case "reamrk" : case "reamrk":
entitys.add(new ExcelExportEntity("备注" ,"reamrk")); entitys.add(new ExcelExportEntity("备注", "reamrk"));
break; break;
case "tableField107-materialCode": case "tableField107-materialCode":
tableField107List.add(new ExcelExportEntity("物料编码" ,"materialCode")); tableField107List.add(new ExcelExportEntity("物料编码", "materialCode"));
break; break;
case "tableField107-materialName": case "tableField107-materialName":
tableField107List.add(new ExcelExportEntity("物料名称" ,"materialName")); tableField107List.add(new ExcelExportEntity("物料名称", "materialName"));
break; break;
case "tableField107-materialType": case "tableField107-materialType":
tableField107List.add(new ExcelExportEntity("物料类型" ,"materialType")); tableField107List.add(new ExcelExportEntity("物料类型", "materialType"));
break; break;
case "tableField107-specification": case "tableField107-specification":
tableField107List.add(new ExcelExportEntity("规格型号" ,"specification")); tableField107List.add(new ExcelExportEntity("规格型号", "specification"));
break; break;
case "tableField107-lackNumber": case "tableField107-lackNumber":
tableField107List.add(new ExcelExportEntity("欠缺量" ,"lackNumber")); tableField107List.add(new ExcelExportEntity("欠缺量", "lackNumber"));
break; break;
case "tableField107-procurementPlanNumber": case "tableField107-procurementPlanNumber":
tableField107List.add(new ExcelExportEntity("拟采购量" ,"procurementPlanNumber")); tableField107List.add(new ExcelExportEntity("拟采购量", "procurementPlanNumber"));
break; break;
case "tableField107-unit": case "tableField107-unit":
tableField107List.add(new ExcelExportEntity("计量单位" ,"unit")); tableField107List.add(new ExcelExportEntity("计量单位", "unit"));
break; break;
default: default:
break; break;
} }
} }
if(tableField107List.size() > 0){ if (tableField107List.size() > 0) {
tableField107ExcelEntity.setList(tableField107List); tableField107ExcelEntity.setList(tableField107List);
entitys.add(tableField107ExcelEntity); entitys.add(tableField107ExcelEntity);
} }
@ -217,10 +235,10 @@ public class YysMaterialProcurementPlanController {
ExportParams exportParams = new ExportParams(null, "表单信息"); ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF); exportParams.setType(ExcelType.XSSF);
try{ try {
@Cleanup Workbook workbook = new HSSFWorkbook(); @Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){ if (entitys.size() > 0) {
if (list.size()==0){ if (list.size() == 0) {
list.add(new HashMap<>()); list.add(new HashMap<>());
} }
//去除空数据 //去除空数据
@ -230,8 +248,8 @@ public class YysMaterialProcurementPlanController {
for (String key : keys) { for (String key : keys) {
//子表 //子表
if (key.toLowerCase().startsWith("tablefield")) { if (key.toLowerCase().startsWith("tablefield")) {
String tableField = key.substring(0, key.indexOf("-" )); String tableField = key.substring(0, key.indexOf("-"));
String field = key.substring(key.indexOf("-" ) + 1); String field = key.substring(key.indexOf("-") + 1);
Object o = map.get(tableField); Object o = map.get(tableField);
if (o != null) { if (o != null) {
List<Map<String, Object>> childList = (List<Map<String, Object>>) o; List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
@ -274,94 +292,110 @@ public class YysMaterialProcurementPlanController {
} }
return vo; return vo;
} }
/** /**
* 编辑 * 编辑
*
* @param id * @param id
* @param yysMaterialProcurementPlanForm * @param yysMaterialProcurementPlanForm
* @return * @return
*/ */
@PutMapping("/{id}") @PutMapping("/{id}")
@Operation(summary = "更新") @Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm, public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid YysMaterialProcurementPlanForm yysMaterialProcurementPlanForm,
@RequestParam(value = "isImport", required = false) boolean isImport){ @RequestParam(value = "isImport", required = false) boolean isImport) {
yysMaterialProcurementPlanForm.setId(id); yysMaterialProcurementPlanForm.setId(id);
if (!isImport) { if (!isImport) {
String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm,1); String b = yysMaterialProcurementPlanService.checkForm(yysMaterialProcurementPlanForm, 1);
if (StringUtil.isNotEmpty(b)){ if (StringUtil.isNotEmpty(b)) {
return ActionResult.fail(b ); return ActionResult.fail(b);
} }
} }
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if(entity!=null){ if (entity != null) {
try{ try {
yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm,id,false); yysMaterialProcurementPlanService.saveOrUpdate(yysMaterialProcurementPlanForm, id, false);
}catch(Exception e){ } catch (Exception e) {
return ActionResult.fail("修改数据失败"); return ActionResult.fail("修改数据失败");
} }
return ActionResult.success("更新成功"); return ActionResult.success("更新成功");
}else{ } else {
return ActionResult.fail("更新失败，数据不存在"); return ActionResult.fail("更新失败，数据不存在");
} }
} }
/** /**
* 删除 * 删除
*
* @param id * @param id
* @return * @return
*/ */
@Operation(summary = "删除") @Operation(summary = "删除")
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
@Transactional @Transactional
public ActionResult delete(@PathVariable("id") String id){ public ActionResult delete(@PathVariable("id") String id) {
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if(entity!=null){ if (entity != null) {
//假删除 //假删除
entity.setDeleteMark(1); entity.setDeleteMark(1);
yysMaterialProcurementPlanService.update(id,entity); yysMaterialProcurementPlanService.update(id, entity);
} }
return ActionResult.success("删除成功"); return ActionResult.success("删除成功");
} }
/** /**
* 表单信息(详情页) * 表单信息(详情页)
* 详情页面使用-转换数据 * 详情页面使用-转换数据
*
* @param id * @param id
* @return * @return
*/ */
@Operation(summary = "表单信息(详情页)") @Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}") @GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){ public ActionResult detailInfo(@PathVariable("id") String id) {
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if(entity==null){ if (entity == null) {
return ActionResult.fail("表单数据不存在！"); 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("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()); List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId());
yysMaterialProcurementPlanMap.put("tableField107",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); yysMaterialProcurementPlanMap.put("tableField107", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialProcurementPlanMap,YysMaterialProcurementPlanConstant.getFormData(),"590930391657874309",false); yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataDetail(yysMaterialProcurementPlanMap, YysMaterialProcurementPlanConstant.getFormData(), "590930391657874309", false);
return ActionResult.success(yysMaterialProcurementPlanMap); return ActionResult.success(yysMaterialProcurementPlanMap);
} }
/** /**
* 获取详情(编辑页) * 获取详情(编辑页)
* 编辑页面使用-不转换数据 * 编辑页面使用-不转换数据
*
* @param id * @param id
* @return * @return
*/ */
@Operation(summary = "信息") @Operation(summary = "信息")
@GetMapping("/{id}") @GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){ public ActionResult info(@PathVariable("id") String id) {
YysMaterialProcurementPlanEntity entity= yysMaterialProcurementPlanService.getInfo(id); YysMaterialProcurementPlanEntity entity = yysMaterialProcurementPlanService.getInfo(id);
if(entity==null){ if (entity == null) {
return ActionResult.fail("表单数据不存在！"); 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("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()); List<YysMaterialProcurementItemEntity> yysMaterialProcurementItemList = yysMaterialProcurementPlanService.getYysMaterialProcurementItemList(entity.getId());
yysMaterialProcurementPlanMap.put("yysMaterialProcurementItemList",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList))); yysMaterialProcurementPlanMap.put("yysMaterialProcurementItemList", JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(yysMaterialProcurementItemList)));
yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialProcurementPlanMap,YysMaterialProcurementPlanConstant.getFormData(),YysMaterialProcurementPlanConstant.TABLEFIELDKEY,YysMaterialProcurementPlanConstant.TABLERENAMES); yysMaterialProcurementPlanMap = generaterSwapUtil.swapDataForm(yysMaterialProcurementPlanMap, YysMaterialProcurementPlanConstant.getFormData(), YysMaterialProcurementPlanConstant.TABLEFIELDKEY, YysMaterialProcurementPlanConstant.TABLERENAMES);
return ActionResult.success(yysMaterialProcurementPlanMap); return ActionResult.success(yysMaterialProcurementPlanMap);
} }

2
jnpf-java-boot/jnpf-web/src/views/yys/yysdayplan/index.vue
Unescape View File

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

218
jnpf-java-boot/jnpf-web/src/views/yys/yysdeviceupkeep/Detail.vue
Unescape View File

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

157
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/Detail.vue
Unescape View File

@ -1,113 +1,125 @@
<template> <template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" <el-page-header @back="goBack" content="详情" />
content="详情"/>
<div class="options"> <div class="options">
<el-button @click="goBack">取 消</el-button> <el-button @click="goBack">取 消</el-button>
</div> </div>
</div> </div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}"> <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" > <el-form ref="formRef" :model="dataForm" size="small" label-width="150px" label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="采购计划单号" <jnpf-form-tip-item label="采购计划单号" prop="procurementNumber">
prop="procurementNumber" > <p>{{ dataForm.procurementNumber }}</p>
<p>{{dataForm.procurementNumber}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="单据日期" <jnpf-form-tip-item label="单据日期" prop="procurementDate">
prop="procurementDate" > <p>{{ dataForm.procurementDate }}</p>
<p>{{dataForm.procurementDate}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="年月" <jnpf-form-tip-item label="年月" prop="procurementYearMonth">
prop="procurementYearMonth" > <p>{{ dataForm.procurementYearMonth }}</p>
<p>{{dataForm.procurementYearMonth}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="物料需求计划单号" <jnpf-form-tip-item label="物料需求计划单号" prop="planNumber">
prop="planNumber" > <p>{{ dataForm.planNumber }}</p>
<p>{{dataForm.planNumber}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item label="备注" <jnpf-form-tip-item label="备注" prop="reamrk">
prop="reamrk" > <p>{{ dataForm.reamrk }}</p>
<p>{{dataForm.reamrk}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item label-width="0"> <jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title"> <div class="JNPF-common-title">
<h2>物料明细</h2> <h2>物料明细</h2>
</div> </div>
<el-table :data="dataForm.tableField107" size='mini' > <el-table :data="dataForm.tableField107" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="materialCode" label="物料编码" > <el-table-column prop="materialCode" label="物料编码">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.materialCode}}</p> <p>{{ scope.row.materialCode }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="materialName" label="物料名称" > <el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.materialName}}</p> <p>{{ scope.row.materialName }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="materialType" label="物料类型" > <el-table-column prop="materialType" label="物料类型">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.materialType}}</p> <p>{{ scope.row.materialType }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="specification" label="规格型号" > <el-table-column prop="specification" label="规格型号">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.specification}}</p> <p>{{ scope.row.specification }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="lackNumber" label="欠缺量" > <el-table-column prop="lackNumber" label="欠缺量">
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfNumber v-model="scope.row.lackNumber" <JnpfNumber v-model="scope.row.lackNumber" placeholder="数字文本" disabled
placeholder="数字文本" disabled :step="1">
:step="1" >
</JnpfNumber> </JnpfNumber>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="procurementPlanNumber" label="拟采购量" > <el-table-column prop="procurementPlanNumber" label="拟采购量">
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfNumber v-model="scope.row.procurementPlanNumber" <JnpfNumber v-model="scope.row.procurementPlanNumber" placeholder="数字文本"
placeholder="数字文本" disabled disabled :step="1">
:step="1" >
</JnpfNumber> </JnpfNumber>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="unit" label="计量单位" > <el-table-column prop="unit" label="计量单位">
<template slot-scope="scope"> <template slot-scope="scope">
<p>{{scope.row.unit}}</p> <p>{{ scope.row.unit }}</p>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </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> </template>
</el-form> </el-form>
</el-row> </el-row>
</div> </div>
</transition> </transition>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
@ -116,13 +128,13 @@
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
procurementNumber : '', procurementNumber: '',
procurementDate : '', procurementDate: '',
procurementYearMonth : '', procurementYearMonth: '',
planNumber : "", planNumber: "",
reamrk : '', reamrk: '',
yysmaterialprocurementitemList:[], yysmaterialprocurementitemList: [],
}, },
} }
@ -132,8 +144,17 @@
created() { created() {
}, },
mounted() {}, mounted() { },
methods: { 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')}`;
}
},
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {
@ -146,8 +167,8 @@
}) })
}) })
}, },
dataInfo(dataAll){ dataInfo(dataAll) {
let _dataAll =dataAll let _dataAll = dataAll
this.dataForm = _dataAll this.dataForm = _dataAll
}, },
@ -158,10 +179,10 @@
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
url: '/api/example/YysMaterialProcurementPlan/detail/'+this.dataForm.id, url: '/api/example/YysMaterialProcurementPlan/detail/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
@ -172,6 +193,6 @@
}) })
}, },
}, },
} }
</script> </script>

415
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/form.vue
Unescape View File

@ -1,198 +1,239 @@
<template>
<template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
:content="!dataForm.id ? '新建':'编辑'"/>
<div class="options"> <div class="options">
<el-dropdown class="dropdown" placement="bottom"> <!-- <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px"> <el-button style="width:70px">
更 多<i class="el-icon-arrow-down el-icon--right"></i> 更 多<i class="el-icon-arrow-down el-icon--right"></i>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<template v-if="dataForm.id"> <template v-if="dataForm.id">
<el-dropdown-item @click.native="prev" :disabled='prevDis'> <el-dropdown-item @click.native="prev" :disabled='prevDis'>
{{'上一条'}} {{ '上一条' }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="next" :disabled='nextDis'> <el-dropdown-item @click.native="next" :disabled='nextDis'>
{{'下一条'}} {{ '下一条' }}
</el-dropdown-item> </el-dropdown-item>
</template> </template>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
:loading="continueBtnLoading" :disabled='btnLoading'> :loading="continueBtnLoading" :disabled='btnLoading'>
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item> {{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> 保
存</el-button>
<el-button @click="goBack"> 取 消</el-button> <el-button @click="goBack"> 取 消</el-button>
</div> </div>
</div> </div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}"> <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px" label-position="right" > <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px"
label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item <jnpf-form-tip-item label="采购计划单号" prop="procurementNumber">
label="采购计划单号" prop="procurementNumber" > <JnpfInput v-model="dataForm.procurementNumber"
<JnpfInput v-model="dataForm.procurementNumber" @change="changeData('procurementNumber',-1)" @change="changeData('procurementNumber', -1)" placeholder="系统自动生成" readonly
placeholder="系统自动生成" readonly :style='{"width":"100%"}'> :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item <jnpf-form-tip-item label="单据日期" prop="procurementDate">
label="单据日期" prop="procurementDate" > <JnpfDatePicker v-model="dataForm.procurementDate"
<JnpfDatePicker v-model="dataForm.procurementDate" @change="changeData('procurementDate',-1)" @change="changeData('procurementDate', -1)" :startTime="dateTime(false, 1, 1, '', '')"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" > :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
:style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker> </JnpfDatePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item <jnpf-form-tip-item label="年月" prop="procurementYearMonth">
label="年月" prop="procurementYearMonth" > <JnpfDatePicker v-model="dataForm.procurementYearMonth"
<JnpfDatePicker v-model="dataForm.procurementYearMonth" @change="changeData('procurementYearMonth',-1)" @change="changeData('procurementYearMonth', -1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :style='{"width":"100%"}' type="month" format="yyyy-MM" > :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择" clearable :style='{ "width": "100%" }' type="month" format="yyyy-MM">
</JnpfDatePicker> </JnpfDatePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item <jnpf-form-tip-item label="物料需求计划单号" prop="planNumber">
label="物料需求计划单号" prop="planNumber" > <JnpfPopupSelect v-model="dataForm.planNumber" @change="changeData('planNumber', -1)"
<JnpfPopupSelect v-model="dataForm.planNumber" @change="changeData('planNumber',-1)" :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.planNumber"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.planNumber" placeholder="请选择" propsValue="plan_number" popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='plan_number' field='planNumber' interfaceId="591169965881556997" :pageSize="20" :columnOptions="planNumbercolumnOptions" clearable :style='{"width":"100%"}'> placeholder="请选择" propsValue="plan_number" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='plan_number' field='planNumber'
interfaceId="591169965881556997" :pageSize="20"
:columnOptions="planNumbercolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="备注" prop="reamrk">
label="备注" prop="reamrk" > <JnpfTextarea v-model="dataForm.reamrk" @change="changeData('reamrk', -1)"
<JnpfTextarea v-model="dataForm.reamrk" @change="changeData('reamrk',-1)" placeholder="请输入" :style='{ "width": "100%" }' true type="textarea"
placeholder="请输入" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' > :autosize='{ "minRows": 4, "maxRows": 4 }'>
</JnpfTextarea> </JnpfTextarea>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item label-width="0"> <jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title"> <div class="JNPF-common-title">
<h2>物料明细</h2> <h2>物料明细</h2>
</div> </div>
<el-table :data="dataForm.yysMaterialProcurementItemList" size='mini' > <el-table :data="dataForm.yysMaterialProcurementItemList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column <el-table-column label="物料编码" prop="materialCode">
label="物料编码" prop="materialCode" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>物料编码
<span class="required-sign" >*</span>物料编码
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.materialCode" @change="changeData('yysmaterialprocurementitem-materialCode',scope.$index)" <JnpfInput v-model="scope.row.materialCode"
placeholder="请输入" clearable :style='{"width":"100%"}'> @change="changeData('yysmaterialprocurementitem-materialCode', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="物料名称" prop="materialName">
label="物料名称" prop="materialName" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>物料名称
<span class="required-sign" >*</span>物料名称
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.materialName" @change="changeData('yysmaterialprocurementitem-materialName',scope.$index)" <JnpfInput v-model="scope.row.materialName"
placeholder="请输入" clearable :style='{"width":"100%"}'> @change="changeData('yysmaterialprocurementitem-materialName', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="物料类型" prop="materialType">
label="物料类型" prop="materialType" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>物料类型
<span class="required-sign" >*</span>物料类型
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.materialType" @change="changeData('yysmaterialprocurementitem-materialType',scope.$index)" <JnpfInput v-model="scope.row.materialType"
placeholder="请输入" clearable :style='{"width":"100%"}'> @change="changeData('yysmaterialprocurementitem-materialType', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="规格型号" prop="specification">
label="规格型号" prop="specification" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>规格型号
<span class="required-sign" >*</span>规格型号
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.specification" @change="changeData('yysmaterialprocurementitem-specification',scope.$index)" <JnpfInput v-model="scope.row.specification"
placeholder="请输入" clearable :style='{"width":"100%"}'> @change="changeData('yysmaterialprocurementitem-specification', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="欠缺量" prop="lackNumber">
label="欠缺量" prop="lackNumber" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>欠缺量
<span class="required-sign" >*</span>欠缺量
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.lackNumber" @change="changeData('yysmaterialprocurementitem-lackNumber',scope.$index)" <JnpfInputNumber v-model="scope.row.lackNumber"
placeholder="数字文本" :precision="2" :step="1" > @change="changeData('yysmaterialprocurementitem-lackNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber> </JnpfInputNumber>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="拟采购量" prop="procurementPlanNumber">
label="拟采购量" prop="procurementPlanNumber" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>拟采购量
<span class="required-sign" >*</span>拟采购量
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.procurementPlanNumber" @change="changeData('yysmaterialprocurementitem-procurementPlanNumber',scope.$index)" <JnpfInputNumber v-model="scope.row.procurementPlanNumber"
placeholder="数字文本" :precision="2" :step="1" > @change="changeData('yysmaterialprocurementitem-procurementPlanNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber> </JnpfInputNumber>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="计量单位" prop="unit">
label="计量单位" prop="unit" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>计量单位
<span class="required-sign" >*</span>计量单位
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.unit" @change="changeData('yysmaterialprocurementitem-unit',scope.$index)" <JnpfInput v-model="scope.row.unit"
placeholder="请输入" clearable :style='{"width":"100%"}'> @change="changeData('yysmaterialprocurementitem-unit', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="50" > <el-table-column label="操作" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delyysMaterialProcurementItemList(scope.$index)">删除</el-button> <el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delyysMaterialProcurementItemList(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="table-actions" @click="addyysMaterialProcurementItemList()" > <div class="table-actions" @click="addyysMaterialProcurementItemList()">
<el-button type="text" icon="el-icon-plus">添加</el-button> <el-button type="text" icon="el-icon-plus">添加</el-button>
</div> </div>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建人" prop="creatorUserId">
<JnpfInput v-model="dataForm.creatorUserId" @change="changeData('creatorUserId', -1)"
placeholder="自动生成" disabled clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<JnpfDatePicker v-model="dataForm.creatorTime" @change="changeData('creatorTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="自动生成" disabled clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改人" prop="lastModifyUserId">
<JnpfInput v-model="dataForm.lastModifyUserId"
@change="changeData('lastModifyUserId', -1)" placeholder="修改时记录" disabled clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="12">
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<JnpfDatePicker v-model="dataForm.lastModifyTime"
@change="changeData('lastModifyTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="修改时记录" disabled clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 --> <!-- 表单结束 -->
</template> </template>
</el-form> </el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/> @select="addForSelect" @close="selectDialogVisible = false" />
</el-row> </el-row>
</div> </div>
</transition> </transition>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user' import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { }, components: {},
props: [], props: [],
data() { data() {
return { return {
@ -206,67 +247,67 @@
loading: false, loading: false,
btnLoading: false, btnLoading: false,
formRef: 'formRef', formRef: 'formRef',
setting:{}, setting: {},
eventType: '', eventType: '',
userBoxVisible:false, userBoxVisible: false,
selectDialogVisible: false, selectDialogVisible: false,
currTableConf:{}, currTableConf: {},
dataValueAll:{}, dataValueAll: {},
addTableConf:{ addTableConf: {
yysMaterialProcurementItemList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"}, yysMaterialProcurementItemList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
}, },
//可选范围默认值 //可选范围默认值
ableAll:{ ableAll: {
}, },
tableRows:{ tableRows: {
yysMaterialProcurementItemList:{ yysMaterialProcurementItemList: {
materialCode : '', materialCode: '',
materialCodeOptions:[], materialCodeOptions: [],
materialName : '', materialName: '',
materialNameOptions:[], materialNameOptions: [],
materialType : '', materialType: '',
materialTypeOptions:[], materialTypeOptions: [],
specification : '', specification: '',
specificationOptions:[], specificationOptions: [],
lackNumber : undefined, lackNumber: undefined,
lackNumberOptions:[], lackNumberOptions: [],
procurementPlanNumber : undefined, procurementPlanNumber: undefined,
procurementPlanNumberOptions:[], procurementPlanNumberOptions: [],
unit : '', unit: '',
unitOptions:[], unitOptions: [],
enabledmark:undefined enabledmark: undefined
}, },
}, },
Vmodel:"", Vmodel: "",
currVmodel:"", currVmodel: "",
dataForm: { dataForm: {
procurementNumber : undefined, procurementNumber: undefined,
procurementDate : undefined, procurementDate: undefined,
procurementYearMonth : undefined, procurementYearMonth: undefined,
planNumber : undefined, planNumber: undefined,
reamrk : undefined, reamrk: undefined,
yysMaterialProcurementItemList:[], yysMaterialProcurementItemList: [],
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule:
{ {
}, },
planNumbercolumnOptions:[ {"label":"物料需求计划单","value":"plan_number"}, {"label":"物料信息","value":"material_names"}, {"label":"年月","value":"plan_year_month"}, {"label":"单据日期","value":"order_date"}, {"label":"备注","value":"reamrk"},], planNumbercolumnOptions: [{ "label": "物料需求计划单", "value": "plan_number" }, { "label": "物料信息", "value": "material_names" }, { "label": "年月", "value": "plan_year_month" }, { "label": "单据日期", "value": "order_date" }, { "label": "备注", "value": "reamrk" },],
childIndex:-1, childIndex: -1,
isEdit:false, isEdit: false,
interfaceRes: { interfaceRes: {
procurementNumber:[] , procurementNumber: [],
procurementDate:[] , procurementDate: [],
procurementYearMonth:[] , procurementYearMonth: [],
planNumber:[] , planNumber: [],
reamrk:[] , reamrk: [],
yysmaterialprocurementitemmaterialCode: [] , yysmaterialprocurementitemmaterialCode: [],
yysmaterialprocurementitemmaterialName: [] , yysmaterialprocurementitemmaterialName: [],
yysmaterialprocurementitemmaterialType: [] , yysmaterialprocurementitemmaterialType: [],
yysmaterialprocurementitemspecification: [] , yysmaterialprocurementitemspecification: [],
yysmaterialprocurementitemlackNumber: [] , yysmaterialprocurementitemlackNumber: [],
yysmaterialprocurementitemprocurementPlanNumber: [] , yysmaterialprocurementitemprocurementPlanNumber: [],
yysmaterialprocurementitemunit: [] , yysmaterialprocurementitemunit: [],
}, },
} }
}, },
@ -279,7 +320,7 @@
this.initDefaultData() this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)) this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
}, },
mounted() {}, mounted() { },
methods: { methods: {
prev() { prev() {
this.index-- this.index--
@ -309,7 +350,7 @@
}, },
getInfo(id) { getInfo(id) {
request({ request({
url: '/api/example/YysMaterialProcurementPlan/'+ id, url: '/api/example/YysMaterialProcurementPlan/' + id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
@ -333,7 +374,7 @@
for (let i = 0; i < faceReList.length; i++) { for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) { if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options'; let options = 'get' + key + 'Options';
if(this[options]){ if (this[options]) {
this[options]() this[options]()
} }
this.changeData(key, index) this.changeData(key, index)
@ -342,8 +383,8 @@
} }
} }
}, },
changeDataFormData(type, data, model,index,defaultValue) { changeDataFormData(type, data, model, index, defaultValue) {
if(!this.isEdit) { if (!this.isEdit) {
if (type == 2) { if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) { for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) { if (index == -1) {
@ -357,11 +398,11 @@
} }
} }
}, },
dataAll(){ dataAll() {
}, },
yysmaterialprocurementitemExist() { yysmaterialprocurementitemExist() {
let isOk = true; let isOk = true;
for(let i=0;i<this.dataForm.yysMaterialProcurementItemList.length;i++){ for (let i = 0; i < this.dataForm.yysMaterialProcurementItemList.length; i++) {
const e = this.dataForm.yysMaterialProcurementItemList[i]; const e = this.dataForm.yysMaterialProcurementItemList[i];
} }
return isOk; return isOk;
@ -369,10 +410,10 @@
goBack() { goBack() {
this.$emit('refresh') this.$emit('refresh')
}, },
clearData(){ clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll)) this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
}, },
init(id,isDetail,allList) { init(id, isDetail, allList) {
this.prevDis = false this.prevDis = false
this.nextDis = false this.nextDis = false
this.allList = allList || [] this.allList = allList || []
@ -391,16 +432,16 @@
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
url: '/api/example/YysMaterialProcurementPlan/'+this.dataForm.id, url: '/api/example/YysMaterialProcurementPlan/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}); });
}else{ } else {
this.clearData() this.clearData()
this.initDefaultData() this.initDefaultData()
} }
@ -422,7 +463,7 @@
}) })
}, },
request() { request() {
let _data =this.dataList() let _data = this.dataList()
if (this.dataFormSubmitType == 2) { if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true this.continueBtnLoading = true
} else { } else {
@ -452,13 +493,13 @@
this.$emit('refresh', true) this.$emit('refresh', true)
} }
}) })
}).catch(()=>{ }).catch(() => {
this.btnLoading = false this.btnLoading = false
this.continueBtnLoading = false this.continueBtnLoading = false
}) })
}else{ } else {
request({ request({
url: '/api/example/YysMaterialProcurementPlan/'+this.dataForm.id, url: '/api/example/YysMaterialProcurementPlan/' + this.dataForm.id,
method: 'PUT', method: 'PUT',
data: _data data: _data
}).then((res) => { }).then((res) => {
@ -473,21 +514,21 @@
this.$emit('refresh', true) this.$emit('refresh', true)
} }
}) })
}).catch(()=>{ }).catch(() => {
this.btnLoading = false this.btnLoading = false
this.continueBtnLoading = false this.continueBtnLoading = false
}) })
} }
}, },
addyysMaterialProcurementItemList(){ addyysMaterialProcurementItemList() {
let item = { let item = {
materialCode:undefined, materialCode: undefined,
materialName:undefined, materialName: undefined,
materialType:undefined, materialType: undefined,
specification:undefined, specification: undefined,
lackNumber:undefined, lackNumber: undefined,
procurementPlanNumber:undefined, procurementPlanNumber: undefined,
unit:undefined, unit: undefined,
} }
this.getyysMaterialProcurementItemList(item) this.getyysMaterialProcurementItemList(item)
}, },
@ -499,17 +540,17 @@
}).catch(() => { }).catch(() => {
}); });
}, },
getyysMaterialProcurementItemList(value){ getyysMaterialProcurementItemList(value) {
let item={...this.tableRows.yysMaterialProcurementItemList,...value} let item = { ...this.tableRows.yysMaterialProcurementItemList, ...value }
this.dataForm.yysMaterialProcurementItemList.push(item) this.dataForm.yysMaterialProcurementItemList.push(item)
this.childIndex=this.dataForm.yysMaterialProcurementItemList.length-1 this.childIndex = this.dataForm.yysMaterialProcurementItemList.length - 1
this.isEdit = true this.isEdit = true
this.isEdit = false this.isEdit = false
this.childIndex = -1 this.childIndex = -1
}, },
openSelectDialog(key) { openSelectDialog(key) {
this.currTableConf=this.addTableConf[key] this.currTableConf = this.addTableConf[key]
this.currVmodel=key this.currVmodel = key
this.selectDialogVisible = true this.selectDialogVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.selectDialog.init() this.$refs.selectDialog.init()
@ -518,8 +559,8 @@
addForSelect(data) { addForSelect(data) {
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
let t = data[i] let t = data[i]
if(this['get'+this.currVmodel]){ if (this['get' + this.currVmodel]) {
this['get'+this.currVmodel](t) this['get' + this.currVmodel](t)
} }
} }
}, },
@ -586,21 +627,21 @@
} }
return timeDataValue; return timeDataValue;
}, },
dataList(){ dataList() {
var _data = this.dataForm; var _data = this.dataForm;
return _data; return _data;
}, },
dataInfo(dataAll){ dataInfo(dataAll) {
let _dataAll =dataAll let _dataAll = dataAll
this.dataForm = _dataAll this.dataForm = _dataAll
this.isEdit = true this.isEdit = true
this.dataAll() this.dataAll()
for(let i=0;i<_dataAll.yysMaterialProcurementItemList.length;i++){ for (let i = 0; i < _dataAll.yysMaterialProcurementItemList.length; i++) {
this.childIndex = i this.childIndex = i
} }
this.childIndex=-1 this.childIndex = -1
}, },
}, },
} }
</script> </script>

186
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialprocurementplan/index.vue
Unescape View File

@ -1,10 +1,3 @@
<template> <template>
<div class="JNPF-common-layout"> <div class="JNPF-common-layout">
<div class="JNPF-common-layout-center"> <div class="JNPF-common-layout-center">
@ -17,17 +10,15 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="年月"> <el-form-item label="年月">
<JnpfDateRangePicker v-model="query.procurementYearMonth" <JnpfDateRangePicker v-model="query.procurementYearMonth" format="yyyy-MM"
format="yyyy-MM" startPlaceholder="开始日期" startPlaceholder="开始日期" endPlaceholder="结束日期">
endPlaceholder="结束日期" >
</JnpfDateRangePicker> </JnpfDateRangePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="单据日期"> <el-form-item label="单据日期">
<JnpfDateRangePicker v-model="query.procurementDate" <JnpfDateRangePicker v-model="query.procurementDate" format="yyyy-MM-dd"
format="yyyy-MM-dd" startPlaceholder="开始日期" startPlaceholder="开始日期" endPlaceholder="结束日期">
endPlaceholder="结束日期" >
</JnpfDateRangePicker> </JnpfDateRangePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -42,12 +33,14 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增 <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'" >导出 <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <!-- <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" /> @click="openSuperQuery()" />
@ -56,62 +49,52 @@
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" /> @click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div> -->
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" :span-method="arraySpanMethod" border>
<el-table-column prop="procurementYearMonth" label="年月" align="center">
>
<el-table-column
prop="procurementNumber"
label="采购计划单号" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="procurementNumber" label="采购计划单号" align="center">
prop="procurementDate"
label="单据日期" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="planNumber" label="物料需求计划单号" align="center">
prop="procurementYearMonth"
label="年月" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="procurementDate" label="单据日期" align="center">
prop="planNumber"
label="物料需求计划单号" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="creatorUserId" label="创建人" align="center">
prop="reamrk"
label="备注" align="left"
>
</el-table-column> </el-table-column>
<el-table-column label="操作" <el-table-column prop="creatorTime" label="创建日期" align="center" :formatter="formatDeliveryTime">
fixed="right" width="150" > </el-table-column>
<template slot-scope="scope" > <el-table-column label="单据状态" prop="procurementStatus" align="center">
<el-button type="text" <template slot-scope="scope">
@click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'" >编辑 <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>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
@click="goDetail(scope.row.id)">详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <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" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" /> @superQuery="superQuery" />
@ -120,39 +103,39 @@
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form' import JNPFForm from './form'
import Detail from './Detail' import Detail from './Detail'
import ExportBox from '@/components/ExportBox' import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail' import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user' import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList' import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery' import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson' import superQueryJson from './superQueryJson'
export default { export default {
components: { components: {
JNPFForm, JNPFForm,
Detail, Detail,
ExportBox,ToFormDetail , SuperQuery ExportBox, ToFormDetail, SuperQuery
}, },
data() { data() {
return { return {
keyword:'', keyword: '',
expandsTree: true, expandsTree: true,
refreshTree: true, refreshTree: true,
toFormDetailVisible:false, toFormDetailVisible: false,
expandObj:{}, expandObj: {},
columnOptions: [], columnOptions: [],
mergeList: [], mergeList: [],
exportList:[], exportList: [],
columnList, columnList,
superQueryVisible: false, superQueryVisible: false,
@ -160,9 +143,9 @@
uploadBoxVisible: false, uploadBoxVisible: false,
detailVisible: false, detailVisible: false,
query: { query: {
procurementNumber:undefined, procurementNumber: undefined,
procurementYearMonth:undefined, procurementYearMonth: undefined,
procurementDate:undefined, procurementDate: undefined,
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -187,7 +170,7 @@
flowList: [], flowList: [],
exportBoxVisible: false, exportBoxVisible: false,
interfaceRes: { interfaceRes: {
planNumber:[] , planNumber: [],
}, },
} }
}, },
@ -203,6 +186,15 @@
this.queryData = JSON.parse(JSON.stringify(this.query)) this.queryData = JSON.parse(JSON.stringify(this.query))
}, },
methods: { 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) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {
@ -231,9 +223,9 @@
}, },
loadNode(node, resolve) { loadNode(node, resolve) {
const nodeData = node.data const nodeData = node.data
const config ={ const config = {
treeInterfaceId:"", treeInterfaceId: "",
treeTemplateJson:[] treeTemplateJson: []
} }
if (config.treeInterfaceId) { if (config.treeInterfaceId) {
//这里是为了拿到参数中关联的字段的值，后端自行拿 //这里是为了拿到参数中关联的字段的值，后端自行拿
@ -312,7 +304,7 @@
} }
}) })
newList.forEach(item => { newList.forEach(item => {
if (item.children && item.children.length ) { if (item.children && item.children.length) {
item.children.forEach((child, index) => { item.children.forEach((child, index) => {
if (index == 0) { if (index == 0) {
this.mergeList.push({ this.mergeList.push({
@ -350,13 +342,13 @@
} }
this.exportList = exportList this.exportList = exportList
}, },
goDetail(id){ goDetail(id) {
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -375,16 +367,16 @@
...this.query, ...this.query,
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId:this.menuId, menuId: this.menuId,
moduleId:'590930391657874309', moduleId: '590930391657874309',
type:1, type: 1,
}; };
request({ request({
url: `/api/example/YysMaterialProcurementPlan/getList`, url: `/api/example/YysMaterialProcurementPlan/getList`,
method: 'post', method: 'post',
data: _query data: _query
}).then(res => { }).then(res => {
var _list =res.data.list; var _list = res.data.list;
this.list = _list.map(o => ({ this.list = _list.map(o => ({
...o, ...o,
...this.expandObj, ...this.expandObj,
@ -412,10 +404,10 @@
}).catch(() => { }).catch(() => {
}); });
}, },
handelUpload(){ handelUpload() {
this.uploadBoxVisible = true this.uploadBoxVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.UploadBox.init("","example/YysMaterialProcurementPlan") this.$refs.UploadBox.init("", "example/YysMaterialProcurementPlan")
}) })
}, },
openSuperQuery() { openSuperQuery() {
@ -430,10 +422,10 @@
this.initData() this.initData()
}, },
addOrUpdateHandle(row, isDetail) { addOrUpdateHandle(row, isDetail) {
let id = row?row.id:"" let id = row ? row.id : ""
this.formVisible = true this.formVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail,this.list) this.$refs.JNPFForm.init(id, isDetail, this.list)
}) })
}, },
exportData() { exportData() {
@ -443,7 +435,7 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({ request({
url: `/api/example/YysMaterialProcurementPlan/Actions/Export`, url: `/api/example/YysMaterialProcurementPlan/Actions/Export`,
method: 'post', method: 'post',
@ -456,10 +448,10 @@
}) })
}, },
search() { search() {
this.listQuery.currentPage=1 this.listQuery.currentPage = 1
this.listQuery.pageSize=20 this.listQuery.pageSize = 20
this.listQuery.sort="desc" this.listQuery.sort = "desc"
this.listQuery.sidx="procurementDate" this.listQuery.sidx = "procurementDate"
this.initData() this.initData()
}, },
refresh(isrRefresh) { refresh(isrRefresh) {
@ -475,5 +467,5 @@
if (isrRefresh) this.reset() if (isrRefresh) this.reset()
}, },
} }
} }
</script> </script>

153
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/Detail.vue
Unescape View File

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

428
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/form.vue
Unescape View File

@ -1,187 +1,187 @@
<template>
<template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" <el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
:content="!dataForm.id ? '新建':'编辑'"/>
<div class="options"> <div class="options">
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> 保 存</el-button>
<el-button @click="goBack"> 取 消</el-button> <el-button @click="goBack"> 取 消</el-button>
</div> </div>
</div> </div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}"> <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px" label-position="right" > <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px"
label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<!-- 具体表单 --> <!-- 具体表单 -->
<el-col :span="12" > <el-col :span="12">
<jnpf-form-tip-item <jnpf-form-tip-item label="物料需求计划单号" prop="planNumber">
label="物料需求计划单号" prop="planNumber" > <JnpfInput v-model="dataForm.planNumber" @change="changeData('planNumber', -1)"
<JnpfInput v-model="dataForm.planNumber" @change="changeData('planNumber',-1)" placeholder="系统自动生成" readonly :style='{ "width": "100%" }'>
placeholder="系统自动生成" readonly :style='{"width":"100%"}'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="12">
<jnpf-form-tip-item <jnpf-form-tip-item label="年月" prop="planYearMonth">
label="年月" prop="planYearMonth" > <JnpfDatePicker v-model="dataForm.planYearMonth"
<JnpfDatePicker v-model="dataForm.planYearMonth" @change="changeData('planYearMonth',-1)" @change="changeData('planYearMonth', -1)" :startTime="dateTime(false, 1, 1, '', '')"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :style='{"width":"100%"}' type="month" format="yyyy-MM" > :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择" clearable
:style='{ "width": "100%" }' type="month" format="yyyy-MM">
</JnpfDatePicker> </JnpfDatePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="12">
<jnpf-form-tip-item <jnpf-form-tip-item label="单据日期" prop="orderDate">
label="单据日期" prop="orderDate" > <JnpfDatePicker v-model="dataForm.orderDate" @change="changeData('orderDate', -1)"
<JnpfDatePicker v-model="dataForm.orderDate" @change="changeData('orderDate',-1)" :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" > placeholder="请选择" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker> </JnpfDatePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="12" > <el-col :span="12">
<jnpf-form-tip-item <jnpf-form-tip-item label="是否生成采购计划" prop="isCreatePlan">
label="是否生成采购计划" prop="isCreatePlan" > <JnpfSelect v-model="dataForm.isCreatePlan" @change="changeData('isCreatePlan', -1)"
<JnpfSelect v-model="dataForm.isCreatePlan" @change="changeData('isCreatePlan',-1)" placeholder="请选择" clearable :style='{ "width": "100%" }' :options="isCreatePlanOptions"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="isCreatePlanOptions" :props="isCreatePlanProps" > :props="isCreatePlanProps">
</JnpfSelect> </JnpfSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="备注" prop="reamrk">
label="备注" prop="reamrk" > <JnpfTextarea v-model="dataForm.reamrk" @change="changeData('reamrk', -1)"
<JnpfTextarea v-model="dataForm.reamrk" @change="changeData('reamrk',-1)" placeholder="请输入" :style='{ "width": "100%" }' true type="textarea"
placeholder="请输入" :style='{"width":"100%"}' true type="textarea" :autosize='{"minRows":4,"maxRows":4}' > :autosize='{ "minRows": 4, "maxRows": 4 }'>
</JnpfTextarea> </JnpfTextarea>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item label-width="0"> <jnpf-form-tip-item label-width="0">
<div class="JNPF-common-title"> <div class="JNPF-common-title">
<h2>设计子表</h2> <h2>物料明细</h2>
</div> </div>
<el-table :data="dataForm.yysMaterialRequirementItemList" size='mini' > <el-table :data="dataForm.yysMaterialRequirementItemList" size='mini'>
<el-table-column type="index" width="50" label="序号" align="center" /> <el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column <el-table-column label="物料编码" prop="materialCode">
label="物料编码" prop="materialCode" > <template slot="header" v-if="true">
<template slot="header" v-if="true" > <span class="required-sign">*</span>物料编码
<span class="required-sign" >*</span>物料编码
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.materialCode" @change="changeData('yysmaterialrequirementitem-materialCode',scope.$index)" <JnpfInput v-model="scope.row.materialCode"
placeholder="请输入" clearable :style='{"width":"100%"}'> @change="changeData('yysmaterialrequirementitem-materialCode', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="物料名称" prop="materialName">
label="物料名称" prop="materialName" > <template slot="header" v-if="true">
<template slot="header" v-if="true" > <span class="required-sign">*</span>物料名称
<span class="required-sign" >*</span>物料名称
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.materialName" @change="changeData('yysmaterialrequirementitem-materialName',scope.$index)" <JnpfInput v-model="scope.row.materialName"
placeholder="请输入" clearable :style='{"width":"100%"}'> @change="changeData('yysmaterialrequirementitem-materialName', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="物料类型" prop="materialType">
label="物料类型" prop="materialType" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>物料类型
<span class="required-sign" >*</span>物料类型
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.materialType" @change="changeData('yysmaterialrequirementitem-materialType',scope.$index)" <JnpfInput v-model="scope.row.materialType"
placeholder="请输入" clearable :style='{"width":"100%"}'> @change="changeData('yysmaterialrequirementitem-materialType', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="规格型号" prop="specification">
label="规格型号" prop="specification" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>规格型号
<span class="required-sign" >*</span>规格型号
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.specification" @change="changeData('yysmaterialrequirementitem-specification',scope.$index)" <JnpfInput v-model="scope.row.specification"
placeholder="请输入" clearable :style='{"width":"100%"}'> @change="changeData('yysmaterialrequirementitem-specification', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="计量单位" prop="unit">
label="计量单位" prop="unit" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>计量单位
<span class="required-sign" >*</span>计量单位
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInput v-model="scope.row.unit" @change="changeData('yysmaterialrequirementitem-unit',scope.$index)" <JnpfInput v-model="scope.row.unit"
placeholder="请输入" clearable :style='{"width":"100%"}'> @change="changeData('yysmaterialrequirementitem-unit', scope.$index)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="需求数量" prop="requirementNumber">
label="需求数量" prop="requirementNumber" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>需求数量
<span class="required-sign" >*</span>需求数量
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.requirementNumber" @change="changeData('yysmaterialrequirementitem-requirementNumber',scope.$index)" <JnpfInputNumber v-model="scope.row.requirementNumber"
placeholder="数字文本" :precision="2" :step="1" > @change="changeData('yysmaterialrequirementitem-requirementNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber> </JnpfInputNumber>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="库存" prop="inventoryNumber">
label="库存" prop="inventoryNumber" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>库存
<span class="required-sign" >*</span>库存
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.inventoryNumber" @change="changeData('yysmaterialrequirementitem-inventoryNumber',scope.$index)" <JnpfInputNumber v-model="scope.row.inventoryNumber"
placeholder="数字文本" :precision="2" :step="1" > @change="changeData('yysmaterialrequirementitem-inventoryNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber> </JnpfInputNumber>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="库存安全" prop="inventorySafetyNumber">
label="库存安全" prop="inventorySafetyNumber" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>库存安全
<span class="required-sign" >*</span>库存安全
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.inventorySafetyNumber" @change="changeData('yysmaterialrequirementitem-inventorySafetyNumber',scope.$index)" <JnpfInputNumber v-model="scope.row.inventorySafetyNumber"
placeholder="数字文本" :precision="2" :step="1" > @change="changeData('yysmaterialrequirementitem-inventorySafetyNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber> </JnpfInputNumber>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="采购未入库" prop="notIntoNumber">
label="采购未入库" prop="notIntoNumber" > <template slot="header" v-if="false">
<template slot="header" v-if="false" > <span class="required-sign">*</span>采购未入库
<span class="required-sign" >*</span>采购未入库
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.notIntoNumber" @change="changeData('yysmaterialrequirementitem-notIntoNumber',scope.$index)" <JnpfInputNumber v-model="scope.row.notIntoNumber"
placeholder="数字文本" :precision="2" :step="1" > @change="changeData('yysmaterialrequirementitem-notIntoNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber> </JnpfInputNumber>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="欠缺量" prop="lackNumber">
label="欠缺量" prop="lackNumber" > <template slot="header" v-if="true">
<template slot="header" v-if="true" > <span class="required-sign">*</span>欠缺量
<span class="required-sign" >*</span>欠缺量
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<JnpfInputNumber v-model="scope.row.lackNumber" @change="changeData('yysmaterialrequirementitem-lackNumber',scope.$index)" <JnpfInputNumber v-model="scope.row.lackNumber"
placeholder="数字文本" :precision="2" :step="1" > @change="changeData('yysmaterialrequirementitem-lackNumber', scope.$index)"
placeholder="数字文本" :precision="2" :step="1">
</JnpfInputNumber> </JnpfInputNumber>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="50" > <el-table-column label="操作" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delyysMaterialRequirementItemList(scope.$index)">删除</el-button> <el-button size="mini" type="text" class="JNPF-table-delBtn"
@click="delyysMaterialRequirementItemList(scope.$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="table-actions" @click="addyysMaterialRequirementItemList()" > <div class="table-actions" @click="addyysMaterialRequirementItemList()">
<el-button type="text" icon="el-icon-plus">添加</el-button> <el-button type="text" icon="el-icon-plus">添加</el-button>
</div> </div>
</jnpf-form-tip-item> </jnpf-form-tip-item>
@ -189,25 +189,25 @@
<!-- 表单结束 --> <!-- 表单结束 -->
</template> </template>
</el-form> </el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/> @select="addForSelect" @close="selectDialogVisible = false" />
</el-row> </el-row>
</div> </div>
</transition> </transition>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user' import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { }, components: {},
props: [], props: [],
data() { data() {
return { return {
@ -221,52 +221,52 @@
loading: false, loading: false,
btnLoading: false, btnLoading: false,
formRef: 'formRef', formRef: 'formRef',
setting:{}, setting: {},
eventType: '', eventType: '',
userBoxVisible:false, userBoxVisible: false,
selectDialogVisible: false, selectDialogVisible: false,
currTableConf:{}, currTableConf: {},
dataValueAll:{}, dataValueAll: {},
addTableConf:{ addTableConf: {
yysMaterialRequirementItemList :{"popupType":"dialog","hasPage":true,"popupTitle":"选择数据","pageSize":20,"columnOptions":[],"interfaceId":"","interfaceName":"","relationOptions":[],"templateJson":[],"popupWidth":"800px"}, yysMaterialRequirementItemList: { "popupType": "dialog", "hasPage": true, "popupTitle": "选择数据", "pageSize": 20, "columnOptions": [], "interfaceId": "", "interfaceName": "", "relationOptions": [], "templateJson": [], "popupWidth": "800px" },
}, },
//可选范围默认值 //可选范围默认值
ableAll:{ ableAll: {
}, },
tableRows:{ tableRows: {
yysMaterialRequirementItemList:{ yysMaterialRequirementItemList: {
materialCode : '', materialCode: '',
materialCodeOptions:[], materialCodeOptions: [],
materialName : '', materialName: '',
materialNameOptions:[], materialNameOptions: [],
materialType : '', materialType: '',
materialTypeOptions:[], materialTypeOptions: [],
specification : '', specification: '',
specificationOptions:[], specificationOptions: [],
unit : '', unit: '',
unitOptions:[], unitOptions: [],
requirementNumber : undefined, requirementNumber: undefined,
requirementNumberOptions:[], requirementNumberOptions: [],
inventoryNumber : undefined, inventoryNumber: undefined,
inventoryNumberOptions:[], inventoryNumberOptions: [],
inventorySafetyNumber : undefined, inventorySafetyNumber: undefined,
inventorySafetyNumberOptions:[], inventorySafetyNumberOptions: [],
notIntoNumber : undefined, notIntoNumber: undefined,
notIntoNumberOptions:[], notIntoNumberOptions: [],
lackNumber : undefined, lackNumber: undefined,
lackNumberOptions:[], lackNumberOptions: [],
enabledmark:undefined enabledmark: undefined
}, },
}, },
Vmodel:"", Vmodel: "",
currVmodel:"", currVmodel: "",
dataForm: { dataForm: {
planNumber : undefined, planNumber: undefined,
planYearMonth : undefined, planYearMonth: undefined,
orderDate : undefined, orderDate: undefined,
isCreatePlan : undefined, isCreatePlan: undefined,
reamrk : undefined, reamrk: undefined,
yysMaterialRequirementItemList:[], yysMaterialRequirementItemList: [],
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule:
@ -286,26 +286,26 @@
}, },
], ],
}, },
isCreatePlanOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"2"}], isCreatePlanOptions: [{ "fullName": "是", "id": "1" }, { "fullName": "否", "id": "2" }],
isCreatePlanProps:{"label":"fullName","value":"id" }, isCreatePlanProps: { "label": "fullName", "value": "id" },
childIndex:-1, childIndex: -1,
isEdit:false, isEdit: false,
interfaceRes: { interfaceRes: {
planNumber:[] , planNumber: [],
planYearMonth:[] , planYearMonth: [],
orderDate:[] , orderDate: [],
isCreatePlan:[] , isCreatePlan: [],
reamrk:[] , reamrk: [],
yysmaterialrequirementitemmaterialCode: [] , yysmaterialrequirementitemmaterialCode: [],
yysmaterialrequirementitemmaterialName: [] , yysmaterialrequirementitemmaterialName: [],
yysmaterialrequirementitemmaterialType: [] , yysmaterialrequirementitemmaterialType: [],
yysmaterialrequirementitemspecification: [] , yysmaterialrequirementitemspecification: [],
yysmaterialrequirementitemunit: [] , yysmaterialrequirementitemunit: [],
yysmaterialrequirementitemrequirementNumber: [] , yysmaterialrequirementitemrequirementNumber: [],
yysmaterialrequirementiteminventoryNumber: [] , yysmaterialrequirementiteminventoryNumber: [],
yysmaterialrequirementiteminventorySafetyNumber: [] , yysmaterialrequirementiteminventorySafetyNumber: [],
yysmaterialrequirementitemnotIntoNumber: [] , yysmaterialrequirementitemnotIntoNumber: [],
yysmaterialrequirementitemlackNumber: [] , yysmaterialrequirementitemlackNumber: [],
}, },
} }
}, },
@ -318,7 +318,7 @@
this.initDefaultData() this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)) this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
}, },
mounted() {}, mounted() { },
methods: { methods: {
prev() { prev() {
this.index-- this.index--
@ -348,7 +348,7 @@
}, },
getInfo(id) { getInfo(id) {
request({ request({
url: '/api/example/YysMaterialRequirementPlan/'+ id, url: '/api/example/YysMaterialRequirementPlan/' + id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
@ -372,7 +372,7 @@
for (let i = 0; i < faceReList.length; i++) { for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) { if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options'; let options = 'get' + key + 'Options';
if(this[options]){ if (this[options]) {
this[options]() this[options]()
} }
this.changeData(key, index) this.changeData(key, index)
@ -381,8 +381,8 @@
} }
} }
}, },
changeDataFormData(type, data, model,index,defaultValue) { changeDataFormData(type, data, model, index, defaultValue) {
if(!this.isEdit) { if (!this.isEdit) {
if (type == 2) { if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) { for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) { if (index == -1) {
@ -396,11 +396,11 @@
} }
} }
}, },
dataAll(){ dataAll() {
}, },
yysmaterialrequirementitemExist() { yysmaterialrequirementitemExist() {
let isOk = true; let isOk = true;
for(let i=0;i<this.dataForm.yysMaterialRequirementItemList.length;i++){ for (let i = 0; i < this.dataForm.yysMaterialRequirementItemList.length; i++) {
const e = this.dataForm.yysMaterialRequirementItemList[i]; const e = this.dataForm.yysMaterialRequirementItemList[i];
if (!e.materialCode) { if (!e.materialCode) {
this.$message({ this.$message({
@ -435,10 +435,10 @@
goBack() { goBack() {
this.$emit('refresh') this.$emit('refresh')
}, },
clearData(){ clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll)) this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
}, },
init(id,isDetail,allList) { init(id, isDetail, allList) {
this.prevDis = false this.prevDis = false
this.nextDis = false this.nextDis = false
this.allList = allList || [] this.allList = allList || []
@ -457,16 +457,16 @@
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
url: '/api/example/YysMaterialRequirementPlan/'+this.dataForm.id, url: '/api/example/YysMaterialRequirementPlan/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
this.loading = false this.loading = false
}); });
}else{ } else {
this.clearData() this.clearData()
this.initDefaultData() this.initDefaultData()
} }
@ -488,7 +488,7 @@
}) })
}, },
request() { request() {
let _data =this.dataList() let _data = this.dataList()
if (this.dataFormSubmitType == 2) { if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true this.continueBtnLoading = true
} else { } else {
@ -518,13 +518,13 @@
this.$emit('refresh', true) this.$emit('refresh', true)
} }
}) })
}).catch(()=>{ }).catch(() => {
this.btnLoading = false this.btnLoading = false
this.continueBtnLoading = false this.continueBtnLoading = false
}) })
}else{ } else {
request({ request({
url: '/api/example/YysMaterialRequirementPlan/'+this.dataForm.id, url: '/api/example/YysMaterialRequirementPlan/' + this.dataForm.id,
method: 'PUT', method: 'PUT',
data: _data data: _data
}).then((res) => { }).then((res) => {
@ -539,24 +539,24 @@
this.$emit('refresh', true) this.$emit('refresh', true)
} }
}) })
}).catch(()=>{ }).catch(() => {
this.btnLoading = false this.btnLoading = false
this.continueBtnLoading = false this.continueBtnLoading = false
}) })
} }
}, },
addyysMaterialRequirementItemList(){ addyysMaterialRequirementItemList() {
let item = { let item = {
materialCode:undefined, materialCode: undefined,
materialName:undefined, materialName: undefined,
materialType:undefined, materialType: undefined,
specification:undefined, specification: undefined,
unit:undefined, unit: undefined,
requirementNumber:undefined, requirementNumber: undefined,
inventoryNumber:undefined, inventoryNumber: undefined,
inventorySafetyNumber:undefined, inventorySafetyNumber: undefined,
notIntoNumber:undefined, notIntoNumber: undefined,
lackNumber:undefined, lackNumber: undefined,
} }
this.getyysMaterialRequirementItemList(item) this.getyysMaterialRequirementItemList(item)
}, },
@ -568,17 +568,17 @@
}).catch(() => { }).catch(() => {
}); });
}, },
getyysMaterialRequirementItemList(value){ getyysMaterialRequirementItemList(value) {
let item={...this.tableRows.yysMaterialRequirementItemList,...value} let item = { ...this.tableRows.yysMaterialRequirementItemList, ...value }
this.dataForm.yysMaterialRequirementItemList.push(item) this.dataForm.yysMaterialRequirementItemList.push(item)
this.childIndex=this.dataForm.yysMaterialRequirementItemList.length-1 this.childIndex = this.dataForm.yysMaterialRequirementItemList.length - 1
this.isEdit = true this.isEdit = true
this.isEdit = false this.isEdit = false
this.childIndex = -1 this.childIndex = -1
}, },
openSelectDialog(key) { openSelectDialog(key) {
this.currTableConf=this.addTableConf[key] this.currTableConf = this.addTableConf[key]
this.currVmodel=key this.currVmodel = key
this.selectDialogVisible = true this.selectDialogVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.selectDialog.init() this.$refs.selectDialog.init()
@ -587,8 +587,8 @@
addForSelect(data) { addForSelect(data) {
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
let t = data[i] let t = data[i]
if(this['get'+this.currVmodel]){ if (this['get' + this.currVmodel]) {
this['get'+this.currVmodel](t) this['get' + this.currVmodel](t)
} }
} }
}, },
@ -655,21 +655,21 @@
} }
return timeDataValue; return timeDataValue;
}, },
dataList(){ dataList() {
var _data = this.dataForm; var _data = this.dataForm;
return _data; return _data;
}, },
dataInfo(dataAll){ dataInfo(dataAll) {
let _dataAll =dataAll let _dataAll = dataAll
this.dataForm = _dataAll this.dataForm = _dataAll
this.isEdit = true this.isEdit = true
this.dataAll() this.dataAll()
for(let i=0;i<_dataAll.yysMaterialRequirementItemList.length;i++){ for (let i = 0; i < _dataAll.yysMaterialRequirementItemList.length; i++) {
this.childIndex = i this.childIndex = i
} }
this.childIndex=-1 this.childIndex = -1
}, },
}, },
} }
</script> </script>

23
jnpf-java-boot/jnpf-web/src/views/yys/yysmaterialrequirementplan/index.vue
Unescape View File

@ -55,16 +55,6 @@
v-has="'btn_download'">导出 v-has="'btn_download'">导出
</el-button> </el-button>
</div> </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> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border> :span-method="arraySpanMethod" border>
@ -76,7 +66,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="creatorUserId" label="创建人" align="center"> <el-table-column prop="creatorUserId" label="创建人" align="center">
</el-table-column> </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>
<el-table-column label="是否生成采购计划" prop="isCreatePlan" align="center"> <el-table-column label="是否生成采购计划" prop="isCreatePlan" align="center">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
@ -96,6 +86,8 @@
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情 <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button> </el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">生成采购计划
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
@ -205,6 +197,15 @@ export default {
this.queryData = JSON.parse(JSON.stringify(this.query)) this.queryData = JSON.parse(JSON.stringify(this.query))
}, },
methods: { 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) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
getConfigData(modelId).then(res => { getConfigData(modelId).then(res => {

Write Preview
Loading…
Cancel
Save