Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/system/dept.vue
This commit is contained in:
2026-08-07 12:02:41 +08:00
37 changed files with 2593 additions and 645 deletions
+87 -93
View File
@@ -1,4 +1,3 @@
import website from '@/config/website';
import { getDeptLazyTree } from '@/api/system/dept';
export const userOption = safe => {
@@ -25,42 +24,41 @@ export const userOption = safe => {
searchShow: true,
searchMenuSpan: 24,
searchIcon: true,
searchIndex: 8,
searchIndex: 4,
searchMenuPosition: 'right',
border: true,
index: true,
selection: true,
addBtn: false,
viewBtn: true,
dialogType: 'drawer',
dialogWidth: 1000,
dialogType: 'dialog',
dialogWidth: '90%',
labelPosition: 'right',
labelWidth: 120,
dialogClickModal: false,
column: [
{
label: '登录账号',
label: '账号',
prop: 'account',
search: true,
searchOrder: 2,
display: false,
},
{
label: '所属租户',
prop: 'tenantName',
slot: true,
display: false,
},
{
label: '用户姓名',
label: '姓名',
prop: 'realName',
search: true,
searchOrder: 4,
display: false,
},
{
label: '所属角色',
prop: 'roleName',
slot: true,
overHidden: true,
label: '手机号',
prop: 'phone',
search: true,
searchOrder: 3,
display: false,
},
{ label: '工号', prop: 'code', display: false },
{
label: '所属部门',
prop: 'deptName',
@@ -68,33 +66,22 @@ export const userOption = safe => {
overHidden: true,
display: false,
},
{ label: '岗位', prop: 'postName', overHidden: true, display: false },
{ label: '性别', prop: 'sexName', width: 80, display: false },
{ label: 'OA人员id', prop: 'oaPersonId', minWidth: 120, overHidden: true, display: false },
{ label: '备注', prop: 'remark', minWidth: 160, overHidden: true, display: false },
{
label: '用户平台',
prop: 'userTypeName',
width: 100,
slot: true,
display: false,
},
{
label: '用户平台',
label: '状态',
prop: 'status',
type: 'select',
dicUrl: '/blade-system/dict/dictionary?code=user_type',
props: {
label: 'dictValue',
value: 'dictKey',
},
dicData: [
{ label: '启用', value: 1 },
{ label: '禁用', value: 0 },
],
dataType: 'number',
search: true,
hide: true,
searchOrder: 1,
display: false,
prop: 'userType',
rules: [
{
required: true,
message: '请选择用户平台',
trigger: 'blur',
},
],
},
],
group: [
@@ -104,53 +91,13 @@ export const userOption = safe => {
icon: 'el-icon-user-solid',
column: [
{
label: '所属租户',
prop: 'tenantId',
type: 'tree',
dicUrl: '/blade-system/tenant/select',
props: {
label: 'tenantName',
value: 'tenantId',
},
hide: !website.tenantMode,
addDisplay: website.tenantMode,
editDisplay: website.tenantMode,
viewDisplay: website.tenantMode,
rules: [
{
required: true,
message: '请输入所属租户',
trigger: 'click',
},
],
span: 24,
},
{
label: '登录账号',
label: '账号名',
prop: 'account',
span: 6,
rules: [
{
required: true,
message: '请输入登录账号',
trigger: 'blur',
},
],
},
{
label: '用户平台',
type: 'select',
dicUrl: '/blade-system/dict/dictionary?code=user_type',
props: {
label: 'dictValue',
value: 'dictKey',
},
dataType: 'number',
slot: true,
prop: 'userType',
rules: [
{
required: true,
message: '请选择用户平台',
message: '请输入账号',
trigger: 'blur',
},
],
@@ -161,6 +108,7 @@ export const userOption = safe => {
hide: true,
editDisplay: false,
viewDisplay: false,
addDisplay: false,
rules: [{ required: true, validator: validatePass, trigger: 'blur' }],
},
{
@@ -169,6 +117,7 @@ export const userOption = safe => {
hide: true,
editDisplay: false,
viewDisplay: false,
addDisplay: false,
rules: [{ required: true, validator: validatePass2, trigger: 'blur' }],
},
],
@@ -191,12 +140,13 @@ export const userOption = safe => {
],
},
{
label: '用户姓名',
label: '姓名',
prop: 'realName',
span: 6,
rules: [
{
required: true,
message: '请输入用户姓名',
message: '请输入姓名',
trigger: 'blur',
},
{
@@ -209,12 +159,14 @@ export const userOption = safe => {
{
label: '手机号码',
prop: 'phone',
span: 6,
rules: [{ required: true, message: '请输入手机号码', trigger: 'blur' }],
overHidden: true,
},
{
label: '电子邮箱',
prop: 'email',
hide: true,
span: 6,
overHidden: true,
},
{
@@ -235,7 +187,7 @@ export const userOption = safe => {
value: 3,
},
],
hide: true,
span: 6,
},
{
label: '用户生日',
@@ -261,6 +213,8 @@ export const userOption = safe => {
{
label: '用户编号',
prop: 'code',
label: '工号',
span: 6,
},
{
label: '所属角色',
@@ -273,13 +227,7 @@ export const userOption = safe => {
},
checkStrictly: true,
slot: true,
rules: [
{
required: true,
message: '请选择所属角色',
trigger: 'click',
},
],
display: false,
},
{
label: '所属部门',
@@ -292,6 +240,7 @@ export const userOption = safe => {
},
checkStrictly: true,
slot: true,
span: 6,
rules: [
{
required: true,
@@ -304,7 +253,7 @@ export const userOption = safe => {
label: '所属岗位',
prop: 'postId',
type: 'tree',
multiple: true,
multiple: false,
dicData: [],
props: {
label: 'postName',
@@ -317,6 +266,7 @@ export const userOption = safe => {
trigger: 'click',
},
],
span: 6,
},
{
label: '直属主管',
@@ -330,6 +280,7 @@ export const userOption = safe => {
value: 'id',
},
clearable: true,
display: false,
},
{
label: '是否主管',
@@ -346,6 +297,49 @@ export const userOption = safe => {
},
],
value: 0,
display: false,
},
{
label: '人员类别',
prop: 'personCategory',
type: 'select',
span: 6,
value: 1,
dicData: [
{ label: '内部员工', value: 1 },
{ label: '承运商', value: 2 },
],
},
{
label: '数据权限范围',
prop: 'dataScopeRange',
type: 'radio',
span: 24,
value: 1,
dicData: [
{ label: '仅所属组织', value: 1 },
{ label: '全部组织', value: 2 },
{ label: '自定义', value: 3 },
],
},
{
label: '数据层级范围',
prop: 'dataLevelRange',
type: 'radio',
span: 24,
value: 1,
dicData: [
{ label: '包含下级', value: 1 },
{ label: '仅本级', value: 2 },
],
},
{
label: '备注',
prop: 'remark',
type: 'textarea',
span: 24,
maxlength: 200,
showWordLimit: true,
},
],
},
+72 -80
View File
@@ -20,58 +20,63 @@ export const option = {
dialogClickModal: false,
column: [
{
label: '姓名',
label: '姓名身份证号',
prop: 'driverName',
search: true,
searchOrder: 7,
slot: true,
minWidth: 120,
minWidth: 220,
},
{
label: '手机号',
label: '手机号',
prop: 'mobile',
search: true,
searchOrder: 6,
minWidth: 130,
},
{
label: '准驾车型',
prop: 'drivingType',
label: '性别',
prop: 'gender',
width: 80,
align: 'center',
},
{
label: '司机类型',
prop: 'driverType',
search: true,
searchOrder: 5,
hide: true,
searchOrder: 3,
type: 'select',
dicData: [
{
label: 'A1',
value: 'A1',
label: '自有员工',
value: '自有',
},
{
label: 'A2',
value: 'A2',
label: '外协',
value: '外协',
},
{
label: 'A3',
value: 'A3',
},
{
label: 'B1',
value: 'B1',
},
{
label: 'B2',
value: 'B2',
},
{
label: 'C1',
value: 'C1',
},
{
label: 'C2',
value: 'C2',
label: '承运管理员',
value: '承运管理员',
},
],
minWidth: 110,
align: 'center',
},
{
label: '岗位',
prop: 'posts',
minWidth: 150,
},
{
label: '所属组织',
prop: 'organizationName',
search: true,
searchOrder: 1,
type: 'select',
filterable: true,
dicData: [],
minWidth: 160,
},
{
label: '状态',
@@ -94,65 +99,52 @@ export const option = {
align: 'center',
},
{
label: '司机类型',
prop: 'driverType',
search: true,
searchOrder: 3,
type: 'select',
dicData: [
{
label: '自有员工',
value: '自有',
},
{
label: '外协',
value: '外协',
},
],
minWidth: 110,
align: 'center',
},
{
label: '身份证号',
prop: 'idCardNo',
search: true,
searchOrder: 2,
minWidth: 190,
},
{
label: '所属组织',
prop: 'organizationName',
search: true,
searchOrder: 1,
type: 'select',
filterable: true,
dicData: [],
minWidth: 160,
},
{
label: '性别',
prop: 'gender',
width: 80,
align: 'center',
},
{
label: '岗位',
prop: 'posts',
minWidth: 150,
},
{
label: '驾驶认证',
label: '驾驶认证(日期)',
prop: 'drivingLicenseEndDate',
slot: true,
minWidth: 140,
align: 'center',
},
{
label: '从业资格认证',
label: '从业资格认证(日期)',
prop: 'qualificationEndDate',
slot: true,
minWidth: 150,
align: 'center',
minWidth: 160,
},
{
label: '身份证号',
prop: 'idCardNo',
search: true,
searchOrder: 2,
hide: true,
},
{
label: '准驾车型',
prop: 'drivingType',
search: true,
searchOrder: 5,
hide: true,
type: 'select',
dicData: [
{ label: 'A1', value: 'A1' },
{ label: 'A2', value: 'A2' },
{ label: 'A3', value: 'A3' },
{ label: 'B1', value: 'B1' },
{ label: 'B2', value: 'B2' },
{ label: 'C1', value: 'C1' },
{ label: 'C2', value: 'C2' },
],
},
{
label: '',
prop: 'expireStatus',
search: true,
searchOrder: 0,
searchSpan: 6,
hide: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
},
],
};
+22 -23
View File
@@ -14,7 +14,7 @@ export const option = {
editBtn: false,
delBtn: false,
viewBtn: false,
menuWidth: 180,
menuWidth: 320,
dialogClickModal: false,
column: [
{
@@ -32,6 +32,16 @@ export const option = {
searchOrder: 4,
minWidth: 140,
},
{
label: '所属组织',
prop: 'organizationName',
search: true,
searchOrder: 1,
type: 'select',
filterable: true,
dicData: [],
minWidth: 160,
},
{
label: '船检登记号',
prop: 'shipInspectionNo',
@@ -54,28 +64,6 @@ export const option = {
minWidth: 110,
align: 'center',
},
{
label: '所属组织',
prop: 'organizationName',
search: true,
searchOrder: 1,
type: 'select',
filterable: true,
dicData: [],
minWidth: 160,
},
{
label: '状态',
prop: 'status',
type: 'select',
slot: true,
dicData: [
{ label: '启用', value: 1 },
{ label: '停用', value: 2 },
],
minWidth: 90,
align: 'center',
},
{
label: '国籍证有效期至',
prop: 'nationalityCertEndDate',
@@ -104,5 +92,16 @@ export const option = {
minWidth: 140,
align: 'center',
},
{
label: '',
prop: 'expireStatus',
search: true,
searchOrder: 0,
searchSpan: 6,
hide: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
},
],
};
@@ -9,22 +9,38 @@ export const option = {
searchMenuPosition: 'right',
border: true,
index: true,
selection: true,
selection: false,
addBtn: false,
editBtn: false,
delBtn: false,
viewBtn: false,
menuWidth: 180,
menuWidth: 320,
dialogClickModal: false,
column: [
{
label: '车牌号',
prop: 'plateNo',
search: true,
searchOrder: 5,
searchOrder: 6,
slot: true,
minWidth: 120,
},
{
label: '业务关系',
prop: 'businessRelation',
search: true,
searchOrder: 5,
searchValue: '',
type: 'select',
dicData: [
{ label: '全部', value: '' },
{ label: '自有', value: '自有' },
{ label: '管理挂靠', value: '管理挂靠' },
{ label: '业务合作', value: '业务合作' },
],
minWidth: 120,
align: 'center',
},
{
label: '所属组织',
prop: 'organizationName',
@@ -35,26 +51,11 @@ export const option = {
dicData: [],
minWidth: 150,
},
{
label: '业务关系',
prop: 'businessRelation',
search: true,
searchOrder: 4,
type: 'select',
dicData: [
{ label: '全部', value: '' },
{ label: '自有', value: '自有' },
{ label: '管理挂靠', value: '管理挂靠' },
{ label: '业务合作', value: '业务合作' },
],
minWidth: 120,
align: 'center',
},
{
label: '车辆类型',
prop: 'vehicleType',
search: true,
searchOrder: 3,
searchOrder: 4,
type: 'select',
dicData: [
{ label: '全部', value: '' },
@@ -74,11 +75,41 @@ export const option = {
minWidth: 140,
align: 'right',
},
{
label: '绑定司机',
prop: 'boundDriver',
slot: true,
minWidth: 120,
align: 'center',
},
{
label: '车辆类型',
prop: 'vehicleType',
minWidth: 110,
align: 'center',
},
{
label: '认证状态',
prop: 'certificationStatus',
slot: true,
search: true,
searchOrder: 2,
searchValue: '',
type: 'select',
dicData: [
{ label: '全部', value: '' },
{ label: '认证中', value: 0 },
{ label: '已认证', value: 1 },
{ label: '已驳回', value: 2 },
],
minWidth: 110,
align: 'center',
},
{
label: '车辆状态',
prop: 'status',
search: true,
searchOrder: 2,
searchOrder: 3,
type: 'select',
slot: true,
dicData: [
@@ -89,25 +120,41 @@ export const option = {
align: 'center',
},
{
label: '行驶证有效期',
label: '道路运输证号',
prop: 'roadTransportCertNo',
minWidth: 160,
},
{
label: '行驶证认证',
prop: 'drivingLicenseEndDate',
slot: true,
minWidth: 140,
align: 'center',
},
{
label: '道路运输证有效期',
label: '道路运输证认证',
prop: 'roadTransportCertEndDate',
slot: true,
minWidth: 160,
align: 'center',
},
{
label: '年审有效期',
label: '道路运输证年审',
prop: 'annualReviewEndDate',
slot: true,
minWidth: 130,
align: 'center',
},
{
label: '',
prop: 'expireStatus',
search: true,
searchOrder: 0,
searchSpan: 6,
hide: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
},
],
};
+5 -6
View File
@@ -49,6 +49,7 @@ export const option = {
searchMenuPosition: 'right',
border: true,
index: true,
indexLabel: '序号',
viewBtn: true,
selection: true,
dialogClickModal: false,
@@ -124,9 +125,8 @@ export const option = {
{
label: '直接经济损失',
prop: 'directEconomicLoss',
type: 'number',
precision: 2,
append: '元',
type: 'input',
formslot: true,
minWidth: 140,
span: 12,
placeholder: '请输入',
@@ -135,9 +135,8 @@ export const option = {
{
label: '保险理赔金额',
prop: 'insuranceClaimAmount',
type: 'number',
precision: 2,
append: '元',
type: 'input',
formslot: true,
minWidth: 140,
span: 12,
placeholder: '请输入',
@@ -48,6 +48,7 @@ export const option = {
searchMenuPosition: 'right',
border: true,
index: true,
indexLabel: '序号',
viewBtn: true,
selection: true,
dialogClickModal: false,
@@ -140,9 +141,8 @@ export const option = {
{
label: '费用',
prop: 'fee',
type: 'number',
precision: 2,
append: '元',
type: 'input',
formslot: true,
minWidth: 100,
span: 12,
placeholder: '请输入',
@@ -155,6 +155,7 @@ export const option = {
label: '评定(复核)单位',
prop: 'assessmentUnit',
minWidth: 160,
overHidden: true,
span: 12,
placeholder: '请输入',
rules: [{ max: 50, message: '最多 50 个字符', trigger: 'blur' }],
+226
View File
@@ -0,0 +1,226 @@
import { formatUpdateUserName } from '@/utils/audit';
export const vehicleTypeDic = [
{ label: '车辆', value: '车辆' },
{ label: '船舶', value: '船舶' },
];
export const onlineStatusDic = [
{ label: '否', value: 0 },
{ label: '是', value: 1 },
];
export const option = {
height: 'auto',
calcHeight: 32,
dialogWidth: 960,
labelPosition: 'right',
labelWidth: 'auto',
searchLabelWidth: 160,
tip: false,
searchBtnText: '查询',
emptyBtnText: '重置',
saveBtnText: '提交',
updateBtnText: '提交',
searchShow: true,
searchMenuSpan: 24,
searchIcon: true,
searchIndex: 4,
searchMenuPosition: 'right',
border: true,
index: true,
indexLabel: '序号',
viewBtn: true,
selection: true,
dialogClickModal: false,
menuWidth: 160,
menuFixed: 'right',
column: [
{
label: '车船类型',
prop: 'vehicleType',
type: 'radio',
dicData: vehicleTypeDic,
value: '车辆',
search: true,
searchOrder: 3,
span: 24,
order: 1,
minWidth: 110,
rules: [{ required: true, message: '请选择车船类型', trigger: 'change' }],
},
{
label: '车牌号/船号',
prop: 'vehicleNo',
slot: true,
formslot: true,
search: true,
searchOrder: 4,
span: 12,
order: 2,
minWidth: 140,
rules: [{ required: true, message: '请输入车牌号/船号', trigger: 'blur' }],
},
{
label: '设备号',
prop: 'equipmentCode',
formslot: true,
search: true,
searchOrder: 2,
span: 12,
order: 3,
minWidth: 150,
rules: [{ required: true, message: '设备编号由系统生成', trigger: 'blur' }],
},
{
label: '设备名称',
prop: 'equipmentName',
span: 12,
order: 4,
minWidth: 150,
rules: [
{ required: true, message: '请输入设备名称', trigger: 'blur' },
{ max: 100, message: '最多 100 个字符', trigger: 'blur' },
],
},
{
label: '出厂日期',
prop: 'factoryDate',
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
span: 12,
order: 8,
minWidth: 130,
},
{
label: '设备品牌',
prop: 'equipmentBrand',
span: 12,
order: 5,
minWidth: 130,
rules: [{ max: 50, message: '最多 50 个字符', trigger: 'blur' }],
},
{
label: '设备类型',
prop: 'equipmentType',
type: 'select',
dicData: [],
span: 12,
order: 6,
minWidth: 130,
rules: [{ max: 50, message: '最多 50 个字符', trigger: 'change' }],
},
{
label: '规格型号',
prop: 'specificationModel',
span: 12,
order: 7,
minWidth: 150,
rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
},
{
label: '备注',
prop: 'remark',
type: 'textarea',
minRows: 3,
span: 24,
order: 10,
minWidth: 180,
overHidden: true,
rules: [{ max: 200, message: '最多 200 个字符', trigger: 'blur' }],
},
{
label: '更新时间',
prop: 'updateTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
minWidth: 170,
},
{
label: '创建时间',
prop: 'createTime',
type: 'datetime',
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
addDisplay: false,
editDisplay: false,
viewDisplay: false,
minWidth: 170,
},
{
label: '是否在线',
prop: 'onlineStatus',
type: 'select',
dicData: onlineStatusDic,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
minWidth: 100,
},
{
label: '原厂设备号',
prop: 'originalEquipmentNo',
span: 12,
order: 9,
hide: true,
rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
},
{
label: '附件',
prop: 'attachments',
slot: true,
formslot: true,
span: 24,
order: 11,
hide: true,
},
{
label: '组织',
prop: 'createDept',
type: 'tree',
dicData: [],
props: { label: 'title', value: 'id' },
checkStrictly: true,
search: true,
searchOrder: 1,
hide: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
},
{
label: '更新人',
prop: 'updateUserName',
formatter: formatUpdateUserName,
display: false,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
},
],
};
export const excelOption = {
labelPosition: 'right',
submitBtn: false,
emptyBtn: false,
column: [
{
label: '模板上传',
prop: 'excelFile',
type: 'upload',
drag: true,
loadText: '模板上传中,请稍等',
span: 24,
propsHttp: { res: 'data' },
tip: '请上传 .xls,.xlsx 标准格式文件',
action: '/blade-transport/equipment-ledger/import-equipment-ledger',
},
{ label: '模板下载', prop: 'excelTemplate', formslot: true, span: 24 },
],
};
+3 -3
View File
@@ -38,6 +38,7 @@ export const option = {
searchMenuPosition: 'right',
border: true,
index: true,
indexLabel: '序号',
viewBtn: true,
selection: true,
dialogClickModal: false,
@@ -103,9 +104,8 @@ export const option = {
{
label: '交易金额',
prop: 'transactionAmount',
type: 'number',
precision: 2,
append: '元',
type: 'input',
formslot: true,
minWidth: 130,
span: 12,
placeholder: '请输入',
+18 -17
View File
@@ -46,6 +46,7 @@ export const option = {
searchMenuPosition: 'right',
border: true,
index: true,
indexLabel: '序号',
viewBtn: true,
selection: true,
dialogClickModal: false,
@@ -128,8 +129,8 @@ export const option = {
{
label: '保额',
prop: 'insuredAmount',
type: 'number',
precision: 2,
type: 'input',
formslot: true,
append: '元',
minWidth: 120,
rules: [{ validator: validateNonNegative, trigger: 'blur' }],
@@ -137,8 +138,8 @@ export const option = {
{
label: '保费',
prop: 'premium',
type: 'number',
precision: 2,
type: 'input',
formslot: true,
append: '元',
minWidth: 120,
rules: [
@@ -181,19 +182,6 @@ export const option = {
display: false,
minWidth: 170,
},
{
label: '创建时间',
prop: 'createTimeRange',
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
searchRange: true,
search: true,
hide: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
},
{
label: '组织',
prop: 'createDept',
@@ -210,6 +198,19 @@ export const option = {
editDisplay: false,
viewDisplay: false,
},
{
label: '创建时间',
prop: 'createTimeRange',
type: 'date',
format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD',
searchRange: true,
search: true,
hide: true,
addDisplay: false,
editDisplay: false,
viewDisplay: false,
},
{
label: '更新人',
prop: 'updateUserName',
+9 -12
View File
@@ -34,6 +34,7 @@ export const option = {
searchMenuPosition: 'right',
border: true,
index: true,
indexLabel: '序号',
viewBtn: true,
selection: true,
dialogClickModal: false,
@@ -67,9 +68,8 @@ export const option = {
{
label: '上月统计里程数',
prop: 'previousMonthMileage',
type: 'number',
precision: 2,
append: '公里',
type: 'input',
formslot: true,
minWidth: 210,
slot: true,
rules: [{ validator: validateNonNegative, trigger: 'blur' }],
@@ -77,9 +77,8 @@ export const option = {
{
label: '本月统计里程数',
prop: 'currentMonthMileage',
type: 'number',
precision: 2,
append: '公里',
type: 'input',
formslot: true,
minWidth: 210,
slot: true,
rules: [{ validator: validateNonNegative, trigger: 'blur' }],
@@ -87,9 +86,8 @@ export const option = {
{
label: '本月行驶里程数',
prop: 'monthlyMileage',
type: 'number',
precision: 2,
append: '公里',
type: 'input',
formslot: true,
minWidth: 170,
slot: true,
rules: [{ validator: validateNonNegative, trigger: 'blur' }],
@@ -97,9 +95,8 @@ export const option = {
{
label: '累计行驶里程数',
prop: 'totalMileage',
type: 'number',
precision: 2,
append: '公里',
type: 'input',
formslot: true,
minWidth: 170,
slot: true,
rules: [{ validator: validateNonNegative, trigger: 'blur' }],
+9 -9
View File
@@ -35,6 +35,7 @@ export const option = {
searchMenuPosition: 'right',
border: true,
index: true,
indexLabel: '序号',
viewBtn: true,
selection: true,
dialogClickModal: false,
@@ -111,25 +112,24 @@ export const option = {
{
label: '数量',
prop: 'quantity',
type: 'number',
precision: 2,
type: 'input',
formslot: true,
minWidth: 110,
rules: [{ validator: validateNonNegative, trigger: 'blur' }],
},
{
label: '单价',
prop: 'unitPrice',
type: 'number',
precision: 2,
type: 'input',
formslot: true,
minWidth: 120,
append: '元/升',
rules: [{ validator: validateNonNegative, trigger: 'blur' }],
},
{
label: '交易金额',
prop: 'transactionAmount',
type: 'number',
precision: 2,
type: 'input',
formslot: true,
minWidth: 130,
rules: [
{ required: true, message: '请输入交易金额', trigger: 'blur' },
@@ -139,8 +139,8 @@ export const option = {
{
label: '余额',
prop: 'balance',
type: 'number',
precision: 2,
type: 'input',
formslot: true,
minWidth: 110,
rules: [{ validator: validateNonNegative, trigger: 'blur' }],
},
+3 -3
View File
@@ -46,6 +46,7 @@ export const option = {
searchMenuPosition: 'right',
border: true,
index: true,
indexLabel: '序号',
viewBtn: true,
selection: true,
dialogClickModal: false,
@@ -102,9 +103,8 @@ export const option = {
{
label: '金额',
prop: 'amount',
type: 'number',
precision: 2,
append: '元',
type: 'input',
formslot: true,
minWidth: 120,
span: 12,
placeholder: '请输入',
@@ -39,6 +39,7 @@ export const option = {
searchMenuPosition: 'right',
border: true,
index: true,
indexLabel: '序号',
viewBtn: true,
selection: true,
dialogClickModal: false,
@@ -88,8 +89,8 @@ export const option = {
{
label: '换胎数量',
prop: 'tireQuantity',
type: 'number',
precision: 0,
type: 'input',
formslot: true,
minWidth: 110,
span: 12,
placeholder: '请输入',
@@ -98,9 +99,8 @@ export const option = {
{
label: '换胎费用',
prop: 'replacementCost',
type: 'number',
precision: 2,
append: '元',
type: 'input',
formslot: true,
minWidth: 120,
span: 12,
placeholder: '请输入',
@@ -26,6 +26,7 @@ export const option = {
searchMenuPosition: 'right',
border: true,
index: true,
indexLabel: '序号',
viewBtn: true,
selection: true,
dialogClickModal: false,
+8 -18
View File
@@ -25,14 +25,6 @@ export const vehicleTypeDic = [
{ label: '船舶', value: '船舶' },
];
export const violationTypeDic = [
{ label: '闯红灯', value: '闯红灯' },
{ label: '超速', value: '超速' },
{ label: '违停', value: '违停' },
{ label: '压线', value: '压线' },
{ label: '其他', value: '其他' },
];
export const processStatusDic = [
{ label: '未处理', value: '未处理' },
{ label: '已处理', value: '已处理' },
@@ -57,6 +49,7 @@ export const option = {
searchMenuPosition: 'right',
border: true,
index: true,
indexLabel: '序号',
viewBtn: true,
selection: true,
dialogClickModal: false,
@@ -104,11 +97,11 @@ export const option = {
label: '类型',
prop: 'violationType',
type: 'select',
dicData: violationTypeDic,
dicData: [],
minWidth: 120,
span: 12,
placeholder: '请选择',
rules: [{ required: true, message: '请选择类型', trigger: 'change' }],
rules: [],
},
{
label: '事项',
@@ -118,10 +111,7 @@ export const option = {
display: false,
span: 12,
placeholder: '请输入',
rules: [
{ required: true, message: '请输入事项', trigger: 'blur' },
{ max: 100, message: '最多 100 个字符', trigger: 'blur' },
],
rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
},
{
label: '日期',
@@ -149,8 +139,8 @@ export const option = {
{
label: '罚款',
prop: 'fineAmount',
type: 'number',
precision: 2,
type: 'input',
formslot: true,
append: '元',
minWidth: 100,
span: 12,
@@ -160,8 +150,8 @@ export const option = {
{
label: '被扣分数',
prop: 'deductPoints',
type: 'number',
precision: 0,
type: 'input',
formslot: true,
minWidth: 110,
span: 12,
placeholder: '请输入',