xcx

config/index.js

@@ -12,8 +12,7 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        // target: 'http://192.168.0.62:8080', //wf
-        target: 'http://localhost:8080', 
+        target: 'http://192.168.0.62:8080', //wf
         // target: 'http://192.168.0.11', //ys
         // target: 'http://192.168.0.11', //ys
         // target: 'http://dev.ycjcjy.com/', //frp

src/pages/system/dataStatistics/cardCouponList/index.vue

@@ -5,7 +5,7 @@
         <div class="flex-item flex-h"></div>
         <ul>
           <li>
-            <el-select v-model="CaseId" placeholder="请选择案场">
+            <el-select v-model="postData.caseid" placeholder="请选择案场">
               <el-option
                 v-for="item in cases"
                 :key="item.CaseId"
@@ -15,12 +15,12 @@
             </el-select>
           </li>
           <li>
-            <el-select v-model="postData.type" placeholder="请选择卡券类型">
+            <el-select v-model="postData.ctype" placeholder="请选择卡券类型">
               <el-option
                 v-for="item in typeList"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
+                :key="item.id"
+                :label="item.value"
+                :value="item.id">
               </el-option>
             </el-select>
           </li>
@@ -43,7 +43,7 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="currentList"
+        :data="cardCouponList"
         stripe
         style="width: 100%">
         <el-table-column
@@ -51,32 +51,38 @@
           label="所属案场">
         </el-table-column>
         <el-table-column
-          prop="name"
+          prop="CName"
           label="卡券名称">
         </el-table-column>
         <el-table-column
-          prop="type"
+          prop="TypeName"
           label="卡券类型">
         </el-table-column>
         <el-table-column
-          prop="sendType"
+          prop="SendType"
           label="发送类型">
+          <template slot-scope="scope">
+            {{scope.row.SendType === 'case' ? '案场' : scope.row.SendType === 'system' ? '系统' : '渠道'}}
+          </template>
         </el-table-column>
         <el-table-column
-          prop="price"
+          prop="Price"
           label="价格">
         </el-table-column>
         <el-table-column
-          prop="getNum"
+          prop="SentCount"
           label="领取数">
         </el-table-column>
         <el-table-column
-          prop="usedNum"
+          prop="UsedCount"
           label="实际使用数">
         </el-table-column>
         <el-table-column
-          prop="totalPrice"
+          prop="UsedCount"
           label="总费用">
+          <template slot-scope="scope">
+            {{(scope.row.Price - 0) * (scope.row.UsedCount - 0)}}
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -91,8 +97,9 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
 import tableSearch from '@/components/tableSearch/index'
+const { mapState: mapStaState, mapActions: mapStaActions } = createNamespacedHelpers('sta')
 
 export default {
   name: '',
@@ -101,13 +108,21 @@ export default {
       total: 0,
       postData: { // 表格搜索条件
         caseid: '', // 案场id
-        type: '', // 卡券类型
+        ctype: '', // 卡券类型
         name: '', // 卡券名称
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
-      currentList: [],
-      typeList: [],
+      typeList: [{
+        value: '课程体验卡',
+        id: 'card'
+      }, {
+        value: '商品优惠券',
+        id: 'goodscoupon'
+      }, {
+        value: '课程优惠券',
+        id: 'coursecoupon'
+      }],
     }
   },
   computed: {
@@ -115,6 +130,9 @@ export default {
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),
+    ...mapStaState({
+      cardCouponList: x => x.cardCoupon.list || [],
+    }),
     CaseId: {
       get () {
         return this.postData.caseid || this.defaultCaseId
@@ -129,14 +147,27 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
+      this.getList()
     })
   },
   methods: {
+    ...mapStaActions([
+      'getCardCouponList',
+    ]),
     search () { // 搜索
-      // 1
+      this.page = 1
+      this.getList()
     },
     handleCurrentChange (val) { // 跳转到分页
-      // this.getList()
+      this.page = val
+      this.getList()
+    },
+    getList () {
+      this.getCardCouponList(this.postData).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.postData.page = res.page
+        this.total = res.total
+      })
     },
   }
 }

src/pages/system/dataStatistics/cardCouponUsedList/index.vue

@@ -4,7 +4,7 @@
       <div class="flex-h">
         <ul class="searchFilterLine" style="white-space: normal;">
           <li>
-            <el-select v-model="CaseId" placeholder="请选择案场">
+            <el-select v-model="postData.caseid" placeholder="请选择案场">
               <el-option
                 v-for="item in cases"
                 :key="item.CaseId"
@@ -14,12 +14,12 @@
             </el-select>
           </li>
           <li>
