提交 d26e850d authored 作者: 钟是志's avatar 钟是志

31614 查询统计/已报到学生明细,导出时--无字段名(101307,bdk@2022*$)

上级 ac3e341a
import fetch from 'dva/fetch'; import fetch from 'dva/fetch';
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom';
import { import {
Select, Select,
Button, Button,
...@@ -16,7 +15,7 @@ import { ...@@ -16,7 +15,7 @@ import {
import { connect } from 'dva'; import { connect } from 'dva';
import { getToken } from '../utils/token'; import { getToken } from '../utils/token';
import config from '@/webPublic/one_stop_public/config'; import config from '@/webPublic/one_stop_public/config';
import styles from './ExportInfo.less';
import QueryItem from './QueryItem'; import QueryItem from './QueryItem';
import OrderItem from './OrderItem'; import OrderItem from './OrderItem';
...@@ -428,7 +427,6 @@ export default class ExportInfo extends React.Component { ...@@ -428,7 +427,6 @@ export default class ExportInfo extends React.Component {
visiable, visiable,
targetKeys, targetKeys,
sourceSelectedKeys, sourceSelectedKeys,
queryVisiable,
querys, querys,
orders, orders,
groups, groups,
...@@ -440,7 +438,6 @@ export default class ExportInfo extends React.Component { ...@@ -440,7 +438,6 @@ export default class ExportInfo extends React.Component {
gs, gs,
currentQueryKey, currentQueryKey,
currentOrderKey, currentOrderKey,
orderVisiable,
currentGroupKey, currentGroupKey,
groupVisiable, groupVisiable,
} = this.state; } = this.state;
...@@ -463,12 +460,12 @@ export default class ExportInfo extends React.Component { ...@@ -463,12 +460,12 @@ export default class ExportInfo extends React.Component {
onOk={this.export} onOk={this.export}
onCancel={this.onCancle} onCancel={this.onCancle}
confirmLoading={confirmLoading}> confirmLoading={confirmLoading}>
<div style={{ overflowY: 'auto', maxHeight: '500px', height: '500px' }}> <div className={styles.modalDiv}>
<div style={{ textAlign: 'left' }}> <div className={styles.div1}>
<ButtonDiy type="primary" name="新增查询条件" /> <span className={styles.span1}>查询条件:</span>
<Select <Select
style={{ width: 200, paddingRight: '10px' }} className={styles.select1}
value={currentQueryKey} value={currentQueryKey}
onChange={this.selectQuery}> onChange={this.selectQuery}>
{qs.map((r) => { {qs.map((r) => {
...@@ -486,7 +483,7 @@ export default class ExportInfo extends React.Component { ...@@ -486,7 +483,7 @@ export default class ExportInfo extends React.Component {
) : ( ) : (
'' ''
)} )}
<div style={{ height: '12px' }} /> <div className={styles.div2} />
{querys.map((r, i) => ( {querys.map((r, i) => (
<FormItem <FormItem
key={r.name + i} key={r.name + i}
...@@ -525,10 +522,10 @@ export default class ExportInfo extends React.Component { ...@@ -525,10 +522,10 @@ export default class ExportInfo extends React.Component {
</FormItem> </FormItem>
))} ))}
</div> </div>
<div style={{ textAlign: 'left', paddingTop: '15px' }}> <div className={styles.div3}>
<ButtonDiy type="primary" name="新增排序条件" /> <span className={styles.span1}>排序条件:</span>
<Select <Select
style={{ width: 200, paddingRight: '10px' }} className={styles.select1}
value={currentOrderKey} value={currentOrderKey}
onChange={this.selectOrder}> onChange={this.selectOrder}>
{os.map((r) => { {os.map((r) => {
...@@ -543,13 +540,13 @@ export default class ExportInfo extends React.Component { ...@@ -543,13 +540,13 @@ export default class ExportInfo extends React.Component {
})} })}
</Select> </Select>
{currentOrderKey ? ( {currentOrderKey ? (
<span style={{ paddingLeft: '0' }}> <span>
<ButtonDiy type="primary" name="确定" handleClick={this.okOrder} /> <ButtonDiy type="primary" name="确定" handleClick={this.okOrder} />
</span> </span>
) : ( ) : (
'' ''
)} )}
<div style={{ height: '12px' }} /> <div className={styles.div2} />
{orders.map((r, i) => ( {orders.map((r, i) => (
<FormItem <FormItem
key={r.name + i} key={r.name + i}
...@@ -564,14 +561,14 @@ export default class ExportInfo extends React.Component { ...@@ -564,14 +561,14 @@ export default class ExportInfo extends React.Component {
))} ))}
</div> </div>
{this.props.voClass ? ( {this.props.voClass ? (
<div style={{ textAlign: 'left', paddingTop: '15px' }}> <div className={styles.div3}>
<span style={{ paddingRight: '10px' }}>聚合条件:</span> <span className={styles.span2}>聚合条件:</span>
{!groupVisiable ? ( {!groupVisiable ? (
<ButtonDiy type="primary" name="新增" handleClick={this.addGroup} /> <ButtonDiy type="primary" name="新增" handleClick={this.addGroup} />
) : ( ) : (
<span> <span>
<Select <Select
style={{ width: 100 }} className={styles.select2}
value={currentGroupKey} value={currentGroupKey}
onChange={this.selectGroup}> onChange={this.selectGroup}>
{gs.map((r) => { {gs.map((r) => {
...@@ -614,13 +611,9 @@ export default class ExportInfo extends React.Component { ...@@ -614,13 +611,9 @@ export default class ExportInfo extends React.Component {
'' ''
)} )}
<Row> <Row>
<Col span={24} style={{ textAlign: 'left', paddingTop: '15px' }}> <Col span={24}
className={styles.div3}>
<span style={{ paddingRight: '10px' }}>导出项:</span> <span style={{ paddingRight: '10px' }}>导出项:</span>
{/*<Select>*/}
{/*{*/}
{/*}*/}
{/*</Select>*/}
</Col> </Col>
<Col span={18}> <Col span={18}>
<Transfer <Transfer
......
.modalDiv{
overflow-y: auto;
height: 500px;
.div1{
text-align: left;
}
.span1{
color: #0A5295;
padding-right: 20px;
}
.select1{
width: 200px;
padding-right: 10px;
}
.div2{
height: 12px;
}
.div3{
text-align: left;
padding-top: 15px;
}
.span2{
padding-right: 10px;
}
.select2{
width: 100px;
}
}
...@@ -510,7 +510,8 @@ class FormList extends React.Component { ...@@ -510,7 +510,8 @@ class FormList extends React.Component {
if (Number(objCode) === 1) { if (Number(objCode) === 1) {
} else { } else {
if (this.props.json?.isDiy !== 'false' && this.props.json?.isDiy !== false) { const isDiy = this.props.json?.isDiy;
if (isDiy !== 'false' && isDiy !== false && typeof isDiy !== 'undefined') {
// 2022年11月8日 姚鑫国说的 开起了这个 自定义模式 就不调接口查表头了. // 2022年11月8日 姚鑫国说的 开起了这个 自定义模式 就不调接口查表头了.
// 2022年12月12日 姚新国说的 没配这个东西都搞成 true qq 聊天记录 // 2022年12月12日 姚新国说的 没配这个东西都搞成 true qq 聊天记录
this.getPage(); this.getPage();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论