|
|
@@ -43,7 +43,7 @@
|
|
|
<div class="operate-button-container" v-if="item.extendOrderId!=null" >
|
|
|
<el-button size="mini" @click="showErpOrder()" >ERP订单信息</el-button>
|
|
|
</div>
|
|
|
- <div class="operate-button-container" v-if="item.status>1">
|
|
|
+ <div class="operate-button-container" v-if="item.status>=1">
|
|
|
<el-button size="mini" @click="refund()" v-hasPermi="['his:liveOrder:refundOrderMoney']">退款</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -307,7 +307,7 @@
|
|
|
|
|
|
|
|
|
<el-dialog :title="erpDialog.title" :visible.sync="erpDialog.open" width="600px" append-to-body>
|
|
|
- <div v-if="order!=null&&order.extendOrderId!=null&&order.status==1" v-hasPermi="['store:storeOrder:updateExpress']" >
|
|
|
+ <div v-if="this.item!=null&&this.item.extendOrderId!=null&&this.item.status==1" v-hasPermi="['store:storeOrder:updateExpress']" >
|
|
|
<el-button size="mini" @click="updateExpress()" >同步物流发货</el-button>
|
|
|
</div>
|
|
|
<div class="table-layout" v-if="erpOrder!=null">
|
|
|
@@ -939,30 +939,31 @@ export default {
|
|
|
this.tuiMoneyLogs=null;
|
|
|
this.afterSales=null;
|
|
|
getLiveOrderAll(orderId).then(response => {
|
|
|
- this.item = response.order;
|
|
|
- console.log(this.tuiMoneyLogs)
|
|
|
- this.tuiMoneyLogs = response.tuiMoneyLogs;
|
|
|
- this.msgForm.userId=response.order.userId;
|
|
|
- this.msgForm.followDoctorId=response.order.followDoctorId;
|
|
|
- this.getlistOrderitem(this.item.orderId);
|
|
|
- getOrderExpress(orderId).then(response => {
|
|
|
- this.deliverList = response.data;
|
|
|
- console.log(this.deliverList)
|
|
|
- });
|
|
|
|
|
|
- getOrderPayments(this.item.orderId).then(response => {
|
|
|
- this.payments = response.payments;
|
|
|
- });
|
|
|
+ this.item = response.order;
|
|
|
+ console.log("this.item",this.item)
|
|
|
+ this.tuiMoneyLogs = response.tuiMoneyLogs;
|
|
|
+ this.msgForm.userId=response.order.userId;
|
|
|
+ this.msgForm.followDoctorId=response.order.followDoctorId;
|
|
|
+ this.getlistOrderitem(this.item.orderId);
|
|
|
+ getOrderExpress(orderId).then(response => {
|
|
|
+ this.deliverList = response.data;
|
|
|
+ console.log("this.deliverList",this.deliverList)
|
|
|
+ });
|
|
|
|
|
|
- getOrderLog(this.item.orderId).then(response => {
|
|
|
- this.logs = response.logs
|
|
|
- });
|
|
|
+ getOrderPayments(this.item.orderId).then(response => {
|
|
|
+ this.payments = response.payments;
|
|
|
+ });
|
|
|
|
|
|
- tuiMoneyLogs(this.item.orderId).then(response => {
|
|
|
- this.tuiMoneyLogs = response.data
|
|
|
- })
|
|
|
- this.afterSales = response.afterSales;
|
|
|
- });
|
|
|
+ getOrderLog(this.item.orderId).then(response => {
|
|
|
+ this.logs = response.logs
|
|
|
+ });
|
|
|
+
|
|
|
+ tuiMoneyLogs(this.item.orderId).then(response => {
|
|
|
+ this.tuiMoneyLogs = response.data
|
|
|
+ })
|
|
|
+ this.afterSales = response.afterSales;
|
|
|
+ });
|
|
|
|
|
|
},
|
|
|
getOrder(){
|