-
+
*
- {{ $t('cutoffTime') }}
+ :title="titleName">
+ {{ titleName }}
{
if (valid) {
- this.$emit('deadlineDataForm', this.queryData,this.formInline)
+ this.$emit('deadlineDataForm', this.queryData, this.formInline)
this.confirmLoading = true
}
})
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 68de076af..eaf3fcca0 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -843,10 +843,10 @@
scopedSlots: { customRender: 'DeliverablesResult' }
},
{
- title: this.$t('closingDate'),
+ title: this.$t('certificationSubmissionEndTime'),
align: 'left',
dataIndex: 'endTime',
- width: 130,
+ width: 150,
sorter: true,
ellipsis: true
},
@@ -1424,7 +1424,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)
}
@@ -2070,7 +2070,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)
From 98984575f78be3ae9b5c0a6162890340b037738e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 26 Oct 2023 09:48:28 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
=?UTF-8?q?=E6=B8=85=E5=8D=95=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/projectManagement/components/responsibilityList.vue | 3 ++-
.../components/responsibilityList.vue | 3 ++-
.../projectStatusBoard/components/responsibilityList.vue | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue
index 86259d364..a5470d4f5 100644
--- a/jero-web/src/views/projectManagement/components/responsibilityList.vue
+++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue
@@ -141,7 +141,8 @@
this.visible = false
},
areaOfResponsibilityClick(item) {
- if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
+ if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' ||
+ this.queryParam.operatorType == 'queryVerificationTaskConfirmation' ||
this.queryParam.operatorType == 'queryDesignStatistics' ||
this.queryParam.operatorType == 'queryVerifyStatistics') {
item.isListing = '1'
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue
index 86259d364..a5470d4f5 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/responsibilityList.vue
@@ -141,7 +141,8 @@
this.visible = false
},
areaOfResponsibilityClick(item) {
- if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
+ if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' ||
+ this.queryParam.operatorType == 'queryVerificationTaskConfirmation' ||
this.queryParam.operatorType == 'queryDesignStatistics' ||
this.queryParam.operatorType == 'queryVerifyStatistics') {
item.isListing = '1'
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/responsibilityList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/responsibilityList.vue
index 9be0759ff..51a0da2da 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/components/responsibilityList.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/responsibilityList.vue
@@ -144,7 +144,8 @@
},
areaOfResponsibilityClick(item) {
let type = ''
- if (this.queryParam.operatorType == 'queryFGTaskToConfirmStatistics' ||
+ if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' ||
+ this.queryParam.operatorType == 'queryVerificationTaskConfirmation' ||
this.queryParam.operatorType == 'queryDesignStatistics' ||
this.queryParam.operatorType == 'queryVerifyStatistics') {
type = '102'
From 5c113843a5d8aefbc81eeda04890739411894375 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 26 Oct 2023 10:50:25 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B?=
=?UTF-8?q?=E5=B8=88=E9=80=80=E5=9B=9E=E6=94=B9=E4=B8=BA=E6=B3=95=E8=A7=84?=
=?UTF-8?q?=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jero/modules/project/enums/ComplianceFlowStatusEnum.java | 2 +-
.../main/java/com/jero/modules/project/enums/FlowStateEnum.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java
index 204c3dee2..a4cb202dd 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java
@@ -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"),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
index 10ba287e5..a35b3aa1b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/FlowStateEnum.java
@@ -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"),
From 877266d0306e4d366e6b61ed6b37b064bc420df4 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 26 Oct 2023 11:21:03 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?=
=?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4--=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dummy/entity/DummyInventoryInfoEO.java | 5 ++-
.../impl/DummyInventoryInfoEOServiceImpl.java | 37 +++++++++++++++++--
2 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java
index 7950daead..e6a62aa7c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java
@@ -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;
+
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
index 339a11252..7ff8f138f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
@@ -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 page = new Page(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize());
IPage pageInfo = this.page(page, queryWrapper);
From c4659076b23c98b46a8572395302f7058a4739a0 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 26 Oct 2023 11:41:19 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?=
=?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BB=B4=E6=8A=A4-=E8=B4=A3=E4=BB=BB?=
=?UTF-8?q?=E9=83=A8=E9=97=A8=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AuthDummyInventoryInfoEOController.java | 39 ++++++++++++-------
.../entity/AuthDummyInventoryInfoEO.java | 17 ++++----
2 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java
index b0eb5a9f9..8e33cdcc2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/controller/AuthDummyInventoryInfoEOController.java
@@ -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 page = new Page(pageNo, pageSize);
IPage pageList = this.authDummyInventoryInfoEOService.page(page, queryWrapper);
this.authDummyInventoryInfoEOService.disposeData(pageList.getRecords(),authDummyInventoryInfoEO.getCut());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
index 43f046ec2..c29dff603 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
@@ -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;
}
From 3a0a48ec668f8a0df9aa5dd49902ecc2c2b1afa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 26 Oct 2023 12:24:45 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=90=8E=EF=BC=8C=E8=B7=B3?=
=?UTF-8?q?=E8=BD=AC=E6=9C=AA=E7=AD=9B=E9=80=89=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/certificationList/index.vue | 191 +++++++++---------
.../components/listOfRegulations.vue | 102 +++++-----
.../components/responsibilityList.vue | 129 +++++++++++-
.../components/certificationList/index.vue | 92 ++++-----
.../components/listOfRegulations.vue | 2 +
.../components/responsibilityList.vue | 117 ++++++++++-
.../components/responsibilityList.vue | 128 +++++++++++-
7 files changed, 554 insertions(+), 207 deletions(-)
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 7ef8546d6..d40476924 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -21,6 +21,7 @@
class="box-input"
mode="multiple"
allowClear
+ @change="ProcessStatusChange"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam.flowStatus">
- {{$t('reset')}}
- {{$t('query')}}
+ {{$t('reset')}}
+ {{$t('query')}}
@@ -130,9 +133,9 @@
-
-
-
+
+
+
{{ $t('CertificationDirectory') }}
@@ -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',
@@ -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.$t('inventoryVerifyEndTime'))
+ 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.$t('taskConfirmEndTime'))
+ 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'))
// }
- },
+ }
}
}
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 44cdf94e3..4995c32d8 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -58,6 +58,7 @@
style="width: calc(100% - 80px);"
mode="multiple"
optionFilterProp="label"
+ @change="listOptionsChange"
:getPopupContainer="triggerNode=> triggerNode.parentNode"
v-model="queryParam[selectModel]">
-
{{$t('reset')}}
-
{{$t('query')}}
+
{{$t('reset')}}
+
{{$t('query')}}
@@ -166,11 +169,11 @@
{{ $t('processReset') }}
-
-
-
-
-
+
+
+
+
+
-
+
@@ -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 {
diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue
index a5470d4f5..f3bec6261 100644
--- a/jero-web/src/views/projectManagement/components/responsibilityList.vue
+++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue
@@ -30,7 +30,7 @@
>
- {{text}}
+ {{text}}
@@ -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,11 +235,26 @@
this.visible = false
},
areaOfResponsibilityClick(item) {
- if (this.queryParam.operatorType == 'queryDesignTaskConfirmation' ||
- this.queryParam.operatorType == 'queryVerificationTaskConfirmation' ||
- 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)
}
diff --git a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
index cd2d47208..5221d7161 100644
--- a/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/platformItemLibraryDetails/components/certificationList/index.vue
@@ -85,8 +85,10 @@
{{ !toggleSearchStatus ? $t('open') : $t('away') }}
-
{{$t('reset')}}
-
{{$t('query')}}
+
{{$t('reset')}}
+
{{$t('query')}}
@@ -130,18 +132,18 @@