-            <el-select v-model="postData.type" placeholder="请选择获取方式">
+            <el-select v-model="postData.receivetype" placeholder="请选择获取方式">
               <el-option
                 v-for="item in typeList"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
+                :key="item.id"
+                :label="item.value"
+                :value="item.id">
               </el-option>
             </el-select>
           </li>
@@ -27,9 +27,9 @@
             <el-select v-model="postData.status" placeholder="请选择状态">
               <el-option
                 v-for="item in statusList"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
+                :key="item.id"
+                :label="item.value"
+                :value="item.id">
               </el-option>
             </el-select>
           </li>
@@ -43,20 +43,20 @@
           <li>
             <el-input
               placeholder="请输入手机号"
-              v-model="postData.phone"
+              v-model="postData.tel"
               clearable>
             </el-input>
           </li>
           <li style="white-space: nowrap;">
             <span>有效期：</span>
             <el-date-picker
-              v-model="postData.startDate"
+              v-model="postData.begindate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
             <span>至</span>
             <el-date-picker
-              v-model="postData.endDate"
+              v-model="postData.enddate"
               type="date"
               placeholder="选择截止日期">
             </el-date-picker>
@@ -76,7 +76,7 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="currentList"
+        :data="cardCouponUsedList"
         stripe
         style="width: 100%">
         <el-table-column
@@ -84,19 +84,22 @@
           label="所属案场">
         </el-table-column>
         <el-table-column
-          prop="Name"
+          prop="CardCouponName"
           label="卡券名称">
         </el-table-column>
         <el-table-column
-          prop="GoodsList"
+          prop="TargetName"
           label="使用商品">
         </el-table-column>
         <el-table-column
-          prop="GetType"
+          prop="ReceivingType"
           label="获取方式">
+          <template slot-scope="scope">
+            {{scope.row.ReceivingType === 'system' ? '系统' : scope.row.ReceivingType === 'case' ? '案场' : scope.row.ReceivingType === 'channel' ? '渠道' : ''}}
+          </template>
         </el-table-column>
         <el-table-column
-          prop="NickName"
+          prop="CustomerName"
           label="微信昵称">
         </el-table-column>
         <el-table-column
@@ -104,24 +107,39 @@
           label="手机号">
         </el-table-column>
         <el-table-column
-          prop="SalerName"
+          prop="SalesName"
           label="销售">
         </el-table-column>
         <el-table-column
           prop="EndDate"
-          label="有效期">
+          label="有效期"
+          width="140px">
+          <template slot-scope="scope">
+            {{toolClass.dateFormat(scope.row.EndDate)}}
+          </template>
         </el-table-column>
         <el-table-column
-          prop="GetDate"
-          label="获取时间">
+          prop="ReceiveDate"
+          label="获取时间"
+          width="140px">
+          <template slot-scope="scope">
+            {{toolClass.dateFormat(scope.row.ReceiveDate)}}
+          </template>
         </el-table-column>
         <el-table-column
-          prop="CheckDate"
-          label="核销时间">
+          prop="VerifyDate"
+          label="使用时间"
+          width="140px">
+          <template slot-scope="scope">
+            {{toolClass.dateFormat(scope.row.UsedDate)}}
+          </template>
         </el-table-column>
         <el-table-column
-          prop="Status"
+          prop="VerifyStatus"
           label="状态">
+          <template slot-scope="scope">
+            {{scope.row.VerifyStatus === 'useable' ? '未使用' : scope.row.VerifyStatus === 'used' ? '已使用' : scope.row.VerifyStatus === 'late' ? '逾期核销' : scope.row.VerifyStatus === 'expire' ? '已失效' : ''}}
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -136,8 +154,9 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
 import tableSearch from '@/components/tableSearch/index'
