Browse Source

no message

duwendi 1 year ago
parent
commit
2437276dee
3 changed files with 63 additions and 22 deletions
  1. 2 1
      package.json
  2. 1 1
      src/api/article_z.js
  3. 60 20
      src/pages/index/components/product_order.vue

+ 2 - 1
package.json

@@ -15,12 +15,13 @@
15
     "@wangeditor/editor-for-vue": "^1.0.2",
15
     "@wangeditor/editor-for-vue": "^1.0.2",
16
     "apexcharts": "^3.45.2",
16
     "apexcharts": "^3.45.2",
17
     "axios": "1.4.0",
17
     "axios": "1.4.0",
18
-    "element-ui": "^2.15.12",
19
     "babel-runtime": "^6.26.0",
18
     "babel-runtime": "^6.26.0",
20
     "echarts": "^4.9.0",
19
     "echarts": "^4.9.0",
21
     "echarts-gl": "^1.1.1",
20
     "echarts-gl": "^1.1.1",
22
     "echarts-liquidfill": "^2.0.5",
21
     "echarts-liquidfill": "^2.0.5",
22
+    "element-ui": "^2.15.12",
23
     "js-cookie": "^3.0.1",
23
     "js-cookie": "^3.0.1",
24
+    "moment": "^2.30.1",
24
     "vue": "^2.5.2",
25
     "vue": "^2.5.2",
25
     "vue-apexcharts": "^1.6.2",
26
     "vue-apexcharts": "^1.6.2",
26
     "vue-router": "^3.0.1",
27
     "vue-router": "^3.0.1",

+ 1 - 1
src/api/article_z.js

@@ -306,7 +306,7 @@ export default {
306
   },
306
   },
307
   // 商品订单查询——获取停车卡订单分页
307
   // 商品订单查询——获取停车卡订单分页
308
   queryProductOrderParkingByPage(params) {
308
   queryProductOrderParkingByPage(params) {
309
-    return axios.get(`/opt/product/order/parking/page`, {params})
309
+    return axios1.post('/reformer-blessing-b/card-mall-system/mall/queryList', params)
310
   },
310
   },
311
   // 商品订单查询——获取错峰订单分页
311
   // 商品订单查询——获取错峰订单分页
