diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 9d4d0fcd6..e0e1afe6b 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -115,8 +115,9 @@
              </span>
         </div>
         <div slot="CurrentProjectStatusEvaluation" slot-scope="text,result">
-          <div class="Current-color box-content-cou" @click="CurrentProjectClick(result)">
-            <div class="Current-color-box"></div>
+          <div class="Current-color box-content-cou" :style="{'background':CurrentColor[result.conditionAssessment]}"
+               @click="CurrentProjectClick(result)">
+            <div class="Current-color-box" :style="{'background':CurrentColorBox[result.conditionAssessment]}"></div>
           </div>
         </div>
       </a-table>
@@ -227,6 +228,16 @@
           'Not start': 'submittedColor'
         },
         queryParam: {},
+        CurrentColor: {
+          '1': '#f3dddd',
+          '2': '#f6ebdb',
+          '3': '#dbf6e2'
+        },
+        CurrentColorBox: {
+          '1': '#E83030',
+          '2': '#FDA71C',
+          '3': '#26BD4B'
+        },
         url: {
           list: '/project/projectTaskInventoryEO/list'
         },
diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue
index d32baf06e..9f4cc4c69 100644
--- a/jero-web/src/views/projectManagement/components/TaskListModel.vue
+++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue
@@ -53,9 +53,10 @@
               <span class="title-text-text"
                     :title="$t('CurrentProjectStatusEvaluation')">{{$t('CurrentProjectStatusEvaluation')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="remarks">
+            <a-form-model-item class="itemModel" prop="conditionAssessment">
               <a-select
                 :disabled="disabled"
+                v-model="formInline.conditionAssessment"
                 :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
                 <a-select-option :key="1" :value="1">
                      <span style="display: inline-block;width: 100%">
@@ -88,7 +89,7 @@
               <span class="title-text-text"
                     :title="$t('remarks')">{{$t('remarks')}}</span>
             </div>
-            <a-form-model-item class="itemModel" prop="remarks">
+            <a-form-model-item class="itemModel" prop="remark">
               <a-textarea
                 :placeholder="$t('remarks')"
                 :disabled="disabled"
@@ -102,7 +103,7 @@
 </template>
 
 <script>
-  import { getAction, putAction } from '@/api/manage'
+  import { postAction, putAction } from '@/api/manage'
 
   export default {
     name: 'TaskListModel',
@@ -115,7 +116,8 @@
         confirmLoading: false,
         disabled: false,
         url: {
-          edit: '/project/projectTaskInventoryEO/edit'
+          edit: '/project/projectTaskInventoryEO/edit',
+          addOrUpdate: '/project/projectTaskInventoryConditionAssessmentEO/addOrUpdate'
         }
       }
     },
@@ -149,13 +151,29 @@
         }
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
-            let query = {
-              id: this.formInline.id,
-              certificationProgress: this.formInline.certificationProgress,
-              certificationProgressRemark: this.formInline.certificationProgressRemark
+            let query = {}
+            let url = ''
+            let Action
+            if (this.title == this.$t('CertificationProgress')) {
+              query = {
+                id: this.formInline.id,
+                certificationProgress: this.formInline.certificationProgress,
+                certificationProgressRemark: this.formInline.certificationProgressRemark
+              }
+              url = this.url.edit
+              Action = putAction
+            } else {
+              query = {
+                roleCode: this.formInline.roleCode,
+                remark: this.formInline.remark,
+                conditionAssessment: this.formInline.conditionAssessment,
+                projectLawsInventoryId: this.formInline.projectLawsInventoryId
+              }
+              url = this.url.addOrUpdate
+              Action = postAction
             }
             this.confirmLoading = true
-            putAction(this.url.edit, query).then((res) => {
+            Action(url, query).then((res) => {
               if (res.success) {
                 this.visible = false
                 this.confirmLoading = false