Browse Source

Finish Hotfix-zh-7

howie 3 years ago
parent
commit
625fcbaf39

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

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

File diff suppressed because it is too large
+ 437 - 298
src/views/supply/policy/components/retail_form.vue


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

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

Some files were not shown because too many files changed in this diff