312
   queryProductOrderUnpeakByPage(params) {
312
   queryProductOrderUnpeakByPage(params) {

+ 60 - 20
src/pages/index/components/product_order.vue

@@ -4,12 +4,33 @@
4
       <el-tab-pane label="停车卡订单查询" name="停车卡订单查询">
4
       <el-tab-pane label="停车卡订单查询" name="停车卡订单查询">
5
         <el-form class="form-wrapper" :inline="true" :model="formInline1" style="margin-bottom: 20px;">
5
         <el-form class="form-wrapper" :inline="true" :model="formInline1" style="margin-bottom: 20px;">
6
           <el-row>
6
           <el-row>
7
-            <el-col :span="8">
8
-              <el-form-item label="订单号:">
9
-                <el-input v-model="formInline1.orderNo" placeholder="请输入"></el-input>
7
+            <el-col :span="6">
8
+              <el-form-item label="商品名称:">
9
+                <el-input v-model="formInline1.goods_name" placeholder="请输入"></el-input>
10
+              </el-form-item>
11
+            </el-col>
12
+            <el-col :span="6">
13
+              <el-form-item label="发布状态:">
14
+                <el-select clearable v-model="formInline1.release_status" placeholder="请选择" popper-class="cur-select">
15
+                  <el-option label="全部" value=""></el-option>
16
+                  <el-option label="上架" value="1"></el-option>
17
+                  <el-option label="下架" value="0"></el-option>
18
+                </el-select>
10
               </el-form-item>
19
               </el-form-item>
11
             </el-col>
20
             </el-col>
12
             <el-col :span="8">
21
             <el-col :span="8">
22
+              <el-form-item label="可购买时间:">
23
+                <el-date-picker
24
+                  v-model="formInline1.time"
25
+                  type="daterange"
26
+                  range-separator="至"
27
+                  value-format="yyyy-MM-dd"
28
+                  start-placeholder="开始日期"
29
+                  end-placeholder="结束日期">
30
+                </el-date-picker>
31
+              </el-form-item>
32
+            </el-col>
33
+            <el-col :span="4">
13
               <el-form-item>
34
               <el-form-item>
14
                 <el-button type="primary" class="query-btn" @click="onSubmit1" icon="el-icon-search">查询</el-button>
35
                 <el-button type="primary" class="query-btn" @click="onSubmit1" icon="el-icon-search">查询</el-button>
15
               </el-form-item>
36
               </el-form-item>
@@ -93,6 +114,7 @@
93
 import api from "@/api/audit.js";
114
 import api from "@/api/audit.js";
94
 import dictionary from "@/util/dictionary";
115
 import dictionary from "@/util/dictionary";
95
 import api_z from "@/api/article_z.js";
116
 import api_z from "@/api/article_z.js";
117
+import moment from 'moment'
96
 
118
 
97
 export default {
119
 export default {
98
   components: {},
120
   components: {},
@@ -104,28 +126,36 @@ export default {
104
       activeName: '停车卡订单查询',
126
       activeName: '停车卡订单查询',
105
       columns1: [
127
       columns1: [
106
         {
128
         {
107
-          label: '订单号',
108
-          key: 'orderNo'
129
+          label: '商品名称',
130
+          key: 'goods_name'
109
         },
131
         },
110
         {
132
         {
111
-          label: '下单时间',
112
-          key: 'createTime'
133
+          label: '所需金额(分)',
134
+          key: 'reality_price'
113
         },
135
         },
114
         {
136
         {
115
-          label: '支付金额',
116
-          key: 'payAmount'
137
+          label: '总库存',
138
+          key: 'goods_total_number'
117
         },
139
         },
118
         {
140
         {
119
-          label: '支付方式',
120
-          key: 'payWay'
141
+          label: '剩余库存量',
142
+          key: 'goods_number'
121
         },
143
         },
122
         {
144
         {
123
-          label: '车牌号',
124
-          key: 'plateNo'
145
+          label: '发布状态',
146
+          key: 'release_status'
125
         },
147
         },
126
         {
148
         {
127
-          label: '支付状态',
128
-          key: 'orderStatus'
149
+          label: '可购买时间',
150
+          key: 'good_range'
151
+        },
152
+        {
153
+          label: '创建时间',
154
+          key: 'goods_create_time'
155
+        },
156
+        {
157
+          label: '最后修改时间',
158
+          key: 'goods_update_time'
129
         },
159
         },
130
       ],
160
       ],
131
       tableData1: [],
161
       tableData1: [],
@@ -133,8 +163,9 @@ export default {
133
       pageSize1: 10,
163
       pageSize1: 10,
134
       pageNum1: 1,
164
       pageNum1: 1,
135
       formInline1: {
165
       formInline1: {
136
-        orderNo: '',
137
-        time:''
166
+        goods_name: '',
167
+        release_status:'',
168
+        time: []
138
       },
169
       },
139
       columns2: [
170
       columns2: [
140
         {
171
         {
@@ -245,9 +276,18 @@ export default {
245
     getTableData1() {
276
     getTableData1() {
246
       this.loading1 = true
277
       this.loading1 = true
247
       const {pageNum1, pageSize1} = this
278
       const {pageNum1, pageSize1} = this
248
-      api_z.queryProductOrderParkingByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
249
-        this.tableData1 = res.data.records || []
250
-        this.total1 = res.data.total
279
+      let params = {...this.formInline1}
280
+      if (
281
+        this.formInline1.time && this.formInline1.time.length === 2 &&
282
+        this.formInline1.time[1] !== ""
283
+      ) {
284
+        params.goods_start_time = this.formInline1.time[0].substring(0, 10) + " 00:00:00";
285
+        params.goods_end_time = this.formInline1.time[1].substring(0, 10) + " 23:59:59";
286
+      }
287
+      delete params.time
288
+      api_z.queryProductOrderParkingByPage({curPage: pageNum1, pageSize: pageSize1, ...this.params}).then(res => {
289
+        this.tableData1 = res.data.data.goods_list.map(item => ({...item, release_status: item.release_status === '1' ? '上架' : '下架', good_range: `${moment(item.goods_start_time).format('YYYY-MM-DD')}~${moment(item.goods_end_time).format('YYYY-MM-DD')}`})) || []
290
+        this.total1 = res.data.data.total_rows
251
         this.loading1 = false
291
         this.loading1 = false
252
       })
292
       })
253
     },
293
     },