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

+ 16
- 24
src/pages/system/dataStatistics/courseOrderList/index.vue 查看文件

@@ -62,21 +62,29 @@
62 62
         :data="currentList"
63 63
         stripe
64 64
         style="width: 100%">
65
+        <el-table-column
66
+          prop="OrderNo"
67
+          label="订单编号">
68
+        </el-table-column>
69
+        <el-table-column
70
+          prop="Name"
71
+          label="课程名称">
72
+        </el-table-column>
65 73
         <el-table-column
66 74
           prop="CaseName"
67 75
           label="所属案场">
68 76
         </el-table-column>
69 77
         <el-table-column
70
-          prop="Name"
71
-          label="卡券名称">
78
+          prop="Type"
79
+          label="课程类别">
72 80
         </el-table-column>
73 81
         <el-table-column
74
-          prop="GoodsList"
75
-          label="使用商品">
82
+          prop="Date"
83
+          label="课程时间">
76 84
         </el-table-column>
77 85
         <el-table-column
78
-          prop="GetType"
79
-          label="获取方式">
86
+          prop="UserName"
87
+          label="用户姓名">
80 88
         </el-table-column>
81 89
         <el-table-column
82 90
           prop="NickName"
@@ -87,24 +95,8 @@
87 95
           label="手机号">
88 96
         </el-table-column>
89 97
         <el-table-column
90
-          prop="SalerName"
91
-          label="销售">
92
-        </el-table-column>
93
-        <el-table-column
94
-          prop="EndDate"
95
-          label="有效期">
96
-        </el-table-column>
97
-        <el-table-column
98
-          prop="GetDate"
99
-          label="获取时间">
100
-        </el-table-column>
101
-        <el-table-column
102
-          prop="CheckDate"
103
-          label="核销时间">
104
-        </el-table-column>
105
-        <el-table-column
106
-          prop="Status"
107
-          label="状态">
98
+          prop="CreatDate"
99
+          label="下单时间">
108 100
         </el-table-column>
109 101
       </el-table>
110 102
     </div>

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

@@ -60,57 +60,41 @@
60 60
       </div>
61 61
       <div class="moreFilter"></div>
62 62
     </div>
63
-    <div class="system-table-box">
64
-      <el-table
65
-        :data="currentList"
66
-        stripe
67
-        style="width: 100%">
68
-        <el-table-column
69
-          prop="CaseName"
70
-          label="所属案场">
71
-        </el-table-column>
72
-        <el-table-column
73
-          prop="Name"
74
-          label="卡券名称">
75
-        </el-table-column>
76
-        <el-table-column
77
-          prop="GoodsList"
78
-          label="使用商品">
79
-        </el-table-column>
80
-        <el-table-column
81
-          prop="GetType"
82
-          label="获取方式">
83
-        </el-table-column>
84
-        <el-table-column
85
-          prop="NickName"
86
-          label="微信昵称">
87
-        </el-table-column>
88
-        <el-table-column
89
-          prop="Phone"
90
-          label="手机号">
91
-        </el-table-column>
92
-        <el-table-column
93
-          prop="SalerName"
94
-          label="销售">
95
-        </el-table-column>
96
-        <el-table-column
97
-          prop="EndDate"
98
-          label="有效期">
99
-        </el-table-column>
100
-        <el-table-column
101
-          prop="GetDate"
102
-          label="获取时间">
103
-        </el-table-column>
104
-        <el-table-column
105
-          prop="CheckDate"
106
-          label="核销时间">
107
-        </el-table-column>
108
-        <el-table-column
109
-          prop="Status"
110
-          label="状态">
111
-        </el-table-column>
112
-      </el-table>
113
-    </div>
63
+    <table>
64
+      <tr v-for="(item,index) in currentList.length*2" :key="index">
65
+        <td v-if="index%2 === 0" colspan="16" class="title">
66
+          <div class="flex-h">
67
+            <div class="flex-item" style="text-align:left;">
68
+              <span>订单编号:{{returnListItem(currentList, index).OrderNo}}</span>
69
+              <span>案场:{{returnListItem(currentList, index).CaseName}}</span>
70
+              <span>用户类型:{{returnListItem(currentList, index).UserType}}</span>
71
+              <span>下单时间:{{returnListItem(currentList, index).CreatDate}}</span>
72
+            </div>
73
+            <span>{{returnListItem(currentList, index).Status}}</span>
74
+          </div>
75
+        </td>
76
+        <td v-if="index%2 !== 0" colspan="4" class="noborder">
77
+          <span v-for="(subItem,subIndex) in returnListItem(currentList, index).OrderDetail" :key="subIndex">{{subItem.GoodsName}}({{subItem.SpecName}})</span>
78
+        </td>
79
+        <td v-if="index%2 !== 0" colspan="1" class="noborder">
80
+          <span v-for="(subItem,subIndex) in returnListItem(currentList, index).OrderDetail" :key="subIndex">x{{subItem.Num}}</span>
81
+        </td>
82
+        <td v-if="index%2 !== 0" colspan="1" class="noborder">
83
+          <span v-for="(subItem,subIndex) in returnListItem(currentList, index).OrderDetail" :key="subIndex">¥{{subItem.Price}}</span>
84
+        </td>
85
+        <td v-if="index%2 !== 0" colspan="4">
86
+          <span>{{returnListItem(currentList, index).AreaName}}{{returnListItem(currentList, index).TableNo}}</span>
87
+        </td>
88
+        <td v-if="index%2 !== 0" colspan="4">
89
+          <span>{{returnListItem(currentList, index).OrderPlacer}}/{{returnListItem(currentList, index).OrderPlacerPhone}}</span>
90
+        </td>
91
+        <td v-if="index%2 !== 0" colspan="2">
92
+          <el-button
93
+          size="mini"
94
+          type="success">重打</el-button>
95
+        </td>
96
+      </tr>
97
+    </table>
114 98
     <el-pagination
