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

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

Browse Source
This commit is contained in:
zyx.net
2023-04-07 09:45:42 +08:00
parent f8a03d7fcb 49234d462a
commit 13d7a404e0
20 changed files with 253 additions and 71 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/entity/AuthDummyInventoryInfoEO.java
+7
View File
@@ -142,4 +142,11 @@ public class AuthDummyInventoryInfoEO implements Serializable {
@TableField(exist = false)
@Excel(name = "交付物模板", width = 20)
private String deliverableTemplateName;
@TableField(exist = false)
private String orderByField;
// 1顺序 2倒序
@TableField(exist = false)
private String orderBy;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+36 -1
View File
@@ -587,11 +587,43 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
@Override
public List<AuthDummyInventoryInfoEO> queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) {
QueryWrapper<AuthDummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
String orderByField = authDummyInventoryInfoEO.getOrderByField();
String orderBy = authDummyInventoryInfoEO.getOrderBy();
// 如果排序字段不为空
if(org.apache.commons.lang.StringUtils.isNotEmpty(orderByField)){
// if (StringUtils.equals(orderBy,"2")) {
// orderBy = " DESC";
// }else {
// orderBy = " ASC";
// }
// 转换字段
orderByField = convertOrderByField(orderByField);
queryWrapper.orderBy(true, "1".equals(orderBy)?true:false, orderByField);
}else {
queryWrapper.orderByDesc("create_time");
}
List<AuthDummyInventoryInfoEO> authDummyInventoryInfoEOList = this.list(queryWrapper);
return authDummyInventoryInfoEOList;
}
private String convertOrderByField(String orderByField) {
if(StringUtils.isEmpty(orderByField)){
return null;
}
switch (orderByField) {
case "category" : return "category";
case "inspectionItem" : return"inspection_item";
case "configItem" : return"config_item";
case "wvtaId" : return"wvta_id";
case "serialNumber" : return "serial_number";
case "dutyTerritory" : return "duty_territory";
case "deliverableType" : return "deliverable_type";
default: return null;
}
}
@Override
public Result<?> copyInfoByIds(String ids, String cut) {
String resultMsg = "";
@@ -885,6 +917,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
oSSFileList.addAll(deliverableTemplateFileList);
}
if(oSSFileList.size() != 0){
if(serialNumber.contains("/")){
serialNumber = serialNumber.replaceAll("/","-");
}
String fileNowPath = path + "/" + serialNumber;
File file = new File(fileNowPath);
if (file.exists()) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+3
View File
@@ -1765,6 +1765,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
if(key.equals("replace_standard_id")){
continue;
}
if(key.equals("corresponding_standard_id")){
continue;
}
//es全文新增数据(数据转换)
// esFullText(cut, fieldList, categoryList, dictItemList, mapList, sbCn,sbEn, entry);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+5 -5
View File
@@ -1181,13 +1181,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
public void exportTemplate(DummyInventoryInfoEO dummyInventoryInfoEO, HttpServletResponse response, HttpServletRequest request) {
OutputStream os = null;
HSSFWorkbook workbook = new HSSFWorkbook();
String fileOriName = "虚拟清单导入模板.xls";
String fileOriName = "市场法规清单导入模板.xls";
String sheetName = "";
if(StringUtils.equals(dummyInventoryInfoEO.getCut(),CutEnum.CN.getValue())){
sheetName = "虚拟清单导入模板";
sheetName = "市场法规清单导入模板";
}else {
sheetName = "Virtual Inventory Import Template";
sheetName = "Market Regulation List Import Template";
}
String filePath = uploadpath + File.separator + fileOriName;
@@ -2430,9 +2430,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
exportFile(dataList,fileInfos);
String excelName = "";
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
excelName = baseList.get(0).getName() + " 虚拟清单.xlsx";
excelName = baseList.get(0).getName() + ".xlsx";
}else{
excelName = baseList.get(0).getName() + " Virtual list.xlsx";
excelName = baseList.get(0).getName() + ".xlsx";
}
//excel
String excelNameRep = excelName.replace('/', '、');
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
+13
View File
@@ -247,4 +247,17 @@ public class ProjectRelatedPersonnelController extends JeroController<ProjectRel
}
}
/**
* 通过projectId查询法规工程师
*
* @return
*/
@AutoLog(value = "项目库-相关人员维护表-根据projectId查询法规工程师")
@ApiOperation(value="项目库-相关人员维护表-根据projectId查询法规工程师", notes="项目库-相关人员维护表-根据projectId查询法规工程师")
@GetMapping(value = "/queryLawEngineerByProjectId")
public Result<?> queryLawEngineerByProjectId(@RequestParam Map<String,Object> params){
List<Map<String,Object>> regulatoryEngineerMapList = projectRelatedPersonnelService.queryLawEngineerByProjectId(params);
return Result.OK(regulatoryEngineerMapList);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
+13 -1
View File
@@ -45,7 +45,19 @@
prp.project_id=#{projectId}
</if>
<if test="dutyTerritory != null and dutyTerritory != ''">
AND prp.duty_territory=#{dutyTerritory}
AND (
prp.duty_territory=#{dutyTerritory}
or prp.duty_territory in
<foreach collection="dutyTerritory.split(',')" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
<!--<foreach collection="dutyTerritory.split(',')" index="index" item="item" open="(" separator=" " close=")">
<if test="index > 0">
or
</if>
prp.duty_territory like concat('%',#{item},'%')
</foreach>-->
)
</if>
<if test="lawEngineer != null and lawEngineer != ''">
AND prp.law_engineer like concat(concat('%',#{lawEngineer}),'%')
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java
+7
View File
@@ -94,4 +94,11 @@ public interface IProjectRelatedPersonnelService extends IService<ProjectRelated
List<ProjectRelatedPersonnel> queryCertificationEngineer(String projectId);
void setBatch(ProjectRelatedPersonnel projectRelatedPersonnel);
/**
* 根据项目库id，查询相关人员名单中的法规工程师
* @param params
* @return
*/
List<Map<String, Object>> queryLawEngineerByProjectId(Map<String, Object> params);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java
+34 -4
View File
@@ -248,6 +248,25 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
userIdList,
userInfoList
);
// 如果责任人有变更，将之前责任人的待办中心任务，移交给新的责任人。
QueryWrapper<ProcessInfoDetailEO> detailQueryWrap = new QueryWrapper<>();
List<String> idList = Arrays.asList(projectCertificationInventoryEO.getId().split(","));
detailQueryWrap.lambda().in(ProcessInfoDetailEO::getProjectLawsInventoryId,idList);
detailQueryWrap.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.CERTIFICATION_LC.getValue());
detailQueryWrap.lambda().eq(ProcessInfoDetailEO::getStatus,TaskStatusEnum.NOT_DONE.getValue());
List<String> taskDefinitionKeyList = new ArrayList<>();
taskDefinitionKeyList.add(CertificationFlowNodeEnum.ZRRJSRW.getKey());
taskDefinitionKeyList.add(CertificationFlowNodeEnum.ZRRTJRW.getKey());
detailQueryWrap.lambda().in(ProcessInfoDetailEO::getTaskDefinitionKey,taskDefinitionKeyList);
List<ProcessInfoDetailEO> processInfoDetailEOList = this.processInfoDetailEOService.list(detailQueryWrap);
if(CollectionUtils.isNotEmpty(processInfoDetailEOList)){
processInfoDetailEOList.forEach(detail -> {
detail.setUserId(projectCertificationInventoryEO.getDutyPerson());
});
this.processInfoDetailEOService.updateBatchById(processInfoDetailEOList);
}
}
}
@@ -348,13 +367,16 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
// studionList = studionList.stream().distinct().collect(Collectors.toList());
// certificationEngineerList = certificationEngineerList.stream().distinct().collect(Collectors.toList());
allList = allList.stream().distinct().collect(Collectors.toList());
allList = allList.stream().filter(all -> {
return StringUtils.isNotBlank(all);
}).distinct().collect(Collectors.toList());
/**
for(String all : allList){
if(all.equals("")){
allList.remove(all);
}
}
*/
//遍历所有人alllist中是否包含责任人,如果包含，不用操作。
//-------如果不包含,再去判断当前用户的角色是studio、法规还是认证
for(ProjectRelatedPersonnel relatedPersonnel : projectRelatedPersonnelList){
@@ -497,6 +519,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
projectCertificationInventoryEO.setBussDocumentLibraryId(bussDocumentLibraryId);
projectCertificationInventoryEO.setProjectLibraryId(projectLibraryId);
projectCertificationInventoryEO.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
projectCertificationInventoryEO.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
projectCertificationInventoryEOList.add(projectCertificationInventoryEO);
}
// 处理提示信息， 类别+检验项目+配置项+编号+责任领域 作为唯一检验
@@ -1354,7 +1377,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
queryWrapper.lambda().eq(ProjectCertificationInventoryEO::getSdt,currentUser.getId());
break;
case PERSON_LIABLE:
List<String> flowStatusList = new ArrayList<>();
/*List<String> flowStatusList = new ArrayList<>();
flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue());
flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue());
flowStatusList.add(CertificationInventoryFlowStatusEnum.REVIEW_AND_RETURN.getValue());
@@ -1367,7 +1390,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
query.eq(ProjectCertificationInventoryEO::getSdt,currentUser.getId());
query.eq(ProjectCertificationInventoryEO::getFlowStatus,CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue());
});
});
});*/
// 修改UAT问题清单 82条
queryWrapper.lambda().eq(ProjectCertificationInventoryEO::getDutyPerson,currentUser.getId());
break;
default:
throw new JeroBootException("当前用户角色有误，请重新选择后角色进行操作！");
@@ -2895,6 +2920,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
projectCertificationInventoryEOTemp.setCreateTime(new Date());
projectCertificationInventoryEOTemp.setUpdateTime(new Date());
projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
projectCertificationInventoryEOList.add(projectCertificationInventoryEOTemp);
}else {
noSerialNumberList.add(authDummyInventoryInfoEO.getSerialNumber());
@@ -3114,6 +3140,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
projectCertificationInventoryEOTemp.setCut(projectCertificationInventoryEO.getCut());
projectCertificationInventoryEOTemp.setProjectLibraryId(projectCertificationInventoryEO.getProjectLibraryId());
projectCertificationInventoryEOTemp.setFlowStatus(CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getValue());
projectCertificationInventoryEOTemp.setCertificationProgress(CertificationProgressEnum.NOT_START.getValue());
datas.add(projectCertificationInventoryEOTemp);
}
}
@@ -3991,6 +4018,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl<Proj
}
if(oSSFileList.size() != 0){
if(serialNumber.contains("/")){
serialNumber = serialNumber.replaceAll("/","-");
}
String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
File file = new File(fileNowPath);
if (file.exists()) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+7 -4
View File
@@ -8366,6 +8366,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
if(oSSFileList.size() != 0){
if(serialNumber.contains("/")){
serialNumber = serialNumber.replaceAll("/","-");
}
String fileNowPath = uploadpath + "/tempZip/" + serialNumber;
File file = new File(fileNowPath);
if (file.exists()) {
@@ -10251,10 +10254,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList);
Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate();
Date verifyDueDate = lawsInventoryEOList.get(0).getVerifyDueDate();
String endTime = "";
if(designDueDate != null){
endTime = DateUtils.formatDate(designDueDate);
if(verifyDueDate != null){
endTime = DateUtils.formatDate(verifyDueDate);
}
String serialNumbers = lawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).distinct().collect(Collectors.joining(","));
@@ -10367,7 +10370,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
this.lawsInventoryEOListSortByVerifyDueDate(lawsInventoryEOList);
Date designDueDate = lawsInventoryEOList.get(0).getVerifyDueDate();
Date designDueDate = lawsInventoryEOList.get(0).getDesignDueDate();
String endTime = "";
if(designDueDate != null){
endTime = DateUtils.formatDate(designDueDate);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+22
View File
@@ -1803,4 +1803,26 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
}
}
@Override
public List<Map<String, Object>> queryLawEngineerByProjectId(Map<String, Object> params) {
List<Map<String, Object>> resultList = new ArrayList<>();
String projectLibraryId = (String) params.get("projectLibraryId");
QueryWrapper<ProjectRelatedPersonnel> queryWrapper = new QueryWrapper<>();
List<ProjectRelatedPersonnel> prpEoList = this.list(queryWrapper.eq("project_id", projectLibraryId));
if(CollectionUtils.isNotEmpty(prpEoList)){
String lawEngineerIds = prpEoList.stream().filter(e->StringUtils.isNotEmpty(e.getLawEngineer()))
.map(ProjectRelatedPersonnel::getLawEngineer).collect(Collectors.joining(","));
List<SysUser> lawEngineerList = this.sysUserService.querySysUserListByIdList(Arrays.asList(lawEngineerIds.split(",")));
if(CollectionUtils.isNotEmpty(lawEngineerList)){
for (SysUser lawEngineer : lawEngineerList) {
Map<String,Object> certificationEngineerMap = new HashMap<>();
certificationEngineerMap.put("id",lawEngineer.getId());
certificationEngineerMap.put("userName",lawEngineer.getUsername());
resultList.add(certificationEngineerMap);
}
}
}
return resultList;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/DesignComplianceFlowNodeKeyEnum.java
+3 -3
View File
@@ -10,9 +10,9 @@ public enum DesignComplianceFlowNodeKeyEnum {
FQLC("发起流程","Initiate the process","fqlc"),
ZRRQR("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认
DEZRRQR("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认
ZRRTJJFW("设计符合性确认","Design compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("设计符合性确认","Design compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
FGGCSSH("设计符合性审查","Design compliance review","fggcssh"), // 法规工程师审核
ZRRTJJFW("符合性确认","Compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("符合性确认","Compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核
;
String cnName;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/enums/VerifyComplianceFlowNodeKeyEnum.java
+3 -3
View File
@@ -10,9 +10,9 @@ public enum VerifyComplianceFlowNodeKeyEnum {
FQLC("发起流程","Initiate the process","fqlc"),
ZRRQR("任务责任确认","Confirmation of mission responsibility","zrrqr"), // 责任人确认
DEZRRQR("任务责任确认","Confirmation of mission responsibility","dezrrqr"),// 第二责任人确认
ZRRTJJFW("验证符合性确认","Verify compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("验证符合性确认","Verify compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
FGGCSSH("验证符合性审查","Verify compliance review","fggcssh"), // 法规工程师审核
ZRRTJJFW("符合性确认","Compliance confirmation","zrrtjjfw"),// "责任人提交交付物"
DEZRRTJJFW("符合性确认","Compliance confirmation","dezrrtjjfw"),// 第二责任人提交交付物
FGGCSSH("符合性审查","Compliance review","fggcssh"), // 法规工程师审核
;
String cnName;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/enums/FlowTypeEnum.java
+2 -2
View File
@@ -10,9 +10,9 @@ import org.apache.commons.lang3.StringUtils;
public enum FlowTypeEnum {
RWQRLC("1","任务确认流程","RWQRLC","任务确认流程","rwqrlc","清单任务确认","List task Confirmation"),
SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxlc","设计符合性确认","Design conformance verification"),
SJFHXSHLC("2","设计符合性审查流程","SJFHXSHLC","设计符合性审查流程","sjfhxlc","设计符合性流程","Design Compliance Process"),
PREHOMOQRLC("3","prehomo确认流程","PREHOMOQRLC","prehomo确认流程","prehomoqrlc","Pre-Homo确认","The Pre - Homo confirmation"),
YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性确认","Verify conformance confirmation"),
YZFHXSCLC("4","验证符合性审查流程","YZFHXSCLC","验证符合性审查流程","yzfhxsclc","验证符合性流程","Verify Compliance Process"),
FGYJSJLC("5","法规意见收集流程","FGYJSJLC","法规意见收集流程","fgyjsjlc","法规意见收集","Collection of Legislative Comments"),
FGJSPG("6","法规技术评估流程","FGJSPG","法规技术评估流程","fgjspglc","法规技术评估","Regulatory and technical assessment"),
QDQR("10","清单确认","QDQR","清单确认流程","qdqr","法规清单发布","Release of regulatory list"),
jero-web/src/common/lang/en-us.js
+5
View File
@@ -1761,4 +1761,9 @@ module.exports = {
reviewAndReturn:'Review and return',
marketRegulationListDetails:'Market Regulation List Details',
marketRegulationList:'Market Regulation List',
onlyDataWithTheCurrentCanBeManipulated:'Only data with the current user as the responsible person can be manipulated',
andTheAndTaskPendingConfirmation:'And the process status is Result Pending Submission, Review Returned, and Task Pending Confirmation',
andProcessStatusIsTaskPendingConfirmation:'And the process status is Task Pending Confirmation',
andPendingSubmissionReviewReturned:'And the process status is result pending submission, review returned',
deliverablesFor:'Deliverables for',
}
jero-web/src/common/lang/zh-cn.js
+5
View File
@@ -1863,4 +1863,9 @@ module.exports = {
electroniccontrollerparameter:'电子控制器参数',
marketRegulationListDetails:'市场法规清单详情',
marketRegulationList:'市场法规清单',
onlyDataWithTheCurrentCanBeManipulated:'仅能操作责任人为当前用户的数据',
andTheAndTaskPendingConfirmation:'并且流程状态为结果待提交、审查退回、任务待确认',
andProcessStatusIsTaskPendingConfirmation:'并且流程状态为任务待确认',
andPendingSubmissionReviewReturned:'并且流程状态为结果待提交、审查退回',
deliverablesFor:'的交付结果',
}
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+1 -1
View File
@@ -1594,7 +1594,7 @@
font-weight: 400;
color: #6F7385;
display: inline-block;
width: 100px;
width: 130px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
jero-web/src/views/processCenter/ProcessMapping.vue
+1
View File
@@ -19,6 +19,7 @@
actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId='//本地
// actUrl: 'http://10.255.35.25:8082/modeler.html?modelId=' //正式
// actUrl: 'http://10.255.128.148:8888/modeler.html?modelId=' //测试
// actUrl: 'http://39.98.140.126:8085/bat-wkflow/modeler.html?modelId=' //39环境测试
}
},
created() {
jero-web/src/views/projectManagement/components/certificationList/index.vue
+27 -15
View File
@@ -569,7 +569,7 @@
type: 'date',
value: 'endTime',
text: this.$t('closingDate')
},
}
],
disabled: false,
queryParamQuery: {},
@@ -626,7 +626,7 @@
width: 180,
ellipsis: true,
fixed: 'left',
sorter: true,
sorter: true
},
{
title: this.$t('inspectionItems'),
@@ -766,7 +766,7 @@
toDoIds: [],
toDoNotConditions: [],
userInfoQuery: {},
DeliverableTreeList:[],
DeliverableTreeList: []
}
},
mounted() {
@@ -826,7 +826,7 @@
type: 'treeChoice',
value: 'deliverableType',
text: this.$t('typeOfDeliverables'),
tree:this.DeliverableTreeList
tree: this.DeliverableTreeList
})
} else {
this.DeliverableTreeList = []
@@ -1456,7 +1456,7 @@
let notConditionsOne = []
let data = ''
let dataOne = ''
let detailedWarningList= []
let detailedWarningList = []
if (this.roleSwitchingCode == 20) {
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].dutyPersonName == this.userInfo().username) {
@@ -1480,14 +1480,14 @@
}
if (notConditions && notConditions.length > 0) {
data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('onlyDataStatusSubmittedCanBeSelected')
detailedWarningList.push(<div>{data}</div>)
detailedWarningList.push( < div > { data } < /div>)
}
if (notConditionsOne && notConditionsOne.length > 0){
dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、')+'"'+this.$t('operationWithoutPermission')
detailedWarningList.push(<div>{dataOne}</div>)
if (notConditionsOne && notConditionsOne.length > 0) {
dataOne = this.$t('inspectionItems') + '"' + notConditionsOne.join('、') + '"' + this.$t('operationWithoutPermission')
detailedWarningList.push( < div > { dataOne } < /div>)
}
if (ids && ids.length > 0) {
this.$refs.referenceDeliverablesListRef.transferModel(ids,detailedWarningList)
this.$refs.referenceDeliverablesListRef.transferModel(ids, detailedWarningList)
} else {
this.failedMessageOne(detailedWarningList)
}
@@ -1542,7 +1542,7 @@
}
this.toDoData = ''
if (this.toDoNotConditions && this.toDoNotConditions.length > 0) {
this.toDoData = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + this.toDoNotConditions.join('、') + '"' + this.$t('data')
this.toDoData = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andTheAndTaskPendingConfirmation')
}
if (this.toDoIds && this.toDoIds.length > 0) {
this.$refs.SelectedByRef.getPush()
@@ -1714,7 +1714,8 @@
}
let data = ''
if (notConditions && notConditions.length > 0) {
data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
// data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
data = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andProcessStatusIsTaskPendingConfirmation')
}
if (ids && ids.length > 0) {
this.submitTask(value, prompt, ids, notConditions, data)
@@ -1728,6 +1729,15 @@
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
let ids = []
let notConditions = []
for (let i = 0; i < this.selectedRowKeysList.length; i++) {
if (this.selectedRowKeysList[i].valueType == 'text' || this.selectedRowKeysList[i].valueType == 'select' ||
this.selectedRowKeysList[i].valueType == 'file') {
if (!this.selectedRowKeysList[i].deliveryResult) {
this.$message.warning(this.$t('inspectionItems')+'"'+this.selectedRowKeysList[i].inspectionItem+'"'+this.$t('deliverablesFor')+this.$t('cannotEmpty'))
return
}
}
}
if (this.roleSwitchingCode == 20) {
this.submitClickJC(value, prompt)
return
@@ -1769,7 +1779,8 @@
}
let data = ''
if (notConditions && notConditions.length > 0) {
data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
// data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
data = this.$t('operationWithoutPermission') + ';' + this.$t('onlyDataWithTheCurrentCanBeManipulated') + ';' + this.$t('andPendingSubmissionReviewReturned')
}
if (ids && ids.length > 0) {
this.submitTask(value, prompt, ids, notConditions, data)
@@ -1855,7 +1866,7 @@
}
})
window.open(newUrl.href, '_blank')
},
}
}
}
</script>
@@ -2205,7 +2216,8 @@
color: #00B3BE;
cursor: pointer;
}
.operator-text-title:last-child{
.operator-text-title:last-child {
margin-bottom: 0;
}
</style>
jero-web/src/views/projectManagement/components/listOfRegulations.vue
+56 -30
View File
@@ -347,22 +347,22 @@
:title="text">{{text}}</a>
</span>
</a-table>
<!-- <div class="page" v-if="dataSource.length > 0">-->
<!-- <a-pagination-->
<!-- :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
<!-- show-quick-jumper-->
<!-- show-size-changer-->
<!-- :page-size.sync="pageSize"-->
<!-- :total="total"-->
<!-- :pageSizeOptions="['50','100','200','300']"-->
<!-- :current="pageNo"-->
<!-- @change="onChangeSize"-->
<!-- @showSizeChange="SizeChange"-->
<!-- />-->
<!-- </div>-->
<div class="buttom-box" v-if="dataSource && dataSource.length > 0">
{{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
</div>
<!-- <div class="page" v-if="dataSource.length > 0">-->
<!-- <a-pagination-->
<!-- :show-total="total => $t('total')+` ${total} `+$t('strip')"-->
<!-- show-quick-jumper-->
<!-- show-size-changer-->
<!-- :page-size.sync="pageSize"-->
<!-- :total="total"-->
<!-- :pageSizeOptions="['50','100','200','300']"-->
<!-- :current="pageNo"-->
<!-- @change="onChangeSize"-->
<!-- @showSizeChange="SizeChange"-->
<!-- />-->
<!-- </div>-->
<div class="buttom-box" v-if="dataSource && dataSource.length > 0">
{{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
</div>
</div>
<listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
<listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
@@ -1127,12 +1127,6 @@
text: this.$t('areaOfResponsibility'),
dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
},
{
type: 'Personnel',
value: 'regulationOwnerId',
valueName: 'regulationOwnerIdName',
text: this.$t('regulatoryEngineer')
},
{
type: 'Personnel',
value: 'engineeringInterfacePerson',
@@ -1318,6 +1312,7 @@
mounted() {
this.JLoading = true
this.getHeader()
this.queryLawEngineerByProjectId()
this.getRoleByUserId(() => {
this.getAndUserId()
})
@@ -1366,7 +1361,32 @@
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
queryLawEngineerByProjectId() {
let query = {
projectLibraryId: this.$route.query.id
}
getAction('/project/projectRelatedPersonnel/queryLawEngineerByProjectId', query).then((res) => {
if (res.success) {
let regulatoryEngineer = {
value: 'regulationOwnerId',
text: this.$t('regulatoryEngineer'),
options:[],
}
if (res.result && res.result.length > 0){
res.result.forEach(val=>{
regulatoryEngineer.options.push({
value: val.id,
key: val.id,
label: val.userName
})
})
}
this.fieldList.push(regulatoryEngineer)
} else {
}
})
},
//流程状态点击事件
designFlowStatusClick(row, name) {
let query = {}
@@ -1474,7 +1494,11 @@
getAction(this.url.AndUserId, query).then((res) => {
if (res.success) {
// this.isDisplay = true
this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
if (this.$route.query.roleOpen && this.$route.query.roleOpen == 'fggcs'){
this.formInlineRoleSwitching.roleSwitchingCode = '1'
}else{
this.formInlineRoleSwitching.roleSwitchingCode = res.result.roleCode
}
this.AndUserId = res.result.id
if (this.formInlineRoleSwitching.roleSwitchingCode) {
if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) {
@@ -2081,7 +2105,7 @@
projectLibraryId: this.$route.query.id,
orderBy: this.orderBy,
orderByField: this.orderByField,
roleCode: roleCode,
roleCode: roleCode
// pageNo: this.pageNo,
// pageSize: this.pageSize
}
@@ -3029,15 +3053,17 @@
}
::v-deep .page .ant-select-selection__rendered {
height: 32px!important;
line-height: 32px!important;
height: 32px !important;
line-height: 32px !important;
}
::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){
::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']) {
text-align: left;
padding-left: 16px!important;
padding-left: 16px !important;
}
.operator-text-title:last-child{
margin-bottom: 0;
.operator-text-title:last-child {
margin-bottom: 0;
}
</style>
<style lang="less">
jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+3 -2
View File
@@ -266,7 +266,8 @@
projectNameId: row.projectNameId,
targetMarket: row.targetMarket,
studioEngineer: row.studioEngineer,
type: '102'
type: '102',
roleOpen:'fggcs',
}
})
window.open(newUrl.href, '_blank')
@@ -279,7 +280,7 @@
projectNameId: row.projectNameId,
targetMarket: row.targetMarket,
studioEngineer: row.studioEngineer,
type: '106'
type: '106',
}
})
window.open(newUrl.href, '_blank')