+const { mapState: mapStaState, mapActions: mapStaActions } = createNamespacedHelpers('sta')
 
 export default {
   name: '',
@@ -145,19 +164,46 @@ export default {
     return {
       total: 0,
       postData: { // 表格搜索条件
-        phone: '', // 手机号
+        tel: '', // 手机号
         status: '', // 状态
         caseid: '', // 案场id
-        type: '', // 获取方式
-        startDate: '', // 起始日期
-        endDate: '', // 截止日期
+        receivetype: '', // 获取方式
+        begindate: '', // 起始日期
+        enddate: '', // 截止日期
         name: '', // 卡券名称
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
       currentList: [],
-      typeList: [],
-      statusList: [],
+      typeList: [{
+        value: '不限',
+        id: ''
+      }, {
+        value: '案场',
+        id: 'case'
+      }, {
+        value: '渠道',
+        id: 'channel'
+      }, {
+        value: '系统',
+        id: 'system'
+      }],
+      statusList: [{
+        value: '不限',
+        id: ''
+      }, {
+        value: '未使用',
+        id: 'useable'
+      }, {
+        value: '已使用',
+        id: 'used'
+      }, {
+        value: '逾期核销',
+        id: 'late'
+      }, {
+        value: '已失效',
+        id: 'expire'
+      }],
     }
   },
   computed: {
@@ -165,6 +211,9 @@ export default {
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),
+    ...mapStaState({
+      cardCouponUsedList: x => x.cardCouponUsedList.list || [],
+    }),
     CaseId: {
       get () {
         return this.postData.caseid || this.defaultCaseId
@@ -179,14 +228,27 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
+      this.getList()
     })
   },
   methods: {
+    ...mapStaActions([
+      'getCardCouponUsedList',
+    ]),
     search () { // 搜索
-      // 1
+      this.page = 1
+      this.getList()
     },
     handleCurrentChange (val) { // 跳转到分页
-      // this.getList()
+      this.page = val
+      this.getList()
+    },
+    getList () {
+      this.getCardCouponUsedList(this.postData).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.postData.page = res.page
+        this.total = res.total
+      })
     },
   }
 }
