b2894lxlx/tms-erp-web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'websoft/master'

Browse Source 
# Conflicts:
#	src/views/business/components/business-crud-page.vue
This commit is contained in:
b2894lxlx
2026-08-25 00:11:14 +08:00
parent 1ef050dda6 21c4168867
commit e5992a0c63
36 changed files with 560 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/transportCapacity/components/vehicle-ledger.vue
+3 -3
View File
@@ -25,11 +25,11 @@
<el-descriptions-item label="能源类型">{{
vehicleDetail.energyType || '-'
}}</el-descriptions-item>
<el-descriptions-item label="外廓尺寸(mm)">{{ dimensions }}</el-descriptions-item>
<el-descriptions-item label="核定载质量(KG)">{{
<el-descriptions-item label="外廓尺寸（mm）">{{ dimensions }}</el-descriptions-item>
<el-descriptions-item label="核定载质量（KG）">{{
vehicleDetail.approvedLoadKg ?? '-'
}}</el-descriptions-item>
<el-descriptions-item label="准牵引总质量(KG)">{{
<el-descriptions-item label="准牵引总质量（KG）">{{
vehicleDetail.tractionMassKg ?? '-'
}}</el-descriptions-item>
<el-descriptions-item label="行驶证档案编号">{{
src/views/transportCapacity/vehicle.vue
+4 -4
View File
@@ -231,7 +231,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="外廓尺寸(毫米)">
<el-form-item label="外廓尺寸（毫米）">
<div class="dimension-group">
<div class="dimension-group__item">
<span class="dimension-group__label">长</span>
@@ -263,7 +263,7 @@
</el-row>
<el-row :gutter="18">
<el-col :span="8">
<el-form-item label="核定载质量(KG)" prop="approvedLoadKg">
<el-form-item label="核定载质量（KG）" prop="approvedLoadKg">
<el-input
v-model="vehicleForm.approvedLoadKg"
inputmode="numeric"
@@ -272,7 +272,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="准牵引总质量(KG)" prop="tractionMassKg">
<el-form-item label="准牵引总质量（KG）" prop="tractionMassKg">
<el-input
v-model="vehicleForm.tractionMassKg"
inputmode="numeric"
@@ -729,7 +729,7 @@ export default {
return [
['所属组织', 'organizationName'], ['车牌号', 'plateNo'], ['车牌颜色', 'plateColor'],
['车辆类型', 'vehicleType'], ['外廓长度(mm)', 'outerLength'], ['外廓宽度(mm)', 'outerWidth'],
['外廓高度(mm)', 'outerHeight'], ['核定载质量(KG)', 'approvedLoadKg'], ['准牵引总质量(KG)', 'tractionMassKg'],
['外廓高度(mm)', 'outerHeight'], ['核定载质量（KG）', 'approvedLoadKg'], ['准牵引总质量（KG）', 'tractionMassKg'],
['业务关系', 'businessRelation'], ['能源类型', 'energyType'], ['强制报废日期', 'compulsoryScrapDate'],
['海关备案号', 'customsRecordNo'], ['行驶证档案编号', 'drivingLicenseNo'], ['行驶证有效期起', 'drivingLicenseStartDate'],
['行驶证有效期止', 'drivingLicenseEndDate'], ['道路运输证号', 'roadTransportCertNo'], ['道路运输证有效期起', 'roadTransportCertStartDate'],