diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue
index b3973e1..de5e41b 100644
--- a/src/views/business/loading-manage.vue
+++ b/src/views/business/loading-manage.vue
@@ -633,15 +633,12 @@
prop="packageType"
label="包装"
min-width="100" />
-
+
@@ -2852,7 +2849,6 @@ export default {
if (status === 'draft') {
return [
{ type: 'edit', label: '编辑' },
- { type: 'copy', label: '复制' },
{ type: 'delete', label: '删除' },
];
}
@@ -2864,36 +2860,24 @@ export default {
if (row.driverRejected) {
actions.push({ type: 'reassign', label: '重新派单' });
}
- actions.push(
- { type: 'edit', label: '编辑' },
- { type: 'copy', label: '复制' },
- { type: 'cancel', label: '取消' }
- );
+ actions.push({ type: 'edit', label: '编辑' }, { type: 'cancel', label: '取消' });
return actions;
}
if (status === 'running') {
return [
{ type: 'view', label: '详情' },
{ type: 'complete', label: '完成' },
- { type: 'copy', label: '复制' },
];
}
if (status === 'completed' || status === 'cancelled') {
- return [
- { type: 'view', label: '详情' },
- { type: 'copy', label: '复制' },
- ];
+ return [{ type: 'view', label: '详情' }];
}
- return [
- { type: 'view', label: '详情' },
- { type: 'copy', label: '复制' },
- ];
+ return [{ type: 'view', label: '详情' }];
},
handleRowAction(type, row) {
const actionMap = {
view: () => this.gotoLoadingDetail(row),
edit: () => this.openLoadingDialog('edit', row),
- copy: () => this.gotoLoadingCopy(row),
reassign: () => this.gotoLoadingReassign(row),
delete: () => this.deleteLoading(row),
start: () => this.startLoading(row),
diff --git a/src/views/transportCapacity/components/vehicle-ledger.vue b/src/views/transportCapacity/components/vehicle-ledger.vue
index 5267ebb..a070ed6 100644
--- a/src/views/transportCapacity/components/vehicle-ledger.vue
+++ b/src/views/transportCapacity/components/vehicle-ledger.vue
@@ -27,10 +27,10 @@
}}
{{ dimensions }}
{{
- vehicleDetail.approvedLoadKg ?? '-'
+ optionalNumberText(vehicleDetail.approvedLoadKg)
}}
{{
- vehicleDetail.tractionMassKg ?? '-'
+ optionalNumberText(vehicleDetail.tractionMassKg)
}}
{{
vehicleDetail.drivingLicenseNo || '-'
@@ -302,10 +302,29 @@ export default {
const v = this.vehicleDetail;
return (
[v.outerLength, v.outerWidth, v.outerHeight]
- .filter(item => item !== null && item !== undefined && item !== '')
+ .filter(
+ item =>
+ item !== null &&
+ item !== undefined &&
+ item !== '' &&
+ Number(item) !== -1 &&
+ String(item) !== '-1'
+ )
.join('×') || '-'
);
},
+ optionalNumberText(value) {
+ if (
+ value === null ||
+ value === undefined ||
+ value === '' ||
+ Number(value) === -1 ||
+ String(value) === '-1'
+ ) {
+ return '-';
+ }
+ return value;
+ },
plateColorType() {
return (
{ 黄牌: 'warning', 蓝牌: 'primary', 绿牌: 'success' }[this.vehicleDetail.plateColor] ||
diff --git a/src/views/transportCapacity/vehicle.vue b/src/views/transportCapacity/vehicle.vue
index 9ec02ca..871d3a5 100644
--- a/src/views/transportCapacity/vehicle.vue
+++ b/src/views/transportCapacity/vehicle.vue
@@ -863,6 +863,7 @@ export default {
...emptyForm(),
...(res.data.data || {}),
};
+ this.normalizeOptionalNumberFields(this.vehicleForm);
if (!this.vehicleForm.useDepartment) {
this.vehicleForm.useDepartment = this.getCurrentOrganizationName();
}
@@ -1284,6 +1285,7 @@ export default {
}
this.submitLoading = true;
const payload = this.normalizeVehicleDateFields({ ...this.vehicleForm });
+ this.normalizeOptionalNumberFields(payload, null);
submit(payload)
.then(() => {
this.$message.success('操作成功');
@@ -1295,6 +1297,24 @@ export default {
});
});
},
+ /**
+ * 可选数字字段:空串 / -1(BladeX null 占位)归一为 emptyValue,避免查看时显示 -1
+ */
+ normalizeOptionalNumberFields(form = {}, emptyValue = undefined) {
+ ['outerLength', 'outerWidth', 'outerHeight', 'tractionMassKg'].forEach(key => {
+ const value = form[key];
+ if (
+ value === undefined ||
+ value === null ||
+ value === '' ||
+ Number(value) === -1 ||
+ String(value) === '-1'
+ ) {
+ form[key] = emptyValue;
+ }
+ });
+ return form;
+ },
handleStatus(row) {
const status = row.status === 1 ? 2 : 1;
const text = status === 1 ? '启用' : '停用';