更新
This commit is contained in:
weipengfei
parent
17a720aac8
commit
cee96dbf02
@ -35,6 +35,13 @@ export function chartApi() {
|
||||
return request.get('order/chart')
|
||||
}
|
||||
|
||||
/**
|
||||
* @description 订单 -- 表头
|
||||
*/
|
||||
export function chartOtherApi() {
|
||||
return request.get('order_other/chart')
|
||||
}
|
||||
|
||||
/**
|
||||
* @description 订单 -- 卡片
|
||||
*/
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<div slot="header" class="clearfix">
|
||||
<div class="container">
|
||||
<el-form size="small" inline label-width="100px">
|
||||
<!-- <el-form-item label="订单状态：">
|
||||
<el-form-item label="订单状态：">
|
||||
<el-radio-group v-model="tableFrom.status" type="button" @change="getList(1),getCardList()">
|
||||
<el-radio-button label="">全部 {{ '(' +orderChartType.all?orderChartType.all:0 + ')' }}</el-radio-button>
|
||||
<el-radio-button
|
||||
@ -29,7 +29,7 @@
|
||||
label="7"
|
||||
>已删除 {{ '(' +orderChartType.del?orderChartType.del:0+ ')' }}</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item> -->
|
||||
</el-form-item>
|
||||
<el-form-item label="时间选择：" class="width100">
|
||||
<el-radio-group
|
||||
v-model="tableFrom.date"
|
||||
@ -135,7 +135,8 @@
|
||||
<el-button slot="append" icon="el-icon-search" size="small" class="el-button-solt" @click="getList(1),getCardList()" />
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="用户信息：" class="width100" style="display: inline-block;">
|
||||
<el-button size="small" type="primary" icon="el-icon-top" @click="exports">导出列表</el-button>
|
||||
<!-- <el-form-item label="用户信息：" class="width100" style="display: inline-block;">
|
||||
<el-input
|
||||
v-model="tableFrom.username"
|
||||
@keyup.enter.native="getList(1),getCardList()"
|
||||
@ -145,9 +146,8 @@
|
||||
>
|
||||
<el-button slot="append" icon="el-icon-search" size="small" class="el-button-solt" @click="getList(1),getCardList()" />
|
||||
</el-input>
|
||||
<el-button size="small" type="primary" icon="el-icon-top" @click="exports">导出列表</el-button>
|
||||
<!-- <el-button size="small" type="primary" @click="getExportFileList">导出记录</el-button> -->
|
||||
</el-form-item>
|
||||
<el-button size="small" type="primary" @click="getExportFileList">导出记录</el-button>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
</div>
|
||||
<el-tabs v-if="headeNum.length > 0" v-model="tableFrom.order_type" @tab-click="getList(1),getCardList()">
|
||||
@ -208,17 +208,17 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="real_name" label="收货人/订购人" min-width="120" /> -->
|
||||
<el-table-column label="商户名称" min-width="150">
|
||||
<!-- <el-table-column label="商户名称" min-width="150">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.merchant ? scope.row.merchant.mer_name :'' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<!-- <el-table-column prop="mer_name" label="商户类别" min-width="90">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.merchant" class="spBlock">{{ scope.row.merchant.is_trader ? '自营' : '非自营' }}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column label="商品信息" min-width="280">
|
||||
<!-- <el-table-column label="商品信息" min-width="280">
|
||||
<template slot-scope="scope">
|
||||
<div
|
||||
v-for="(val, i) in scope.row.orderProduct"
|
||||
@ -235,16 +235,15 @@
|
||||
class="tabBox_tit"
|
||||
>{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
|
||||
<span class="tabBox_pice">
|
||||
<!-- {{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} -->
|
||||
{{' x '+ val.product_num}}
|
||||
{{ '￥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} -->
|
||||
<!-- <em
|
||||
v-if="val.refund_num < val.product_num && val.refund_num > 0"
|
||||
style="color: red;font-style: normal;"
|
||||
>(-{{ val.product_num - val.refund_num }})</em> -->
|
||||
>(-{{ val.product_num - val.refund_num }})</em>
|
||||
</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<!-- <el-table-column label="实际支付" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.pay_price }}</span>
|
||||
@ -267,6 +266,21 @@
|
||||
<div v-else>-</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="付款公司" min-width="320">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.merchant"
|
||||
>
|
||||
<div v-if="scope.row.merchant.financial_bank">
|
||||
<div>公司名称: {{scope.row.merchant.mer_name||'-'}}</div>
|
||||
<div>对公账户: {{scope.row.merchant.financial_bank.bank_code||'-'}}</div>
|
||||
<div>开户行: {{scope.row.merchant.financial_bank.bank||'-'}}</div>
|
||||
<div>开户行地址: {{scope.row.merchant.financial_bank.bank_branch||'-'}}</div>
|
||||
</div>
|
||||
<div v-else>-</div>
|
||||
</div>
|
||||
<div v-else>-</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="收款凭证" min-width="80" >
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.order_extend"
|
||||
@ -283,11 +297,12 @@
|
||||
<div v-else>-</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="pay_price" label="手续扣除" min-width="100" >
|
||||
<el-table-column prop="pay_price" label="扣除" min-width="150" >
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.order_extend&&scope.row.order_extend.commission_rate"
|
||||
<div v-if="scope.row.financial_record"
|
||||
>
|
||||
{{ scope.row.order_extend.commission_rate }}
|
||||
<div>押金({{scope.row.financial_record.auto_margin_lv}}%): <span>{{scope.row.financial_record.auto_margin||'0.00'}}元</span></div>
|
||||
<div>手续费({{scope.row.financial_record.order_charge_lv}}%): <span>{{scope.row.financial_record.order_charge||'0.00'}}元</span></div>
|
||||
</div>
|
||||
<div v-else>-</div>
|
||||
</template>
|
||||
@ -360,7 +375,7 @@
|
||||
>查看退款单</el-button>
|
||||
</span>
|
||||
<el-button type="text" size="small" @click="onOrderDetails(scope.row.order_id)">详情</el-button>
|
||||
<el-button type="text" size="small" @click="uploadVoucher(scope.row)">上传凭证</el-button>
|
||||
<el-button v-if="!scope.row.order_extend.corporate_voucher" type="text" size="small" @click="uploadVoucher(scope.row)">上传凭证</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@ -441,7 +456,7 @@
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
import { orderOtherListApi, chartApi, cardListApi, exportOrderOtherApi, orderOtherPayOrder } from "@/api/order";
|
||||
import { orderOtherListApi, chartOtherApi, cardListApi, exportOrderOtherApi, orderOtherPayOrder } from "@/api/order";
|
||||
import { merSelectApi } from "@/api/product";
|
||||
import { uploadImage } from "@/api/public";
|
||||
import userDetails from '../../user/list/userDetails';
|
||||
@ -707,7 +722,7 @@ export default {
|
||||
this.getList('');
|
||||
},
|
||||
headerList() {
|
||||
chartApi()
|
||||
chartOtherApi()
|
||||
.then((res) => {
|
||||
this.orderChartType = res.data;
|
||||
})
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user