diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index cdbb79f99..bd6ea6376 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -786,10 +786,10 @@ module.exports = {
importTemplate: 'Import Template',
verificationConfirmationDeadline: 'Verification compliance confirmation deadline',
technicalEvaluationResults: 'Technical Evaluation Results',
- engineeringConfirmation: 'EngineeringConfirmation',
+ engineeringConfirmation: 'Project Delivery',
feedbackFromTheEngineer: 'Feedback From The Engineer',
- completedBy: 'Completed by',
- completedTime: 'Completed time',
+ completedBy: 'Completed By',
+ completedTime: 'Completed Time',
replyFromProjectContactPerson: 'Responsible Persons reply',
answer: 'Answer',
distributionEngineer: 'Distribution Engineer',
@@ -891,4 +891,5 @@ module.exports = {
custom:'Custom',
notSelected:'Not selected',
ExportReport:'Export Report',
+ basicInformation:'Basic Information',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 0343b852e..6dd6e00ee 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -794,7 +794,7 @@ module.exports = {
importTemplate: '导入模板',
verificationConfirmationDeadline: '验证符合性确认截止时间',
technicalEvaluationResults: '技术评估结果',
- engineeringConfirmation: '工程确认',
+ engineeringConfirmation: '工程交付',
feedbackFromTheEngineer: '工程师反馈意见',
completedBy: '填写人',
completedTime: '填写时间',
@@ -804,7 +804,7 @@ module.exports = {
reminderHandling: '提醒办理',
addFeedback: '添加反馈',
engineer: '工程师',
- engineeringConfirmationDetails: '工程确认详情',
+ engineeringConfirmationDetails: '工程交付详情',
reminder: '提醒',
adopt: '通过',
reviewedByThePersonInCharge: '负责人审核',
@@ -896,4 +896,5 @@ module.exports = {
custom:'自定义',
notSelected:'未选择',
ExportReport:'导出报告',
+ basicInformation:'基础信息',
}
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/footerProcess.vue b/jero-web/src/views/processCenter/components/footerProcess.vue
index 090db92d7..48821c688 100644
--- a/jero-web/src/views/processCenter/components/footerProcess.vue
+++ b/jero-web/src/views/processCenter/components/footerProcess.vue
@@ -107,8 +107,8 @@
box-sizing: border-box;
.process-header-title {
- height: 68px;
- line-height: 68px;
+ /*height: 68px;*/
+ /*line-height: 68px;*/
background: #FFFFFF;
text-align: right;
diff --git a/jero-web/src/views/processCenter/components/projectInformation.vue b/jero-web/src/views/processCenter/components/projectInformation.vue
index 102b8611d..65e75b9f7 100644
--- a/jero-web/src/views/processCenter/components/projectInformation.vue
+++ b/jero-web/src/views/processCenter/components/projectInformation.vue
@@ -2,7 +2,7 @@
@@ -49,6 +49,10 @@
queryProject: {
type: Object,
default: {}
+ },
+ title: {
+ type: String,
+ default: ''
}
},
data() {
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index 2bbc1a265..e7ebead41 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -1,7 +1,7 @@
-
-
+
-
+
-
+
@@ -169,6 +176,9 @@
}
})
},
+ currentStatus(item) {
+ this.$emit('TaskListChange', item)
+ },
getSetting() {
getAction(this.url.queryByProjectId, { projectId: this.$route.query.id }).then((res) => {
if (res.success) {
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 50c4584c2..51a4d6989 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -141,7 +141,7 @@
certificationDirectory,
TaskListModel
},
- props:['isDisplayNum'],
+ props: ['isDisplayNum', 'areaOfResponsibility'],
data() {
return {
columns: [
@@ -257,7 +257,7 @@
mounted() {
this.getList()
this.long = localStorage.getItem('language') || 'zh-cn'
-
+ console.log(this.areaOfResponsibility)
},
methods: {
...mapGetters(['userInfo']),
diff --git a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
index bed58d4bd..dfa4961dd 100644
--- a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
+++ b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
@@ -19,7 +19,7 @@
-
+
@@ -75,6 +75,9 @@
this.getData()
},
methods: {
+ responsibility(item) {
+ this.$emit('currentStatus', item)
+ },
getData() {
getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => {
if (res.success) {
diff --git a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
index d83b48662..7c0157783 100644
--- a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
+++ b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue
@@ -26,7 +26,7 @@
-
+
@@ -174,8 +174,10 @@
})
}
this.getEcharts('main-left', this.$t('CurrentStatusOfTheProject'), color, data)
+ },
+ responsibility(item) {
+ this.$emit('currentStatus', item)
}
-
}
}
diff --git a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
index 6c120bd6a..31a91e2a7 100644
--- a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
+++ b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue
@@ -21,7 +21,7 @@
-
+
@@ -250,6 +250,9 @@
,
mainBottomEcharts(data, color) {
this.getEcharts('main-bottom', this.$t('verificationComplianceConfirmationProgress'), color, data, 5)
+ },
+ responsibility(item) {
+ this.$emit('currentStatus', item)
}
}
}
diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue
index cd0f0aea9..7cda45c34 100644
--- a/jero-web/src/views/projectManagement/components/responsibilityList.vue
+++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue
@@ -26,6 +26,9 @@
:data-source="dataSource"
:columns="columns"
>
+
+ {{text}}
+
@@ -53,15 +56,16 @@
title: this.$t('areaOfResponsibility'),
dataIndex: 'dutyTerritory',
align: 'center',
- width:400,
- ellipsis: true
+ width: 400,
+ ellipsis: true,
+ scopedSlots: { customRender: 'areaOfResponsibility' }
},
{
title: this.$t('Quantity'),
dataIndex: 'amount',
align: 'center',
ellipsis: true,
- width:300,
+ width: 300
}
]
}
@@ -92,6 +96,9 @@
},
handleCancel() {
this.visible = false
+ },
+ areaOfResponsibilityClick(item) {
+ this.$emit('responsibility', item)
}
}
}