WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT

Browse Source
This commit is contained in:
gaosong
2023-10-26 17:53:59 +08:00
parent bb60bd5a74 4af4be822d
commit 38e9523f67
25 changed files with 808 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java
+24 -15
View File
@@ -1,30 +1,36 @@
package com.jero.modules.authDummy.controller;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO;
import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
@@ -68,6 +74,9 @@ public class AuthDummyInventoryInfoEOController extends JeroController<AuthDummy
}else {
queryWrapper.orderByDesc("create_time");
}
if(StringUtils.isNotBlank(authDummyInventoryInfoEO.getFirstLevelDutyTerritory())){
queryWrapper.lambda().eq(AuthDummyInventoryInfoEO::getDutyDepart,authDummyInventoryInfoEO.getFirstLevelDutyTerritory());
}
Page<AuthDummyInventoryInfoEO> page = new Page<AuthDummyInventoryInfoEO>(pageNo, pageSize);
IPage<AuthDummyInventoryInfoEO> pageList = this.authDummyInventoryInfoEOService.page(page, queryWrapper);
this.authDummyInventoryInfoEOService.disposeData(pageList.getRecords(),authDummyInventoryInfoEO.getCut());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
+9 -8
View File
@@ -1,22 +1,19 @@
package com.jero.modules.authDummy.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
@@ -166,4 +163,8 @@ public class AuthDummyInventoryInfoEO implements Serializable {
@ApiModelProperty(value = "备注")
@Excel(name = "备注", width = 50)
private String remark;
@ApiModelProperty(value = "责任部门")
@TableField(exist = false)
private String firstLevelDutyTerritory;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+12 -1
View File
@@ -763,8 +763,19 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if (StringUtils.isNotEmpty(paramsCollectManifestVO.getState())) {
paramsCollectManifestVO.setDre(paramsCollectManifestVO.getState().replaceAll("'", "\'"));
sqlJoinSb.append(" and state = '").append(paramsCollectManifestVO.getDre()).append("'");
String state = paramsCollectManifestVO.getState().replaceAll("'", "\'");
// state = "1,2,3,9";
StringBuilder sb = new StringBuilder();
for (String s : Arrays.asList(state.split(","))) {
sb.append("'"+s+"',");
}
String substring = sb.substring(0,sb.length() - 1);
sqlJoinSb.append(" and state in ( ").append(substring).append(" )");
}
// if (StringUtils.isNotEmpty(paramsCollectManifestVO.getState())) {
// paramsCollectManifestVO.setDre(paramsCollectManifestVO.getState().replaceAll("'", "\'"));
// sqlJoinSb.append(" and state = '").append(paramsCollectManifestVO.getDre()).append("'");
// }
if (StringUtils.isNotEmpty(paramsCollectManifestVO.getCertCategory())) {
sqlJoinSb.append(" and cert_category like '%").append(paramsCollectManifestVO.getCertCategory()).append("%'");
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java
+4 -1
View File
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -336,6 +335,10 @@ public class DummyInventoryInfoEO implements Serializable {
@TableField(exist = false)
private String orderByField;
/**一级责任领域**/
@TableField(exist = false)
private String firstLevelDutyTerritory;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+33 -4
View File
@@ -46,8 +46,19 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.hssf.usermodel.HSSFRichTextString;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.shiro.SecurityUtils;
@@ -65,11 +76,25 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.Collator;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile;
@@ -168,6 +193,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
}
});
}
//责任部门查询
if(StringUtils.isNotBlank(dummyInventoryInfoEO.getFirstLevelDutyTerritory())){
queryWrapper.lambda().eq(DummyInventoryInfoEO::getDutyDepart,dummyInventoryInfoEO.getFirstLevelDutyTerritory());
}
Page<DummyInventoryInfoEO> page = new Page<DummyInventoryInfoEO>(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize());
IPage<DummyInventoryInfoEO> pageInfo = this.page(page, queryWrapper);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java
+18 -17
View File
@@ -57,7 +57,6 @@ import com.jero.modules.project.enums.ProjectMessageEnum;
import com.jero.modules.project.enums.ProjectUserLocationEnum;
import com.jero.modules.project.enums.ReviewResultEnum;
import com.jero.modules.project.enums.RoleRelModelTypeEnum;
import com.jero.modules.project.enums.TaskAffirmStatusEnum;
import com.jero.modules.project.enums.TaskStatusEnum;
import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper;
import com.jero.modules.project.service.IProjectCertificationInventoryLogEOService;
@@ -80,7 +79,6 @@ import com.jero.modules.system.service.ISysUserService;
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO;
import com.jero.modules.todoCenter.entity.ProcessInfoEO;
import com.jero.modules.todoCenter.enums.TodoCenterStatusEnum;
import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService;
import com.jero.modules.todoCenter.service.IProcessInfoEOService;
import com.jero.modules.wkflow.enums.FlowTypeEnum;
@@ -3376,7 +3374,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
public List<Map<String, Object>> getTaskToConfirmStatistics(List<ProjectCertificationInventoryEO> pciEoList) {
List<Map<String,Object>> result = new ArrayList<>();
int listToBeReleasedCount = 0;//清单待发布
// int listToBeReleasedCount = 0;//清单待发布
int taskToBeInitiatedCount = 0;//任务待发起
int taskToBeConfirmedCount = 0;//任务待确认
int acceptedCount = 0;//责任人接受
@@ -3384,13 +3382,13 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
if(CollectionUtils.isNotEmpty(pciEoList)){
// 清单待发布
listToBeReleasedCount = (int) pciEoList.stream().filter(pciEo -> {
boolean flag = (
StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue())
);
return flag;
}).count();
// listToBeReleasedCount = (int) pciEoList.stream().filter(pciEo -> {
// boolean flag = (
// StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
// || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue())
// );
// return flag;
// }).count();
// 任务待发起
taskToBeInitiatedCount = (int) pciEoList.stream().filter(pciEo -> {
boolean flag = (
@@ -3424,14 +3422,14 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
}).count();
}
Map<String,Object> listToBeReleasedMap = new HashMap<>();
// Map<String,Object> listToBeReleasedMap = new HashMap<>();
Map<String,Object> taskToBeInitiatedMap = new HashMap<>();
Map<String,Object> taskToBeConfirmedMap = new HashMap<>();
Map<String,Object> acceptedMap = new HashMap<>();
Map<String,Object> rejectedMap = new HashMap<>();
listToBeReleasedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
listToBeReleasedMap.put("taskAffirmStatusCount",listToBeReleasedCount);
// listToBeReleasedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
// listToBeReleasedMap.put("taskAffirmStatusCount",listToBeReleasedCount);
taskToBeInitiatedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
taskToBeInitiatedMap.put("taskAffirmStatusCount",taskToBeInitiatedCount);
@@ -3445,7 +3443,7 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
rejectedMap.put("taskAffirmStatus",CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue());
rejectedMap.put("taskAffirmStatusCount",rejectedCount);
result.add(listToBeReleasedMap);
// result.add(listToBeReleasedMap);
result.add(taskToBeInitiatedMap);
result.add(taskToBeConfirmedMap);
result.add(acceptedMap);
@@ -3467,11 +3465,14 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI
// 任务待确认
taskToBeConfirmedCount = (int) pciEoList.stream().filter(pciEo -> {
boolean flag = (
StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue())
|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
|| StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue())
// StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
// || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getValue())
// || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
// || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
// || StringUtils.equals(pciEo.getFlowStatus(),CertificationInventoryFlowStatusEnum.REFUSAL_OF_RESPONSIBLE_PERSON.getValue())
);
return flag;
}).count();
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectLawsInventoryEOServiceImpl.java
+36 -30
View File
@@ -10045,20 +10045,20 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
public List<Map<String, Object>> getDesignTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
List<Map<String,Object>> result = new ArrayList<>();
int listToBeReleasedCount = 0;//清单待发布
// int listToBeReleasedCount = 0;//清单待发布
int taskToBeInitiatedCount = 0;//任务待发起
int taskToBeConfirmedCount = 0;//任务待确认
int acceptedCount = 0;//责任人接收
int rejectedCount = 0;//责任人拒绝
if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
// 清单待发布
listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
);
return flag;
}).count();
// listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
// boolean flag = (
// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
// );
// return flag;
// }).count();
// 任务待发起
taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
@@ -10097,14 +10097,14 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
}).count();
}
Map<String,Object> listToBeReleasedMap = new HashMap<>();//清单待发布
// Map<String,Object> listToBeReleasedMap = new HashMap<>();//清单待发布
Map<String,Object> taskToBeInitiatedMap = new HashMap<>();//任务待发起
Map<String,Object> taskToBeConfirmedMap = new HashMap<>();//任务待确认
Map<String,Object> acceptedMap = new HashMap<>();//责任人接收
Map<String,Object> rejectedMap = new HashMap<>();//责任人拒绝
listToBeReleasedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
listToBeReleasedMap.put("designTaskAffirmStatusCount",listToBeReleasedCount);
// listToBeReleasedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
// listToBeReleasedMap.put("designTaskAffirmStatusCount",listToBeReleasedCount);
taskToBeInitiatedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
taskToBeInitiatedMap.put("designTaskAffirmStatusCount",taskToBeInitiatedCount);
@@ -10118,7 +10118,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
rejectedMap.put("designTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue());
rejectedMap.put("designTaskAffirmStatusCount",rejectedCount);
result.add(listToBeReleasedMap);
// result.add(listToBeReleasedMap);
result.add(taskToBeInitiatedMap);
result.add(taskToBeConfirmedMap);
result.add(acceptedMap);
@@ -10129,20 +10129,20 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
public List<Map<String, Object>> getVerifyTaskToConfirmStatistics(List<ProjectLawsInventoryEO> projectLawsInventoryEOList) {
List<Map<String,Object>> result = new ArrayList<>();
int listToBeReleasedCount = 0;//清单待发布
// int listToBeReleasedCount = 0;//清单待发布
int taskToBeInitiatedCount = 0;//任务待发起
int taskToBeConfirmedCount = 0;//任务待确认
int acceptedCount = 0;//责任人接收
int rejectedCount = 0;//责任人拒绝
if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){
// 清单待发布
listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
);
return flag;
}).count();
// listToBeReleasedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
// boolean flag = (
// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
// );
// return flag;
// }).count();
// 任务待发起
taskToBeInitiatedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
@@ -10181,14 +10181,14 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
}).count();
}
Map<String,Object> listToBeReleasedMap = new HashMap<>();//清单待发布
// Map<String,Object> listToBeReleasedMap = new HashMap<>();//清单待发布
Map<String,Object> taskToBeInitiatedMap = new HashMap<>();//任务待发起
Map<String,Object> taskToBeConfirmedMap = new HashMap<>();//任务待确认
Map<String,Object> acceptedMap = new HashMap<>();//责任人接收
Map<String,Object> rejectedMap = new HashMap<>();//责任人拒绝
listToBeReleasedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
listToBeReleasedMap.put("verifyTaskAffirmStatusCount",listToBeReleasedCount);
// listToBeReleasedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
// listToBeReleasedMap.put("verifyTaskAffirmStatusCount",listToBeReleasedCount);
taskToBeInitiatedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue());
taskToBeInitiatedMap.put("verifyTaskAffirmStatusCount",taskToBeInitiatedCount);
@@ -10202,7 +10202,7 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
rejectedMap.put("verifyTaskAffirmStatus",ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue());
rejectedMap.put("verifyTaskAffirmStatusCount",rejectedCount);
result.add(listToBeReleasedMap);
// result.add(listToBeReleasedMap);
result.add(taskToBeInitiatedMap);
result.add(taskToBeConfirmedMap);
result.add(acceptedMap);
@@ -10328,11 +10328,14 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
// 任务待确认
taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
|| StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
// StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
// || StringUtils.equals(pliEo.getDesignFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
);
return flag;
@@ -10424,11 +10427,14 @@ public class PlatformProjectLawsInventoryEOServiceImpl extends ServiceImpl<Platf
// 任务待确认
taskToBeConfirmedCount = (int) projectLawsInventoryEOList.stream().filter(pliEo -> {
boolean flag = (
StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
|| StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
// StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue())
// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.REGULATORY_ENGINEER_RETURNS.getValue())
// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())
// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue())
// || StringUtils.equals(pliEo.getVerifyFlowStatus(),ComplianceFlowStatusEnum.DUTY_PERSON_REJECTED.getValue())
);
return flag;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java
+1 -1
View File
@@ -9,7 +9,7 @@ import org.apache.commons.lang.StringUtils;
public enum ComplianceFlowStatusEnum {
LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"),
LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"),
REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"),
REGULATORY_ENGINEER_RETURNS("法规退回","Regulatory engineer returns","Regulatory engineer returns"),
DUTY_PERSON_REJECTED("责任人拒绝","Rejected by the responsible person","Duty Person Rejected"),
DUTY_PERSON_ACCEPTED("责任人接受","Accepted by the responsible person","Duty Person Accepted"),
TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
+1 -1
View File
@@ -13,7 +13,7 @@ public enum FlowStateEnum {
UNINVOLVED("不涉及","NA","NA"),
LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"),
LIST_TO_BE_CHECKED("任务待发起","Task to be initiated","List to be checked"),
REGULATORY_ENGINEER_RETURNS("法规工程师退回","Regulatory engineer returns","Regulatory engineer returns"),
REGULATORY_ENGINEER_RETURNS("法规退回","Regulatory engineer returns","Regulatory engineer returns"),
REFUSAL_OF_RESPONSIBLE_PERSON("责任人拒绝","Refusal of responsible person","Duty Person Rejected"),
TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"),
RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"),
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/entity/ParamsManifestTodoCenterEO.java
+3
View File
@@ -44,4 +44,7 @@ public class ParamsManifestTodoCenterEO {
private Date createTime;
private String state;
private String projectId;
//用于区分跳转所带的状态
private String flag;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/FlagEnum.java
+24
View File
@@ -0,0 +1,24 @@
package com.jero.modules.todoCenter.enums;
/**
* 待办中心状态枚举类
*/
public enum FlagEnum {
ZERO("0"),
ONE("1"),
;
String value;
private FlagEnum(String value) {
this.value = value;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ParamsManifestTodoCenterServiceImpl.java
+3
View File
@@ -11,6 +11,7 @@ import com.jero.modules.cert.collect.enums.ManifestStateEnum;
import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper;
import com.jero.modules.todoCenter.entity.ParamsManifestTodoCenterEO;
import com.jero.modules.todoCenter.enums.FlagEnum;
import com.jero.modules.todoCenter.service.IParamsManifestTodoCenterService;
import com.jero.modules.todoCenter.vo.ParamsManifestTodoCenterEOPage;
import org.apache.shiro.SecurityUtils;
@@ -92,6 +93,7 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC
if (count > 0) {
paramsManifestEO.setWaitFillNum(count);
}
paramsManifestEO.setFlag(FlagEnum.ZERO.getValue());
} else { // 工程接口只能看到工程接口人是自己的；填写人只能看到填写人是自己 的数量
// 统计待分配数量 包括状态：待工程接口人处理,填写人退回
count = (int) pcmList.stream().filter(e-> (CollectManifestStateEnum.WAIT_SDT.getValue().equals(e.getState())
@@ -108,6 +110,7 @@ public class ParamsManifestTodoCenterServiceImpl implements IParamsManifestTodoC
if (count > 0) {
paramsManifestEO.setWaitFillNum(count);
}
paramsManifestEO.setFlag(FlagEnum.ONE.getValue());
}
jero-web/src/common/lang/en-us.js
+1
View File
@@ -1712,6 +1712,7 @@ module.exports = {
returntofill: 'Return to fill',
thereAreCurrentlyNoRegulationsToHandle: 'No regulations to be processed now',
certificationSubmission: 'Application Submitted',
certificationSubmissionEndTime: 'Application Submitted End Time',
upgradecompletion: 'Upgrade completion',
implementedupgrade: 'Whether the implemented upgrade is consistent with the record',
numberofvehicles: 'Number of vehicles that have completed upgrades',
jero-web/src/common/lang/zh-cn.js
+3 -2
View File
@@ -1812,6 +1812,7 @@ module.exports = {
expeditionProcess: '催办流程',
thereAreCurrentlyNoRegulationsToHandle: '当前没有可处理的法规',
certificationSubmission: '认证提交',
certificationSubmissionEndTime:'认证提交截止时间',
upgradecompletion: '升级完成情况',
implementedupgrade: '实施的升级是否和备案一致',
numberofvehicles: '完成升级的车辆数',
@@ -1895,7 +1896,7 @@ module.exports = {
lidar:'激光雷达',
history:'历史',
deliveryDate:'交付日期',
regulatoryEngineerReturns:'法规工程师退回',
regulatoryEngineerReturns:'法规退回',
designProcessStatus:'设计流程状态',
verifyProcessStatus:'验证流程状态',
design:'设计',
@@ -3802,7 +3803,7 @@ module.exports = {
lidar:'激光雷达',
history:'历史',
deliveryDate:'交付日期',
regulatoryEngineerReturns:'法规工程师退回',
regulatoryEngineerReturns:'法规退回',
designProcessStatus:'设计流程状态',
verifyProcessStatus:'验证流程状态',
design:'设计',
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+6 -9
View File
@@ -128,6 +128,7 @@
<a-select :placeholder="$t('PleaseSelect')+$t('status')"
class="box-input"
allowClear
mode="multiple"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="formInline.state">
<a-select-option v-for="(item, key) in statusList"
@@ -1161,17 +1162,13 @@
window.addEventListener('click', this.handleClick)
this.GetgetLoginUserType()
this.getQueryDutyTerritory()
console.log(this.currentPersonRole)
if (this.$route.query.type == '1') {
this.handleOkRoleSwitching()
}
if (this.$route.query.statusFlag == '1') {
this.formInline.state = '1'
} else if (this.$route.query.statusFlag == '2') {
this.formInline.state = '2'
} else if (this.$route.query.statusFlag == '4') {
this.formInline.state = '4'
if (this.$route.query.statusFlag) {
this.formInline.state = this.$route.query.statusFlag.split(',')
}
this.formInline = { ...this.formInline }
// clearTimeout(this.timeBatch)
// this.timeBatch = setTimeout(() => {
// if (this.currentPersonRole == 'dre') {
@@ -1212,9 +1209,9 @@
...mapGetters(['userInfo']),
getQueryDutyTerritory() {
let url = ''
if(this.$route.query.it){
if (this.$route.query.it) {
url = '/params/collectManifest/queryDutyTerritoryHistory'
}else{
} else {
url = '/params/collectManifest/queryDutyTerritory'
}
getAction(url, { id: this.$route.query.id }).then((res) => {
jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue
+24 -24
View File
@@ -303,14 +303,14 @@
<div class="box-title-text">
<div class="title-text">
<span class="Required" v-if="item.deliverableType != '1635545748968783874'">*</span>
<span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
<span class="title-text-text" :title="$t('certificationSubmissionEndTime')">{{$t('certificationSubmissionEndTime')}}</span>
</div>
<a-form-model-item class="itemModel"
:prop="item.deliverableType == '1635545748968783874'?'':'dataList.'+index+'.endTime'"
:rules="[{ required: item.deliverableType == '1635545748968783874'?false:true, message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'},]"
:rules="[{ required: item.deliverableType == '1635545748968783874'?false:true, message: $t('certificationSubmissionEndTime') + $t('cannotEmpty'), trigger: 'change'},]"
>
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('closingDate')"
:placeholder="$t('PleaseSelect')+$t('certificationSubmissionEndTime')"
@change="dateChange({db_field_name:'endTime'},index)"
format="YYYY-MM-DD"
:disabledDate="disabledDate"
@@ -617,16 +617,16 @@
<div class="box-title-text">
<div class="title-text">
<span class="Required" v-if="formInline.deliverableType != '1635545748968783874'">*</span>
<span class="title-text-text" :title="$t('closingDate')">{{$t('closingDate')}}</span>
<span class="title-text-text" :title="$t('certificationSubmissionEndTime')">{{$t('certificationSubmissionEndTime')}}</span>
</div>
<a-form-model-item class="itemModel"
:prop="formInline.deliverableType == '1635545748968783874'?'':'endTime'"
:rules="[{ required: formInline.deliverableType == '1635545748968783874'?false:true,
message: $t('closingDate') + $t('cannotEmpty'), trigger: 'change'}]"
message: $t('certificationSubmissionEndTime') + $t('cannotEmpty'), trigger: 'change'}]"
>
<a-date-picker class="box-input"
:disabled="flowdisabled"
:placeholder="$t('PleaseSelect')+$t('closingDate')"
:placeholder="$t('PleaseSelect')+$t('certificationSubmissionEndTime')"
@change="dateChange({db_field_name:'endTime'})"
format="YYYY-MM-DD"
:disabledDate="disabledDate"
@@ -655,22 +655,6 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('remarks')">{{$t('remarks')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'remark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('remarks')"
v-model="formInline.remark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12" v-if="formInline.taskConfirmEndTime">
<div class="box-title-text">
@@ -690,6 +674,22 @@
</div>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('remarks')">{{$t('remarks')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'remark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('remarks')"
v-model="formInline.remark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-row>
</div>
<!-- <a-row :gutter="24">-->
<!-- <a-col :span="24">-->
@@ -1222,7 +1222,7 @@
}
.title-text {
width: 114px;
width: 124px;
text-align: right;
display: inline-block;
font-weight: 500;
@@ -1242,7 +1242,7 @@
}
.itemModel {
width: calc(100% - 130px);
width: calc(100% - 140px);
display: inline-block;
margin-top: 2px;
height: 40px;
jero-web/src/views/projectManagement/components/certificationList/components/deadlineForm.vue
+11 -9
View File
@@ -13,16 +13,16 @@
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text-index">
<div class="title-text-index" style="width: 100px">
<div class="title-text-index" style="width: 140px">
<span class="Required">*</span>
<span class="title-text-text"
:title="$t('cutoffTime')">
{{ $t('cutoffTime') }}
:title="titleName">
{{ titleName }}
</span>
</div>
<a-form-model-item class="itemModel" style="width: calc(100% - 120px)" :prop="queryData.dutyDueDate">
<a-date-picker class="box-input"
:placeholder="$t('PleaseSelect')+$t('cutoffTime')"
:placeholder="$t('PleaseSelect')+titleName"
@change="dateChange({'db_field_name':queryData.dutyDueDate})"
format="YYYY-MM-DD"
:disabledDate="disabledDate"
@@ -50,13 +50,15 @@
confirmLoading: false,
formInline: {},
rules: {},
queryData:{},
queryData: {},
titleName: ''
}
},
methods: {
getData(val) {
getData(val, title) {
this.queryData = val
this.title = val.title
this.titleName = title || this.$t('cutoffTime')
this.visible = true
this.formInline = {}
this.confirmLoading = false
@@ -65,16 +67,16 @@
this.rules[val.dutyDueDate] = [
{
required: true,
message: this.$t('cutoffTime') + this.$t('cannotEmpty'),
message: this.titleName + this.$t('cannotEmpty'),
trigger: 'change'
},
}
]
})
},
handleOk() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
this.$emit('deadlineDataForm', this.queryData,this.formInline)
this.$emit('deadlineDataForm', this.queryData, this.formInline)
this.confirmLoading = true
}
})
jero-web/src/views/projectManagement/components/certificationList/index.vue
+102 -93
View File
@@ -21,6 +21,7 @@
class="box-input"
mode="multiple"
allowClear
@change="ProcessStatusChange"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.flowStatus">
<a-select-option v-for="(item, key) in processStatusList"
@@ -85,8 +86,10 @@
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }"
@click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary"
@click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
@@ -130,9 +133,9 @@
</div>
<!-- 认证目录-->
<!-- v-if="roleSwitchingCode == 0 || roleSwitchingCode == 1 ||-->
<!-- roleSwitchingCode == 2"-->
<div @click="certificationClick" v-has="'rzqd:homologationatalogue'" class="operator-text">
<!-- v-if="roleSwitchingCode == 0 || roleSwitchingCode == 1 ||-->
<!-- roleSwitchingCode == 2"-->
<div @click="certificationClick" v-has="'rzqd:homologationatalogue'" class="operator-text">
<a-icon type="profile"/>
{{ $t('CertificationDirectory') }}
</div>
@@ -603,7 +606,7 @@
export default {
name: 'index',
props: ['isDisplayNum','areaOfResponsibility'],
props: ['isDisplayNum', 'areaOfResponsibility'],
mixins: [ResizeColumnProvide, ResizeHeader],
components: {
globalAdvancedQuery,
@@ -633,7 +636,7 @@
total: 0,
JTextLoading: false,
visibleoperationFailed: false,
visibleoperation:'',
visibleoperation: '',
CertificationColor: {
'Test passed': 'accordColor',
'Test failed': 'nonConformityColor',
@@ -843,10 +846,10 @@
scopedSlots: { customRender: 'DeliverablesResult' }
},
{
title: this.$t('closingDate'),
title: this.$t('certificationSubmissionEndTime'),
align: 'left',
dataIndex: 'endTime',
width: 130,
width: 150,
sorter: true,
ellipsis: true
},
@@ -896,7 +899,7 @@
align: 'left',
dataIndex: 'remark',
width: 210,
ellipsis: true,
ellipsis: true
},
{
title: this.$t('operation'),
@@ -913,7 +916,7 @@
toDoNotConditions: [],
userInfoQuery: {},
DeliverableTreeList: [],
firstLevelDutyTerritoryList:[],
firstLevelDutyTerritoryList: []
}
},
mounted() {
@@ -922,9 +925,9 @@
this.long = localStorage.getItem('language') || 'zh-cn'
this.loading = true
this.userInfoQuery = this.userInfo()
console.log(this.areaOfResponsibility)
if (this.areaOfResponsibility && this.areaOfResponsibility.dutyTerritoryName) {
this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibility.dutyTerritoryName
this.queryParam.flowStatus = this.areaOfResponsibility.processState ? this.areaOfResponsibility.processState.split(',') : []
this.queryParam = { ...this.queryParam }
}
this.getProcessStatus()
@@ -1206,6 +1209,9 @@
}
downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect)
},
ProcessStatusChange(value) {
console.log(value)
},
handleDel() {
let _this = this
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
@@ -1215,9 +1221,9 @@
if (this.selectedRowKeysList[i].flowStatus == 'List to be released' ||
this.selectedRowKeysList[i].flowStatus == 'Review and pass') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1284,7 +1290,7 @@
ids: idList.join(','),
projectLibraryId: _this.$route.query.id,
operatorType: 'certificationInventoryStudioReset',
currRole:_this.roleSwitchingCode
currRole: _this.roleSwitchingCode
}).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
@@ -1310,9 +1316,9 @@
}
},
// 关联平台件
associatedplatformClick(type){
associatedplatformClick(type) {
let flag = ''
if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.detailedWarningList = []
let dataSource = []
let status = ''
@@ -1331,31 +1337,31 @@
status = '2'
}
}
if(status == '1'){
this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
}else{
if (status == '1') {
this.$refs.associatedplatRef.transferModel(flag, type, this.selectedRowKeys.join(','))
} else {
this.$message.warning(this.$t('unpublishedregulationsselected'))
}
}else{
} else {
flag = '2'
this.$message.warning(this.$t('selectLeastOne'))
}
},
associatedplatForm(id,flag,type,ids){
console.log(id,flag,type,ids)
let query ={
ids:ids,
projectLibraryIds:id
associatedplatForm(id, flag, type, ids) {
console.log(id, flag, type, ids)
let query = {
ids: ids,
projectLibraryIds: id
}
if(type == '认证'){
if (type == '认证') {
postAction('/project/projectCertificationInventoryEO/listPlatform', query).then((res) => {
if (res.success) {
if(res.result == ''){
if (res.result == '') {
this.$refs.associatedplatRef.visible = false
this.$message.success(this.$t('OperationSuccessful'))
this.selectedRowKeys = []
this.getList()
}else{
} else {
this.visibleoperation = res.result
this.visibleoperationFailed = true
}
@@ -1368,16 +1374,16 @@
// this.$refs.associatedplattwoRef.transferModel(id,type,ids)
// }
},
cancleoperationFailed(){
cancleoperationFailed() {
this.visibleoperationFailed = false
this.$refs.associatedplatRef.handleCancel()
this.selectedRowKeys = []
this.getList()
},
associatedplattwoForm(id,type,ids){
associatedplattwoForm(id, type, ids) {
// this.$refs.associatedplatthreeRef.transferModel(id,type,ids)
},
associatedplatthreeForm(id){
associatedplatthreeForm(id) {
console.log(id)
},
//添加
@@ -1425,7 +1431,7 @@
dutyDueDate: 'inventoryVerifyEndTime',
title: this.$t('release')
}
this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)))
this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)), this.$t('inventoryVerifyEndTime'))
} else {
this.failedMessage(data)
}
@@ -1542,9 +1548,9 @@
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'List to be checked') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1606,9 +1612,9 @@
this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1629,9 +1635,9 @@
this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1652,9 +1658,9 @@
this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1721,13 +1727,16 @@
let _this = this
if (val.flowStatus == 'List to be released' || val.flowStatus == 'Review and pass') {
console.log(val)
if(val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)){
if (val.projectCertificationInventoryEOS && (val.projectCertificationInventoryEOS.length > 0 || val.projectCertificationInventoryEOS !== null)) {
this.$message.warning(val.serialNumber + this.$t('platformitemhasbeenassociated'))
}else{
} else {
this.$confirm({
content: _this.$t('ConfirmDelete'),
onOk() {
deleteAction(_this.url.deleteOne, { id: val.id, projectLibraryId: _this.$route.query.id }).then((res) => {
deleteAction(_this.url.deleteOne, {
id: val.id,
projectLibraryId: _this.$route.query.id
}).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.getList()
@@ -1857,9 +1866,9 @@
if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1873,9 +1882,9 @@
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -1914,9 +1923,9 @@
this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
this.toDoIds.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2036,17 +2045,17 @@
this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
if (this.selectedRowKeysList[i].deliverableType == '1635545748968783874') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
NAId.push(this.selectedRowKeysList[i].id)
}
} else if (this.selectedRowKeysList[i].dutyPerson && this.selectedRowKeysList[i].deliverableType &&
this.selectedRowKeysList[i].sdt && this.selectedRowKeysList[i].endTime) {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2071,7 +2080,7 @@
title: this.$t('initiateTask'),
NAId: NAId
}
this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)))
this.$refs.deadlineFormRef.getData(JSON.parse(JSON.stringify(query)), this.$t('taskConfirmEndTime'))
// this.submitTask(value, prompt, ids, notConditions, data, NAId)
} else {
this.failedMessage(data)
@@ -2089,9 +2098,9 @@
if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2124,9 +2133,9 @@
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2158,9 +2167,9 @@
if (this.selectedRowKeysList[i].flowStatus == 'Task to be confirmed' &&
this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2205,9 +2214,9 @@
if (this.selectedRowKeysList[i].flowStatus == 'Results to be submitted' ||
this.selectedRowKeysList[i].flowStatus == 'Review and return') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2237,9 +2246,9 @@
this.selectedRowKeysList[i].flowStatus == 'Review and return') &&
this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2268,16 +2277,16 @@
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'Results to be reviewed') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else if (this.selectedRowKeysList[i].flowStatus == 'Review and pass' && value == 'rzgcssc_th') {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
isTrue = true
}
@@ -2445,16 +2454,16 @@
if (this.selectedRowKeysList[i].flowStatus == 'Review and pass') {
if (this.roleSwitchingCode == 20 && this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else if (this.roleSwitchingCode == 21) {
if (this.selectedRowKeysList[i].projectCertificationInventoryEOS && (this.selectedRowKeysList[i].projectCertificationInventoryEOS.length > 0 || this.selectedRowKeysList[i].projectCertificationInventoryEOS !== null)) {
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated') )
this.failedMessage(this.selectedRowKeysList[i].serialNumber + this.$t('platformitemhasbeenassociated'))
return
}else{
} else {
ids.push(this.selectedRowKeysList[i].id)
}
} else {
@@ -2502,31 +2511,31 @@
this.$message.warning(this.$t('selectLeastOne'))
}
},
bringInRelevantPersonnelClick(){
bringInRelevantPersonnelClick() {
let _this = this
// if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.$confirm({
content: _this.$t('confirmBringInRelevantPersonnel'),
onOk() {
// let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
postAction('/project/projectCertificationInventoryEO/matchRelevantPeople', {
// ids: selectedRowKeys.join(','),
projectLibraryId: _this.$route.query.id
}).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = []
_this.getList()
} else {
_this.$message.warning(_this.$t('operationFailed'))
}
})
}
})
this.$confirm({
content: _this.$t('confirmBringInRelevantPersonnel'),
onOk() {
// let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys))
postAction('/project/projectCertificationInventoryEO/matchRelevantPeople', {
// ids: selectedRowKeys.join(','),
projectLibraryId: _this.$route.query.id
}).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.selectedRowKeys = []
_this.getList()
} else {
_this.$message.warning(_this.$t('operationFailed'))
}
})
}
})
// } else {
// this.$message.warning(this.$t('selectLeastOne'))
// }
},
}
}
}
</script>
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+55 -47
View File
@@ -58,6 +58,7 @@
style="width: calc(100% - 80px);"
mode="multiple"
optionFilterProp="label"
@change="listOptionsChange"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam[selectModel]">
<a-select-option v-for="(item, key) in listOptions"
@@ -113,8 +114,10 @@
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }"
@click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary"
@click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
@@ -166,11 +169,11 @@
{{ $t('processReset') }}
</div>
<!-- 关联平台件-->
<!-- v-if="this.roleSwitchingCode == '0'"-->
<!-- <div class="operator-text" @click="associatedplatformClick('法规')">-->
<!-- <a-icon type="setting"/>-->
<!-- {{ $t('Associatedplatform') }}-->
<!-- </div>-->
<!-- v-if="this.roleSwitchingCode == '0'"-->
<!-- <div class="operator-text" @click="associatedplatformClick('法规')">-->
<!-- <a-icon type="setting"/>-->
<!-- {{ $t('Associatedplatform') }}-->
<!-- </div>-->
<!-- 列表设置-->
<!-- v-if="this.roleSwitchingCode == '0' || this.roleSwitchingCode == '1' || this.roleSwitchingCode == '13'"-->
<a-popconfirm :visible="customizevisible" overlayClassName="popconfirmmize"
@@ -440,7 +443,8 @@
<transferList :url="url" @transferListForm="transferListForm" ref="transferListRef"/>
<associatedplat :url="url" @associatedplatForm="associatedplatForm" ref="associatedplatRef"/>
<associatedplattwo :url="url" @associatedplattwoForm="associatedplattwoForm" ref="associatedplattwoRef"/>
<associatedplatthree :url="url" @associatedplatthreeFormHomo="associatedplatthreeFormHomo" @associatedplatthreeForm="associatedplatthreeForm" ref="associatedplatthreeRef"/>
<associatedplatthree :url="url" @associatedplatthreeFormHomo="associatedplatthreeFormHomo"
@associatedplatthreeForm="associatedplatthreeForm" ref="associatedplatthreeRef"/>
<customizeList :url="url" @customizeListForm="customizeListForm" ref="customizeListRef"/>
<transferListvirtal :url="url" @transferListFormHomo="transferListFormHomo" ref="transferListvirtalRef"/>
<fixedPlate @fixedPlateForm="addModelList" ref="fixedPlateRef"/>
@@ -795,8 +799,8 @@
pageNo: 1,
pageSize: 50,
total: 0,
long:'',
visibleoperation:'',
long: '',
visibleoperation: '',
roleSwitchingList: [],
formInlineQuestion: {},
formInlineReset: {},
@@ -1585,6 +1589,8 @@
this.getFirstLevelDutyTerritory()
if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritoryName) {
this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibilityList.dutyTerritoryName
this.selectModel = this.areaOfResponsibilityList.selectModel
this.queryParam[this.selectModel] = this.areaOfResponsibilityList.processState ? this.areaOfResponsibilityList.processState.split(',') : []
this.queryParam = { ...this.queryParam }
}
this.long = localStorage.getItem('language') || 'zh-cn'
@@ -1855,15 +1861,15 @@
primaryKeyId: row.primaryKeyId
}
}
if(row.projectLawsInventoryEOS && row.projectLawsInventoryEOS.length > 1){
if (row.projectLawsInventoryEOS && row.projectLawsInventoryEOS.length > 1) {
this.$refs.flowstatusdetialRef.addModel(row, name)
}else{
} else {
this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), name)
}
},
a(){
a() {
this.$refs.flowstatusdetialRef.addModel()
},
@@ -1942,7 +1948,9 @@
downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('complianceReporting') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') })
}
},
listOptionsChange(row) {
console.log(row)
},
//导出
handleExport() {
let roleCodeIndex = this.roleSwitchingCode
@@ -1985,9 +1993,9 @@
this.$refs.transferListRef.transferModel()
},
// 关联平台件visibleoperation
associatedplatformClick(type){
associatedplatformClick(type) {
let flag = ''
if(this.selectedRowKeys && this.selectedRowKeys.length > 0){
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
this.detailedWarningList = []
let dataSource = []
let status = ''
@@ -2006,42 +2014,42 @@
}
}
console.log(status)
if(status == '1'){
if (status == '1') {
this.$message.warning(this.$t('unpublishedregulationsselected'))
}else{
this.$refs.associatedplatRef.transferModel(flag,type,this.selectedRowKeys.join(','))
} else {
this.$refs.associatedplatRef.transferModel(flag, type, this.selectedRowKeys.join(','))
}
}else{
} else {
let ids = []
this.dataSource.forEach(item => {
ids.push(item.id)
})
flag = '2'
this.$refs.associatedplatRef.transferModel(flag,type,ids.join(','))
this.$refs.associatedplatRef.transferModel(flag, type, ids.join(','))
}
},
associatedplatForm(id,flag,type,ids){
if(flag == '1'){
this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids)
}else{
this.$refs.associatedplattwoRef.transferModel(id,flag,type,ids)
associatedplatForm(id, flag, type, ids) {
if (flag == '1') {
this.$refs.associatedplatthreeRef.transferModel(id, flag, type, ids)
} else {
this.$refs.associatedplattwoRef.transferModel(id, flag, type, ids)
}
},
associatedplattwoForm(id,flag,type,ids){
this.$refs.associatedplatthreeRef.transferModel(id,flag,type,ids)
associatedplattwoForm(id, flag, type, ids) {
this.$refs.associatedplatthreeRef.transferModel(id, flag, type, ids)
},
associatedplatthreeForm(id){
associatedplatthreeForm(id) {
this.$refs.associatedplatRef.handleCancel()
this.$refs.associatedplattwoRef.handleCancel()
this.selectedRowKeys = []
this.getList()
},
associatedplatthreeFormHomo(msg){
if(msg){
associatedplatthreeFormHomo(msg) {
if (msg) {
this.visibleoperation = msg
this.visibleoperationFailed = true
}else{
} else {
this.$message.success(this.$t('OperationSuccessful'))
this.$refs.associatedplatRef.handleCancel()
this.$refs.associatedplattwoRef.handleCancel()
@@ -2049,7 +2057,7 @@
this.getList()
}
},
cancleoperationFailed(){
cancleoperationFailed() {
this.visibleoperationFailed = false
this.$refs.associatedplatRef.handleCancel()
this.$refs.associatedplattwoRef.handleCancel()
@@ -2156,8 +2164,8 @@
contentList[i].designFlowStatus == 'Duty Person Rejected') {
if (contentList[i].projectLawsInventoryEOS && (contentList[i].projectLawsInventoryEOS.length > 0 || contentList[i].projectLawsInventoryEOS !== null)) {
detailedWarningList.push(
< div > { contentList[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
}else{
< div > { contentList[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
} else {
idList.push(contentList[i].id)
}
} else if (contentList[i].designFlowStatus == 'NA' || contentList[i].verifyFlowStatus == 'NA') {
@@ -2280,8 +2288,8 @@
content[i].designFlowStatus == 'Results to be reviewed') {
if (content[i].projectLawsInventoryEOS && (content[i].projectLawsInventoryEOS.length > 0 || content[i].projectLawsInventoryEOS !== null)) {
this.questionWarning.push(
< div > { content[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
}else{
< div > { content[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
} else {
this.questionIdList.push(content[i].id)
}
} else {
@@ -2407,7 +2415,7 @@
ids: idList.join(','),
projectLibraryId: _this.$route.query.id,
operateType: _this.formInlineReset.operateType,
currRole:this.roleSwitchingCode
currRole: this.roleSwitchingCode
}).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
@@ -2934,12 +2942,12 @@
dataSource[i].designFlowStatus == 'List to be released' ||
dataSource[i].designFlowStatus == 'Regulatory engineer returns') {
// if(dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)){
if (dataSource[i].regulationOwnerId) {
this.detailedSuccessList.push(dataSource[i])
} else {
this.detailedWarningList.push(
< div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
}
if (dataSource[i].regulationOwnerId) {
this.detailedSuccessList.push(dataSource[i])
} else {
this.detailedWarningList.push(
< div > { dataSource[i].serialNumber + this.$t('TheEngineerAndCertification') } < /div>)
}
// }else{
// this.detailedWarningList.push(
// < div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
@@ -3103,8 +3111,8 @@
dataSource[i].designFlowStatus == 'Duty Person Rejected') {
if (dataSource[i].projectLawsInventoryEOS && (dataSource[i].projectLawsInventoryEOS.length > 0 || dataSource[i].projectLawsInventoryEOS !== null)) {
this.detailedWarningList.push(
< div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
}else{
< div > { dataSource[i].serialNumber + this.$t('platformitemhasbeenassociated') } < /div>)
} else {
idList.push(dataSource[i].id)
this.rowKeysSuccessList.push(dataSource[i])
}
@@ -3477,7 +3485,7 @@
if (isDesign || isVerify) {
if (dataSource[0].projectLawsInventoryEOS && (dataSource[0].projectLawsInventoryEOS.length > 0 || dataSource[0].projectLawsInventoryEOS !== null)) {
this.$message.warning(dataSource[0].serialNumber + this.$t('platformitemhasbeenassociated'))
}else{
} else {
this.$refs.toResubmitFormRef.getData(dataSource[0], isDesign, isVerify)
}
} else {
jero-web/src/views/projectManagement/components/responsibilityList.vue
+119 -9
View File
@@ -30,7 +30,7 @@
>
<!-- -->
<a slot="areaOfResponsibility" @click="areaOfResponsibilityClick(result)" slot-scope="text,result">
{{text}}
{{text}}
</a>
</a-table>
</a-modal>
@@ -82,7 +82,101 @@
width: 240,
sorter: true
}
]
],
//法规清单
taskProcessState: {//设计、验证任务确认
'Duty Person Accepted': [//设计、验证任务确认-责任人接受
'Results to be submitted',
'Results to be reviewed',
'Compliance',
'Non-Compliance',
'To be tracked'
],
'List to be released': [//设计、验证任务确认-清单待发布
'List to be released',
'Regulatory engineer returns'
],
'Task to be confirmed': [//设计、验证任务确认-任务待确认
'Task to be confirmed'
],
'Duty Person Rejected': [//设计、验证任务确认-责任人拒绝
'Duty Person Rejected'
],
'List to be checked': [//设计、验证任务确认-任务待发起
'List to be checked'
]
},
complianceProcessState: {//设计、验证符合性
'Task to be confirmed': [//任务待确认
'List to be released',
'Regulatory engineer returns',
'List to be checked',
'Task to be confirmed',
'Duty Person Rejected'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'To be tracked': [//待追踪
'To be tracked'
],
'Compliance': [//符合
'Compliance'
],
'Non-Compliance': [//不符合
'Non-Compliance'
]
},
//认证清单-认证任务确认
authenticationProcessState: {
'List to be released': [//清单待发布
'List to be released',
'Certification returned'
],
'List to be checked': [//任务待发起
'List to be checked'
],
'Task to be confirmed': [//任务待确认
'Task to be confirmed'
],
'Accepted of responsible person': [//责任人接受
'Results to be submitted',
'Results to be reviewed',
'Review and pass',
'Review and return'
],
'Refusal of responsible person': [//责任人拒绝
'Refusal of responsible person'
]
},
//认证清单-Pro-homo流程
proHomoProcessState: {
'Task to be confirmed': [//任务待确认
'List to be released',
'Certification returned',
'List to be checked',
'Task to be confirmed',
'Refusal of responsible person'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'Review and pass': [//审查通过
'Review and pass'
],
'Review and return': [//审查退回
'Review and return'
]
},
//认证清单-认证进度
progressProcessState: {}
}
},
mounted() {
@@ -108,9 +202,9 @@
this.orderByField = 'designDutyId'
} else if (sorter.columnKey == 'verifyDutyIdName') {
this.orderByField = 'verifyDutyId'
} else if (sorter.columnKey == 'verifyFlowStatusName') {
} else if (sorter.columnKey == 'verifyFlowStatusName') {
this.orderByField = 'verifyFlowStatus'
} else if (sorter.columnKey == 'designFlowStatusName') {
} else if (sorter.columnKey == 'designFlowStatusName') {
this.orderByField = 'designFlowStatus'
} else {
this.orderByField = sorter.columnKey
@@ -120,9 +214,9 @@
getList() {
this.loading = true
let query = {
...this.queryParam,
...this.queryParam,
orderBy: this.orderBy,
orderByField: this.orderByField,
orderByField: this.orderByField
}
getAction(this.url.GroupByTerritory, query).then((res) => {
if (res.success) {
@@ -141,10 +235,26 @@
this.visible = false
},
areaOfResponsibilityClick(item) {
if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
this.queryParam.operatorType == 'queryDesignStatistics' ||
this.queryParam.operatorType == 'queryVerifyStatistics') {
if (this.queryParam.operatorType == 'queryDesignTaskConfirmation') {
item.isListing = '1'
item.processState = this.taskProcessState[this.queryParam.status].join(',')
item.selectModel = 'designFlowStatus'
} else if (this.queryParam.operatorType == 'queryVerificationTaskConfirmation') {
item.isListing = '1'
item.processState = this.taskProcessState[this.queryParam.status].join(',')
item.selectModel = 'verifyFlowStatus'
} else if (this.queryParam.operatorType == 'queryDesignStatistics') {
item.processState = this.complianceProcessState[this.queryParam.status].join(',')
item.isListing = '1'
item.selectModel = 'designFlowStatus'
} else if (this.queryParam.operatorType == 'queryVerifyStatistics') {
item.processState = this.complianceProcessState[this.queryParam.status].join(',')
item.isListing = '1'
item.selectModel = 'verifyFlowStatus'
} else if (this.queryParam.operatorType == 'queryRZTaskToConfirmStatistics') {
item.processState = this.authenticationProcessState[this.queryParam.status].join(',')
} else if (this.queryParam.operatorType == 'queryPrehomoStatistics') {
item.processState = this.proHomoProcessState[this.queryParam.status].join(',')
}
this.$emit('responsibility', item)
}
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+47 -45
View File
@@ -85,8 +85,10 @@
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" @click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }"
@click="searchReset">{{$t('reset')}}</a-button>
<a-button class="box-button" :style="{ marginLeft: long == 'en-us'?'3px':'8px' }" type="primary"
@click="searchQuery">{{$t('query')}}</a-button>
<globalAdvancedQuery ref="globalAdvancedQueryRef"
@handleSuperQuery="handleSuperQuery"
:fieldList="fieldList"/>
@@ -130,18 +132,18 @@
</div>
<!-- 认证目录-->
<!-- v-if="roleSwitchingCode == 0 || roleSwitchingCode == 1 ||-->
<!-- roleSwitchingCode == 2"-->
<div @click="certificationClick" v-has="'rzqd:homologationatalogue'" class="operator-text">
<!-- v-if="roleSwitchingCode == 0 || roleSwitchingCode == 1 ||-->
<!-- roleSwitchingCode == 2"-->
<div @click="certificationClick" v-has="'rzqd:homologationatalogue'" class="operator-text">
<a-icon type="profile"/>
{{ $t('CertificationDirectory') }}
</div>
<!-- 修改配置-->
<!-- <div @click="BatchSettingClick($t('changeSetting'))" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"-->
<!-- class="operator-text">-->
<!-- <a-icon type="setting"/>-->
<!-- {{ $t('changeSetting') }}-->
<!-- </div>-->
<!-- <div @click="BatchSettingClick($t('changeSetting'))" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"-->
<!-- class="operator-text">-->
<!-- <a-icon type="setting"/>-->
<!-- {{ $t('changeSetting') }}-->
<!-- </div>-->
<!-- 引用交付物-->
<div @click="referenceDeliverablesClick" v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"
@@ -150,12 +152,12 @@
{{ $t('referenceDeliverables') }}
</div>
<!-- 添加配置-->
<!-- <div @click="addConfigurationClick"-->
<!-- v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"-->
<!-- class="operator-text">-->
<!-- <a-icon type="plus"/>-->
<!-- {{ $t('addConfiguration') }}-->
<!-- </div>-->
<!-- <div @click="addConfigurationClick"-->
<!-- v-if="roleSwitchingCode == 20 || roleSwitchingCode == 21"-->
<!-- class="operator-text">-->
<!-- <a-icon type="plus"/>-->
<!-- {{ $t('addConfiguration') }}-->
<!-- </div>-->
<a-popconfirm overlayClassName="popconfirm" placement="bottomRight">
<template slot="title" id="popconfirm">
<div>
@@ -167,12 +169,12 @@
{{ $t('add') }}
</div>
<!-- 添加配置-->
<!-- <div @click="addConfigurationClick"-->
<!-- v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"-->
<!-- class="operator-text-title">-->
<!-- <a-icon type="plus"/>-->
<!-- {{ $t('addConfiguration') }}-->
<!-- </div>-->
<!-- <div @click="addConfigurationClick"-->
<!-- v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"-->
<!-- class="operator-text-title">-->
<!-- <a-icon type="plus"/>-->
<!-- {{ $t('addConfiguration') }}-->
<!-- </div>-->
<!-- 模板下载-->
<div @click="handleModule"
v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2"
@@ -182,12 +184,12 @@
</div>
<!-- 导出-->
<!-- <div @click="handleExport"-->
<!-- v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"-->
<!-- class="operator-text-title">-->
<!-- <a-icon type="export" :rotate="-90"/>-->
<!-- {{ $t('export') }}-->
<!-- </div>-->
<!-- <div @click="handleExport"-->
<!-- v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2 || roleSwitchingCode == 20 || roleSwitchingCode == 21"-->
<!-- class="operator-text-title">-->
<!-- <a-icon type="export" :rotate="-90"/>-->
<!-- {{ $t('export') }}-->
<!-- </div>-->
<!-- 导入-->
<div class="operator-text-title" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2">
@@ -220,11 +222,11 @@
</div>
<div style="margin-top: 1px;float:right;">
<!-- &lt;!&ndash; 撤回&ndash;&gt;-->
<!-- <div @click="withdrawClick" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2" class="operator-text">-->
<!-- <a-icon type="rollback"/>-->
<!-- {{ $t('withdraw') }}-->
<!-- </div>-->
<!-- &lt;!&ndash; 撤回&ndash;&gt;-->
<!-- <div @click="withdrawClick" v-if="roleSwitchingCode == 1 || roleSwitchingCode == 2" class="operator-text">-->
<!-- <a-icon type="rollback"/>-->
<!-- {{ $t('withdraw') }}-->
<!-- </div>-->
<!-- 发起任务-->
<div @click="initiatingProcessClick('rzgcsjsrw',$t('confirmLaunchTask'))"
@@ -233,12 +235,12 @@
{{ $t('initiateTask') }}
</div>
<!-- &lt;!&ndash; 退回至Studio&ndash;&gt;-->
<!-- <div @click="returnToStudioClick('rzgcsthrw',$t('areYouReturnToStudio'))"-->
<!-- v-if="roleSwitchingCode == 1" class="operator-text">-->
<!-- <a-icon type="close-circle"/>-->
<!-- {{ $t('returnToStudio') }}-->
<!-- </div>-->
<!-- &lt;!&ndash; 退回至Studio&ndash;&gt;-->
<!-- <div @click="returnToStudioClick('rzgcsthrw',$t('areYouReturnToStudio'))"-->
<!-- v-if="roleSwitchingCode == 1" class="operator-text">-->
<!-- <a-icon type="close-circle"/>-->
<!-- {{ $t('returnToStudio') }}-->
<!-- </div>-->
<!-- 审批通过-->
<div @click="ApprovedClick('rzgcssc_tg',$t('confirmApproval'))" v-if="roleSwitchingCode == 1"
@@ -546,7 +548,7 @@
export default {
name: 'index',
props: ['isDisplayNum','areaOfResponsibility'],
props: ['isDisplayNum', 'areaOfResponsibility'],
mixins: [ResizeColumnProvide, ResizeHeader],
components: {
globalAdvancedQuery,
@@ -825,7 +827,7 @@
align: 'left',
dataIndex: 'remark',
width: 180,
ellipsis: true,
ellipsis: true
},
{
title: this.$t('operation'),
@@ -842,7 +844,7 @@
toDoNotConditions: [],
userInfoQuery: {},
DeliverableTreeList: [],
firstLevelDutyTerritoryList:[],
firstLevelDutyTerritoryList: []
}
},
mounted() {
@@ -851,9 +853,9 @@
this.long = localStorage.getItem('language') || 'zh-cn'
this.loading = true
this.userInfoQuery = this.userInfo()
console.log(this.areaOfResponsibility)
if (this.areaOfResponsibility && this.areaOfResponsibility.dutyTerritoryName) {
this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibility.dutyTerritoryName
this.queryParam.flowStatus = this.areaOfResponsibility.processState ? this.areaOfResponsibility.processState.split(',') : []
this.queryParam = { ...this.queryParam }
}
this.getProcessStatus()
@@ -1144,7 +1146,7 @@
let notConditions = []
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].flowStatus == 'List to be checked' ||
this.selectedRowKeysList[i].flowStatus == 'Review and pass' ||
this.selectedRowKeysList[i].flowStatus == 'Review and pass' ||
this.selectedRowKeysList[i].flowStatus == 'Refusal of responsible person') {
ids.push(this.selectedRowKeysList[i].id)
} else {
@@ -2210,7 +2212,7 @@
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
},
}
}
}
</script>
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/listOfRegulations.vue
+2
View File
@@ -1521,6 +1521,8 @@
this.getFirstLevelDutyTerritory()
if (this.areaOfResponsibilityList && this.areaOfResponsibilityList.dutyTerritoryName) {
this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibilityList.dutyTerritoryName
this.selectModel = this.areaOfResponsibilityList.selectModel
this.queryParam[this.selectModel] = this.areaOfResponsibilityList.processState ? this.areaOfResponsibilityList.processState.split(',') : []
this.queryParam = { ...this.queryParam }
}
this.long = localStorage.getItem('language') || 'zh-cn'
jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue
+112 -4
View File
@@ -82,7 +82,99 @@
width: 240,
sorter: true
}
]
],
//法规清单
taskProcessState: {//设计、验证任务确认
'Duty Person Accepted': [//设计、验证任务确认-责任人接受
'Results to be submitted',
'Results to be reviewed',
'Compliance',
'Non-Compliance',
'To be tracked'
],
'List to be released': [//设计、验证任务确认-清单待发布
'List to be released',
'Regulatory engineer returns'
],
'Task to be confirmed': [//设计、验证任务确认-任务待确认
'Task to be confirmed'
],
'Duty Person Rejected': [//设计、验证任务确认-责任人拒绝
'Duty Person Rejected'
],
'List to be checked': [//设计、验证任务确认-任务待发起
'List to be checked'
]
},
complianceProcessState: {//设计、验证符合性
'Task to be confirmed': [//任务待确认
// 'List to be released',
// 'Regulatory engineer returns',
'List to be checked',
'Task to be confirmed',
'Duty Person Rejected'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'To be tracked': [//待追踪
'To be tracked'
],
'Compliance': [//符合
'Compliance'
],
'Non-Compliance': [//不符合
'Non-Compliance'
]
},
//认证清单-认证任务确认
authenticationProcessState: {
'List to be released': [//清单待发布
'List to be released',
'Certification returned'
],
'List to be checked': [//任务待发起
'List to be checked'
],
'Task to be confirmed': [//任务待确认
'Task to be confirmed'
],
'Accepted of responsible person': [//责任人接受
'Results to be submitted',
'Results to be reviewed',
'Review and pass',
'Review and return'
],
'Refusal of responsible person': [//责任人拒绝
'Refusal of responsible person'
]
},
//认证清单-Pro-homo流程
proHomoProcessState: {
'Task to be confirmed': [//任务待确认
'List to be released',
'Certification returned',
'List to be checked',
'Task to be confirmed',
'Refusal of responsible person'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'Review and pass': [//审查通过
'Review and pass'
],
'Review and return': [//审查退回
'Review and return'
]
},
}
},
mounted() {
@@ -141,10 +233,26 @@
this.visible = false
},
areaOfResponsibilityClick(item) {
if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
this.queryParam.operatorType == 'queryDesignStatistics' ||
this.queryParam.operatorType == 'queryVerifyStatistics') {
if (this.queryParam.operatorType == 'queryDesignTaskConfirmation') {
item.isListing = '1'
item.processState = this.taskProcessState[this.queryParam.status].join(',')
item.selectModel = 'designFlowStatus'
} else if (this.queryParam.operatorType == 'queryVerificationTaskConfirmation') {
item.isListing = '1'
item.processState = this.taskProcessState[this.queryParam.status].join(',')
item.selectModel = 'verifyFlowStatus'
} else if (this.queryParam.operatorType == 'queryDesignStatistics') {
item.processState = this.complianceProcessState[this.queryParam.status].join(',')
item.isListing = '1'
item.selectModel = 'designFlowStatus'
} else if (this.queryParam.operatorType == 'queryVerifyStatistics') {
item.processState = this.complianceProcessState[this.queryParam.status].join(',')
item.isListing = '1'
item.selectModel = 'verifyFlowStatus'
} else if (this.queryParam.operatorType == 'queryRZTaskToConfirmStatistics') {
item.processState = this.authenticationProcessState[this.queryParam.status].join(',')
} else if (this.queryParam.operatorType == 'queryPrehomoStatistics') {
item.processState = this.proHomoProcessState[this.queryParam.status].join(',')
}
this.$emit('responsibility', item)
}
jero-web/src/views/projectManagement/projectStatusBoard/components/responsibilityList.vue
+120 -9
View File
@@ -83,7 +83,99 @@
width: 240,
sorter: true
}
]
],
//法规清单
taskProcessState: {//设计、验证任务确认
'Duty Person Accepted': [//设计、验证任务确认-责任人接受
'Results to be submitted',
'Results to be reviewed',
'Compliance',
'Non-Compliance',
'To be tracked'
],
'List to be released': [//设计、验证任务确认-清单待发布
'List to be released',
'Regulatory engineer returns'
],
'Task to be confirmed': [//设计、验证任务确认-任务待确认
'Task to be confirmed'
],
'Duty Person Rejected': [//设计、验证任务确认-责任人拒绝
'Duty Person Rejected'
],
'List to be checked': [//设计、验证任务确认-任务待发起
'List to be checked'
]
},
complianceProcessState: {//设计、验证符合性
'Task to be confirmed': [//任务待确认
'List to be released',
'Regulatory engineer returns',
'List to be checked',
'Task to be confirmed',
'Duty Person Rejected'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'To be tracked': [//待追踪
'To be tracked'
],
'Compliance': [//符合
'Compliance'
],
'Non-Compliance': [//不符合
'Non-Compliance'
]
},
//认证清单-认证任务确认
authenticationProcessState: {
'List to be released': [//清单待发布
'List to be released',
'Certification returned'
],
'List to be checked': [//任务待发起
'List to be checked'
],
'Task to be confirmed': [//任务待确认
'Task to be confirmed'
],
'Accepted of responsible person': [//责任人接受
'Results to be submitted',
'Results to be reviewed',
'Review and pass',
'Review and return'
],
'Refusal of responsible person': [//责任人拒绝
'Refusal of responsible person'
]
},
//认证清单-Pro-homo流程
proHomoProcessState: {
'Task to be confirmed': [//任务待确认
'List to be released',
'Certification returned',
'List to be checked',
'Task to be confirmed',
'Refusal of responsible person'
],
'Results to be submitted': [//结果待提交
'Results to be submitted'
],
'Results to be reviewed': [//结果待审查
'Results to be reviewed'
],
'Review and pass': [//审查通过
'Review and pass'
],
'Review and return': [//审查退回
'Review and return'
]
},
}
},
mounted() {
@@ -144,22 +236,41 @@
},
areaOfResponsibilityClick(item) {
let type = ''
if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
this.queryParam.operatorType == 'queryDesignStatistics' ||
this.queryParam.operatorType == 'queryVerifyStatistics') {
type = '102'
} else {
type = '106'
}
let query = {
id: this.projectInfo.id,
projectName: this.projectInfo.projectName,
projectNameId: this.projectInfo.projectNameId,
targetMarket: this.projectInfo.targetMarket,
studioEngineer: this.projectInfo.studioEngineer,
type: type,
dutyTerritoryName: item.dutyTerritoryName
}
console.log(this.queryParam.operatorType)
if (this.queryParam.operatorType == 'queryDesignTaskConfirmation') {
query.processState = this.taskProcessState[this.queryParam.status].join(',')
query.selectModel = 'designFlowStatus'
type = '102'
} else if (this.queryParam.operatorType == 'queryVerificationTaskConfirmation') {
query.processState = this.taskProcessState[this.queryParam.status].join(',')
query.selectModel = 'verifyFlowStatus'
type = '102'
} else if (this.queryParam.operatorType == 'queryDesignStatistics') {
query.processState = this.complianceProcessState[this.queryParam.status].join(',')
query.selectModel = 'designFlowStatus'
type = '102'
} else if (this.queryParam.operatorType == 'queryVerifyStatistics') {
query.processState = this.complianceProcessState[this.queryParam.status].join(',')
query.selectModel = 'verifyFlowStatus'
type = '102'
} else if (this.queryParam.operatorType == 'queryRZTaskToConfirmStatistics') {
type = '106'
item.processState = this.authenticationProcessState[this.queryParam.status].join(',')
} else if (this.queryParam.operatorType == 'queryPrehomoStatistics') {
type = '106'
query.processState = this.proHomoProcessState[this.queryParam.status].join(',')
}else{
type = '106'
}
query.type = type
let newUrl = this.$router.resolve({
path: '/ProjectDetails',
query: query
jero-web/src/views/toDoCenter/projectParameterTasks/index.vue
+38 -34
View File
@@ -50,17 +50,17 @@
<span slot="waitFillNumoperation" slot-scope="text,record">
<a class="text-operation" v-if='text'
@click="waitFillClick(record)">{{text}}</a>
<span class="text-operation" v-else >{{'--'}}</span>
<span class="text-operation" v-else>{{'--'}}</span>
</span>
<span slot="waitSdtNumoperation" slot-scope="text,record">
<a class="text-operation" v-if='text'
@click="waitSdtClick(record)">{{text}}</a>
<span class="text-operation" v-else >{{'--'}}</span>
<span class="text-operation" v-else>{{'--'}}</span>
</span>
<span slot="waitCollectNumoperation" slot-scope="text,record">
<a class="text-operation" v-if='text'
@click="waitCollectClick(record)">{{text}}</a>
<span class="text-operation" v-else >{{'--'}}</span>
<span class="text-operation" v-else>{{'--'}}</span>
</span>
</a-table>
<div class="page" v-if="dataSource.length > 0">
@@ -86,7 +86,7 @@
export default {
name: 'index',
components: {},
mixins:[ResizeHeader, ResizeColumnProvide],
mixins: [ResizeHeader, ResizeColumnProvide],
data() {
return {
queryParam: {},
@@ -98,8 +98,8 @@
pageNo: 1,
total: 0,
loading: false,
url:{
list:'',
url: {
list: ''
},
columns: [
{
@@ -178,27 +178,27 @@
let userType = ''
let valueList = []
getAction('params/collectManifest/getLoginUserType', query).then((res) => {
if(res.result){
res.result.find((item,index) => {
if(item.value){
if (res.result) {
res.result.find((item, index) => {
if (item.value) {
valueList.push(item.value)
}
})
let flag = valueList.find((item,index) => {
return item == 'dre'
})
let flag = valueList.find((item, index) => {
return item == 'dre'
})
let _this = this
item.type = '1'
item.statusFlag = '4'
item.userType = flag == undefined ? valueList[0] : 'dre'
item.statusFlag = '4,7'
item.userType = flag == undefined ? valueList[0] : 'dre'
this.loading = false
let newUrl = _this.$router.resolve({
path: '/ParameterItemCollection',
query: item
query: item
// projectName:this.$route.query.projectName
})
window.open(newUrl.href, '_blank')
}else{
} else {
this.loading = false
}
})
@@ -213,27 +213,27 @@
let userType = ''
let valueList = []
getAction('params/collectManifest/getLoginUserType', query).then((res) => {
if(res.result){
res.result.find((item,index) => {
if(item.value){
if (res.result) {
res.result.find((item, index) => {
if (item.value) {
valueList.push(item.value)
}
})
let flag = valueList.find((item,index) => {
let flag = valueList.find((item, index) => {
return item == 'sdt'
})
let _this = this
item.type = '1'
item.statusFlag = '2'
item.userType = flag == undefined ? valueList[0] : 'sdt'
item.statusFlag = '2,5'
item.userType = flag == undefined ? valueList[0] : 'sdt'
this.loading = false
let newUrl = _this.$router.resolve({
path: '/ParameterItemCollection',
query: item
query: item
// projectName:this.$route.query.projectName
})
window.open(newUrl.href, '_blank')
}else{
} else {
this.loading = false
}
})
@@ -241,6 +241,9 @@
},
//参数待发起数量
waitCollectClick(item) {
if (item.flag == '1') {
return
}
let query = {
paramsManifestId: item.id,
projectId: item.projectId
@@ -249,27 +252,27 @@
let userType = ''
let valueList = []
getAction('params/collectManifest/getLoginUserType', query).then((res) => {
if(res.result){
res.result.find((item,index) => {
if(item.value){
if (res.result) {
res.result.find((item, index) => {
if (item.value) {
valueList.push(item.value)
}
})
let flag = valueList.find((item,index) => {
let flag = valueList.find((item, index) => {
return item == 'homo'
})
let _this = this
item.type = '1'
item.statusFlag = '1'
item.userType = flag == undefined ? valueList[0] : 'homo'
item.statusFlag = '1,3,9'
item.userType = flag == undefined ? valueList[0] : 'homo'
this.loading = false
let newUrl = _this.$router.resolve({
path: '/ParameterItemCollection',
query: item
query: item
// projectName:this.$route.query.projectName
})
window.open(newUrl.href, '_blank')
}else{
} else {
this.loading = false
}
})
@@ -312,7 +315,7 @@
</script>
<style scoped lang="less">
@import'~@assets/less/common.less';
@import '~@assets/less/common.less';
.box-title-text {
line-height: 1.4;
@@ -371,12 +374,13 @@
::v-deep .ant-table-body {
background: transparent !important;
}
.page {
text-align: right;
margin-top: 20px;
}
::v-deep .ant-table-placeholder{
::v-deep .ant-table-placeholder {
margin-top: 8px !important;
}
</style>