许成详 6 年之前
父節點
當前提交
0749028572

+ 1
- 0
src/pages/system/cardAndCouponManager/couponManager/edit.vue 查看文件

492
     },
492
     },
493
     sureAddItem () { // 确定添加指定商品
493
     sureAddItem () { // 确定添加指定商品
494
       var bool = true
494
       var bool = true
495
+      this.couponInfo.Targets = this.couponInfo.Targets || []
495
       if (this.couponInfo.CouponType === 'goods') {
496
       if (this.couponInfo.CouponType === 'goods') {
496
         for (var n = 0; n < this.currentSelectArr.length; n++) {
497
         for (var n = 0; n < this.currentSelectArr.length; n++) {
497
           if (this.couponInfo.Targets.length) {
498
           if (this.couponInfo.Targets.length) {

+ 14
- 8
src/pages/system/dashboard/index.vue 查看文件

94
     }),
94
     }),
95
     CaseId: {
95
     CaseId: {
96
       get () {
96
       get () {
97
-        return this.postData.caseid || this.defaultCaseId
97
+        return this.postData.caseid || this.defaultCaseId || this.cases[0].CaseId
98
       },
98
       },
99
       set (val) {
99
       set (val) {
100
         this.postData.caseid = val
100
         this.postData.caseid = val
101
       }
101
       }
102
     }
102
     }
103
   },
103
   },
104
-  mounted () {
105
-    this.$nextTick(function () {
106
-      this.getDashboardData({
107
-        caseid: this.postData.caseid
108
-      }).then((res) => {
109
-        console.log(JSON.stringify(res))
110
-      })
104
+  created () {
105
+    this.postData.caseid = this.postData.caseid || this.cases[0].CaseId
106
+    this.getDashboardData({
107
+      caseid: this.postData.caseid
108
+    }).then((res) => {
109
+      console.log(JSON.stringify(res))
110
+    })
111
+    this.getDashboardBottomData({
112
+      caseid: this.postData.caseid,
113
+      statype: 'week'
114
+    }).then((res) => {
115
+      console.log(JSON.stringify(res))
111
     })
116
     })
112
   },
117
   },
113
   methods: {
118
   methods: {
114
     ...mapStaActions([
119
     ...mapStaActions([
115
       'getDashboardData',
120
       'getDashboardData',
121
+      'getDashboardBottomData',
116
     ]),
122
     ]),
117
   }
123
   }
118
 }
124
 }

+ 2
- 2
src/pages/system/dataStatistics/cardCouponUsedList/index.vue 查看文件

176
       },
176
       },
177
       currentList: [],
177
       currentList: [],
178
       typeList: [{
178
       typeList: [{
179
-        value: '不限',
179
+        value: '',
180
         id: ''
180
         id: ''
181
       }, {
181
       }, {
182
         value: '案场',
182
         value: '案场',
192
         id: 'give'
192
         id: 'give'
193
       }],
193
       }],
194
       statusList: [{
194
       statusList: [{
195
-        value: '不限',
195
+        value: '',
196
         id: ''
196
         id: ''
197
       }, {
197
       }, {
198
         value: '未使用',
198
         value: '未使用',

+ 1
- 1
src/pages/system/dataStatistics/courseVerifyList/index.vue 查看文件

139
         pagesize: 10, // 请求数据量
139
         pagesize: 10, // 请求数据量
140
       },
140
       },
141
       statusList: [{
141
       statusList: [{
142
-        value: '不限',
142
+        value: '',
143
         id: ''
143
         id: ''
144
       }, {
144
       }, {
145
         value: '未使用',
145
         value: '未使用',

+ 2
- 2
src/pages/system/dataStatistics/goodsOrderList/index.vue 查看文件

148
         pagesize: 10, // 请求数据量
148
         pagesize: 10, // 请求数据量
149
       },
149
       },
150
       typeList: [{
150
       typeList: [{
151
-        value: '不限',
151
+        value: '',
152
         id: ''
152
         id: ''
153
       }, {
153
       }, {
154
         value: '销售',
154
         value: '销售',
161
         id: 'customer'
161
         id: 'customer'
162
       }],
162
       }],
163
       statusList: [{
163
       statusList: [{
164
-        value: '不限',
164
+        value: '',
165
         id: ''
165
         id: ''
166
       }, {
166
       }, {
167
         value: '已下单',
167
         value: '已下单',

+ 5
- 0
src/pages/system/verificationManager/drawVerification/index.vue 查看文件

79
           this.centerDialogVisible = false
79
           this.centerDialogVisible = false
80
           this.verificationCode = ''
80
           this.verificationCode = ''
81
         })
81
         })
82
+      } else {
83
+        this.$message({
84
+          message: '核销码为空!',
85
+          type: 'error'
86
+        })
82
       }
87
       }
83
     },
88
     },
