Skip to content

S
shop-new
提交 3ec7fe41 authored 作者: 王天霸's avatar 王天霸
浏览文件
操作

Merge branch '3.0.3'

上级 249f24e4 594037d2
隐藏空白字符变更
内嵌 并排
正在显示 包含 119 行增加 和 33 行删除
.env.development
浏览文件 @ 3ec7fe41
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
ENV = 'development' ENV = 'development'
# 正式环境 # 正式环境
VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1' #VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1'
# 测试环境 # 测试环境
#VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1' VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1' #VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1'
# 文档模块 直接调用 sys开放接口 # 文档模块 直接调用 sys开放接口
VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com' VUE_APP_BASE_SYS_API = 'http://sysapi.jxhh.com'
......
src/views/system/order/components/orderDetail.vue
浏览文件 @ 3ec7fe41
...@@ -341,18 +341,21 @@ export default { ...@@ -341,18 +341,21 @@ export default {
return isShow; return isShow;
}, },
/** 商品 发货状态 */ /** 商品 发货状态 */
goodsStatusFormatter(status) { goodsStatusFormatter(status) {
let res = '—'; let res = '—';
if (status == 0) { if (status == 0) {
res = '未发货' res = "待发货";
}else if (status == 1) { } else if (status == 1) {
res = '已发货' res = "已发货";
}else if (status == 2) { } else if (status == 2) {
res = '已收货' res = "已完成";
}else if (status == 3) { } else if (status == 3) {
res = '配货中' res = "配货中";
}else if (status == 4) { } else if (status == 4) {
res = '拒收' res = "拒收";
}else if (status == 5) {
res = "已收货";
} }
return res return res
}, },
...@@ -391,7 +394,7 @@ export default { ...@@ -391,7 +394,7 @@ export default {
return return
} }
for(let i = 0; i < this.multipleSelection.length; i++) { for(let i = 0; i < this.multipleSelection.length; i++) {
// 批量发货 goods_status 0:未发货,1:已发货,2:已收货,3:配货中,4：拒收 // 批量发货 goods_status 0:未发货,1:待收货,2:已收货,3:配货中,4：拒收
if (this.multipleSelection[i].goods_status > 0) { if (this.multipleSelection[i].goods_status > 0) {
this.$message({type: 'warning',message: '所选商品中部分已发货，请重新选择'}); this.$message({type: 'warning',message: '所选商品中部分已发货，请重新选择'});
isContinue = false isContinue = false
......
src/views/system/order/index.vue
浏览文件 @ 3ec7fe41
...@@ -3,15 +3,25 @@ ...@@ -3,15 +3,25 @@
<el-card class="box-cardone"> <el-card class="box-cardone">
<div style="position: relative;" class="clearfixall"> <div style="position: relative;" class="clearfixall">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="全部订单" name="fourth" >
<div slot="label">全部订单{{'（' + totalall + '）' }}</div>
</el-tab-pane>
<el-tab-pane name="first"> <el-tab-pane name="first">
<!--<div slot="label">待发货{{activeName == 'first' ? '（' + total1 + '）' : '（0）'}}</div>--> <!--<div slot="label">待发货{{activeName == 'first' ? '（' + total1 + '）' : '（0）'}}</div>-->
<div slot="label">待发货{{'（' + total1 + '）' }}</div> <div slot="label">待发货{{'（' + total1 + '）' }}</div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane name="second"> <el-tab-pane name="second">
<div slot="label">已发货{{'（' + total2 + '）' }}</div> <div slot="label">待收货{{'（' + total2 + '）' }}</div>
</el-tab-pane>
<el-tab-pane label="已收货" name="five">
<div slot="label">已收货{{'（' + total5 + '）' }}</div>
</el-tab-pane>
<el-tab-pane label="已完成" name="third">
<div slot="label">已完成{{'（' + total4 + '）' }}</div>
</el-tab-pane>
<el-tab-pane label="异常订单" name="six">
<div slot="label">异常订单{{'（' + total3 + '）' }}</div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="已完成" name="third"></el-tab-pane>
<el-tab-pane label="全部订单" name="fourth" ></el-tab-pane>
</el-tabs> </el-tabs>
<div v-show="activeName == 'first' " style="position: absolute; top: -2px; right: 0;"> <div v-show="activeName == 'first' " style="position: absolute; top: -2px; right: 0;">
<el-tooltip v-if="channel_id == 0" class="item" effect="dark" content="查看2021年10月8日23:00之前的订单" placement="bottom-end"> <el-tooltip v-if="channel_id == 0" class="item" effect="dark" content="查看2021年10月8日23:00之前的订单" placement="bottom-end">
...@@ -65,7 +75,16 @@ ...@@ -65,7 +75,16 @@
<el-option label="否" value="0"></el-option> <el-option label="否" value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="订单状态：" prop="status" v-show="activeName == 'fourth' ">
<el-select v-model="form.status" placeholder="请选择订单状态" style="width:150px;">
<el-option label="全部" value="-1"></el-option>
<el-option label="待发货" value="1"></el-option>
<el-option label="待收货" value="2"></el-option>
<el-option label="已收货" value="5"></el-option>
<el-option label="已完成" value="3"></el-option>
<el-option label="异常订单" value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="下单时间：" v-show="activeName == 'first' || activeName == 'fourth' "> <el-form-item label="下单时间：" v-show="activeName == 'first' || activeName == 'fourth' ">
<el-date-picker <el-date-picker
style="width:280px;" style="width:280px;"
...@@ -90,7 +109,17 @@ ...@@ -90,7 +109,17 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="收货时间：" v-show="activeName == 'five' ">
<el-date-picker
v-model="form.qiansTime"
type="daterange"
align="left"
unaLink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="完成时间：" v-show="activeName == 'third' "> <el-form-item label="完成时间：" v-show="activeName == 'third' ">
<el-date-picker <el-date-picker
v-model="form.finishTime" v-model="form.finishTime"
...@@ -346,20 +375,26 @@ ...@@ -346,20 +375,26 @@
pageSize: 20, pageSize: 20,
total: 0, total: 0,
total1: '',//待发货 total1: '',//待发货
total2: '',//已发货 total2: '',//待收货
activeName: 'first', total5:'',//已收货
total4:'',//已完成
total3:'',//异常订单
totalall:'',//全部订单
activeName: 'fourth',
form: { form: {
order_sn: '', order_sn: '',
goods_name: '', goods_name: '',
real_name: '', real_name: '',
Tel: '', Tel: '',
settlement_status: '', settlement_status: '',
status:'',
dateTime: [], dateTime: [],
finishTime: [], finishTime: [],
qiansTime:[],
sendTime: [], sendTime: [],
is_after_sale: '' is_after_sale: ''
}, },
goodsStatus: 1, goodsStatus: 0,
tableDataList: [], // 后台返回所有数据 tableDataList: [], // 后台返回所有数据
detailDialog: false, detailDialog: false,
isDeliveryOpen: false, isDeliveryOpen: false,
...@@ -475,6 +510,12 @@ ...@@ -475,6 +510,12 @@
/** 订单状态 */ /** 订单状态 */
orderStatusFormatter(status) { orderStatusFormatter(status) {
// <el-option label="全部" value="-1"></el-option>
// <el-option label="待发货" value="1"></el-option>
// <el-option label="待收货" value="2"></el-option>
// <el-option label="已收货" value="5"></el-option>
// <el-option label="已完成" value="3"></el-option>
// <el-option label="异常订单" value="4"></el-option>
if(status === -1) { if(status === -1) {
return '订单取消' return '订单取消'
}else if (status === 0) { }else if (status === 0) {
...@@ -486,7 +527,9 @@ ...@@ -486,7 +527,9 @@
}else if (status === 3) { }else if (status === 3) {
return '已完成' return '已完成'
}else if (status === 4) { }else if (status === 4) {
return '已结算' return '异常订单'
}else if (status === 5) {
return '已收货'
}else { }else {
return '' // 保险，返回空 return '' // 保险，返回空
} }
...@@ -538,6 +581,7 @@ ...@@ -538,6 +581,7 @@
Tel: '', Tel: '',
dateTime: [], dateTime: [],
finishTime: [], finishTime: [],
qiansTime:[],
sendTime: [], sendTime: [],
settlement_status: '', settlement_status: '',
is_after_sale: '' is_after_sale: ''
...@@ -554,16 +598,22 @@ ...@@ -554,16 +598,22 @@
switch (this.activeName) { switch (this.activeName) {
case 'first': case 'first':
this.goodsStatus = 1 this.goodsStatus = 1 //待发货
break break
case 'second': case 'second':
this.goodsStatus = 2 this.goodsStatus = 2 //待收货
break break
case 'third': case 'third':
this.goodsStatus = 3 this.goodsStatus = 3 //已完成。
break
case 'five':
this.goodsStatus = 5 //已收货
break
case 'six':
this.goodsStatus = 4 //异常订单
break break
case 'fourth': case 'fourth':
this.goodsStatus = 0 this.goodsStatus = 0 //全部订单
break break
// case 'oldVersion': // case 'oldVersion':
// window.open('http://oldpop.jxhh.com/') // window.open('http://oldpop.jxhh.com/')
...@@ -584,12 +634,30 @@ ...@@ -584,12 +634,30 @@
getOrderTabData().then(res => { getOrderTabData().then(res => {
//console.log("获取订单状态和对应订单数量",res); //console.log("获取订单状态和对应订单数量",res);
if (res.code === 1 && res.data.length > 0) { if (res.code === 1 && res.data.length > 0) {
// 1 表示 代发货；2 表示 已发货 // 1 表示 代发货；2 表示 待收货
for (let i = 0; i < res.data.length; i++) { for (let i = 0; i < res.data.length; i++) {
if (res.data[i].Status === 1) { // total1: '',//待发货
this.total1 = res.data[i].Count > 999 ? '999+' : res.data[i].Count; // total2: '',//待收货
} else if (res.data[i].Status === 2) { // total5:'',//已收货
this.total2 = res.data[i].Count > 999 ? '999+' : res.data[i].Count; // total4:'',//已完成
// total3:'',//异常订单
// totalall:'',//全部订单
if (res.data[i].status === 1) {//待发货
this.total1 = res.data[i].count > 999 ? '999+' : res.data[i].count;
} else if (res.data[i].status === 2) {//待收货
this.total2 = res.data[i].count > 999 ? '999+' : res.data[i].count;
}
else if (res.data[i].status === 3) {//已完成
this.total4 = res.data[i].count > 999 ? '999+' : res.data[i].count;
}
else if (res.data[i].status === 5) {//已收货
this.total5 = res.data[i].count > 999 ? '999+' : res.data[i].count;
}
else if (res.data[i].status === 4) {//异常订单
this.total3 = res.data[i].count > 999 ? '999+' : res.data[i].count;
}
else if (res.data[i].status === 0) {//全部订单
this.totalall = res.data[i].count > 999 ? '999+' : res.data[i].count;
} }
} }
} }
...@@ -607,7 +675,7 @@ ...@@ -607,7 +675,7 @@
page: this.currentPage, page: this.currentPage,
limit: this.pageSize, limit: this.pageSize,
seller_id: this.sellerId, seller_id: this.sellerId,
status: this.goodsStatus,
} }
// if(this.$route.query.timeout==24){ // if(this.$route.query.timeout==24){
// params.is_time_out=true // params.is_time_out=true
...@@ -628,6 +696,17 @@ ...@@ -628,6 +696,17 @@
params['is_after_sale'] = this.form.is_after_sale params['is_after_sale'] = this.form.is_after_sale
} }
if(this.goodsStatus==0) {
if(this.form.status == '' || this.form.status == '-1'){
params['status'] = this.goodsStatus
}
else{
params['status'] = this.form.status
}
}else{
params['status'] = this.goodsStatus
}
if (this.form.settlement_status == '0' || this.form.settlement_status == '1') { if (this.form.settlement_status == '0' || this.form.settlement_status == '1') {
params['settlement_status'] = this.form.settlement_status params['settlement_status'] = this.form.settlement_status
} }
...@@ -641,7 +720,11 @@ ...@@ -641,7 +720,11 @@
params['finish_start_time'] = new Date(this.form.finishTime[0]).getTime() / 1000; params['finish_start_time'] = new Date(this.form.finishTime[0]).getTime() / 1000;
params['finish_end_time'] = new Date(this.form.finishTime[1]).getTime() / 1000; params['finish_end_time'] = new Date(this.form.finishTime[1]).getTime() / 1000;
} }
if(this.form.qiansTime && this.form.qiansTime.length == 2) {
params['sign_order_start_time'] = new Date(this.form.qiansTime[0]).getTime() / 1000;
params['sign_order_end_time'] = new Date(this.form.qiansTime[1]).getTime() / 1000;
}
if(this.form.sendTime && this.form.sendTime.length == 2) { if(this.form.sendTime && this.form.sendTime.length == 2) {
params['send_start_time'] = new Date(this.form.sendTime[0]).getTime() / 1000; params['send_start_time'] = new Date(this.form.sendTime[0]).getTime() / 1000;
params['send_end_time'] = new Date(this.form.sendTime[1]).getTime() / 1000; params['send_end_time'] = new Date(this.form.sendTime[1]).getTime() / 1000;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论