🐛 运输计划调度确认生成不再强制司机与手机号
司机与手机号对全部承运类型(承运商/自运/平台)均为选填,仅校验已填内容的格式与长度。
This commit is contained in:
@@ -1861,7 +1861,7 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="司机" required>
|
<el-form-item label="司机">
|
||||||
<el-autocomplete
|
<el-autocomplete
|
||||||
v-model="dispatchItemForm.driverName"
|
v-model="dispatchItemForm.driverName"
|
||||||
placeholder="请输入"
|
placeholder="请输入"
|
||||||
@@ -1878,7 +1878,6 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
:label="dispatchItemForm.carrierType === '承运商' ? '手机号' : '司机手机号'"
|
:label="dispatchItemForm.carrierType === '承运商' ? '手机号' : '司机手机号'"
|
||||||
required
|
|
||||||
>
|
>
|
||||||
<el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
|
<el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -2104,7 +2103,7 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-if="dispatchIsRoadTransport" label="司机" required>
|
<el-form-item v-if="dispatchIsRoadTransport" label="司机">
|
||||||
<el-autocomplete
|
<el-autocomplete
|
||||||
v-model="dispatchItemForm.driverName"
|
v-model="dispatchItemForm.driverName"
|
||||||
placeholder="请输入"
|
placeholder="请输入"
|
||||||
@@ -2115,7 +2114,7 @@
|
|||||||
@select="item => handleTaskDriverSelect('dispatch', item)"
|
@select="item => handleTaskDriverSelect('dispatch', item)"
|
||||||
/>
|
/>
|
||||||
</el-form-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-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item
|
<el-form-item
|
||||||
@@ -8365,19 +8364,7 @@ export default {
|
|||||||
}
|
}
|
||||||
const fullEntry = row.taskEntryMode === 'full';
|
const fullEntry = row.taskEntryMode === 'full';
|
||||||
const roadTransport = this.resolveTransportMode(row.transportType) === 'road';
|
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]));
|
const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
|
||||||
if (emptyField) return requiredMessage(emptyField[1]);
|
if (emptyField) return requiredMessage(emptyField[1]);
|
||||||
|
|
||||||
|
|||||||
@@ -577,7 +577,7 @@ export default {
|
|||||||
this.$message.warning(`第${index + 1}条调度明细缺少承运商信息`);
|
this.$message.warning(`第${index + 1}条调度明细缺少承运商信息`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// 司机是否必填由调度明细弹窗按承运类型判定(承运商承运时司机选填),此处不再重复校验
|
// 司机与手机号对全部承运类型都是选填,由调度明细弹窗校验已填部分的格式,此处不重复校验
|
||||||
if (!row.vehicleNo) {
|
if (!row.vehicleNo) {
|
||||||
this.$message.warning(`第${index + 1}条调度明细缺少车牌号`);
|
this.$message.warning(`第${index + 1}条调度明细缺少车牌号`);
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user