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;">