|
@@ -486,6 +486,25 @@ class DetailedList extends Component {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
+ componentWillMount() {
|
|
|
+ let _this = this
|
|
|
+ this.setState({
|
|
|
+ loading: true,
|
|
|
+ aid: this.props.aid,
|
|
|
+ depId: this.props.depId,
|
|
|
+ releaseDate: this.props.releaseDate,
|
|
|
+ createReleaseDate: this.props.createReleaseDate,
|
|
|
+ })
|
|
|
+ setTimeout(function () {
|
|
|
+ _this.loadData();
|
|
|
+ _this.setState({
|
|
|
+ loading: false
|
|
|
+ })
|
|
|
+ }, 300)
|
|
|
+ this.selectSuperId();
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
loadData(pageNo) {
|
|
|
this.setState({
|
|
|
loading: true,
|
|
@@ -500,6 +519,8 @@ class DetailedList extends Component {
|
|
|
pageSize: this.state.pagination.pageSize,
|
|
|
releaseStart: this.state.releaseDate[0] || undefined,
|
|
|
releaseEnd: this.state.releaseDate[1] || undefined,
|
|
|
+ createStart: this.state.createReleaseDate[0] || undefined,
|
|
|
+ createEnd: this.state.createReleaseDate[1] || undefined,
|
|
|
aid: this.state.theTypes,
|
|
|
sid: this.state.theTypes1 || undefined,
|
|
|
uid: this.state.theCustomerTypes,
|
|
@@ -583,6 +604,7 @@ class DetailedList extends Component {
|
|
|
}.bind(this),
|
|
|
}).always(function () { }.bind(this));
|
|
|
}
|
|
|
+
|
|
|
supervisor1(e) {
|
|
|
$.ajax({
|
|
|
method: "get",
|
|
@@ -716,20 +738,6 @@ class DetailedList extends Component {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- componentWillMount() {
|
|
|
- let _this = this
|
|
|
- this.setState({
|
|
|
- loading: true
|
|
|
- })
|
|
|
- setTimeout(function () {
|
|
|
- _this.loadData();
|
|
|
- _this.setState({
|
|
|
- loading: false
|
|
|
- })
|
|
|
- }, 300)
|
|
|
- this.selectSuperId();
|
|
|
- }
|
|
|
-
|
|
|
exportExec() {
|
|
|
message.config({
|
|
|
duration: 20,
|
|
@@ -741,6 +749,8 @@ class DetailedList extends Component {
|
|
|
let data = {
|
|
|
releaseStart: this.state.releaseDate[0],
|
|
|
releaseEnd: this.state.releaseDate[1],
|
|
|
+ createStart: this.state.createReleaseDate[0] || undefined,
|
|
|
+ createEnd: this.state.createReleaseDate[1] || undefined,
|
|
|
aid: this.state.theTypes,
|
|
|
sid: this.state.theTypes1,
|
|
|
uid: this.state.theCustomerTypes,
|
|
@@ -859,7 +869,7 @@ class DetailedList extends Component {
|
|
|
<span style={{ marginRight: "10px" }}>
|
|
|
<Select
|
|
|
placeholder="请选择审核状态"
|
|
|
- style={{ width: 200, marginLeft: 10 }}
|
|
|
+ style={{ width: 120, marginLeft: 10 }}
|
|
|
value={this.state.status}
|
|
|
onChange={(e) => {
|
|
|
this.setState({ status: e });
|
|
@@ -875,7 +885,7 @@ class DetailedList extends Component {
|
|
|
<span style={{ marginRight: "10px" }}>
|
|
|
<Select
|
|
|
placeholder="请选择打卡状态"
|
|
|
- style={{ width: 200, marginLeft: 10 }}
|
|
|
+ style={{ width: 120, marginLeft: 10 }}
|
|
|
value={this.state.clockIn}
|
|
|
onChange={(e) => {
|
|
|
this.setState({ clockIn: e });
|
|
@@ -888,7 +898,7 @@ class DetailedList extends Component {
|
|
|
<span style={{ marginRight: "10px" }}>
|
|
|
<Select
|
|
|
placeholder="请选择公出类型"
|
|
|
- style={{ width: 200, marginLeft: 10 }}
|
|
|
+ style={{ width: 120, marginLeft: 10 }}
|
|
|
value={this.state.type}
|
|
|
onChange={(e) => {
|
|
|
this.setState({ type: e });
|
|
@@ -900,7 +910,7 @@ class DetailedList extends Component {
|
|
|
<Select.Option value={3}>技术协单</Select.Option>
|
|
|
</Select>
|
|
|
</span>
|
|
|
- <span style={{ marginRight: "10px" }}>
|
|
|
+ {/* <span style={{ marginRight: "10px" }}>
|
|
|
<AutoComplete
|
|
|
className="certain-category-search"
|
|
|
dropdownClassName="certain-category-search-dropdown"
|
|
@@ -916,7 +926,7 @@ class DetailedList extends Component {
|
|
|
>
|
|
|
<Input />
|
|
|
</AutoComplete>
|
|
|
- </span>
|
|
|
+ </span> */}
|
|
|
<span style={{ marginRight: "10px" }}>
|
|
|
<AutoComplete
|
|
|
className="certain-category-search"
|
|
@@ -936,6 +946,25 @@ class DetailedList extends Component {
|
|
|
</span>
|
|
|
<span style={{ marginRight: "10px" }}>
|
|
|
<span style={{ marginRight: "5px", marginBottom: "10px" }}>
|
|
|
+ 创建时间 :
|
|
|
+ </span>
|
|
|
+ <RangePicker
|
|
|
+ style={{ marginRight: "10px", marginBottom: "10px" }}
|
|
|
+ value={[
|
|
|
+ this.state.createReleaseDate[0]
|
|
|
+ ? moment(this.state.createReleaseDate[0])
|
|
|
+ : null,
|
|
|
+ this.state.createReleaseDate[1]
|
|
|
+ ? moment(this.state.createReleaseDate[1])
|
|
|
+ : null,
|
|
|
+ ]}
|
|
|
+ onChange={(data, dataString) => {
|
|
|
+ this.setState({ createReleaseDate: dataString });
|
|
|
+ }}
|
|
|
+ />
|
|
|
+ </span>
|
|
|
+ <span style={{ marginRight: "10px" }}>
|
|
|
+ <span style={{ marginRight: "5px", marginBottom: "10px" }}>
|
|
|
公出时间 :
|
|
|
</span>
|
|
|
<RangePicker
|