智能语音新增字段

src/pages/order/Order.vue

@@ -106,17 +106,23 @@
             align="right"
             header-align="center"
             :render-header="renderheader"
-            prop="appendConsecutiveMonthly"
             min-width="140px"
-          ></el-table-column>
+          >
+              <template slot-scope="scope">
+                  <span>{{scope.row.appendConsecutiveMonthly || 0}}</span>
+              </template>
+          </el-table-column>
           <el-table-column
             label="续包月续费 | -Qm1-2"
             align="right"
             header-align="center"
             :render-header="renderheader"
-            prop="continueConsecutiveMonthly"
             min-width="140px"
-          ></el-table-column>
+          >
+              <template slot-scope="scope">
+                  <span>{{scope.row.continueConsecutiveMonthly || 0}}</span>
+              </template>
+          </el-table-column>
           <el-table-column
             label="月包 | -Qm2"
             align="right"
@@ -181,9 +187,12 @@
             align="right"
             header-align="center"
             :render-header="renderheader"
-            prop="appendTotalConversion"
             min-width="190px"
-          ></el-table-column>
+          >
+              <template slot-scope="scope">
+                  <span>{{scope.row.appendTotalConversion || 0}}</span>
+              </template>
+          </el-table-column>
         </el-table-column>
       </el-table>
       <!-- <el-pagination

src/pages/skill/Skill.vue

@@ -188,6 +188,28 @@
             min-width="100px"
           ></el-table-column>
           <el-table-column
+            label="新增连续包月 | -Qm1-1"
+            align="right"
+            header-align="center"
+            :render-header="renderheader"
+            min-width="140px"
+          >
+              <template slot-scope="scope">
+                  <span>{{scope.row.appendConsecutiveMonthly || 0}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column
+            label="续包月续费 | -Qm1-2"
+            align="right"
+            header-align="center"
+            :render-header="renderheader"
+            min-width="140px"
+          >
+              <template slot-scope="scope">
+                  <span>{{scope.row.continueConsecutiveMonthly || 0}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column
             label="月包 | -Qm2"
             align="right"
             header-align="center"
@@ -242,6 +264,17 @@
             prop="totalConversion"
             min-width="190px"
           ></el-table-column>
+          <el-table-column
+            label="R1 | =(Qm1-1+Qm2+Qy)/UV2"
+            align="right"
+            header-align="center"
+            :render-header="renderheader"
+            min-width="190px"
+          >
+              <template slot-scope="scope">
+                  <span>{{scope.row.appendTotalConversion || 0}}</span>
+              </template>
+          </el-table-column>
         </el-table-column>
       </el-table>
       <el-table :data="skillData" border style="width: 100%" :height="tableHeight" v-else>
@@ -322,6 +355,29 @@
             min-width="100px"
           ></el-table-column>
           <el-table-column
+            label="新增连续包月 | -Qm1-1"
+            align="right"
+            header-align="center"
+            :render-header="renderheader"
+            min-width="140px"
+          >
+              <template slot-scope="scope">
+                  <span>{{scope.row.appendConsecutiveMonthly || 0}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column
+            label="续包月续费 | -Qm1-2"
+            align="right"
+            header-align="center"
+            :render-header="renderheader"
+            prop="continueConsecutiveMonthly"
+            min-width="140px"
+          >
+              <template slot-scope="scope">
+                  <span>{{scope.row.continueConsecutiveMonthly || 0}}</span>
+              </template>
+          </el-table-column>
+          <el-table-column
             label="月包 | -Qm2"
             align="right"
             header-align="center"
@@ -376,6 +432,17 @@
             prop="totalConversion"
             min-width="190px"
           ></el-table-column>
+          <el-table-column
+            label="R1 | =(Qm1-1+Qm2+Qy)/UV2"
+            align="right"
+            header-align="center"
+            :render-header="renderheader"
+            min-width="190px"
+          >
+              <template slot-scope="scope">
+                  <span>{{scope.row.appendTotalConversion || 0}}</span>
+              </template>
+          </el-table-column>
         </el-table-column>
       </el-table>
       <!-- <el-pagination