Skip to content

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

设备查看，设备台账，租赁合同

parent b9301c04
Hide whitespace changes
Inline Side-by-side
Showing with 416 additions and 311 deletions
src/pages/lease/contract/columns.js
View file @ a94fe98c
......@@ -119,6 +119,7 @@ function getcolumns(setdrawer, drawer) {
hideInSearch: true,
valueType: 'digit',
hideInTable: true,
precision: 0
},
{
title: '租赁设备',
......@@ -127,12 +128,6 @@ function getcolumns(setdrawer, drawer) {
hideInSearch: true,
valueType: 'formList',
hideInTable: true,
initialValue: [
{
state: 'all',
title: '标题',
},
],
colProps: {
xs: 24,
sm: 24,
......@@ -180,6 +175,7 @@ function getcolumns(setdrawer, drawer) {
colProps: {
sm: 3,
},
min: 0.01
},
{
title: '智享价（元）',
......@@ -198,6 +194,7 @@ function getcolumns(setdrawer, drawer) {
colProps: {
sm: 3,
},
min: 0.01
},
{
title: '返利金额（元）',
......@@ -216,6 +213,10 @@ function getcolumns(setdrawer, drawer) {
colProps: {
sm: 3,
},
fieldProps: {
disabled: true
},
min: 0.00
},
{
title: '押金（元）',
......@@ -234,6 +235,7 @@ function getcolumns(setdrawer, drawer) {
colProps: {
sm: 3,
},
min: 0.01
},
{
title: '备注',
......@@ -244,6 +246,8 @@ function getcolumns(setdrawer, drawer) {
},
}
],
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
min: 1
},
{
title: '营销区域',
......@@ -299,10 +303,11 @@ function getcolumns(setdrawer, drawer) {
fieldProps: {
limit: 5,
},
colProps: { span: 24 },
render: (_, row) => {
return <Filedetail files={drawer?.val == 'only' ? row?.['contractFileList'] : (row?.['contractFileList']?.[0] ?? [])} />
}
},
}
];
return [
{
......
src/pages/lease/contract/index.jsx
View file @ a94fe98c
......@@ -15,14 +15,15 @@ import { useRequest } from 'ahooks';
import { doFetch } from '@/utils/doFetch';
import Addform from '@/components/Addform';
import Detail from '@/components/RepaireDetail/Detail';
import dayjs from 'dayjs';
function Contract(props) {
let actionRef = useRef(),
formRef = useRef();
const [drawer, setdrawer] = useState({
open: false,
}),
[activeTabKey, setactiveTabKey] = useState('1');
[activeTabKey, setactiveTabKey] = useState('1'),
[amount, camount] = useState(0);
const { run, loading } = useRequest(doFetch, {
manual: true,
......@@ -102,6 +103,22 @@ function Contract(props) {
let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
return defpath;
}, [activeTabKey]);
const calculateContractAmount = (list = [], month = 0) => {
const sum = list?.reduce((prev, next) => {
return (prev * 100 + next * 100) / 100;
}, 0);
camount(month == 0 || month ? (sum * 100) * month / 100 : 0);
};
const changeList = (list = []) => {
list.forEach(it => {
if (it.unitPrice && it.zxPrice) {
it.rebatePrice = ((it.unitPrice ?? 0) * 100 - (it.zxPrice ?? 0) * 100) / 100;
} else {
it.rebatePrice = ''
}
});
return list;
};
return (
<div style={{ position: 'relative' }}>
<AutoTable
......@@ -121,7 +138,19 @@ function Contract(props) {
setdrawer((s) => ({
...s,
open: true,
item: {},
item: {
registrationDate: dayjs().format('YYYY-MM-DD'),
contractEquipmentList: [
{
equipmentId: '',
unitPrice: '',
zxPrice: '',
rebatePrice: '',
deposit: '',
remark: ''
}
]
},
title: '新增',
val: 'add'
}));
......@@ -134,7 +163,6 @@ function Contract(props) {
setactiveTabKey(key);
}}
/>
<DrawerPro
fields={columns}
detailpath={pathconfig?.detail || null}
......@@ -151,12 +179,67 @@ function Contract(props) {
}}
{...drawer}
onFinish={(vals) => {
if (drawer?.val == 'add') {
run({ url: pathconfig?.add || '/add', params: { ...vals } });
} else if (drawer?.val == 'edit') {
run({ url: pathconfig?.edit || '/edit', params: { ...vals, id: drawer?.item?.id } });
console.log(vals);
// if (drawer?.val == 'add') {
// run({ url: pathconfig?.add || '/add', params: { ...vals } });
// } else if (drawer?.val == 'edit') {
// run({ url: pathconfig?.edit || '/edit', params: { ...vals, id: drawer?.item?.id } });
// }
}}
onValuesChange={(changedValues, allValues) => {
for (let i in changedValues) {
if (i == 'contractEquipmentList' || i == 'tenancy') {
calculateContractAmount(allValues['contractEquipmentList']?.map(it => it.unitPrice ?? 0), allValues['tenancy']);
}
if (i == 'contractEquipmentList') {
let newList = changeList(allValues['contractEquipmentList']);
formRef?.current?.setFieldsValue({ ['contractEquipmentList']: newList });
setdrawer((s) => {
return {
...s,
item: { ...s.item, contractEquipmentList: newList }
}
})
}
}
}}
submitter={{
render: (props, doms) => {
return [
<div key='render' className='spread' style={{ position: 'fixed', bottom: 12, width: 'calc(100% - 62px)' }}>
<div key='amount' style={{ color: 'red', fontSize: 16, fontWeight: 500 }}>
<span>合同金额（单位：元）：</span>
<span>{amount}</span>
</div>,
<div>
<PremButton
key='rest'
btn={{
onClick: () => {
props.form?.resetFields()
},
style: { marginRight: 8 }
}}
>
重置
</PremButton>,
<PremButton
key='submit'
btn={{
type: "primary",
onClick: () => {
props.form?.submit?.()
},
}}
>
提交
</PremButton>,
</div>
</div>
];
},
}}
>
{/* {selectType(drawer?.val)} */}
</DrawerPro>
......
src/pages/lease/custom/columns.js
View file @ a94fe98c
......@@ -45,6 +45,10 @@ function getcolumns(setdrawer) {
options: { path: '/lease/umLeaseCustomer/getAllFactorySelection', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 },
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
},
{ title: '企业法人', dataIndex: 'enterpriseLegalPerson', key: 'enterpriseLegalPerson', colProps: { span: 8 }, hideInSearch: true },
{ title: '联系电话', dataIndex: 'phone', key: 'phone', colProps: { span: 8 }, hideInSearch: true },
......
src/pages/lease/devicedata/Account.jsx
View file @ a94fe98c
......@@ -31,7 +31,7 @@ import dayjs from 'dayjs';
const { Sider, Content } = Layout;
function Account({ boxRef }) {
function Account({ boxRef, extraparams }) {
const disabledDateOfDay = (current) => {
// Can not select days before today and today
return current && current > dayjs().endOf('day');
......@@ -42,7 +42,6 @@ function Account({ boxRef }) {
[drawer, setDrawer] = useState({
open: false,
}),
[extraparams, setextraparams] = useState({}),
[currDrawer, setCurrDrawer] = useState({
open: false,
}),
......@@ -571,13 +570,17 @@ function Account({ boxRef }) {
title: '图片',
dataIndex: 'pictureUrl',
key: 'pictureUrl',
render: (text, row) => <Image width={70} src={row.pictureUrl} />,
render: (_, row) => {
return row?.pictureUrl ? <Image style={{ width: 40, height: 40, objectFit: 'contain', objectPosition: 'center' }} src={row?.pictureUrl} /> : '-'
}
},
{
title: '二维码',
dataIndex: 'qrCodeUrl',
key: 'qrCodeUrl',
render: (text, row) => <Image width={70} src={row.qrCodeUrl} />,
render: (_, row) => {
return row?.qrCodeUrl ? <Image style={{ width: 40, height: 40, objectFit: 'contain', objectPosition: 'center' }} src={row?.qrCodeUrl} /> : '-'
}
},
];
const [newfieldscolumns, setnewfieldscolumns] = useState([]);
......
src/pages/lease/devicedata/Basemsg.jsx
View file @ a94fe98c
......@@ -2,55 +2,27 @@ import React, { useMemo } from 'react';
import DetailPro from '@/components/DetailPro';
import getcolumns from './columns';
import { doFetch } from '@/utils/doFetch';
import { useRequest } from 'ahooks';
const Basemsg = ({ drawer, activeKey, setdrawer }) => {
const columns = useMemo(() => {
let defcolumn = [];
if (activeKey == 'item-1') {
defcolumn = getcolumns(setdrawer, activeKey)?.columns ?? [];
} else {
doFetch({ url: '/base/paFormField/queryList', params: { formId: '2' } }).then(res => {
if (res.code == '0000') {
let column = [];
res?.data?.dataList?.forEach?.((el) => {
column.push({
...selectValueType(el.fieldChar, el.valueList),
title: el.fieldName,
dataIndex: el.id,
key: el.id,
});
});
defcolumn = [...(getcolumns(setdrawer, activeKey)?.columns ?? []), ...column];
}
})
}
let defcolumn = getcolumns(setdrawer, activeKey)?.columns ?? [];
return defcolumn;
}, [activeKey]);
const detailData = useMemo(() => {
let data = {};
if (activeKey == 'item-1') {
doFetch({ url: '/asset/equipment/detail', params: { id: drawer?.item?.id } }).then(res => {
if (res.code == '0000') {
data = res?.data?.data ?? {};
}
})
} else {
doFetch({ url: '/asset/equipment/detail', params: { id: drawer?.item?.id } }).then(res => {
if (res.code == '0000') {
let obj = {};
res?.data?.data['equipmentCharList']?.forEach?.((it) => {
obj[it?.fieldId] = it?.fieldRealValue;
});
data = { ...(res?.data?.data ?? {}), ...obj };
}
})
const detailData = useRequest(async () => {
let res = await doFetch({ url: '/lease/umLeaseLedger/detail', params: { id: drawer?.item?.id } });
return res?.data?.data ?? {};
}, {
refreshDeps: [drawer?.item?.id]
})
}
return data;
}, [activeKey]);
return <DetailPro
fields={columns}
detailData={detailData}
detailData={detailData?.data ?? {}}
params={{ id: drawer?.item?.id }}
/>
}
......
src/pages/lease/devicedata/columns.js
View file @ a94fe98c
......@@ -9,20 +9,20 @@ function getcolumns(setdrawer, activeKey) {
},
{
title: '设备编号',
dataIndex: 'f1',
key: 'f1',
dataIndex: 'equipmentNo',
key: 'equipmentNo',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 },
},
{
title: '设备名称',
dataIndex: 'f2',
key: 'f2',
dataIndex: 'equipmentName',
key: 'equipmentName',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 },
render: (_, row) => {
return (
<Tooltip title={row.f2}>
<Tooltip title={row.equipmentName}>
<a
className="table-cell"
onClick={() => {
......@@ -35,7 +35,7 @@ function getcolumns(setdrawer, activeKey) {
}));
}}
>
{row.f2}
{row.equipmentName}
</a>
</Tooltip>
);
......@@ -43,65 +43,84 @@ function getcolumns(setdrawer, activeKey) {
},
{
title: '资产编号',
dataIndex: 'f3',
key: 'f3',
colProps: { span: 8 }
dataIndex: 'assetNumber',
key: 'assetNumber',
colProps: { span: 8 },
hideInTable: true,
hideInSearch: true
},
{
title: '关联设备',
dataIndex: 'f18',
key: 'f18',
dataIndex: 'ledgerEquipment',
key: 'ledgerEquipment',
hideInForm: true,
colProps: { span: 8 }
},
{
title: '设备品牌',
dataIndex: 'f4',
key: 'f4',
dataIndex: 'brand',
key: 'brand',
colProps: { span: 8 }
},
{
title: '开始租赁日期',
dataIndex: 'f3',
key: 'f3',
valueType: 'dateRange',
hideInDescriptions: true,
title: '设备型号',
dataIndex: 'equipmentModelName',
key: 'equipmentModelId',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
valueType: 'select',
options: { path: '/asset/equipmentModel/query/selection', params: {} },
colProps: { span: 8 },
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
},
{
title: '结束租赁日期',
dataIndex: 'f4',
key: 'f4',
title: '开始租赁时间',
dataIndex: 'startLeaseTime',
key: 'startLeaseTimeList',
valueType: 'dateRange',
hideInDescriptions: true,
},
{
title: '租赁合同单号',
dataIndex: 'f5',
key: 'f5',
title: '结束租赁时间',
dataIndex: 'endLeaseTime',
key: 'endLeaseTimeList',
valueType: 'dateRange',
hideInDescriptions: true,
},
{
title: '设备型号',
dataIndex: 'f5',
key: 'f5',
title: '设备类型',
dataIndex: 'equipmentTypeName',
key: 'equipmentType',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
hideInSearch: true,
valueType: 'select',
options: { path: '/', params: {} },
colProps: { span: 8 }
options: [
{ label: '设备', value: 1 },
{ label: '智能单元', value: 2 },
],
colProps: { span: 8 },
hideInTable: true
},
{
title: '设备类型',
dataIndex: 'f12',
key: 'f12',
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
hideInSearch: false,
title: '经营状态',
dataIndex: 'statusName',
key: 'status',
hideInForm: true,
valueType: 'select',
options: [
{ label: '设备', value: '1' },
{ label: '智能单元', value: '2' },
{ label: '报废', value: '0' },
{ label: '预占', value: '1' },
{ label: '租赁', value: '2' },
{ label: '销售', value: '3' },
{ label: '闲置', value: '4' },
{ label: '待复检', value: '5' },
{ label: '未绑定', value: '6' },
{ label: '绑定', value: '7' },
],
colProps: { span: 8 }
fixed: 'right',
span: 2
},
{
title: '所属信息',
......@@ -109,47 +128,39 @@ function getcolumns(setdrawer, activeKey) {
},
{
title: '公司名称',
dataIndex: 'f6',
key: 'f6',
dataIndex: 'companyName',
key: 'organizationId',
hideInSearch: true,
hideInTable: true,
valueType: 'select',
options: { path: '/', params: {} },
options: { path: '/auth/sysDepartment/query/organization/selectbox', params: {} },
colProps: { span: 8 }
},
{
title: '部门名称',
dataIndex: 'f7',
key: 'f7',
dataIndex: 'departmentName',
key: 'departmentId',
formItemProps: { rules: [{ required: false, message: '此项为必填项' }] },
hideInSearch: true,
hideInTable: true,
valueType: 'select',
options: { path: '/', linkParams: { f6: '' } },
valueType: 'treeSelect',
options: { path: '/auth/sysDepartment/query/children/tree', linkParams: { organizationId: 'parentId' } },
colProps: { span: 8 }
},
{
title: '工厂名称',
dataIndex: 'factoryName',
key: 'factoryName',
valueType: 'input',
hideInSearch: true,
hideInTable: true,
hideInDescriptions: true,
colProps: { span: 8 },
fieldProps: {
disabled: true
}
},
{
title: '工厂名称',
dataIndex: 'factoryName',
key: 'factoryId',
valueType: 'select',
options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
hideInForm: true,
colProps: { span: 8 }
hideInSearch: true,
hideInTable: true,
colProps: { span: 8 },
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
},
{
title: '车间名称',
......@@ -160,7 +171,11 @@ function getcolumns(setdrawer, activeKey) {
valueType: 'select',
options: { path: '/auth/sysShop/getShopSelectionByFactory', linkParams: { factoryId: '' } },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 }
colProps: { span: 8 },
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
},
{
title: '工段名称',
......@@ -190,15 +205,11 @@ function getcolumns(setdrawer, activeKey) {
},
{
title: '关联客户',
dataIndex: 'f19',
key: 'f19',
hideInSearch: false,
hideInTable: false,
hideInForm: true,
valueType: 'select',
options: { path: '/', params: {} },
colProps: { span: 8 },
span: 3
dataIndex: 'ledgerCustomer',
key: 'ledgerCustomer',
hideInSearch: true,
hideInTable: true,
hideInForm: true
},
{
title: '其他信息',
......@@ -206,70 +217,60 @@ function getcolumns(setdrawer, activeKey) {
},
{
title: '供应商',
dataIndex: 'f13',
key: 'f13',
dataIndex: 'supplierName',
key: 'supplierId',
valueType: 'select',
options: { path: '/', params: {} },
colProps: { span: 8 }
options: { path: '/lease/umEquipmentSupplier/getSelection', params: {} },
colProps: { span: 8 },
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
span: 1
},
{
title: '保管单位',
dataIndex: 'f14',
key: 'f14',
colProps: { span: 8 }
dataIndex: 'custodyUnit',
key: 'custodyUnit',
colProps: { span: 8 },
hideInTable: true,
hideInSearch: true
},
{
title: '产权单位',
dataIndex: 'f15',
key: 'f15',
colProps: { span: 8 }
dataIndex: 'propertyUnit',
key: 'propertyUnit',
colProps: { span: 8 },
hideInTable: true,
hideInSearch: true
},
{
title: '上传图片',
dataIndex: 'f16',
key: 'f16',
hideInSearch: true,
hideInTable: true,
title: '租赁合同单号',
dataIndex: 'contractNo',
key: 'contractNo',
colProps: { span: 8 },
hideInDescriptions: true,
valueType: 'uploadImage',
fieldProps: {
limit: 1,
}
},
{
title: '图片',
dataIndex: 'f21',
key: 'f21',
dataIndex: 'imageUrl',
key: 'imageUrl',
hideInSearch: true,
hideInForm: true,
render: (_, row) => {
return row.f21?.length && <Image src={row?.f21?.[0]?.url} />
return row?.imageUrl ? <Image style={{ width: 40, height: 40, objectFit: 'contain', objectPosition: 'center' }} src={row?.imageUrl} /> : '-'
}
},
{
title: '二维码',
dataIndex: 'f22',
key: 'f22',
dataIndex: 'qrCodeUrl',
key: 'qrCodeUrl',
hideInSearch: true,
hideInForm: true,
render: (_, row) => {
return row.f22?.length && <Image src={row?.f22?.[0]?.url} />
return row?.qrCodeUrl ? <Image style={{ width: 40, height: 40, objectFit: 'contain', objectPosition: 'center' }} src={row?.qrCodeUrl} /> : '-'
}
},
{
title: '采集状态',
dataIndex: 'f20',
key: 'f20',
hideInForm: true,
valueType: 'select',
options: [
{ label: '工作', value: '1' },
{ label: '待机', value: '2' },
{ label: '报警', value: '3' },
{ label: '关机', value: '4' }
],
fixed: 'right'
},
}
],
pathconfig: {
add: '',
......@@ -528,13 +529,9 @@ function getcolumns(setdrawer, activeKey) {
},
],
},
render: (text, row) => {
if (row?.pictureUrl == null) {
return '暂无图片';
} else {
return <Image width={70} src={row.pictureUrl} />;
}
},
render: (_, row) => {
return row?.pictureUrl ? <Image style={{ width: 40, height: 40, objectFit: 'contain', objectPosition: 'center' }} src={row?.pictureUrl} /> : '-'
}
},
{
title: '二维码',
......
src/pages/lease/devicedata/index.jsx
View file @ a94fe98c
......@@ -15,10 +15,9 @@ const Devicedata = () => {
const [drawer, setdrawer] = useState({
open: false,
}),
[extraparams, setextraparams] = useState({}),
[activeKey, catk] = useState('item-1'),
[currDrawer, setCurrDrawer] = useState({
open: false,
});
[item2extraparams, citp] = useState({});
const { run, loading, runAsync } = useRequest(doFetch, {
manual: true,
onSuccess: (res, params) => {
......@@ -36,16 +35,6 @@ const Devicedata = () => {
return defcolumn;
}, [activeKey]);
const items = useMemo(() => {
if (drawer.val == 'only') {
if (activeKey == 'item-1') {
return [
{ label: '基础信息', key: 'item-1', children: <Basemsg drawer={drawer} activeKey={activeKey} setdrawer={setdrawer} /> }
]
}
}
}, [drawer.val, activeKey]);
const tableItems = useMemo(() => {
return [
{
......@@ -53,35 +42,64 @@ const Devicedata = () => {
key: 'item-1',
children: <AutoTable
columns={columns}
path=''
path='/lease/umLeaseLedger/queryLeaseList'
actionRef={actionRef}
resizeable={false}
dataSource={[{ 'f1': '111', 'f2': '222', id: 1, status: 1, f12: 1, intelligentUnit: '11' }]}
bordered={false}
x={1500}
toolBarRender={true}
formRef={formRef}
dataSourceFieldsChange={(val) => {
console.log(val);
}}
extraparams={extraparams}
pagination={false}
/>
},
{
label: '自主设备',
key: 'item-2',
children: <Account boxRef={boxRef} />
children: <Account boxRef={boxRef} extraparams={item2extraparams} />
}
]
}, []);
const onselecteTree = async (selectedKeys, e, alldata) => {
// let params = {
// treeNodeType: e.node.type,
// treeNodeKey: e.node.key,
// };
// setextraparams(params);
};
}, [extraparams]);
const items = useMemo(() => {
if (drawer.val == 'only') {
if (activeKey == 'item-1') {
return [
{ label: '基础信息', key: 'item-1', children: <Basemsg drawer={drawer} activeKey={activeKey} setdrawer={setdrawer} /> }
]
}
}
}, [drawer.val, activeKey, drawer.item]);
const onselecteTree = (selectedKeys, e, alldata) => {
let params = {};
if (selectedKeys.length) {
switch (e.node.type) {
case 1:
params = { factoryId: e.node.key }
break;
case 2:
params = { shopId: e.node.key }
break;
case 3:
params = { sectionId: e.node.key }
break;
case 4:
params = { productionLineId: e.node.key }
break;
default:
params = {};
}
} else {
params = {}
}
citp(selectedKeys.length ? {
treeNodeType: e.node.type,
treeNodeKey: e.node.key,
} : {});
setextraparams(params);
};
return <div className={styles.ledgerbox} ref={boxRef}>
<div className={styles.ledgerheader}>
<div className="ant-card-head" style={{ backgroundColor: 'white' }}>
......@@ -97,7 +115,7 @@ const Devicedata = () => {
<TreeRender url="/auth/sysFactory/getTree" onselected={onselecteTree} noaction={true} />
</div>
<div className={`${styles.ledgerright} ledgerf`}>
<Tabs activeKey={activeKey} onChange={(key) => {
<Tabs destroyInactiveTabPane activeKey={activeKey} onChange={(key) => {
catk(key);
}} items={tableItems} />
</div>
......@@ -117,7 +135,7 @@ const Devicedata = () => {
}));
}}
>
<Tabs items={items} />
<Tabs destroyInactiveTabPane items={items} />
</DrawerPro>
</div>
}
......
src/pages/lease/ledger/Basemsg.jsx
View file @ a94fe98c
......@@ -9,7 +9,7 @@ const Basemsg = ({ drawer }) => {
}, []);
return <DetailPro
fields={columns}
detailpath="/"
detailpath="/lease/umLeaseLedger/detail"
params={{ id: drawer?.item?.id }}
/>
}
......
src/pages/lease/ledger/Leaseresume.jsx
View file @ a94fe98c
......@@ -6,35 +6,35 @@ const Leaseresume = ({ setdrawer, drawer }) => {
const columns = [
{
title: '客户名称',
dataIndex: 'f1',
key: 'f1',
dataIndex: 'customerName',
key: 'customerName',
},
{
title: '开始租赁日期',
dataIndex: 'f3',
key: 'f3',
dataIndex: 'startLeaseTime',
key: 'startLeaseTimeList',
valueType: 'dateRange',
},
{
title: '实际结束日期',
dataIndex: 'f4',
key: 'f4',
dataIndex: 'endLeaseTime',
key: 'endLeaseTimeList',
valueType: 'dateRange',
},
{
title: '相关单号',
dataIndex: 'f2',
key: 'f2',
dataIndex: 'businessNo',
key: 'businessNo',
render: (_, row) => {
return (
<Tooltip title={row.f2}>
<Tooltip title={row.businessNo}>
<a
className="table-cell"
onClick={() => {
}}
>
{row.f2}
{row.businessNo}
</a>
</Tooltip>
);
......@@ -44,11 +44,11 @@ const Leaseresume = ({ setdrawer, drawer }) => {
return (
<AutoTable
columns={columns}
path={'/'}
path={'/lease/umLeaseLedgerCustomer/queryList'}
resizeable={false}
dataSource={[{ f1: '111', f2: '222', id: 1, status: 1, f12: 1, intelligentUnit: '11' }]}
pageextra="none"
bordered={false}
extraparams={{ leaseLedgerId: drawer?.item?.id }}
/>
);
};
......
src/pages/lease/ledger/Operatinghistory.jsx
View file @ a94fe98c
......@@ -7,33 +7,29 @@ const Operatinghistory = ({ setdrawer, drawer }) => {
return [
{
title: '操作时间',
dataIndex: 'f3',
key: 'f3',
dataIndex: 'operateTime',
key: 'operateTimeList',
valueType: 'dateRange',
},
{
title: '操作人',
dataIndex: 'f4',
key: 'f4'
dataIndex: 'operateUserName',
key: 'operateUserName'
},
{
title: '操作类型',
dataIndex: 'f20',
key: 'f20',
dataIndex: 'operateTypeName',
key: 'operateType',
valueType: 'select',
options: drawer.item.f12 == 1 ? [
{ label: '闲置', value: '1' },
{ label: '预占', value: '2' },
{ label: '租赁', value: '3' },
{ label: '待复检', value: '4' },
{ label: '报废', value: '5' },
{ label: '新增', value: '6' },
{ label: '销售', value: '8' },
options: drawer.item.equipmentType == 1 ? [
{ label: '新增', value: '0' },
{ label: '绑定', value: '3' },
{ label: '报废', value: '4' },
{ label: '转闲置', value: '5' },
] : [
{ label: '报废', value: '5' },
{ label: '未绑定', value: '6' },
{ label: '绑定', value: '7' },
{ label: '新增', value: '8' },
{ label: '新增', value: '0' },
{ label: '报废', value: '4' },
{ label: '解绑', value: '6' }
]
},
];
......@@ -41,11 +37,11 @@ const Operatinghistory = ({ setdrawer, drawer }) => {
return (
<AutoTable
columns={columns}
path={'/'}
path={'/lease/umLeaseLedgerOperate/queryList'}
resizeable={false}
dataSource={[{ f1: '111', f2: '222', id: 1, status: 1, f12: 1, intelligentUnit: '11' }]}
pageextra="none"
bordered={false}
extraparams={{ leaseLedgerId: drawer?.item?.id }}
/>
);
};
......
src/pages/lease/ledger/Resume.jsx
View file @ a94fe98c
......@@ -4,35 +4,35 @@ const Resume = ({ setdrawer, drawer }) => {
const columns = [
{
title: '设备编号',
dataIndex: 'f1',
key: 'f1',
dataIndex: 'equipmentNo',
key: 'equipmentNo',
},
{
title: '设备名称',
dataIndex: 'f2',
key: 'f2',
dataIndex: 'equipmentName',
key: 'equipmentName',
},
{
title: '绑定时间',
dataIndex: 'f3',
key: 'f3',
dataIndex: 'bindingTime',
key: 'bindingTimeList',
valueType: 'dateRange',
},
{
title: '解绑时间',
dataIndex: 'f4',
key: 'f4',
dataIndex: 'unBindingTime',
key: 'unBindingTimeList',
valueType: 'dateRange',
},
];
return (
<AutoTable
columns={columns}
path={'/'}
path={'/lease/umLeaseLedgerEquipment/queryList'}
resizeable={false}
dataSource={[{ f1: '111', f2: '222', id: 1, status: 1, f12: 1, intelligentUnit: '11' }]}
pageextra="none"
bordered={false}
extraparams={{ leaseLedgerId: drawer?.item?.id }}
/>
);
};
......
src/pages/lease/ledger/columns.js
View file @ a94fe98c
......@@ -66,7 +66,11 @@ function getcolumns(setdrawer) {
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
valueType: 'select',
options: { path: '/asset/equipmentModel/query/selection', params: {} },
colProps: { span: 8 }
colProps: { span: 8 },
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
},
{
title: '设备类型',
......@@ -76,18 +80,36 @@ function getcolumns(setdrawer) {
hideInSearch: false,
valueType: 'select',
options: [
{ label: '设备', value: '1' },
{ label: '智能单元', value: '2' },
{ label: '设备', value: 1 },
{ label: '智能单元', value: 2 },
],
colProps: { span: 8 }
},
{
title: '经营状态',
dataIndex: 'statusName',
key: 'status',
hideInForm: true,
valueType: 'select',
options: [
{ label: '报废', value: '0' },
{ label: '预占', value: '1' },
{ label: '租赁', value: '2' },
{ label: '销售', value: '3' },
{ label: '闲置', value: '4' },
{ label: '待复检', value: '5' },
{ label: '未绑定', value: '6' },
{ label: '绑定', value: '7' },
],
fixed: 'right'
},
{
title: '所属信息',
valueType: 'split'
},
{
title: '公司名称',
dataIndex: 'organizationName',
dataIndex: 'companyName',
key: 'organizationId',
hideInSearch: true,
hideInTable: true,
......@@ -103,21 +125,23 @@ function getcolumns(setdrawer) {
hideInSearch: true,
hideInTable: true,
valueType: 'treeSelect',
options: { path: '/auth/sysDepartment/query/children/tree', linkParams: { organizationId: '' } },
options: { path: '/auth/sysDepartment/query/children/tree', linkParams: { organizationId: 'parentId' } },
colProps: { span: 8 }
},
{
title: '工厂名称',
dataIndex: 'factoryName',
key: 'factoryName',
valueType: 'input',
key: 'factoryId',
valueType: 'select',
hideInSearch: true,
hideInTable: true,
hideInDescriptions: true,
colProps: { span: 8 },
options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
fieldProps: {
disabled: true
}
},
},
{
title: '工厂名称',
......@@ -125,9 +149,12 @@ function getcolumns(setdrawer) {
key: 'factoryId',
valueType: 'select',
options: { path: '/auth/sysFactory/getAllFactorySelection', params: {} },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
hideInForm: true,
colProps: { span: 8 }
colProps: { span: 8 },
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
},
{
title: '车间名称',
......@@ -138,7 +165,11 @@ function getcolumns(setdrawer) {
valueType: 'select',
options: { path: '/auth/sysShop/getShopSelectionByFactory', linkParams: { factoryId: '' } },
formItemProps: { rules: [{ required: true, message: '此项为必填项' }] },
colProps: { span: 8 }
colProps: { span: 8 },
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
},
{
title: '工段名称',
......@@ -176,7 +207,11 @@ function getcolumns(setdrawer) {
valueType: 'select',
options: { path: '/lease/umLeaseCustomer/getSelection', params: {} },
colProps: { span: 8 },
span: 3
span: 3,
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
},
{
title: '其他信息',
......@@ -188,7 +223,12 @@ function getcolumns(setdrawer) {
key: 'supplierId',
valueType: 'select',
options: { path: '/lease/umEquipmentSupplier/getSelection', params: {} },
colProps: { span: 8 }
colProps: { span: 8 },
fieldProps: {
placeholder: '请选择',
showSearch: true,
},
span: 1
},
{
title: '保管单位',
......@@ -221,7 +261,7 @@ function getcolumns(setdrawer) {
hideInSearch: true,
hideInForm: true,
render: (_, row) => {
return <Image src={row?.imageUrl} />
return row?.imageUrl ? <Image style={{ width: 40, height: 40, objectFit: 'contain', objectPosition: 'center' }} src={row?.imageUrl} /> : '-'
}
},
{
......@@ -231,34 +271,16 @@ function getcolumns(setdrawer) {
hideInSearch: true,
hideInForm: true,
render: (_, row) => {
return <Image src={row?.qrCodeUrl} />
return row?.qrCodeUrl ? <Image style={{ width: 40, height: 40, objectFit: 'contain', objectPosition: 'center' }} src={row?.qrCodeUrl} /> : '-'
}
},
{
title: '经营状态',
dataIndex: 'statusName',
key: 'status',
hideInForm: true,
valueType: 'select',
options: [
{ label: '报废', value: '0' },
{ label: '预占', value: '1' },
{ label: '租赁', value: '2' },
{ label: '销售', value: '3' },
{ label: '闲置', value: '4' },
{ label: '待复检', value: '5' },
{ label: '未绑定', value: '6' },
{ label: '绑定', value: '7' },
],
fixed: 'right'
},
}
],
pathconfig: {
add: '/lease/umLeaseLedger/save',
edit: '/lease/umLeaseLedger/save',
list: '/lease/umLeaseLedger/queryList',
delete: '/lease/umLeaseLedger/deleteById',
detail: '/lease/umLeaseLedger/queryById'
detail: '/lease/umLeaseLedger/detail'
},
};
}
......
src/pages/lease/ledger/index.jsx
View file @ a94fe98c
......@@ -21,7 +21,6 @@ const Ledger = () => {
supplier: {},
factory: {}
}),
[node, cnode] = useState({}),
[extraparams, setextraparams] = useState({});
const { run, loading, runAsync } = useRequest(doFetch, {
manual: true,
......@@ -40,7 +39,7 @@ const Ledger = () => {
return defcolumn.concat({
title: '操作',
valueType: 'option',
width: 170,
width: 190,
render: (text, row, _, action) => getExtra(text, row, _, action),
colProps: {
fixed: 'right'
......@@ -61,24 +60,29 @@ const Ledger = () => {
}, [])
const onselecteTree = async (selectedKeys, e, alldata) => {
const onselecteTree = (selectedKeys, e, alldata) => {
let params = {};
switch (e.node.type) {
case 1:
params = { factoryId: e.node.key }
break;
case 2:
params = { shopId: e.node.key }
break;
case 3:
params = { sectionId: e.node.key }
break;
case 4:
params = { productionLineId: e.node.key }
break;
default:
params = {};
if (selectedKeys.length) {
switch (e.node.type) {
case 1:
params = { factoryId: e.node.key }
break;
case 2:
params = { shopId: e.node.key }
break;
case 3:
params = { sectionId: e.node.key }
break;
case 4:
params = { productionLineId: e.node.key }
break;
default:
params = {};
}
} else {
params = {}
}
setextraparams(params);
};
const getExtra = (text, row, _, action) => {
......@@ -96,7 +100,7 @@ const Ledger = () => {
intelligentUnit = row.ledgerEquipment;
return [
(ifs || ifse || ifsd) && <PremButton
(ifsd || (devicetype1 && ifs) || (devicetype2 && ifse)) && <PremButton
key='edit'
btn={{
size: 'small',
......@@ -245,7 +249,7 @@ const Ledger = () => {
val: 'add',
title: '新增',
item: {
factoryName: defaultmsg?.factory?.factoryName,
factoryId: defaultmsg?.factory?.id,
supplierId: defaultmsg?.supplier?.id
}
}));
......@@ -337,17 +341,18 @@ const Ledger = () => {
}));
}}
onFinish={async (vals) => {
// if (drawer?.val == "add") {
// await runAsync({ url: pathconfig?.add, params: { ...vals } });
// } else if (drawer?.val == "edit") {
// await runAsync({
// url: pathconfig?.edit,
// params: { ...vals, id: drawer?.item?.id },
// });
// }
let newParams = JSON.parse(JSON.stringify(vals));
if (drawer?.val == "add") {
await runAsync({ url: pathconfig?.add, params: { ...newParams } });
} else if (drawer?.val == "edit") {
await runAsync({
url: pathconfig?.edit,
params: { ...newParams, id: drawer?.item?.id },
});
}
}}
>
<Tabs items={items} />
<Tabs items={items} destroyInactiveTabPane />
</DrawerPro>
</div>
}
......
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