diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index e0d6f2a7d..ab21c14ce 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1970,4 +1970,7 @@ module.exports = {
   Chinesecharacters:'The role code cannot enter Chinese characters',
   alreadyexistssystem:'The role encoding already exists',
   releaseType:'releaseType',
+  by:'By',
+  Changeto:'Change to',
+  emptyc:'empty',
 }
\ 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 773b0e065..61034b24d 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -3926,4 +3926,7 @@ module.exports = {
   Addresslink:'地址链接',
   Problemanagement:'问题管理',
   releaseType:'发布类型',
+  by:'由',
+  Changeto:'改为了',
+  emptyc:'空',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue
index 0bdd14ac0..c5a499e73 100644
--- a/jero-web/src/views/projectManagement/components/addModelconformance.vue
+++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue
@@ -152,6 +152,7 @@
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             showSearch
                             optionFilterProp="label"
+                            @change='change'
                             :autoClearSearchValue="false"
                             :placeholder="$t('PleaseSelect')+$t('Problemstate')">
                     <a-select-option v-for="(item, key) in ProblemstateList"
@@ -244,11 +245,11 @@
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
-                  <!--                  <span class="Required">*</span>-->
+                  <span class="Required" v-if="this.formInline.problemState == this.$t('green')">*</span>
                   <span class="title-text-text"
                         :title="$t('conculsion')">{{$t('conculsion')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="conclusion">
+                <a-form-model-item class="itemModel" :prop="this.formInline.problemState == this.$t('green') ? 'conclusion' : ''">
                   <a-input class="box-input"
                            v-model='formInline.conclusion'
                            :disabled="disabled"
@@ -372,6 +373,13 @@ export default {
             trigger: 'change'
           }
         ],
+        conclusion: [
+          {
+            required: true,
+            message: this.$t('conculsion') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
       },
       visible: false,
       visibletrack: false,
@@ -421,6 +429,7 @@ export default {
         }
       ],
       index:'',
+      problemState:'',
       url: {
         add: '/project/problemManagementEO/add',
         edit: '/project/problemManagementEO/edit',
@@ -456,6 +465,13 @@ export default {
         }
       })
     },
+    change(value){
+      if(value != this.problemState && this.title == this.$t('edit') && this.problemState){
+        let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        let text = this.userInfo().username + ' ' + time + ' ' + this.$t('Problemstate')+this.$t('by')+ '\'' + this.problemState + '\'' +this.$t('Changeto') + '\'' + value + '\''
+        this.formInline.progressTrackingList.push({progressTracking:text})
+      }
+    },
     StandardselectionChange(value, id) {
       this.formInline.lawsId = id
       this.formInline = { ...this.formInline }
@@ -510,6 +526,7 @@ export default {
       this.getNameList()
       this.getFirstLevelDutyTerritory()
       this.title = this.$t('edit')
+      this.problemState = row.problemState
       this.formInline = row
       if(this.formInline.dutyTerritory != null){
         this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',')
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
index 0bdd14ac0..343b431fa 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
@@ -153,6 +153,7 @@
                             showSearch
                             optionFilterProp="label"
                             :autoClearSearchValue="false"
+                            @change='change'
                             :placeholder="$t('PleaseSelect')+$t('Problemstate')">
                     <a-select-option v-for="(item, key) in ProblemstateList"
                                      :label='item'
@@ -244,11 +245,11 @@
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
-                  <!--                  <span class="Required">*</span>-->
+                  <span class="Required" v-if="this.formInline.problemState == this.$t('green')">*</span>
                   <span class="title-text-text"
                         :title="$t('conculsion')">{{$t('conculsion')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="conclusion">
+                <a-form-model-item class="itemModel" :prop="this.formInline.problemState == this.$t('green') ? 'conclusion' : ''">
                   <a-input class="box-input"
                            v-model='formInline.conclusion'
                            :disabled="disabled"
@@ -372,6 +373,13 @@ export default {
             trigger: 'change'
           }
         ],
+        conclusion: [
+          {
+            required: true,
+            message: this.$t('conculsion') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
       },
       visible: false,
       visibletrack: false,
@@ -392,6 +400,7 @@ export default {
         projectId:undefined,
         problemState:undefined,
       },
+      data:{},
       formInlinetracking:{},
       confirmLoading: false,
       title: '',
@@ -421,6 +430,7 @@ export default {
         }
       ],
       index:'',
+      problemState:'',
       url: {
         add: '/project/problemManagementEO/add',
         edit: '/project/problemManagementEO/edit',
@@ -460,6 +470,14 @@ export default {
       this.formInline.lawsId = id
       this.formInline = { ...this.formInline }
     },
+    change(value){
+      if(value != this.problemState && this.title == this.$t('edit') && this.problemState){
+        console.log(this.formInline.progressTrackingList)
+        let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        let text = this.userInfo().username + ' ' + time + ' ' + this.$t('Problemstate')+this.$t('by')+ '\'' + this.problemState + '\'' +this.$t('Changeto') + '\'' + value + '\''
+        this.formInline.progressTrackingList.push({progressTracking:text})
+      }
+    },
     Standardselectioninput(val){
       this.formInline.lawsName = val
     },
@@ -510,6 +528,7 @@ export default {
       this.getNameList()
       this.getFirstLevelDutyTerritory()
       this.title = this.$t('edit')
+      this.problemState = row.problemState
       this.formInline = row
       if(this.formInline.dutyTerritory != null){
         this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',')