diff --git a/src/views/order/components/billOfLading.vue b/src/views/order/components/billOfLading.vue
index dd36e1e..fa0c4f0 100644
--- a/src/views/order/components/billOfLading.vue
+++ b/src/views/order/components/billOfLading.vue
@@ -104,7 +104,7 @@
- 取消
+ 取消
订单确认
@@ -286,7 +286,6 @@ export default {
order.billSave(this.billAddData).then(res=>{
if(res.code == 20000){
this.billAddData.deliveryStatus = 'SUBMITED'
- this.billData.list.push(this.billAddData)
this.billListMeth()
this.$message.success(res.msg)
this.dialogBillAdd = false
@@ -305,14 +304,19 @@ export default {
}
}
})
+ this.$emit('billOfLading',this.billAddData.orderId)
},
//更新提货单数据
billListMeth(){
setTimeout(()=>{
order.findDeliveryByOrderId(this.controlWindows.addInfo.id).then((res) => {
this.billData.list = res.data
- this.$forceUpdate()
+ this.$forceUpdate()
});
+ order.findByOrderId(this.controlWindows.addInfo.id).then((res) => {
+ this.billData.orderInfo = res.data
+ this.$forceUpdate()
+ });
},200)
},
//删除提货单
@@ -325,7 +329,6 @@ export default {
this.billListMeth()
}
})
- this.$set(this.billData.list,index,'')
})
},
openDrawer() {
@@ -348,18 +351,34 @@ export default {
throw new Error()
}
});
- this.$confirm('确定下单?', '提示', { type: 'success' }).then(() => {
- let data={
+ let titleConfirm = ['是否确认订单已完成?','一旦确认,该订单无法再被提货,且未提货的金额将自行退回。']
+ const newDatas = []
+ const h = this.$createElement
+ for (const i in titleConfirm) {
+ newDatas.push(h('p', null, titleConfirm[i]))
+ }
+ this.$confirm(
+ '提示',
+ {
+ title: '提示',
+ message: h('div', null, newDatas),
+ showCancelButton: true,
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'success'
+ }
+ ).then(() => {
+ let data={
id:this.controlWindows.addInfo.id,
actQuantity:this.quantity,
}
- order.orderComplete(data).then((res) => {
+ order.orderComplete(data).then((res) => {
if (res.code === 20000) {
this.$message.success(res.msg);
this.closeWindow();
}
});
- })
+ })
},
judgeInterface(form) {
// let { id } = this.controlWindows.addInfo;
@@ -371,7 +390,6 @@ export default {
this.$emit("closeWindow");
this.form = {};
this.controlWindows.bill = false;
- this.$refs.form.clearValidate();
},
},
};