Browse Source

审批状态

master
wenlele 2 years ago
parent
commit
e56f08efa2
  1. 46
      web/client/src/sections/dataQuality/containers/documentLibrary.js
  2. 2
      web/client/src/sections/resourceConsumption/containers/myApplication.js

46
web/client/src/sections/dataQuality/containers/documentLibrary.js

@ -4,14 +4,15 @@ import moment from 'moment';
import ApproveModal from '../components/approveModal'; import ApproveModal from '../components/approveModal';
import { Tabs, Form, Input, DatePicker, Button, Table } from 'antd'; import { Tabs, Form, Input, Space, Button, Table } from 'antd';
const { Search } = Input;
import { v1 } from 'uuid'; import { v1 } from 'uuid';
function Approve ({ loading, clientHeight, actions, dispatch, }) { function Approve ({ loading, clientHeight, actions, dispatch, }) {
const { resourceConsumption } = actions const { resourceConsumption } = actions
const [tabsKey, setTabsKey] = useState("stay") const [checkAll, setCheckAll] = useState(false)
const [query, setQuery] = useState({ page: 0, limit: 10 }); const [query, setQuery] = useState({ page: 0, limit: 10 });
const [proTableList, setProTableList] = useState({ rows: [], count: 0 }); const [proTableList, setProTableList] = useState({ rows: [], count: 0 });
const [formData, setFormData] = useState({}) const [formData, setFormData] = useState({})
@ -42,30 +43,25 @@ function Approve ({ loading, clientHeight, actions, dispatch, }) {
return <> return <>
{/* <Form <div style={{ display: 'flex', justifyContent: 'space-between' }}>
style={{ display: 'flex' }} <Space size={'small'}>
onFinish={v => { <Button>{checkAll ? "全选" : "取消全选"}</Button>
<Button>新建分组</Button>
setFormData({ ...v, applyAt: v.applyAt ? moment(v.applyAt).format('YYYY-MM-DD HH:mm:ss') : "" }) <Button type="primary">上传</Button>
resourceData({ limit: 10, page: 0, ...v, applyAt: v.applyAt ? moment(v.applyAt).format('YYYY-MM-DD HH:mm:ss') : "" }) <Button type="primary">下载</Button>
setQuery({ limit: 10, page: 0 }); <Button type="primary">删除</Button>
console.log(v); </Space>
<Search
placeholder="标准类型或文件文件名称关键字"
onSearch={(value, event) => {
console.log(value, event);
}}
style={{
width: 266,
}} }}
autoComplete="off" />
> </div>
<Form.Item label="资源名称" name="resourceName" >
<Input allowClear placeholder='资源名称关键字' style={{ width: 200, marginRight: 16 }} />
</Form.Item>
<Form.Item label="申请人" name="applyBy" >
<Input allowClear placeholder='申请人关键字' style={{ width: 140, marginRight: 16 }} />
</Form.Item>
<Form.Item label="申请日期" name="applyAt" >
<DatePicker style={{ width: 140, marginRight: 16 }} />
</Form.Item>
<Form.Item >
<Button type="primary" htmlType="submit"> 查询 </Button>
</Form.Item>
</Form> */}
{ {

2
web/client/src/sections/resourceConsumption/containers/myApplication.js

@ -57,7 +57,7 @@ function MyApplication ({ loading, clientHeight, actions, dispatch, user }) {
// multiple: 2, // multiple: 2,
}, },
}, { }, {
title: '审批意见', title: '审批状态',
dataIndex: 'result', dataIndex: 'result',
render: (text, record) => record?.approveState == '审批中' ? record?.approveState : record?.approveState == '已审批' ? record?.token ? "审批通过" : "审批不通过" : "--" render: (text, record) => record?.approveState == '审批中' ? record?.approveState : record?.approveState == '已审批' ? record?.token ? "审批通过" : "审批不通过" : "--"
}, { }, {

Loading…
Cancel
Save