@@ -195,8 +257,8 @@ export default {
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style lang="scss" scoped>
 @import "page.scss";
-.searchFilterLine{
-  >li{
+.searchFilterLine {
+  > li {
     margin-bottom: 20px;
   }
 }

src/pages/system/dataStatistics/courseOrderList/index.vue

@@ -4,7 +4,7 @@
       <div class="flex-h">
         <ul class="searchFilterLine" style="white-space: normal;">
           <li>
-            <el-select v-model="CaseId" placeholder="请选择案场">
+            <el-select v-model="postData.caseid" placeholder="请选择案场">
               <el-option
                 v-for="item in cases"
                 :key="item.CaseId"
@@ -14,12 +14,12 @@
             </el-select>
           </li>
           <li>
-            <el-select v-model="postData.type" placeholder="请选择课程类别">
+            <el-select v-model="postData.typeid" placeholder="请选择课程类别">
               <el-option
-                v-for="item in typeList"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
+                v-for="item in courseTypeList"
+                :key="item.LocationId"
+                :label="item.LocationName"
+                :value="item.LocationId">
               </el-option>
             </el-select>
           </li>
@@ -33,13 +33,13 @@
           <li style="white-space: nowrap;">
             <span>下单时间：</span>
             <el-date-picker
-              v-model="postData.startDate"
+              v-model="postData.begindate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
             <span>至</span>
             <el-date-picker
-              v-model="postData.endDate"
+              v-model="postData.enddate"
               type="date"
               placeholder="选择截止日期">
             </el-date-picker>
@@ -59,15 +59,15 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="currentList"
+        :data="courseOrderList"
         stripe
         style="width: 100%">
         <el-table-column
-          prop="OrderNo"
+          prop="OrdersNo"
           label="订单编号">
         </el-table-column>
         <el-table-column
-          prop="Name"
+          prop="CourseName"
           label="课程名称">
         </el-table-column>
         <el-table-column
@@ -75,19 +75,25 @@
           label="所属案场">
         </el-table-column>
         <el-table-column
-          prop="Type"
+          prop="LocationName"
           label="课程类别">
         </el-table-column>
         <el-table-column
-          prop="Date"
-          label="课程时间">
+          prop="BeginDate"
+          label="课程时间"
+          width="140px">
+          <template slot-scope="scope">
+            {{toolClass.dateFormat(scope.row.BeginDate)}}<br>
+            -<br>
+            {{toolClass.dateFormat(scope.row.EndDate)}}
+          </template>
         </el-table-column>
         <el-table-column
-          prop="UserName"
+          prop="CustomerName"
           label="用户姓名">
         </el-table-column>
         <el-table-column
-          prop="NickName"
+          prop="Name"
           label="微信昵称">
         </el-table-column>
         <el-table-column
@@ -95,8 +101,12 @@
           label="手机号">
         </el-table-column>
         <el-table-column
-          prop="CreatDate"
-          label="下单时间">
+          prop="CreateDate"
+          label="下单时间"
+          width="140px">
+          <template slot-scope="scope">
+            {{toolClass.dateFormat(scope.row.CreateDate)}}
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -111,8 +121,10 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
 import tableSearch from '@/components/tableSearch/index'
+const { mapState: mapStaState, mapActions: mapStaActions } = createNamespacedHelpers('sta')
+const { mapState: mapCmsState, mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 
 export default {
   name: '',
@@ -121,9 +133,9 @@ export default {
       total: 0,
       postData: { // 表格搜索条件
         caseid: '', // 案场id
-        type: '', // 获取方式
-        startDate: '', // 起始日期
-        endDate: '', // 截止日期
+        typeid: '', // 获取方式
+        begindate: '', // 起始日期
+        enddate: '', // 截止日期
         name: '', // 卡券名称
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
@@ -138,6 +150,12 @@ export default {
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),
+    ...mapStaState({
+      courseOrderList: x => x.courseOrder.list || [],
+    }),
+    ...mapCmsState({
+      courseTypeList: x => x.location || [],
+    }),
     CaseId: {
       get () {
         return this.postData.caseid || this.defaultCaseId
@@ -152,14 +170,33 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
+      this.updateLocationInfo().then((res) => {
+        // console.log(JSON.stringify(res))
+      })
+      this.getList()
     })
   },
   methods: {
+    ...mapCmsActions([
+      'updateLocationInfo',
+    ]),
+    ...mapStaActions([
+      'getCourseOrderList',
+    ]),
     search () { // 搜索
-      // 1
+      this.page = 1
+      this.getList()
     },
     handleCurrentChange (val) { // 跳转到分页
-      // this.getList()
+      this.page = val
+      this.getList()
+    },
+    getList () {
+      this.getCourseOrderList(this.postData).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.postData.page = res.page
+        this.total = res.total
+      })
     },
   }
 }

src/pages/system/dataStatistics/courseStatisticsList/index.vue

@@ -5,7 +5,7 @@
         <div class="flex-item flex-h"></div>
         <ul>
           <li>
-            <el-select v-model="CaseId" placeholder="请选择案场">
+            <el-select v-model="postData.caseid" placeholder="请选择案场">
               <el-option
                 v-for="item in cases"
                 :key="item.CaseId"
@@ -15,12 +15,12 @@
             </el-select>
           </li>
           <li>
-            <el-select v-model="postData.type" placeholder="请选择课程类别">
+            <el-select v-model="postData.typeid" placeholder="请选择课程类别">
               <el-option
-                v-for="item in typeList"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
+                v-for="item in courseTypeList"
+                :key="item.LocationId"
+                :label="item.LocationName"
+                :value="item.LocationId">
               </el-option>
             </el-select>
           </li>
@@ -43,7 +43,7 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="currentList"
+        :data="courseList"
         stripe
         style="width: 100%">
         <el-table-column
@@ -51,32 +51,41 @@
           label="所属案场">
         </el-table-column>
         <el-table-column
-          prop="Name"
+          prop="CourseName"
           label="课程名称">
         </el-table-column>
         <el-table-column
-          prop="Type"
+          prop="LocationName"
           label="课程类别">
         </el-table-column>
         <el-table-column
-          prop="Date"
-          label="课程时间">
+          prop="BeginDate"
+          label="课程时间"
+          width="140px">
+          <template slot-scope="scope">
+            {{toolClass.dateFormat(scope.row.BeginDate)}}<br>
+            -<br>
+            {{toolClass.dateFormat(scope.row.EndDate)}}
+          </template>
         </el-table-column>
         <el-table-column
           prop="Price"
           label="课程价格">
         </el-table-column>
         <el-table-column
-          prop="ApplyNum"
+          prop="Total"
           label="报名人数">
         </el-table-column>
         <el-table-column
-          prop="CheckedNum"
+          prop="JoinTotal"
           label="核销人数">
         </el-table-column>
         <el-table-column
-          prop="totalPrice"
+          prop="JoinTotal"
           label="总费用">
+          <template slot-scope="scope">
+            {{(scope.row.JoinTotal - 0) * (scope.row.Price - 0)}}
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -91,8 +100,10 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
 import tableSearch from '@/components/tableSearch/index'
+const { mapState: mapStaState, mapActions: mapStaActions } = createNamespacedHelpers('sta')
+const { mapState: mapCmsState, mapActions: mapCmsActions } = createNamespacedHelpers('cms')
 
 export default {
   name: '',
@@ -101,7 +112,7 @@ export default {
       total: 0,
       postData: { // 表格搜索条件
         caseid: '', // 案场id
-        type: '', // 卡券类型
+        typeid: '', // 卡券类型
         name: '', // 卡券名称
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
@@ -115,6 +126,12 @@ export default {
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),
+    ...mapStaState({
+      courseList: x => x.course.list || [],
+    }),
+    ...mapCmsState({
+      courseTypeList: x => x.location || [],
+    }),
     CaseId: {
       get () {
         return this.postData.caseid || this.defaultCaseId
@@ -129,14 +146,31 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
+      this.updateLocationInfo()
+      this.getList()
     })
   },
   methods: {
+    ...mapCmsActions([
+      'updateLocationInfo',
+    ]),
+    ...mapStaActions([
+      'getCourseList',
+    ]),
     search () { // 搜索
-      // 1
+      this.page = 1
+      this.getList()
     },
     handleCurrentChange (val) { // 跳转到分页
-      // this.getList()
+      this.page = val
+      this.getList()
+    },
+    getList () {
+      this.getCourseList(this.postData).then((res) => {
+        console.log(JSON.stringify(res))
+        this.postData.page = res.page
+        this.total = res.total
+      })
     },
   }
 }

src/pages/system/dataStatistics/goodsOrderList/index.vue

@@ -4,7 +4,7 @@
       <div class="flex-h">
         <ul class="searchFilterLine" style="white-space: normal;">
           <li>
-            <el-select v-model="CaseId" placeholder="请选择案场">
+            <el-select v-model="postData.caseid" placeholder="请选择案场">
               <el-option
                 v-for="item in cases"
                 :key="item.CaseId"
@@ -14,12 +14,12 @@
             </el-select>
           </li>
           <li>
-            <el-select v-model="postData.type" placeholder="请选择下单用户类型">
+            <el-select v-model="postData.usertype" placeholder="请选择下单用户类型">
               <el-option
                 v-for="item in typeList"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
+                :key="item.id"
+                :label="item.value"
+                :value="item.id">
               </el-option>
             </el-select>
           </li>
@@ -27,22 +27,22 @@
             <el-select v-model="postData.status" placeholder="请选择订单状态">
               <el-option
                 v-for="item in statusList"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
+                :key="item.id"
+                :label="item.value"
+                :value="item.id">
               </el-option>
             </el-select>
           </li>
           <li style="white-space: nowrap;">
-            <span>有下单时间：</span>
+            <span>下单时间：</span>
             <el-date-picker
-              v-model="postData.startDate"
+              v-model="postData.begindate"
               type="date"
               placeholder="选择起始日期">
             </el-date-picker>
             <span>至</span>
             <el-date-picker
-              v-model="postData.endDate"
+              v-model="postData.enddate"
               type="date"
               placeholder="选择截止日期">
             </el-date-picker>
@@ -61,32 +61,32 @@
       <div class="moreFilter"></div>
     </div>
     <table>
-      <tr v-for="(item,index) in currentList.length*2" :key="index">
+      <tr v-for="(item,index) in goodsOrderList.length*2" :key="index">
         <td v-if="index%2 === 0" colspan="16" class="title">
           <div class="flex-h">
             <div class="flex-item" style="text-align:left;">
-              <span>订单编号：{{returnListItem(currentList, index).OrderNo}}</span>
-              <span>案场：{{returnListItem(currentList, index).CaseName}}</span>
-              <span>用户类型：{{returnListItem(currentList, index).UserType}}</span>
-              <span>下单时间：{{returnListItem(currentList, index).CreatDate}}</span>
+              <span>订单编号：{{returnListItem(goodsOrderList, index).OrdersNo}}</span>
+              <span>案场：{{returnListItem(goodsOrderList, index).CaseName}}</span>
+              <span>用户类型：{{returnListItem(goodsOrderList, index).UserType === 'sales' ? '销售' : returnListItem(goodsOrderList, index).UserType === 'manager' ? '主管' : '用户'}}</span>
+              <span>下单时间：{{toolClass.dateFormat(returnListItem(goodsOrderList, index).CreateDate)}}</span>
             </div>
-            <span>{{returnListItem(currentList, index).Status}}</span>
+            <span>{{returnStatus(returnListItem(goodsOrderList, index).MakeStatus)}}</span>
           </div>
         </td>
         <td v-if="index%2 !== 0" colspan="4" class="noborder">
-          <span v-for="(subItem,subIndex) in returnListItem(currentList, index).OrderDetail" :key="subIndex">{{subItem.GoodsName}}（{{subItem.SpecName}}）</span>
+          <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">{{subItem.GoodsName}}（{{subItem.SpecName}}）</span>
         </td>
         <td v-if="index%2 !== 0" colspan="1" class="noborder">
-          <span v-for="(subItem,subIndex) in returnListItem(currentList, index).OrderDetail" :key="subIndex">x{{subItem.Num}}</span>
+          <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">x{{subItem.Number}}</span>
         </td>
         <td v-if="index%2 !== 0" colspan="1" class="noborder">
-          <span v-for="(subItem,subIndex) in returnListItem(currentList, index).OrderDetail" :key="subIndex">￥{{subItem.Price}}</span>
+          <span v-for="(subItem,subIndex) in returnListItem(goodsOrderList, index).Details" :key="subIndex">￥{{subItem.Price}}</span>
         </td>
         <td v-if="index%2 !== 0" colspan="4">
-          <span>{{returnListItem(currentList, index).AreaName}}{{returnListItem(currentList, index).TableNo}}</span>
+          <span>{{returnListItem(goodsOrderList, index).AreaName}}{{returnListItem(goodsOrderList, index).TableNo}}</span>
         </td>
         <td v-if="index%2 !== 0" colspan="4">
-          <span>{{returnListItem(currentList, index).OrderPlacer}}/{{returnListItem(currentList, index).OrderPlacerPhone}}</span>
+          <span>{{returnListItem(goodsOrderList, index).Name}}/{{returnListItem(goodsOrderList, index).Phone}}</span>
         </td>
         <td v-if="index%2 !== 0" colspan="2">
           <el-button
@@ -106,8 +106,9 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, createNamespacedHelpers } from 'vuex'
 import tableSearch from '@/components/tableSearch/index'
+const { mapState: mapStaState, mapActions: mapStaActions } = createNamespacedHelpers('sta')
 
 export default {
   name: '',
@@ -115,103 +116,43 @@ export default {
     return {
       total: 0,
       postData: { // 表格搜索条件
-        phone: '', // 手机号
         status: '', // 状态
         caseid: '', // 案场id
-        type: '', // 获取方式
-        startDate: '', // 起始日期
-        endDate: '', // 截止日期
-        name: '', // 卡券名称
+        usertype: '', // 用户类型
+        begindate: '', // 起始日期
+        enddate: '', // 截止日期
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
       },
-      currentList: [{
-        OrderNo: '1234567890000',
-        OrderId: '123456',
-        CaseName: '案场名称',
-        CaseId: '123456',
-        UserType: 'manager',
-        CreatDate: '12345678900000',
-        Status: '已完成',
-        AreaName: '区域名称',
-        TableNo: '桌号',
-        OrderPlacer: '下单人',
-        OrderPlacerPhone: '18266666666',
-        OrderDetail: [{
-          GoodsName: '商品名称',
-          SpecName: '商品规格',
-          Num: '1',
-          Price: '30',
-        }, {
-          GoodsName: '商品名称',
-          SpecName: '商品规格',
-          Num: '1',
-          Price: '30',
-        }, {
-          GoodsName: '商品名称',
-          SpecName: '商品规格',
-          Num: '1',
-          Price: '30',
-        }]
+      typeList: [{
+        value: '不限',
+        id: ''
+      }, {
+        value: '销售',
+        id: 'sales'
+      }, {
+        value: '主管',
+        id: 'manager'
       }, {
-        OrderNo: '1234567890000',
-        OrderId: '123456',
-        CaseName: '案场名称',
-        CaseId: '123456',
-        UserType: 'manager',
-        CreatDate: '12345678900000',
-        Status: '已完成',
-        AreaName: '区域名称',
-        TableNo: '桌号',
-        OrderPlacer: '下单人',
-        OrderPlacerPhone: '18266666666',
-        OrderDetail: [{
-          GoodsName: '商品名称',
-          SpecName: '商品规格',
-          Num: '1',
-          Price: '30',
-        }, {
-          GoodsName: '商品名称',
-          SpecName: '商品规格',
-          Num: '1',
-          Price: '30',
-        }, {
-          GoodsName: '商品名称',
-          SpecName: '商品规格',
-          Num: '1',
-          Price: '30',
-        }]
+        value: '用户',
+        id: 'customer'
+      }],
+      statusList: [{
+        value: '不限',
+        id: ''
+      }, {
+        value: '已下单',
+        id: 'not started'
+      }, {
+        value: '制作中',
+        id: 'doing'
+      }, {
+        value: '已完成',
+        id: 'finished'
       }, {
-        OrderNo: '1234567890000',
-        OrderId: '123456',
-        CaseName: '案场名称',
-        CaseId: '123456',
-        UserType: 'manager',
-        CreatDate: '12345678900000',
-        Status: '已完成',
-        AreaName: '区域名称',
-        TableNo: '桌号',
-        OrderPlacer: '下单人',
-        OrderPlacerPhone: '18266666666',
-        OrderDetail: [{
-          GoodsName: '商品名称',
-          SpecName: '商品规格',
-          Num: '1',
-          Price: '30',
-        }, {
-          GoodsName: '商品名称',
-          SpecName: '商品规格',
-          Num: '1',
-          Price: '30',
-        }, {
-          GoodsName: '商品名称',
-          SpecName: '商品规格',
-          Num: '1',
-          Price: '30',
-        }]
+        value: '已取消',
+        id: 'cancel'
       }],
-      typeList: [],
-      statusList: [],
     }
   },
   computed: {
@@ -219,6 +160,9 @@ export default {
       cases: x => x.app.cases.list,
       defaultCaseId: x => x.app.cases.default
     }),
+    ...mapStaState({
+      goodsOrderList: x => x.goodsOrder.list || [],
+    }),
     CaseId: {
       get () {
         return this.postData.caseid || this.defaultCaseId
@@ -233,17 +177,42 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
+      this.getList()
     })
   },
   methods: {
+    ...mapStaActions([
+      'getGoodsOrderList',
+    ]),
+    returnStatus (val) {
+      switch (val) {
+        case 'not started':
+          return '已下单'
+        case 'doing':
+          return '制作中'
+        case 'finished':
+          return '已完成'
+        case 'cancel':
+          return '已取消'
+      }
+    },
     returnListItem (target, index) {
       return target[Math.ceil((index + 1) / 2) - 1]
     },
     search () { // 搜索
-      // 1
+      this.page = 1
+      this.getList()
     },
     handleCurrentChange (val) { // 跳转到分页
-      // this.getList()
+      this.page = val
+      this.getList()
+    },
+    getList () {
+      this.getGoodsOrderList(this.postData).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.postData.page = res.page
+        this.total = res.total
+      })
     },
   }
 }

src/pages/system/dataStatistics/goodsOrderList/page.scss

@@ -11,12 +11,12 @@ table{
       border: none;
     }
     &.title{
-      background: #409EFF;
+      background: #ccc;
       div{
         font-size: 0;
         white-space: nowrap;
         span{
-          color: #fff;
+          color: #333;
           line-height: 40px;
           margin-left: 20px;
         }

src/pages/system/dataStatistics/goodsStatisticsList/index.vue

@@ -5,7 +5,7 @@
         <div class="flex-item flex-h"></div>
         <ul>
           <li>
-            <el-select v-model="CaseId" placeholder="请选择案场">
+            <el-select v-model="postData.caseid" placeholder="请选择案场">
               <el-option
                 v-for="item in cases"
                 :key="item.CaseId"
@@ -15,12 +15,12 @@
             </el-select>
           </li>
           <li>
-            <el-select v-model="postData.type" placeholder="请选择商品分类">
+            <el-select v-model="postData.typeid" placeholder="请选择商品分类">
               <el-option
-                v-for="item in typeList"
-                :key="item.CaseId"
-                :label="item.CaseName"
-                :value="item.CaseId">
+                v-for="item in goodsTypeList"
+                :key="item.TypeId"
+                :label="item.TypeName"
+                :value="item.TypeId">
               </el-option>
             </el-select>
           </li>
@@ -43,7 +43,7 @@
     </div>
     <div class="system-table-box">
       <el-table
-        :data="currentList"
+        :data="goodsList"
         stripe
         style="width: 100%">
         <el-table-column
@@ -51,11 +51,11 @@
           label="所属案场">
         </el-table-column>
         <el-table-column
-          prop="Name"
+          prop="GoodsName"
           label="商品名称">
         </el-table-column>
         <el-table-column
-          prop="Type"
+          prop="TypeName"
           label="商品分类">
         </el-table-column>
         <el-table-column
@@ -63,15 +63,15 @@
           label="价格">
         </el-table-column>
         <el-table-column
-          prop="OrderNum"
+          prop="Total"
           label="下单数">
         </el-table-column>
         <el-table-column
-          prop="OverNum"
+          prop="FinishTotal"
           label="完成数">
         </el-table-column>
         <el-table-column
-          prop="totalPrice"
+          prop="Amount"
           label="总费用">
         </el-table-column>
       </el-table>
@@ -90,7 +90,7 @@
 import { mapState, createNamespacedHelpers } from 'vuex'
 import tableSearch from '@/components/tableSearch/index'
 
-const {mapState: mapStaState, mapActions: mapStaActions} = createNamespacedHelpers('sta')
+const { mapState: mapStaState, mapActions: mapStaActions } = createNamespacedHelpers('sta')
 
 export default {
   name: '',
@@ -99,7 +99,7 @@ export default {
       total: 0,
       postData: { // 表格搜索条件
         caseid: '', // 案场id
-        type: '', // 卡券类型
+        typeid: '', // 卡券类型
         name: '', // 卡券名称
         page: 1, // 当前页码
         pagesize: 10, // 请求数据量
@@ -114,7 +114,8 @@ export default {
       defaultCaseId: x => x.app.cases.default
     }),
     ...mapStaState({
-      goods: x => x.goods,
+      goodsList: x => x.goods.list,
+      goodsTypeList: x => x.goodsType.list,
     }),
     CaseId: {
       get () {
@@ -130,17 +131,34 @@ export default {
   },
   mounted () {
     this.$nextTick(function () {
+      this.getGoodsTypeList({
+        page: 1,
+        pagesize: 10000,
+        caseid: ''
+      }).then((res) => {
+        // console.log(JSON.stringify(res))
+        this.getList()
+      })
     })
   },
   methods: {
     ...mapStaActions([
       'GetGoods',
+      'getGoodsTypeList',
     ]),
     search () { // 搜索
-      // 1
+      this.postData.page = 1
+      this.getList()
     },
     handleCurrentChange (val) { // 跳转到分页
-      // this.getList()
+      this.postData.page = val
+      this.getList()
+    },
+    getList () { // 获取列表
+      this.GetGoods(this.postData).then((res) => {
+        this.postData.page = res.page
+        this.total = res.total
+      })
     },
   }
 }

src/store/cms/index.js

@@ -19,7 +19,7 @@ export default {
           }
         }).then(res => {
           context.commit('init', res)
-          resolve()
+          resolve(res)
         })
       })
     }

src/store/sta/sta.js

@@ -4,11 +4,35 @@ import api from '../../util/api'
 export default {
   namespaced: true,
   state: {
-    goods: [],
+    goods: {},
+    goodsType: {},
+    goodsOrder: {},
+    courseOrder: {},
+    course: {},
+    cardCoupon: {},
+    cardCouponUsedList: {},
   },
   mutations: {
     updateGoods (state, payload) {
-      state.goods = payload || []
+      state.goods = payload || {}
+    },
+    updateGoodsType (state, payload) {
+      state.goodsType = payload || {}
+    },
+    updateGoodsOrder (state, payload) {
+      state.goodsOrder = payload || {}
+    },
+    updateCourseOrder (state, payload) {
+      state.courseOrder = payload || {}
+    },
+    updateCourseList (state, payload) {
+      state.course = payload || {}
+    },
+    updateCardCouponList (state, payload) {
+      state.cardCoupon = payload || {}
+    },
+    updateCardCouponUsedList (state, payload) {
+      state.cardCouponUsedList = payload || {}
     },
   },
   actions: {
@@ -25,5 +49,83 @@ export default {
         }).catch(reject)
       })
     },