84
     toVerificationList () { // 定向到核销列表
89
     toVerificationList () { // 定向到核销列表

+ 8
- 1
src/pages/system/verificationManager/phoneVerification/index.vue 查看文件

31
   },
31
   },
32
   methods: {
32
   methods: {
33
     toVerificationList () { // 前往核销列表
33
     toVerificationList () { // 前往核销列表
34
-      this.$router.push({name: 'phoneVerificationList', query: {tel: this.phone}})
34
+      if (this.phone !== '') {
35
+        this.$router.push({name: 'phoneVerificationList', query: {tel: this.phone}})
36
+      } else {
37
+        this.$message({
38
+          message: '手机号为空!',
39
+          type: 'error'
40
+        })
41
+      }
35
     },
42
     },
36
   }
43
   }
37
 }
44
 }

+ 14
- 6
src/pages/system/verificationManager/phoneVerification/verificationList/index.vue 查看文件

6
           <div class="flex-item">
6
           <div class="flex-item">
7
             <div class="userInfo">
7
             <div class="userInfo">
8
               <span>用户名:</span>
8
               <span>用户名:</span>
9
-              <b>{{(courses.customerInfo || {}).Name || (courses.customerInfo || {}).CustomerName }}</b>
9
+              <b>{{customerName}}</b>
10
               <span>手机号:</span>
10
               <span>手机号:</span>
11
-              <b>{{(courses.customerInfo || {}).Phone}}</b>
11
+              <b>{{phone}}</b>
12
             </div>
12
             </div>
13
           </div>
13
           </div>
14
           <el-button
14
           <el-button
86
   name: '',
86
   name: '',
87
   data () {
87
   data () {
88
     return {
88
     return {
89
+      customerName: '',
90
+      phone: this.$route.query.tel,
89
       code: '',
91
       code: '',
90
       tel: '',
92
       tel: '',
91
       page: 1,
93
       page: 1,
93
     }
95
     }
94
   },
96
   },
95
   mounted () {
97
   mounted () {
96
-    const { code, tel } = this.$route.query
97
-    this.code = code
98
-    this.tel = tel
99
     this.$nextTick(function () {
98
     this.$nextTick(function () {
100
-      this.getList()
99
+      this.getCustomerName({
100
+        id: this.phone
101
+      }).then((res) => {
102
+        console.log(res)
103
+        const { code, tel } = this.$route.query
104
+        this.code = code
105
+        this.tel = tel
106
+        this.getList()
107
+      })
101
     })
108
     })
102
   },
109
   },
103
   computed: {
110
   computed: {
110
       'GetCourseVerList',
117
       'GetCourseVerList',
111
       'CourseVerifs',
118
       'CourseVerifs',
112
       'GetCourseVerListByTel',
119
       'GetCourseVerListByTel',
120
+      'getCustomerName'
113
     ]),
121
     ]),
