mkm/new_shop_admin_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

凭证

Browse Source
This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-03-16 18:01:27 +08:00
parent b507c35f66
commit cd95a6fc93
5 changed files with 280 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/api/merchant.js
View File

@ -9,6 +9,11 @@
// +----------------------------------------------------------------------
import request from './request'
// 新增修改状态
export function updateStatus(mer_id, data) {
return request.post(`merchant/intention/status/${mer_id}`, data)
}
/**
* @description 商户权限管理 -- 列表
*/
@ -67,8 +72,8 @@ export function merchantUpdateApi(id) {
/**
* @description 商户列表 -- 编辑
*/
export function merchantUpdate(id,data) {
return request.post(`system/merchant/update/${id}`,data)
export function merchantUpdate(id, data) {
return request.post(`system/merchant/update/${id}`, data)
}
/**
* @description 商户列表 -- 删除
@ -195,19 +200,19 @@ export function intentionAgreeInfo() {
* @description 申请管理 -- 入驻协议保存
*/
export function intentionAgreeUpdate(data) {
return request.post(`agreement/sys_intention_agree`,data)
return request.post(`agreement/sys_intention_agree`, data)
}
/**
* @description 店铺类型 -- 获取说明
*/
export function getStoreTypeApi(key) {
return request.get(`agreement/${key}`)
export function getStoreTypeApi(key) {
return request.get(`agreement/${key}`)
}
/**
* @description 店铺类型 -- 编辑说明
*/
export function updateStoreTypeApi(type, data) {
return request.post(`agreement/${type}`, data)
return request.post(`agreement/${type}`, data)
}
/**
* @description 商户列表 -- 开启关闭
@ -226,102 +231,102 @@ export function merchantCountApi() {
* @description 店铺类型 -- 创建店铺类型
*/
export function storeTypeCreateApi(data) {
return request.post(`merchant/type/create`, data)
return request.post(`merchant/type/create`, data)
}
/**
* @description 店铺类型 -- 列表
*/
export function storeTypeLstApi(data) {
export function storeTypeLstApi(data) {
return request.get(`merchant/type/lst`, data)
}
/**
* @description 店铺类型 -- 店铺权限
*/
export function storeJurisdictionApi() {
export function storeJurisdictionApi() {
return request.get(`merchant/mer_auth`)
}
/**
* @description 店铺类型 -- 创建店铺类型
*/
export function storeTypeUpdateApi(id, data) {
return request.post(`merchant/type/update/${id}`, data)
return request.post(`merchant/type/update/${id}`, data)
}
/**
* @description 店铺类型列表 -- 删除
*/
export function storeTypeDeleteApi(id) {
return request.delete(`merchant/type/delete/${id}`)
return request.delete(`merchant/type/delete/${id}`)
}
/**
* @description 店铺类型列表 -- 备注
*/
export function merchantTypeMarkForm(id) {
return request.get(`merchant/type/mark/${id}`)
return request.get(`merchant/type/mark/${id}`)
}
/**
* @description 店铺类型列表 -- 详情
*/
export function merchantTypeDetailApi(id) {
export function merchantTypeDetailApi(id) {
return request.get(`/merchant/type/detail/${id}`)
}
/**
* @description 店铺类型 -- 获取选择项
*/
export function getstoreTypeApi() {
return request.get(`merchant/type/options`)
return request.get(`merchant/type/options`)
}
/**
* @description 商户分类 -- 获取选择项
*/
export function getMerCateApi() {
return request.get(`system/merchant/category/options`)
return request.get(`system/merchant/category/options`)
}
/**
* @description 服务申请 -- 列表
*/
export function getApplymentLst(data) {
return request.get(`system/applyments/lst`, data)
return request.get(`system/applyments/lst`, data)
}
/**
* @description 服务申请 -- 审核
*/
export function applymentStatusApi(id, data) {
return request.post(`system/applyments/status/${id}`, data)
return request.post(`system/applyments/status/${id}`, data)
}
/**
* @description 服务申请 -- 详情
*/
export function applymentDetailApi(id) {
return request.get(`system/applyments/detail/${id}`)
return request.get(`system/applyments/detail/${id}`)
}
/**
* @description 商户 -- 分账列表
*/
export function applymentLstApi(data) {
return request.get(`profitsharing/lst`, data)
export function applymentLstApi(data) {
return request.get(`profitsharing/lst`, data)
}
/**
* @description 商户 -- 分账（立即分账）
*/
export function splitAccountApi(id) {
return request.post(`profitsharing/again/${id}`)
export function splitAccountApi(id) {
return request.post(`profitsharing/again/${id}`)
}
/**
* @description 分账申请 -- 备注
*/
export function splitAccountMark(id) {
return request.get(`system/applyments/mark/${id}/form`)
return request.get(`system/applyments/mark/${id}/form`)
}
/**
* @description 分账管理 -- 导出
*/
export function ledgerManageExportApi(data) {
export function ledgerManageExportApi(data) {
return request.get(`profitsharing/export`, data)
}
/**
* @description 缴存保证金 -- 列表
*/
export function marginLstApi(data) {
export function marginLstApi(data) {
return request.get(`margin/lst`, data)
}
/**
@ -339,37 +344,37 @@ export function marginPaymentApi(id) {
/**
* @description 退回保证金 -- 列表
*/
export function marginRefundLstApi(data) {
export function marginRefundLstApi(data) {
return request.get(`margin/refund/lst`, data)
}
/**
* @description 退回保证金 -- 审核
*/
export function marginRefundStatus(id) {
export function marginRefundStatus(id) {
return request.get(`margin/refund/status/${id}/form`)
}
/**
* @description 退回保证金 -- 备注
*/
export function marginRefundMark(id) {
export function marginRefundMark(id) {
return request.get(`margin/refund/mark/${id}/form`)
}
/**
* @description 退回保证金 -- 退回信息
*/
export function marginRefundInfo(id) {
export function marginRefundInfo(id) {
return request.get(`margin/refund/show/${id}`)
}
/**
* @description 退回保证金 -- 扣费记录
*/
export function marginDeductionRecord(id, data) {
export function marginDeductionRecord(id, data) {
return request.get(`margin/list/${id}`, data)
}
/**
* @description 退回保证金 -- 保证金扣费
*/
export function marginDeductionForm(id) {
export function marginDeductionForm(id) {
return request.get(`margin/set/${id}/form`)
}
/**

37
src/api/order.js
View File

@ -9,6 +9,13 @@
// +----------------------------------------------------------------------
import request from './request'
/**
* @description 转账订单 -- 上传凭证
*/
export function orderOtherPayOrder(data) {
return request.get('order/change/' + data.id + "?img=" + data.images)
}
/**
* @description 订单 -- 列表
*/
@ -27,7 +34,7 @@ export function chartApi() {
* @description 订单 -- 卡片
*/
export function cardListApi(data) {
return request.get('order/title', data)
return request.get('order/title', data)
}
/**
* @description 订单 -- 编辑
@ -52,7 +59,7 @@ export function orderDetailApi(id) {
/**
* @description 订单 -- 记录
*/
export function orderLogApi(id, data) {
export function orderLogApi(id, data) {
return request.get(`order/status/${id}`, data)
}
/**
@ -83,13 +90,13 @@ export function getExpress(id) {
* @description 导出订单
*/
export function exportOrderApi(data) {
return request.get(`order/excel`, data )
return request.get(`order/excel`, data)
}
/**
* @description 导出退款单
*/
export function exportRefundOrderApi(data) {
return request.get(`order/refund/excel`, data )
export function exportRefundOrderApi(data) {
return request.get(`order/refund/excel`, data)
}
/**
* @description 导出文件列表
@ -118,48 +125,48 @@ export function takeOrderListApi(data) {
/**
* @description 核销订单 -- 卡片
*/
export function takeCardListApi(data) {
return request.get('order/take_title', data)
export function takeCardListApi(data) {
return request.get('order/take_title', data)
}
/**
* @description 导出列表 -- 文件类型
*/
export function excelFileType() {
return request.get('excel/type')
export function excelFileType() {
return request.get('excel/type')
}
/**
* @description 发送货 -- 门店列表
*/
export function getStoreLst() {
export function getStoreLst() {
return request.get(`delivery/station/options`)
}
/**
* @description 同城配送 -- 订单列表
*/
export function deliveryOrderLst(data) {
export function deliveryOrderLst(data) {
return request.get(`delivery/order/lst`, data)
}
/**
* @description 同城订单 -- 取消
*/
export function deliveryOrderCancle(id) {
export function deliveryOrderCancle(id) {
return request.get(`delivery/order/cancel/${id}/form`)
}
/**
* @description 同城配送 -- 充值记录列表
*/
export function rechargeLst(data) {
export function rechargeLst(data) {
return request.get(`delivery/station/payLst`, data)
}
/**
* @description 同城配送 -- 充值记录卡片数据
*/
export function rechargeCardApi() {
export function rechargeCardApi() {
return request.get(`delivery/title`)
}
/**
* @description 同城配送 -- 充值余额
*/
export function rechargeBalancei() {
export function rechargeBalancei() {
return request.get(`delivery/belence`)
}

17
src/api/public.js Normal file
View File

@ -0,0 +1,17 @@
// +----------------------------------------------------------------------
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
// +----------------------------------------------------------------------
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
// +----------------------------------------------------------------------
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
import request from './request'
/**
* @description 上传图片
*/
export function uploadImage(data) {
return request.post('upload/image/0/file', data)
}

22
src/views/merchant/application/index.vue
View File

@ -361,7 +361,8 @@ import {
intentionDelte,
intentionStatusApi,
getstoreTypeApi,
getMerCateApi
getMerCateApi,
updateStatus
} from "@/api/merchant";
import { fromList, statusList } from "@/libs/constants.js";
import { roterPre } from "@/settings";
@ -510,6 +511,25 @@ export default {
// 添加
// 提交状态修改
handleSubmit() {
if (this.statusAuditForm.state == 2 && !this.statusAuditForm.fail_msg) {
return this.$message.warning("请输入拒绝原因");
}
updateStatus(this.statusAuditForm.mer_intention_id, {
status: this.statusAuditForm.state,
create_mer: this.statusAuditForm.create_mer,
fail_msg: this.statusAuditForm.fail_msg
}).then(res => {
this.statusAuditVisible = false;
this.$message.success(res.message);
this.getList("");
}).catch(({ message }) => {
this.$message.error(message);
});
},
// 编辑
onEdit(id) {
this.$modalForm(auditApi(id)).then(() => this.getList(""));

396
src/views/order/list/index.vue
View File

@ -3,189 +3,95 @@
<div class="selCard mb14">
<el-form size="small" inline :model="tableFrom" ref="searchForm" label-width="85px">
<el-form-item label="订单状态：" class="width100" prop="status">
<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
label="1"
>待付款 {{ '(' +orderChartType.unpaid?orderChartType.unpaid:0+ ')' }}</el-radio-button>
<el-radio-button
label="2"
>待发货 {{ '(' +orderChartType.unshipped?orderChartType.unshipped:0+ ')' }}</el-radio-button>
<el-radio-button
label="3"
>待收货 {{ '(' +orderChartType.untake?orderChartType.untake:0+ ')' }}</el-radio-button>
<el-radio-button
label="4"
>待评价 {{ '(' +orderChartType.unevaluate?orderChartType.unevaluate:0+ ')' }}</el-radio-button>
<el-radio-button
label="5"
>交易完成 {{ '(' +orderChartType.complete?orderChartType.complete:0+ ')' }}</el-radio-button>
<el-radio-button
label="6"
>已退款 {{ '(' +orderChartType.refund?orderChartType.refund:0+ ')' }}</el-radio-button>
<el-radio-button
label="7"
>已删除 {{ '(' +orderChartType.del?orderChartType.del:0+ ')' }}</el-radio-button>
<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 label="1">待付款 {{ '(' + orderChartType.unpaid ? orderChartType.unpaid : 0 + ')'
}}</el-radio-button>
<el-radio-button label="2">待发货 {{ '(' + orderChartType.unshipped ? orderChartType.unshipped : 0 + ')'
}}</el-radio-button>
<el-radio-button label="3">待收货 {{ '(' + orderChartType.untake ? orderChartType.untake : 0 + ')'
}}</el-radio-button>
<el-radio-button label="4">待评价 {{ '(' + orderChartType.unevaluate ? orderChartType.unevaluate : 0 + ')'
}}</el-radio-button>
<el-radio-button label="5">交易完成 {{ '(' + orderChartType.complete ? orderChartType.complete : 0 + ')'
}}</el-radio-button>
<el-radio-button label="6">已退款 {{ '(' + orderChartType.refund ? orderChartType.refund : 0 + ')'
}}</el-radio-button>
<el-radio-button label="7">已删除 {{ '(' + orderChartType.del ? orderChartType.del : 0 + ')'
}}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="时间选择：">
<el-date-picker
v-model="timeVal"
value-format="yyyy/MM/dd"
format="yyyy/MM/dd"
size="small"
type="daterange"
placement="bottom-end"
placeholder="自定义时间"
style="width: 280px;"
:picker-options="pickerOptions"
@change="onchangeTime"
/>
<el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small" type="daterange"
placement="bottom-end" placeholder="自定义时间" style="width: 280px;" :picker-options="pickerOptions"
@change="onchangeTime" />
</el-form-item>
<el-form-item label="活动类型：" prop="activity_type">
<el-select
v-model="tableFrom.activity_type"
clearable
filterable
placeholder="请选择"
class="selWidth"
@change="getList(1),getCardList()"
>
<el-option
v-for="item in activity"
:key="item.type"
:label="item.name"
:value="item.type"
/>
<el-select v-model="tableFrom.activity_type" clearable filterable placeholder="请选择" class="selWidth"
@change="getList(1), getCardList()">
<el-option v-for="item in activity" :key="item.type" :label="item.name" :value="item.type" />
</el-select>
</el-form-item>
<el-form-item label="商户名称：" prop="mer_id">
<el-select
v-model="tableFrom.mer_id"
clearable
filterable
placeholder="请选择"
class="selWidth"
@change="getList(1),getCardList()"
>
<el-option
v-for="item in merSelect"
:key="item.mer_id"
:label="item.mer_name"
:value="item.mer_id"
/>
<el-select v-model="tableFrom.mer_id" clearable filterable placeholder="请选择" class="selWidth"
@change="getList(1), getCardList()">
<el-option v-for="item in merSelect" :key="item.mer_id" :label="item.mer_name" :value="item.mer_id" />
</el-select>
</el-form-item>
<el-form-item label="商户类别：" prop="is_trader">
<el-select
v-model="tableFrom.is_trader"
clearable
placeholder="请选择"
class="selWidth"
@change="getList(1),getCardList()"
>
<el-select v-model="tableFrom.is_trader" clearable placeholder="请选择" class="selWidth"
@change="getList(1), getCardList()">
<el-option label="自营" value="1" />
<el-option label="非自营" value="0" />
</el-select>
</el-form-item>
<el-form-item label="商品名称：" prop="store_name">
<el-input
v-model="tableFrom.store_name"
@keyup.enter.native="getList(1),getCardList()"
placeholder="请输入商品名称"
class="selWidth"
clearable
/>
<el-input v-model="tableFrom.store_name" @keyup.enter.native="getList(1), getCardList()" placeholder="请输入商品名称"
class="selWidth" clearable />
</el-form-item>
<el-form-item label="支付方式：" prop="pay_type">
<el-select
v-model="tableFrom.pay_type"
clearable
placeholder="请选择"
class="selWidth"
@change="getList(1),getCardList()"
>
<el-select v-model="tableFrom.pay_type" clearable placeholder="请选择" class="selWidth"
@change="getList(1), getCardList()">
<el-option label="余额" value="0" />
<el-option label="微信" value="1" />
<el-option label="支付宝" value="2" />
</el-select>
</el-form-item>
<el-form-item label="发货方式：" prop="filter_delivery">
<el-select
v-model="tableFrom.filter_delivery"
placeholder="请选择"
class="selWidth"
clearable
@change="getList(1),getCardList()"
>
<el-option
v-for="item in dliveryWayList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="商品类型：" prop="filter_product">
<el-select
v-model="tableFrom.filter_product"
placeholder="请选择"
class="selWidth"
clearable
@change="getList(1),getCardList()"
>
<el-option
v-for="item in productTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-select v-model="tableFrom.filter_delivery" placeholder="请选择" class="selWidth" clearable
@change="getList(1), getCardList()">
<el-option v-for="item in dliveryWayList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="商品类型：" prop="filter_product">
<el-select v-model="tableFrom.filter_product" placeholder="请选择" class="selWidth" clearable
@change="getList(1), getCardList()">
<el-option v-for="item in productTypeList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="关键字：" prop="keywords">
<el-input
v-model="tableFrom.keywords"
@keyup.enter.native="getList(1),getCardList()"
placeholder="请输入订单号/收货人/联系方式"
class="selWidth"
clearable
/>
<el-input v-model="tableFrom.keywords" @keyup.enter.native="getList(1), getCardList()"
placeholder="请输入订单号/收货人/联系方式" class="selWidth" clearable />
</el-form-item>
<el-form-item label="总单单号：" prop="group_order_sn">
<el-input
v-model="tableFrom.group_order_sn"
@keyup.enter.native="getList(1),getCardList()"
placeholder="请输入总单单号"
class="selWidth"
clearable
/>
<el-input v-model="tableFrom.group_order_sn" @keyup.enter.native="getList(1), getCardList()"
placeholder="请输入总单单号" class="selWidth" clearable />
</el-form-item>
<el-form-item label="用户信息：" prop="username">
<el-input
v-model="tableFrom.username"
@keyup.enter.native="getList(1),getCardList()"
placeholder="请输入用户昵称/手机号"
class="selWidth"
clearable
/>
<el-input v-model="tableFrom.username" @keyup.enter.native="getList(1), getCardList()"
placeholder="请输入用户昵称/手机号" class="selWidth" clearable />
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
<el-button size="small" @click="searchReset()">重置</el-button>
<el-button size="small" @click="searchReset()">重置</el-button>
</el-form-item>
</el-form>
</div>
<cards-data v-if="cardLists.length>0" :card-lists="cardLists" />
<cards-data v-if="cardLists.length > 0" :card-lists="cardLists" />
<el-card>
<el-button size="small" type="primary" class="mb20" @click="exports">导出列表</el-button>
<el-table
v-loading="listLoading"
:data="tableData.data"
size="small"
class="table"
highlight-current-row
:cell-class-name="addTdClass"
>
<el-table v-loading="listLoading" :data="tableData.data" size="small" class="table" highlight-current-row
:cell-class-name="addTdClass">
<el-table-column type="expand">
<template slot-scope="props">
<el-form label-position="left" inline class="demo-table-expand">
@ -215,7 +121,9 @@
</el-table-column>
<el-table-column label="用户信息" min-width="130">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native="onUserDetails(scope.row.uid)">{{scope.row.user&&scope.row.user.nickname +'/'+ scope.row.uid}}</el-button>
<el-button type="text" size="small" @click.native="onUserDetails(scope.row.uid)">{{ scope.row.user &&
scope.row.user.nickname + '/' +
scope.row.uid }}</el-button>
</template>
</el-table-column>
<el-table-column label="订单类型" min-width="80">
@ -226,31 +134,21 @@
<el-table-column prop="real_name" label="收货人/订购人" min-width="120" />
<el-table-column label="商户名称" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.merchant ? scope.row.merchant.mer_name :'' }}</span>
<span>{{ scope.row.merchant ? scope.row.merchant.mer_name : '' }}</span>
</template>
</el-table-column>
<el-table-column label="商品信息" min-width="330">
<template slot-scope="scope">
<div
v-for="(val, i) in scope.row.orderProduct"
:key="i"
class="tabBox acea-row row-middle"
>
<div v-for="(val, i) in scope.row.orderProduct" :key="i" class="tabBox acea-row row-middle">
<div class="demo-image__preview">
<el-image
:src="val.cart_info.product.image"
:preview-src-list="[val.cart_info.product.image]"
/>
<el-image :src="val.cart_info.product.image" :preview-src-list="[val.cart_info.product.image]" />
</div>
<span
class="tabBox_tit"
>{{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }}</span>
<span 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 }}
<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.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>
</span>
</div>
</template>
@ -272,12 +170,25 @@
<span>{{ scope.row.paid == 0 ? "未支付" : "已支付" }}</span>
</template>
</el-table-column>
<el-table-column label="支付凭证" min-width="80">
<template slot-scope="scope">
<div class="demo-image__preview"
v-if="scope.row.pay_type == 10 && scope.row.order_extend.corporate_voucher">
<el-image style="width: 36px; height: 36px" :src="scope.row.order_extend.corporate_voucher"
:preview-src-list="[scope.row.order_extend.corporate_voucher]" />
</div>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="订单状态" min-width="80">
<template slot-scope="scope">
<span v-if="scope.row.is_del === 0">
<span v-if="scope.row.paid === 0">待付款</span>
<span v-else>
<span v-if="scope.row.order_type === 0 || scope.row.order_type === 2">{{ scope.row.status | orderStatusFilter }}</span>
<span v-if="scope.row.order_type === 0 || scope.row.order_type === 2">{{ scope.row.status |
orderStatusFilter }}</span>
<span v-else>{{ scope.row.status | cancelOrderStatusFilter }}</span>
</span>
</span>
@ -289,48 +200,59 @@
<span>{{ scope.row.create_time }}</span>
</template>
</el-table-column>
<el-table-column label="操作" min-width="80" fixed="right">
<el-table-column label="操作" min-width="120" fixed="right">
<template slot-scope="scope">
<span v-for="(val, i ) in scope.row.orderProduct" :key="i">
<el-button
v-if="orderFilter(scope.row)"
type="text"
size="small"
@click="onRefundDetail(scope.row.order_sn)"
>查看退款单</el-button>
<el-button v-if="orderFilter(scope.row)" type="text" size="small"
@click="onRefundDetail(scope.row.order_sn)">查看退款单</el-button>
</span>
<el-button type="text" size="small" @click="onOrderDetails(scope.row.order_id)">详情</el-button>
<el-button
v-if="!scope.row.order_extend.corporate_voucher && scope.row.pay_type == 10 && scope.row.paid == 0"
type="text" size="small" @click="uploadVoucher(scope.row)">上传凭证</el-button>
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
background
:page-size="tableFrom.limit"
:current-page="tableFrom.page"
layout="total, prev, pager, next, jumper"
:total="tableData.total"
@size-change="handleSizeChange"
@current-change="pageChange"
/>
<el-pagination background :page-size="tableFrom.limit" :current-page="tableFrom.page"
layout="total, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
@current-change="pageChange" />
</div>
</el-card>
<!--用户信息-->
<user-details
ref="userDetails"
:drawer="userDawer"
@closeDrawer="closeDrawer"
@changeDrawer="changeDrawer"
:uid="uid"
:isUser="false" />
<user-details ref="userDetails" :drawer="userDawer" @closeDrawer="closeDrawer" @changeDrawer="changeDrawer"
:uid="uid" :isUser="false" />
<!--详情-->
<order-detail
ref="orderDetail"
:orderId="orderId"
@closeDrawer="closeDrawer"
@changeDrawer="changeDrawer"
:drawer="drawer"
></order-detail>
<order-detail ref="orderDetail" :orderId="orderId" @closeDrawer="closeDrawer" @changeDrawer="changeDrawer"
:drawer="drawer"></order-detail>
<!-- 上传凭证 -->
<el-dialog v-if="dialogVoucher" title="上传凭证" :visible.sync="dialogVoucher" width="500px"
:before-close="closeDialogVoucher">
<el-form :model="voucherInfo">
<el-form-item label="订单编号" label-width="100px">
<el-input v-model="voucherInfo.order_sn" disabled></el-input>
</el-form-item>
<el-form-item label="凭证图片" label-width="100px">
<div style="display: flex">
<el-upload class="upload-demo" drag action="store/import/import_images" :multiple="false"
:http-request="uploadVoucherImage" :accept="'image/*'" :limit="1">
<i class="el-icon-upload" style="color:#4073FA;"></i>
<div class="el-upload__text">
将凭证图片拖到此处，或<em>点击上传</em>
</div>
<div class="el-upload__tip" slot="tip">
只能上传图片文件
</div>
</el-upload>
</div>
</el-form-item>
<div style="display: flex;justify-content: flex-end;">
<el-button size="small" @click="dialogVoucher = false">取消</el-button>
<el-button size="small" type="primary" @click="addVoucher">确认</el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
@ -344,7 +266,7 @@
// +----------------------------------------------------------------------
// | Author: CRMEB Team <admin@crmeb.com>
// +----------------------------------------------------------------------
import { orderListApi, chartApi, cardListApi, exportOrderApi } from "@/api/order";
import { orderListApi, chartApi, cardListApi, exportOrderApi, orderOtherPayOrder } from "@/api/order";
import { merSelectApi } from "@/api/product";
import userDetails from '../../user/list/userDetails';
import orderDetail from './orderDetails.vue';
@ -352,10 +274,13 @@ import createWorkBook from '@/utils/newToExcel.js';
import cardsData from "@/components/cards/index";
import { fromList } from "@/libs/constants.js";
import timeOptions from '@/utils/timeOptions';
import { uploadImage } from "@/api/public";
export default {
components: { orderDetail, cardsData, userDetails },
data() {
return {
dialogVoucher: false, //上传凭证
pickerOptions: timeOptions,
orderId: 0,
tableData: {
@ -363,11 +288,11 @@ export default {
total: 0,
},
activity: [
{name: "普通订单",type: 0},
{name: "秒杀订单",type: 1},
{name: "预售订单",type: 2},
{name: "助力订单",type: 3},
{name: "拼团订单",type: 4}
{ name: "普通订单", type: 0 },
{ name: "秒杀订单", type: 1 },
{ name: "预售订单", type: 2 },
{ name: "助力订单", type: 3 },
{ name: "拼团订单", type: 4 }
],
listLoading: true,
tableFrom: {
@ -384,7 +309,7 @@ export default {
is_trader: '',
pay_type: "",
filter_delivery: '',
filter_product : '',
filter_product: '',
activity_type: ''
},
dliveryWayList: [
@ -421,6 +346,10 @@ export default {
merSelect: [],
drawer: false,
userDawer: false,
voucherInfo: {
id: '',
images: ''
}
};
},
mounted() {
@ -447,8 +376,47 @@ export default {
this.getList('');
},
methods: {
// 上传凭证
uploadVoucher(data) {
this.voucherInfo.id = data.order_id;
this.voucherInfo.order_sn = data.order_sn;
this.dialogVoucher = true;
},
async uploadVoucherImage(options) {
console.log('上传', options);
const file = options.file;
const formData = new FormData();
formData.append('file', file);
uploadImage(formData).then((res) => {
this.$message.success('上传成功');
this.voucherInfo.image = res.data.src;
}).catch(e => {
this.$message.error(e);
})
},
// 上传
addVoucher() {
if (!this.voucherInfo.image) return this.$message.error('请先上传凭证!');
orderOtherPayOrder({
id: this.voucherInfo.id,
images: this.voucherInfo.image
}).then(res => {
this.$message.success(res.message);
this.closeDialogVoucher();
this.getList();
}).catch(e => {
this.$message.error(e);
})
},
closeDialogVoucher() {
this.dialogVoucher = false;
},
/**重置 */
searchReset(){
searchReset() {
this.timeVal = []
this.tableFrom.date = ""
this.$refs.searchForm.resetFields()
@ -500,7 +468,7 @@ export default {
onUserDetails(uid) {
this.uid = uid
this.userDawer = true
this.$refs.userDetails.getData(uid,false,true);
this.$refs.userDetails.getData(uid, false, true);
},
closeDrawer() {
this.drawer = false
@ -517,13 +485,13 @@ export default {
let lebData = {};
for (let i = 0; i < pageCount; i++) {
lebData = await this.downData(excelData)
pageCount = Math.ceil(lebData.count/excelData.limit)
pageCount = Math.ceil(lebData.count / excelData.limit)
if (lebData.export.length) {
data = data.concat(lebData.export)
excelData.page++
}
}
createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename);
createWorkBook(lebData.header, lebData.title, data, lebData.foot, lebData.filename);
return
},
/**订单列表 */
@ -595,17 +563,17 @@ export default {
.then((res) => {
this.tableData.data = res.data.list;
this.tableData.total = res.data.count;
// this.cardLists = res.data.stat;
// this.cardLists = res.data.stat;
this.listLoading = false;
// this.getCardList();
// this.getCardList();
})
.catch((res) => {
this.$message.error(res.message);
this.listLoading = false;
});
},
getCardList(){
cardListApi(this.tableFrom)
getCardList() {
cardListApi(this.tableFrom)
.then((res) => {
this.cardLists = res.data;
})
@ -636,16 +604,19 @@ export default {
<style lang="scss" scoped>
.demo-table-expand ::v-deep label {
width: 83px !important;
width: 83px !important;
}
.el-dropdown-link {
cursor: pointer;
color: var(--prev-color-primary);
font-size: 12px;
}
.el-icon-arrow-down {
font-size: 12px;
}
.tabBox_tit {
max-width: 60%;
font-size: 12px !important;
@ -654,6 +625,7 @@ export default {
padding: 5px 0;
box-sizing: border-box;
}
::v-deep .row-bg .cell {
color: red !important;
}