总后台报表开发

src/views/his/integralOrder/index.vue

@@ -124,7 +124,7 @@
       <el-table-column label="用户电话" align="center" prop="userPhone" />
       <el-table-column label="用户地址" align="center" prop="userAddress" show-overflow-tooltip />
       <el-table-column label="支付积分" align="center" prop="integral" />
-      <el-table-column label="支付金额" align="center" prop="cash" />
+      <el-table-column label="支付金额" align="center" prop="payMoney" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="statusOptions" :value="scope.row.status"/>

src/views/his/statistics/courseReport.vue

@@ -33,7 +33,7 @@
                     :normalizer="normalizer" v-if="queryParams.dimension === 'camp'" />
       </el-form-item>
       <el-form-item>
-        <el-form-item label="下单时间" prop="createTime">
+        <el-form-item label="看课时间" prop="createTime">
           <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd"
                           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
                           @change="xdChange"></el-date-picker>

src/views/his/statistics/orderReport.vue

@@ -22,6 +22,17 @@
                     clearable :show-count="true" placeholder="请选择归属部门" @input="currDeptChange" v-if="queryParams.dimension === 'dept'"/>
       </el-form-item>
       <el-form-item>
+<!--        <el-form-item label="训练营" prop="trainingCampId">-->
+<!--          <el-select filterable v-model="queryParams.trainingCampId" placeholder="请选择训练营"-->
+<!--                     clearable size="small" >-->
+<!--            <el-option-->
+<!--              v-for="item in camps"-->
+<!--              :key="item.dictValue"-->
+<!--              :label="item.dictLabel"-->
+<!--              :value="item.dictValue"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="下单时间" prop="createTime">
           <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd"
                           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
@@ -91,6 +102,7 @@ import {treeselect} from "@/api/company/companyDept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {getTask} from "@/api/common";
+import {getCampList} from "@/api/course/userWatchCourseStatistics";
 
 export default {
   watch: {
@@ -118,6 +130,7 @@ export default {
       totalData: {},
       companys: [],
       deptOptions: [],
+      camps: [],
       companyId: undefined,
       deptId: undefined,
       show: {
@@ -185,7 +198,8 @@ export default {
         companyName: null,
         deptId: null,
         source: null,
-        dimension:'company'
+        dimension:'company',
+        trainingCampId: null
       },
       // 表单参数
       form: {},
@@ -196,6 +210,13 @@ export default {
   computed: {
   },
   created() {
+    getCampList().then(response => {
+      this.camps = response.data.list
+      if (this.camps != null && this.camps.length > 0) {
+        this.companyId = this.camps[0].dictValue;
+      }
+      this.camps.push({companyId: "-1", companyName: "无"})
+    });
     getCompanyList().then(response => {
       this.companys = response.data;
       if (this.companys != null && this.companys.length > 0) {

src/views/his/statistics/packageOrderReport.vue

@@ -21,6 +21,17 @@
         <treeselect style="width: 220px" :clearable="false" v-model="queryParams.deptId" :options="deptOptions"
                     clearable :show-count="true" placeholder="请选择归属部门" v-if="queryParams.dimension === 'dept'"/>
       </el-form-item>
+<!--      <el-form-item label="训练营" prop="trainingCampId">-->
+<!--        <el-select filterable v-model="queryParams.trainingCampId" placeholder="请选择训练营"-->
+<!--                   clearable size="small" >-->
+<!--          <el-option-->
+<!--            v-for="item in camps"-->
+<!--            :key="item.dictValue"-->
+<!--            :label="item.dictLabel"-->
+<!--            :value="item.dictValue"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-form-item label="下单时间" prop="createTime">
           <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd"
@@ -87,6 +98,7 @@ import {treeselect} from "@/api/company/companyDept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {getTask} from "@/api/common";
+import {getCampList} from "@/api/course/userWatchCourseStatistics";
 
 export default {
   watch: {
@@ -144,6 +156,7 @@ export default {
       payTypeOptions: [],
       deliveryPayStatusOptions: [],
       deliveryStatusOptions: [],
+      camps: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -172,7 +185,8 @@ export default {
         companyName: null,
         deptId: null,
         source: null,
-        dimension:'company'
+        dimension:'company',
+        trainingCampId: null,
       },
       // 表单参数
       form: {},
@@ -198,6 +212,13 @@ export default {
     // }
   },
   created() {
+    getCampList().then(response => {
+      this.camps = response.data.list
+      if (this.camps != null && this.camps.length > 0) {
+        this.companyId = this.camps[0].dictValue;
+      }
+      this.camps.push({companyId: "-1", companyName: "无"})
+    });
     getCompanyList().then(response => {
       this.companys = response.data;
       if (this.companys != null && this.companys.length > 0) {

src/views/his/statistics/userReport.vue

@@ -81,7 +81,7 @@
       <el-table-column label="会员id" align="center" prop="userId" width="120px"/>
       <el-table-column label="用户昵称" align="center" prop="nickName" />
       <el-table-column label="用户状态" align="center" prop="status" />
-      <el-table-column label="用户积分" align="center" prop="Integral"/>
+      <el-table-column label="用户积分" align="center" prop="integral"/>
       <el-table-column label="所属销售" align="center" prop="companyUserName"/>
       <el-table-column label="所属销售公司" align="center" prop="companyName"/>
       <el-table-column label="注册时间" align="center" prop="registerDate"/>
@@ -100,7 +100,7 @@
       <span class="total-item">缺课数: {{ calculatedTotalData.absentCount }}</span>
       <span class="total-item">参与营期数量: {{ calculatedTotalData.periodCount }}</span>
       <span class="total-item">已消耗积分: {{ calculatedTotalData.consumedIntegral }}</span>
-      <span class="total-item">用户积分: {{ calculatedTotalData.Integral }}</span>
+      <span class="total-item">用户积分: {{ calculatedTotalData.integral }}</span>
       <span class="total-item">红包金额: {{ calculatedTotalData.receivedAmount.toFixed(2) }}</span>
       <span class="total-item">订单金额: {{ calculatedTotalData.orderAmount.toFixed(2) }}</span>
     </div>
@@ -190,7 +190,7 @@ export default {
         absentCount: 0,
         periodCount: 0,
         consumedIntegral: 0,
-        Integral: 0,
+        integral: 0,
         receivedAmount: 0,
         orderAmount: 0
       },
@@ -301,7 +301,7 @@ export default {
         absentCount: 0,
         periodCount: 0,
         consumedIntegral: 0,
-        Integral: 0,
+        integral: 0,
         receivedAmount: 0,
         orderAmount: 0
       };
@@ -312,7 +312,7 @@ export default {
         this.calculatedTotalData.absentCount += Number(item.absentCount) || 0;
         this.calculatedTotalData.periodCount += Number(item.periodCount) || 0;
         this.calculatedTotalData.consumedIntegral += Number(item.consumedIntegral) || 0;
-        this.calculatedTotalData.Integral += Number(item.Integral) || 0;
+        this.calculatedTotalData.integral += Number(item.integral) || 0;
         this.calculatedTotalData.receivedAmount += Number(item.receivedAmount) || 0;
         this.calculatedTotalData.orderAmount += Number(item.orderAmount) || 0;
       });