Merge tag 'Hotfix-mo-158' into develop

Finish Hotfix-mo-158

src/views/supply/retail/components/retail_form.vue

@@ -135,7 +135,7 @@
         </el-table-column>
         <el-table-column align="right" label="使用返利金额" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{(scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100}}
+            {{((scope.row.price - scope.row.discAmount) * scope.row.qty * (scope.row.rebateRate * 100)) / 100}}
           </template>
         </el-table-column>
         <el-table-column align="right" label="格力折扣" min-width="100" show-overflow-tooltip>