|
@@ -1,16 +1,16 @@
|
|
-import React,{ Component } from 'react';
|
|
|
|
|
|
+import React, { Component } from 'react';
|
|
import {
|
|
import {
|
|
Modal,
|
|
Modal,
|
|
Tooltip,
|
|
Tooltip,
|
|
} from "antd";
|
|
} from "antd";
|
|
import './index.less';
|
|
import './index.less';
|
|
import TabelContent from "../../../../common/tabelContent";
|
|
import TabelContent from "../../../../common/tabelContent";
|
|
-import {getApprovedState, getLiquidationStatus, getNewOrderStatus, getProcessStatus} from "../../../../tools";
|
|
|
|
|
|
+import { getApprovedState, getLiquidationStatus, getNewOrderStatus, getProcessStatus } from "../../../../tools";
|
|
|
|
|
|
-class DetailedList extends Component{
|
|
|
|
|
|
+class DetailedList extends Component {
|
|
constructor(props) {
|
|
constructor(props) {
|
|
super(props);
|
|
super(props);
|
|
- this.state= {
|
|
|
|
|
|
+ this.state = {
|
|
columns: [
|
|
columns: [
|
|
{
|
|
{
|
|
title: "编号",
|
|
title: "编号",
|
|
@@ -74,14 +74,14 @@ class DetailedList extends Component{
|
|
title: "客户名称",
|
|
title: "客户名称",
|
|
dataIndex: "userName",
|
|
dataIndex: "userName",
|
|
key: "userName",
|
|
key: "userName",
|
|
- render:text=>{
|
|
|
|
|
|
+ render: text => {
|
|
return (
|
|
return (
|
|
<Tooltip title={text}>
|
|
<Tooltip title={text}>
|
|
<div style={{
|
|
<div style={{
|
|
- maxWidth:'150px',
|
|
|
|
- overflow:'hidden',
|
|
|
|
|
|
+ maxWidth: '150px',
|
|
|
|
+ overflow: 'hidden',
|
|
textOverflow: "ellipsis",
|
|
textOverflow: "ellipsis",
|
|
- whiteSpace:'nowrap',
|
|
|
|
|
|
+ whiteSpace: 'nowrap',
|
|
}}>{text}</div>
|
|
}}>{text}</div>
|
|
</Tooltip>
|
|
</Tooltip>
|
|
)
|
|
)
|
|
@@ -107,7 +107,7 @@ class DetailedList extends Component{
|
|
dataIndex: "processStatus",
|
|
dataIndex: "processStatus",
|
|
key: "processStatus",
|
|
key: "processStatus",
|
|
render: (text, record) => {
|
|
render: (text, record) => {
|
|
- return getProcessStatus(text, record.examineName);
|
|
|
|
|
|
+ return getProcessStatus(text, record.examineName, record.approval);
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
{
|
|
@@ -155,132 +155,132 @@ class DetailedList extends Component{
|
|
key: "financeName",
|
|
key: "financeName",
|
|
},
|
|
},
|
|
],
|
|
],
|
|
- searchList:[
|
|
|
|
|
|
+ searchList: [
|
|
{
|
|
{
|
|
- type:'newDepartmentSelect',
|
|
|
|
- dataKey:'deps',
|
|
|
|
- placeholder:'请选择部门'
|
|
|
|
|
|
+ type: 'newDepartmentSelect',
|
|
|
|
+ dataKey: 'deps',
|
|
|
|
+ placeholder: '请选择部门'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- type:'times',
|
|
|
|
- title:'下单时间',
|
|
|
|
- dataKey:['startCreate','endCreate'],
|
|
|
|
|
|
+ type: 'times',
|
|
|
|
+ title: '下单时间',
|
|
|
|
+ dataKey: ['startCreate', 'endCreate'],
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- type:'times',
|
|
|
|
- title:'合同时间',
|
|
|
|
- dataKey:['startSign','endSign'],
|
|
|
|
|
|
+ type: 'times',
|
|
|
|
+ title: '合同时间',
|
|
|
|
+ dataKey: ['startSign', 'endSign'],
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- type:'select',
|
|
|
|
- dataKey:'sort',
|
|
|
|
- placeholder:'请选择排序',
|
|
|
|
- selectList:[
|
|
|
|
|
|
+ type: 'select',
|
|
|
|
+ dataKey: 'sort',
|
|
|
|
+ placeholder: '请选择排序',
|
|
|
|
+ selectList: [
|
|
{
|
|
{
|
|
- value:'0',
|
|
|
|
- label:'按总金额排序'
|
|
|
|
|
|
+ value: '0',
|
|
|
|
+ label: '按总金额排序'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- value:'1',
|
|
|
|
- label:'按数量排序'
|
|
|
|
|
|
+ value: '1',
|
|
|
|
+ label: '按数量排序'
|
|
},
|
|
},
|
|
]
|
|
]
|
|
},
|
|
},
|
|
],
|
|
],
|
|
- searchList1:[
|
|
|
|
|
|
+ searchList1: [
|
|
{
|
|
{
|
|
- type:'text',
|
|
|
|
- dataKey:'orderNo',
|
|
|
|
- placeholder:'请输入订单编号'
|
|
|
|
|
|
+ type: 'text',
|
|
|
|
+ dataKey: 'orderNo',
|
|
|
|
+ placeholder: '请输入订单编号'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- type:'text',
|
|
|
|
- dataKey:'name',
|
|
|
|
- placeholder:'请输入客户名称'
|
|
|
|
|
|
+ type: 'text',
|
|
|
|
+ dataKey: 'name',
|
|
|
|
+ placeholder: '请输入客户名称'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- type:'departmentSelect',
|
|
|
|
- dataKey:'depId',
|
|
|
|
- placeholder:'请选择部门'
|
|
|
|
|
|
+ type: 'departmentSelect',
|
|
|
|
+ dataKey: 'depId',
|
|
|
|
+ placeholder: '请选择部门'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- type:'text',
|
|
|
|
- dataKey:'contractNo',
|
|
|
|
- placeholder:'请输入合同编号'
|
|
|
|
|
|
+ type: 'text',
|
|
|
|
+ dataKey: 'contractNo',
|
|
|
|
+ placeholder: '请输入合同编号'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- type:'select',
|
|
|
|
- dataKey:'liquidationStatus',
|
|
|
|
- placeholder:'请选择结算状态',
|
|
|
|
- selectList:[
|
|
|
|
|
|
+ type: 'select',
|
|
|
|
+ dataKey: 'liquidationStatus',
|
|
|
|
+ placeholder: '请选择结算状态',
|
|
|
|
+ selectList: [
|
|
{
|
|
{
|
|
- value:'0',
|
|
|
|
- label:'首付待付请'
|
|
|
|
|
|
+ value: '0',
|
|
|
|
+ label: '首付待付请'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- value:'1',
|
|
|
|
- label:'尾款待付清'
|
|
|
|
|
|
+ value: '1',
|
|
|
|
+ label: '尾款待付清'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- value:'2',
|
|
|
|
- label:'已付清'
|
|
|
|
|
|
+ value: '2',
|
|
|
|
+ label: '已付清'
|
|
}
|
|
}
|
|
]
|
|
]
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- type:'select',
|
|
|
|
- dataKey:'approval',
|
|
|
|
- placeholder:'请选择特批状态',
|
|
|
|
- selectList:[
|
|
|
|
|
|
+ type: 'select',
|
|
|
|
+ dataKey: 'approval',
|
|
|
|
+ placeholder: '请选择特批状态',
|
|
|
|
+ selectList: [
|
|
{
|
|
{
|
|
- value:'0',
|
|
|
|
- label:'非特批'
|
|
|
|
|
|
+ value: '0',
|
|
|
|
+ label: '非特批'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- value:'1',
|
|
|
|
- label:'特批'
|
|
|
|
|
|
+ value: '1',
|
|
|
|
+ label: '特批'
|
|
}
|
|
}
|
|
]
|
|
]
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- type:'select',
|
|
|
|
- dataKey:'amountStatus',
|
|
|
|
- placeholder:'请选择签单金额',
|
|
|
|
- selectList:[
|
|
|
|
|
|
+ type: 'select',
|
|
|
|
+ dataKey: 'amountStatus',
|
|
|
|
+ placeholder: '请选择签单金额',
|
|
|
|
+ selectList: [
|
|
{
|
|
{
|
|
- value:'0',
|
|
|
|
- label:'10万元以下'
|
|
|
|
|
|
+ value: '0',
|
|
|
|
+ label: '10万元以下'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- value:'1',
|
|
|
|
- label:'10~20万元'
|
|
|
|
|
|
+ value: '1',
|
|
|
|
+ label: '10~20万元'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- value:'2',
|
|
|
|
- label:'20~30万元'
|
|
|
|
|
|
+ value: '2',
|
|
|
|
+ label: '20~30万元'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- value:'3',
|
|
|
|
- label:'30~40万元'
|
|
|
|
|
|
+ value: '3',
|
|
|
|
+ label: '30~40万元'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- value:'4',
|
|
|
|
- label:'40万元以上'
|
|
|
|
|
|
+ value: '4',
|
|
|
|
+ label: '40万元以上'
|
|
},
|
|
},
|
|
]
|
|
]
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- type:'times',
|
|
|
|
- title:'下单时间',
|
|
|
|
- dataKey:['starTime','endTime'],
|
|
|
|
|
|
+ type: 'times',
|
|
|
|
+ title: '下单时间',
|
|
|
|
+ dataKey: ['starTime', 'endTime'],
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- type:'times',
|
|
|
|
- title:'合同时间',
|
|
|
|
- dataKey:['contractStart','contractEnd'],
|
|
|
|
|
|
+ type: 'times',
|
|
|
|
+ title: '合同时间',
|
|
|
|
+ dataKey: ['contractStart', 'contractEnd'],
|
|
},
|
|
},
|
|
],
|
|
],
|
|
- searchConfig:{},
|
|
|
|
|
|
+ searchConfig: {},
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -308,35 +308,36 @@ class DetailedList extends Component{
|
|
className="admin-desc-content">
|
|
className="admin-desc-content">
|
|
<div className="user-content">
|
|
<div className="user-content">
|
|
<TabelContent
|
|
<TabelContent
|
|
- scroll={{ x: 0, y: 500}}
|
|
|
|
|
|
+ scroll={{ x: 0, y: 500 }}
|
|
searchList={this.state.searchList}
|
|
searchList={this.state.searchList}
|
|
columns={this.state.columns}
|
|
columns={this.state.columns}
|
|
tabelApi={'/api/admin/newOrder/provinceStatisticsList'}
|
|
tabelApi={'/api/admin/newOrder/provinceStatisticsList'}
|
|
searchConfig={this.props.searchConfig}
|
|
searchConfig={this.props.searchConfig}
|
|
- searchOperation={(value)=>{
|
|
|
|
- for(let i of Object.keys(value)){
|
|
|
|
- if(i === 'sort' || i === 'pageNo' || i === 'pageSize'){
|
|
|
|
|
|
+ searchOperation={(value) => {
|
|
|
|
+ for (let i of Object.keys(value)) {
|
|
|
|
+ if (i === 'sort' || i === 'pageNo' || i === 'pageSize') {
|
|
delete value[i]
|
|
delete value[i]
|
|
}
|
|
}
|
|
- if(i === 'startSign'){
|
|
|
|
|
|
+ if (i === 'startSign') {
|
|
value['contractStart'] = value['startSign']
|
|
value['contractStart'] = value['startSign']
|
|
}
|
|
}
|
|
- if(i === 'endSign'){
|
|
|
|
|
|
+ if (i === 'endSign') {
|
|
value['contractEnd'] = value['endSign']
|
|
value['contractEnd'] = value['endSign']
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- this.setState({searchConfig:value})}
|
|
|
|
|
|
+ this.setState({ searchConfig: value })
|
|
|
|
+ }
|
|
}
|
|
}
|
|
exportApi={'/api/admin/newOrder/provinceStatisticsListExprot'}
|
|
exportApi={'/api/admin/newOrder/provinceStatisticsListExprot'}
|
|
query={{
|
|
query={{
|
|
- province:this.props.recordInfor.id,
|
|
|
|
|
|
+ province: this.props.recordInfor.id,
|
|
}}
|
|
}}
|
|
- dataProcessing={(data)=>{
|
|
|
|
|
|
+ dataProcessing={(data) => {
|
|
let theArr = [];
|
|
let theArr = [];
|
|
for (let i = 0; i < data.data.length; i++) {
|
|
for (let i = 0; i < data.data.length; i++) {
|
|
let thisdata = data.data[i];
|
|
let thisdata = data.data[i];
|
|
// thisdata.key=(data.data.pageNo - 1) * data.data.pageSize + i + 1;
|
|
// thisdata.key=(data.data.pageNo - 1) * data.data.pageSize + i + 1;
|
|
- thisdata.key=i + 1;
|
|
|
|
|
|
+ thisdata.key = i + 1;
|
|
theArr.push(thisdata);
|
|
theArr.push(thisdata);
|
|
}
|
|
}
|
|
return theArr;
|
|
return theArr;
|
|
@@ -346,15 +347,15 @@ class DetailedList extends Component{
|
|
{this.state.visible1 && <Modal
|
|
{this.state.visible1 && <Modal
|
|
maskClosable={false}
|
|
maskClosable={false}
|
|
visible={this.state.visible1}
|
|
visible={this.state.visible1}
|
|
- onOk={()=>{
|
|
|
|
|
|
+ onOk={() => {
|
|
this.setState({
|
|
this.setState({
|
|
- visible1:false
|
|
|
|
|
|
+ visible1: false
|
|
})
|
|
})
|
|
}}
|
|
}}
|
|
- onCancel={()=>{
|
|
|
|
|
|
+ onCancel={() => {
|
|
// console.log(this.state.searchConfig,'this.state.searchConfig')
|
|
// console.log(this.state.searchConfig,'this.state.searchConfig')
|
|
this.setState({
|
|
this.setState({
|
|
- visible1:false
|
|
|
|
|
|
+ visible1: false
|
|
})
|
|
})
|
|
}}
|
|
}}
|
|
width='1600px'
|
|
width='1600px'
|
|
@@ -369,14 +370,14 @@ class DetailedList extends Component{
|
|
tabelApi={'/api/admin/newOrder/orderNewList'}
|
|
tabelApi={'/api/admin/newOrder/orderNewList'}
|
|
exportApi={false}
|
|
exportApi={false}
|
|
query={{
|
|
query={{
|
|
- specially:7,
|
|
|
|
- aid:this.state.aid
|
|
|
|
|
|
+ specially: 7,
|
|
|
|
+ aid: this.state.aid
|
|
}}
|
|
}}
|
|
- dataProcessing={(data)=>{
|
|
|
|
|
|
+ dataProcessing={(data) => {
|
|
let theArr = [];
|
|
let theArr = [];
|
|
for (let i = 0; i < data.data.list.length; i++) {
|
|
for (let i = 0; i < data.data.list.length; i++) {
|
|
let thisdata = data.data.list[i];
|
|
let thisdata = data.data.list[i];
|
|
- thisdata.key=(data.data.pageNo - 1) * data.data.pageSize + i + 1;
|
|
|
|
|
|
+ thisdata.key = (data.data.pageNo - 1) * data.data.pageSize + i + 1;
|
|
theArr.push(thisdata);
|
|
theArr.push(thisdata);
|
|
}
|
|
}
|
|
return theArr;
|
|
return theArr;
|