Skip to content

E
ems3.3
Commit 726f66a3 authored by 左玲玲's avatar 左玲玲 😬
Browse files
Options

0921

parent 53462862
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 70 deletions
src/components/InitForm/EditTable/index.jsx
View file @ 726f66a3
...@@ -164,6 +164,7 @@ const EditTable = (props) => { ...@@ -164,6 +164,7 @@ const EditTable = (props) => {
}} }}
search={{ search={{
filterType: 'light', //轻量模式 filterType: 'light', //轻量模式
placement: 'bottomLeft'
}} }}
/> />
); );
......
src/pages/maintain/plan/index.jsx
View file @ 726f66a3
...@@ -21,8 +21,8 @@ function Plan(props) { ...@@ -21,8 +21,8 @@ function Plan(props) {
const actionRef = useRef(), const actionRef = useRef(),
formRef = useRef(); formRef = useRef();
const [drawer, setdrawer] = useState({ const [drawer, setdrawer] = useState({
open: false, open: false,
}), }),
[activeTabKey, setactiveTabKey] = useState('1'); [activeTabKey, setactiveTabKey] = useState('1');
const { run, loading, runAsync } = useRequest(doFetch, { const { run, loading, runAsync } = useRequest(doFetch, {
...@@ -460,43 +460,32 @@ function Plan(props) { ...@@ -460,43 +460,32 @@ function Plan(props) {
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {}; let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
return activeTabKey == 1 return activeTabKey == 1
? defcolumn.concat([ ? defcolumn.concat([
{ {
title: '启用/停用', title: '启用/停用',
dataIndex: 'isStopStatus', dataIndex: 'isStopStatus',
key: 'isStopStatus', key: 'isStopStatus',
hideInForm: true, hideInForm: true,
hideInSearch: true, hideInSearch: true,
valueType: 'switch', valueType: 'switch',
render: (text, row, _, action) => { render: (text, row, _, action) => {
//"1停用 2启用 *" //"1停用 2启用 *"
return row.isStopStatus == 1 ? ( return row.isStopStatus == 1 ? (
<Popconfirm <Popconfirm
title="是否开启或停用?" title="是否开启或停用?"
onConfirm={async () => { onConfirm={async () => {
if (row.isStopStatus == 1) { if (row.isStopStatus == 1) {
await runAsync({ await runAsync({
url: '/maintain/umMaintainPlan/enableDeactivate', url: '/maintain/umMaintainPlan/enableDeactivate',
params: { id: row.id, isStopFlag: 2 }, params: { id: row.id, isStopFlag: 2 },
}); });
}
}}
okText="确定"
cancelText="取消"
disabled={
!(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
} }
> }}
<Switch okText="确定"
checked={row.isStopStatus == 1 ? true : false} cancelText="取消"
checkedChildren="开启" disabled={
unCheckedChildren="停用" !(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
defaultChecked={false} }
disabled={ >
!(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
}
/>
</Popconfirm>
) : (
<Switch <Switch
checked={row.isStopStatus == 1 ? true : false} checked={row.isStopStatus == 1 ? true : false}
checkedChildren="开启" checkedChildren="开启"
...@@ -505,36 +494,47 @@ function Plan(props) { ...@@ -505,36 +494,47 @@ function Plan(props) {
disabled={ disabled={
!(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2)) !(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
} }
onChange={(checked) => {
if (checked) {
setdrawer((s) => ({
...s,
open: true,
item: row,
title: '调整日期',
val: 'detailaddon',
id: row?.id,
from: 'tq',
}));
}
}}
/> />
); </Popconfirm>
}, ) : (
hideInDescriptions: true, <Switch
}, checked={row.isStopStatus == 1 ? true : false}
{ checkedChildren="开启"
title: '操作', unCheckedChildren="停用"
valueType: 'option', defaultChecked={false}
width: 150, disabled={
render: (text, row, _, action) => [ !(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2)) && }
editDate(text, row, _, action), onChange={(checked) => {
row.maintainStatus == 2 && close(text, row, _, action), if (checked) {
defpath?.enabledelete && row.maintainStatus == 1 && remove(text, row, _, action), setdrawer((s) => ({
], ...s,
open: true,
item: row,
title: '调整日期',
val: 'detailaddon',
id: row?.id,
from: 'tq',
}));
}
}}
/>
);
}, },
]) hideInDescriptions: true,
},
{
title: '操作',
valueType: 'option',
width: 150,
render: (text, row, _, action) => [
(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2)) &&
editDate(text, row, _, action),
row.maintainStatus == 2 && close(text, row, _, action),
defpath?.enabledelete && row.maintainStatus == 1 && remove(text, row, _, action),
],
},
])
: defcolumn; : defcolumn;
}, [activeTabKey]); }, [activeTabKey]);
...@@ -579,8 +579,8 @@ function Plan(props) { ...@@ -579,8 +579,8 @@ function Plan(props) {
drawer?.val == 'detailaddon' drawer?.val == 'detailaddon'
? editDateColumns ? editDateColumns
: drawer?.val == 'detail' : drawer?.val == 'detail'
? detailsColumns ? detailsColumns
: columns : columns
} }
detailpath={pathconfig?.detail || null} detailpath={pathconfig?.detail || null}
// detailData={drawer?.item} // detailData={drawer?.item}
...@@ -596,7 +596,6 @@ function Plan(props) { ...@@ -596,7 +596,6 @@ function Plan(props) {
}} }}
{...drawer} {...drawer}
onFinish={async (vals) => { onFinish={async (vals) => {
console.log(vals);
let params = JSON.parse(JSON.stringify(vals)); let params = JSON.parse(JSON.stringify(vals));
params.equipmentList = vals?.paramList?.map((it) => { params.equipmentList = vals?.paramList?.map((it) => {
return { return {
...@@ -610,7 +609,6 @@ function Plan(props) { ...@@ -610,7 +609,6 @@ function Plan(props) {
message.warning('下次保养日期必填！'); message.warning('下次保养日期必填！');
return; return;
} }
console.log(params);
if (drawer?.val == 'add') { if (drawer?.val == 'add') {
await runAsync({ url: pathconfig?.add || '/add', params: { ...params } }); await runAsync({ url: pathconfig?.add || '/add', params: { ...params } });
} else if (drawer?.val == 'edit') { } else if (drawer?.val == 'edit') {
......
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