|
@@ -42,12 +42,13 @@ import {
|
|
|
} from '@/tools'
|
|
|
import { ChooseList } from '../../../../component/manageCenter/order/orderNew/chooseList'
|
|
|
import ImgList from "../../../common/imgList";
|
|
|
-import {getProjectName} from "../../../tools";
|
|
|
+import { getProjectName } from "../../../tools";
|
|
|
import DepartmentList from "../../../common/departmentList";
|
|
|
import OrderItemStatus from "../../../common/orderItemStatus";
|
|
|
import EnterpriseNameChange from "../../../common/enterpriseNameChange";
|
|
|
import LogPopup from "../../../common/logPopup";
|
|
|
import ContentUrl from '../../order/orderNew/contentUrl'
|
|
|
+import { salesList } from "@/dataDic.js";
|
|
|
const FormItem = Form.Item
|
|
|
|
|
|
const approvedOutsourcing = React.createClass({
|
|
@@ -193,17 +194,17 @@ const approvedOutsourcing = React.createClass({
|
|
|
key: 'buyerName',
|
|
|
className: 'title-table',
|
|
|
fixed: 'left',
|
|
|
- width:100,
|
|
|
+ width: 100,
|
|
|
render: text => {
|
|
|
return (
|
|
|
- <Tooltip title={text}>
|
|
|
- <div style={{
|
|
|
- maxWidth:'100px',
|
|
|
- overflow:'hidden',
|
|
|
- textOverflow: "ellipsis",
|
|
|
- whiteSpace:'nowrap',
|
|
|
- }}>{text}</div>
|
|
|
- </Tooltip>
|
|
|
+ <Tooltip title={text}>
|
|
|
+ <div style={{
|
|
|
+ maxWidth: '100px',
|
|
|
+ overflow: 'hidden',
|
|
|
+ textOverflow: "ellipsis",
|
|
|
+ whiteSpace: 'nowrap',
|
|
|
+ }}>{text}</div>
|
|
|
+ </Tooltip>
|
|
|
)
|
|
|
}
|
|
|
},
|
|
@@ -397,20 +398,20 @@ const approvedOutsourcing = React.createClass({
|
|
|
recard.actuallyTotalAmount &&
|
|
|
Number(recard.actuallyTotalAmount) > 0
|
|
|
) && (
|
|
|
- <Button
|
|
|
- type="danger"
|
|
|
- style={{
|
|
|
- marginLeft: '5px',
|
|
|
- display:
|
|
|
- recard.processStatus == 3 ? 'inline-block' : 'none',
|
|
|
- }}
|
|
|
- onClick={(e) => {
|
|
|
- e.stopPropagation(), this.reject(recard)
|
|
|
- }}
|
|
|
- >
|
|
|
- 驳回
|
|
|
- </Button>
|
|
|
- )}
|
|
|
+ <Button
|
|
|
+ type="danger"
|
|
|
+ style={{
|
|
|
+ marginLeft: '5px',
|
|
|
+ display:
|
|
|
+ recard.processStatus == 3 ? 'inline-block' : 'none',
|
|
|
+ }}
|
|
|
+ onClick={(e) => {
|
|
|
+ e.stopPropagation(), this.reject(recard)
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ 驳回
|
|
|
+ </Button>
|
|
|
+ )}
|
|
|
{
|
|
|
// <Button
|
|
|
// type="primary"
|
|
@@ -448,17 +449,17 @@ const approvedOutsourcing = React.createClass({
|
|
|
title: '客户名称',
|
|
|
dataIndex: 'userName',
|
|
|
key: 'userName',
|
|
|
- width:100,
|
|
|
+ width: 100,
|
|
|
render: text => {
|
|
|
return (
|
|
|
- <Tooltip title={text}>
|
|
|
- <div style={{
|
|
|
- maxWidth:'100px',
|
|
|
- overflow:'hidden',
|
|
|
- textOverflow: "ellipsis",
|
|
|
- whiteSpace:'nowrap',
|
|
|
- }}>{text}</div>
|
|
|
- </Tooltip>
|
|
|
+ <Tooltip title={text}>
|
|
|
+ <div style={{
|
|
|
+ maxWidth: '100px',
|
|
|
+ overflow: 'hidden',
|
|
|
+ textOverflow: "ellipsis",
|
|
|
+ whiteSpace: 'nowrap',
|
|
|
+ }}>{text}</div>
|
|
|
+ </Tooltip>
|
|
|
)
|
|
|
}
|
|
|
},
|
|
@@ -564,17 +565,17 @@ const approvedOutsourcing = React.createClass({
|
|
|
title: '客户名称',
|
|
|
dataIndex: 'userName',
|
|
|
key: 'userName',
|
|
|
- width:100,
|
|
|
+ width: 100,
|
|
|
render: text => {
|
|
|
return (
|
|
|
- <Tooltip title={text}>
|
|
|
- <div style={{
|
|
|
- maxWidth:'100px',
|
|
|
- overflow:'hidden',
|
|
|
- textOverflow: "ellipsis",
|
|
|
- whiteSpace:'nowrap',
|
|
|
- }}>{text}</div>
|
|
|
- </Tooltip>
|
|
|
+ <Tooltip title={text}>
|
|
|
+ <div style={{
|
|
|
+ maxWidth: '100px',
|
|
|
+ overflow: 'hidden',
|
|
|
+ textOverflow: "ellipsis",
|
|
|
+ whiteSpace: 'nowrap',
|
|
|
+ }}>{text}</div>
|
|
|
+ </Tooltip>
|
|
|
)
|
|
|
}
|
|
|
},
|
|
@@ -677,17 +678,17 @@ const approvedOutsourcing = React.createClass({
|
|
|
title: '客户名称',
|
|
|
dataIndex: 'userName',
|
|
|
key: 'userName',
|
|
|
- width:100,
|
|
|
+ width: 100,
|
|
|
render: text => {
|
|
|
return (
|
|
|
- <Tooltip title={text}>
|
|
|
- <div style={{
|
|
|
- maxWidth:'100px',
|
|
|
- overflow:'hidden',
|
|
|
- textOverflow: "ellipsis",
|
|
|
- whiteSpace:'nowrap',
|
|
|
- }}>{text}</div>
|
|
|
- </Tooltip>
|
|
|
+ <Tooltip title={text}>
|
|
|
+ <div style={{
|
|
|
+ maxWidth: '100px',
|
|
|
+ overflow: 'hidden',
|
|
|
+ textOverflow: "ellipsis",
|
|
|
+ whiteSpace: 'nowrap',
|
|
|
+ }}>{text}</div>
|
|
|
+ </Tooltip>
|
|
|
)
|
|
|
}
|
|
|
},
|
|
@@ -890,17 +891,17 @@ const approvedOutsourcing = React.createClass({
|
|
|
title: '客户名称',
|
|
|
dataIndex: 'userName',
|
|
|
key: 'userName',
|
|
|
- width:100,
|
|
|
+ width: 100,
|
|
|
render: text => {
|
|
|
return (
|
|
|
- <Tooltip title={text}>
|
|
|
- <div style={{
|
|
|
- maxWidth:'100px',
|
|
|
- overflow:'hidden',
|
|
|
- textOverflow: "ellipsis",
|
|
|
- whiteSpace:'nowrap',
|
|
|
- }}>{text}</div>
|
|
|
- </Tooltip>
|
|
|
+ <Tooltip title={text}>
|
|
|
+ <div style={{
|
|
|
+ maxWidth: '100px',
|
|
|
+ overflow: 'hidden',
|
|
|
+ textOverflow: "ellipsis",
|
|
|
+ whiteSpace: 'nowrap',
|
|
|
+ }}>{text}</div>
|
|
|
+ </Tooltip>
|
|
|
)
|
|
|
}
|
|
|
},
|
|
@@ -1234,10 +1235,10 @@ const approvedOutsourcing = React.createClass({
|
|
|
return test[0] === null
|
|
|
? ''
|
|
|
: getprovince(test[0]) +
|
|
|
- '/' +
|
|
|
- getprovince(test[1]) +
|
|
|
- '/' +
|
|
|
- getprovince(test[2])
|
|
|
+ '/' +
|
|
|
+ getprovince(test[1]) +
|
|
|
+ '/' +
|
|
|
+ getprovince(test[2])
|
|
|
},
|
|
|
},
|
|
|
{
|
|
@@ -1290,17 +1291,17 @@ const approvedOutsourcing = React.createClass({
|
|
|
title: '客户名称',
|
|
|
dataIndex: 'buyerName',
|
|
|
key: 'buyerName',
|
|
|
- width:100,
|
|
|
+ width: 100,
|
|
|
render: text => {
|
|
|
return (
|
|
|
- <Tooltip title={text}>
|
|
|
- <div style={{
|
|
|
- maxWidth:'100px',
|
|
|
- overflow:'hidden',
|
|
|
- textOverflow: "ellipsis",
|
|
|
- whiteSpace:'nowrap',
|
|
|
- }}>{text}</div>
|
|
|
- </Tooltip>
|
|
|
+ <Tooltip title={text}>
|
|
|
+ <div style={{
|
|
|
+ maxWidth: '100px',
|
|
|
+ overflow: 'hidden',
|
|
|
+ textOverflow: "ellipsis",
|
|
|
+ whiteSpace: 'nowrap',
|
|
|
+ }}>{text}</div>
|
|
|
+ </Tooltip>
|
|
|
)
|
|
|
}
|
|
|
},
|
|
@@ -1677,17 +1678,17 @@ const approvedOutsourcing = React.createClass({
|
|
|
remarks: thisdata.remarks,
|
|
|
attachmentUrl: thisdata.attachmentUrl
|
|
|
? splitUrl(
|
|
|
- thisdata.attachmentUrl,
|
|
|
- ',',
|
|
|
- globalConfig.avatarHost + '/upload'
|
|
|
- )
|
|
|
+ thisdata.attachmentUrl,
|
|
|
+ ',',
|
|
|
+ globalConfig.avatarHost + '/upload'
|
|
|
+ )
|
|
|
: [],
|
|
|
pictureUrl: thisdata.pictureUrl
|
|
|
? splitUrl(
|
|
|
- thisdata.pictureUrl,
|
|
|
- ',',
|
|
|
- globalConfig.avatarHost + '/upload'
|
|
|
- )
|
|
|
+ thisdata.pictureUrl,
|
|
|
+ ',',
|
|
|
+ globalConfig.avatarHost + '/upload'
|
|
|
+ )
|
|
|
: [], //图片地址
|
|
|
amount: thisdata.amount,
|
|
|
companyName: thisdata.companyName,
|
|
@@ -1770,7 +1771,7 @@ const approvedOutsourcing = React.createClass({
|
|
|
{
|
|
|
dataSourceW: theArr,
|
|
|
},
|
|
|
- () => {}
|
|
|
+ () => { }
|
|
|
)
|
|
|
}.bind(this),
|
|
|
}).always(
|
|
@@ -1864,29 +1865,29 @@ const approvedOutsourcing = React.createClass({
|
|
|
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"
|
|
|
+ )
|
|
|
: [], //图片地址
|
|
|
orderNo: thisData.orderNo, //订单编号
|
|
|
buyerId: thisData.buyerId,
|
|
|
depName: thisData.depName,
|
|
|
- deleteSign:thisData.deleteSign,
|
|
|
+ deleteSign: thisData.deleteSign,
|
|
|
})
|
|
|
}.bind(this),
|
|
|
}).always(
|
|
@@ -2117,7 +2118,7 @@ const approvedOutsourcing = React.createClass({
|
|
|
createTime: thisdata.createTime, //流程状态
|
|
|
status: thisdata.status, //结算状态
|
|
|
rejectReason: thisdata.rejectReason,
|
|
|
- approval:thisdata.approval,//0非特批 1待审核 2审核通过
|
|
|
+ approval: thisdata.approval,//0非特批 1待审核 2审核通过
|
|
|
})
|
|
|
}
|
|
|
}
|
|
@@ -2185,8 +2186,8 @@ const approvedOutsourcing = React.createClass({
|
|
|
thisdata.type == 0
|
|
|
? '手工'
|
|
|
: thisdata.type == 1
|
|
|
- ? '批量'
|
|
|
- : '合同变更退款',
|
|
|
+ ? '批量'
|
|
|
+ : '合同变更退款',
|
|
|
deleteSign: thisdata.deleteSign,
|
|
|
deleteTimes: thisdata.deleteTimes,
|
|
|
refundTimes: thisdata.refundTimes,
|
|
@@ -2801,10 +2802,10 @@ const approvedOutsourcing = React.createClass({
|
|
|
recipientAddress: thisdata.recipientAddress,
|
|
|
orgCodeUrl: thisdata.voucherUrl
|
|
|
? splitUrl(
|
|
|
- thisdata.voucherUrl,
|
|
|
- ',',
|
|
|
- globalConfig.avatarHost + '/upload'
|
|
|
- )
|
|
|
+ thisdata.voucherUrl,
|
|
|
+ ',',
|
|
|
+ globalConfig.avatarHost + '/upload'
|
|
|
+ )
|
|
|
: [],
|
|
|
}
|
|
|
this.setState({
|
|
@@ -2886,10 +2887,10 @@ const approvedOutsourcing = React.createClass({
|
|
|
}}
|
|
|
/>
|
|
|
<DepartmentList
|
|
|
- value={this.state.departmenttList}
|
|
|
- onChange={e => {
|
|
|
- this.setState({ departmenttList: e });
|
|
|
- }}/>
|
|
|
+ value={this.state.departmenttList}
|
|
|
+ onChange={e => {
|
|
|
+ this.setState({ departmenttList: e });
|
|
|
+ }} />
|
|
|
<Input
|
|
|
placeholder="合同编号"
|
|
|
value={this.state.contractNoSearch}
|
|
@@ -3214,9 +3215,8 @@ const approvedOutsourcing = React.createClass({
|
|
|
}
|
|
|
{
|
|
|
<span>
|
|
|
- {`合同额总计(万元):${
|
|
|
- this.state.totalHui ? this.state.totalHui : '0'
|
|
|
- }`}
|
|
|
+ {`合同额总计(万元):${this.state.totalHui ? this.state.totalHui : '0'
|
|
|
+ }`}
|
|
|
</span>
|
|
|
}
|
|
|
</p>
|
|
@@ -3235,8 +3235,8 @@ const approvedOutsourcing = React.createClass({
|
|
|
type="card"
|
|
|
activeKey={this.state.modKey}
|
|
|
tabBarExtraContent={
|
|
|
- <div style={{fontWeight:'bold',paddingRight:'15px'}}>
|
|
|
- <OrderItemStatus deleteSign={this.state.deleteSign}/>
|
|
|
+ <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
|
|
|
+ <OrderItemStatus deleteSign={this.state.deleteSign} />
|
|
|
</div>
|
|
|
}
|
|
|
>
|
|
@@ -3265,9 +3265,27 @@ const approvedOutsourcing = React.createClass({
|
|
|
>
|
|
|
<span>{theData.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>
|
|
|
+ {(["私有客户-", "签单客户-"][theData.userType] || " ") +
|
|
|
+ (salesList[theData.salesType] || "")}
|
|
|
+ {
|
|
|
+ theData.other != null && theData.other != "" &&
|
|
|
+ <Tooltip title={theData.other}>
|
|
|
+ <span>
|
|
|
+ {"(" + theData.other.toString().slice(0, 10) + (theData.other.toString().length > 9 ? "...)" : ")")}
|
|
|
+ </span>
|
|
|
+ </Tooltip>
|
|
|
+ }
|
|
|
+ </span>
|
|
|
</FormItem>
|
|
|
<FormItem
|
|
|
className="half-item"
|
|
@@ -3341,9 +3359,9 @@ const approvedOutsourcing = React.createClass({
|
|
|
{/* })*/}
|
|
|
{/* }}*/}
|
|
|
{/*/>*/}
|
|
|
- {this.state.visible && this.state.modKey === "1" && this.state.orgCodeUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
|
|
|
- <ImgList fileList={this.state.orgCodeUrl} domId={'approvedOutsourcing1'}/>
|
|
|
- </div>: <div/>}
|
|
|
+ {this.state.visible && this.state.modKey === "1" && this.state.orgCodeUrl ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
|
|
|
+ <ImgList fileList={this.state.orgCodeUrl} domId={'approvedOutsourcing1'} />
|
|
|
+ </div> : <div />}
|
|
|
<Modal
|
|
|
maskClosable={false}
|
|
|
footer={null}
|
|
@@ -3424,9 +3442,9 @@ const approvedOutsourcing = React.createClass({
|
|
|
{/* })*/}
|
|
|
{/* }}*/}
|
|
|
{/*/>*/}
|
|
|
- {this.state.visible && this.state.modKey === "1" && this.state.replenishUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
|
|
|
- <ImgList fileList={this.state.replenishUrl} domId={'approvedOutsourcing2'}/>
|
|
|
- </div>: <div/>}
|
|
|
+ {this.state.visible && this.state.modKey === "1" && this.state.replenishUrl ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
|
|
|
+ <ImgList fileList={this.state.replenishUrl} domId={'approvedOutsourcing2'} />
|
|
|
+ </div> : <div />}
|
|
|
<Modal
|
|
|
maskClosable={false}
|
|
|
footer={null}
|
|
@@ -3483,10 +3501,10 @@ const approvedOutsourcing = React.createClass({
|
|
|
</FormItem>
|
|
|
</div>
|
|
|
<ContentUrl
|
|
|
- processStatus={1}
|
|
|
- domId = {"sourcingContents"}
|
|
|
- contentUrl = {this.state.contentUrl}
|
|
|
- imgId = {"sourcingContentsImg"}
|
|
|
+ processStatus={1}
|
|
|
+ domId={"sourcingContents"}
|
|
|
+ contentUrl={this.state.contentUrl}
|
|
|
+ imgId={"sourcingContentsImg"}
|
|
|
/>
|
|
|
<div className="clearfix">
|
|
|
<FormItem
|
|
@@ -3672,7 +3690,7 @@ const approvedOutsourcing = React.createClass({
|
|
|
</Spin>
|
|
|
</div>
|
|
|
</Spin>
|
|
|
- </Form> : <div/>}
|
|
|
+ </Form> : <div />}
|
|
|
</TabPane>
|
|
|
<TabPane tab="外包详情" key="2">
|
|
|
<div className="clearfix">
|
|
@@ -3780,9 +3798,9 @@ const approvedOutsourcing = React.createClass({
|
|
|
{/* })*/}
|
|
|
{/* }}*/}
|
|
|
{/*/>*/}
|
|
|
- {this.state.visible && this.state.modKey === "3" && this.state.pictureUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
|
|
|
- <ImgList fileList={this.state.pictureUrl} domId={'approvedOutsourcing3'}/>
|
|
|
- </div>: <div/>}
|
|
|
+ {this.state.visible && this.state.modKey === "3" && this.state.pictureUrl ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
|
|
|
+ <ImgList fileList={this.state.pictureUrl} domId={'approvedOutsourcing3'} />
|
|
|
+ </div> : <div />}
|
|
|
<Modal
|
|
|
maskClosable={false}
|
|
|
footer={null}
|
|
@@ -3870,7 +3888,7 @@ const approvedOutsourcing = React.createClass({
|
|
|
</div>
|
|
|
</TabPane>
|
|
|
</Tabs>
|
|
|
- </Modal> : <div/>}
|
|
|
+ </Modal> : <div />}
|
|
|
</div>
|
|
|
<div className="patent-desc">
|
|
|
<Modal
|