Merge branch 'orangeUrgent' into allTestUrgent

src/HDrpManagement/orderManage/details/tabs/rebatesettlement.vue

@@ -35,7 +35,7 @@
             <div v-else-if="scope.column.columnname === 'rebate_discountrate'">
               {{Math.round((scope.column.data[scope.column.columnname] * 100)*100)/100 + '%'}}
             </div>
-            <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
+            <p v-else>{{scope.column.data[scope.column.columnname] || '--'}}</p>
           </template>
         </table-new-layout>
         <div class="container normal-panel" style="text-align:right;padding-bottom: 0">