|
@@ -1,7 +1,7 @@
|
|
|
import React from "react";
|
|
|
import $ from "jquery/src/ajax";
|
|
|
import "@/manageCenter/financialManage/distribute/public.less";
|
|
|
-import {Button, Form, Input, Select, Spin, Table, message, Modal, Tabs, Tag, Tooltip} from "antd";
|
|
|
+import { Button, Form, Input, Select, Spin, Table, message, Modal, Tabs, Tag, Tooltip } from "antd";
|
|
|
import Assign from "@/manageCenter/publicComponent/assign";
|
|
|
import ResolutionDetail from "@/resolutionDetail";
|
|
|
import OrderRiZi from "@/orderRiZi.jsx";
|
|
@@ -17,13 +17,13 @@ import {
|
|
|
} from "@/tools";
|
|
|
import ShowModalDiv from "@/showModal.jsx";
|
|
|
import ResolutionPro from "../task/resolutionPro";
|
|
|
-import {ChooseList} from "../../order/orderNew/chooseList";
|
|
|
+import { ChooseList } from "../../order/orderNew/chooseList";
|
|
|
import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
|
|
|
import OrderItemStatus from "../../../common/orderItemStatus";
|
|
|
import EnterpriseNameChange from "../../../common/enterpriseNameChange";
|
|
|
import OrderCoor from "../../order/orderNew/changeComponent/orderCoor";
|
|
|
const FormItem = Form.Item;
|
|
|
-const {TabPane} = Tabs
|
|
|
+const { TabPane } = Tabs
|
|
|
const OutsourceTaskAssignment = React.createClass({
|
|
|
loadData(pageNo) {
|
|
|
this.state.data = [];
|
|
@@ -77,6 +77,7 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
depName: thisdata.depName, //部门名称
|
|
|
splitStatus: thisdata.splitStatus, //拆分状态
|
|
|
splitList: thisdata.splitList,
|
|
|
+ patentTypeName: thisdata.patentTypeName,
|
|
|
});
|
|
|
}
|
|
|
}
|
|
@@ -133,14 +134,17 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
},
|
|
|
columns: [
|
|
|
{
|
|
|
- title: "任务编号",
|
|
|
+ title: "编号",
|
|
|
dataIndex: "id",
|
|
|
key: "id",
|
|
|
},
|
|
|
{
|
|
|
- title: "任务名称",
|
|
|
+ title: "项目名称",
|
|
|
dataIndex: "taskName",
|
|
|
key: "taskName",
|
|
|
+ render: (text, record) => {
|
|
|
+ return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title: "订单编号",
|
|
@@ -158,14 +162,14 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
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>
|
|
|
)
|
|
|
}
|
|
|
},
|
|
@@ -266,9 +270,9 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
key: "commodityName",
|
|
|
render: (text, record) => {
|
|
|
return (
|
|
|
- <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
|
|
|
+ <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
|
|
|
)
|
|
|
- }
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title: "项目类别",
|
|
@@ -415,10 +419,10 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
orderRemarks: thisdata.orderRemarks, //订单留言
|
|
|
orgCodeUrl: thisdata.contractPictureUrl
|
|
|
? splitUrl(
|
|
|
- thisdata.contractPictureUrl,
|
|
|
- ",",
|
|
|
- globalConfig.avatarHost + "/upload"
|
|
|
- )
|
|
|
+ thisdata.contractPictureUrl,
|
|
|
+ ",",
|
|
|
+ globalConfig.avatarHost + "/upload"
|
|
|
+ )
|
|
|
: [], //图片地址
|
|
|
salesmanName: thisdata.salesmanName, //营销员名称
|
|
|
salesmanMobile: thisdata.salesmanMobile, //营销员电话
|
|
@@ -429,7 +433,7 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
nowFinance: thisdata.nowFinance, //财务名称
|
|
|
nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
|
|
|
depName: thisdata.depName, //订单部门
|
|
|
- deleteSign:thisdata.deleteSign,
|
|
|
+ deleteSign: thisdata.deleteSign,
|
|
|
});
|
|
|
}
|
|
|
}.bind(this),
|
|
@@ -521,7 +525,7 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
costReduction: record.costReduction,
|
|
|
officialCost: record.officialCost,
|
|
|
});
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
this.setState({
|
|
|
displayFees: "none",
|
|
|
});
|
|
@@ -535,7 +539,7 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
taskComment: record.taskComment, //备注
|
|
|
main: record.main.toString(), //是否为主要
|
|
|
addnextVisible: true,
|
|
|
- dataInfor:record,
|
|
|
+ dataInfor: record,
|
|
|
addState: 0,
|
|
|
});
|
|
|
},
|
|
@@ -795,12 +799,12 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
isAddition: thisdata.additionalOrder ? true : false,
|
|
|
contractPictureUrl: thisdata.contractPictureUrl
|
|
|
? splitUrl(
|
|
|
- thisdata.contractPictureUrl,
|
|
|
- ",",
|
|
|
- globalConfig.avatarHost + "/upload"
|
|
|
- )
|
|
|
+ thisdata.contractPictureUrl,
|
|
|
+ ",",
|
|
|
+ globalConfig.avatarHost + "/upload"
|
|
|
+ )
|
|
|
: [],
|
|
|
- deleteSign:thisdata.deleteSign,
|
|
|
+ deleteSign: thisdata.deleteSign,
|
|
|
});
|
|
|
}
|
|
|
}.bind(this),
|
|
@@ -854,14 +858,14 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
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>
|
|
|
)
|
|
|
}
|
|
|
},
|
|
@@ -1033,7 +1037,7 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
<Button type="primary" onClick={this.search}>
|
|
|
搜索
|
|
|
</Button>
|
|
|
- <Button onClick={()=>{
|
|
|
+ <Button onClick={() => {
|
|
|
this.reset();
|
|
|
this.loadData();
|
|
|
}}>重置</Button>
|
|
@@ -1051,11 +1055,11 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
<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>
|
|
@@ -1065,8 +1069,8 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
<Table
|
|
|
columns={
|
|
|
this.state.changeList
|
|
|
- ? this.state.changeList
|
|
|
- : this.state.columns
|
|
|
+ ? this.state.changeList
|
|
|
+ : this.state.columns
|
|
|
}
|
|
|
dataSource={this.state.dataSource}
|
|
|
expandedRowRender={expandedRowRender}
|
|
@@ -1100,8 +1104,8 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
onCancel={this.visitCancel}
|
|
|
>
|
|
|
<Tabs activeKey={this.state.activeKey} onChange={this.orderChange} tabBarExtraContent={
|
|
|
- <div style={{fontWeight:'bold',paddingRight:'15px'}}>
|
|
|
- <OrderItemStatus deleteSign={this.state.deleteSign}/>
|
|
|
+ <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
|
|
|
+ <OrderItemStatus deleteSign={this.state.deleteSign} />
|
|
|
</div>
|
|
|
}>
|
|
|
<TabPane tab="任务详情" key="1">
|
|
@@ -1134,9 +1138,9 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
>
|
|
|
<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"
|
|
@@ -1325,7 +1329,7 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
visible={this.state.avisible}
|
|
|
loading={this.state.loading}
|
|
|
/>
|
|
|
- <OrderCoor orderNo={this.state.orderNo}/>
|
|
|
+ <OrderCoor orderNo={this.state.orderNo} />
|
|
|
<div>
|
|
|
<span style={{ marginLeft: "50px", fontSize: "20px" }}>
|
|
|
项目业务
|
|
@@ -1380,9 +1384,9 @@ const OutsourceTaskAssignment = React.createClass({
|
|
|
</Tabs>
|
|
|
</Modal>
|
|
|
{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>
|
|
|
);
|