Merge branch 'feature/12月迭代' into dev

src/views/recharge/consume.vue

@@ -51,8 +51,12 @@
             <p class="gray">{{ scope.row.storeGroupName }}</p>
           </template>
         </el-table-column>
-        <el-table-column label="触发计划名称" :show-overflow-tooltip="true" align="left" min-width="110" prop="sourceName"></el-table-column>
-        <el-table-column label="活动创建人" align="left" min-width="100" prop="sourceCreatorName"></el-table-column>
+        <el-table-column label="触发计划名称" :show-overflow-tooltip="true" align="left" min-width="110" prop="sourceName">
+          <template slot-scope="{ row }">{{ row.sourceName || '--' }}</template>
+        </el-table-column>
+        <el-table-column label="活动创建人" align="left" min-width="100" prop="sourceCreatorName">
+          <template slot-scope="{ row }">{{ row.sourceCreatorName || '--' }}</template>
+        </el-table-column>
         <el-table-column v-if="isMoreAccount" label="扣费规则" align="left" min-width="120" prop="accountRule">
           <template slot-scope="{ row }">{{ accountRule(row.accountRule) }}</template>
         </el-table-column>
@@ -146,8 +150,12 @@
             <p class="fz13 gray">{{ scope.row.storeGroupName }}</p>
           </template>
         </el-table-column>
-        <el-table-column label="触发计划名称" align="left" :show-overflow-tooltip="true" min-width="150" prop="sourceName"></el-table-column>
-        <el-table-column label="活动创建人" align="left" min-width="120" prop="sourceCreatorName"></el-table-column>
+        <el-table-column label="触发计划名称" align="left" :show-overflow-tooltip="true" min-width="150" prop="sourceName">
+          <template slot-scope="{ row }">{{ row.sourceName || '--' }}</template>
+        </el-table-column>
+        <el-table-column label="活动创建人" align="left" min-width="120" prop="sourceCreatorName">
+          <template slot-scope="{ row }">{{ row.sourceCreatorName || '--' }}</template>
+        </el-table-column>
         <el-table-column v-if="isMoreAccount" label="扣费规则" align="left" min-width="120" prop="accountRule">
           <template slot-scope="{ row }">{{ accountRule(row.accountRule) }}</template>
         </el-table-column>
@@ -197,8 +205,12 @@
             <p class="fz13 gray">{{ scope.row.storeGroupName }}</p>
           </template>
         </el-table-column>
-        <el-table-column label="触发计划名称" align="left" min-width="150" prop="sourceName" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="活动创建人" align="left" min-width="100" prop="sourceCreatorName"></el-table-column>
+        <el-table-column label="触发计划名称" align="left" min-width="150" prop="sourceName" :show-overflow-tooltip="true">
+          <template slot-scope="{ row }">{{ row.sourceName || '--' }}</template>
+        </el-table-column>
+        <el-table-column label="活动创建人" align="left" min-width="100" prop="sourceCreatorName">
+          <template slot-scope="{ row }">{{ row.sourceCreatorName || '--' }}</template>
+        </el-table-column>
         <el-table-column v-if="isMoreAccount" label="扣费规则" align="left" min-width="100" prop="accountRule">
           <template slot-scope="{ row }">{{ accountRule(row.accountRule) }}</template>
         </el-table-column>