瀏覽代碼

Merge tag 'Hotfix-mo-36' into develop

Finish Hotfix-mo-36
莫绍宝 3 年之前
父節點
當前提交
38a8462682
共有 2 個文件被更改,包括 4 次插入2 次删除
  1. 2 1
      src/views/supply/engin/commerce_list.vue
  2. 2 1
      src/views/supply/engin/home_list.vue

+ 2 - 1
src/views/supply/engin/commerce_list.vue

@@ -133,7 +133,8 @@
             <el-table-column align="center" label="返利钱包" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="使用返利金额" prop="rebateAmount" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.rebateAmount | numToFixed}}
+                <div v-if="scope.row.examineStatus === 'OK'">{{scope.row.payRebateAmount | numToFixed}}</div>
+                <div v-else>{{scope.row.rebateAmount | numToFixed}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" label="业务员" prop="aaa" min-width="160" show-overflow-tooltip></el-table-column>

+ 2 - 1
src/views/supply/engin/home_list.vue

@@ -133,7 +133,8 @@
             <el-table-column align="center" label="返利钱包" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="使用返利金额" prop="rebateAmount" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{scope.row.rebateAmount | numToFixed}}
+                <div v-if="scope.row.examineStatus === 'OK'">{{scope.row.payRebateAmount | numToFixed}}</div>
+                <div v-else>{{scope.row.rebateAmount | numToFixed}}</div>
               </template>
             </el-table-column>
             <el-table-column align="center" label="业务员" prop="aaa" min-width="160" show-overflow-tooltip></el-table-column>