- {{formInlineDetails.engineerFeedbackContent}}
+
+
+
-
-
-
-
- {{this.$t('Deliverables')}}:
-
-
-
- {{this.$t('viewFile')}}
+
-
-
-
-
- {{this.$t('completedBy')}}:
-
-
-
- {{formInlineDetails.createBy}}
-
-
-
-
-
- {{this.$t('completedTime')}}:
-
-
-
- {{formInlineDetails.createTime}}
-
-
-
-
-
- {{this.$t('replyFromProjectContactPerson')}}:
-
-
-
- {{formInlineDetails.engineeringInterfacePersonReply}}
-
-
-
+
+
+ {{this.$t('projectDeliveryRequirements')}}:
+
+
+
+ {{item.deliveryInstructions}}
+
+
+
+
+
+ {{this.$t('feedbackFromTheEngineer')}}:
+
+
+
+ {{item.engineerFeedbackContent}}
+
+
+
+
+
+ {{this.$t('Deliverables')}}:
+
+
+
+ {{this.$t('viewUploadedFiles')}}
+
+
+
+
+
+ {{this.$t('completedBy')}}:
+
+
+
+ {{item.createBy}}
+
+
+
+ {{this.$t('completedTime')}}:
+
+
+
+ {{item.createTime}}
+
+
+
+
+
+ {{this.$t('replyFromProjectContactPerson')}}:
+
+
+
+ {{item.engineeringInterfacePersonReply}}
+
+
+
+
+ {{this.$t('noData')}}
+
+
+
+
{{$t('dataLoading')}}
{
if (valid) {
@@ -482,6 +533,34 @@
this.$refs.ruleForm.validateField()
})
},
+ confirm(val) {
+ let _this = this
+ this.$confirm({
+ content: _this.$t('confirmOperation') + '?',
+ onOk() {
+ let query = {}
+ if (val.status == 'NotDone') {
+ query = {
+ id: val.projectTaskInventoryId,
+ status: 'haveDone'
+ }
+ } else {
+ query = {
+ id: val.projectTaskInventoryId,
+ status: 'NotDone'
+ }
+ }
+ putAction(_this.url.confirmEdit, query).then((res) => {
+ if (res.success) {
+ _this.$message.success(_this.$t('OperationSuccessful'))
+ _this.getList()
+ } else {
+ _this.$message.warning(_this.$t('operationFailed'))
+ }
+ })
+ }
+ })
+ },
reminderHandling() {
this.visibleTable = true
this.getReminderHandlingList()
@@ -526,8 +605,25 @@
})
},
detailsClick(val) {
- this.formInlineDetails = val || {}
this.visibleDetails = true
+ this.getDetails(val)
+ },
+ getDetails(row) {
+ let query = {
+ pageNo: this.pageNo,
+ pageSize: this.pageSize,
+ feedbackId: row.id
+ }
+ this.pageLoading = true
+ getAction(this.url.page, query).then((res) => {
+ if (res.success) {
+ this.detailsList = res.result.records || []
+ this.total = res.result.total
+ this.pageLoading = false
+ } else {
+ this.pageLoading = false
+ }
+ })
},
PersonnelSelectionChange(value, id) {
this.formInline[value] = id
@@ -754,4 +850,28 @@
color: #00B3BE;
cursor: pointer;
}
+
+ .engineeringBox {
+ width: 100%;
+ max-height: 600px;
+ overflow: auto;
+ }
+
+ .title-header-text {
+ font-size: 16px;
+ font-weight: 400;
+ color: #000F16;
+ margin-bottom: 30px;
+ }
+
+ .page {
+ text-align: right;
+ margin-top: 20px;
+ }
+
+ .noData {
+ height: 200px;
+ line-height: 200px;
+ text-align: center;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
index 0bb8fcc94..5c81f85b6 100644
--- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue
@@ -2,11 +2,11 @@
-
+
@@ -35,7 +35,100 @@
-
+
+
+
+
+ {{$t('feedbackMessage')}}
+
+
+
+
+
+
+ {{$t('projectDeliveryDescription')}}
+
+
+
+
+
+
+ {{$t('feedbackFromTheEngineer')}}
+
+
+
+
+
+
+ {{$t('Deliverables')}}
+
+
+
+ {{ (formInline.fileId === 'null' || formInline.fileId === '' ||
+ formInline.fileId == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+ }}
+
+
+
+
+ {{$t('complianceResults')}}
+
+
+
+
+
+
+ {{$t('feedbackMessage')}}
+
+
+
+
+
+
+
+