Skip to content

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

1807

parent b704f1d6
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 141 deletions
config/authRoutes.js
View file @ 55902baf
......@@ -308,19 +308,19 @@ export default [
icon: 'laptop',
routes: [
{
name: '租赁客户',
name: '租户管理',
path: '/lease/custom',
icon: '',
component: './lease/custom',
},
{
name: '租赁台账',
name: '设备台账',
path: '/lease/ledger',
icon: '',
component: './lease/ledger',
},
{
name: '设备供应商',
name: '供应商管理',
path: '/lease/supplier',
icon: '',
component: './lease/supplier',
......@@ -338,13 +338,13 @@ export default [
component: './lease/contract',
},
{
name: '费用分析',
name: '租赁营收',
path: '/lease/costanalysis',
icon: '',
component: './lease/costanalysis',
},
{
name: '租赁设备',
name: '设备OEE',
path: '/lease/leasedevice',
icon: '',
component: './lease/leasedevice',
......
config/proxy.js
View file @ 55902baf
......@@ -23,7 +23,7 @@ export default {
dev: {
[defaultSetting.proxypath]: {
// 要代理的地址
target: 'http://192.168.40.111:8000', //jf哥
target: 'http://192.168.40.203:8000', //jf哥
// target: 'http://192.168.40.248:8080', //jf哥
// target: 'http://192.168.40.64:28000', //gc哥
// target: 'http://192.168.40.203:8000', //dj哥
......@@ -32,7 +32,7 @@ export default {
},
'/token': {
// 要代理的地址
target: 'http://192.168.40.111:8000',
target: 'http://192.168.40.203:8000',
changeOrigin: true,
},
'/staticfile/': {
......
src/global.less
View file @ 55902baf
......@@ -410,6 +410,10 @@ ol {
width: 100%;
}
.ant-popover {
z-index: 9999;
}
.ant-drawer-wrapper-body {
.diycard {
height: unset;
......@@ -425,7 +429,8 @@ ol {
.runtime-keep-alive-layout,
.ant-table-content,
.ant-drawer-body,
.boxcontianbox {
.boxcontianbox,
.ant-table-body {
&::-webkit-scrollbar {
/*滚动条整体样式*/
......
src/pages/lease/contract/Details.jsx
View file @ 55902baf
......@@ -149,7 +149,7 @@ const fields = [
}
},
{
title: '发用单文件',
title: '发运单上传',
dataIndex: 'hairuseFileList',
key: 'hairuseFileList',
render: (_, row) => {
......@@ -157,7 +157,7 @@ const fields = [
}
},
{
title: '租赁物交付确认单文件',
title: '租赁物交付确认单上传',
dataIndex: 'leaseDeliverFileList',
key: 'leaseDeliverFileList',
render: (_, row) => {
......@@ -225,7 +225,7 @@ const Details = ({ drawer }) => {
key: 'equipmentName',
},
{
title: '智能单元',
title: '莫格云眼',
dataIndex: 'intelligentUnitNo',
key: 'intelligentUnitNo',
},
......@@ -270,7 +270,7 @@ const Details = ({ drawer }) => {
return [
{
key: '1',
label: '基础信息',
label: '基本信息',
children: <DetailPro
fields={fields}
detailpath="/lease/umContract/queryDetail"
......@@ -279,7 +279,7 @@ const Details = ({ drawer }) => {
},
{
key: '2',
label: '租赁设备',
label: '合同详情',
children: <AutoTable
columns={columns}
path={'/lease/umContractEquipment/queryByContractId'}
......
src/pages/lease/contract/columns.js
View file @ 55902baf
......@@ -19,7 +19,7 @@ function getcolumns(setdrawer, valtype, itemId) {
open: true,
item: row,
val: 'only',
title: '合同详情',
title: <span style={{ fontWeight: 'bold' }}>{`租赁合同 ${row.contractNo}`}</span>,
type: 'detail'
}));
}}
......
src/pages/lease/contract/index.jsx
View file @ 55902baf
......@@ -235,7 +235,7 @@ function Contract(props) {
editable: false
},
{
title: '关联智能单元',
title: '莫格云眼',
dataIndex: 'ledgerEquipmentId',
key: 'ledgerEquipmentId',
valueType: 'select',
......@@ -279,7 +279,7 @@ function Contract(props) {
colProps: { span: 24 },
},
{
title: '发用单文件',
title: '发运单上传',
dataIndex: 'hairuseFileList',
key: 'hairuseFileList',
valueType: 'uploadBtn',
......@@ -289,7 +289,7 @@ function Contract(props) {
colProps: { span: 24 },
},
{
title: '租赁物交付确认单文件',
title: '租赁物交付确认单上传',
dataIndex: 'leaseDeliverFileList',
key: 'leaseDeliverFileList',
valueType: 'uploadBtn',
......
src/pages/lease/costanalysis/index.jsx
View file @ 55902baf
......@@ -222,7 +222,7 @@ const Costanalysis = () => {
return (
<div ref={boxRef}>
<AutoTable
pagetitle={<h3 className="page-title">费用分析</h3>}
pagetitle={<h3 className="page-title">租赁营收</h3>}
columns={columns}
extraparams={extraparams}
path={
......
src/pages/lease/custom/columns.js
View file @ 55902baf
......@@ -7,7 +7,6 @@ function getcolumns(setdrawer) {
title: '客户编号',
dataIndex: 'customerNo',
key: 'customerNo',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 },
},
{
......@@ -106,7 +105,6 @@ function getcolumns(setdrawer) {
fieldProps: {
mode: 'multiple'
},
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
options: { path: '/lease/umLeaseCustomer/getAllShopSelection', params: {} },
hideInSearch: true,
},
......
src/pages/lease/custom/index.jsx
View file @ 55902baf
......@@ -91,7 +91,7 @@ const Custom = () => {
}, []);
return <div>
<AutoTable
pagetitle={<h3 className="page-title">客户管理</h3>}
pagetitle={<h3 className="page-title">租户管理</h3>}
columns={columns}
path={pathconfig?.list}
actionRef={actionRef}
......
src/pages/lease/devicedata/Account.jsx
View file @ 55902baf
......@@ -24,7 +24,6 @@ import {
Tabs,
Tooltip,
} from 'antd';
import TreeRender from '@/components/TreeRender';
import { ProDescriptions } from '@ant-design/pro-components';
import InitForm from '@/components/InitForm';
import dayjs from 'dayjs';
......@@ -2039,6 +2038,7 @@ function Account({ boxRef, extraparams }) {
actionRef={actionRef}
resizeable={false}
x={1500}
y={`calc(100vh - 410px)`}
extraparams={extraparams}
bordered={false}
/>
......
src/pages/lease/devicedata/columns.js
View file @ 55902baf
......@@ -19,16 +19,9 @@ function getcolumns(setdrawer, activeKey) {
key: 'equipmentNo',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 },
},
{
title: '设备名称',
dataIndex: 'equipmentName',
key: 'equipmentName',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 },
render: (_, row) => {
return (
<Tooltip title={row.equipmentName}>
<Tooltip title={row.equipmentNo}>
<a
className="table-cell"
onClick={() => {
......@@ -41,12 +34,19 @@ function getcolumns(setdrawer, activeKey) {
}));
}}
>
{row.equipmentName}
{row.equipmentNo}
</a>
</Tooltip>
);
}
},
{
title: '设备名称',
dataIndex: 'equipmentName',
key: 'equipmentName',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 }
},
{
title: '资产编号',
dataIndex: 'assetNumber',
......@@ -56,7 +56,7 @@ function getcolumns(setdrawer, activeKey) {
hideInSearch: true
},
{
title: '关联设备',
title: '莫格云眼',
dataIndex: 'ledgerEquipment',
key: 'ledgerEquipment',
hideInForm: true,
......
src/pages/lease/devicedata/index.jsx
View file @ 55902baf
......@@ -7,11 +7,12 @@ import { doFetch } from '@/utils/doFetch';
import { useRequest } from "ahooks";
import styles from "./index.less";
import TreeRender from '@/components/TreeRender';
import { Divider, Tabs, ProDescriptions } from "antd";
import { Divider, Tabs, ProDescriptions, Tooltip } from "antd";
import Account from "./Account";
import Basemsg from "./Basemsg";
import { useModel } from "@umijs/max";
import dayjs from 'dayjs';
import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons';
const Devicedata = () => {
let actionRef = useRef(), formRef = useRef(), boxRef = useRef();
const [drawer, setdrawer] = useState({
......@@ -20,8 +21,8 @@ const Devicedata = () => {
[extraparams, setextraparams] = useState({}),
[activeKey, catk] = useState('item-1'),
[item2extraparams, citp] = useState({}),
[searchParams, csp] = useState({});
// [leaseList, clea] = useState([]);
[searchParams, csp] = useState({}),
[flag, setFlag] = useState(false);
const { allWebsocket: { commonWebsocket, commonWebmsg } } = useModel('useGlobal');
const { run, loading, runAsync } = useRequest(doFetch, {
manual: true,
......@@ -35,42 +36,6 @@ const Devicedata = () => {
}
},
});
// tableData = useRequest(() => doFetch({ url: '/lease/umLeaseLedger/queryLeaseList', params: { ...searchParams, ...extraparams } }), {
// refreshDeps: [extraparams, searchParams],
// onSuccess: (res, params) => {
// if (res.code == '0000') {
// clea(res?.data?.dataList ?? [])
// }
// }
// });
// useEffect(() => {
// const msg = commonWebmsg?.msg;
// if (commonWebmsg?.wsMsgModel == 'LEASE') {
// let newList = JSON.parse(JSON.stringify(leaseList));
// newList = newList?.map(it => {
// if (it.id == msg.id) {
// it.collectStatusName = msg.collectStatusName;
// it.collectStatus = msg.collectStatus;
// }
// return it
// });
// clea(newList);
// }
// }, [commonWebmsg]);
// useEffect(() => {
// try {
// commonWebsocket && commonWebsocket.emit("sendMessage", {
// "wsMsgModel": "LEASE",
// "subId": dayjs().valueOf(),
// param: '',
// unsubscribe: false,
// });
// } catch (error) {
// }
// }, []);
const columns = useMemo(() => {
let defcolumn = getcolumns(setdrawer, activeKey)?.columns ?? [];
return defcolumn;
......@@ -89,18 +54,9 @@ const Devicedata = () => {
resizeable={false}
bordered={false}
x={1500}
y={`calc(100vh - 410px)`}
formRef={formRef}
// dataSourceFieldsChange={(val) => {
// csp({ ...val })
// }}
extraparams={extraparams}
// pagination={false}
// toolBarRender={true}
// options={{
// reload: () => {
// tableData.run()
// }
// }}
/>
},
{
......@@ -159,8 +115,20 @@ const Devicedata = () => {
</div>
</div>
<div className={styles.ledgercontent}>
<div className={`${styles.ledgerleft} boxcontianbox`}>
<TreeRender url="/auth/sysFactory/getFactoryTree" onselected={onselecteTree} noaction={true} maxWidth={215} />
<div style={{ '--flagw': flag ? '300px' : '48px' }} className={`${styles.ledgerleft} boxcontianbox`}>
<div style={{ cursor: 'pointer', marginTop: 16 }} onClick={() => {
setFlag(!flag);
}}>
{
flag ? <Tooltip title='收起'>
<MenuFoldOutlined style={{ fontSize: 22 }} />
</Tooltip> :
<Tooltip title='展开'>
<MenuUnfoldOutlined style={{ fontSize: 22 }} />
</Tooltip>
}
</div>
<TreeRender url="/auth/sysFactory/getFactoryTree" onselected={onselecteTree} noaction={true} maxWidth={215} style={{ display: flag ? 'block' : 'none' }} />
</div>
<div className={`${styles.ledgerright} ledgerf boxcontianbox`}>
<Tabs destroyInactiveTabPane activeKey={activeKey} onChange={(key) => {
......
src/pages/lease/devicedata/index.less
View file @ 55902baf
......@@ -19,7 +19,7 @@
justify-content: space-between;
.ledgerleft {
width: 300px;
width: var(--flagw);
display: flex;
flex-direction: column;
height: 100%;
......
src/pages/lease/leasedevice/index.jsx
View file @ 55902baf
......@@ -3,6 +3,8 @@ import AutoTable from '@/components/AutoTable/mtable';
import { useRequest } from 'ahooks';
import { doFetch } from '@/utils/doFetch';
import styles from "./index.less";
import { Tooltip } from "antd";
import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons';
const columnsa = [
{
title: '客户名称',
......@@ -115,10 +117,10 @@ const columnsa = [
},
];
const Leasedevice = () => {
const [clickrow, cr] = useState({}),
[searchParams, csp] = useState({}),
formRef = useRef();
const LeftTable = ({ onChange }) => {
const [searchParams, csp] = useState({}),
[clickrow, cr] = useState({}),
[flag, setFlag] = useState(false);
const ledgerCustomer = useRequest(async () => {
let res = await doFetch({ url: "/lease/umLeaseLedger/ledgerCustomerEquipmentUseRate", params: { ...searchParams } });
cr(res?.data?.dataList?.[0]);
......@@ -126,16 +128,22 @@ const Leasedevice = () => {
}, {
refreshDeps: [searchParams]
});
return <div style={{ background: '#fff' }}>
<div className="ant-card-head" style={{ backgroundColor: 'white' }}>
<div className="ant-card-head-wrapper">
<div className="ant-card-head-title">
<h3 className="page-title">租赁设备</h3>
</div>
</div>
useEffect(() => {
onChange(clickrow?.ledgerCustomerId)
}, [clickrow?.ledgerCustomerId])
return <div style={{ flex: flag ? 1 : 0 }}>
<div style={{ cursor: 'pointer' }} onClick={() => {
setFlag(!flag);
}}>
{
flag ? <Tooltip title='收起'>
<MenuFoldOutlined style={{ fontSize: 22 }} />
</Tooltip> :
<Tooltip title='展开'>
<MenuUnfoldOutlined style={{ fontSize: 22 }} />
</Tooltip>
}
</div>
<div style={{ display: "flex", gap: 20, padding: 15 }}>
<div style={{ flex: 1 }}>
<AutoTable
columns={columnsa}
dataSource={ledgerCustomer?.data ?? []}
......@@ -149,7 +157,6 @@ const Leasedevice = () => {
};
}}
pagination={'false'}
formRef={formRef}
dataSourceFieldsChange={(val) => {
csp({ ...val })
}}
......@@ -163,15 +170,32 @@ const Leasedevice = () => {
rowClassName={(record, index) => {
return record.ledgerCustomerId == clickrow?.ledgerCustomerId ? styles.rowClass : ''
}}
style={{ display: flag ? 'block' : 'none' }}
/>
</div>
<div style={{ flex: 2 }}>
}
const Leasedevice = () => {
const [extraparamsId, setExtraparamsId] = useState('');
return <div style={{ background: '#fff' }}>
<div className="ant-card-head" style={{ backgroundColor: 'white' }}>
<div className="ant-card-head-wrapper">
<div className="ant-card-head-title">
<h3 className="page-title">设备OEE</h3>
</div>
</div>
</div>
<div style={{ display: "flex", gap: 20, padding: 15 }}>
<LeftTable onChange={(val) => {
setExtraparamsId(val);
}} />
<div style={{ flex: 2, marginTop: 26, borderLeft: '1px solid #f0f0f0', paddingLeft: 15 }}>
<AutoTable
columns={columnsb}
path={clickrow?.ledgerCustomerId ? '/lease/umLeaseLedger/ledgerCustomerEquipmentUseDetail' : ''}
path={extraparamsId ? '/lease/umLeaseLedger/ledgerCustomerEquipmentUseDetail' : ''}
resizeable={false}
pageextra="none"
extraparams={{ ledgerCustomerId: clickrow?.ledgerCustomerId }}
extraparams={{ ledgerCustomerId: extraparamsId }}
/>
</div>
</div>
......
src/pages/lease/ledger/columns.js
View file @ 55902baf
......@@ -12,16 +12,9 @@ function getcolumns(setdrawer) {
key: 'equipmentNo',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 },
},
{
title: '设备名称',
dataIndex: 'equipmentName',
key: 'equipmentName',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 },
render: (_, row) => {
return (
<Tooltip title={row.equipmentName}>
<Tooltip title={row.equipmentNo}>
<a
className="table-cell"
onClick={() => {
......@@ -35,12 +28,19 @@ function getcolumns(setdrawer) {
}));
}}
>
{row.equipmentName}
{row.equipmentNo}
</a>
</Tooltip>
);
}
},
{
title: '设备名称',
dataIndex: 'equipmentName',
key: 'equipmentName',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 }
},
{
title: '资产编号',
dataIndex: 'assetNumber',
......@@ -102,7 +102,7 @@ function getcolumns(setdrawer) {
{ label: '未绑定', value: '6' },
{ label: '绑定', value: '7' },
],
fixed: 'right',
fixed: 'left',
width: 80
},
{
......@@ -166,7 +166,6 @@ function getcolumns(setdrawer) {
hideInTable: true,
valueType: 'select',
options: { path: '/auth/sysShop/getShopSelectBox', linkParams: { factoryId: '' } },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 },
fieldProps: {
placeholder: '请选择',
......
src/pages/lease/ledger/index.jsx
View file @ 55902baf
......@@ -7,13 +7,14 @@ import { doFetch, exportFetch } from '@/utils/doFetch';
import { useRequest, useAsyncEffect } from "ahooks";
import styles from "./index.less";
import TreeRender from '@/components/TreeRender';
import { Divider, Tabs, message } from "antd";
import { Divider, Tabs, message, Tooltip } from "antd";
import Leaseresume from "./Leaseresume";
import Operatinghistory from "./Operatinghistory";
import Resume from "./Resume";
import Basemsg from "./Basemsg";
import Devicestatus from "./Devicestatus";
import setAllCanvas from "@/utils/drawimage"//导出二维码
import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons';
const Ledger = () => {
let actionRef = useRef();
const [drawer, setdrawer] = useState({
......@@ -24,7 +25,8 @@ const Ledger = () => {
factory: {}
}),
[extraparams, setextraparams] = useState({}),
[searchParams, csp] = useState({});
[searchParams, csp] = useState({}),
[flag, setFlag] = useState(false);
const { run, loading, runAsync } = useRequest(doFetch, {
manual: true,
onSuccess: (res, params) => {
......@@ -335,14 +337,26 @@ const Ledger = () => {
<div className="ant-card-head" style={{ backgroundColor: 'white' }}>
<div className="ant-card-head-wrapper">
<div className="ant-card-head-title">
<h3 className="page-title">租赁台账</h3>
<h3 className="page-title">设备台账</h3>
</div>
</div>
</div>
</div>
<div className={styles.ledgercontent}>
<div className={`${styles.ledgerleft} boxcontianbox`}>
<TreeRender url="/auth/sysFactory/getFactoryTree" onselected={onselecteTree} noaction={true} maxWidth={215} />
<div style={{ '--flagw': flag ? '300px' : '48px' }} className={`${styles.ledgerleft} boxcontianbox`}>
<div style={{ cursor: 'pointer', marginTop: 16 }} onClick={() => {
setFlag(!flag);
}}>
{
flag ? <Tooltip title='收起'>
<MenuFoldOutlined style={{ fontSize: 22 }} />
</Tooltip> :
<Tooltip title='展开'>
<MenuUnfoldOutlined style={{ fontSize: 22 }} />
</Tooltip>
}
</div>
<TreeRender url="/auth/sysFactory/getFactoryTree" onselected={onselecteTree} noaction={true} maxWidth={215} style={{ display: flag ? 'block' : 'none' }} />
</div>
<div className={`${styles.ledgerright} boxcontianbox`}>
<AutoTable
......@@ -354,6 +368,7 @@ const Ledger = () => {
pageextra={rightExtra}
bordered={false}
x={2200}
y={`calc(100vh - 480px)`}
extraparams={extraparams}
dataSourceFieldsChange={(val) => {
csp(val)
......
src/pages/lease/ledger/index.less
View file @ 55902baf
......@@ -19,7 +19,7 @@
justify-content: space-between;
.ledgerleft {
width: 300px;
width: var(--flagw);
display: flex;
flex-direction: column;
height: 100%;
......
src/pages/lease/supplier/index.jsx
View file @ 55902baf
......@@ -382,7 +382,7 @@ function Supplier(props) {
return (
<div>
<AutoTable
pagetitle={<h3 className="page-title">设备供应商</h3>}
pagetitle={<h3 className="page-title">供应商管理</h3>}
columns={columns}
path={urlParams.list}
actionRef={actionRef}
......
src/pages/system/field/index.jsx
View file @ 55902baf
......@@ -13,7 +13,6 @@ import PremButton from '@/components/PremButton';
import getcolumns from './columns';
import { doFetch } from '@/utils/doFetch';
import { message, Dropdown, Menu, Layout, Button, Image, Space, Divider, Tabs } from 'antd';
import TreeRender from '@/components/TreeRender';
import { ProDescriptions } from '@ant-design/pro-components';
import InitForm from '@/components/InitForm';
......
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