Skip to content

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

1853

parent 55902baf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 728 additions and 376 deletions
config/proxy.js
View file @ aab9e0ac
...@@ -23,7 +23,7 @@ export default { ...@@ -23,7 +23,7 @@ export default {
dev: { dev: {
[defaultSetting.proxypath]: { [defaultSetting.proxypath]: {
// 要代理的地址 // 要代理的地址
target: 'http://192.168.40.203:8000', //jf哥 target: 'http://192.168.40.110:8000', //jf哥
// target: 'http://192.168.40.248:8080', //jf哥 // target: 'http://192.168.40.248:8080', //jf哥
// target: 'http://192.168.40.64:28000', //gc哥 // target: 'http://192.168.40.64:28000', //gc哥
// target: 'http://192.168.40.203:8000', //dj哥 // target: 'http://192.168.40.203:8000', //dj哥
...@@ -32,7 +32,7 @@ export default { ...@@ -32,7 +32,7 @@ export default {
}, },
'/token': { '/token': {
// 要代理的地址 // 要代理的地址
target: 'http://192.168.40.203:8000', target: 'http://192.168.40.110:8000',
changeOrigin: true, changeOrigin: true,
}, },
'/staticfile/': { '/staticfile/': {
......
src/components/InitForm/FormItems.jsx
View file @ aab9e0ac
...@@ -181,7 +181,7 @@ let FormRender = memo(({ fields = [], name, curindex, formRef, action }) => { ...@@ -181,7 +181,7 @@ let FormRender = memo(({ fields = [], name, curindex, formRef, action }) => {
<Col {...item.colProps} style={{ height: 68 }} key={index}> <Col {...item.colProps} style={{ height: 68 }} key={index}>
<div> <div>
<label htmlFor="" style={{ marginBottom: 14, display: 'inline-block' }} >{item.title}</label> <label htmlFor="" style={{ marginBottom: 14, display: 'inline-block' }} >{item.title}</label>
<div style={{ margin: 0 }}> <div title={value[item?.key ?? item?.dataIndex] ?? "-"} style={{ margin: 0 }}>
{value[item?.key ?? item?.dataIndex] ?? "-"} {value[item?.key ?? item?.dataIndex] ?? "-"}
</div> </div>
</div> </div>
...@@ -189,7 +189,7 @@ let FormRender = memo(({ fields = [], name, curindex, formRef, action }) => { ...@@ -189,7 +189,7 @@ let FormRender = memo(({ fields = [], name, curindex, formRef, action }) => {
) : ( ) : (
<Col {...item.colProps} style={{ height: 40, display: 'flex', alignItems: 'center' }} key={index}> <Col {...item.colProps} style={{ height: 40, display: 'flex', alignItems: 'center' }} key={index}>
<div> <div>
<div style={{ margin: 0 }}> <div title={value[item?.key ?? item?.dataIndex] ?? "-"} style={{ margin: 0 }}>
{value[item?.key ?? item?.dataIndex] ?? "-"} {value[item?.key ?? item?.dataIndex] ?? "-"}
</div> </div>
</div> </div>
...@@ -1466,7 +1466,7 @@ function FormList(props) { ...@@ -1466,7 +1466,7 @@ function FormList(props) {
}, [props]); }, [props]);
return ( return (
<Col {...col}> <Col {...col}>
<div className="formlist"> <div className="formlist" style={{ '--bordered': item.bordered ? '1px solid #dbdbdb' : 'none' }}>
{ {
item?.creatorButtonProps === false ? item?.creatorButtonProps === false ?
!isEmpty ? !isEmpty ?
......
src/global.less
View file @ aab9e0ac
...@@ -617,11 +617,13 @@ ol { ...@@ -617,11 +617,13 @@ ol {
.formlist { .formlist {
>div { >div {
overflow-x: auto;
>div { >div {
>div { >div {
>div { >div {
>div:last-child { >div:last-child {
border: 1px solid #dbdbdb; border: var(--bordered);
padding: 12px; padding: 12px;
} }
} }
...@@ -636,6 +638,16 @@ ol { ...@@ -636,6 +638,16 @@ ol {
.ant-form-item { .ant-form-item {
margin-bottom: 12px !important; margin-bottom: 12px !important;
} }
.ant-pro-form-group {
>div {
>.ant-row {
flex-flow: row nowrap !important;
align-items: baseline !important;
}
}
}
} }
.screenwh { .screenwh {
......
src/pages/lease/contract/Details.jsx
View file @ aab9e0ac
...@@ -11,7 +11,7 @@ const fields = [ ...@@ -11,7 +11,7 @@ const fields = [
key: 'contractNo' key: 'contractNo'
}, },
{ {
title: '合同金额（元）', title: '合同金额',
dataIndex: 'amount', dataIndex: 'amount',
key: 'amount' key: 'amount'
}, },
...@@ -46,15 +46,25 @@ const fields = [ ...@@ -46,15 +46,25 @@ const fields = [
key: 'undertakingId' key: 'undertakingId'
}, },
{ {
title: '合同负责人', title: '销售经理',
dataIndex: 'head', dataIndex: 'head',
key: 'head' key: 'head'
}, },
{ {
title: '登记日期', title: '签订日期',
dataIndex: 'registrationDate', dataIndex: 'registrationDate',
key: 'registrationDate' key: 'registrationDate'
}, },
{
title: '到货日期',
dataIndex: 'arriveDate',
key: 'arriveDate'
},
{
title: '退还日期',
dataIndex: 'returnDate',
key: 'returnDate'
},
{ {
title: '状态', title: '状态',
dataIndex: 'statusName', dataIndex: 'statusName',
...@@ -89,7 +99,7 @@ const fields = [ ...@@ -89,7 +99,7 @@ const fields = [
valueType: 'split' valueType: 'split'
}, },
{ {
title: '去程运费（元）', title: '交付运费',
dataIndex: 'tripFreight', dataIndex: 'tripFreight',
key: 'tripFreight' key: 'tripFreight'
}, },
...@@ -99,21 +109,16 @@ const fields = [ ...@@ -99,21 +109,16 @@ const fields = [
key: 'tripBearName' key: 'tripBearName'
}, },
{ {
title: '返程运费（元）', title: '退还运费',
dataIndex: 'returnFreight', dataIndex: 'returnFreight',
key: 'returnFreight' key: 'returnFreight'
}, },
{
title: '返程运费承担方',
dataIndex: 'returnBearName',
key: 'returnBearName'
},
{ {
title: '', title: '',
valueType: 'split' valueType: 'split'
}, },
{ {
title: '退还押金（元）', title: '退还押金',
dataIndex: 'refund', dataIndex: 'refund',
key: 'refund' key: 'refund'
}, },
...@@ -127,6 +132,12 @@ const fields = [ ...@@ -127,6 +132,12 @@ const fields = [
dataIndex: 'handleTime', dataIndex: 'handleTime',
key: 'handleTime' key: 'handleTime'
}, },
{
title: '备注',
dataIndex: 'remark',
key: 'remark',
colProps: { span: 24 },
},
{ {
title: '相关文件', title: '相关文件',
valueType: 'split' valueType: 'split'
...@@ -224,35 +235,77 @@ const Details = ({ drawer }) => { ...@@ -224,35 +235,77 @@ const Details = ({ drawer }) => {
dataIndex: 'equipmentName', dataIndex: 'equipmentName',
key: 'equipmentName', key: 'equipmentName',
}, },
{
title: '设备型号',
dataIndex: 'equipmentModelName',
key: 'equipmentModelName',
hideInSearch: true
},
{ {
title: '莫格云眼', title: '莫格云眼',
dataIndex: 'intelligentUnitNo', dataIndex: 'intelligentUnitNo',
key: 'intelligentUnitNo', key: 'intelligentUnitNo',
}, },
{ {
title: '每期单价（元）', title: '出库区域',
dataIndex: 'equipmentModelName',
key: 'equipmentModelName',
hideInSearch: true
},
{
title: '入库区域',
dataIndex: 'equipmentModelName',
key: 'equipmentModelName',
hideInSearch: true
},
{
title: '每期单价',
dataIndex: 'unitPrice', dataIndex: 'unitPrice',
key: 'unitPrice', key: 'unitPrice',
hideInSearch: true hideInSearch: true
}, },
{ {
title: '智享价（元）', title: '智享价',
dataIndex: 'zxPrice', dataIndex: 'zxPrice',
key: 'zxPrice', key: 'zxPrice',
hideInSearch: true hideInSearch: true
}, },
{ {
title: '返利金额（元）', title: '返利金额',
dataIndex: 'rebatePrice', dataIndex: 'rebatePrice',
key: 'rebatePrice', key: 'rebatePrice',
hideInSearch: true hideInSearch: true
}, },
{ {
title: '押金（元）', title: '交付运费',
dataIndex: 'deliveryPrice',
key: 'deliveryPrice',
hideInSearch: true
},
{
title: '交付日期',
dataIndex: 'deliveryDate',
key: 'deliveryDate',
hideInSearch: true
},
{
title: '押金',
dataIndex: 'deposit', dataIndex: 'deposit',
key: 'deposit', key: 'deposit',
hideInSearch: true hideInSearch: true
}, },
{
title: '开始租赁时间',
dataIndex: 'startLeaseDate',
key: 'startLeaseDate',
hideInSearch: true
},
{
title: '结束租赁时间',
dataIndex: 'endLeaseDate',
key: 'endLeaseDate',
hideInSearch: true
},
{ {
title: '实际结束时间', title: '实际结束时间',
dataIndex: 'realEndDate', dataIndex: 'realEndDate',
...@@ -260,11 +313,35 @@ const Details = ({ drawer }) => { ...@@ -260,11 +313,35 @@ const Details = ({ drawer }) => {
hideInSearch: true hideInSearch: true
}, },
{ {
title: '违约金（元）', title: '违约金',
dataIndex: 'violatePrice', dataIndex: 'violatePrice',
key: 'violatePrice', key: 'violatePrice',
hideInSearch: true hideInSearch: true
}, },
{
title: '退还运费',
dataIndex: 'returnFreight',
key: 'returnFreight',
hideInSearch: true
},
{
title: '退还日期',
dataIndex: 'returnDate',
key: 'returnDate',
hideInSearch: true
},
{
title: '返程运费承担方',
dataIndex: 'returnBearName',
key: 'returnBearName',
hideInSearch: true
},
{
title: '备注',
dataIndex: 'remark',
key: 'remark',
hideInSearch: true
},
]; ];
const items = useMemo(() => { const items = useMemo(() => {
return [ return [
...@@ -288,6 +365,7 @@ const Details = ({ drawer }) => { ...@@ -288,6 +365,7 @@ const Details = ({ drawer }) => {
bordered={false} bordered={false}
extraparams={{ contractId: drawer?.item?.id }} extraparams={{ contractId: drawer?.item?.id }}
pagination={'false'} pagination={'false'}
x={2300}
/>, />,
} }
] ]
......
src/pages/lease/contract/columns.js
View file @ aab9e0ac
This diff is collapsed.
src/pages/lease/contract/index.jsx
View file @ aab9e0ac
This diff is collapsed.
src/pages/lease/costanalysis/columns.js
View file @ aab9e0ac
...@@ -8,7 +8,7 @@ const statusColors = { ...@@ -8,7 +8,7 @@ const statusColors = {
function getcolumns(setdrawer, activeKey) { function getcolumns(setdrawer, activeKey) {
const commona = [ const commona = [
{ {
title: '客户', title: '客户名称',
dataIndex: 'customerName', dataIndex: 'customerName',
key: 'customerId', key: 'customerId',
valueType: 'select', valueType: 'select',
...@@ -35,37 +35,86 @@ function getcolumns(setdrawer, activeKey) { ...@@ -35,37 +35,86 @@ function getcolumns(setdrawer, activeKey) {
key: 'equipmentName', key: 'equipmentName',
}, },
{ {
title: '智能单元莫格云眼编号', title: '设备型号',
dataIndex: 'intelligentUnitNo', dataIndex: 'equipmentModelName',
key: 'intelligentUnitNo', key: 'equipmentModelName',
width: 170
},
{
title: '每期单价（元）',
dataIndex: 'unitPrice',
key: 'unitPrice',
hideInSearch: true hideInSearch: true
}, },
{ {
title: '智享价（元）', title: '莫格云眼',
dataIndex: 'zxPrice', dataIndex: 'intelligentUnitNo',
key: 'zxPrice', key: 'intelligentUnitNo',
hideInSearch: true width: 170
},
{
title: '返利金额（元）',
dataIndex: 'rebatePrice',
key: 'rebatePrice',
hideInSearch: true
}, },
{ {
title: '押金（元）', title: '出库区域',
dataIndex: 'deposit', dataIndex: 'intelligentUnitNo',
key: 'deposit', key: 'intelligentUnitNo',
hideInSearch: true
} }
], ],
commonb = [ commonb = [
{
title: '每期单价',
dataIndex: 'unitPrice',
key: 'unitPrice',
hideInSearch: true
},
{
title: '智享价',
dataIndex: 'zxPrice',
key: 'zxPrice',
hideInSearch: true
},
{
title: '返利金额',
dataIndex: 'rebatePrice',
key: 'rebatePrice',
hideInSearch: true
},
{
title: '交付运费',
dataIndex: 'deliveryPrice',
key: 'deliveryPrice',
hideInSearch: true
},
{
title: '交付日期',
dataIndex: 'deliveryDate',
key: 'deliveryDate',
hideInSearch: true
},
{
title: '退还运费',
dataIndex: 'returnFreight',
key: 'returnFreight',
hideInSearch: true
},
{
title: '退还日期',
dataIndex: 'returnDate',
key: 'returnDate',
hideInSearch: true
},
{
title: '返程运费承担方',
dataIndex: 'returnBearName',
key: 'returnBearName',
hideInSearch: true
},
{
title: '押金',
dataIndex: 'deposit',
key: 'deposit',
hideInSearch: true
},
{
title: '违约金',
dataIndex: 'violatePrice',
key: 'violatePrice',
hideInSearch: true
}
],
commonc = [
{ {
title: '开票期数', title: '开票期数',
dataIndex: 'openNum', dataIndex: 'openNum',
...@@ -153,6 +202,7 @@ function getcolumns(setdrawer, activeKey) { ...@@ -153,6 +202,7 @@ function getcolumns(setdrawer, activeKey) {
hideInSearch: true hideInSearch: true
}, },
...commonb, ...commonb,
...commonc,
{ {
title: '回款状态', title: '回款状态',
dataIndex: 'collectionStatusName', dataIndex: 'collectionStatusName',
...@@ -202,7 +252,14 @@ function getcolumns(setdrawer, activeKey) { ...@@ -202,7 +252,14 @@ function getcolumns(setdrawer, activeKey) {
}, },
hideInSearch: true hideInSearch: true
}, },
...commonb,] ...commonb,
{
title: '入库区域',
dataIndex: 'intelligentUnitNo',
key: 'intelligentUnitNo',
},
...commonc
]
} }
] ]
......
src/pages/lease/costanalysis/index.jsx
View file @ aab9e0ac
...@@ -135,7 +135,7 @@ const Costanalysis = () => { ...@@ -135,7 +135,7 @@ const Costanalysis = () => {
title: '租金减免', title: '租金减免',
fields: [ fields: [
{ {
title: '当前减免金额（元）', title: '当前减免金额',
dataIndex: 'reducePrice', dataIndex: 'reducePrice',
key: 'reducePrice', key: 'reducePrice',
valueType: 'digit', valueType: 'digit',
......
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