Merge branch 'mergeBranch' into orangeUrgent

src/HDrpManagement/contractManage/index.vue

@@ -115,6 +115,9 @@
           <div v-else-if="scope.data.column.data.type === '直销'">
             {{scope.data.column.data.discountrate<1?Math.round((scope.data.column.data.discountrate * 100)*100)/100:100}}
           </div>
+          <div v-else-if="scope.data.column.data.type === '项目'">
+            {{scope.data.column.data.discountrate<1?Math.round((scope.data.column.data.discountrate * 100)*100)/100:100}}
+          </div>
           <div v-else-if="scope.data.column.data.type === '居间'">
             <span v-if="scope.data.column.data.calculatemodel === 1">
               {{scope.data.column.data.orderratio<1?Math.round((scope.data.column.data.orderratio * 100)*100)/100:100}}