Skip to content

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

滚动条整体修改

parent 6782a1c9
Hide whitespace changes
Inline Side-by-side
Showing with 531 additions and 497 deletions
.stylelintrc.js deleted 100644 → 0
View file @ 6782a1c9
const fabric = require('@umijs/fabric');
module.exports = {
...fabric.stylelint,
};
src/components/DrawerPro/index.jsx
View file @ 74b9d280
......@@ -21,7 +21,7 @@ function DrawerPro(props) {
placement="right"
closable={true}
getContainer={false}
style={{ position: 'absolute', transform: 'translateX(0)', maxWidth: '100%' }}
style={{ position: 'absolute', transform: 'translateX(0)' }}
width={'100%'}
destroyOnClose={true}
{...props}
......
src/components/RightContent/AvatarDropdown.jsx
View file @ 74b9d280
......@@ -16,7 +16,7 @@ import Utf8 from 'crypto-js/enc-utf8';
import moment from 'moment';
import io from 'socket.io-client';
const { NODE_ENV } = process.env;
const websocketUrl = NODE_ENV == "development" ? "ws://192.168.40.110:9933" : `${window.location.protocol == "http:" ? "ws" : "wss"}://${window.location.host}`;
const websocketUrl = NODE_ENV == "development" ? "ws://192.168.40.111:9933" : `${window.location.protocol == "http:" ? "ws" : "wss"}://${window.location.host}`;
const socket = io(websocketUrl, {
reconnectionDelay: 4000,
transports: ['websocket'],
......
src/components/TagView/index.jsx
View file @ 74b9d280
......@@ -163,14 +163,15 @@ const TagView = ({ children, home }) => {
</div>
<div className={styles.child}>
<div className={styles.contianbox}>
<Scrollbars
{/* <Scrollbars
thumbMinSize={10}
autoHide
style={{ width: '100%', height: '100%' }}
hideTracksWhenNotNeeded={true}
>
{refresh && children}
</Scrollbars>
</Scrollbars> */}
<div style={{ width: "100%", height: "100%" }}> {refresh && children}</div>
</div>
</div>
</>
......
src/global.less
View file @ 74b9d280
......@@ -422,6 +422,42 @@ ol {
}
}
.runtime-keep-alive-layout,
.ant-table-content,
.ant-drawer-body {
&::-webkit-scrollbar {
/*滚动条整体样式*/
width: 5px;
/*高宽分别对应横竖滚动条的尺寸*/
height: 5px;
}
&::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
// border-radius: 5px;
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
background: #c1c1c1;
}
&::-webkit-scrollbar-track {
/*滚动条里面轨道*/
-webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
border-radius: 0;
background: #fff;
}
}
.page-title {
margin-bottom: 0;
font-weight: 700;
......@@ -461,9 +497,10 @@ ol {
.runtime-keep-alive-layout,
.runtime-keep-alive-layout-no {
height: auto !important;
min-height: 100% !important;
overflow: hidden !important;
// height: auto !important;
// min-height: 100% !important;
// overflow: hidden !important;
position: static !important;
>div {
height: 100%;
......
src/pages/check/order/index.jsx
View file @ 74b9d280
......@@ -248,7 +248,7 @@ function Order(props) {
}, [drawer?.val, drawer?.item?.id]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">点检接单</h3>}
columns={columns}
......
src/pages/check/plan/index.jsx
View file @ 74b9d280
......@@ -15,8 +15,8 @@ function Plan(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
}),
open: false,
}),
[activeTabKey, setactiveTabKey] = useState(1);
const { run, loading, runAsync } = useRequest(doFetch, {
......@@ -123,75 +123,75 @@ function Plan(props) {
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
return activeTabKey == 1
? defcolumn.concat([
{
title: '启用/停用',
dataIndex: 'checkEnable',
key: 'checkEnable',
hideInForm: true,
hideInSearch: true,
valueType: 'switch',
render: (text, row, _, action) => {
//"1停用 2启用 *"
return row.checkEnable == 1 ? (
<Popconfirm
title="是否开启或停用?"
onConfirm={async () => {
if (row.checkEnable == 1) {
await runAsync({
url: '/check/umEquipmentCheckPlan/enable',
params: { id: row.id, checkEnable: 2 },
});
}
}}
okText="确定"
cancelText="取消"
disabled={!(row.status == 1 || (row.status == 2 && row.checkLoop == 2))}
>
<Switch
checked={row.checkEnable == 1 ? true : false}
checkedChildren="开启"
unCheckedChildren="停用"
defaultChecked={false}
disabled={!(row.status == 1 || (row.status == 2 && row.checkLoop == 2))}
/>
</Popconfirm>
) : (
{
title: '启用/停用',
dataIndex: 'checkEnable',
key: 'checkEnable',
hideInForm: true,
hideInSearch: true,
valueType: 'switch',
render: (text, row, _, action) => {
//"1停用 2启用 *"
return row.checkEnable == 1 ? (
<Popconfirm
title="是否开启或停用?"
onConfirm={async () => {
if (row.checkEnable == 1) {
await runAsync({
url: '/check/umEquipmentCheckPlan/enable',
params: { id: row.id, checkEnable: 2 },
});
}
}}
okText="确定"
cancelText="取消"
disabled={!(row.status == 1 || (row.status == 2 && row.checkLoop == 2))}
>
<Switch
checked={row.checkEnable == 1 ? true : false}
checkedChildren="开启"
unCheckedChildren="停用"
defaultChecked={false}
disabled={!(row.status == 1 || (row.status == 2 && row.checkLoop == 2))}
onChange={(checked) => {
if (checked) {
setdrawer((s) => ({
...s,
open: true,
item: row,
title: '启用点检计划',
val: 'detailaddon',
type: 'delay',
id: row?.id,
}));
}
}}
/>
);
},
hideInDescriptions: true,
},
{
title: '操作',
valueType: 'option',
width: 150,
render: (text, row, _, action) => [
(row.status == 1 || (row.status == 2 && row.checkLoop == 2)) &&
editDate(text, row, _, action),
row.status == 2 && close(text, row, _, action),
defpath?.enabledelete && row.status == 1 && remove(text, row, _, action),
],
</Popconfirm>
) : (
<Switch
checked={row.checkEnable == 1 ? true : false}
checkedChildren="开启"
unCheckedChildren="停用"
defaultChecked={false}
disabled={!(row.status == 1 || (row.status == 2 && row.checkLoop == 2))}
onChange={(checked) => {
if (checked) {
setdrawer((s) => ({
...s,
open: true,
item: row,
title: '启用点检计划',
val: 'detailaddon',
type: 'delay',
id: row?.id,
}));
}
}}
/>
);
},
])
hideInDescriptions: true,
},
{
title: '操作',
valueType: 'option',
width: 150,
render: (text, row, _, action) => [
(row.status == 1 || (row.status == 2 && row.checkLoop == 2)) &&
editDate(text, row, _, action),
row.status == 2 && close(text, row, _, action),
defpath?.enabledelete && row.status == 1 && remove(text, row, _, action),
],
},
])
: defcolumn;
}, [activeTabKey]);
......@@ -450,7 +450,7 @@ function Plan(props) {
});
};
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">点检计划</h3>}
columns={columns}
......@@ -485,8 +485,8 @@ function Plan(props) {
drawer?.val == 'detailaddon'
? editDateColumns
: drawer?.val == 'detail'
? detailsColumns
: columns
? detailsColumns
: columns
}
detailpath={pathconfig?.detail || null}
defaultFormValue={drawer?.item}
......
src/pages/check/standard/Project.jsx
View file @ 74b9d280
......@@ -110,7 +110,7 @@ function Project({ equipmentCheckStandardId }) {
}, [drawer?.id]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
columns={columns}
actionRef={actionRef}
......
src/pages/check/standard/index.jsx
View file @ 74b9d280
......@@ -133,7 +133,7 @@ function Standard(props) {
}, [drawer?.id]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">点检标准</h3>}
columns={columns}
......
src/pages/check/task/index.jsx
View file @ 74b9d280
......@@ -13,8 +13,8 @@ function Task(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
}),
open: false,
}),
[activeTabKey, setactiveTabKey] = useState('1'),
[detailData, cd] = useState({});
......@@ -343,193 +343,193 @@ function Task(props) {
},
];
const allObj = {
task: [
{
title: '工单信息',
valueType: 'split',
},
{
title: '点检单号',
dataIndex: 'taskNo',
key: 'taskNo',
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
},
{
title: '工单状态',
dataIndex: 'statusName',
key: 'statusName',
},
{
title: '点检计划单号',
dataIndex: 'planNo',
key: 'planNo',
span: activeTabKey == 3 ? 1 : 3,
},
{
title: '关单时间',
dataIndex: 'endTime',
key: 'endTime',
hideInDescriptions: activeTabKey == 3 ? false : true,
},
],
basics: [
{
title: '基础信息',
valueType: 'split',
},
{
title: '设备编号',
dataIndex: 'equipmentNo',
key: 'equipmentNo',
},
{
title: '设备名称',
dataIndex: 'equipmentName',
key: 'equipmentName',
},
{
title: '设备型号',
dataIndex: 'equipmentModelName',
key: 'equipmentModelName',
},
{
title: '点检类型',
dataIndex: 'checkTypeName',
key: 'checkTypeName',
},
{
title: '点检截止日期',
dataIndex: 'checkCloseDate',
key: 'checkCloseDate',
span: 2,
task: [
{
title: '工单信息',
valueType: 'split',
},
{
title: '点检单号',
dataIndex: 'taskNo',
key: 'taskNo',
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
},
{
title: '工单状态',
dataIndex: 'statusName',
key: 'statusName',
},
{
title: '点检计划单号',
dataIndex: 'planNo',
key: 'planNo',
span: activeTabKey == 3 ? 1 : 3,
},
{
title: '关单时间',
dataIndex: 'endTime',
key: 'endTime',
hideInDescriptions: activeTabKey == 3 ? false : true,
},
],
basics: [
{
title: '基础信息',
valueType: 'split',
},
{
title: '设备编号',
dataIndex: 'equipmentNo',
key: 'equipmentNo',
},
{
title: '设备名称',
dataIndex: 'equipmentName',
key: 'equipmentName',
},
{
title: '设备型号',
dataIndex: 'equipmentModelName',
key: 'equipmentModelName',
},
{
title: '点检类型',
dataIndex: 'checkTypeName',
key: 'checkTypeName',
},
{
title: '点检截止日期',
dataIndex: 'checkCloseDate',
key: 'checkCloseDate',
span: 2,
},
{
title: '点检项目',
dataIndex: 'itemList',
key: 'itemList',
columns,
span: 3,
render: (text, row, _, action) => {
return (
<AutoTables
columns={columnsc?.map((it) => ({
...it,
hideInSearch: true,
}))}
dataSource={drawer?.item?.basics?.item ?? []}
/>
);
},
{
title: '点检项目',
dataIndex: 'itemList',
key: 'itemList',
columns,
span: 3,
render: (text, row, _, action) => {
return (
<AutoTables
columns={columnsc?.map((it) => ({
hideInDescriptions: drawer?.item?.task?.status != 4 ? false : true,
},
],
meet: [
{
title: '接单信息',
valueType: 'split',
},
{
title: '点检人员',
dataIndex: 'checkUserName',
key: 'checkUserName',
},
{
title: '接单时间',
dataIndex: 'checkStartTime',
key: 'checkStartTime',
span: 2,
},
],
delay: [
{
title: '完成点检',
valueType: 'split',
},
{
title: '完成点检时间',
dataIndex: 'checkEndTime',
key: 'checkEndTime',
span: 3,
},
{
title: '点检项目',
dataIndex: 'itemList',
key: 'itemList',
columns,
span: 3,
render: (text, row, _, action) => {
return (
<AutoTables
columns={columnsc
.concat([
{
title: '结果',
dataIndex: 'result',
key: 'result',
hideInForm: true,
render: (text, row, _, action) => {
return (
<span>
{row.judgeType == 1
? row.result == 1
? '正常'
: '异常'
: row.result}
</span>
);
},
},
{
title: '下限值',
dataIndex: 'lowerLimit',
key: 'lowerLimit',
hideInForm: true,
},
{
title: '上限值',
dataIndex: 'upperLimit',
key: 'upperLimit',
hideInForm: true,
},
{
title: '备注',
dataIndex: 'remark',
key: 'remark',
hideInForm: true,
},
])
?.map((it) => ({
...it,
hideInSearch: true,
}))}
dataSource={drawer?.item?.basics?.item ?? []}
/>
);
},
hideInDescriptions: drawer?.item?.task?.status != 4 ? false : true,
},
],
meet: [
{
title: '接单信息',
valueType: 'split',
dataSource={drawer?.item?.delay?.itemlist ?? []}
/>
);
},
{
title: '点检人员',
dataIndex: 'checkUserName',
key: 'checkUserName',
},
{
title: '接单时间',
dataIndex: 'checkStartTime',
key: 'checkStartTime',
span: 2,
},
],
delay: [
{
title: '完成点检',
valueType: 'split',
},
{
title: '完成点检时间',
dataIndex: 'checkEndTime',
key: 'checkEndTime',
span: 3,
},
{
title: '点检项目',
dataIndex: 'itemList',
key: 'itemList',
columns,
span: 3,
render: (text, row, _, action) => {
return (
<AutoTables
columns={columnsc
.concat([
{
title: '结果',
dataIndex: 'result',
key: 'result',
hideInForm: true,
render: (text, row, _, action) => {
return (
<span>
{row.judgeType == 1
? row.result == 1
? '正常'
: '异常'
: row.result}
</span>
);
},
},
{
title: '下限值',
dataIndex: 'lowerLimit',
key: 'lowerLimit',
hideInForm: true,
},
{
title: '上限值',
dataIndex: 'upperLimit',
key: 'upperLimit',
hideInForm: true,
},
{
title: '备注',
dataIndex: 'remark',
key: 'remark',
hideInForm: true,
},
])
?.map((it) => ({
...it,
hideInSearch: true,
}))}
dataSource={drawer?.item?.delay?.itemlist ?? []}
/>
);
},
hideInDescriptions: drawer?.item?.task?.status == 4 ? false : true,
},
],
shut: [
{
title: '关单信息',
valueType: 'split',
},
{
title: '关单人员',
dataIndex: 'shutUserName',
key: 'shutUserName',
},
{
title: '强制关单时间',
dataIndex: 'shutTime',
key: 'shutTime',
},
],
},
hideInDescriptions: drawer?.item?.task?.status == 4 ? false : true,
},
],
shut: [
{
title: '关单信息',
valueType: 'split',
},
{
title: '关单人员',
dataIndex: 'shutUserName',
key: 'shutUserName',
},
{
title: '强制关单时间',
dataIndex: 'shutTime',
key: 'shutTime',
},
],
},
newObject = {};
let data = JSON.parse(JSON.stringify(drawer?.item)),
objectData = {};
......@@ -556,15 +556,15 @@ function Task(props) {
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
return activeTabKey == 1
? defcolumn.concat({
title: '操作',
valueType: 'option',
width: 150,
render: (text, row, _, action) => [
row.status == 1 && order(text, row, _, action),
row.status == 1 && close(text, row, _, action),
row.status == 2 && finish(text, row, _, action),
],
})
title: '操作',
valueType: 'option',
width: 150,
render: (text, row, _, action) => [
row.status == 1 && order(text, row, _, action),
row.status == 1 && close(text, row, _, action),
row.status == 2 && finish(text, row, _, action),
],
})
: defcolumn;
}, [activeTabKey]);
......@@ -574,7 +574,7 @@ function Task(props) {
}, [activeTabKey]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">点检工单</h3>}
columns={columns}
......
src/pages/device/account/index.jsx
View file @ 74b9d280
......@@ -2288,7 +2288,7 @@ function Model(props) {
const containderef = useRef();
return (
<div style={{ position: 'relative' }}>
<div>
<div className="ant-card-head" style={{ backgroundColor: 'white' }}>
<div className="ant-card-head-wrapper">
<div className="ant-card-head-title">
......
src/pages/device/model/index.jsx
View file @ 74b9d280
......@@ -132,7 +132,7 @@ function Model(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">设备型号</h3>}
columns={columns}
......
src/pages/device/supplier/index.jsx
View file @ 74b9d280
......@@ -191,25 +191,25 @@ function Supplier(props) {
const [request, setrequest] = useState();
useEffect(() => {
const fn = async () => {
let res = await doFetch({
url: '/base/paFormField/queryList',
params: {
formId: '3',
},
});
if (res?.data?.dataList) {
let column = [];
res?.data?.dataList?.forEach?.((el) => {
column.push({
...selectValueType(el.fieldChar, el.valueList),
title: el.fieldName,
dataIndex: el.id,
key: el.id,
});
let res = await doFetch({
url: '/base/paFormField/queryList',
params: {
formId: '3',
},
});
if (res?.data?.dataList) {
let column = [];
res?.data?.dataList?.forEach?.((el) => {
column.push({
...selectValueType(el.fieldChar, el.valueList),
title: el.fieldName,
dataIndex: el.id,
key: el.id,
});
setnewfieldscolumns(column);
}
},
});
setnewfieldscolumns(column);
}
},
fn2 = async () => {
const res = await doFetch({
url: urlParams.detail,
......@@ -420,7 +420,7 @@ function Supplier(props) {
}
};
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">设备供应商</h3>}
columns={columns}
......
src/pages/device/type/index.jsx
View file @ 74b9d280
......@@ -193,7 +193,7 @@ function Type(props) {
}, [drawer?.val]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">设备类型</h3>}
columns={columns}
......
src/pages/lease/contract/index.jsx
View file @ 74b9d280
......@@ -573,7 +573,7 @@ function Contract(props) {
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">租赁合同</h3>}
columns={columns}
......
src/pages/lease/ledger/index.jsx
View file @ 74b9d280
......@@ -342,7 +342,7 @@ const Ledger = () => {
</div>
<div className={styles.ledgercontent}>
<div className={styles.ledgerleft}>
<TreeRender url="/auth/sysFactory/getTree" onselected={onselecteTree} noaction={true} />
<TreeRender url="/auth/sysFactory/getTree" onselected={onselecteTree} noaction={true} maxWidth={240} />
</div>
<div className={styles.ledgerright}>
<AutoTable
......
src/pages/lease/ledger/index.less
View file @ 74b9d280
.ledgerbox {
width: 100%;
height: 100%;
overflow: hidden;
// overflow: hidden;
background-color: #fff;
display: flex;
flex-direction: column;
position: relative;
// position: relative;
.ledgerheader {
width: 100%;
......@@ -16,7 +16,7 @@
.ledgercontent {
flex: 1;
width: 100%;
overflow: hidden;
// overflow: hidden;
display: flex;
justify-content: space-between;
......@@ -34,6 +34,7 @@
flex: 1;
border-left: 1px solid #f0f0f0;
overflow: hidden;
overflow-y: auto;
}
}
}
\ No newline at end of file
src/pages/lease/supplier/index.jsx
View file @ 74b9d280
......@@ -380,7 +380,7 @@ function Supplier(props) {
}
};
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">设备供应商</h3>}
columns={columns}
......
src/pages/lifeparts/count/index.jsx
View file @ 74b9d280
......@@ -212,7 +212,7 @@ function Warning(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">寿命件台账</h3>}
columns={columns}
......
src/pages/lifeparts/criterion/index.jsx
View file @ 74b9d280
......@@ -118,7 +118,7 @@ function Criterion(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">寿命件标准</h3>}
columns={columns}
......
src/pages/lifeparts/warning/index.jsx
View file @ 74b9d280
......@@ -205,7 +205,7 @@ function Warning(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">寿命件预警</h3>}
columns={columns}
......
src/pages/maintain/criterion/Project.jsx
View file @ 74b9d280
......@@ -109,7 +109,7 @@ function Project({ equipmentMaintainStandardId }) {
});
}, [drawer?.id]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
columns={columns}
actionRef={actionRef}
......
src/pages/maintain/criterion/index.jsx
View file @ 74b9d280
......@@ -141,7 +141,7 @@ function Criterion(props) {
}, [drawer?.equipmentModelId]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">保养标准</h3>}
columns={columns}
......
src/pages/maintain/orders/index.jsx
View file @ 74b9d280
......@@ -190,7 +190,7 @@ function Orders(props) {
};
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">保养接单</h3>}
columns={columns}
......
src/pages/maintain/plan/index.jsx
View file @ 74b9d280
......@@ -21,8 +21,8 @@ function Plan(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
}),
open: false,
}),
[activeTabKey, setactiveTabKey] = useState('1');
const { run, loading, runAsync } = useRequest(doFetch, {
......@@ -465,43 +465,32 @@ function Plan(props) {
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
return activeTabKey == 1
? defcolumn.concat([
{
title: '启用/停用',
dataIndex: 'isStopStatus',
key: 'isStopStatus',
hideInForm: true,
hideInSearch: true,
valueType: 'switch',
render: (text, row, _, action) => {
//"1停用 2启用 *"
return row.isStopStatus == 1 ? (
<Popconfirm
title="是否开启或停用?"
onConfirm={async () => {
if (row.isStopStatus == 1) {
await runAsync({
url: '/maintain/umMaintainPlan/enableDeactivate',
params: { id: row.id, isStopFlag: 2 },
});
}
}}
okText="确定"
cancelText="取消"
disabled={
!(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
{
title: '启用/停用',
dataIndex: 'isStopStatus',
key: 'isStopStatus',
hideInForm: true,
hideInSearch: true,
valueType: 'switch',
render: (text, row, _, action) => {
//"1停用 2启用 *"
return row.isStopStatus == 1 ? (
<Popconfirm
title="是否开启或停用?"
onConfirm={async () => {
if (row.isStopStatus == 1) {
await runAsync({
url: '/maintain/umMaintainPlan/enableDeactivate',
params: { id: row.id, isStopFlag: 2 },
});
}
>
<Switch
checked={row.isStopStatus == 1 ? true : false}
checkedChildren="开启"
unCheckedChildren="停用"
defaultChecked={false}
disabled={
!(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
}
/>
</Popconfirm>
) : (
}}
okText="确定"
cancelText="取消"
disabled={
!(row.maintainStatus == 1 || (row.maintainStatus == 2 && row.isCycle == 2))
}
>
<Switch
checked={row.isStopStatus == 1 ? true : false}
checkedChildren="开启"
......@@ -510,36 +499,47 @@ function Plan(props) {
disabled={
!(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',
}));
}
}}
/>
);
},
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),
],
</Popconfirm>
) : (
<Switch
checked={row.isStopStatus == 1 ? true : false}
checkedChildren="开启"
unCheckedChildren="停用"
defaultChecked={false}
disabled={
!(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',
}));
}
}}
/>
);
},
])
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;
}, [activeTabKey]);
......@@ -549,7 +549,7 @@ function Plan(props) {
}, [activeTabKey]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">保养计划</h3>}
columns={columns}
......@@ -585,8 +585,8 @@ function Plan(props) {
drawer?.val == 'detailaddon'
? editDateColumns
: drawer?.val == 'detail'
? detailsColumns
: columns
? detailsColumns
: columns
}
detailpath={pathconfig?.detail || null}
onValuesChange={(changedValues, allValues) => {
......
src/pages/maintain/workOrder/index.jsx
View file @ 74b9d280
......@@ -26,8 +26,8 @@ function WorkOrder(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
}),
open: false,
}),
[activeTabKey, setactiveTabKey] = useState('1');
const { run, loading, runAsync } = useRequest(doFetch, {
......@@ -490,21 +490,21 @@ function WorkOrder(props) {
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
return activeTabKey == 1
? defcolumn.concat({
title: '操作',
valueType: 'option',
width: 150,
render: (text, row, _, action) => {
if (row?.taskStatus == 1) {
return [order(text, row, _, action), close(text, row, _, action)];
} else if (row?.taskStatus == 2) {
return [finish(text, row, _, action)];
} else if (row?.taskStatus == 5) {
return [verify(text, row, _, action)];
} else {
return '无操作';
}
},
})
title: '操作',
valueType: 'option',
width: 150,
render: (text, row, _, action) => {
if (row?.taskStatus == 1) {
return [order(text, row, _, action), close(text, row, _, action)];
} else if (row?.taskStatus == 2) {
return [finish(text, row, _, action)];
} else if (row?.taskStatus == 5) {
return [verify(text, row, _, action)];
} else {
return '无操作';
}
},
})
: defcolumn;
}, [activeTabKey]);
......@@ -758,54 +758,54 @@ function WorkOrder(props) {
titleColumns={
activeTabKey == 3
? [
{
title: '保养单号',
dataIndex: 'taskNo',
key: 'taskNo',
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
},
{
title: '工单状态',
dataIndex: 'taskStatusName',
key: 'taskStatusName',
},
{
title: '保养计划单号',
dataIndex: 'maintainNo',
key: 'maintainNo',
},
{
title: '关单时间',
dataIndex: 'customsTime',
key: 'customsTime',
},
]
{
title: '保养单号',
dataIndex: 'taskNo',
key: 'taskNo',
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
},
{
title: '工单状态',
dataIndex: 'taskStatusName',
key: 'taskStatusName',
},
{
title: '保养计划单号',
dataIndex: 'maintainNo',
key: 'maintainNo',
},
{
title: '关单时间',
dataIndex: 'customsTime',
key: 'customsTime',
},
]
: [
{
title: '保养单号',
dataIndex: 'taskNo',
key: 'taskNo',
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
},
{
title: '工单状态',
dataIndex: 'taskStatusName',
key: 'taskStatusName',
},
{
title: '保养计划单号',
dataIndex: 'maintainNo',
key: 'maintainNo',
},
]
{
title: '保养单号',
dataIndex: 'taskNo',
key: 'taskNo',
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
},
{
title: '工单状态',
dataIndex: 'taskStatusName',
key: 'taskStatusName',
},
{
title: '保养计划单号',
dataIndex: 'maintainNo',
key: 'maintainNo',
},
]
}
detailKey="maintainTaskItemList"
columns={getDetailColumns}
......@@ -815,7 +815,7 @@ function WorkOrder(props) {
};
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">保养工单</h3>}
columns={columns}
......
src/pages/repair/failure/index.jsx
View file @ 74b9d280
......@@ -20,8 +20,8 @@ function Failure(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
}),
open: false,
}),
[activeTabKey, setactiveTabKey] = useState('1');
const { run, loading } = useRequest(doFetch, {
......@@ -179,7 +179,7 @@ function Failure(props) {
}
};
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">故障报修</h3>}
columns={columns}
......
src/pages/repair/fault/index.jsx
View file @ 74b9d280
......@@ -355,7 +355,7 @@ function Fault(props) {
}
}
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">故障设置</h3>}
columns={columns}
......
src/pages/repair/order/index.jsx
View file @ 74b9d280
......@@ -27,9 +27,9 @@ function Failure(props) {
const { initialState, error, refresh, setInitialState } = useModel('@@initialState');
console.log(initialState);
const [drawer, setdrawer] = useState({
open: false,
SpecName: null,
}),
open: false,
SpecName: null,
}),
[activeTabKey, setactiveTabKey] = useState('1');
useEffect(async () => {
......@@ -1693,7 +1693,7 @@ function Failure(props) {
const containderef = useRef();
return (
<div style={{ position: 'relative' }} ref={containderef}>
<div ref={containderef}>
<AutoTable
pagetitle={<h3 className="page-title">维修工单</h3>}
columns={columns}
......
src/pages/repair/outsourcing/index.jsx
View file @ 74b9d280
......@@ -556,7 +556,7 @@ function Failure(props) {
}
};
return (
<div style={{ position: 'relative' }} ref={containderef}>
<div ref={containderef}>
<AutoTable
pagetitle={<h3 className="page-title">外协工单</h3>}
columns={columns}
......
src/pages/repair/platform/index.jsx
View file @ 74b9d280
......@@ -21,9 +21,9 @@ function Platform(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
SpecName: null,
}),
open: false,
SpecName: null,
}),
[activeTabKey, setactiveTabKey] = useState('1');
const { run, loading } = useRequest(doFetch, {
......@@ -446,7 +446,7 @@ function Platform(props) {
}
}
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">接单平台</h3>}
columns={columns}
......
src/pages/repair/track/index.jsx
View file @ 74b9d280
......@@ -26,9 +26,9 @@ function Failure(props) {
containderef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
SpecName: null,
}),
open: false,
SpecName: null,
}),
[activeTabKey, setactiveTabKey] = useState('1');
const { run, loading } = useRequest(doFetch, {
......@@ -686,7 +686,7 @@ function Failure(props) {
}
};
return (
<div style={{ position: 'relative' }} ref={containderef}>
<div ref={containderef}>
<AutoTable
pagetitle={<h3 className="page-title">追踪工单</h3>}
columns={columns}
......
src/pages/setting/factory/index.jsx
View file @ 74b9d280
......@@ -131,7 +131,7 @@ function Factory(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">工厂管理</h3>}
columns={columns}
......
src/pages/setting/organization/index.jsx
View file @ 74b9d280
......@@ -196,7 +196,7 @@ function Type(props) {
}, [drawer.val]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">组织管理</h3>}
columns={columns}
......
src/pages/setting/production/index.jsx
View file @ 74b9d280
......@@ -136,7 +136,7 @@ function Section(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">产线管理</h3>}
columns={columns}
......
src/pages/setting/role/index.jsx
View file @ 74b9d280
......@@ -227,7 +227,7 @@ function Role(props) {
);
};
// 数据分权
const distribution = (text, row, _, action) => {};
const distribution = (text, row, _, action) => { };
const columns = useMemo(() => {
let defcolumn = getcolumns(setDrawer);
......@@ -245,7 +245,7 @@ function Role(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">角色管理</h3>}
columns={columns}
......
src/pages/setting/section/index.jsx
View file @ 74b9d280
......@@ -136,7 +136,7 @@ function Section(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">工段管理</h3>}
columns={columns}
......
src/pages/setting/users/index.jsx
View file @ 74b9d280
......@@ -268,7 +268,7 @@ function User(props) {
}
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">用户管理</h3>}
columns={columns}
......
src/pages/setting/workshop/index.jsx
View file @ 74b9d280
......@@ -135,7 +135,7 @@ function Factory(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">车间管理</h3>}
columns={columns}
......
src/pages/spare/edgestore/index.jsx
View file @ 74b9d280
......@@ -101,7 +101,7 @@ function Edgestore(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">线边库存</h3>}
columns={columns}
......
src/pages/spare/instore/index.jsx
View file @ 74b9d280
......@@ -11,8 +11,8 @@ function Instore(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
}),
open: false,
}),
[activeTabKey, setactiveTabKey] = useState('1');
const { run, loading } = useRequest(doFetch, {
......@@ -121,7 +121,7 @@ function Instore(props) {
return res?.data?.dataList;
});
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">入库管理</h3>}
columns={columns}
......
src/pages/spare/outstore/index.jsx
View file @ 74b9d280
......@@ -14,8 +14,8 @@ function Outstore(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
}),
open: false,
}),
[activeTabKey, setactiveTabKey] = useState('1');
const [value, setvalue] = useState([]);
......@@ -129,7 +129,7 @@ function Outstore(props) {
}, [activeTabKey]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">出库管理</h3>}
columns={columns}
......@@ -276,8 +276,8 @@ function Outstore(props) {
value && value.length > 0
? value?.filter?.((it) => it?.id == record.id)[0]
? value
?.filter?.((it) => it?.id == record.id)[0]
?.taskSpareSupplierList?.map?.((it) => it?.spareSupplierStockId)
?.filter?.((it) => it?.id == record.id)[0]
?.taskSpareSupplierList?.map?.((it) => it?.spareSupplierStockId)
: []
: [],
onChange: (selectedKeys, selectedRows) => {
......
src/pages/spare/personalstore/index.jsx
View file @ 74b9d280
......@@ -110,7 +110,7 @@ function Personalstore(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">个人库存</h3>}
columns={columns}
......
src/pages/spare/record/index.jsx
View file @ 74b9d280
......@@ -101,7 +101,7 @@ function Record(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">出入库记录</h3>}
columns={columns}
......
src/pages/spare/requisition/index.jsx
View file @ 74b9d280
......@@ -15,8 +15,8 @@ function Requisition(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
}),
open: false,
}),
[activeTabKey, setactiveTabKey] = useState('1');
const {
initialState: { currentUser },
......@@ -138,11 +138,11 @@ function Requisition(props) {
};
const columns = useMemo(() => {
let defcolumn = getcolumns(setdrawer,drawer?.type, currentUser?.fullName).filter(
let defcolumn = getcolumns(setdrawer, drawer?.type, currentUser?.fullName).filter(
(it) => it.key == activeTabKey,
)[0]?.columns;
let defpath =
getcolumns(setdrawer,drawer?.type).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
getcolumns(setdrawer, drawer?.type).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
if (activeTabKey == 1) {
return defcolumn.concat({
title: '操作',
......@@ -165,7 +165,7 @@ function Requisition(props) {
}, [activeTabKey]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">备件领用</h3>}
columns={columns}
......
src/pages/spare/setting/index.jsx
View file @ 74b9d280
......@@ -114,7 +114,7 @@ function Setting(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">备件设置</h3>}
columns={columns}
......
src/pages/spare/spareback/index.jsx
View file @ 74b9d280
......@@ -14,8 +14,8 @@ function Spareback(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
}),
open: false,
}),
[activeTabKey, setactiveTabKey] = useState('1');
const {
initialState: { currentUser },
......@@ -164,7 +164,7 @@ function Spareback(props) {
}, [activeTabKey]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">备件回冲</h3>}
columns={columns}
......
src/pages/spare/stock/index.jsx
View file @ 74b9d280
......@@ -39,7 +39,7 @@ function Stock(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">备件库存</h3>}
columns={columns}
......
src/pages/spare/supplier/index.jsx
View file @ 74b9d280
......@@ -142,7 +142,7 @@ function Supplier(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">备件供应商</h3>}
columns={columns}
......
src/pages/spare/userecord/index.jsx
View file @ 74b9d280
......@@ -101,7 +101,7 @@ function Record(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">使用记录</h3>}
columns={columns}
......
src/pages/system/dictionary/index.jsx
View file @ 74b9d280
......@@ -194,7 +194,7 @@ function Type(props) {
}, [drawer.val]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">数据字典</h3>}
columns={columns}
......
src/pages/system/field/index.jsx
View file @ 74b9d280
......@@ -148,7 +148,7 @@ function Field(props) {
}, [drawer?.formId]);
return (
<div style={{ position: 'relative' }}>
<div>
<div className="ant-card-head">
<div className="ant-card-head-wrapper">
<div className="ant-card-head-title">
......
src/pages/system/pushsetting/Notice.jsx
View file @ 74b9d280
......@@ -109,7 +109,7 @@ function Project({ businessMsgOptionId }) {
});
}, [drawer?.id]);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
columns={columns}
actionRef={actionRef}
......
src/pages/system/pushsetting/index.jsx
View file @ 74b9d280
......@@ -171,7 +171,7 @@ function Pushsetting(props) {
};
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">推送配置</h3>}
columns={columns}
......
src/pages/system/rules/index.jsx
View file @ 74b9d280
......@@ -162,7 +162,7 @@ function Rules(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle={<h3 className="page-title">编号规则</h3>}
columns={columns}
......
src/pages/welcome/index.jsx
View file @ 74b9d280
......@@ -92,7 +92,7 @@ function Welcome(props) {
}, []);
return (
<div style={{ position: 'relative' }}>
<div>
<AutoTable
pagetitle="系统首页"
columns={columns}
......
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