bug fixed

src/pages/index/components/product_order.vue

@@ -50,17 +50,33 @@
       <el-tab-pane label="错峰卡订单查询" name="错峰卡订单查询">
         <el-form class="form-wrapper" :inline="true" :model="formInline2" style="margin-bottom: 20px;">
           <el-row>
-            <el-col :span="8">
-              <el-form-item label="订单号: ">
-                <el-input v-model="formInline2.orderNo" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="车牌号: ">
-                <el-input v-model="formInline2.plateNo" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+              <el-col :span="6">
+                <el-form-item label="商品名称:">
+                  <el-input v-model="formInline2.goods_name" placeholder="请输入"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="发布状态:">
+                  <el-select clearable v-model="formInline2.release_status" placeholder="请选择" popper-class="cur-select">
+                    <el-option label="全部" value=""></el-option>
+                    <el-option label="上架" value="1"></el-option>
+                    <el-option label="下架" value="0"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="可购买时间:">
+                  <el-date-picker
+                    v-model="formInline2.time"
+                    type="daterange"
+                    range-separator="至"
+                    value-format="yyyy-MM-dd"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            <el-col :span="4">
               <el-form-item>
                 <el-button type="primary" class="query-btn" @click="onSubmit2" icon="el-icon-search">查询</el-button>
               </el-form-item>
@@ -180,28 +196,36 @@ export default {
       },
       columns2: [
         {
-          label: '订单编号',
-          key: 'orderNo'
+          label: '商品名称',
+          key: 'goods_name'
+        },
+        {
+          label: '所需金额（分）',
+          key: 'reality_price'
         },
         {
-          label: '车牌号',
-          key: 'plateNo'
+          label: '总库存',
+          key: 'goods_total_number'
+        },
+        {
+          label: '剩余库存量',
+          key: 'goods_number'
         },
         {
-          label: '停车场',
-          key: 'parkName'
+          label: '发布状态',
+          key: 'release_status'
         },
         {
-          label: '支付金额',
-          key: 'payAmount'
+          label: '可购买时间',
+          key: 'good_range'
         },
         {
-          label: '支付方式',
-          key: 'payWay'
+          label: '创建时间',
+          key: 'goods_create_time'
         },
         {
-          label: '支付状态',
-          key: 'payStatus'
+          label: '最后修改时间',
+          key: 'goods_update_time'
         },
       ],
       tableData2: [],
@@ -209,8 +233,9 @@ export default {
       pageSize2: 10,
       pageNum2: 1,
       formInline2: {
-        orderNo: '',
-        plateNo:''
+        goods_name: '',
+        release_status:'',
+        time: []
       },
       columns3: [
         {
@@ -314,9 +339,10 @@ export default {
         params.goods_end_time = this.formInline1.time[1].substring(0, 10) + " 23:59:59";
       }
       delete params.time
-      api_z.queryProductOrderParkingByPage({curPage: pageNum1, pageSize: pageSize1, ...this.params}).then(res => {
-        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')}`})) || []
-        this.total1 = res.data.data.total_rows
+      api_z.queryProductOrderParkingByPage({curPage: pageNum1, pageSize: pageSize1, ...params}).then(res => {
+        let arr = res.data.data.goods_list.filter(item => !item.goods_name.includes('错峰卡'))
+        this.tableData1 = arr.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')}`})) || []
+        this.total1 = arr.length
         this.loading1 = false
       })
     },
@@ -326,9 +352,19 @@ export default {
     getTableData2() {
       this.loading2 = true
       const {pageNum2, pageSize2} = this
-      api_z.queryProductOrderUnpeakByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
-        this.tableData2 = res.data.records || []
-        this.total2 = res.data.total
+      let params = {...this.formInline2}
+      if (
+        this.formInline2.time && this.formInline2.time.length === 2 &&
+        this.formInline2.time[1] !== ""
+      ) {
+        params.goods_start_time = this.formInline2.time[0].substring(0, 10) + " 00:00:00";
+        params.goods_end_time = this.formInline2.time[1].substring(0, 10) + " 23:59:59";
+      }
+      delete params.time
+      api_z.queryProductOrderUnpeakByPage({curPage: pageNum2, size: pageSize2, ...params}).then(res => {
+        let arr = res.data.data.goods_list.filter(item => item.goods_name.includes('错峰卡'))
+        this.tableData2 = arr.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')}`})) || []
+        this.total2 = data.length
         this.loading2 = false
       })
     },