{{
detailRow.departureName || detailRow.departureAddress || '-'
}}终{{ detailRow.arrivalName || detailRow.arrivalAddress || '-' }}
+ >终{{ detailRow.arrivalName || detailRow.arrivalAddress || '-' }}
{{ detailRow.departureAddress || '-' }} → {{ detailRow.arrivalAddress || '-' }}
@@ -2417,7 +2417,7 @@
{{
+ >{{
[row.specification, row.model].filter(Boolean).join('/') || '-'
}}
@@ -2439,13 +2439,13 @@
>
司机{{ detailRow.driverName || '-' }} {{ detailRow.driverPhone || '' }}
+ >{{ detailRow.driverName || '-' }} {{ detailRow.driverPhone || '' }}
{{
- waybillIsRoadTransport(detailRow) ? '车牌号' : '航班号/船次号/班列号'
- }}{{ detailRow.vehicleNo || '-' }}
押运人{{ detailRow.escortName || '-' }} {{ detailRow.escortPhone || '' }}
+ >{{ detailRow.escortName || '-' }} {{ detailRow.escortPhone || '' }}
{{ node.name || node.nodeName || node.label }}{{ node.name || node.nodeName || node.label }}
@@ -2550,7 +2550,7 @@
轨迹回放轨迹回放
实时定位
@@ -2924,7 +2924,7 @@
添加附件
请上传计划明细表，仅支持 Excel 格式请上传计划明细表，仅支持 Excel 格式
下载模板
@@ -3030,7 +3030,7 @@
type="primary"
:loading="transportPlanImportLoading"
@click="submitTransportPlanImport"
- >提交提交
返回
@@ -3835,7 +3835,7 @@
删除删除
@@ -4505,7 +4505,7 @@
{{ transportMapStatus }}
行政区划：{{ transportMapSelected.regionName }}行政区划：{{ transportMapSelected.regionName }}
@@ -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);
@@ -11178,10 +11178,6 @@ export default {
font-size: 15px;
font-weight: 600;
- > span {
- line-height: 1;
- }
-
&::before {
display: block;
width: 4px;
@@ -11211,12 +11207,6 @@ export default {
flex: 0 0 auto;
align-items: center;
gap: 8px;
-
- .el-link {
- display: inline-flex;
- align-items: center;
- line-height: 1;
- }
}
&__task {
@@ -11967,23 +11957,12 @@ export default {
gap: 16px;
align-items: stretch;
margin-bottom: 12px;
-
- .section-card {
- margin-bottom: 0 !important;
- }
}
&__dispatch-summary-card,
&__dispatch-route-card {
display: flex;
flex-direction: column;
- min-height: 260px;
-
- :deep(.section-card) {
- flex: 1;
- display: flex;
- flex-direction: column;
- }
:deep(.section-card__body) {
flex: 1;
@@ -12156,13 +12135,6 @@ export default {
margin-left: 8px;
font-size: 14px;
color: #3c3c3c;
-
- .dispatch-summary-value {
- &.is-piece {
- color: #409eff;
- font-weight: 600;
- }
- }
}
&__dispatch-table {
@@ -12418,10 +12390,9 @@ export default {
&__detail-content {
display: flex;
flex-direction: column;
- //gap: 8px;
+ gap: 12px;
.section-card {
-
:deep(.el-descriptions__label) {
width: 140px;
color: #606266;
@@ -12849,11 +12820,6 @@ export default {
}
}
}
-.section-card {
-
- &:last-child {
- margin-bottom: 0 !important;
- }
.section-card {
margin-bottom: 0 !important;
}
@@ -12864,7 +12830,7 @@ export default {
border-radius: 6px;
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.08);
padding: 16px;
- margin-bottom: 8px;
+ margin-bottom: 16px;
.avue-form__group--title {
padding: 0 !important;
diff --git a/vite.config.mjs b/vite.config.mjs
index 09134a0..8c0a2a9 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -50,26 +50,26 @@ export default ({
__VUE_I18N_LEGACY_API__: true,
__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: {
- port: 2889,
+ port: 2888,
proxy: {
'/api': {
- target: 'http://172.16.203.228:8000',
+ target: 'http://localhost',
+ //target: 'https://saber3.bladex.cn/api',
changeOrigin: true,
+ rewrite: path => path.replace(/^\/api/, ''),
},
},
},
+ // server: {
+ // port: 2889,
+ // proxy: {
+ // '/api': {
+ // target: 'http://172.16.203.228:8000',
+ // changeOrigin: true,
+ // },
+ // },
+ // },
resolve: {
alias: {
'~': resolve(__dirname, './'),