Joe 4 年之前
父节点
当前提交
175d4b5296
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      src/views/dzk/Dzk_Bill.vue
  2. 1 1
      src/views/dzk/Dzk_RuleList.vue
  3. 2 2
      src/views/overview/Overview_Summary.vue

+ 1 - 1
src/views/dzk/Dzk_Bill.vue

@@ -57,7 +57,7 @@
       <af-table-column label="id" align="center" prop="id" v-if="false" />
       <af-table-column label="id" align="center" prop="id" v-if="false" />
       <af-table-column label="充值/消费单号" align="center" prop="orderNo" />
       <af-table-column label="充值/消费单号" align="center" prop="orderNo" />
       <!-- <af-table-column label="会员号ID" align="center" prop="customerNo" /> -->
       <!-- <af-table-column label="会员号ID" align="center" prop="customerNo" /> -->
-      <!-- <af-table-column label="客户名" align="center" prop="customerName" /> -->
+      <af-table-column label="客户名" align="center" prop="customerName" />
       <af-table-column
       <af-table-column
         label="消费充值类型"
         label="消费充值类型"
         align="center"
         align="center"

+ 1 - 1
src/views/dzk/Dzk_RuleList.vue

@@ -76,7 +76,7 @@
       
       
       
       
       <el-form-item
       <el-form-item
-        label="电子卡会执行的优惠方案"
+        label="电子卡会叠加的优惠方案"
         v-if="sumForm.cardEnabledFlag == 1"
         v-if="sumForm.cardEnabledFlag == 1"
       >
       >
         <div>
         <div>

+ 2 - 2
src/views/overview/Overview_Summary.vue

@@ -341,8 +341,8 @@ export default {
       // 查询汇总充值金额
       // 查询汇总充值金额
       listCZXFData(query).then((response) => {
       listCZXFData(query).then((response) => {
         if (response.data!=null ) {
         if (response.data!=null ) {
-          if (response.data.amt) {
-            this.infoFrom.czAmt = response.data.amt;
+          if (response.data.czAmt) {
+            this.infoFrom.czAmt = response.data.czAmt;
           } else {
           } else {
             this.infoFrom.czAmt = 0;
             this.infoFrom.czAmt = 0;
           }
           }