+    getGoodsTypeList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.goodsManager.getGoodsTypeList.url, {
+          method: api.goodsManager.getGoodsTypeList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateGoodsType', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getGoodsOrderList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.statistics.goodsOrder.url, {
+          method: api.statistics.goodsOrder.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateGoodsOrder', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getCourseOrderList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.statistics.courseOrder.url, {
+          method: api.statistics.courseOrder.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateCourseOrder', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getCourseList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.statistics.courseList.url, {
+          method: api.statistics.courseList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateCourseList', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getCardCouponList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.statistics.cardCouponList.url, {
+          method: api.statistics.cardCouponList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateCardCouponList', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
+    getCardCouponUsedList ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        ajax(api.statistics.cardCouponUsedList.url, {
+          method: api.statistics.cardCouponUsedList.method,
+          queryData: {
+            ...payload,
+          }
+        }).then(res => {
+          commit('updateCardCouponUsedList', res)
+          resolve(res)
+        }).catch(reject)
+      })
+    },
   }
 }

src/util/api.js

@@ -695,6 +695,26 @@ const $api = {
       method: 'get',
       url: `${baseUrl}${common}/statistics/goods`
     },
+    goodsOrder: {
+      method: 'get',
+      url: `${baseUrl}${common}/statistics/goodsorders`
+    },
+    courseOrder: {
+      method: 'get',
+      url: `${baseUrl}${common}/statistics/courseorders`
+    },
+    courseList: {
+      method: 'get',
+      url: `${baseUrl}${common}/statistics/courses`
+    },
+    cardCouponList: {
+      method: 'get',
+      url: `${baseUrl}${common}/statistics/cardcoupon`
+    },
+    cardCouponUsedList: {
+      method: 'get',
+      url: `${baseUrl}${common}/statistics/cardcouponused`
+    },
   }
 }
 export default $api