💄 运单管理待回单确认的操作文案改为完成
This commit is contained in:
@@ -1607,7 +1607,7 @@
|
|||||||
v-if="canConfirmReturn(row)"
|
v-if="canConfirmReturn(row)"
|
||||||
@click="handleAction('confirmReturn', row)"
|
@click="handleAction('confirmReturn', row)"
|
||||||
>
|
>
|
||||||
确认回单
|
{{ completeActionLabel }}
|
||||||
</el-link>
|
</el-link>
|
||||||
<el-link type="primary" v-if="canMaintainMileage(row)" @click="openMileageDialog(row)">
|
<el-link type="primary" v-if="canMaintainMileage(row)" @click="openMileageDialog(row)">
|
||||||
维护里程
|
维护里程
|
||||||
@@ -5168,8 +5168,12 @@ export default {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
const status = this.statusValue(row);
|
const status = this.statusValue(row);
|
||||||
// 待回单确认也可直接完成,不经确认回单
|
// 待回单确认的「完成」由确认回单入口承担(走打卡节点与未了结异常校验);
|
||||||
return status === 'processing' || status === 'running' || status === 'pending_return_confirm';
|
// 只有确认回单不可用时才退回这里的普通完成
|
||||||
|
if (status === 'pending_return_confirm') {
|
||||||
|
return !this.canConfirmReturn(row);
|
||||||
|
}
|
||||||
|
return status === 'processing' || status === 'running';
|
||||||
},
|
},
|
||||||
canConfirmReturn(row) {
|
canConfirmReturn(row) {
|
||||||
return (
|
return (
|
||||||
@@ -10215,12 +10219,12 @@ export default {
|
|||||||
cancel: '取消',
|
cancel: '取消',
|
||||||
complete: this.completeActionLabel,
|
complete: this.completeActionLabel,
|
||||||
reassign: '重新派单',
|
reassign: '重新派单',
|
||||||
confirmReturn: '确认回单',
|
confirmReturn: '完成',
|
||||||
}[action];
|
}[action];
|
||||||
// 确认回单是终态动作(本轮不做撤销),把后果写在提示里,别让人以为还能退回
|
// 回单确认是终态动作(本轮不做撤销),把后果写在提示里,别让人以为还能退回
|
||||||
const confirmText =
|
const confirmText =
|
||||||
action === 'confirmReturn'
|
action === 'confirmReturn'
|
||||||
? '确认回单后该运单将置为已完成,且不可撤销。是否继续?'
|
? '回单确认后该运单将置为已完成,且不可撤销。是否继续?'
|
||||||
: `确定${actionName}该${this.config.title}?`;
|
: `确定${actionName}该${this.config.title}?`;
|
||||||
this.$confirm(confirmText, '提示', {
|
this.$confirm(confirmText, '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
|
|||||||
Reference in New Issue
Block a user