Merge branch 'blueUrgent' into mergeBranch

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -304,7 +304,7 @@ export default {
                 style = {color:'#333333'}
                 break;
               case '复核':
-                style = {color:'#333333'}
+                style = {color:'#fa8c16'}
                 break;
               default:
                 break;
@@ -372,7 +372,7 @@ export default {
                     style = {color:'#333333'}
                     break;
                   case '复核':
-                    style = {color:'#333333'}
+                    style = {color:'#fa8c16'}
                     break;
                   default:
                     break;

src/SDrpManagement/QuotedPrice/detail/modules/detailed/index.vue

@@ -99,6 +99,9 @@ export default {
         case '审核':
           style = {color:'#333333'}
           break;
+        case '复核':
+          style = {color:'#fa8c16'}
+          break;
         default:
           break;
       }

src/SDrpManagement/QuotedPrice/index.vue

@@ -96,7 +96,7 @@
           <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '复核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '复核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'invaliddate'">
           <p>{{scope.data.column.data.begdate?scope.data.column.data.begdate+ '至' + scope.data.column.data.enddate:'--'}}</p>

src/template/addProductContract/index.vue

@@ -29,7 +29,11 @@
                   label="状态"
                   width="100">
                 <template slot-scope="scope">
-                  <span style="margin-left: 10px">{{ scope.row.status?scope.row.status:'--' }}</span>
+<!--                  <span style="margin-left: 10px" >{{ scope.row.status?scope.row.status:'&#45;&#45;' }}</span>-->
+                  <span style="color:#3874f6" v-if="scope.row.status == '新建'">{{scope.row.status}}</span>
+                  <span style="color:#52c41a" v-else-if="scope.row.status == '提交'">{{scope.row.status}}</span>
+                  <span style="color:#333333" v-else-if="scope.row.status == '审核'">{{scope.row.status}}</span>
+                  <span style="color:#fa8c16" v-else-if="scope.row.status == '复核'">{{scope.row.status}}</span>
                 </template>
               </el-table-column>
               <el-table-column