diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 407749f5e..1317235d0 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -266,6 +266,11 @@
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
:columns="columns"
>
+
+
+ {{ text }}
+
+
{
this.getAndUserId()
})
@@ -804,6 +812,21 @@
},
methods: {
...mapGetters(['userInfo']),
+ getDeliverableTree() {
+ getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
+ if (res.success) {
+ this.DeliverableTreeList = res.result
+ this.fieldList.push({
+ type: 'treeChoice',
+ value: 'deliverableType',
+ text: this.$t('typeOfDeliverables'),
+ tree:this.DeliverableTreeList
+ })
+ } else {
+ this.DeliverableTreeList = []
+ }
+ })
+ },
getProcessStatus() {
getAction('/project/projectCertificationInventoryEO/getFlowStatusList', {}).then((res) => {
if (res.success) {
@@ -1804,7 +1827,16 @@
viewFileClick(item) {
this.$refs.viewFileModelRef.clickButtonToUpload(item)
- }
+ },
+ standardClick(row) {
+ let newUrl = this.$router.resolve({
+ path: '/docManage/library/detail',
+ query: {
+ id: row.bussDocumentLibraryId
+ }
+ })
+ window.open(newUrl.href, '_blank')
+ },
}
}
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 4aa42f3e2..53823f392 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1115,7 +1115,109 @@
value: 'engineeringInterfacePerson',
valueName: 'engineeringInterfacePersonName',
text: this.$t('engineeringInterfacePerson')
- }
+ },
+ {
+ value: 'designFlowStatus',
+ text: this.$t('designComplianceReview')+this.$t('ProcessStatus'),
+ options:[
+ {
+ value: 'List to be released',
+ key: 'List to be released',
+ label: this.$t('listToBeReleased')
+ },
+ {
+ value: 'List to be checked',
+ key: 'List to be checked',
+ label: this.$t('listToBeChecked')
+ },
+ {
+ value: 'Task to be confirmed',
+ key: 'Task to be confirmed',
+ label: this.$t('taskToBeConfirmed')
+ },
+ {
+ value: 'Results to be submitted',
+ key: 'Results to be submitted',
+ label: this.$t('resultsToBeSubmitted')
+ },
+ {
+ value: 'Results to be reviewed',
+ key: 'Results to be reviewed',
+ label: this.$t('resultsToBeReviewed')
+ },
+ {
+ value: 'Compliance',
+ key: 'Compliance',
+ label: this.$t('compliance')
+ },
+ {
+ value: 'Non-Compliance',
+ key: 'Non-Compliance',
+ label: this.$t('nonCompliance')
+ },
+ {
+ value: 'To be tracked',
+ key: 'To be tracked',
+ label: this.$t('toBeTracked')
+ },
+ {
+ value: 'NA',
+ key: 'NA',
+ label: this.$t('NA')
+ }
+ ],
+ },
+ {
+ value: 'verifyFlowStatus',
+ text: this.$t('verificationAndConformityconfirmation')+this.$t('ProcessStatus'),
+ options:[
+ {
+ value: 'List to be released',
+ key: 'List to be released',
+ label: this.$t('listToBeReleased')
+ },
+ {
+ value: 'List to be checked',
+ key: 'List to be checked',
+ label: this.$t('listToBeChecked')
+ },
+ {
+ value: 'Task to be confirmed',
+ key: 'Task to be confirmed',
+ label: this.$t('taskToBeConfirmed')
+ },
+ {
+ value: 'Results to be submitted',
+ key: 'Results to be submitted',
+ label: this.$t('resultsToBeSubmitted')
+ },
+ {
+ value: 'Results to be reviewed',
+ key: 'Results to be reviewed',
+ label: this.$t('resultsToBeReviewed')
+ },
+ {
+ value: 'Compliance',
+ key: 'Compliance',
+ label: this.$t('compliance')
+ },
+ {
+ value: 'Non-Compliance',
+ key: 'Non-Compliance',
+ label: this.$t('nonCompliance')
+ },
+ {
+ value: 'To be tracked',
+ key: 'To be tracked',
+ label: this.$t('toBeTracked')
+ },
+ {
+ value: 'NA',
+ key: 'NA',
+ label: this.$t('NA')
+ }
+ ],
+ },
],
listOptions: [
{
@@ -1931,6 +2033,7 @@
getList() {
let roleCode = this.roleSwitchingCode
let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+ this.getRoleByUserId()
Object.keys(queryParam).forEach(val => {
if (queryParam[val] instanceof Array) {
queryParam[val] = queryParam[val].join(',')
@@ -1949,7 +2052,6 @@
}
this.loading = true
getAction(this.url.list, query).then((res) => {
- this.getRoleByUserId()
if (res.success) {
this.dataSource = res.result || []
this.loading = false
@@ -2399,8 +2501,11 @@
}
if (this.requestsNum == 0) {
- this.$message.warning(_this.$t('theDataYouInitiate'))
- // _this.promptInformation(_this.detailedWarningList)
+ if (_this.detailedWarningList && _this.detailedWarningList.length > 0){
+ _this.promptInformation(_this.detailedWarningList)
+ }else{
+ this.$message.warning(_this.$t('theDataYouInitiate'))
+ }
this.JTextLoading = false
}
},
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
index ed8dc8238..bf8f01fc2 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
@@ -155,14 +155,11 @@
ellipsis: true
},
{
- title: this.$t('OperationTime'),
- dataIndex: 'createTime',
+ title: this.$t('feedback'),
+ dataIndex: 'approvalOpinion',
align: 'left',
width: 200,
- ellipsis: true,
- customRender: function(t, r, index) {
- return moment(t).format('YYYY-MM-DD HH:mm:ss')
- }
+ ellipsis: true
},
{
title: this.$t('resultofhandling'),
@@ -172,13 +169,6 @@
ellipsis: true,
scopedSlots: { customRender: 'resultofhandling' }
},
- {
- title: this.$t('feedback'),
- dataIndex: 'approvalOpinion',
- align: 'left',
- width: 200,
- ellipsis: true
- },
{
title: this.$t('enclosure'),
dataIndex: 'approvalFile',
@@ -186,7 +176,17 @@
width: 100,
ellipsis: true,
scopedSlots: { customRender: 'approvalFile' }
- }
+ },
+ {
+ title: this.$t('OperationTime'),
+ dataIndex: 'createTime',
+ align: 'left',
+ width: 200,
+ ellipsis: true,
+ customRender: function(t, r, index) {
+ return moment(t).format('YYYY-MM-DD HH:mm:ss')
+ }
+ },
]
}
},