补提 dev 上未进主干的 10 个改动(运力组织/运单导入/凭证批次/运输计划) #17

Merged
b2894lxlx merged 10 commits from feature/20261110-补开dev未合并改动-web into master 2026-11-10 17:45:22 +08:00
2 changed files with 5 additions and 18 deletions
Showing only changes of commit 85dc96e126 - Show all commits
@@ -1861,7 +1861,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="司机" required>
<el-form-item label="司机">
<el-autocomplete
v-model="dispatchItemForm.driverName"
placeholder="请输入"
@@ -1878,7 +1878,6 @@
</el-form-item>
<el-form-item
:label="dispatchItemForm.carrierType === '承运商' ? '手机号' : '司机手机号'"
required
>
<el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
</el-form-item>
@@ -2104,7 +2103,7 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="dispatchIsRoadTransport" label="司机" required>
<el-form-item v-if="dispatchIsRoadTransport" label="司机">
<el-autocomplete
v-model="dispatchItemForm.driverName"
placeholder="请输入"
@@ -2115,7 +2114,7 @@
@select="item => handleTaskDriverSelect('dispatch', item)"
/>
</el-form-item>
<el-form-item v-if="dispatchIsRoadTransport" label="手机号" required>
<el-form-item v-if="dispatchIsRoadTransport" label="手机号">
<el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
</el-form-item>
<el-form-item
@@ -8365,19 +8364,7 @@ export default {
}
const fullEntry = row.taskEntryMode === 'full';
const roadTransport = this.resolveTransportMode(row.transportType) === 'road';
if (fullEntry) {
// 公路运输时司机/手机号一律必填(含承运类型为承运商)
if (roadTransport && row.carrierType) {
requiredFields.push(['driverName', '司机']);
requiredFields.push(['driverPhone', '手机号']);
}
} else if (row.carrierType) {
requiredFields.push(['driverName', '司机']);
requiredFields.push([
'driverPhone',
row.carrierType === '承运商' ? '手机号' : '司机手机号',
]);
}
// 司机与手机号对全部承运类型(承运商 / 自运 / 平台)都是选填,填了才校验格式与长度
const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
if (emptyField) return requiredMessage(emptyField[1]);
@@ -577,7 +577,7 @@ export default {
this.$message.warning(`第${index + 1}条调度明细缺少承运商信息`);
return;
}
// 司机是否必填由调度明细弹窗按承运类型判定(承运商承运时司机选填),此处不再重复校验
// 司机与手机号对全部承运类型都是选填,由调度明细弹窗校验已填部分的格式,此处不重复校验
if (!row.vehicleNo) {
this.$message.warning(`第${index + 1}条调度明细缺少车牌号`);
return;