🐛 修复车务非必填-1展示,并完善总单调度与运单表单体验
调度页限制上一段到达后才可调度;司机候选项点击展开;车务多模块-1显示为空;同步配载/总单编辑与导入相关优化。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import { formatUpdateUserName } from '@/utils/audit';
|
||||
|
||||
const isEmpty = value => value === undefined || value === null || value === '';
|
||||
const isEmpty = value =>
|
||||
value === undefined || value === null || value === '' || Number(value) === -1;
|
||||
|
||||
const validateNonNegative = (rule, value, callback) => {
|
||||
if (isEmpty(value)) {
|
||||
@@ -12,6 +13,8 @@ const validateNonNegative = (rule, value, callback) => {
|
||||
}
|
||||
};
|
||||
|
||||
const formatEmptySentinel = (row, value) => (isEmpty(value) ? '' : value);
|
||||
|
||||
export const vehicleTypeDic = [
|
||||
{ label: '车辆', value: '车辆' },
|
||||
{ label: '船舶', value: '船舶' },
|
||||
@@ -124,6 +127,7 @@ export const option = {
|
||||
type: 'input',
|
||||
formslot: true,
|
||||
minWidth: 110,
|
||||
formatter: formatEmptySentinel,
|
||||
rules: [{ validator: validateNonNegative, trigger: 'blur' }],
|
||||
},
|
||||
{
|
||||
@@ -133,6 +137,7 @@ export const option = {
|
||||
formslot: true,
|
||||
append: '元/升',
|
||||
minWidth: 120,
|
||||
formatter: formatEmptySentinel,
|
||||
rules: [{ validator: validateNonNegative, trigger: 'blur' }],
|
||||
},
|
||||
{
|
||||
@@ -141,6 +146,7 @@ export const option = {
|
||||
type: 'input',
|
||||
formslot: true,
|
||||
minWidth: 130,
|
||||
formatter: formatEmptySentinel,
|
||||
rules: [
|
||||
{ required: true, message: '请输入交易金额', trigger: 'blur' },
|
||||
{ validator: validateNonNegative, trigger: 'blur' },
|
||||
@@ -152,6 +158,7 @@ export const option = {
|
||||
type: 'input',
|
||||
formslot: true,
|
||||
minWidth: 110,
|
||||
formatter: formatEmptySentinel,
|
||||
rules: [{ validator: validateNonNegative, trigger: 'blur' }],
|
||||
},
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user