diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index 086c6f36d..5a0367166 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -425,7 +425,11 @@ this.$refs.addModelRef.edit(JSON.parse(JSON.stringify(record))) }, detil(record){ - this.designFlowStatusClick(record) + if(record.flag == 'NEW'){ + this.$refs.detilModelRef.check(JSON.parse(JSON.stringify(record))) + }else{ + this.designFlowStatusClick(record) + } }, deleteLib(record){ let _this = this diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 20c408f2f..f9e8da0c5 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -509,18 +509,20 @@ export default { this.getNameList() this.getFirstLevelDutyTerritory() this.title = this.$t('edit') - if(row.dutyTerritory != null){ - this.formInline.dutyTerritory = row.dutyTerritory.split(',') - }else{ - this.formInline.dutyTerritory = undefined - console.log(this.formInline.dutyTerritory) - } - if(row.projectId != null){ - this.formInline.projectId = row.projectId.split(',') - }else{ - this.formInline.dutyTerritory = undefined - } this.formInline = row + if(this.formInline.dutyTerritory != null){ + this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',') + }else{ + this.formInline.dutyTerritory = undefined + } + if(this.formInline.problemState == null){ + this.formInline.problemState = undefined + } + if(this.formInline.projectId != null){ + this.formInline.projectId = this.formInline.projectId.split(',') + }else{ + this.formInline.projectId = undefined + } console.log(this.formInline) this.visible = true this.disabled = false diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue index 7d06b0f9d..2272baf87 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue @@ -10,21 +10,14 @@ :visible="visible" style="height: 100%;overflow: auto;padding-bottom: 53px;"> -
- * {{$t('title')}}
- - - + {{formInline.title}}
@@ -32,31 +25,26 @@
- * + {{$t('problemType')}}
- - - + {{formInline.problemType}} + + + + + +
- {{'PS-issue'}}
- - - + {{formInline.psIssue}}
@@ -68,12 +56,7 @@ {{$t('creator')}} - - - + {{formInline.creator}} @@ -83,12 +66,7 @@ {{$t('createTime')}} - - - + {{formInline.createTime}} @@ -100,14 +78,7 @@ {{$t('Relevantlawsregulations')}} - - - + {{formInline.lawsName}} @@ -117,26 +88,7 @@ {{$t('RelatedItems')}} - - - - - {{ item.projectName}} - - - - + {{formInline.projectId}} @@ -148,25 +100,7 @@ {{$t('statisticalNodes')}} - - - - - {{ item.key }} - - - - + {{formInline.dutyTerritory}} @@ -176,25 +110,7 @@ {{$t('Problemstate')}} - - - - - {{ item }} - - - - + {{formInline.problemState}} @@ -206,12 +122,7 @@ {{$t('descriptions')}} - - - + {{formInline.descriptions}} @@ -223,27 +134,16 @@ {{$t('documents')}} - -
- - - +
+ {{item.fileLink}}
+ {{formInline.fileLink}} {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' || formInline.accessory_id == null) ? $t('Fileupload') : $t('viewUploadedFiles') }} -
@@ -255,18 +155,9 @@ {{$t('progresstracking')}} - -
- - - {{$t('newlyAdded')}} - {{$t('delete')}} +
+ {{item.progressTracking}}
-
@@ -278,12 +169,7 @@ {{$t('conculsion')}} - - - + {{formInline.conclusion}} @@ -295,19 +181,8 @@ {{$t('examineapproveevidence')}} - -
- - - +
+ {{item.approvalEvidenceLink}}
@@ -315,60 +190,21 @@ formInline.examineapproveevidence == null) ? $t('Fileupload') : $t('viewUploadedFiles') }} -
-
{{$t('cancel')}} - {{$t('submit')}} - + +
- - - - - -
-
- * - - {{$t('progresstracking')}} -
- - - -
-
-
-
-