|
@@ -239,6 +239,8 @@ const Task = React.createClass({
|
|
|
searchMore: true,
|
|
|
assignVisible: false,
|
|
|
releaseDate: [],
|
|
|
+ patentType: -1,
|
|
|
+ patentNameType: 0,
|
|
|
startType: 0, //外包供应商类型
|
|
|
// 判断是否是退回给咨询师经理
|
|
|
flag: false,
|
|
@@ -946,7 +948,99 @@ const Task = React.createClass({
|
|
|
)
|
|
|
},
|
|
|
},
|
|
|
- ]
|
|
|
+ ],
|
|
|
+ //付款节点表头
|
|
|
+ PayNodeTableColunms: [
|
|
|
+ {
|
|
|
+ title: '供应商名称',
|
|
|
+ dataIndex: 'companyName',
|
|
|
+ key: 'companyName',
|
|
|
+ render: (text, record, index) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '付款科目',
|
|
|
+ dataIndex: 'dunType',
|
|
|
+ key: 'dunType',
|
|
|
+ render: (text, record) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '付款时间',
|
|
|
+ dataIndex: 'partyTimes',
|
|
|
+ key: 'partyTimes',
|
|
|
+ render: (text, record) => {
|
|
|
+ return <span>{text ? text : '/'}</span>
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '数量',
|
|
|
+ dataIndex: 'quantity',
|
|
|
+ key: 'quantity',
|
|
|
+ render: (text, record) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '总价',
|
|
|
+ dataIndex: 'totalAmount',
|
|
|
+ key: 'totalAmount',
|
|
|
+ render: (text, record) => {
|
|
|
+ return <span>{text}</span>
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '已付',
|
|
|
+ dataIndex: 'partyAmount',
|
|
|
+ key: 'partyAmount',
|
|
|
+ render: (text, record) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '操作',
|
|
|
+ dataIndex: 'dels',
|
|
|
+ key: 'dels',
|
|
|
+ render: (text, record, index) => {
|
|
|
+ return (
|
|
|
+ <div>
|
|
|
+ <Popconfirm
|
|
|
+ title="是否删除?"
|
|
|
+ onConfirm={() => {
|
|
|
+ this.payNodeConfirmDeletNew(record)
|
|
|
+ }}
|
|
|
+ okText="删除"
|
|
|
+ cancelText="不删除"
|
|
|
+ >
|
|
|
+ <Button
|
|
|
+ onClick={(e) => {
|
|
|
+ e.stopPropagation()
|
|
|
+ }}
|
|
|
+ style={{
|
|
|
+ marginRight: '10px',
|
|
|
+ color: '#ffffff',
|
|
|
+ background: '#f00',
|
|
|
+ border: 'none',
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ 删除
|
|
|
+ </Button>
|
|
|
+ </Popconfirm>
|
|
|
+ </div>
|
|
|
+ )
|
|
|
+ },
|
|
|
+ },
|
|
|
+ ],
|
|
|
})
|
|
|
}else if(projectType === 2){ //2软著
|
|
|
this.setState({
|
|
@@ -1055,11 +1149,9 @@ const Task = React.createClass({
|
|
|
)
|
|
|
},
|
|
|
},
|
|
|
- ]
|
|
|
- })
|
|
|
- }else if(projectType === 1){ //1专利
|
|
|
- this.setState({
|
|
|
- ContactsListsNew: [
|
|
|
+ ],
|
|
|
+ //付款节点表头
|
|
|
+ PayNodeTableColunms: [
|
|
|
{
|
|
|
title: '供应商名称',
|
|
|
dataIndex: 'companyName',
|
|
@@ -1071,9 +1163,9 @@ const Task = React.createClass({
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
- title: '单价(万元)',
|
|
|
- dataIndex: 'unitPrice',
|
|
|
- key: 'unitPrice',
|
|
|
+ title: '付款科目',
|
|
|
+ dataIndex: 'dunType',
|
|
|
+ key: 'dunType',
|
|
|
render: (text, record) => {
|
|
|
if (text) {
|
|
|
return <span>{text}</span>
|
|
@@ -1081,6 +1173,14 @@ const Task = React.createClass({
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
+ title: '付款时间',
|
|
|
+ dataIndex: 'partyTimes',
|
|
|
+ key: 'partyTimes',
|
|
|
+ render: (text, record) => {
|
|
|
+ return <span>{text ? text : '/'}</span>
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
title: '数量',
|
|
|
dataIndex: 'quantity',
|
|
|
key: 'quantity',
|
|
@@ -1091,46 +1191,34 @@ const Task = React.createClass({
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
- title: '总价(万元)',
|
|
|
+ title: '总价',
|
|
|
dataIndex: 'totalAmount',
|
|
|
key: 'totalAmount',
|
|
|
render: (text, record) => {
|
|
|
+ return <span>***</span>
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '已付',
|
|
|
+ dataIndex: 'partyAmount',
|
|
|
+ key: 'partyAmount',
|
|
|
+ render: (text, record) => {
|
|
|
if (text) {
|
|
|
return <span>{text}</span>
|
|
|
}
|
|
|
},
|
|
|
},
|
|
|
{
|
|
|
- title: '备注',
|
|
|
- dataIndex: 'remarks',
|
|
|
- key: 'remarks',
|
|
|
- },
|
|
|
- {
|
|
|
title: '操作',
|
|
|
- dataIndex: 'action',
|
|
|
- key: 'action',
|
|
|
- render: (text, record) => {
|
|
|
+ dataIndex: 'dels',
|
|
|
+ key: 'dels',
|
|
|
+ render: (text, record, index) => {
|
|
|
return (
|
|
|
<div>
|
|
|
- {/*外包审核通过后,咨询师/咨询经理可申请付款*/}
|
|
|
- {/*存在支付节点时不显示第三方的申请付款*/}
|
|
|
- {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
|
|
|
- {
|
|
|
- <Button disabled={
|
|
|
- !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
|
|
|
- } type="primary" onClick={() => {
|
|
|
- this.setState({
|
|
|
- previewPayVisible: true,
|
|
|
- previewPayInfor: record,
|
|
|
- })
|
|
|
- }}>
|
|
|
- 申请付款
|
|
|
- </Button>
|
|
|
- }
|
|
|
<Popconfirm
|
|
|
title="是否删除?"
|
|
|
onConfirm={() => {
|
|
|
- this.confirmDeletNew(record)
|
|
|
+ this.payNodeConfirmDeletNew(record)
|
|
|
}}
|
|
|
okText="删除"
|
|
|
cancelText="不删除"
|
|
@@ -1140,7 +1228,7 @@ const Task = React.createClass({
|
|
|
e.stopPropagation()
|
|
|
}}
|
|
|
style={{
|
|
|
- marginLeft: '10px',
|
|
|
+ marginRight: '10px',
|
|
|
color: '#ffffff',
|
|
|
background: '#f00',
|
|
|
border: 'none',
|
|
@@ -1153,8 +1241,239 @@ const Task = React.createClass({
|
|
|
)
|
|
|
},
|
|
|
},
|
|
|
- ]
|
|
|
+ ],
|
|
|
})
|
|
|
+ }else if(projectType === 1){ //1专利
|
|
|
+ console.log(this.state.patentType,'asjdlkasjdlajsldjasldjlasjl')
|
|
|
+ if(this.state.patentType === 0){ //专利申请
|
|
|
+ this.setState({
|
|
|
+ ContactsListsNew: [
|
|
|
+ {
|
|
|
+ title: '供应商名称',
|
|
|
+ dataIndex: 'companyName',
|
|
|
+ key: 'companyName',
|
|
|
+ render: (text, record, index) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '单价(万元)',
|
|
|
+ dataIndex: 'unitPrice',
|
|
|
+ key: 'unitPrice',
|
|
|
+ render: (text, record) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '数量',
|
|
|
+ dataIndex: 'quantity',
|
|
|
+ key: 'quantity',
|
|
|
+ render: (text, record) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "官费",
|
|
|
+ dataIndex: "officialCost",
|
|
|
+ key: "officialCost",
|
|
|
+ render: (text) => {
|
|
|
+ return text === 1 ? '含官费' : '不含官费'
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "费减",
|
|
|
+ dataIndex: "costReduction",
|
|
|
+ key: "costReduction",
|
|
|
+ render: (text) => {
|
|
|
+ return text === 1 ? '有费减' : '无费减'
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '总价(万元)',
|
|
|
+ dataIndex: 'totalAmount',
|
|
|
+ key: 'totalAmount',
|
|
|
+ render: (text, record) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '备注',
|
|
|
+ dataIndex: 'remarks',
|
|
|
+ key: 'remarks',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '操作',
|
|
|
+ dataIndex: 'action',
|
|
|
+ key: 'action',
|
|
|
+ render: (text, record) => {
|
|
|
+ return (
|
|
|
+ <div>
|
|
|
+ {/*外包审核通过后,咨询师/咨询经理可申请付款*/}
|
|
|
+ {/*存在支付节点时不显示第三方的申请付款*/}
|
|
|
+ {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
|
|
|
+ {
|
|
|
+ <Button disabled={
|
|
|
+ !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
|
|
|
+ } type="primary" onClick={() => {
|
|
|
+ this.setState({
|
|
|
+ previewPayVisible: true,
|
|
|
+ previewPayInfor: record,
|
|
|
+ })
|
|
|
+ }}>
|
|
|
+ 申请付款
|
|
|
+ </Button>
|
|
|
+ }
|
|
|
+ {
|
|
|
+ <Button
|
|
|
+ type="primary"
|
|
|
+ style={{
|
|
|
+ marginLeft: '10px',
|
|
|
+ }}
|
|
|
+ disabled={!(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)}
|
|
|
+ onClick={() => {
|
|
|
+ this.setState({
|
|
|
+ previewPayVisible: true,
|
|
|
+ previewPayInfor: record,
|
|
|
+ })
|
|
|
+ }}>
|
|
|
+ 付官费
|
|
|
+ </Button>
|
|
|
+ }
|
|
|
+ <Popconfirm
|
|
|
+ title="是否删除?"
|
|
|
+ onConfirm={() => {
|
|
|
+ this.confirmDeletNew(record)
|
|
|
+ }}
|
|
|
+ okText="删除"
|
|
|
+ cancelText="不删除"
|
|
|
+ >
|
|
|
+ <Button
|
|
|
+ onClick={(e) => {
|
|
|
+ e.stopPropagation()
|
|
|
+ }}
|
|
|
+ style={{
|
|
|
+ marginLeft: '10px',
|
|
|
+ color: '#ffffff',
|
|
|
+ background: '#f00',
|
|
|
+ border: 'none',
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ 删除
|
|
|
+ </Button>
|
|
|
+ </Popconfirm>
|
|
|
+ </div>
|
|
|
+ )
|
|
|
+ },
|
|
|
+ },
|
|
|
+ ]
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ this.setState({
|
|
|
+ ContactsListsNew: [
|
|
|
+ {
|
|
|
+ title: '供应商名称',
|
|
|
+ dataIndex: 'companyName',
|
|
|
+ key: 'companyName',
|
|
|
+ render: (text, record, index) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '单价(万元)',
|
|
|
+ dataIndex: 'unitPrice',
|
|
|
+ key: 'unitPrice',
|
|
|
+ render: (text, record) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '数量',
|
|
|
+ dataIndex: 'quantity',
|
|
|
+ key: 'quantity',
|
|
|
+ render: (text, record) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '总价(万元)',
|
|
|
+ dataIndex: 'totalAmount',
|
|
|
+ key: 'totalAmount',
|
|
|
+ render: (text, record) => {
|
|
|
+ if (text) {
|
|
|
+ return <span>{text}</span>
|
|
|
+ }
|
|
|
+ },
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '备注',
|
|
|
+ dataIndex: 'remarks',
|
|
|
+ key: 'remarks',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '操作',
|
|
|
+ dataIndex: 'action',
|
|
|
+ key: 'action',
|
|
|
+ render: (text, record) => {
|
|
|
+ return (
|
|
|
+ <div>
|
|
|
+ {/*外包审核通过后,咨询师/咨询经理可申请付款*/}
|
|
|
+ {/*存在支付节点时不显示第三方的申请付款*/}
|
|
|
+ {/*0-待审核 ,1-审核通过,2-审核拒绝 true [NULL]*/}
|
|
|
+ {
|
|
|
+ <Button disabled={
|
|
|
+ !(this.props.isPreviewPay && (this.props.status === 1 || parseInt(this.props.startType) === 1) && this.props.dataSource.length === 0)
|
|
|
+ } type="primary" onClick={() => {
|
|
|
+ this.setState({
|
|
|
+ previewPayVisible: true,
|
|
|
+ previewPayInfor: record,
|
|
|
+ })
|
|
|
+ }}>
|
|
|
+ 申请付款
|
|
|
+ </Button>
|
|
|
+ }
|
|
|
+ <Popconfirm
|
|
|
+ title="是否删除?"
|
|
|
+ onConfirm={() => {
|
|
|
+ this.confirmDeletNew(record)
|
|
|
+ }}
|
|
|
+ okText="删除"
|
|
|
+ cancelText="不删除"
|
|
|
+ >
|
|
|
+ <Button
|
|
|
+ onClick={(e) => {
|
|
|
+ e.stopPropagation()
|
|
|
+ }}
|
|
|
+ style={{
|
|
|
+ marginLeft: '10px',
|
|
|
+ color: '#ffffff',
|
|
|
+ background: '#f00',
|
|
|
+ border: 'none',
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ 删除
|
|
|
+ </Button>
|
|
|
+ </Popconfirm>
|
|
|
+ </div>
|
|
|
+ )
|
|
|
+ },
|
|
|
+ },
|
|
|
+ ]
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
setColor() {
|
|
@@ -1219,7 +1538,7 @@ const Task = React.createClass({
|
|
|
// 获取Csort
|
|
|
this.getCsortData(localStorage.getItem('cSort'))
|
|
|
this.projectTypeTabContent(record.projectType)
|
|
|
- alert(record.projectType)
|
|
|
+ console.log('项目类型',record.projectType)
|
|
|
},
|
|
|
//点击修改项目详情
|
|
|
tijiaoOk() {
|
|
@@ -2384,6 +2703,7 @@ const Task = React.createClass({
|
|
|
let thisData = []
|
|
|
let arr = data.data || []
|
|
|
let allTotalAmount = 0
|
|
|
+ let type = 0;
|
|
|
for (let i = 0; i < arr.length; i++) {
|
|
|
thisData = arr[i]
|
|
|
allTotalAmount =
|
|
@@ -2404,7 +2724,11 @@ const Task = React.createClass({
|
|
|
income: thisData.income, //收入
|
|
|
remarks: thisData.remarks, //备注
|
|
|
cid: thisData.cid, //机构id
|
|
|
+ costReduction: thisData.costReduction,//费减
|
|
|
+ officiaCost: thisData.officiaCost,//费减
|
|
|
+ type: thisData.type //0其他 1专利申请 2专利买卖
|
|
|
})
|
|
|
+ type=thisData.type
|
|
|
}
|
|
|
if (!allTotalAmount) {
|
|
|
allTotalAmount = 0
|
|
@@ -2421,16 +2745,32 @@ const Task = React.createClass({
|
|
|
let arrIndex = 0;
|
|
|
for(let d=0;d<theArr.length;d++){
|
|
|
if(arr1[i].cid === theArr[d].cid){
|
|
|
+ theArr[d].companyName = theArr[d].companyName;
|
|
|
+ companyNameArr[d] = {
|
|
|
+ companyName: theArr[d].companyName,
|
|
|
+ id: theArr[d].id,
|
|
|
+ }
|
|
|
if(index !== 0){
|
|
|
if(index === 1){
|
|
|
theArr[arrIndex].companyName = theArr[arrIndex].companyName+ '-' + theArr[arrIndex].id;
|
|
|
- companyNameArr[d] = theArr[arrIndex].companyName;
|
|
|
+ companyNameArr[arrIndex] = {
|
|
|
+ companyName: theArr[arrIndex].companyName,
|
|
|
+ id: theArr[arrIndex].id,
|
|
|
+ }
|
|
|
}
|
|
|
theArr[d].companyName = theArr[d].companyName + '-' + theArr[d].id;
|
|
|
- companyNameArr[d] = theArr[d].companyName;
|
|
|
+ companyNameArr[d]= {
|
|
|
+ companyName: theArr[d].companyName,
|
|
|
+ id: theArr[d].id,
|
|
|
+ };
|
|
|
}
|
|
|
index++;
|
|
|
arrIndex = d;
|
|
|
+ }else{
|
|
|
+ companyNameArr[d] = {
|
|
|
+ companyName: theArr[d].companyName,
|
|
|
+ id: theArr[d].id,
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -2440,6 +2780,9 @@ const Task = React.createClass({
|
|
|
PayNodeCompany: companyNameArr,
|
|
|
thirdInfoList: theArr,
|
|
|
allTotalAmount: allTotalAmount,
|
|
|
+ patentType: type === 1 ? 0 : type === 2 ? 1 : -1, //0其他 1专利申请 2专利买卖
|
|
|
+ },()=>{
|
|
|
+ this.projectTypeTabContent(this.state.projectType);
|
|
|
})
|
|
|
}
|
|
|
}.bind(this),
|
|
@@ -2496,8 +2839,12 @@ const Task = React.createClass({
|
|
|
cid: thisData.cid, //机构id
|
|
|
})
|
|
|
}
|
|
|
+
|
|
|
+ for(let d=0;d<payNodeArr.length;d++){
|
|
|
+ payNodeArr[d].companyName = payNodeArr[d].companyName+ '-' + payNodeArr[arrIndex].cid;
|
|
|
+ }
|
|
|
+
|
|
|
console.log('payNodeArr:', payNodeArr)
|
|
|
- // console.log('paySubject:', this.state.paySubject)
|
|
|
this.setState({
|
|
|
tid: id,
|
|
|
payNodeList: payNodeArr,
|
|
@@ -2673,9 +3020,18 @@ const Task = React.createClass({
|
|
|
// totalAmount: this.state.currentTotalPrice, //总价
|
|
|
// partyAmount: this.state.partyAmount, //付款金额
|
|
|
//
|
|
|
+
|
|
|
+ let customerId=0;
|
|
|
+ this.state.PayNodeCompany.some((value)=>{
|
|
|
+ if(value.companyName === this.state.thirdCompanyName){
|
|
|
+ customerId = value.id
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ });
|
|
|
let data = {
|
|
|
id: this.state.ThirdId, //id
|
|
|
tid: this.state.tid, //订单编号
|
|
|
+ cid: customerId,//对应的第三方信息
|
|
|
companyName: this.state.thirdCompanyName.split('-')[0], //第三方名称
|
|
|
quantity: this.state.payNodeQuantity, //数量
|
|
|
dunType: this.state.dunType, //催款节点
|
|
@@ -2741,16 +3097,24 @@ const Task = React.createClass({
|
|
|
})
|
|
|
},
|
|
|
// 删除供应商信息
|
|
|
- confirmDeletNew(index) {
|
|
|
+ confirmDeletNew(index,resolve=()=>{},reject=()=>{}) {
|
|
|
this.setState({
|
|
|
loading: true,
|
|
|
ThirdListVisible: false,
|
|
|
})
|
|
|
+ let id = '';
|
|
|
+ if(index === -1){
|
|
|
+ this.state.thirdInfoList.map((value,index)=>{
|
|
|
+ id+=value.id+',';
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ id = index.id
|
|
|
+ }
|
|
|
$.ajax({
|
|
|
url: globalConfig.context + '/api/admin/company/deleteCompany',
|
|
|
method: 'post',
|
|
|
data: {
|
|
|
- id: index.id,
|
|
|
+ id: id,
|
|
|
},
|
|
|
}).done(
|
|
|
function (data) {
|
|
@@ -2760,23 +3124,33 @@ const Task = React.createClass({
|
|
|
if (!data.error.length) {
|
|
|
message.success('删除成功!')
|
|
|
this.thirdTable(this.state.tid)
|
|
|
+ resolve();
|
|
|
} else {
|
|
|
message.warning(data.error[0].message)
|
|
|
+ reject();
|
|
|
}
|
|
|
}.bind(this)
|
|
|
)
|
|
|
},
|
|
|
// 删除付款节点
|
|
|
- payNodeConfirmDeletNew(index) {
|
|
|
+ payNodeConfirmDeletNew(index,resolve=()=>{},reject=()=>{}) {
|
|
|
this.setState({
|
|
|
loading: true,
|
|
|
PayNodeVisible: false,
|
|
|
})
|
|
|
+ let id = '';
|
|
|
+ if(index === -1){
|
|
|
+ this.state.payNodeList.map((value,index)=>{
|
|
|
+ id+=value.id+',';
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ id = index.id
|
|
|
+ }
|
|
|
$.ajax({
|
|
|
url: globalConfig.context + '/api/admin/company/deletePaymentNode',
|
|
|
method: 'post',
|
|
|
data: {
|
|
|
- id: index.id,
|
|
|
+ id: id,
|
|
|
},
|
|
|
}).done(
|
|
|
function (data) {
|
|
@@ -2785,9 +3159,11 @@ const Task = React.createClass({
|
|
|
})
|
|
|
if (!data.error.length) {
|
|
|
message.success('删除成功!')
|
|
|
+ resolve();
|
|
|
this.payNodeTable(this.state.tid)
|
|
|
} else {
|
|
|
message.warning(data.error[0].message)
|
|
|
+ reject();
|
|
|
}
|
|
|
}.bind(this)
|
|
|
)
|
|
@@ -3079,7 +3455,7 @@ const Task = React.createClass({
|
|
|
flag={this.state.flag}
|
|
|
all={this.state}
|
|
|
/>
|
|
|
- <Modal
|
|
|
+ {this.state.visible ? <Modal
|
|
|
className="customeDetails"
|
|
|
footer=""
|
|
|
title=""
|
|
@@ -3093,7 +3469,9 @@ const Task = React.createClass({
|
|
|
onChange={(e) => {
|
|
|
this.callback(e)
|
|
|
if (e == 2) {
|
|
|
- this.waiDetail()
|
|
|
+ this.waiDetail();
|
|
|
+ this.thirdTable(this.state.tid);
|
|
|
+ this.payNodeTable(this.state.tid)
|
|
|
}
|
|
|
}}
|
|
|
>
|
|
@@ -3932,7 +4310,7 @@ const Task = React.createClass({
|
|
|
<div
|
|
|
className="clearfix"
|
|
|
style={{
|
|
|
- display: this.state.refundStatus === 1 ? 'block' : 'none',
|
|
|
+ display: this.state.projectType === 1 ? 'block' : 'none',
|
|
|
}}
|
|
|
>
|
|
|
<FormItem
|
|
@@ -3948,7 +4326,29 @@ const Task = React.createClass({
|
|
|
<Radio.Group
|
|
|
value={this.state.patentType}
|
|
|
onChange={(e) => {
|
|
|
- this.setState({ patentType: e.target.value })
|
|
|
+ let _this = this;
|
|
|
+ if(this.state.thirdInfoList.length >0){
|
|
|
+ confirm({
|
|
|
+ title: '确定要切换吗?',
|
|
|
+ content: '切换将删除所有第三信息和付款节点',
|
|
|
+ onOk() {
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
+ _this.setState({ patentType: e.target.value },()=>{
|
|
|
+ _this.projectTypeTabContent(_this.state.projectType);
|
|
|
+ })
|
|
|
+ _this.confirmDeletNew(-1,resolve,reject)
|
|
|
+ if(this.state.payNodeList.length > 0){
|
|
|
+ _this.payNodeConfirmDeletNew(-1,resolve,reject);
|
|
|
+ }
|
|
|
+ }).catch(() => console.log('Oops errors!'));
|
|
|
+ },
|
|
|
+ onCancel() {},
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ this.setState({ patentType: e.target.value },()=>{
|
|
|
+ this.projectTypeTabContent(this.state.projectType);
|
|
|
+ })
|
|
|
+ }
|
|
|
}}
|
|
|
>
|
|
|
<Radio value={0}>专利申请/变更/转让</Radio>
|
|
@@ -3959,7 +4359,7 @@ const Task = React.createClass({
|
|
|
<div
|
|
|
className="clearfix"
|
|
|
style={{
|
|
|
- display: this.state.refundStatus === 1? 'block' : 'none',
|
|
|
+ display: this.state.projectType === 1? 'block' : 'none',
|
|
|
}}
|
|
|
>
|
|
|
<FormItem
|
|
@@ -4025,7 +4425,11 @@ const Task = React.createClass({
|
|
|
<Button
|
|
|
type="primary"
|
|
|
onClick={(e) => {
|
|
|
- this.addThirdList()
|
|
|
+ if(this.state.projectType === 1 && this.state.patentType === -1){
|
|
|
+ message.info('请先选择专利类型')
|
|
|
+ }else{
|
|
|
+ this.addThirdList()
|
|
|
+ }
|
|
|
}}
|
|
|
style={{
|
|
|
float: 'right',
|
|
@@ -4310,7 +4714,7 @@ const Task = React.createClass({
|
|
|
''
|
|
|
)}
|
|
|
</Tabs>
|
|
|
- </Modal>
|
|
|
+ </Modal> : <div/>}
|
|
|
<Modal
|
|
|
maskClosable={false}
|
|
|
visible={this.state.lookVisible}
|
|
@@ -5362,6 +5766,7 @@ const Task = React.createClass({
|
|
|
{this.state.ThirdListVisible ? <NewSupplier
|
|
|
ThirdId={this.state.ThirdId}
|
|
|
tid={this.state.tid}
|
|
|
+ patentType={this.state.patentType}
|
|
|
projectType={this.state.projectType}
|
|
|
thirdCompanyName={this.state.thirdCompanyName}
|
|
|
thirdUnitPrice={this.state.thirdUnitPrice}
|
|
@@ -5386,7 +5791,7 @@ const Task = React.createClass({
|
|
|
thirdCompanyName: data.thirdCompanyName
|
|
|
})
|
|
|
}}/> : <div/>}
|
|
|
- <Modal
|
|
|
+ {this.state.PayNodeVisible ? <Modal
|
|
|
visible={this.state.PayNodeVisible}
|
|
|
onCancel={this.handleCancelclose}
|
|
|
width={800}
|
|
@@ -5419,8 +5824,8 @@ const Task = React.createClass({
|
|
|
style={{ width: 220 }}
|
|
|
>
|
|
|
{this.state.PayNodeCompany.map((item, index) => (
|
|
|
- <Select.Option value={item} key={index}>
|
|
|
- {item}
|
|
|
+ <Select.Option value={item.companyName} key={index}>
|
|
|
+ {item.companyName}
|
|
|
</Select.Option>
|
|
|
))}
|
|
|
</Select>
|
|
@@ -5470,14 +5875,15 @@ const Task = React.createClass({
|
|
|
</FormItem> : <div/>}
|
|
|
</div>
|
|
|
<div className="clearfix">
|
|
|
- <FormItem {...formItemLayout} label="数量1">
|
|
|
+ <FormItem {...formItemLayout} label="数量">
|
|
|
<Input
|
|
|
value={this.state.payNodeQuantity}
|
|
|
placeholder="请输入数量(必填项)"
|
|
|
required="required"
|
|
|
type={'number'}
|
|
|
onChange={(e) => {
|
|
|
- let num = e.target.value
|
|
|
+ //TODO 数量为1时不可修改,需要将次块分成组件
|
|
|
+ let num = e.target.value ? (e.target.value < 1 ? 1 : e.target.value) : 1
|
|
|
this.setState(
|
|
|
{
|
|
|
payNodeQuantity: num,
|
|
@@ -5530,7 +5936,7 @@ const Task = React.createClass({
|
|
|
</div>
|
|
|
</Spin>
|
|
|
</Form>
|
|
|
- </Modal>
|
|
|
+ </Modal> : <div/>}
|
|
|
</div>
|
|
|
)
|
|
|
},
|