Merge remote-tracking branch 'websoft/master'
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
:icon="actionButtonLikeSearch ? undefined : 'el-icon-plus'"
|
||||
v-if="canCreate"
|
||||
@click="$refs.crud.rowAdd()"
|
||||
>{{ config.createText || '新增' }}
|
||||
>{{ config.createText || '新增' }}
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
@@ -39,7 +39,7 @@
|
||||
!readonlyScope
|
||||
"
|
||||
@click="handleImport"
|
||||
>{{ config.importText || '批量导入' }}
|
||||
>{{ config.importText || '批量导入' }}
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
@@ -47,7 +47,7 @@
|
||||
plain
|
||||
v-if="config.templateUrl && hasPermission(`${config.permission}_template`)"
|
||||
@click="handleTemplate"
|
||||
>下载模板
|
||||
>下载模板
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
@@ -55,7 +55,7 @@
|
||||
plain
|
||||
v-if="config.exportUrl && hasPermission(`${config.permission}_export`)"
|
||||
@click="handleExport"
|
||||
>批量导出
|
||||
>批量导出
|
||||
</el-button>
|
||||
<el-button
|
||||
type="success"
|
||||
@@ -63,14 +63,14 @@
|
||||
plain
|
||||
v-if="canBatchComplete"
|
||||
@click="handleBatchComplete"
|
||||
>批量完成
|
||||
>批量完成
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
:plain="!actionButtonLikeSearch"
|
||||
v-if="canRoadLoading"
|
||||
@click="handleRoadLoading"
|
||||
>{{ config.roadLoadingText || '公路配载' }}
|
||||
>{{ config.roadLoadingText || '公路配载' }}
|
||||
</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
@@ -82,7 +82,7 @@
|
||||
!readonlyScope
|
||||
"
|
||||
@click="handleDelete"
|
||||
>批量删除
|
||||
>批量删除
|
||||
</el-button>
|
||||
</template>
|
||||
|
||||
@@ -1130,20 +1130,20 @@
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<template v-if="hasTransportType">
|
||||
<el-form-item v-if="isCarrierMode" label="承运商" required>
|
||||
<el-select
|
||||
v-model="form.carrierName"
|
||||
placeholder="请选择承运商"
|
||||
filterable
|
||||
clearable
|
||||
:loading="taskCarrierLoading"
|
||||
:disabled="dialogReadonly || form.carrierType !== '承运商'"
|
||||
@visible-change="visible => visible && loadTaskCarrierOptions()"
|
||||
@change="handleTaskCarrierChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in taskCarrierOptions"
|
||||
:key="
|
||||
<el-form-item v-if="isCarrierMode" label="承运商" required>
|
||||
<el-select
|
||||
v-model="form.carrierName"
|
||||
placeholder="请选择承运商"
|
||||
filterable
|
||||
clearable
|
||||
:loading="taskCarrierLoading"
|
||||
:disabled="dialogReadonly || form.carrierType !== '承运商'"
|
||||
@visible-change="visible => visible && loadTaskCarrierOptions()"
|
||||
@change="handleTaskCarrierChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in taskCarrierOptions"
|
||||
:key="
|
||||
item.id ||
|
||||
item.customerName ||
|
||||
item.carrierName ||
|
||||
@@ -1151,275 +1151,275 @@
|
||||
item.name ||
|
||||
item.customerCode
|
||||
"
|
||||
:label="item.customerName || item.carrierName || item.fullName || item.name"
|
||||
:value="item.customerName || item.carrierName || item.fullName || item.name"
|
||||
:label="item.customerName || item.carrierName || item.fullName || item.name"
|
||||
:value="item.customerName || item.carrierName || item.fullName || item.name"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
v-if="isRoadTransport"
|
||||
label="司机"
|
||||
:required="form.carrierType === '自运'"
|
||||
>
|
||||
<el-select
|
||||
v-model="form.driverName"
|
||||
placeholder="请选择或输入司机"
|
||||
filterable
|
||||
clearable
|
||||
allow-create
|
||||
default-first-option
|
||||
:loading="taskDriverLoading"
|
||||
:disabled="dialogReadonly"
|
||||
@visible-change="visible => visible && loadTaskDriverOptions()"
|
||||
@change="handleTaskDriverChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in taskDriverOptions"
|
||||
:key="item.id || item.driverName || item.mobile"
|
||||
:label="item.driverName || item.name"
|
||||
:value="item.driverName || item.name"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
v-if="isRoadTransport"
|
||||
label="手机号"
|
||||
:required="form.carrierType === '自运'"
|
||||
>
|
||||
<el-input
|
||||
v-model="form.driverPhone"
|
||||
placeholder="请输入手机号"
|
||||
clearable
|
||||
maxlength="20"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
v-if="isRoadTransport"
|
||||
label="司机"
|
||||
:required="form.carrierType === '自运'"
|
||||
>
|
||||
<el-select
|
||||
v-model="form.driverName"
|
||||
placeholder="请选择或输入司机"
|
||||
filterable
|
||||
clearable
|
||||
allow-create
|
||||
default-first-option
|
||||
:loading="taskDriverLoading"
|
||||
:disabled="dialogReadonly"
|
||||
@visible-change="visible => visible && loadTaskDriverOptions()"
|
||||
@change="handleTaskDriverChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in taskDriverOptions"
|
||||
:key="item.id || item.driverName || item.mobile"
|
||||
:label="item.driverName || item.name"
|
||||
:value="item.driverName || item.name"
|
||||
</el-form-item>
|
||||
<el-form-item :label="transportVehicleNoLabel" required>
|
||||
<el-input
|
||||
v-model="form.vehicleNo"
|
||||
:placeholder="`请输入${transportVehicleNoLabel}`"
|
||||
clearable
|
||||
maxlength="30"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
v-if="isRoadTransport"
|
||||
label="手机号"
|
||||
:required="form.carrierType === '自运'"
|
||||
>
|
||||
<el-input
|
||||
v-model="form.driverPhone"
|
||||
placeholder="请输入手机号"
|
||||
clearable
|
||||
maxlength="20"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="transportVehicleNoLabel" required>
|
||||
<el-input
|
||||
v-model="form.vehicleNo"
|
||||
:placeholder="`请输入${transportVehicleNoLabel}`"
|
||||
clearable
|
||||
maxlength="30"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isNonRoadTransport" label="船长">
|
||||
<el-input
|
||||
v-model="form.captainName"
|
||||
placeholder="请输入船长"
|
||||
clearable
|
||||
maxlength="20"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isNonRoadTransport && isCarrierMode" label="联系电话">
|
||||
<el-input
|
||||
v-model="form.driverPhone"
|
||||
placeholder="请输入联系电话"
|
||||
clearable
|
||||
maxlength="20"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isNonRoadTransport" label="箱号">
|
||||
<el-input
|
||||
v-model="form.containerNo"
|
||||
placeholder="请输入箱号"
|
||||
clearable
|
||||
maxlength="30"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isNonRoadTransport" label="舱位">
|
||||
<el-input
|
||||
v-model="form.cabinNo"
|
||||
placeholder="请输入舱位"
|
||||
clearable
|
||||
maxlength="30"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="showRoadEscortFields" label="挂车车牌号">
|
||||
<el-input
|
||||
v-model="form.trailerVehicleNo"
|
||||
placeholder="请输入挂车车牌号"
|
||||
clearable
|
||||
maxlength="30"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="showRoadEscortFields" label="押运人">
|
||||
<el-input
|
||||
v-model="form.escortName"
|
||||
placeholder="请输入押运人"
|
||||
clearable
|
||||
maxlength="20"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="showRoadEscortFields" label="押运人手机号">
|
||||
<el-input
|
||||
v-model="form.escortPhone"
|
||||
placeholder="请输入押运人手机号"
|
||||
clearable
|
||||
maxlength="20"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="货物类型" required>
|
||||
<el-cascader
|
||||
v-model="form.cargoTypePath"
|
||||
:options="transportCargoTypeOptions"
|
||||
:props="transportCargoTypeCascaderProps"
|
||||
placeholder="请选择到二级"
|
||||
clearable
|
||||
filterable
|
||||
:disabled="dialogReadonly"
|
||||
:filter-method="filterBillingCargoType"
|
||||
@visible-change="visible => visible && ensureBillingCargoTypeOptions()"
|
||||
@change="handleTaskCargoTypeChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="货物名称">
|
||||
<el-select
|
||||
v-model="form.cargoName"
|
||||
placeholder="请选择或输入货物"
|
||||
filterable
|
||||
allow-create
|
||||
default-first-option
|
||||
clearable
|
||||
:disabled="dialogReadonly || !form.cargoType"
|
||||
:loading="taskCargoLoading"
|
||||
@visible-change="visible => visible && loadTaskCargoOptionsForForm()"
|
||||
@change="handleTaskCargoChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in taskCargoOptions"
|
||||
:key="item.id || item.cargoCode || item.cargoName"
|
||||
:label="formatBillingCargoTypeLabel(item)"
|
||||
:value="formatBillingCargoTypeLabel(item)"
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isNonRoadTransport" label="船长">
|
||||
<el-input
|
||||
v-model="form.captainName"
|
||||
placeholder="请输入船长"
|
||||
clearable
|
||||
maxlength="20"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格">
|
||||
<el-input
|
||||
v-model="form.specification"
|
||||
placeholder="选择货物自动回填"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="型号">
|
||||
<el-input
|
||||
v-model="form.model"
|
||||
placeholder="选择货物自动回填"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="数量">
|
||||
<el-input
|
||||
v-model="form.quantity"
|
||||
placeholder="请输入数量"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
@input="value => handleTaskNumberInput('quantity', value)"
|
||||
>
|
||||
<template #append>
|
||||
<el-select
|
||||
v-model="form.quantityUnit"
|
||||
class="business-crud-page__append-select business-crud-page__append-select--wide"
|
||||
placeholder="单位"
|
||||
:disabled="dialogReadonly"
|
||||
@visible-change="visible => visible && loadTaskQuantityUnitOptions()"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in taskQuantityUnitOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="里程(km)">
|
||||
<el-input
|
||||
v-model="form.mileage"
|
||||
placeholder="请输入里程"
|
||||
clearable
|
||||
maxlength="10"
|
||||
inputmode="numeric"
|
||||
:disabled="dialogReadonly"
|
||||
@input="handleTaskMileageInput"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="isRoadTransport ? '计划发货日期' : '预计发货日期'">
|
||||
<el-date-picker
|
||||
v-model="form.estimatedStartTime"
|
||||
type="date"
|
||||
placeholder="请选择预计发货日期"
|
||||
format="YYYY-MM-DD"
|
||||
value-format="YYYY-MM-DD"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="isRoadTransport ? '计划完成日期' : '预计完成日期'">
|
||||
<el-date-picker
|
||||
v-model="form.estimatedEndTime"
|
||||
type="date"
|
||||
placeholder="请选择预计完成日期"
|
||||
format="YYYY-MM-DD"
|
||||
value-format="YYYY-MM-DD"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="单价">
|
||||
<el-input
|
||||
v-model="form.unitPrice"
|
||||
placeholder="请输入单价"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
@input="value => handleTaskNumberInput('unitPrice', value)"
|
||||
>
|
||||
<template #append>
|
||||
<el-select
|
||||
v-model="form.priceUnit"
|
||||
class="business-crud-page__append-select business-crud-page__append-select--wide"
|
||||
placeholder="单位"
|
||||
:disabled="dialogReadonly"
|
||||
@visible-change="visible => visible && loadTaskFeeUnitOptions()"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in taskFeeUnitOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="其他费用合计">
|
||||
<el-input
|
||||
v-model="form.otherFeeTotal"
|
||||
placeholder="请输入其他费用合计"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
@input="value => handleTaskNumberInput('otherFeeTotal', value)"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" class="business-crud-page__task-remark">
|
||||
<el-input
|
||||
v-model="form.taskRemark"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
maxlength="200"
|
||||
show-word-limit
|
||||
placeholder="请输入备注，200字以内"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isNonRoadTransport && isCarrierMode" label="联系电话">
|
||||
<el-input
|
||||
v-model="form.driverPhone"
|
||||
placeholder="请输入联系电话"
|
||||
clearable
|
||||
maxlength="20"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isNonRoadTransport" label="箱号">
|
||||
<el-input
|
||||
v-model="form.containerNo"
|
||||
placeholder="请输入箱号"
|
||||
clearable
|
||||
maxlength="30"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="isNonRoadTransport" label="舱位">
|
||||
<el-input
|
||||
v-model="form.cabinNo"
|
||||
placeholder="请输入舱位"
|
||||
clearable
|
||||
maxlength="30"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="showRoadEscortFields" label="挂车车牌号">
|
||||
<el-input
|
||||
v-model="form.trailerVehicleNo"
|
||||
placeholder="请输入挂车车牌号"
|
||||
clearable
|
||||
maxlength="30"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="showRoadEscortFields" label="押运人">
|
||||
<el-input
|
||||
v-model="form.escortName"
|
||||
placeholder="请输入押运人"
|
||||
clearable
|
||||
maxlength="20"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="showRoadEscortFields" label="押运人手机号">
|
||||
<el-input
|
||||
v-model="form.escortPhone"
|
||||
placeholder="请输入押运人手机号"
|
||||
clearable
|
||||
maxlength="20"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="货物类型" required>
|
||||
<el-cascader
|
||||
v-model="form.cargoTypePath"
|
||||
:options="transportCargoTypeOptions"
|
||||
:props="transportCargoTypeCascaderProps"
|
||||
placeholder="请选择到二级"
|
||||
clearable
|
||||
filterable
|
||||
:disabled="dialogReadonly"
|
||||
:filter-method="filterBillingCargoType"
|
||||
@visible-change="visible => visible && ensureBillingCargoTypeOptions()"
|
||||
@change="handleTaskCargoTypeChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="货物名称">
|
||||
<el-select
|
||||
v-model="form.cargoName"
|
||||
placeholder="请选择或输入货物"
|
||||
filterable
|
||||
allow-create
|
||||
default-first-option
|
||||
clearable
|
||||
:disabled="dialogReadonly || !form.cargoType"
|
||||
:loading="taskCargoLoading"
|
||||
@visible-change="visible => visible && loadTaskCargoOptionsForForm()"
|
||||
@change="handleTaskCargoChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in taskCargoOptions"
|
||||
:key="item.id || item.cargoCode || item.cargoName"
|
||||
:label="formatBillingCargoTypeLabel(item)"
|
||||
:value="formatBillingCargoTypeLabel(item)"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格">
|
||||
<el-input
|
||||
v-model="form.specification"
|
||||
placeholder="选择货物自动回填"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="型号">
|
||||
<el-input
|
||||
v-model="form.model"
|
||||
placeholder="选择货物自动回填"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="数量">
|
||||
<el-input
|
||||
v-model="form.quantity"
|
||||
placeholder="请输入数量"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
@input="value => handleTaskNumberInput('quantity', value)"
|
||||
>
|
||||
<template #append>
|
||||
<el-select
|
||||
v-model="form.quantityUnit"
|
||||
class="business-crud-page__append-select business-crud-page__append-select--wide"
|
||||
placeholder="单位"
|
||||
:disabled="dialogReadonly"
|
||||
@visible-change="visible => visible && loadTaskQuantityUnitOptions()"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in taskQuantityUnitOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="里程(km)">
|
||||
<el-input
|
||||
v-model="form.mileage"
|
||||
placeholder="请输入里程"
|
||||
clearable
|
||||
maxlength="10"
|
||||
inputmode="numeric"
|
||||
:disabled="dialogReadonly"
|
||||
@input="handleTaskMileageInput"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="isRoadTransport ? '计划发货日期' : '预计发货日期'">
|
||||
<el-date-picker
|
||||
v-model="form.estimatedStartTime"
|
||||
type="date"
|
||||
placeholder="请选择预计发货日期"
|
||||
format="YYYY-MM-DD"
|
||||
value-format="YYYY-MM-DD"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item :label="isRoadTransport ? '计划完成日期' : '预计完成日期'">
|
||||
<el-date-picker
|
||||
v-model="form.estimatedEndTime"
|
||||
type="date"
|
||||
placeholder="请选择预计完成日期"
|
||||
format="YYYY-MM-DD"
|
||||
value-format="YYYY-MM-DD"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="单价">
|
||||
<el-input
|
||||
v-model="form.unitPrice"
|
||||
placeholder="请输入单价"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
@input="value => handleTaskNumberInput('unitPrice', value)"
|
||||
>
|
||||
<template #append>
|
||||
<el-select
|
||||
v-model="form.priceUnit"
|
||||
class="business-crud-page__append-select business-crud-page__append-select--wide"
|
||||
placeholder="单位"
|
||||
:disabled="dialogReadonly"
|
||||
@visible-change="visible => visible && loadTaskFeeUnitOptions()"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in taskFeeUnitOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="其他费用合计">
|
||||
<el-input
|
||||
v-model="form.otherFeeTotal"
|
||||
placeholder="请输入其他费用合计"
|
||||
clearable
|
||||
:disabled="dialogReadonly"
|
||||
@input="value => handleTaskNumberInput('otherFeeTotal', value)"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" class="business-crud-page__task-remark">
|
||||
<el-input
|
||||
v-model="form.taskRemark"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
maxlength="200"
|
||||
show-word-limit
|
||||
placeholder="请输入备注，200字以内"
|
||||
:disabled="dialogReadonly"
|
||||
/>
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-form>
|
||||
</div>
|
||||
@@ -2285,7 +2285,7 @@
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-link type="primary" v-if="showDetailButton(row)" @click="openDetail(row)"
|
||||
>详情</el-link
|
||||
>详情</el-link
|
||||
>
|
||||
<el-link
|
||||
type="primary"
|
||||
@@ -2376,8 +2376,8 @@
|
||||
><strong>{{
|
||||
detailRow.departureName || detailRow.departureAddress || '-'
|
||||
}}</strong
|
||||
><b class="end">终</b
|
||||
><strong>{{ detailRow.arrivalName || detailRow.arrivalAddress || '-' }}</strong>
|
||||
><b class="end">终</b
|
||||
><strong>{{ detailRow.arrivalName || detailRow.arrivalAddress || '-' }}</strong>
|
||||
</div>
|
||||
<div class="business-crud-page__waybill-route-text">
|
||||
{{ detailRow.departureAddress || '-' }} → {{ detailRow.arrivalAddress || '-' }}
|
||||
@@ -2417,7 +2417,7 @@
|
||||
<el-table-column prop="deviceCode" label="设备编码" min-width="130" />
|
||||
<el-table-column prop="brand" label="品牌" min-width="110" />
|
||||
<el-table-column label="规格型号" min-width="140"
|
||||
><template #default="{ row }">{{
|
||||
><template #default="{ row }">{{
|
||||
[row.specification, row.model].filter(Boolean).join('/') || '-'
|
||||
}}</template></el-table-column
|
||||
>
|
||||
@@ -2439,13 +2439,13 @@
|
||||
>
|
||||
<span>司机</span
|
||||
><strong
|
||||
>{{ detailRow.driverName || '-' }} {{ detailRow.driverPhone || '' }}</strong
|
||||
>
|
||||
>{{ detailRow.driverName || '-' }} {{ detailRow.driverPhone || '' }}</strong
|
||||
>
|
||||
</div>
|
||||
<div class="business-crud-page__waybill-detail-field">
|
||||
<span>{{
|
||||
waybillIsRoadTransport(detailRow) ? '车牌号' : '航班号/船次号/班列号'
|
||||
}}</span
|
||||
waybillIsRoadTransport(detailRow) ? '车牌号' : '航班号/船次号/班列号'
|
||||
}}</span
|
||||
><strong>{{ detailRow.vehicleNo || '-' }}</strong>
|
||||
</div>
|
||||
<div
|
||||
@@ -2460,8 +2460,8 @@
|
||||
>
|
||||
<span>押运人</span
|
||||
><strong
|
||||
>{{ detailRow.escortName || '-' }} {{ detailRow.escortPhone || '' }}</strong
|
||||
>
|
||||
>{{ detailRow.escortName || '-' }} {{ detailRow.escortPhone || '' }}</strong
|
||||
>
|
||||
</div>
|
||||
<div
|
||||
v-if="!waybillIsRoadTransport(detailRow)"
|
||||
@@ -2514,7 +2514,7 @@
|
||||
v-for="(node, index) in waybillDetailProcessNodes"
|
||||
:key="node.key || index"
|
||||
:timestamp="node.time || ''"
|
||||
>{{ node.name || node.nodeName || node.label }}</el-timeline-item
|
||||
>{{ node.name || node.nodeName || node.label }}</el-timeline-item
|
||||
>
|
||||
</el-timeline>
|
||||
<el-empty v-else description="暂无打卡详情" :image-size="50" />
|
||||
@@ -2550,7 +2550,7 @@
|
||||
<template #extra>
|
||||
<div class="business-crud-page__waybill-track-actions">
|
||||
<el-button plain @click="handleWaybillTrackAction('playback')"
|
||||
>轨迹回放</el-button
|
||||
>轨迹回放</el-button
|
||||
>
|
||||
<el-button plain @click="handleWaybillTrackAction('locate')">实时定位</el-button>
|
||||
</div>
|
||||
@@ -2924,7 +2924,7 @@
|
||||
<el-button type="primary">添加附件</el-button>
|
||||
</el-upload>
|
||||
<span class="business-crud-page__import-file-tip"
|
||||
>请上传计划明细表，仅支持 Excel 格式</span
|
||||
>请上传计划明细表，仅支持 Excel 格式</span
|
||||
>
|
||||
<el-link type="primary" @click="handleTransportPlanTemplate">下载模板</el-link>
|
||||
</el-form-item>
|
||||
@@ -3030,7 +3030,7 @@
|
||||
type="primary"
|
||||
:loading="transportPlanImportLoading"
|
||||
@click="submitTransportPlanImport"
|
||||
>提交</el-button
|
||||
>提交</el-button
|
||||
>
|
||||
<el-button @click="transportPlanImportBox = false">返回</el-button>
|
||||
</template>
|
||||
@@ -3835,7 +3835,7 @@
|
||||
<el-table-column label="操作" width="100" align="center" fixed="right">
|
||||
<template #default="{ $index }">
|
||||
<el-link type="danger" @click="removeDispatchItemAttachment($index)"
|
||||
>删除</el-link
|
||||
>删除</el-link
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -4505,7 +4505,7 @@
|
||||
<div class="business-crud-page__map-info">
|
||||
<span>{{ transportMapStatus }}</span>
|
||||
<span v-if="transportMapSelected.regionName"
|
||||
>行政区划：{{ transportMapSelected.regionName }}</span
|
||||
>行政区划：{{ transportMapSelected.regionName }}</span
|
||||
>
|
||||
</div>
|
||||
<template #footer>
|
||||
@@ -5422,9 +5422,9 @@ export default {
|
||||
this.getDispatchQuantityUnit(row),
|
||||
'total',
|
||||
row.quantity ||
|
||||
row.cargoQuantity ||
|
||||
row.goodsQuantity ||
|
||||
row.totalQuantity ||
|
||||
row.cargoQuantity ||
|
||||
row.goodsQuantity ||
|
||||
row.totalQuantity ||
|
||||
row.totalCargoQuantity
|
||||
);
|
||||
});
|
||||
@@ -6206,8 +6206,8 @@ export default {
|
||||
const taskInfo = this.parseJsonObject(this.detailRow.taskInfoJson);
|
||||
this.waybillRouteChangeRecords = Array.isArray(taskInfo.routeChangeRecords)
|
||||
? [...taskInfo.routeChangeRecords].sort((a, b) =>
|
||||
String(b.changeTime).localeCompare(String(a.changeTime))
|
||||
)
|
||||
String(b.changeTime).localeCompare(String(a.changeTime))
|
||||
)
|
||||
: [];
|
||||
},
|
||||
openWaybillRouteChangeDialog() {
|
||||
@@ -6302,8 +6302,8 @@ export default {
|
||||
|
||||
const content = changed
|
||||
? `${row.waybillNo || '运单'}：发货地 ${row.originalDepartureAddress || '-'} → ${
|
||||
row.departureAddress || '-'
|
||||
}；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`
|
||||
row.departureAddress || '-'
|
||||
}；到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`
|
||||
: '调整运输路线顺序';
|
||||
const records = [
|
||||
{
|
||||
@@ -8031,21 +8031,21 @@ export default {
|
||||
const goodsRows = this.isTaskFullMode
|
||||
? this.transportCargoRows.map(item => this.normalizeTransportCargoRow(item))
|
||||
: [
|
||||
{
|
||||
cargoType: row.cargoType,
|
||||
cargoTypeCode: row.cargoTypeCode,
|
||||
cargoTypePath: row.cargoTypePath,
|
||||
cargoName: row.cargoName,
|
||||
specification: row.specification,
|
||||
model: row.model,
|
||||
quantity: row.quantity,
|
||||
quantityUnit: row.quantityUnit,
|
||||
mileage: row.mileage,
|
||||
unitPrice: row.unitPrice,
|
||||
priceUnit: row.priceUnit,
|
||||
remark: row.taskRemark,
|
||||
},
|
||||
];
|
||||
{
|
||||
cargoType: row.cargoType,
|
||||
cargoTypeCode: row.cargoTypeCode,
|
||||
cargoTypePath: row.cargoTypePath,
|
||||
cargoName: row.cargoName,
|
||||
specification: row.specification,
|
||||
model: row.model,
|
||||
quantity: row.quantity,
|
||||
quantityUnit: row.quantityUnit,
|
||||
mileage: row.mileage,
|
||||
unitPrice: row.unitPrice,
|
||||
priceUnit: row.priceUnit,
|
||||
remark: row.taskRemark,
|
||||
},
|
||||
];
|
||||
if (this.isTaskFullMode) {
|
||||
const firstCargo = goodsRows[0] || {};
|
||||
taskInfo.unitPrice = firstCargo.unitPrice || '';
|
||||
@@ -9398,8 +9398,8 @@ export default {
|
||||
const children =
|
||||
level === 1
|
||||
? (cargoType.children || [])
|
||||
.map(item => this.normalizeBillingCargoTypeNode(item, level + 1, path))
|
||||
.filter(Boolean)
|
||||
.map(item => this.normalizeBillingCargoTypeNode(item, level + 1, path))
|
||||
.filter(Boolean)
|
||||
: [];
|
||||
return {
|
||||
...cargoType,
|
||||
@@ -9466,8 +9466,8 @@ export default {
|
||||
const children =
|
||||
level === 1
|
||||
? (region.children || [])
|
||||
.map(item => this.normalizeBillingMatchRegionNode(item, level + 1))
|
||||
.filter(Boolean)
|
||||
.map(item => this.normalizeBillingMatchRegionNode(item, level + 1))
|
||||
.filter(Boolean)
|
||||
: [];
|
||||
return {
|
||||
...region,
|
||||
@@ -11008,8 +11008,8 @@ export default {
|
||||
mode === 'draft'
|
||||
? '生成草稿成功'
|
||||
: shouldCompletePlan
|
||||
? '确认生成成功，运输计划已完成'
|
||||
: '确认生成成功';
|
||||
? '确认生成成功，运输计划已完成'
|
||||
: '确认生成成功';
|
||||
this.$message.success(message);
|
||||
this.dispatchBox = false;
|
||||
this.onLoad(this.page, this.query);
|
||||
|
||||
Reference in New Issue
Block a user