|
@@ -29,6 +29,7 @@ import { ChooseList } from "../../../../component/manageCenter/order/orderNew/ch
|
|
|
import ImgList from "../../../common/imgList";
|
|
|
import {getProjectName} from "../../../tools";
|
|
|
import DepartmentList from "../../../common/departmentList";
|
|
|
+import LogPopup from "../../../common/logPopup";
|
|
|
|
|
|
const FormItem = Form.Item;
|
|
|
const { TabPane } = Tabs
|
|
@@ -54,7 +55,8 @@ const outInvoiceQuery = React.createClass({
|
|
|
orderDep: this.state.departmenttList,
|
|
|
status: this.state.statusSearch,
|
|
|
type: 1,
|
|
|
- approval: this.state.processStatus
|
|
|
+ approval: this.state.processStatus,
|
|
|
+ all:1,
|
|
|
},
|
|
|
success: function (data) {
|
|
|
ShowModal(this);
|
|
@@ -221,8 +223,9 @@ const outInvoiceQuery = React.createClass({
|
|
|
title: "开票状态",
|
|
|
dataIndex: "status",
|
|
|
key: "status",
|
|
|
- render: text => {
|
|
|
- return getStatus(text);
|
|
|
+ render: (text,record) => {
|
|
|
+ // return getStatus(text);
|
|
|
+ return getInvoiceStatus(text, record);
|
|
|
}
|
|
|
},
|
|
|
{
|
|
@@ -346,11 +349,15 @@ const outInvoiceQuery = React.createClass({
|
|
|
title: "开票状态",
|
|
|
dataIndex: "status",
|
|
|
key: "status",
|
|
|
- render: text => {
|
|
|
- return getInvoiceStatus(text, {
|
|
|
- approval: 0
|
|
|
- });
|
|
|
- }
|
|
|
+ // render: text => {
|
|
|
+ // return getInvoiceStatus(text, {
|
|
|
+ // approval: 0
|
|
|
+ // });
|
|
|
+
|
|
|
+ // }
|
|
|
+ render: (text, record) => {
|
|
|
+ return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
|
|
|
+ },
|
|
|
}
|
|
|
],
|
|
|
dataSource: [],
|
|
@@ -472,7 +479,8 @@ const outInvoiceQuery = React.createClass({
|
|
|
amount: thisdata.amount, //签单金额
|
|
|
createTime: thisdata.createTime, //流程状态
|
|
|
status: thisdata.status, //结算状态
|
|
|
- rejectReason: thisdata.rejectReason
|
|
|
+ rejectReason: thisdata.rejectReason,
|
|
|
+ approval:thisdata.approval,//0非特批 1待审核 2审核通过
|
|
|
});
|
|
|
}
|
|
|
}
|
|
@@ -928,7 +936,7 @@ const outInvoiceQuery = React.createClass({
|
|
|
) : (
|
|
|
""
|
|
|
)}
|
|
|
- <FormItem
|
|
|
+ {/* <FormItem
|
|
|
className="half-item"
|
|
|
{...formItemLayout}
|
|
|
label={
|
|
@@ -938,7 +946,7 @@ const outInvoiceQuery = React.createClass({
|
|
|
}
|
|
|
>
|
|
|
<span>{this.state.alreadyAmount}万元</span>
|
|
|
- </FormItem>
|
|
|
+ </FormItem> */}
|
|
|
</div>
|
|
|
</Spin>
|
|
|
</Form>
|