Skip to content

S
shop-new
提交 2261701c authored 作者: PC-20210205TDZC\Administrator's avatar PC-20210205TDZC\Administrator
浏览文件
操作

Merge branch 'dev_hxz' of http://120.27.146.32:8888/wangfulong/shop-new into dev_hxz

上级 5e13b566 5f0d535c
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 2547 行增加 和 695 行删除
src/api/module/bankcard.js
浏览文件 @ 2261701c
import request from '@/utils/request' import request from '@/utils/request'
// 查询bankcard列表 // 查询bankcard列表
export function listBankcard(query) { // export function listBankcard(query) {
return request({ // return request({
url: '/system/bankcard/list', // url: '/system/bankcard/list',
method: 'get', // method: 'get',
params: query // params: query
}) // })
} // }
// 查询银行名称列表 // 查询银行名称列表
export function listBankname(query) { // export function listBankname(query) {
// return request({
// url: '/system/bankcard/getBankList',
// method: 'get',
// params: query
// })
// }
// 查询bankcard详细
// export function getBankcard (id) {
// return request({
// url: '/system/bankcard/edit?id='+id,
// method: 'get'
// })
// }
// 修改bankcard
// export function updateBankcard(data) {
// return request({
// url: '/system/bankcard/edit',
// method: 'post',
// data: data
// })
// }
// 删除bankcard
// export function delBankcard(ids) {
// return request({
// url: '/system/bankcard/delete',
// method: 'delete',
// data:{id:ids}
// })
// }
// 我的资产 页面 所有数据
export function getMyAssetListData(data) {
return request({
url: '/local/assets/list',
method: 'post',
data: data
})
}
// 获取 主体信息
export function getOrganizationData(query) {
return request({ return request({
url: '/system/bankcard/getBankList', url: '/local/getOrganization',
method: 'get', method: 'get',
params: query params: query
}) })
} }
// 查询bankcard详细 // 新增 银行卡 信息
export function getBankcard (id) { export function addBankcardData(data) {
return request({ return request({
url: '/system/bankcard/edit?id='+id, url: '/system/bank/add',
method: 'get' method: 'post',
data: data
}) })
} }
// 编辑 银行卡 信息
export function editBankcardData(data) {
return request({
url: '/system/bank/update',
method: 'post',
data: data
})
}
// 新增bankcard // 获取 银行卡 详情
export function addBankcard(data) { export function getBankDetailsData(data) {
return request({ return request({
url: '/system/bankcard/add', url: '/system/bank/detail',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 修改bankcard // 获取商户银行卡列表
export function updateBankcard(data) { export function getBankcardListData(data) {
return request({ return request({
url: '/system/bankcard/edit', url: '/system/bank/list',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 删除bankcard // 账户 删除
export function delBankcard(ids) { export function delBankcardData(data) {
return request({ return request({
url: '/system/bankcard/delete', url: '/system/bank/delete',
method: 'delete', method: 'post',
data:{id:ids} data: data
}) })
} }
// 收支明细 列表
export function getBalanceList(data) {
return request({
url: '/local/asset/getSellerBalanceLogList',
method: 'post',
data: data
})
}
// 提现记录 列表
export function getWithdrawData(data) {
return request({
url: '/system/withdrawlog/list',
method: 'post',
data: data
})
}
// 提现记录 详情
export function getWithdrawlogDetailsData(data) {
return request({
url: '/system/withdrawlog/info',
method: 'post',
data: data
})
}
// 导出商品明细
export function exportGoodsDetailsData(data) {
return request({
url: '/system/withdrawlog/exportWithdrawOrderGoods',
method: 'post',
data: data
})
}
// 获取 所有物流信息
export function getExpressListData(query) {
return request({
url: '/system/order/expressList',
method: 'get',
params: query
})
}
// 上传 发票 图片
export function upLoadImg (data) {
return request({
url: '/system/goodsNew/uploadImage',
method: 'post',
data: data
});
}
// 补充发票
export function addInvoiceData (data) {
return request({
url: '/system/withdrawlog/updateInvoice',
method: 'post',
data: data
});
}
// 获取验证码
export function getCheckCodeData(data) {
return request({
url: '/system/withdrawlog/getCheckCode',
method: 'post',
data: data
})
}
// 提交 提现申请
export function applyWithdraw(data) {
return request({
url: '/system/withdrawlog/applyWithdraw',
method: 'post',
data: data
})
}
src/api/module/newasset.js 0 → 100644
浏览文件 @ 2261701c
import request from '@/utils/request'
/** 我的资产 */
// 获取 银行卡 信息
export function getBankcardListData(query) {
return request({
url: '/system/asset/list11',
method: 'get',
params: query
})
}
src/api/module/order.js
浏览文件 @ 2261701c
...@@ -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
浏览文件 @ 2261701c
...@@ -2,29 +2,84 @@ ...@@ -2,29 +2,84 @@
<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">结算流水</p> <el-form class="form-params" :model="queryParams" :inline="true" size="small">
<el-form-item label="关联订单单号：" prop="order_sn">
<el-input
v-model="queryParams.order_sn"
placeholder="请输入关联订单单号"
clearable
style="width:230px"
/></el-form-item>
<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="change_type">
<el-select v-model="queryParams.change_type" placeholder="全部类型" clearable style="width:130px">
<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" :height="tableHeight" :data="assetList"> <el-table v-loading="loading" :height="tableHeight" :data="balanceList">
<el-table-column label="ID" align="center" prop="Id"/> <!-- <template slot-scope="scope">-->
<el-table-column label="流水订单号" align="center" prop="BalanceSn"/> <!-- <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>-->
<el-table-column label="变动金额" align="center" prop="ChangeMoney"/> <!-- </template>-->
<el-table-column label="变动类型" align="center" :formatter="formatType" prop="ChangeType"/> <el-table-column label="序号" align="center" width="55">
<el-table-column label="时间" align="center" :formatter="formatTime" prop="AddTime"/> <template slot-scope="scope">
<el-table-column label="描述" align="center" prop="Des"/> <span>{{ scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="流水订单号" align="center" prop="balance_sn"></el-table-column>
<el-table-column label="变动金额" align="center" prop="change_money" width="130">
<template slot-scope="scope">
<span>{{ scope.row.change_money / 100 }}</span>
</template>
</el-table-column>
<el-table-column label="变动类型" align="center" prop="change_type" width="130">
<template slot-scope="scope">
<span v-if="scope.row.change_type == 1">增加</span>
<span v-if="scope.row.change_type == 2">减少</span>
</template>
</el-table-column>
<el-table-column label="变动描述" align="center" prop="des"></el-table-column>
<el-table-column label="变动时间" align="center" :formatter="formatTime" prop="add_time"></el-table-column>
<el-table-column label="关联订单单号" align="center" prop="links_des"></el-table-column>
</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>
<script> <script>
import { import { getBalanceList } from '@/api/module/bankcard'
listAsset,
getAsset,
delAsset,
addAsset,
updateAsset
} from '@/api/module/asset'
import { import {
dateFormat dateFormat
} from '@/utils' } from '@/utils'
...@@ -32,25 +87,24 @@ ...@@ -32,25 +87,24 @@
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, sellerId: 0,
pageSize: 10, order_sn: '',
sellerId: 0 searchTime: [],
change_type: ''
}, },
form: {}, // 表单参数 total: 0,
rules: {} // 表单校验 currentPage: 1,
pageSize: 20,
balanceList: [],
}; };
}, },
created() { created() {
this.queryParams.sellerId = this.$store.state.user.sellerid // this.queryParams.sellerId = this.$store.state.user.sellerid
/** 查询 收支明细 列表 */
this.getList(); this.getList();
this.$nextTick(() => { this.$nextTick(() => {
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
...@@ -59,23 +113,71 @@ ...@@ -59,23 +113,71 @@
watch: { watch: {
fullHeight(val) { fullHeight(val) {
let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight let formHeight = document.getElementsByClassName('clearfix')[0].clientHeight
this.tableHeight = val - formHeight - 120; this.tableHeight = val - formHeight - 100;
} }
}, },
methods: { methods: {
formatType(row) { /** 列表查询 */
var types = row.ChangeType getList() {
var optDes = '' let params = {
if (types == 1) { page: this.currentPage,
optDes = "增加" limit: this.pageSize,
} else if (types == 2) { }
optDes = "减少"
if(this.queryParams.order_sn != '') {
params['order_sn'] = this.queryParams.order_sn
}
if(this.queryParams.change_type == '') {
params['change_type'] = 0
}else {
params['change_type'] = this.queryParams.change_type
}
if( this.queryParams.searchTime && this.queryParams.searchTime.length == 2) {
params['start_time'] = new Date(this.queryParams.searchTime[0]).getTime() / 1000;
params['end_time'] = new Date(this.queryParams.searchTime[1]).getTime() / 1000;
}
getBalanceList(params).then(res => {
if(res.code == 1) {
this.balanceList = res.data.list;
this.total = res.data.count;
}else {
let msg = res.message ? res.message : '查询失败'
this.$message({type: 'error', message: msg});
}
});
},
/** 重置 搜索条件 */
resetQuery() {
this.queryParams = { // 查询参数
sellerId: 0,
order_sn: '',
searchTime: [],
change_type: ''
} }
return optDes this.currentPage = 1
this.pageSize = 20
this.getList();
},
handleSizeChange(val) {
this.pageSize = val
this.getList()
},
handleCurrentChange(val) {
this.currentPage = val
this.getList()
}, },
//格式化时间 /** 输入搜索条件后，enter 查询 暂时未用 */
handleQuery() {
},
/** 时间格式化 */
formatTime(row) { formatTime(row) {
let Time = row.AddTime; let Time = row.add_time;
let newtime = ""; let newtime = "";
if (Time > 0) { if (Time > 0) {
newtime = dateFormat(Time * 1000, "Y-m-d H:i:s"); newtime = dateFormat(Time * 1000, "Y-m-d H:i:s");
...@@ -85,27 +187,23 @@ ...@@ -85,27 +187,23 @@
//格式化价格 //格式化价格
formatMoney(row) { formatMoney(row) {
var nm = 0; var nm = 0;
var money = row.ChangeMoney; var money = row.change_money;
if (money > 0) { if (money > 0) {
nm = money / 1000 nm = money / 1000
} }
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/explain/index.vue 0 → 100644
浏览文件 @ 2261701c
<template>
<div class="app-container">
<el-card class="box-card explain">
<div class="pre-details">
<p>1、账户资产说明</p>
<p>（1）、当前余额：是指您当前账户里面的余额，该部分余额包含【可提现余额】和【提现中的金额】</p>
<p>（2）、可提现余额：是指您可以操作提现的余额</p>
<p>（3）、提现中的金额：是指您当前进行中的提现金额，提现中的金额在完成打款前会暂时冻结，直到打款完成</p>
<p>三者的关系：当前余额=可提现余额+提现中的金额</p>
</div>
<div class="pre-details">
<p>2、相关名词说明</p>
<p>（1）、结算：指订单完成并过售后期，订单金额结算到您的可提现余额账户中</p>
<p>（2）、提现：指您操作提现，将可提现余额账户中的钱提现至您的银行卡中</p>
</div>
<div class="pre-details">
<p>3、提现账户管理</p>
<p>（1）、提现账户必须为企业对公账户，且对公账户名称与认证的主体一致</p>
<p>（2）、提现账户不支持个人账户，不支持支付宝账户</p>
<p>（3）、对公账户最多只能添加三个</p>
</div>
<div class="pre-details">
<p>4、提现要求</p>
<p>（1）、提供正确、合规的企业对公账户</p>
<p>（2）、提供提现金额对应订单商品的发票及明细</p>
<p>（3）、提现金额最低要求为100元，如果您的可提现账户余额不足100元，则暂无法提现</p>
</div>
<div class="pre-details">
<p>5、订单结算</p>
<p>（1）、订单自发货日期，10天后自动确认收货，15天后过售后期，订单金额自动结算到可提现余额账户中</p>
<p>（2）、售后中的订单、失效订单等订单不会结算</p>
</div>
<div class="pre-details">
<p>6、操作提现</p>
<p>（1）、在【我的资产】中，点击提现按钮，根据提示验证支付密码及手机验证码，验证通过后即可提现</p>
<p>（2）、操作提现时，提现的金额为全部的可提现余额，不允许手动输入金额</p>
<p>（3）、操作提现时，会产生提现手续费，手续费收取标准请参照本文第5条</p>
<p>（4）、实际到账金额=提现金额-提现手续费，请以实际到账为准</p>
</div>
<div class="pre-details">
<p>7、提现周期</p>
<p>（1）、工作日当日12:00之前提交的提现，1-5个工作日内安排打款，工作日当日12:00之后提现的金额，次日开始，1-5个工作日安排打款，节假日顺延</p>
<p>（2）、银行卡到账时间：打款后0-2个工作日到账 （具体请咨询所属银行）</p>
</div>
<div class="pre-details">
<p>8、提现收续费收取标准</p>
<p>
<img width="712px" src="@/assets/image/withdraw-charges.png" alt="">
</p>
</div>
<div class="pre-details">
<p>9、提现流程</p>
<p>
<img width="712px" src="@/assets/image/withdraw-process.png" alt="">
</p>
</div>
<div class="pre-details">
<p>10、发票信息</p>
<p>（1）、发票抬头：北京胜天半子科技有限公司</p>
<p>（2）、纳税人识别号：911016513F1ECWX</p>
</div>
<div class="pre-details">
<p>11、联系我们</p>
<p>（1）、客服电话：4000-188-199</p>
<p>（2）、公司地址：北京市丰台区诺德中心一期四号楼21层</p>
</div>
</el-card>
</div>
</template>
<script>
export default {
name: "Explain",
data() {
return {}
}
}
</script>
<style scoped>
/deep/.explain .el-card__body {
height: 100%;
/*padding: 30px 20px;*/
overflow: auto;
color: #333;
font-size: 14px;
}
.pre-details {
margin: 40px 50px;
}
</style>
src/views/system/asset/myAsset/index.vue 0 → 100644
浏览文件 @ 2261701c
差异被折叠。
src/views/system/asset/wddetails.vue 0 → 100644
浏览文件 @ 2261701c
差异被折叠。
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @ 2261701c
...@@ -379,9 +379,9 @@ ...@@ -379,9 +379,9 @@
if(res.data) { if(res.data) {
urlObj.url = res.data.image_url; urlObj.url = res.data.image_url;
this.goodsImgFileList.push(urlObj); this.goodsImgFileList.push(urlObj);
this.goodsImgFileList.forEach(item=> { // this.goodsImgFileList.forEach(item=> {
this.goodsInfoForm.imgs.push(item.url) // this.goodsInfoForm.imgs.push(item.url)
}) // })
this.$message({type:'success',message:'图片上传成功'}); this.$message({type:'success',message:'图片上传成功'});
// 只清除一次，不浪费哦 // 只清除一次，不浪费哦
if(this.goodsImgFileList.length === 1) { if(this.goodsImgFileList.length === 1) {
......
src/views/system/retreat/address.vue
浏览文件 @ 2261701c
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
/> />
</el-card> </el-card>
<!-- 新增、修改 --> <!-- 新增、修改 -->
<el-dialog :title="addTitle" :visible.sync="isOpen" width="50%" class="add-edit"> <el-dialog :title="addTitle" :visible.sync="isOpen" width="40%" class="add-edit" center :before-close="cancel">
<el-form v-if="isOpen" :model="addressForm" :rules="addressRules" ref="addressForm" label-width="100px"> <el-form v-if="isOpen" :model="addressForm" :rules="addressRules" ref="addressForm" label-width="100px" size="small">
<el-row> <el-row>
<el-col :span="16" :offset="3"> <el-col :span="16" :offset="3">
<el-form-item label="联系人：" prop="contact_person"> <el-form-item label="联系人：" prop="contact_person">
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer" > <div slot="footer" class="dialog-footer" >
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel" size="small">取 消</el-button>
<el-button type="primary" @click="save('addressForm')">确 定</el-button> <el-button type="primary" @click="save('addressForm')" size="small">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
}, },
// 售后地址列表 // 售后地址列表
addressList:[], addressList:[],
addTitle: '新增/修改', // 新增，修改 弹窗名 addTitle: '', // 新增，修改 弹窗名
// 新增、修改表单 // 新增、修改表单
addressForm: { addressForm: {
id: 0, id: 0,
...@@ -239,10 +239,9 @@ ...@@ -239,10 +239,9 @@
handleAdd() { handleAdd() {
this.isOpen = true; this.isOpen = true;
this.addTitle = "新增地址"; this.addTitle = "新增地址";
this.areaList = [];
this.resetForm('addressForm');
}, },
/** 删除 */
handleDelete(row) { handleDelete(row) {
const roleIds = row.id || this.ids; const roleIds = row.id || this.ids;
this.$confirm('是否确认删除编号为"' + roleIds + '"的数据项？', '确认信息', { this.$confirm('是否确认删除编号为"' + roleIds + '"的数据项？', '确认信息', {
...@@ -257,13 +256,13 @@ ...@@ -257,13 +256,13 @@
}).catch(action => {}); }).catch(action => {});
}, },
// 修改 /** 修改 */
handleUpdate(row) { handleUpdate(row) {
this.areaList = [];
const roleIds = row.id || this.ids; const roleIds = row.id || this.ids;
this.loading = true; this.loading = true;
getAddressDetails(roleIds).then(res => { getAddressDetails(roleIds).then(res => {
if(res.data) { if(res.data) {
this.addTitle = "编辑地址";
this.isOpen = true; this.isOpen = true;
// 处理 三级联动回显 // 处理 三级联动回显
let areaListAry = res.data.address_ids ? res.data.address_ids.split(",") : []; let areaListAry = res.data.address_ids ? res.data.address_ids.split(",") : [];
...@@ -275,11 +274,14 @@ ...@@ -275,11 +274,14 @@
this.loading = false; this.loading = false;
}); });
}, },
/** 取消 新增售后地址 */
cancel() { cancel() {
this.areaList = []; //
this.resetForm('addressForm'); this.resetAddressForm();
this.isOpen = false; this.isOpen = false;
}, },
/** 保存 */
save(form) { save(form) {
if(typeof this.addressForm.address_ids === "string") { if(typeof this.addressForm.address_ids === "string") {
let areaListAry = this.addressForm.address_ids.split(","); let areaListAry = this.addressForm.address_ids.split(",");
...@@ -299,7 +301,8 @@ ...@@ -299,7 +301,8 @@
}else { }else {
this.$message({ message: '修改成功', type: 'success'}); this.$message({ message: '修改成功', type: 'success'});
} }
this.resetAddressForm();
this.isOpen = false;
this.getList(); this.getList();
}else if( res.code === 0){ }else if( res.code === 0){
if(res.msg) { if(res.msg) {
...@@ -308,12 +311,21 @@ ...@@ -308,12 +311,21 @@
this.$message({ message: '新增失败', type: 'error'}); this.$message({ message: '新增失败', type: 'error'});
} }
} }
this.resetForm('addressForm');
this.isOpen = false;
}); });
} }
}); });
}, },
/** 初始化 添加 地址 表单 数据 */
resetAddressForm() {
this.addressForm = {
id: 0,
contact_person: '',
contact_phone: '',
address_ids: [],
address: ''
}
this.areaList = [];
},
// //
handleChanges(value) { handleChanges(value) {
//this.areaList = value; //this.areaList = value;
......
src/views/system/retreat/retreat/index.vue
浏览文件 @ 2261701c
...@@ -18,18 +18,17 @@ ...@@ -18,18 +18,17 @@
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
@change="applyTimeChange"
:picker-options="pickerOptions"> :picker-options="pickerOptions">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="商品ID" prop="goods_id"> <!-- <el-form-item label="商品ID" prop="goods_id">-->
<el-input <!-- <el-input-->
v-model="queryParams.goods_id" <!-- v-model="queryParams.goods_id"-->
placeholder="请输入商品id" <!-- placeholder="请输入商品id"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/></el-form-item> <!-- /></el-form-item>-->
<el-form-item label="商品名称" prop="goods_title"> <el-form-item label="商品名称" prop="goods_title">
<el-input <el-input
...@@ -40,7 +39,7 @@ ...@@ -40,7 +39,7 @@
/></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 width="120px">
<el-option v-for="item in userNeedOptions" :key="item.value" :label="item.label" <el-option v-for="item in userNeedOptions" :key="item.value" :label="item.label"
:value="item.value"></el-option> :value="item.value"></el-option>
</el-select> </el-select>
...@@ -48,6 +47,7 @@ ...@@ -48,6 +47,7 @@
<el-form-item label="订单号" prop="goods_order_sn"> <el-form-item label="订单号" prop="goods_order_sn">
<el-input <el-input
style="width:250px;"
v-model="queryParams.goods_order_sn" v-model="queryParams.goods_order_sn"
placeholder="请输入订单号" placeholder="请输入订单号"
clearable clearable
...@@ -62,14 +62,14 @@ ...@@ -62,14 +62,14 @@
</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" size="mini" @click="searchList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 列表 --> <!-- 列表 -->
<el-table class="after-sale-table" :data="afterSaleList" :height="afterSaleHeight"> <el-table class="after-sale-table" :data="afterSaleList" :height="afterSaleHeight">
<el-table-column label="商品ID" align="center" width="150" prop="goodsId"></el-table-column> <!-- <el-table-column label="商品ID" align="center" width="150" prop="goodsId"></el-table-column>-->
<el-table-column label="商品名称" align="center" width="180" prop="title"></el-table-column> <el-table-column label="商品名称" align="center" width="280" prop="title"></el-table-column>
<el-table-column label="订单号" align="center" width="240" prop="goods_order_sn"></el-table-column> <el-table-column label="订单号" align="center" width="240" prop="goods_order_sn"></el-table-column>
<el-table-column label="退换货类型" align="center" width="180"> <el-table-column label="退换货类型" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -104,13 +104,14 @@ ...@@ -104,13 +104,14 @@
<!-- 分页 --> <!-- 分页 -->
<div class="pagination-con"> <div class="pagination-con">
<el-pagination <el-pagination
@size-change="handleSizeChange" :page-size="pageSize"
@current-change="handleCurrentChange"
:current-page="currentPage" :current-page="currentPage"
:page-sizes="[20, 40, 60, 80, 100]" :page-sizes="[20, 40, 60, 80, 100]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total"> :total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
...@@ -127,8 +128,9 @@ ...@@ -127,8 +128,9 @@
goodsStatus: 1, goodsStatus: 1,
activeName: 'first', activeName: 'first',
queryParams: { queryParams: {
status: 0,
applyTime: [], applyTime: [],
goods_id: '', // goods_id: '',
goods_title: '', goods_title: '',
refund_type: '', refund_type: '',
goods_order_sn: '', goods_order_sn: '',
...@@ -163,9 +165,9 @@ ...@@ -163,9 +165,9 @@
}, },
// 退换货类型 // 退换货类型
userNeedOptions: [ userNeedOptions: [
{value: -1,label: '全部类型'}, {value: -1, label: '全部类型'},
{value: 1,label: '仅退款'}, {value: 1, label: '仅退款'},
{value: 2,label: '退货退款'}, {value: 2, label: '退货退款'},
], ],
// 退换货原因 // 退换货原因
needMsgOptions: [ needMsgOptions: [
...@@ -178,7 +180,7 @@ ...@@ -178,7 +180,7 @@
fullHeight: 0, fullHeight: 0,
afterSaleHeight: 200, afterSaleHeight: 200,
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 20,
total: 0, total: 0,
// 售后列表 // 售后列表
afterSaleList: [], afterSaleList: [],
...@@ -193,19 +195,20 @@ ...@@ -193,19 +195,20 @@
} }
}, },
created() { created() {
this.getList(); this.searchList();
this.$nextTick(() => { this.$nextTick(() => {
this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
}) })
}, },
mounted() { mounted() {},
},
methods: { methods: {
/** 顶部 状态页签切换 /** 顶部 状态页签切换
* 1-未处理；2-处理中；3-已完成 * 1-未处理；2-处理中；3-已完成
* */ * */
handleClick() { handleClick() {
// 搜索条件初始化
this.resetSearchParams();
switch (this.activeName) { switch (this.activeName) {
case 'first': case 'first':
this.goodsStatus = 1 this.goodsStatus = 1
...@@ -219,16 +222,18 @@ ...@@ -219,16 +222,18 @@
default: default:
break break
} }
// 搜索条件初始化
this.resetSearchParams();
// 列表 查询 // 列表 查询
this.getList(); this.getList();
}, },
/** 时间格式处理 */ /** 时间格式处理 */
applyTimeChange() { // applyTimeChange() {
if( !Array.isArray(this.queryParams.applyTime) ) { // if( !Array.isArray(this.queryParams.applyTime) ) {
this.queryParams.applyTime = []; // this.queryParams.applyTime = [];
} // }
// },
searchList() {
this.currentPage = 1;
this.getList();
}, },
/** 列表查询 */ /** 列表查询 */
getList() { getList() {
...@@ -236,35 +241,27 @@ ...@@ -236,35 +241,27 @@
page: this.currentPage, page: this.currentPage,
limit: this.pageSize, limit: this.pageSize,
status: this.goodsStatus, status: this.goodsStatus,
apply_start_time: '',
apply_end_time: '',
goods_id: this.queryParams.goods_id,
goods_title: this.queryParams.goods_title,
refund_type: '',
goods_order_sn: '',
reason: ''
} }
// console.log('queryParams：',this.queryParams);
//console.log('传向后台的参数：',params);
if( this.queryParams.applyTime.length === 2) { if( this.queryParams.applyTime && this.queryParams.applyTime.length === 2) {
params.apply_start_time = new Date(this.queryParams.applyTime[0]).getTime() / 1000 params['apply_start_time'] = new Date(this.queryParams.applyTime[0]).getTime() / 1000
params.apply_end_time = new Date(this.queryParams.applyTime[1]).getTime() / 1000 params['apply_end_time'] = new Date(this.queryParams.applyTime[1]).getTime() / 1000
}else { }
params.apply_start_time = ''
params.apply_end_time = '' if (this.queryParams.goods_title != '') {
params['goods_title'] = this.queryParams.goods_title;
} }
if (this.queryParams.refund_type === -1) { if (this.queryParams.refund_type != -1 && this.queryParams.refund_type != '') {
params.refund_type = '' params['refund_type'] = this.queryParams.refund_type;
}else {
params.refund_type = this.queryParams.refund_type;
} }
if (this.queryParams.reason === -1) { if (this.queryParams.goods_order_sn != '') {
params.reason = '' params['goods_order_sn'] = this.queryParams.goods_order_sn;
}else { }
params.reason = this.queryParams.reason;
if (this.queryParams.reason != -1 && this.queryParams.reason != '') {
params['reason'] = this.queryParams.reason;
} }
getRetreatList(params).then(res=> { getRetreatList(params).then(res=> {
...@@ -291,21 +288,21 @@ ...@@ -291,21 +288,21 @@
/** 调整 列表当前页面 最大展示条数 */ /** 调整 列表当前页面 最大展示条数 */
handleSizeChange(val) { handleSizeChange(val) {
this.pageSize = val; this.pageSize = val;
// this.getList(); this.getList();
}, },
/** 列表 跳转到 第 几 页 */ /** 列表 跳转到 第 几 页 */
handleCurrentChange(val) { handleCurrentChange(val) {
this.currentPage = val this.currentPage = val
// this.getList(); this.getList();
}, },
/** 搜索条件初始化 */ /** 搜索条件初始化 */
resetSearchParams() { resetSearchParams() {
this.pageSize = 10; this.pageSize = 20;
this.currentPage = 1; this.currentPage = 1;
// this.goodsStatus = 1;
this.queryParams = { this.queryParams = {
status: 0,
applyTime: [], applyTime: [],
goods_id: '', //goods_id: '',
goods_title: '', goods_title: '',
refund_type: '', refund_type: '',
goods_order_sn: '', goods_order_sn: '',
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论