|
@@ -35,13 +35,14 @@ import ShowModalDiv from "@/showModal.jsx";
|
|
|
import ResolutionDetail from "@/resolutionDetail";
|
|
|
import OrderRiZi from "@/orderRiZi.jsx";
|
|
|
import ImgList from "../../../common/imgList";
|
|
|
-import {ChooseList} from "./chooseList";
|
|
|
-import {getProjectName} from "../../../tools";
|
|
|
+import { ChooseList } from "./chooseList";
|
|
|
+import { getProjectName } from "../../../tools";
|
|
|
import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
|
|
|
import OrderItemStatus from "../../../common/orderItemStatus";
|
|
|
import EnterpriseNameChange from "../../../common/enterpriseNameChange";
|
|
|
import OrderCoor from "./changeComponent/orderCoor";
|
|
|
import ContentUrl from "./contentUrl";
|
|
|
+import { salesList } from "@/dataDic.js";
|
|
|
const confirm = Modal.confirm;
|
|
|
const { Option } = Select;
|
|
|
//图片组件
|
|
@@ -108,7 +109,7 @@ const PicturesWall = React.createClass({
|
|
|
onCancel={this.handleCancel}
|
|
|
>
|
|
|
<img alt="example" style={{ width: "100%" }} src={previewImage} />
|
|
|
- </Modal> : <div/>}
|
|
|
+ </Modal> : <div />}
|
|
|
</div>
|
|
|
);
|
|
|
}
|
|
@@ -153,6 +154,7 @@ const IntentionCustomer = Form.create()(
|
|
|
theArr.push({
|
|
|
key: i,
|
|
|
id: thisdata.id, //用户ID
|
|
|
+ salesType: thisdata.salesType, //销售类型
|
|
|
orderNo: thisdata.orderNo, //订单编号
|
|
|
totalAmount: thisdata.totalAmount, //签单金额
|
|
|
processStatus: thisdata.processStatus, //流程状态
|
|
@@ -203,7 +205,7 @@ const IntentionCustomer = Form.create()(
|
|
|
approvalSearch: undefined,
|
|
|
processStatusSearch: undefined,
|
|
|
aloading: false,
|
|
|
- orderNos:'',
|
|
|
+ orderNos: '',
|
|
|
pagination: {
|
|
|
defaultCurrent: 1,
|
|
|
defaultPageSize: 10,
|
|
@@ -218,6 +220,22 @@ const IntentionCustomer = Form.create()(
|
|
|
},
|
|
|
columns: [
|
|
|
{
|
|
|
+ title: "销售类型",
|
|
|
+ dataIndex: "salesType",
|
|
|
+ key: "salesType",
|
|
|
+ render: (text, record) => {
|
|
|
+ return (
|
|
|
+ <Tooltip
|
|
|
+ title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? "," + record.other : "")}
|
|
|
+ >
|
|
|
+ <span>
|
|
|
+ {salesList[text]}
|
|
|
+ </span>
|
|
|
+ </Tooltip>
|
|
|
+ );
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
title: "订单编号",
|
|
|
dataIndex: "orderNo",
|
|
|
key: "orderNo",
|
|
@@ -238,14 +256,14 @@ const IntentionCustomer = Form.create()(
|
|
|
key: "userName",
|
|
|
render: (text) => {
|
|
|
return (
|
|
|
- <Tooltip title={text}>
|
|
|
- <div style={{
|
|
|
- maxWidth:'150px',
|
|
|
- overflow:'hidden',
|
|
|
- textOverflow: "ellipsis",
|
|
|
- whiteSpace:'nowrap',
|
|
|
- }}>{text}</div>
|
|
|
- </Tooltip>
|
|
|
+ <Tooltip title={text}>
|
|
|
+ <div style={{
|
|
|
+ maxWidth: '150px',
|
|
|
+ overflow: 'hidden',
|
|
|
+ textOverflow: "ellipsis",
|
|
|
+ whiteSpace: 'nowrap',
|
|
|
+ }}>{text}</div>
|
|
|
+ </Tooltip>
|
|
|
)
|
|
|
},
|
|
|
},
|
|
@@ -421,7 +439,7 @@ const IntentionCustomer = Form.create()(
|
|
|
title: "催款科目",
|
|
|
dataIndex: "dunTypeName",
|
|
|
key: "dunTypeName",
|
|
|
- render: (text,record) => {
|
|
|
+ render: (text, record) => {
|
|
|
if (record.customizeName) {
|
|
|
return text + record.customizeName;
|
|
|
}
|
|
@@ -492,7 +510,7 @@ const IntentionCustomer = Form.create()(
|
|
|
},
|
|
|
{
|
|
|
title: "金额(万元)",
|
|
|
- dataIndex: "money",
|
|
|
+ visible订单详情dataIndex: "money",
|
|
|
key: "money",
|
|
|
},
|
|
|
{
|
|
@@ -516,7 +534,7 @@ const IntentionCustomer = Form.create()(
|
|
|
visible: true,
|
|
|
orderStatus: record.orderStatus,
|
|
|
id: record.id,
|
|
|
- orderNos:record.orderNo
|
|
|
+ orderNos: record.orderNo
|
|
|
});
|
|
|
this.xiangqing(record.orderNo);
|
|
|
this.xiangmu(record.orderNo);
|
|
@@ -531,7 +549,7 @@ const IntentionCustomer = Form.create()(
|
|
|
costReduction: record.costReduction,
|
|
|
officialCost: record.officialCost,
|
|
|
});
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
this.setState({
|
|
|
displayFees: "none",
|
|
|
});
|
|
@@ -545,7 +563,7 @@ const IntentionCustomer = Form.create()(
|
|
|
taskComment: record.taskComment, //备注
|
|
|
main: record.main.toString(), //是否为主要
|
|
|
addnextVisible: true,
|
|
|
- dataInfor:record,
|
|
|
+ dataInfor: record,
|
|
|
addState: 0,
|
|
|
});
|
|
|
},
|
|
@@ -577,6 +595,7 @@ const IntentionCustomer = Form.create()(
|
|
|
let thisdata = data.data;
|
|
|
this.setState({
|
|
|
orderUid: thisdata.uid,
|
|
|
+ salesType: thisdata.salesType, //销售类型
|
|
|
orderNo: thisdata.orderNo, //订单编号
|
|
|
contractNo: thisdata.contractNo, //合同编号
|
|
|
userName: thisdata.userName, //客户名称
|
|
@@ -594,24 +613,24 @@ const IntentionCustomer = Form.create()(
|
|
|
orderRemarks: thisdata.orderRemarks, //订单留言
|
|
|
orgCodeUrl: thisdata.contractPictureUrl
|
|
|
? splitUrl(
|
|
|
- thisdata.contractPictureUrl,
|
|
|
- ",",
|
|
|
- globalConfig.avatarHost + "/upload"
|
|
|
- )
|
|
|
+ thisdata.contractPictureUrl,
|
|
|
+ ",",
|
|
|
+ globalConfig.avatarHost + "/upload"
|
|
|
+ )
|
|
|
: [], //图片地址
|
|
|
replenishUrl: thisdata.agreementUrl
|
|
|
? splitUrl(
|
|
|
- thisdata.agreementUrl,
|
|
|
- ",",
|
|
|
- globalConfig.avatarHost + "/upload"
|
|
|
- )
|
|
|
+ thisdata.agreementUrl,
|
|
|
+ ",",
|
|
|
+ globalConfig.avatarHost + "/upload"
|
|
|
+ )
|
|
|
: [], //图片地址
|
|
|
- contentUrl:thisdata.serviceContent
|
|
|
+ contentUrl: thisdata.serviceContent
|
|
|
? splitUrl(
|
|
|
- thisdata.serviceContent,
|
|
|
- ",",
|
|
|
- globalConfig.avatarHost + "/upload"
|
|
|
- )
|
|
|
+ thisdata.serviceContent,
|
|
|
+ ",",
|
|
|
+ globalConfig.avatarHost + "/upload"
|
|
|
+ )
|
|
|
: [], //图片地址
|
|
|
salesmanName: thisdata.salesmanName, //营销员名称
|
|
|
salesmanMobile: thisdata.salesmanMobile, //营销员电话
|
|
@@ -623,7 +642,7 @@ const IntentionCustomer = Form.create()(
|
|
|
nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
|
|
|
depName: thisdata.depName,
|
|
|
outsource: thisdata.outsource == 0 ? "否" : "是",
|
|
|
- deleteSign:thisdata.deleteSign,
|
|
|
+ deleteSign: thisdata.deleteSign,
|
|
|
});
|
|
|
}
|
|
|
}.bind(this),
|
|
@@ -1030,27 +1049,27 @@ const IntentionCustomer = Form.create()(
|
|
|
remarks: thisdata.remarks,
|
|
|
attachmentUrl: thisdata.attachmentUrl
|
|
|
? splitUrl(
|
|
|
- thisdata.attachmentUrl,
|
|
|
- ",",
|
|
|
- globalConfig.avatarHost + "/upload",
|
|
|
- url
|
|
|
- )
|
|
|
+ thisdata.attachmentUrl,
|
|
|
+ ",",
|
|
|
+ globalConfig.avatarHost + "/upload",
|
|
|
+ url
|
|
|
+ )
|
|
|
: [],
|
|
|
fileUrl: thisdata.attachmentUrl
|
|
|
? splitUrl(
|
|
|
- thisdata.attachmentUrl,
|
|
|
- ",",
|
|
|
- globalConfig.avatarHost + "/upload",
|
|
|
- url
|
|
|
- )
|
|
|
+ thisdata.attachmentUrl,
|
|
|
+ ",",
|
|
|
+ globalConfig.avatarHost + "/upload",
|
|
|
+ url
|
|
|
+ )
|
|
|
: [],
|
|
|
pictureUrl: thisdata.pictureUrl
|
|
|
? splitUrl(
|
|
|
- thisdata.pictureUrl,
|
|
|
- ",",
|
|
|
- globalConfig.avatarHost + "/upload",
|
|
|
- url
|
|
|
- )
|
|
|
+ thisdata.pictureUrl,
|
|
|
+ ",",
|
|
|
+ globalConfig.avatarHost + "/upload",
|
|
|
+ url
|
|
|
+ )
|
|
|
: [], //图片地址
|
|
|
amount: thisdata.amount,
|
|
|
companyName: thisdata.companyName,
|
|
@@ -1244,7 +1263,7 @@ const IntentionCustomer = Form.create()(
|
|
|
onOk() {
|
|
|
fn();
|
|
|
},
|
|
|
- onCancel() {},
|
|
|
+ onCancel() { },
|
|
|
});
|
|
|
},
|
|
|
downImg() {
|
|
@@ -1415,24 +1434,24 @@ const IntentionCustomer = Form.create()(
|
|
|
<Option value="4">40万元以上</Option>
|
|
|
</Select>
|
|
|
<Select
|
|
|
- style={{ width: 150 }}
|
|
|
- placeholder="流程状态"
|
|
|
- value={this.state.processStatusSearch}
|
|
|
- onChange={e => {
|
|
|
- this.setState({
|
|
|
- processStatusSearch: e
|
|
|
- });
|
|
|
- }}
|
|
|
- >
|
|
|
- <Option value="">全部</Option>
|
|
|
- <Option value="0">已派营销员</Option>
|
|
|
- <Option value="1">已派营销员管理员</Option>
|
|
|
- <Option value="2">已派财务管理员</Option>
|
|
|
- <Option value="3">已派财务专员</Option>
|
|
|
- <Option value="4">已派咨询师管理员</Option>
|
|
|
- <Option value="5">已部分派咨询师经理</Option>
|
|
|
- <Option value="6">已部全部派咨询师经理</Option>
|
|
|
- </Select>
|
|
|
+ style={{ width: 150 }}
|
|
|
+ placeholder="流程状态"
|
|
|
+ value={this.state.processStatusSearch}
|
|
|
+ onChange={e => {
|
|
|
+ this.setState({
|
|
|
+ processStatusSearch: e
|
|
|
+ });
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ <Option value="">全部</Option>
|
|
|
+ <Option value="0">已派营销员</Option>
|
|
|
+ <Option value="1">已派营销员管理员</Option>
|
|
|
+ <Option value="2">已派财务管理员</Option>
|
|
|
+ <Option value="3">已派财务专员</Option>
|
|
|
+ <Option value="4">已派咨询师管理员</Option>
|
|
|
+ <Option value="5">已部分派咨询师经理</Option>
|
|
|
+ <Option value="6">已部全部派咨询师经理</Option>
|
|
|
+ </Select>
|
|
|
<span style={{ marginRight: "10px" }}>下单时间 :</span>
|
|
|
<RangePicker
|
|
|
value={[
|
|
@@ -1460,11 +1479,11 @@ const IntentionCustomer = Form.create()(
|
|
|
<TabPane tab="更改表格显示数据" key="2">
|
|
|
<div style={{ marginLeft: 10 }}>
|
|
|
<ChooseList
|
|
|
- columns={this.state.columns}
|
|
|
- changeFn={this.changeList}
|
|
|
- changeList={this.state.changeList}
|
|
|
- top={55}
|
|
|
- margin={11}
|
|
|
+ columns={this.state.columns}
|
|
|
+ changeFn={this.changeList}
|
|
|
+ changeList={this.state.changeList}
|
|
|
+ top={55}
|
|
|
+ margin={11}
|
|
|
/>
|
|
|
</div>
|
|
|
</TabPane>
|
|
@@ -1474,8 +1493,8 @@ const IntentionCustomer = Form.create()(
|
|
|
<Table
|
|
|
columns={
|
|
|
this.state.changeList
|
|
|
- ? this.state.changeList
|
|
|
- : this.state.columns
|
|
|
+ ? this.state.changeList
|
|
|
+ : this.state.columns
|
|
|
}
|
|
|
dataSource={this.state.dataSource}
|
|
|
pagination={this.state.pagination}
|
|
@@ -1503,8 +1522,8 @@ const IntentionCustomer = Form.create()(
|
|
|
>
|
|
|
<Spin spinning={this.state.loading}>
|
|
|
<div className="clearfix">
|
|
|
- <div style={{position:"absolute",top:'-30px',left:'92px',zIndex:10000}}>
|
|
|
- <OrderItemStatus deleteSign={this.state.deleteSign}/>
|
|
|
+ <div style={{ position: "absolute", top: '-30px', left: '92px', zIndex: 10000 }}>
|
|
|
+ <OrderItemStatus deleteSign={this.state.deleteSign} />
|
|
|
</div>
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -1527,9 +1546,12 @@ const IntentionCustomer = Form.create()(
|
|
|
>
|
|
|
<span>{this.state.userName}</span>
|
|
|
<EnterpriseNameChange
|
|
|
- type='journal'
|
|
|
- style={{ marginLeft: 10 }}
|
|
|
- enterpriseId={this.state.orderUid}/>
|
|
|
+ type='journal'
|
|
|
+ style={{ marginLeft: 10 }}
|
|
|
+ enterpriseId={this.state.orderUid} />
|
|
|
+ </FormItem>
|
|
|
+ <FormItem className="half-item" {...formItemLayout} label="销售类型">
|
|
|
+ <span>{salesList[this.state.salesType]}</span>
|
|
|
</FormItem>
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -1655,8 +1677,8 @@ const IntentionCustomer = Form.create()(
|
|
|
{/* });*/}
|
|
|
{/* }}*/}
|
|
|
{/*/>*/}
|
|
|
- <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
|
|
|
- {this.state.orgCodeUrl && this.state.visible ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
|
|
|
+ <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
|
|
|
+ {this.state.orgCodeUrl && this.state.visible ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
|
|
|
</div>
|
|
|
{this.state.previewVisible ? <Modal
|
|
|
maskClosable={false}
|
|
@@ -1710,7 +1732,7 @@ const IntentionCustomer = Form.create()(
|
|
|
>
|
|
|
下一张
|
|
|
</Button>
|
|
|
- </Modal> : <div/>}
|
|
|
+ </Modal> : <div />}
|
|
|
<Button
|
|
|
style={{
|
|
|
float: "right",
|
|
@@ -1738,8 +1760,8 @@ const IntentionCustomer = Form.create()(
|
|
|
{/* });*/}
|
|
|
{/* }}*/}
|
|
|
{/*/>*/}
|
|
|
- <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
|
|
|
- {this.state.replenishUrl && this.state.visible ? <ImgList domId={'examine1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> : <div/>}
|
|
|
+ <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
|
|
|
+ {this.state.replenishUrl && this.state.visible ? <ImgList domId={'examine1'} fileList={this.state.replenishUrl} ItemWidth={'96px'} /> : <div />}
|
|
|
</div>
|
|
|
{this.state.previewVisibles ? <Modal
|
|
|
maskClosable={false}
|
|
@@ -1793,15 +1815,15 @@ const IntentionCustomer = Form.create()(
|
|
|
>
|
|
|
下一张
|
|
|
</Button>
|
|
|
- </Modal> : <div/>}
|
|
|
+ </Modal> : <div />}
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
</div>
|
|
|
<ContentUrl
|
|
|
- processStatus={1}
|
|
|
- domId = {"examineContents"}
|
|
|
- contentUrl = {this.state.contentUrl}
|
|
|
- imgId = {"examineContentsImg"}
|
|
|
+ processStatus={1}
|
|
|
+ domId={"examineContents"}
|
|
|
+ contentUrl={this.state.contentUrl}
|
|
|
+ imgId={"examineContentsImg"}
|
|
|
/>
|
|
|
<div className="clearfix">
|
|
|
<FormItem
|
|
@@ -1872,7 +1894,7 @@ const IntentionCustomer = Form.create()(
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
{/* 协单人员 */}
|
|
|
- <OrderCoor orderNo={this.state.orderNos}/>
|
|
|
+ <OrderCoor orderNo={this.state.orderNos} />
|
|
|
<div>
|
|
|
<span
|
|
|
style={{ marginLeft: "50px", fontSize: "20px" }}
|
|
@@ -2163,7 +2185,7 @@ const IntentionCustomer = Form.create()(
|
|
|
</Spin>
|
|
|
</TabPane> */}
|
|
|
</Tabs>
|
|
|
- </Modal> : <div/>}
|
|
|
+ </Modal> : <div />}
|
|
|
{this.state.noVisible ? <Modal
|
|
|
maskClosable={false}
|
|
|
visible={this.state.noVisible}
|
|
@@ -2216,7 +2238,7 @@ const IntentionCustomer = Form.create()(
|
|
|
</div>
|
|
|
</Spin>
|
|
|
</Form>
|
|
|
- </Modal> : <div/>}
|
|
|
+ </Modal> : <div />}
|
|
|
{this.state.agreeVisible ? <Modal
|
|
|
maskClosable={false}
|
|
|
visible={this.state.agreeVisible}
|
|
@@ -2287,7 +2309,7 @@ const IntentionCustomer = Form.create()(
|
|
|
</div>
|
|
|
</Spin>
|
|
|
</Form>
|
|
|
- </Modal> : <div/>}
|
|
|
+ </Modal> : <div />}
|
|
|
{/* <Modal
|
|
|
visible={this.state.rizhivisible}
|
|
|
className="admin-desc-content"
|
|
@@ -2315,9 +2337,9 @@ const IntentionCustomer = Form.create()(
|
|
|
/>
|
|
|
</div>
|
|
|
{this.state.addnextVisible && <ProjectDetailsReadOnly
|
|
|
- infor={this.state.dataInfor}
|
|
|
- visible={this.state.addnextVisible}
|
|
|
- onCancel={this.nextCancel}
|
|
|
+ infor={this.state.dataInfor}
|
|
|
+ visible={this.state.addnextVisible}
|
|
|
+ onCancel={this.nextCancel}
|
|
|
/>}
|
|
|
</div>
|
|
|
);
|