Merge branch 'monthly_report_daily_0.0.1' of git.xiaojukeji.com:pu_qa_tool/thoth-frontend into monthly_report_daily_0.0.1

src/views/monthlyReport/childrenPage/editReport/components/MrTable.vue

@@ -441,6 +441,9 @@ export default {
         if (obj && obj.content[0].tableRows.length) {
           updateAnalyticFeedback(params).then((res) => {
             if (res.code === 200) {
+              if (res.data.search(/yellow/) > -1) {
+                res.data.replace(/yellow/, '#F0B044')
+              }
               this.analyticFeedback = res.data
             }
           })

src/views/monthlyReport/childrenPage/editReport/components/TableExpandRow.vue

@@ -47,7 +47,7 @@ style="min-width: 50px;display: inline-block;"
             <!--改进项: 进度-->
             <span
               class="progress-wrapper"
-              :style="{ width: !subItem.isProgressEdit ? '80px' : '150px' }"
+              :style="{ width: !subItem.isProgressEdit ? '80px' : '190px' }"
               >进度：<span v-if="!subItem.isProgressEdit">{{
                 subItem.progress || '0'
               }}</span
@@ -59,7 +59,7 @@ style="min-width: 50px;display: inline-block;"
                   style="width:100px"
                   :min="0"
                   :max="100" /></span
-              >%
+              >%<el-button type="text" v-if="subItem.isProgressEdit" @click.stop="progressEdit(subItem)">保存</el-button>
               <span v-if="subItem.isHold" class="isHold">Hold</span>
             </span>
             <!--改进项: 进度更新-->