Merge remote-tracking branch 'origin/0.8.X' into 0.8.X
This commit is contained in:
@@ -252,7 +252,7 @@ export default {
|
|||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
async handleDelete(row) {
|
async handleDelete(row) {
|
||||||
const planIds = row.planId || this.ids;
|
const planIds = row.planId || this.ids;
|
||||||
await this.$modal.confirm(`是否确认删除发货计划编号为"${planIds}"的数据项?`);
|
await this.$modal.confirm(`是否确认删除发货计划编号为"${planIds}"的数据项?会同时删除该计划下的所有发货单及明细且无法还原`);
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
await delDeliveryPlan(planIds).then(() => {
|
await delDeliveryPlan(planIds).then(() => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
|
|||||||
@@ -194,7 +194,6 @@ export default {
|
|||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getList();
|
this.getList();
|
||||||
this.getPlanList();
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
/** 查询发货单列表 */
|
/** 查询发货单列表 */
|
||||||
@@ -347,7 +346,7 @@ export default {
|
|||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
handleDelete(row) {
|
handleDelete(row) {
|
||||||
const waybillIds = row.waybillId || this.ids;
|
const waybillIds = row.waybillId || this.ids;
|
||||||
this.$modal.confirm('是否确认删除发货单编号为"' + waybillIds + '"的数据项?').then(() => {
|
this.$modal.confirm('是否确认删除发货单编号为"' + waybillIds + '"的数据项?会同时删除该发货单的所有明细记录且无法恢复。').then(() => {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
return delDeliveryWaybill(waybillIds);
|
return delDeliveryWaybill(waybillIds);
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user