114
     check (item) { // 核销
122
     check (item) { // 核销
115
       this.$confirm('确认核销此课程?', '提示', {
123
       this.$confirm('确认核销此课程?', '提示', {

+ 8
- 1
src/pages/system/verificationManager/qrcodeVerification/index.vue 查看文件

62
   },
62
   },
63
   methods: {
63
   methods: {
64
     toVerificationList () { // 定向到核销列表
64
     toVerificationList () { // 定向到核销列表
65
-      this.$router.push({name: 'qrcodeVerificationList', query: {code: this.verificationCode}})
65
+      if (this.verificationCode !== '') {
66
+        this.$router.push({ name: 'qrcodeVerificationList', query: { code: this.verificationCode } })
67
+      } else {
68
+        this.$message({
69
+          message: '核销码为空!',
70
+          type: 'error'
71
+        })
72
+      }
66
     },
73
     },
67
   }
74
   }
68
 }
75
 }

+ 1
- 1
src/store/case/index.js 查看文件

12
       label: '案场3'
12
       label: '案场3'
13
     }, {
13
     }, {
14
       value: '',
14
       value: '',
15
-      label: '不限'
15
+      label: ''
16
     }],
16
     }],
17
   },
17
   },
18
   mutations: {},
18
   mutations: {},

+ 14
- 2
src/store/sta/sta.js 查看文件

158
     },
158
     },
159
     getDashboardData ({ commit }, payload) {
159
     getDashboardData ({ commit }, payload) {
160
       return new Promise((resolve, reject) => {
160
       return new Promise((resolve, reject) => {
161
-        ajax(api.statistics.dashboardData.url, {
162
-          method: api.statistics.dashboardData.method,
161
+        ajax(api.dashboard.dashboardData.url, {
162
+          method: api.dashboard.dashboardData.method,
163
+          queryData: {
164
+            ...payload,
165
+          }
166
+        }).then(res => {
167
+          resolve(res)
168
+        }).catch(reject)
169
+      })
170
+    },
171
+    getDashboardBottomData ({ commit }, payload) {
172
+      return new Promise((resolve, reject) => {
173
+        ajax(api.dashboard.dashboardBottomData.url, {
174
+          method: api.dashboard.dashboardBottomData.method,
163
           queryData: {
175
           queryData: {
164
             ...payload,
176
             ...payload,
165
           }
177
           }

+ 12
- 0
src/store/verification/verification.js 查看文件

74
         }).catch(reject)
74
         }).catch(reject)
75
       })
75
       })
76
     },
76
     },
77
+    getCustomerName ({ commit }, { id }) {
78
+      return new Promise((resolve, reject) => {
79
+        ajax(api.verification.getCustomerName.url, {
80
+          method: api.verification.getCustomerName.method,
81
+          urlData: {
82
+            id,
83
+          }
84
+        }).then(res => {
85
+          resolve(res)
86
+        }).catch(reject)
87
+      })
88
+    },
77
   },
89
   },
78
 }
90
 }

+ 4
- 0
src/style/main.css 查看文件

395
   height: 100%;
395
   height: 100%;
396
 }
396
 }
397
 
397
 
398
+.el-table th>.cell,
399
+.el-table .cell{
400
+  text-overflow: initial !important;
401
+}
398
 
402
 
399
 
403
 
400
 
404
 

+ 13
- 3
src/util/api.js 查看文件

553
       method: 'get',
553
       method: 'get',
554
       url: `${baseUrl}${common}/luckdrawlist/verify/:id`
554
       url: `${baseUrl}${common}/luckdrawlist/verify/:id`
555
     },
555
     },
556
+    getCustomerName: {
557
+      method: 'get',
558
+      url: `${baseUrl}${common}/customer/tel/:id`
559
+    },
556
   },
560
   },
557
   goodsOrder: {
561
   goodsOrder: {
558
     getOnlineOrder: {
562
     getOnlineOrder: {
760
       url: `${baseUrl}${common}/statistics/cardcouponverify/excel`
764
       url: `${baseUrl}${common}/statistics/cardcouponverify/excel`
761
     },
765
     },
762
   },
766
   },
763
-  dashboardData: {
764
-    method: 'get',
765
-    url: `${baseUrl}${common}/dashboard`
767
+  dashboard: {
768
+    dashboardData: {
769
+      method: 'get',
770
+      url: `${baseUrl}${common}/dashboard`
771
+    },
772
+    dashboardBottomData: {
773
+      method: 'get',
774
+      url: `${baseUrl}${common}/dashboard/charts`
775
+    },
766
   },
776
   },
767
   health: {
777
   health: {
768
     healthList: {
778
     healthList: {