Skip to content

Commit

Permalink
订单功能完成
Browse files Browse the repository at this point in the history
  • Loading branch information
zhh committed Oct 30, 2018
1 parent d9220d9 commit 21664cd
Show file tree
Hide file tree
Showing 4 changed files with 284 additions and 64 deletions.
8 changes: 8 additions & 0 deletions src/api/order.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,11 @@ export function updateMoneyInfo(data) {
data:data
});
}

export function updateOrderNote(params) {
return request({
url:'/order/update/note',
method:'post',
params:params
})
}
59 changes: 59 additions & 0 deletions src/views/oms/order/components/logisticsDialog.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<template
<el-dialog title="订单跟踪"
:visible.sync="visible"
:before-close="handleClose"
width="40%">
<el-steps direction="vertical"
:active="6"
finish-status="success"
space="50px">
<el-step v-for="item in logisticsList"
:key="item.name"
:title="item.name"
:description="item.time"></el-step>
</el-steps>
</el-dialog>
</template>
<script>
const defaultLogisticsList=[
{name: '订单已提交,等待付款',time:'2017-04-01 12:00:00 '},
{name: '订单付款成功',time:'2017-04-01 12:00:00 '},
{name: '在北京市进行下级地点扫描,等待付款',time:'2017-04-01 12:00:00 '},
{name: '在分拨中心广东深圳公司进行卸车扫描,等待付款',time:'2017-04-01 12:00:00 '},
{name: '在广东深圳公司进行发出扫描',time:'2017-04-01 12:00:00 '},
{name: '到达目的地网点广东深圳公司,快件将很快进行派送',time:'2017-04-01 12:00:00 '},
{name: '订单已签收,期待再次为您服务',time:'2017-04-01 12:00:00 '}
];
export default {
name:'logisticsDialog',
props: {
value: Boolean
},
computed:{
visible: {
get() {
return this.value;
},
set(visible){
this.value=visible;
}
}
},
data() {
return {
logisticsList:Object.assign({},defaultLogisticsList)
}
},
methods:{
emitInput(val) {
this.$emit('input', val)
},
handleClose(){
this.emitInput(false);
}
}
}
</script>
<style></style>


9 changes: 7 additions & 2 deletions src/views/oms/order/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,13 @@
<el-button type="primary" @click="handleCloseOrderConfirm">确 定</el-button>
</span>
</el-dialog>
<logistics-dialog v-model="logisticsDialogVisible"></logistics-dialog>
</div>
</template>
<script>
import {fetchList,closeOrder,deleteOrder} from '@/api/order'
import {formatDate} from '@/utils/date';
import LogisticsDialog from '@/views/oms/order/components/logisticsDialog';
const defaultListQuery = {
pageNum: 1,
pageSize: 10,
Expand All @@ -193,6 +194,7 @@
};
export default {
name: "orderList",
components:{LogisticsDialog},
data() {
return {
listQuery: Object.assign({}, defaultListQuery),
Expand Down Expand Up @@ -262,6 +264,7 @@
value: 3
}
],
logisticsDialogVisible:false
}
},
created() {
Expand Down Expand Up @@ -326,7 +329,9 @@
let listItem = this.covertOrder(row);
this.$router.push({path:'/oms/deliverOrderList',query:{list:[listItem]}})
},
handleViewLogistics(index, row){},
handleViewLogistics(index, row){
this.logisticsDialogVisible=true;
},
handleDeleteOrder(index, row){
let ids=[];
ids.push(row.id);
Expand Down
Loading

0 comments on commit 21664cd

Please sign in to comment.