【新增】零售订单

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

@@ -95,7 +95,9 @@
             {{scope.row.price * scope.row.qty * scope.row.rebateRate}}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="格力折扣" prop="deductAmount" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="格力折扣" min-width="100" show-overflow-tooltip>
+          {{scope.row.qty * scope.row.discAmount}}
+        </el-table-column>
         <el-table-column align="center" label="现金钱包" prop="walletRebateId2" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select v-model="scope.row.walletRebateId2" placeholder="选择现金钱包" size="small">
@@ -111,7 +113,7 @@
         </el-table-column>
         <el-table-column align="center" label="实付金额" prop="qty" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{(scope.row.price * scope.row.qty) - (scope.row.price * scope.row.qty * scope.row.rebateRate) - scope.row.deductAmount}}
+            {{(scope.row.price * scope.row.qty) - (scope.row.price * scope.row.qty * scope.row.rebateRate) - (scope.row.qty * scope.row.discAmount)}}
           </template>
         </el-table-column>
         <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100">
@@ -221,8 +223,8 @@
         </div>
         <div class="buttons">
           <el-button size="small" type="primary" @click="addAllGoods">全部添加</el-button>
-          <el-button size="small" type="primary" @click="addGoods">添加</el-button>
-          <el-button size="small" type="danger" @click="deleteGoods">删除</el-button>
+          <el-button size="small" type="primary" @click="addGoods">添&emsp;加</el-button>
+          <el-button size="small" type="danger" @click="deleteGoods">删&emsp;除</el-button>
           <el-button size="small" type="danger" @click="deleteAllGoods">全部删除</el-button>
         </div>
         <div class="table">
@@ -412,7 +414,6 @@ export default {
           item.directTransferQty = '';
           item.status1 = '';
           item.status2 = '';
-          item.deductAmount = item.discAmount || 0;
           item.rebateAmount = '';
           item.rebateRate = '';
         });
@@ -422,7 +423,7 @@ export default {
     },
 
     // 查询重复值并禁选
-    checkboxSelect (row, rowIndex) {
+    checkboxSelect(row, rowIndex) {
       if (row.selected) {
         return false // 禁用
       }else{