fix bug

src/option/business/process-config.js

@@ -85,6 +85,7 @@ export const option = {
       type: 'number',
       min: 0,
       max: 999,
+      formatter: row => (Number(row.defaultFinishDays) === -1 ? '' : row.defaultFinishDays),
       span: 12,
       minWidth: 170,
       addDisplay: false,

src/option/vehicle/annual-inspection-record.js

@@ -29,6 +29,12 @@ export const shipInspectionTypeDic = [
   { label: '其他', value: '其他' },
 ];
 
+export const passengerTypeLevelDic = [
+  { label: '一级', value: '一级' },
+  { label: '二级', value: '二级' },
+  { label: '其他', value: '其他' },
+];
+
 export const option = {
   height: 'auto',
   calcHeight: 32,
@@ -128,10 +134,11 @@ export const option = {
     {
       label: '客车类型及等级',
       prop: 'passengerTypeLevel',
+      type: 'select',
+      dicData: passengerTypeLevelDic,
       minWidth: 150,
       span: 12,
-      placeholder: '请输入',
-      rules: [{ max: 50, message: '最多 50 个字符', trigger: 'blur' }],
+      placeholder: '请选择',
     },
     {
       label: '检测评定单位',

src/option/vehicle/equipment-ledger.js

@@ -42,11 +42,12 @@ export const option = {
       prop: 'vehicleType',
       type: 'radio',
       dicData: vehicleTypeDic,
+      formslot: true,
       value: '车辆',
       search: true,
       searchOrder: 3,
       span: 24,
-      order: 1,
+      order: 11,
       minWidth: 110,
       rules: [{ required: true, message: '请选择车船类型', trigger: 'change' }],
     },
@@ -58,9 +59,9 @@ export const option = {
       search: true,
       searchOrder: 4,
       span: 12,
-      order: 2,
+      order: 10,
       minWidth: 140,
-      rules: [{ required: true, message: '请输入车牌号/船号', trigger: 'blur' }],
+      rules: [{ required: true, message: '请选择车牌号/船号', trigger: 'change' }],
     },
     {
       label: '设备号',
@@ -69,7 +70,7 @@ export const option = {
       search: true,
       searchOrder: 2,
       span: 12,
-      order: 3,
+      order: 9,
       minWidth: 150,
       rules: [{ required: true, message: '设备编号由系统生成', trigger: 'blur' }],
     },
@@ -77,7 +78,7 @@ export const option = {
       label: '设备名称',
       prop: 'equipmentName',
       span: 12,
-      order: 4,
+      order: 8,
       minWidth: 150,
       rules: [
         { required: true, message: '请输入设备名称', trigger: 'blur' },
@@ -92,14 +93,14 @@ export const option = {
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
       span: 12,
-      order: 8,
+      order: 4,
       minWidth: 130,
     },
     {
       label: '设备品牌',
       prop: 'equipmentBrand',
       span: 12,
-      order: 5,
+      order: 7,
       minWidth: 130,
       rules: [{ max: 50, message: '最多 50 个字符', trigger: 'blur' }],
     },
@@ -117,7 +118,7 @@ export const option = {
       label: '规格型号',
       prop: 'specificationModel',
       span: 12,
-      order: 7,
+      order: 5,
       minWidth: 150,
       rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
     },
@@ -127,7 +128,7 @@ export const option = {
       type: 'textarea',
       minRows: 2,
       span: 24,
-      order: 10,
+      order: 2,
       minWidth: 180,
       overHidden: true,
       rules: [{ max: 200, message: '最多 200 个字符', trigger: 'blur' }],
@@ -170,7 +171,7 @@ export const option = {
       label: '原厂设备号',
       prop: 'originalEquipmentNo',
       span: 12,
-      order: 9,
+      order: 3,
       hide: true,
       rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
     },
@@ -180,7 +181,8 @@ export const option = {
       slot: true,
       formslot: true,
       span: 24,
-      order: 11,
+      order: 1,
+      minWidth: 100,
       hide: true,
     },
     {

src/option/vehicle/mileage-record.js

@@ -12,11 +12,6 @@ const validateNonNegative = (rule, value, callback) => {
   }
 };
 
-export const vehicleTypeDic = [
-  { label: '车辆', value: '车辆' },
-  { label: '船舶', value: '船舶' },
-];
-
 export const option = {
   height: 'auto',
   calcHeight: 32,
@@ -43,18 +38,7 @@ export const option = {
   menuFixed: 'right',
   column: [
     {
-      label: '车船类型',
-      prop: 'vehicleType',
-      type: 'radio',
-      dicData: vehicleTypeDic,
-      value: '车辆',
-      search: true,
-      searchSpan: 6,
-      minWidth: 110,
-      rules: [{ required: true, message: '请选择车船类型', trigger: 'change' }],
-    },
-    {
-      label: '车牌号/船号',
+      label: '车牌号',
       prop: 'vehicleNo',
       slot: true,
       formslot: true,
@@ -62,7 +46,7 @@ export const option = {
       searchSpan: 6,
       minWidth: 130,
       rules: [
-        { required: true, message: '请输入车牌号/船号', trigger: 'blur' },
+        { required: true, message: '请输入车牌号', trigger: 'blur' },
         { max: 30, message: '最多 30 个字符', trigger: 'blur' },
       ],
     },
@@ -106,19 +90,6 @@ export const option = {
       slot: true,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
-    {
-      label: '里程单位',
-      prop: 'mileageUnit',
-      type: 'select',
-      dicData: [
-        { label: '公里', value: '公里' },
-        { label: '海里', value: '海里' },
-      ],
-      value: '公里',
-      hide: true,
-      display: false,
-      search: false,
-    },
     {
       label: '备注',
       prop: 'remark',

src/option/vehicle/oil-electric-record.js

@@ -46,6 +46,8 @@ export const option = {
     {
       label: '卡号',
       prop: 'cardNo',
+      span: 12,
+      order: 1,
       minWidth: 150,
       rules: [{ max: 30, message: '最多 30 个字符', trigger: 'blur' }],
     },
@@ -56,6 +58,7 @@ export const option = {
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      span: 12,
       minWidth: 170,
       rules: [{ required: true, message: '请选择交易时间', trigger: 'click' }],
     },
@@ -66,6 +69,8 @@ export const option = {
       dicData: vehicleTypeDic,
       value: '车辆',
       search: true,
+      span: 24,
+      order: 2,
       minWidth: 110,
       rules: [{ required: true, message: '请选择车船类型', trigger: 'change' }],
     },