Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/contractManage/index.vue

@@ -111,6 +111,9 @@
             {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
           </span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'enterprisename2'">
+          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+        </div>
         <div  v-else-if="scope.data.column.columnname == 'discountrate'">
 <!--          <div v-if="scope.data.column.data"></div>-->
 <!--          {{scope.data.column.data[[scope.data.column.columnname]] <1 ?(scope.data.column.data[[scope.data.column.columnname]] * 100).toFixed(2):100}}-->
@@ -133,6 +136,9 @@
           </div>
           <div v-else>--</div>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'rate'">
+          {{scope.data.column.data[[scope.data.column.columnname]] < 1?Math.round((scope.data.column.data[[scope.data.column.columnname]] * 100)*100)/100:100}}
+        </div>
         <div v-else>
           {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
         </div>