Commit d47a343e authored by 左玲玲's avatar 左玲玲 😬

1730

parent b674812c
......@@ -59,9 +59,8 @@ function getcolumns(setdrawer) {
},
],
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
dropdownMatchSelectWidth: 100
}
},
{
title: '点检截止日期',
......@@ -69,7 +68,7 @@ function getcolumns(setdrawer) {
key: 'checkCloseDateList',
valueType: 'dateRange',
render: (text, row, _, action) => {
return <span style={{ color: `${dayjs(row.checkCloseDate).valueOf() < dayjs().valueOf() ? "#f50" : "rgba(0, 0, 0, 0.85)"}` }}>{row.checkCloseDate}</span>
return <span style={{ color: `${dayjs(row.checkCloseDate).valueOf() < dayjs().format("YYYY-MM-DD").valueOf() ? "#f50" : "rgba(0, 0, 0, 0.85)"}` }}>{row.checkCloseDate}</span>
}
},
],
......
......@@ -214,8 +214,7 @@ function getcolumns(setdrawer) {
hideInForm: true,
valueType: 'select',
fieldProps: {
placeholder: '请选择',
showSearch: true,
dropdownMatchSelectWidth: 100
},
options: [
{
......
......@@ -31,9 +31,8 @@ function getcolumns(id) {
}
],
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
dropdownMatchSelectWidth: 100
}
},
{
"title": "设备型号",
......
......@@ -22,7 +22,7 @@ function procolumns(id) {
},
{
title: '判断类型',
dataIndex: 'judgeType',
dataIndex: 'judgeTypeName',
key: 'judgeType',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
valueType: 'select',
......@@ -40,6 +40,7 @@ function procolumns(id) {
hideInForm: { judgeType: [1, null, undefined] },
valueType: 'digit',
hideInSearch: true,
min: -10000000000000000
},
{
title: '上限值',
......@@ -49,6 +50,7 @@ function procolumns(id) {
valueType: 'digit',
hideInForm: { judgeType: [1, null, undefined] },
hideInSearch: true,
min: -10000000000000000
},
{
title: '预计工时',
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment