Skip to content

S
shop-new
提交 05803be4 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

1、售后2-3；2、订单bug修复

上级 1b9e7ad2
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 371 行增加 和 181 行删除
src/api/module/order.js
浏览文件 @ 05803be4
...@@ -99,51 +99,52 @@ export function delOrder(ids) { ...@@ -99,51 +99,52 @@ export function delOrder(ids) {
}) })
} }
// 订单导出-按搜索条件，全部导出 // 批量 去发货
export function exportOrder(query) { export function deliveryOrder(data) {
return request({ return request({
url: '/system/order/unSendOrderGoodsExport', url: '/system/order/orderListSend',
method: 'get', method: 'post',
params: query data: data
}) })
} }
// old
// export function exportOrder(query) {
// return request({
// url: '/system/order/getOrderListExport',
// method: 'get',
// params: query
// })
// }
// 批量发货 // 批量 补单发货
export function deliveryOrder(data) { export function deliveryOrderAgain(data) {
return request({ return request({
url: '/system/order/batchDeliveryGoods', url: '/system/order/orderListAllSend',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 订单 右上角的 批量发货接口 /system/order/batchDeliveryGoodsOut 老接口 // 导出导入-批量发货
export function deliveryOrderExport(data) {
// 批量 去发货
export function deliveryOrderOne(data) {
return request({ return request({
url: '/system/order/orderListSend', url: '/system/order/batchDeliveryGoods',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 批量 补单发货 // 订单导出-全部订单-页签
export function deliveryOrderTwo(data) { export function exportOrder(query) {
return request({ return request({
url: '/system/order/orderListAllSend', url: '/system/order/getOrderListExport',
method: 'post', method: 'get',
data: data params: query
}) })
} }
// 【待发货】-状态的 订单导出
export function exportUnSendOrderGoodsData(query) {
return request({
url: '/system/order/unSendOrderGoodsExport',
method: 'get',
params: query
})
}
// //
// // 单商品订单 补单发货 // // 单商品订单 补单发货
// export function toReissueOrderData(data) { // export function toReissueOrderData(data) {
......
src/views/system/asset/balance/index.vue
浏览文件 @ 05803be4
...@@ -3,51 +3,68 @@ ...@@ -3,51 +3,68 @@
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<el-form class="form-params" :model="queryParams" label-width="auto" :inline="true" size="small"> <el-form class="form-params" :model="queryParams" label-width="auto" :inline="true" size="small">
<el-form-item label="商品ID" prop="goods_id"> <el-form-item label="关联订单单号：" prop="order_sn">
<el-input <el-input
v-model="queryParams.goods_id" v-model="queryParams.order_sn"
placeholder="请输入商品id" placeholder="请输入关联订单单号"
clearable clearable
@keyup.enter.native="handleQuery"
/></el-form-item> /></el-form-item>
<el-form-item label="申请时间" prop="applyTime"> <el-form-item label="查询时间" prop="searchTime">
<el-date-picker <el-date-picker
v-model="queryParams.applyTime" v-model="queryParams.searchTime"
type="daterange" type="daterange"
align="left" align="left"
unlink-panels unlink-panels
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期">
@change="applyTimeChange"
:picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="退换货类型" prop="refund_type"> <el-form-item label="变动类型" prop="refund_type">
<el-select v-model="queryParams.refund_type" placeholder="全部类型" clearable > <el-select v-model="queryParams.refund_type" placeholder="全部类型" clearable >
<el-option v-for="item in userNeedOptions" :key="item.value" :label="item.label" <el-option label="全部类型" :value="0"></el-option>
:value="item.value"></el-option> <el-option label="增加" :value="1" ></el-option>
<el-option label="减少" :value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<el-table v-loading="loading" :height="tableHeight" :data="assetList"> <el-table v-loading="loading" :height="tableHeight" :data="assetList">
<el-table-column label="ID" align="center" prop="Id"/> <!-- <template slot-scope="scope">-->
<!-- <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>-->
<!-- </template>-->
<el-table-column label="序号" align="center" width="55">
<template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="流水订单号" align="center" prop="BalanceSn"/> <el-table-column label="流水订单号" align="center" prop="BalanceSn"/>
<el-table-column label="变动金额" align="center" prop="ChangeMoney"/> <el-table-column label="变动金额" align="center" prop="ChangeMoney"/>
<el-table-column label="变动类型" align="center" :formatter="formatType" prop="ChangeType"/> <el-table-column label="变动类型" align="center" :formatter="formatType" prop="ChangeType"/>
<el-table-column label="时间" align="center" :formatter="formatTime" prop="AddTime"/> <el-table-column label="变动描述" align="center" :formatter="formatType" prop="ChangeType1"/>
<el-table-column label="描述" align="center" prop="Des"/> <el-table-column label="变动时间" align="center" :formatter="formatTime" prop="AddTime"/>
<el-table-column label="关联订单单号" align="center" prop="Des"/>
</el-table> </el-table>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <!-- 分页 -->
@pagination="getList"/> <div class="footer_pagination">
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[20, 40, 60, 80, 100]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
</el-pagination>
</div>
</el-card> </el-card>
</div> </div>
</template> </template>
...@@ -66,23 +83,19 @@ ...@@ -66,23 +83,19 @@
name: "asset", name: "asset",
data() { data() {
return { return {
loading: false,
fullHeight: 0, fullHeight: 0,
tableHeight: 0, tableHeight: 0,
loading: false, // 遮罩层
ids: [], // 选中数组
total: 0, // 总条数
assetList: [], // 商户余额变动日志表格数据
title: "", // 弹出层标题
open: false, // 是否显示弹出层
queryParams: { // 查询参数 queryParams: { // 查询参数
pageNum: 1,
pageSize: 10,
sellerId: 0, sellerId: 0,
order_sn: '', order_sn: '',
searchTime: [], searchTime: [],
refund_type: ''
}, },
form: {}, // 表单参数 total: 0,
rules: {} // 表单校验 currentPage: 1,
pageSize: 20,
assetList: [],
}; };
}, },
created() { created() {
...@@ -99,6 +112,66 @@ ...@@ -99,6 +112,66 @@
} }
}, },
methods: { methods: {
/** 列表查询 */
getList() {
let params = {
page: this.currentPage,
limit: this.pageSize,
seller_id: this.seller_id,
}
if(this.queryParams.order_sn != '') {
params['order_sn'] = this.queryParams.order_sn
}
if(this.queryParams.refund_type == '') {
params['refund_type'] = 0
}else {
params['refund_type'] = this.queryParams.refund_type
}
if( this.queryParams.searchTime && this.queryParams.searchTime.length == 2) {
params['created_start_time'] = new Date(this.queryParams.searchTime[0]).getTime() / 1000;
params['created_end_time'] = new Date(this.queryParams.searchTime[1]).getTime() / 1000;
}
listAsset(params).then(res => {
if(res.code == 1) {
this.assetList = res.data.list;
this.total = res.data.total;
}else {
let msg = res.message ? res.message : '查询失败'
this.$message({type: 'error', message: msg});
}
});
},
/** 重置 搜索条件 */
resetQuery() {
this.queryParams = { // 查询参数
sellerId: 0,
order_sn: '',
searchTime: [],
refund_type: ''
}
this.currentPage = 1
this.pageSize = 20
this.getList();
},
handleSizeChange(val) {
this.pageSize = val
this.getList()
},
handleCurrentChange(val) {
this.currentPage = val
this.getList()
},
/** 输入搜索条件后，enter 查询 暂时未用 */
handleQuery() {
},
/********************************** */
formatType(row) { formatType(row) {
var types = row.ChangeType var types = row.ChangeType
var optDes = '' var optDes = ''
...@@ -127,21 +200,17 @@ ...@@ -127,21 +200,17 @@
} }
return nm return nm
}, },
/** 查询商户余额变动日志列表 */
getList() {
listAsset(this.queryParams).then(res => {
this.assetList = res.data.list;
this.total = res.data.total;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
} //methods结束 } //methods结束
}; };
</script> </script>
<style scoped> <style scoped>
.form-params .el-form-item {
margin: 10px 0 10px 10px;
}
/* 分页 */
.footer_pagination {
text-align: center;
margin-top: 15px;
}
</style> </style>
src/views/system/asset/myAsset/index.vue
浏览文件 @ 05803be4
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</div> </div>
<div class="card-header-handle"> <div class="card-header-handle">
<el-button plain type="primary" size="small">提现说明</el-button> <el-button plain type="primary" size="small">提现说明</el-button>
<el-button plain type="primary" size="small">提现记录</el-button> <el-button plain type="primary" size="small" @click="goToWithdrawlog">提现记录</el-button>
</div> </div>
</div> </div>
<div class="row-flex-center"> <div class="row-flex-center">
...@@ -181,7 +181,11 @@ ...@@ -181,7 +181,11 @@
/** 收支明细 跳转 */ /** 收支明细 跳转 */
goToBalance() { goToBalance() {
this.$router.push({ path: "/system/asset/balance" }); this.$router.push({ path: "/system/asset/balance" });
} },
/** 提现记录*/
goToWithdrawlog() {
this.$router.push({ path: "/system/asset/withdrawlog" });
},
} // methods end } // methods end
} }
</script> </script>
......
src/views/system/asset/withdrawlog/index.vue
浏览文件 @ 05803be4
...@@ -2,23 +2,60 @@ ...@@ -2,23 +2,60 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<p style="font-size: 18px; float:left;">提现记录</p> <el-form class="form-params" :model="queryParams" label-width="auto" :inline="true" size="small">
<el-form-item label="提现时间" prop="searchTime">
<el-date-picker
v-model="queryParams.searchTime"
type="daterange"
align="left"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="提现状态" prop="refund_type">
<el-select v-model="queryParams.refund_type" placeholder="全部类型" clearable >
<el-option label="全部类型" :value="0"></el-option>
<el-option label="打款中" :value="1" ></el-option>
<el-option label="提现成功" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</div> </div>
<el-table v-loading="loading" :data="withdrawlogList" :height="tableHeight"> <el-table :data="withdrawlogList" :height="tableHeight">
<el-table-column label="提现流水单号" align="center" prop="ReflectSn"/> <el-table-column label="序号" align="center" width="55">
<el-table-column label="提现账号" align="center" prop="BankName">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <span>{{ scope.$index + 1 }}</span>
{{ scope.row.BankAccountNo }}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="提现金额" :formatter="formatFee" align="center" prop="ReflectMoney"/> <el-table-column label="提现流水单号" align="center" prop="ReflectSn"/>
<el-table-column label="提现状态" align="center" :formatter="formatType" prop="Status"/>
<el-table-column label="提现审核说明" align="center" prop="Des"/>
<el-table-column label="提现时间" :formatter="formatTime" align="center" prop="AddTime"/> <el-table-column label="提现时间" :formatter="formatTime" align="center" prop="AddTime"/>
<el-table-column label="提现金额" :formatter="formatFee" align="center" prop="ReflectMoney"/>
<el-table-column label="手续费" :formatter="formatFee" align="center" prop="Fee"/> <el-table-column label="手续费" :formatter="formatFee" align="center" prop="Fee"/>
<el-table-column label="实际到账金额" :formatter="formatFee" align="center" prop="AfterReflectMoney"/> <el-table-column label="实际到账金额" :formatter="formatFee" align="center" prop="AfterReflectMoney"/>
<el-table-column label="提现状态" align="center" :formatter="formatType" prop="Status"/>
<el-table-column label="开票状态" align="center" prop="kpzt"></el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="text" @click="viewDetails(scope.row)">详情</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="提现账号" align="center" prop="BankName">-->
<!-- <template slot-scope="scope">-->
<!-- <div>-->
<!-- {{ scope.row.BankAccountNo }}-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="提现审核说明" align="center" prop="Des"/>-->
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
...@@ -38,7 +75,7 @@ ...@@ -38,7 +75,7 @@
addWithdrawlog, addWithdrawlog,
updateWithdrawlog updateWithdrawlog
} from '@/api/module/withdrawlog' } from '@/api/module/withdrawlog'
import {dateFormat} from '@/utils' import { dateFormat } from '@/utils'
export default { export default {
name: "withdrawlog", name: "withdrawlog",
...@@ -47,38 +84,19 @@ ...@@ -47,38 +84,19 @@
sellerId: 0, sellerId: 0,
fullHeight: 0, fullHeight: 0,
tableHeight: 0, tableHeight: 0,
// 遮罩层
loading: false,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 商户提现表格数据
withdrawlogList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: { // 查询参数
page: 1,
limit: 10,
sellerId: 0, sellerId: 0,
searchTime: [],
refund_type: ''
}, },
// 表单参数 total: 0,
form: {}, currentPage: 1,
// 表单校验 pageSize: 20,
rules: { withdrawlogList: [],
status: [
{required: true, message: "提现状态 0申请提现 1提现成功 2提现失败不能为空", trigger: "blur"}
],
}
}; };
}, },
created() { created() {
...@@ -95,6 +113,43 @@ ...@@ -95,6 +113,43 @@
} }
}, },
methods: { methods: {
// 列表
getList() {
this.queryParams.sellerId = this.sellerId;
listWithdrawlog(this.queryParams).then(response => {
if (response) {
this.withdrawlogList = response.data.data;
this.total = response.data.count;
} else {
this.$message({message: '数据出错啦！', type: 'error'});
}
});
},
// 详情
viewDetails(row) {
},
/** 重置 搜索条件 */
resetQuery() {
this.queryParams = { // 查询参数
sellerId: 0,
searchTime: [],
refund_type: ''
}
this.currentPage = 1
this.pageSize = 20
this.getList();
},
handleSizeChange(val) {
this.pageSize = val
this.getList()
},
handleCurrentChange(val) {
this.currentPage = val
this.getList()
},
//-------------------------
//格式化状态 //格式化状态
formatType(row) { formatType(row) {
var types = row.Status var types = row.Status
...@@ -127,17 +182,7 @@ ...@@ -127,17 +182,7 @@
return newtime return newtime
}, },
/** 查询商户提现列表 */ /** 查询商户提现列表 */
getList() {
this.queryParams.sellerId = this.sellerId;
listWithdrawlog(this.queryParams).then(response => {
if (response) {
this.withdrawlogList = response.data.data;
this.total = response.data.count;
} else {
this.$message({message: '数据出错啦！', type: 'error'});
}
});
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
...@@ -163,6 +208,8 @@ ...@@ -163,6 +208,8 @@
} //methods结束 } //methods结束
}; };
</script> </script>
<style scoped lang="scss" type="text/stylus"> <style scoped>
.form-params .el-form-item {
margin: 10px 0 10px 10px;
}
</style> </style>
src/views/system/order/components/orderDetail.vue
浏览文件 @ 05803be4
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<img class="icon" src="@/assets/image/order/icon2.png" alt=""> <img class="icon" src="@/assets/image/order/icon2.png" alt="">
<span>买家信息</span> <span>买家信息</span>
</div> </div>
<el-button size="mini" type="primary" @click="modifyinfo" :disabled="orderDetail && orderDetail.status > 1">修改买家信息</el-button> <el-button size="mini" type="primary" @click="modifyinfo" :disabled="orderDetail.isEditBuyerInfo">修改买家信息</el-button>
</div> </div>
<div> <div>
<el-row class="row-title"> <el-row class="row-title">
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
</template> </template>
<script> <script>
import {orderInfo, sendOrder, expressInfoNew, remarkOrder, orderInfoEdit,deliveryOrderOne, deliveryOrderTwo, toReissueOrderData} from '@/api/module/order' import {orderInfo, sendOrder, expressInfoNew, remarkOrder, orderInfoEdit,deliveryOrder, deliveryOrderAgain, toReissueOrderData} from '@/api/module/order'
import {dateFormat} from '@/utils' import {dateFormat} from '@/utils'
import {getAreaList} from '@/api/module/retreat/address' import {getAreaList} from '@/api/module/retreat/address'
export default { export default {
...@@ -481,9 +481,8 @@ export default { ...@@ -481,9 +481,8 @@ export default {
express_sn: this.express_sn, // 快递单号 express_sn: this.express_sn, // 快递单号
//express_code: '' //express_code: ''
} }
//console.log(11111,paramsObj);
deliveryOrderOne(paramsObj).then(res=> { deliveryOrder(paramsObj).then(res=> {
if(res.code == 1) { if(res.code == 1) {
this.$message({type:'success',message:'发货成功'}); this.$message({type:'success',message:'发货成功'});
this.goShippingDialog = false this.goShippingDialog = false
...@@ -505,7 +504,7 @@ export default { ...@@ -505,7 +504,7 @@ export default {
//console.log("批量补单发货",listObj); //console.log("批量补单发货",listObj);
deliveryOrderTwo(listObj).then(res=> { deliveryOrderAgain(listObj).then(res=> {
if(res.code == 1) { if(res.code == 1) {
this.$message({type:'success',message:'补单发货成功'}); this.$message({type:'success',message:'补单发货成功'});
this.goShippingDialog = false this.goShippingDialog = false
...@@ -527,7 +526,7 @@ export default { ...@@ -527,7 +526,7 @@ export default {
paramsObj.order_goods_ids.push(this.goods_ids); paramsObj.order_goods_ids.push(this.goods_ids);
//console.log(11111,paramsObj); //console.log(11111,paramsObj);
deliveryOrderOne(paramsObj).then(res=> { deliveryOrder(paramsObj).then(res=> {
if(res.code == 1) { if(res.code == 1) {
this.$message({type:'success',message:'发货成功'}); this.$message({type:'success',message:'发货成功'});
this.goShippingDialog = false this.goShippingDialog = false
...@@ -552,7 +551,7 @@ export default { ...@@ -552,7 +551,7 @@ export default {
orderObj.express_sn = this.express_sn; orderObj.express_sn = this.express_sn;
singleOrderObj.list.push(orderObj); singleOrderObj.list.push(orderObj);
deliveryOrderTwo(singleOrderObj).then(res=> { deliveryOrderAgain(singleOrderObj).then(res=> {
if(res.code == 1) { if(res.code == 1) {
this.$message({type:'success',message:'补单发货成功'}); this.$message({type:'success',message:'补单发货成功'});
this.goShippingDialog = false this.goShippingDialog = false
...@@ -577,12 +576,37 @@ export default { ...@@ -577,12 +576,37 @@ export default {
}, },
/** 修改 买家信息 */ /** 修改 买家信息 */
modifyinfo() { modifyinfo() {
// console.log(580,this.orderDetail);
this.addressForm = { this.addressForm = {
shipping_name: '', shipping_name: '',
tel: '', tel: '',
address: '', address: '',
street: '' street: '',
areaList: []
}
if(this.orderDetail.real_name) {
this.addressForm.shipping_name = this.orderDetail.real_name;
}
if(this.orderDetail.mobile) {
this.addressForm.tel = this.orderDetail.mobile;
}
// if(this.orderDetail.provice && this.orderDetail.city && this.orderDetail.district) {
// this.addressForm.areaList.push(this.orderDetail.provice) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district
// this.addressForm.areaList.push(this.orderDetail.this.city) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district
// this.addressForm.areaList.push(this.orderDetail.district) //this.orderDetail.provice + this.orderDetail.city + this.orderDetail.district
// }else {
// this.addressForm.areaList = []
// }
if(this.orderDetail.street) {
this.addressForm.street = this.orderDetail.street;
} }
if(this.orderDetail.address) {
this.addressForm.address = this.orderDetail.address;
}
this.modifyinfoDialog = true this.modifyinfoDialog = true
}, },
/** 保存 买家信息 */ /** 保存 买家信息 */
...@@ -788,7 +812,7 @@ export default { ...@@ -788,7 +812,7 @@ export default {
align-items: center; align-items: center;
} }
/deep/.el-dialog__body { /deep/.el-dialog__body {
padding-bottom: 0; padding: 20px;
} }
/deep/.el-input--medium .el-input__inner { /deep/.el-input--medium .el-input__inner {
height: 28px; height: 28px;
...@@ -833,6 +857,7 @@ export default { ...@@ -833,6 +857,7 @@ export default {
.logistics { .logistics {
height: 600px; height: 600px;
overflow-y: auto; overflow-y: auto;
padding: 10px;
} }
/* 留言框样式 */ /* 留言框样式 */
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论