chore(config): 配置开发服务器及代理端口为2888
- 将Vite开发服务器端口修改为2888 - 配置本地API代理,重写请求路径以支持本地调试 - 注释了旧端口及旧代理配置,预留切换接口使用
This commit is contained in:
@@ -27,7 +27,7 @@
|
|||||||
:icon="actionButtonLikeSearch ? undefined : 'el-icon-plus'"
|
:icon="actionButtonLikeSearch ? undefined : 'el-icon-plus'"
|
||||||
v-if="canCreate"
|
v-if="canCreate"
|
||||||
@click="$refs.crud.rowAdd()"
|
@click="$refs.crud.rowAdd()"
|
||||||
>{{ config.createText || '新增' }}
|
>{{ config.createText || '新增' }}
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
!readonlyScope
|
!readonlyScope
|
||||||
"
|
"
|
||||||
@click="handleImport"
|
@click="handleImport"
|
||||||
>{{ config.importText || '批量导入' }}
|
>{{ config.importText || '批量导入' }}
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
plain
|
plain
|
||||||
v-if="config.templateUrl && hasPermission(`${config.permission}_template`)"
|
v-if="config.templateUrl && hasPermission(`${config.permission}_template`)"
|
||||||
@click="handleTemplate"
|
@click="handleTemplate"
|
||||||
>下载模板
|
>下载模板
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
plain
|
plain
|
||||||
v-if="config.exportUrl && hasPermission(`${config.permission}_export`)"
|
v-if="config.exportUrl && hasPermission(`${config.permission}_export`)"
|
||||||
@click="handleExport"
|
@click="handleExport"
|
||||||
>批量导出
|
>批量导出
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="success"
|
type="success"
|
||||||
@@ -63,14 +63,14 @@
|
|||||||
plain
|
plain
|
||||||
v-if="canBatchComplete"
|
v-if="canBatchComplete"
|
||||||
@click="handleBatchComplete"
|
@click="handleBatchComplete"
|
||||||
>批量完成
|
>批量完成
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
:plain="!actionButtonLikeSearch"
|
:plain="!actionButtonLikeSearch"
|
||||||
v-if="canRoadLoading"
|
v-if="canRoadLoading"
|
||||||
@click="handleRoadLoading"
|
@click="handleRoadLoading"
|
||||||
>{{ config.roadLoadingText || '公路配载' }}
|
>{{ config.roadLoadingText || '公路配载' }}
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="danger"
|
type="danger"
|
||||||
@@ -82,7 +82,7 @@
|
|||||||
!readonlyScope
|
!readonlyScope
|
||||||
"
|
"
|
||||||
@click="handleDelete"
|
@click="handleDelete"
|
||||||
>批量删除
|
>批量删除
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -1130,20 +1130,20 @@
|
|||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<template v-if="hasTransportType">
|
<template v-if="hasTransportType">
|
||||||
<el-form-item v-if="isCarrierMode" label="承运商" required>
|
<el-form-item v-if="isCarrierMode" label="承运商" required>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.carrierName"
|
v-model="form.carrierName"
|
||||||
placeholder="请选择承运商"
|
placeholder="请选择承运商"
|
||||||
filterable
|
filterable
|
||||||
clearable
|
clearable
|
||||||
:loading="taskCarrierLoading"
|
:loading="taskCarrierLoading"
|
||||||
:disabled="dialogReadonly || form.carrierType !== '承运商'"
|
:disabled="dialogReadonly || form.carrierType !== '承运商'"
|
||||||
@visible-change="visible => visible && loadTaskCarrierOptions()"
|
@visible-change="visible => visible && loadTaskCarrierOptions()"
|
||||||
@change="handleTaskCarrierChange"
|
@change="handleTaskCarrierChange"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in taskCarrierOptions"
|
v-for="item in taskCarrierOptions"
|
||||||
:key="
|
:key="
|
||||||
item.id ||
|
item.id ||
|
||||||
item.customerName ||
|
item.customerName ||
|
||||||
item.carrierName ||
|
item.carrierName ||
|
||||||
@@ -1151,275 +1151,275 @@
|
|||||||
item.name ||
|
item.name ||
|
||||||
item.customerCode
|
item.customerCode
|
||||||
"
|
"
|
||||||
:label="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"
|
: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>
|
<el-form-item :label="transportVehicleNoLabel" required>
|
||||||
<el-form-item
|
<el-input
|
||||||
v-if="isRoadTransport"
|
v-model="form.vehicleNo"
|
||||||
label="司机"
|
:placeholder="`请输入${transportVehicleNoLabel}`"
|
||||||
:required="form.carrierType === '自运'"
|
clearable
|
||||||
>
|
maxlength="30"
|
||||||
<el-select
|
:disabled="dialogReadonly"
|
||||||
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>
|
<el-form-item v-if="isNonRoadTransport" label="船长">
|
||||||
<el-form-item
|
<el-input
|
||||||
v-if="isRoadTransport"
|
v-model="form.captainName"
|
||||||
label="手机号"
|
placeholder="请输入船长"
|
||||||
:required="form.carrierType === '自运'"
|
clearable
|
||||||
>
|
maxlength="20"
|
||||||
<el-input
|
:disabled="dialogReadonly"
|
||||||
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-select>
|
</el-form-item>
|
||||||
</el-form-item>
|
<el-form-item v-if="isNonRoadTransport && isCarrierMode" label="联系电话">
|
||||||
<el-form-item label="规格">
|
<el-input
|
||||||
<el-input
|
v-model="form.driverPhone"
|
||||||
v-model="form.specification"
|
placeholder="请输入联系电话"
|
||||||
placeholder="选择货物自动回填"
|
clearable
|
||||||
clearable
|
maxlength="20"
|
||||||
:disabled="dialogReadonly"
|
:disabled="dialogReadonly"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="型号">
|
<el-form-item v-if="isNonRoadTransport" label="箱号">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="form.model"
|
v-model="form.containerNo"
|
||||||
placeholder="选择货物自动回填"
|
placeholder="请输入箱号"
|
||||||
clearable
|
clearable
|
||||||
:disabled="dialogReadonly"
|
maxlength="30"
|
||||||
/>
|
:disabled="dialogReadonly"
|
||||||
</el-form-item>
|
/>
|
||||||
<el-form-item label="数量">
|
</el-form-item>
|
||||||
<el-input
|
<el-form-item v-if="isNonRoadTransport" label="舱位">
|
||||||
v-model="form.quantity"
|
<el-input
|
||||||
placeholder="请输入数量"
|
v-model="form.cabinNo"
|
||||||
clearable
|
placeholder="请输入舱位"
|
||||||
:disabled="dialogReadonly"
|
clearable
|
||||||
@input="value => handleTaskNumberInput('quantity', value)"
|
maxlength="30"
|
||||||
>
|
:disabled="dialogReadonly"
|
||||||
<template #append>
|
/>
|
||||||
<el-select
|
</el-form-item>
|
||||||
v-model="form.quantityUnit"
|
<el-form-item v-if="showRoadEscortFields" label="挂车车牌号">
|
||||||
class="business-crud-page__append-select business-crud-page__append-select--wide"
|
<el-input
|
||||||
placeholder="单位"
|
v-model="form.trailerVehicleNo"
|
||||||
:disabled="dialogReadonly"
|
placeholder="请输入挂车车牌号"
|
||||||
@visible-change="visible => visible && loadTaskQuantityUnitOptions()"
|
clearable
|
||||||
>
|
maxlength="30"
|
||||||
<el-option
|
:disabled="dialogReadonly"
|
||||||
v-for="item in taskQuantityUnitOptions"
|
/>
|
||||||
:key="item.value"
|
</el-form-item>
|
||||||
:label="item.label"
|
<el-form-item v-if="showRoadEscortFields" label="押运人">
|
||||||
:value="item.value"
|
<el-input
|
||||||
/>
|
v-model="form.escortName"
|
||||||
</el-select>
|
placeholder="请输入押运人"
|
||||||
</template>
|
clearable
|
||||||
</el-input>
|
maxlength="20"
|
||||||
</el-form-item>
|
:disabled="dialogReadonly"
|
||||||
<el-form-item label="里程(km)">
|
/>
|
||||||
<el-input
|
</el-form-item>
|
||||||
v-model="form.mileage"
|
<el-form-item v-if="showRoadEscortFields" label="押运人手机号">
|
||||||
placeholder="请输入里程"
|
<el-input
|
||||||
clearable
|
v-model="form.escortPhone"
|
||||||
maxlength="10"
|
placeholder="请输入押运人手机号"
|
||||||
inputmode="numeric"
|
clearable
|
||||||
:disabled="dialogReadonly"
|
maxlength="20"
|
||||||
@input="handleTaskMileageInput"
|
:disabled="dialogReadonly"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item :label="isRoadTransport ? '计划发货日期' : '预计发货日期'">
|
<el-form-item label="货物类型" required>
|
||||||
<el-date-picker
|
<el-cascader
|
||||||
v-model="form.estimatedStartTime"
|
v-model="form.cargoTypePath"
|
||||||
type="date"
|
:options="transportCargoTypeOptions"
|
||||||
placeholder="请选择预计发货日期"
|
:props="transportCargoTypeCascaderProps"
|
||||||
format="YYYY-MM-DD"
|
placeholder="请选择到二级"
|
||||||
value-format="YYYY-MM-DD"
|
clearable
|
||||||
:disabled="dialogReadonly"
|
filterable
|
||||||
/>
|
:disabled="dialogReadonly"
|
||||||
</el-form-item>
|
:filter-method="filterBillingCargoType"
|
||||||
<el-form-item :label="isRoadTransport ? '计划完成日期' : '预计完成日期'">
|
@visible-change="visible => visible && ensureBillingCargoTypeOptions()"
|
||||||
<el-date-picker
|
@change="handleTaskCargoTypeChange"
|
||||||
v-model="form.estimatedEndTime"
|
/>
|
||||||
type="date"
|
</el-form-item>
|
||||||
placeholder="请选择预计完成日期"
|
<el-form-item label="货物名称">
|
||||||
format="YYYY-MM-DD"
|
<el-select
|
||||||
value-format="YYYY-MM-DD"
|
v-model="form.cargoName"
|
||||||
:disabled="dialogReadonly"
|
placeholder="请选择或输入货物"
|
||||||
/>
|
filterable
|
||||||
</el-form-item>
|
allow-create
|
||||||
<el-form-item label="单价">
|
default-first-option
|
||||||
<el-input
|
clearable
|
||||||
v-model="form.unitPrice"
|
:disabled="dialogReadonly || !form.cargoType"
|
||||||
placeholder="请输入单价"
|
:loading="taskCargoLoading"
|
||||||
clearable
|
@visible-change="visible => visible && loadTaskCargoOptionsForForm()"
|
||||||
:disabled="dialogReadonly"
|
@change="handleTaskCargoChange"
|
||||||
@input="value => handleTaskNumberInput('unitPrice', value)"
|
>
|
||||||
>
|
<el-option
|
||||||
<template #append>
|
v-for="item in taskCargoOptions"
|
||||||
<el-select
|
:key="item.id || item.cargoCode || item.cargoName"
|
||||||
v-model="form.priceUnit"
|
:label="formatBillingCargoTypeLabel(item)"
|
||||||
class="business-crud-page__append-select business-crud-page__append-select--wide"
|
:value="formatBillingCargoTypeLabel(item)"
|
||||||
placeholder="单位"
|
/>
|
||||||
:disabled="dialogReadonly"
|
</el-select>
|
||||||
@visible-change="visible => visible && loadTaskFeeUnitOptions()"
|
</el-form-item>
|
||||||
>
|
<el-form-item label="规格">
|
||||||
<el-option
|
<el-input
|
||||||
v-for="item in taskFeeUnitOptions"
|
v-model="form.specification"
|
||||||
:key="item.value"
|
placeholder="选择货物自动回填"
|
||||||
:label="item.label"
|
clearable
|
||||||
:value="item.value"
|
:disabled="dialogReadonly"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-form-item>
|
||||||
</template>
|
<el-form-item label="型号">
|
||||||
</el-input>
|
<el-input
|
||||||
</el-form-item>
|
v-model="form.model"
|
||||||
<el-form-item label="其他费用合计">
|
placeholder="选择货物自动回填"
|
||||||
<el-input
|
clearable
|
||||||
v-model="form.otherFeeTotal"
|
:disabled="dialogReadonly"
|
||||||
placeholder="请输入其他费用合计"
|
/>
|
||||||
clearable
|
</el-form-item>
|
||||||
:disabled="dialogReadonly"
|
<el-form-item label="数量">
|
||||||
@input="value => handleTaskNumberInput('otherFeeTotal', value)"
|
<el-input
|
||||||
/>
|
v-model="form.quantity"
|
||||||
</el-form-item>
|
placeholder="请输入数量"
|
||||||
<el-form-item label="备注" class="business-crud-page__task-remark">
|
clearable
|
||||||
<el-input
|
:disabled="dialogReadonly"
|
||||||
v-model="form.taskRemark"
|
@input="value => handleTaskNumberInput('quantity', value)"
|
||||||
type="textarea"
|
>
|
||||||
:rows="2"
|
<template #append>
|
||||||
maxlength="200"
|
<el-select
|
||||||
show-word-limit
|
v-model="form.quantityUnit"
|
||||||
placeholder="请输入备注,200字以内"
|
class="business-crud-page__append-select business-crud-page__append-select--wide"
|
||||||
:disabled="dialogReadonly"
|
placeholder="单位"
|
||||||
/>
|
:disabled="dialogReadonly"
|
||||||
</el-form-item>
|
@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>
|
</template>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
@@ -2285,7 +2285,7 @@
|
|||||||
</template>
|
</template>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<el-link type="primary" v-if="showDetailButton(row)" @click="openDetail(row)"
|
<el-link type="primary" v-if="showDetailButton(row)" @click="openDetail(row)"
|
||||||
>详情</el-link
|
>详情</el-link
|
||||||
>
|
>
|
||||||
<el-link
|
<el-link
|
||||||
type="primary"
|
type="primary"
|
||||||
@@ -2376,8 +2376,8 @@
|
|||||||
><strong>{{
|
><strong>{{
|
||||||
detailRow.departureName || detailRow.departureAddress || '-'
|
detailRow.departureName || detailRow.departureAddress || '-'
|
||||||
}}</strong
|
}}</strong
|
||||||
><b class="end">终</b
|
><b class="end">终</b
|
||||||
><strong>{{ detailRow.arrivalName || detailRow.arrivalAddress || '-' }}</strong>
|
><strong>{{ detailRow.arrivalName || detailRow.arrivalAddress || '-' }}</strong>
|
||||||
</div>
|
</div>
|
||||||
<div class="business-crud-page__waybill-route-text">
|
<div class="business-crud-page__waybill-route-text">
|
||||||
{{ detailRow.departureAddress || '-' }} → {{ detailRow.arrivalAddress || '-' }}
|
{{ detailRow.departureAddress || '-' }} → {{ detailRow.arrivalAddress || '-' }}
|
||||||
@@ -2417,7 +2417,7 @@
|
|||||||
<el-table-column prop="deviceCode" label="设备编码" min-width="130" />
|
<el-table-column prop="deviceCode" label="设备编码" min-width="130" />
|
||||||
<el-table-column prop="brand" label="品牌" min-width="110" />
|
<el-table-column prop="brand" label="品牌" min-width="110" />
|
||||||
<el-table-column label="规格型号" min-width="140"
|
<el-table-column label="规格型号" min-width="140"
|
||||||
><template #default="{ row }">{{
|
><template #default="{ row }">{{
|
||||||
[row.specification, row.model].filter(Boolean).join('/') || '-'
|
[row.specification, row.model].filter(Boolean).join('/') || '-'
|
||||||
}}</template></el-table-column
|
}}</template></el-table-column
|
||||||
>
|
>
|
||||||
@@ -2439,13 +2439,13 @@
|
|||||||
>
|
>
|
||||||
<span>司机</span
|
<span>司机</span
|
||||||
><strong
|
><strong
|
||||||
>{{ detailRow.driverName || '-' }} {{ detailRow.driverPhone || '' }}</strong
|
>{{ detailRow.driverName || '-' }} {{ detailRow.driverPhone || '' }}</strong
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div class="business-crud-page__waybill-detail-field">
|
<div class="business-crud-page__waybill-detail-field">
|
||||||
<span>{{
|
<span>{{
|
||||||
waybillIsRoadTransport(detailRow) ? '车牌号' : '航班号/船次号/班列号'
|
waybillIsRoadTransport(detailRow) ? '车牌号' : '航班号/船次号/班列号'
|
||||||
}}</span
|
}}</span
|
||||||
><strong>{{ detailRow.vehicleNo || '-' }}</strong>
|
><strong>{{ detailRow.vehicleNo || '-' }}</strong>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
@@ -2460,8 +2460,8 @@
|
|||||||
>
|
>
|
||||||
<span>押运人</span
|
<span>押运人</span
|
||||||
><strong
|
><strong
|
||||||
>{{ detailRow.escortName || '-' }} {{ detailRow.escortPhone || '' }}</strong
|
>{{ detailRow.escortName || '-' }} {{ detailRow.escortPhone || '' }}</strong
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="!waybillIsRoadTransport(detailRow)"
|
v-if="!waybillIsRoadTransport(detailRow)"
|
||||||
@@ -2514,7 +2514,7 @@
|
|||||||
v-for="(node, index) in waybillDetailProcessNodes"
|
v-for="(node, index) in waybillDetailProcessNodes"
|
||||||
:key="node.key || index"
|
:key="node.key || index"
|
||||||
:timestamp="node.time || ''"
|
:timestamp="node.time || ''"
|
||||||
>{{ node.name || node.nodeName || node.label }}</el-timeline-item
|
>{{ node.name || node.nodeName || node.label }}</el-timeline-item
|
||||||
>
|
>
|
||||||
</el-timeline>
|
</el-timeline>
|
||||||
<el-empty v-else description="暂无打卡详情" :image-size="50" />
|
<el-empty v-else description="暂无打卡详情" :image-size="50" />
|
||||||
@@ -2550,7 +2550,7 @@
|
|||||||
<template #extra>
|
<template #extra>
|
||||||
<div class="business-crud-page__waybill-track-actions">
|
<div class="business-crud-page__waybill-track-actions">
|
||||||
<el-button plain @click="handleWaybillTrackAction('playback')"
|
<el-button plain @click="handleWaybillTrackAction('playback')"
|
||||||
>轨迹回放</el-button
|
>轨迹回放</el-button
|
||||||
>
|
>
|
||||||
<el-button plain @click="handleWaybillTrackAction('locate')">实时定位</el-button>
|
<el-button plain @click="handleWaybillTrackAction('locate')">实时定位</el-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -2924,7 +2924,7 @@
|
|||||||
<el-button type="primary">添加附件</el-button>
|
<el-button type="primary">添加附件</el-button>
|
||||||
</el-upload>
|
</el-upload>
|
||||||
<span class="business-crud-page__import-file-tip"
|
<span class="business-crud-page__import-file-tip"
|
||||||
>请上传计划明细表,仅支持 Excel 格式</span
|
>请上传计划明细表,仅支持 Excel 格式</span
|
||||||
>
|
>
|
||||||
<el-link type="primary" @click="handleTransportPlanTemplate">下载模板</el-link>
|
<el-link type="primary" @click="handleTransportPlanTemplate">下载模板</el-link>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -3030,7 +3030,7 @@
|
|||||||
type="primary"
|
type="primary"
|
||||||
:loading="transportPlanImportLoading"
|
:loading="transportPlanImportLoading"
|
||||||
@click="submitTransportPlanImport"
|
@click="submitTransportPlanImport"
|
||||||
>提交</el-button
|
>提交</el-button
|
||||||
>
|
>
|
||||||
<el-button @click="transportPlanImportBox = false">返回</el-button>
|
<el-button @click="transportPlanImportBox = false">返回</el-button>
|
||||||
</template>
|
</template>
|
||||||
@@ -3835,7 +3835,7 @@
|
|||||||
<el-table-column label="操作" width="100" align="center" fixed="right">
|
<el-table-column label="操作" width="100" align="center" fixed="right">
|
||||||
<template #default="{ $index }">
|
<template #default="{ $index }">
|
||||||
<el-link type="danger" @click="removeDispatchItemAttachment($index)"
|
<el-link type="danger" @click="removeDispatchItemAttachment($index)"
|
||||||
>删除</el-link
|
>删除</el-link
|
||||||
>
|
>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -4505,7 +4505,7 @@
|
|||||||
<div class="business-crud-page__map-info">
|
<div class="business-crud-page__map-info">
|
||||||
<span>{{ transportMapStatus }}</span>
|
<span>{{ transportMapStatus }}</span>
|
||||||
<span v-if="transportMapSelected.regionName"
|
<span v-if="transportMapSelected.regionName"
|
||||||
>行政区划:{{ transportMapSelected.regionName }}</span
|
>行政区划:{{ transportMapSelected.regionName }}</span
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
@@ -5422,9 +5422,9 @@ export default {
|
|||||||
this.getDispatchQuantityUnit(row),
|
this.getDispatchQuantityUnit(row),
|
||||||
'total',
|
'total',
|
||||||
row.quantity ||
|
row.quantity ||
|
||||||
row.cargoQuantity ||
|
row.cargoQuantity ||
|
||||||
row.goodsQuantity ||
|
row.goodsQuantity ||
|
||||||
row.totalQuantity ||
|
row.totalQuantity ||
|
||||||
row.totalCargoQuantity
|
row.totalCargoQuantity
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -6206,8 +6206,8 @@ export default {
|
|||||||
const taskInfo = this.parseJsonObject(this.detailRow.taskInfoJson);
|
const taskInfo = this.parseJsonObject(this.detailRow.taskInfoJson);
|
||||||
this.waybillRouteChangeRecords = Array.isArray(taskInfo.routeChangeRecords)
|
this.waybillRouteChangeRecords = Array.isArray(taskInfo.routeChangeRecords)
|
||||||
? [...taskInfo.routeChangeRecords].sort((a, b) =>
|
? [...taskInfo.routeChangeRecords].sort((a, b) =>
|
||||||
String(b.changeTime).localeCompare(String(a.changeTime))
|
String(b.changeTime).localeCompare(String(a.changeTime))
|
||||||
)
|
)
|
||||||
: [];
|
: [];
|
||||||
},
|
},
|
||||||
openWaybillRouteChangeDialog() {
|
openWaybillRouteChangeDialog() {
|
||||||
@@ -6302,8 +6302,8 @@ export default {
|
|||||||
|
|
||||||
const content = changed
|
const content = changed
|
||||||
? `${row.waybillNo || '运单'}:发货地 ${row.originalDepartureAddress || '-'} → ${
|
? `${row.waybillNo || '运单'}:发货地 ${row.originalDepartureAddress || '-'} → ${
|
||||||
row.departureAddress || '-'
|
row.departureAddress || '-'
|
||||||
};到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`
|
};到货地 ${row.originalArrivalAddress || '-'} → ${row.arrivalAddress || '-'}`
|
||||||
: '调整运输路线顺序';
|
: '调整运输路线顺序';
|
||||||
const records = [
|
const records = [
|
||||||
{
|
{
|
||||||
@@ -8031,21 +8031,21 @@ export default {
|
|||||||
const goodsRows = this.isTaskFullMode
|
const goodsRows = this.isTaskFullMode
|
||||||
? this.transportCargoRows.map(item => this.normalizeTransportCargoRow(item))
|
? this.transportCargoRows.map(item => this.normalizeTransportCargoRow(item))
|
||||||
: [
|
: [
|
||||||
{
|
{
|
||||||
cargoType: row.cargoType,
|
cargoType: row.cargoType,
|
||||||
cargoTypeCode: row.cargoTypeCode,
|
cargoTypeCode: row.cargoTypeCode,
|
||||||
cargoTypePath: row.cargoTypePath,
|
cargoTypePath: row.cargoTypePath,
|
||||||
cargoName: row.cargoName,
|
cargoName: row.cargoName,
|
||||||
specification: row.specification,
|
specification: row.specification,
|
||||||
model: row.model,
|
model: row.model,
|
||||||
quantity: row.quantity,
|
quantity: row.quantity,
|
||||||
quantityUnit: row.quantityUnit,
|
quantityUnit: row.quantityUnit,
|
||||||
mileage: row.mileage,
|
mileage: row.mileage,
|
||||||
unitPrice: row.unitPrice,
|
unitPrice: row.unitPrice,
|
||||||
priceUnit: row.priceUnit,
|
priceUnit: row.priceUnit,
|
||||||
remark: row.taskRemark,
|
remark: row.taskRemark,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
if (this.isTaskFullMode) {
|
if (this.isTaskFullMode) {
|
||||||
const firstCargo = goodsRows[0] || {};
|
const firstCargo = goodsRows[0] || {};
|
||||||
taskInfo.unitPrice = firstCargo.unitPrice || '';
|
taskInfo.unitPrice = firstCargo.unitPrice || '';
|
||||||
@@ -9398,8 +9398,8 @@ export default {
|
|||||||
const children =
|
const children =
|
||||||
level === 1
|
level === 1
|
||||||
? (cargoType.children || [])
|
? (cargoType.children || [])
|
||||||
.map(item => this.normalizeBillingCargoTypeNode(item, level + 1, path))
|
.map(item => this.normalizeBillingCargoTypeNode(item, level + 1, path))
|
||||||
.filter(Boolean)
|
.filter(Boolean)
|
||||||
: [];
|
: [];
|
||||||
return {
|
return {
|
||||||
...cargoType,
|
...cargoType,
|
||||||
@@ -9466,8 +9466,8 @@ export default {
|
|||||||
const children =
|
const children =
|
||||||
level === 1
|
level === 1
|
||||||
? (region.children || [])
|
? (region.children || [])
|
||||||
.map(item => this.normalizeBillingMatchRegionNode(item, level + 1))
|
.map(item => this.normalizeBillingMatchRegionNode(item, level + 1))
|
||||||
.filter(Boolean)
|
.filter(Boolean)
|
||||||
: [];
|
: [];
|
||||||
return {
|
return {
|
||||||
...region,
|
...region,
|
||||||
@@ -11008,8 +11008,8 @@ export default {
|
|||||||
mode === 'draft'
|
mode === 'draft'
|
||||||
? '生成草稿成功'
|
? '生成草稿成功'
|
||||||
: shouldCompletePlan
|
: shouldCompletePlan
|
||||||
? '确认生成成功,运输计划已完成'
|
? '确认生成成功,运输计划已完成'
|
||||||
: '确认生成成功';
|
: '确认生成成功';
|
||||||
this.$message.success(message);
|
this.$message.success(message);
|
||||||
this.dispatchBox = false;
|
this.dispatchBox = false;
|
||||||
this.onLoad(this.page, this.query);
|
this.onLoad(this.page, this.query);
|
||||||
@@ -11178,10 +11178,6 @@ export default {
|
|||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
|
|
||||||
> span {
|
|
||||||
line-height: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
&::before {
|
&::before {
|
||||||
display: block;
|
display: block;
|
||||||
width: 4px;
|
width: 4px;
|
||||||
@@ -11211,12 +11207,6 @@ export default {
|
|||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 8px;
|
gap: 8px;
|
||||||
|
|
||||||
.el-link {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
line-height: 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&__task {
|
&__task {
|
||||||
@@ -11967,23 +11957,12 @@ export default {
|
|||||||
gap: 16px;
|
gap: 16px;
|
||||||
align-items: stretch;
|
align-items: stretch;
|
||||||
margin-bottom: 12px;
|
margin-bottom: 12px;
|
||||||
|
|
||||||
.section-card {
|
|
||||||
margin-bottom: 0 !important;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&__dispatch-summary-card,
|
&__dispatch-summary-card,
|
||||||
&__dispatch-route-card {
|
&__dispatch-route-card {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
min-height: 260px;
|
|
||||||
|
|
||||||
:deep(.section-card) {
|
|
||||||
flex: 1;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
:deep(.section-card__body) {
|
:deep(.section-card__body) {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
@@ -12156,13 +12135,6 @@ export default {
|
|||||||
margin-left: 8px;
|
margin-left: 8px;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: #3c3c3c;
|
color: #3c3c3c;
|
||||||
|
|
||||||
.dispatch-summary-value {
|
|
||||||
&.is-piece {
|
|
||||||
color: #409eff;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&__dispatch-table {
|
&__dispatch-table {
|
||||||
@@ -12418,10 +12390,9 @@ export default {
|
|||||||
&__detail-content {
|
&__detail-content {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
//gap: 8px;
|
gap: 12px;
|
||||||
|
|
||||||
.section-card {
|
.section-card {
|
||||||
|
|
||||||
:deep(.el-descriptions__label) {
|
:deep(.el-descriptions__label) {
|
||||||
width: 140px;
|
width: 140px;
|
||||||
color: #606266;
|
color: #606266;
|
||||||
@@ -12849,11 +12820,6 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.section-card {
|
|
||||||
|
|
||||||
&:last-child {
|
|
||||||
margin-bottom: 0 !important;
|
|
||||||
}
|
|
||||||
.section-card {
|
.section-card {
|
||||||
margin-bottom: 0 !important;
|
margin-bottom: 0 !important;
|
||||||
}
|
}
|
||||||
@@ -12864,7 +12830,7 @@ export default {
|
|||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
|
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
|
||||||
padding: 16px;
|
padding: 16px;
|
||||||
margin-bottom: 8px;
|
margin-bottom: 16px;
|
||||||
|
|
||||||
.avue-form__group--title {
|
.avue-form__group--title {
|
||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
|
|||||||
+13
-13
@@ -50,26 +50,26 @@ export default ({
|
|||||||
__VUE_I18N_LEGACY_API__: true,
|
__VUE_I18N_LEGACY_API__: true,
|
||||||
__INTLIFY_PROD_DEVTOOLS__: false,
|
__INTLIFY_PROD_DEVTOOLS__: false,
|
||||||
},
|
},
|
||||||
// server: {
|
|
||||||
// port: 2888,
|
|
||||||
// proxy: {
|
|
||||||
// '/api': {
|
|
||||||
// target: 'http://localhost',
|
|
||||||
// //target: 'https://saber3.bladex.cn/api',
|
|
||||||
// changeOrigin: true,
|
|
||||||
// rewrite: path => path.replace(/^\/api/, ''),
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
server: {
|
server: {
|
||||||
port: 2889,
|
port: 2888,
|
||||||
proxy: {
|
proxy: {
|
||||||
'/api': {
|
'/api': {
|
||||||
target: 'http://172.16.203.228:8000',
|
target: 'http://localhost',
|
||||||
|
//target: 'https://saber3.bladex.cn/api',
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
|
rewrite: path => path.replace(/^\/api/, ''),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
// server: {
|
||||||
|
// port: 2889,
|
||||||
|
// proxy: {
|
||||||
|
// '/api': {
|
||||||
|
// target: 'http://172.16.203.228:8000',
|
||||||
|
// changeOrigin: true,
|
||||||
|
// },
|
||||||
|
// },
|
||||||
|
// },
|
||||||
resolve: {
|
resolve: {
|
||||||
alias: {
|
alias: {
|
||||||
'~': resolve(__dirname, './'),
|
'~': resolve(__dirname, './'),
|
||||||
|
|||||||
Reference in New Issue
Block a user