|
@@ -28,6 +28,7 @@ import {
|
|
|
ShowModal
|
|
|
} from "@/tools";
|
|
|
import ShowModalDiv from "@/showModal.jsx";
|
|
|
+import OrderRiZi from "@/orderRiZi.jsx";
|
|
|
|
|
|
const PaiDan = React.createClass({
|
|
|
loadData(pageNo) {
|
|
@@ -228,6 +229,11 @@ const PaiDan = React.createClass({
|
|
|
title: "时间",
|
|
|
dataIndex: "createDate",
|
|
|
key: "createDate"
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: "备注",
|
|
|
+ dataIndex: "remarks",
|
|
|
+ key: "remarks"
|
|
|
}
|
|
|
],
|
|
|
dataSource: [],
|
|
@@ -522,7 +528,8 @@ const PaiDan = React.createClass({
|
|
|
theArr.push({
|
|
|
processName: thisdata.processName,
|
|
|
adminName: thisdata.adminName,
|
|
|
- createDate: thisdata.createDate
|
|
|
+ createDate: thisdata.createDate,
|
|
|
+ remarks: thisdata.remarks
|
|
|
});
|
|
|
}
|
|
|
}
|
|
@@ -1314,7 +1321,6 @@ const PaiDan = React.createClass({
|
|
|
</Spin>
|
|
|
</Form>
|
|
|
</Modal>
|
|
|
-
|
|
|
<Modal
|
|
|
maskClosable={false}
|
|
|
visible={this.state.addserviceVisible}
|
|
@@ -1446,7 +1452,6 @@ const PaiDan = React.createClass({
|
|
|
</Spin>
|
|
|
</Form>
|
|
|
</Modal>
|
|
|
-
|
|
|
<Modal
|
|
|
maskClosable={false}
|
|
|
visible={this.state.noVisible}
|
|
@@ -1498,7 +1503,7 @@ const PaiDan = React.createClass({
|
|
|
</Spin>
|
|
|
</Form>
|
|
|
</Modal>
|
|
|
- <Modal
|
|
|
+ {/* <Modal
|
|
|
visible={this.state.rizhivisible}
|
|
|
className="admin-desc-content"
|
|
|
width="800px"
|
|
@@ -1516,7 +1521,13 @@ const PaiDan = React.createClass({
|
|
|
/>
|
|
|
</Spin>
|
|
|
</div>
|
|
|
- </Modal>
|
|
|
+ </Modal> */}
|
|
|
+ <OrderRiZi
|
|
|
+ dataSourcerizhi={this.state.dataSourcerizhi}
|
|
|
+ closeOrderLog={this.closeOrderLog}
|
|
|
+ visible={this.state.rizhivisible}
|
|
|
+ loading={this.state.loading}
|
|
|
+ />
|
|
|
</div>
|
|
|
);
|
|
|
}
|