Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-01-29 ac61bdd7a7f4834d35bf42a06bc766981f50211e

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html

@@ -98,7 +98,7 @@

    <el-row class="table-style"  >

        <el-table id="proj" :data="table.rows"  :height="height" stripe>
        <el-table id="proj" :data="table.rows"  :height="height" stripe @sort-change="sortChange">
            <el-table-column
                    prop="orderNo"
                    label="订单号"
@@ -112,16 +112,19 @@
            </el-table-column>
            <el-table-column
                    prop="createTime"
                    sortable="custom"
                    label="交易时间"
                    show-overflow-tooltip
                    width="180">
            </el-table-column>
            <el-table-column
                    prop="flowType"
                    sortable="custom"
                    label="交易类型">
            </el-table-column>
            <el-table-column
                    prop="amount"
                    sortable="custom"
                    label="交易金额">
            </el-table-column>
            <el-table-column
@@ -130,6 +133,7 @@
            </el-table-column>
            <el-table-column
                    prop="payMethod"
                    sortable="custom"
                    label="支付方式">
            </el-table-column>
            <el-table-column
@@ -191,6 +195,8 @@
                orderNo:'',
                oprationMan:'',
                queryKey:'',
                order:'',
                sort:''
            },
            height:'calc(100vh - 240px)',
            flowTypeList:[
@@ -226,6 +232,17 @@
            resetForm(formName) {
                this.$refs[formName].resetFields();
            },
            sortChange:function (column){
                if(column.order){
                    if(column.order.indexOf("desc")){
                        this.form.order="desc";
                    }else{
                        this.form.order="asc";
                    }
                    this.form.sort=column.prop;
                    this.loadData();
                }
            },
            loadData:function(){
                let _this = this;
                let data=_this.getRequestParam();
@@ -240,6 +257,22 @@
                        _this.table.total=data.total;
                    }
                });
            },
            getRequestParam(){
                let _this = this;
                return   {
                    name:_this.form.name,
                    payMethod:_this.form.payMethod,
                    flowType:_this.form.flowType,
                    orderNo:_this.form.orderNo,
                    oprationMan:_this.form.oprationMan,
                    queryKey:_this.form.queryKey,
                    startTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[0]).format("YYYY-MM-DD HH:mm"):'',
                    endTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[1]).format("YYYY-MM-DD HH:mm"):'',
                    shopId:_this.form.shopId,
                    order:_this.form.order,
                    sort:_this.form.sort,
                }
            },
            search:function(){
                this.table.currentPage=1;
@@ -258,19 +291,6 @@
                    maxmin : true,
                    content : [ basePath + '/admin/order/orderItem?id=' + row.orderId ]
                }));
            },
            getRequestParam(){
                let _this = this;
                return   {
                    name:_this.form.name,
                    payMethod:_this.form.payMethod,
                    flowType:_this.form.flowType,
                    orderNo:_this.form.orderNo,
                    oprationMan:_this.form.oprationMan,
                    queryKey:_this.form.queryKey,
                    startTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[0]).format("YYYY-MM-DD HH:mm"):'',
                    endTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[1]).format("YYYY-MM-DD HH:mm"):'',
                }
            },
            //导出
          exportExcel(){