Merge remote-tracking branch 'origin/develop' into develop

src/views/supply/displace/displace_list.vue

@@ -87,12 +87,16 @@
             </template>
           </el-table-column>
           <el-table-column align="left" label="返利类型" prop="rebateWalletName" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="使用返利金额" prop="payRebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="格力折扣" prop="totalDiscAmount" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="使用返利金额" prop="singleRebateAmount" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.singleRebateAmount * scope.row.ke_refundableQty}}
+            </template>
+          </el-table-column>
+          <el-table-column align="right" label="格力折扣" prop="discAmount" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="现金钱包" prop="walletName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{(scope.row.price * scope.row.ke_refundableQty) - (scope.row.payRebateAmount * scope.row.ke_refundableQty) - scope.row.totalDiscAmount}}
+              {{(scope.row.price * scope.row.ke_refundableQty) - (scope.row.singleRebateAmount * scope.row.ke_refundableQty) - scope.row.discAmount}}
             </template>
           </el-table-column>
         </el-table-column>