|
@@ -480,7 +480,7 @@ export default {
|
|
|
// this.closeOrder.content = "";
|
|
// this.closeOrder.content = "";
|
|
|
// this.closeOrder.orderIds = [row.id];
|
|
// this.closeOrder.orderIds = [row.id];
|
|
|
//
|
|
//
|
|
|
- const message = row.status === 2 ? '该订单已发货，关闭后将自动返还库存？' :'是否要关闭订单？'
|
|
|
|
|
|
|
+ const message = row.status === 2 || row.deliveryTime ? '该订单已发货，关闭后将自动返还库存？' :'是否要关闭订单？'
|
|
|
this.$confirm(message, "提示", {
|
|
this.$confirm(message, "提示", {
|
|
|
confirmButtonText: "确定",
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
cancelButtonText: "取消",
|
