浏览代码

Merge tag 'Hotfix-zh-8' into develop

Finish Hotfix-zh-8
howie 3 年之前
父节点
当前提交
c94d6455c4
共有 2 个文件被更改,包括 18 次插入4 次删除
  1. 2 1
      src/views/sales_policy/components/AddPolicy.vue
  2. 16 3
      src/views/supply/policy/policy_list.vue

+ 2 - 1
src/views/sales_policy/components/AddPolicy.vue

@@ -808,7 +808,7 @@ export default {
         saleTypeId: "",
         saleTypeName: "",
         specification: "",
-        walletIds: "",
+        walletIds: [this.NoRebateWalletList[0].id],
         walletRelaList: [],
       });
        this.sleectBox.currentPage =1
@@ -816,6 +816,7 @@ export default {
       // this.dataList.push(this.addList[this.addList.length-1])
     },
     handleSave() {
+      console.log(this.dataList);
       if (!this.dataList.length) {
           return
       }

+ 16 - 3
src/views/supply/policy/policy_list.vue

@@ -259,7 +259,11 @@
               prop="payAmount"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+               <template slot-scope="scope">
+                {{ scope.row.payAmount | numToFixed }}
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               label="返利类型"
@@ -284,14 +288,23 @@
               prop="payRebateAmount"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+                <template slot-scope="scope">
+                <div>{{scope.row.rebateAmount | numToFixed}}</div>
+                <div>(实际:{{scope.row.payRebateAmount | numToFixed}})</div>
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               label="格力折扣"
               prop="totalDiscAmount"
               min-width="100"
               show-overflow-tooltip
-            ></el-table-column>
+            >
+
+             <template slot-scope="scope">
+                {{ scope.row.totalDiscAmount | numToFixed }}
+              </template></el-table-column>
             <el-table-column
               align="center"
               label="直调数量"