115 99
       @current-change="handleCurrentChange"
116 100
       :current-page.sync="postData.page"
@@ -141,7 +125,91 @@ export default {
141 125
         page: 1, // 当前页码
142 126
         pagesize: 10, // 请求数据量
143 127
       },
144
-      currentList: [],
128
+      currentList: [{
129
+        OrderNo: '1234567890000',
130
+        OrderId: '123456',
131
+        CaseName: '案场名称',
132
+        CaseId: '123456',
133
+        UserType: 'manager',
134
+        CreatDate: '12345678900000',
135
+        Status: '已完成',
136
+        AreaName: '区域名称',
137
+        TableNo: '桌号',
138
+        OrderPlacer: '下单人',
139
+        OrderPlacerPhone: '18266666666',
140
+        OrderDetail: [{
141
+          GoodsName: '商品名称',
142
+          SpecName: '商品规格',
143
+          Num: '1',
144
+          Price: '30',
145
+        }, {
146
+          GoodsName: '商品名称',
147
+          SpecName: '商品规格',
148
+          Num: '1',
149
+          Price: '30',
150
+        }, {
151
+          GoodsName: '商品名称',
152
+          SpecName: '商品规格',
153
+          Num: '1',
154
+          Price: '30',
155
+        }]
156
+      }, {
157
+        OrderNo: '1234567890000',
158
+        OrderId: '123456',
159
+        CaseName: '案场名称',
160
+        CaseId: '123456',
161
+        UserType: 'manager',
162
+        CreatDate: '12345678900000',
163
+        Status: '已完成',
164
+        AreaName: '区域名称',
165
+        TableNo: '桌号',
166
+        OrderPlacer: '下单人',
167
+        OrderPlacerPhone: '18266666666',
168
+        OrderDetail: [{
169
+          GoodsName: '商品名称',
170
+          SpecName: '商品规格',
171
+          Num: '1',
172
+          Price: '30',
173
+        }, {
174
+          GoodsName: '商品名称',
175
+          SpecName: '商品规格',
176
+          Num: '1',
177
+          Price: '30',
178
+        }, {
179
+          GoodsName: '商品名称',
180
+          SpecName: '商品规格',
181
+          Num: '1',
182
+          Price: '30',
183
+        }]
184
+      }, {
185
+        OrderNo: '1234567890000',
186
+        OrderId: '123456',
187
+        CaseName: '案场名称',
188
+        CaseId: '123456',
189
+        UserType: 'manager',
190
+        CreatDate: '12345678900000',
191
+        Status: '已完成',
192
+        AreaName: '区域名称',
193
+        TableNo: '桌号',
194
+        OrderPlacer: '下单人',
195
+        OrderPlacerPhone: '18266666666',
196
+        OrderDetail: [{
197
+          GoodsName: '商品名称',
198
+          SpecName: '商品规格',
199
+          Num: '1',
200
+          Price: '30',
201
+        }, {
202
+          GoodsName: '商品名称',
203
+          SpecName: '商品规格',
204
+          Num: '1',
205
+          Price: '30',
206
+        }, {
207
+          GoodsName: '商品名称',
208
+          SpecName: '商品规格',
209
+          Num: '1',
210
+          Price: '30',
211
+        }]
212
+      }],
145 213
       typeList: [],
146 214
       statusList: [],
147 215
     }
@@ -168,6 +236,9 @@ export default {
168 236
     })
169 237
   },
170 238
   methods: {
239
+    returnListItem (target, index) {
240
+      return target[Math.ceil((index + 1) / 2) - 1]
241
+    },
171 242
     search () { // 搜索
172 243
       // 1
173 244
     },
@@ -181,8 +252,8 @@ export default {
181 252
 <!-- Add "scoped" attribute to limit CSS to this component only -->
182 253
 <style lang="scss" scoped>
183 254
 @import "page.scss";
184
-.searchFilterLine{
185
-  >li{
255
+.searchFilterLine {
256
+  > li {
186 257
     margin-bottom: 20px;
187 258
   }
188 259
 }

+ 42
- 0
src/pages/system/dataStatistics/goodsOrderList/page.scss 查看文件

@@ -1,4 +1,46 @@
1 1
 
2
+table{
3
+  width: calc(100% - 40px);
4
+  border: 1px solid #eee;
5
+  margin: 20px auto 0;
6
+  border-collapse: collapse;
7
+  td{
8
+    border: 1px solid #eee;
9
+    text-align: center;
10
+    &.noborder{
11
+      border: none;
12
+    }
13
+    &.title{
14
+      background: #409EFF;
15
+      div{
16
+        font-size: 0;
17
+        white-space: nowrap;
18
+        span{
19
+          color: #fff;
20
+          line-height: 40px;
21
+          margin-left: 20px;
22
+        }
23
+      }
24
+      >div{
25
+        >span{
26
+          font-weight: bolder;
27
+          margin-right: 20px;
28
+        }
29
+      }
30
+    }
31
+    >span{
32
+      width: 100%;
33
+      display: block;
34
+      text-align: center;
35
+      line-height: 40px;
36
+      border-top: 1px solid #eee;
37
+      &:nth-child(1){
38
+        border-top: none;
39
+      }
40
+    }
41
+  }
42
+}
43
+
2 44
 
3 45
 
4 46