Commit 618c0e07 by fanyongjun

tijiao

parent 086fefdf
......@@ -132,7 +132,6 @@ export function testPost(url, payload) {
const { fileList = null,} = payload||{};
let formData = new FormData();
formData.append('attachment',fileList)
const cancelToken = __source ? __source.token : null;
return testA.post(url, formData, ).then(
callback
)
......
......@@ -132,7 +132,7 @@ class SearchTree extends React.Component {
</TreeNode>
);
}else{
if(item.typ==0)
if(parseInt(item.typ)===0)
return <TreeNode key={item.key} dataRef={item} title={title} />;
if(item.no)
return <TreeNode key={item.key} dataRef={item} title={title} />;
......
......@@ -55,9 +55,6 @@ class Assets extends Component {
}catch(err){
console.log(err)
}
console.log('111')
}
})
}
......@@ -69,7 +66,7 @@ class Assets extends Component {
return data
let value = JSON.parse(JSON.stringify(data))
for (let treenode of value){
if(treenode.pid === pid){
if(parseInt(treenode.pid) === parseInt(pid)){
treenode.title = treenode.name
treenode.key = `${treenode.id}`
if(treenode.no)
......
......@@ -106,10 +106,10 @@ export default class ListBox extends Component {
};
const getActions = (item) => {
if (item.state=='approve') {
if (item.state==='approve') {
return [
<Button size="small" type="link" icon="book" disabled>已审核 </Button>,
item.confirmState=='toConfirm'? (
item.confirmState==='toConfirm'? (
<Button size="small" type="link" icon="book"
onClick={this.onSubscribeModel.bind(this, item, item.processId)}
>待确认</Button>
......@@ -117,12 +117,12 @@ export default class ListBox extends Component {
<Button size="small" type="link" icon="book" disabled>已确认 </Button>
), <span></span>
];
}else if(item.state=='applying'){
}else if(item.state==='applying'){
return[
<Button size="small" type="link" icon="book" disabled>待审核</Button>,
<span></span>
]
}else if(item.state=='reject'){
}else if(item.state==='reject'){
return[
<Button size="small" type="link" icon="book" style={{color:'#ff4d4f'}} disabled>已驳回</Button>,
<span></span>
......
import React, { Component } from "react";
import { Card, Table, Radio, Pagination, Input, Button, Modal } from 'antd';
import { dispatchLatest, dispatch } from '../../../model';
import { Card, Pagination,} from 'antd';
import { dispatchLatest } from '../../../model';
import PageHeaderWrapper from '../../../layout/PageHeaderWrapper';
import ListBox from './components/ListBox'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment