Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/GovernmentDataResourceCenter

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

@@ -4,14 +4,15 @@ import moment from 'moment';
 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';
 
 
 function Approve ({ loading, clientHeight, actions, dispatch, }) {
 
    const { resourceConsumption } = actions
-   const [tabsKey, setTabsKey] = useState("stay")
+   const [checkAll, setCheckAll] = useState(false)
    const [query, setQuery] = useState({ page: 0, limit: 10 });
    const [proTableList, setProTableList] = useState({ rows: [], count: 0 });
    const [formData, setFormData] = useState({})
@@ -34,40 +35,35 @@ function Approve ({ loading, clientHeight, actions, dispatch, }) {
    }
 
 
-  
+
 
    useEffect(() => {
-    
+
    }, [])
 
    return <>
-     
-      {/* <Form
-         style={{ display: 'flex' }}
-         onFinish={v => {
-
-            setFormData({ ...v, applyAt: v.applyAt ? moment(v.applyAt).format('YYYY-MM-DD HH:mm:ss') : "" })
-            resourceData({ limit: 10, page: 0, ...v, applyAt: v.applyAt ? moment(v.applyAt).format('YYYY-MM-DD HH:mm:ss') : "" })
-            setQuery({ limit: 10, page: 0 });
-            console.log(v);
-         }}
-         autoComplete="off"
-      >
-         <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> */}
-
-     
+
+      <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+         <Space size={'small'}>
+            <Button>{checkAll ? "全选" : "取消全选"}</Button>
+            <Button>新建分组</Button>
+            <Button type="primary">上传</Button>
+            <Button type="primary">下载</Button>
+            <Button type="primary">删除</Button>
+         </Space>
+
+         <Search
+            placeholder="标准类型或文件文件名称关键字"
+            onSearch={(value, event) => {
+               console.log(value, event);
+            }}
+            style={{
+               width: 266,
+            }}
+         />
+      </div>
+
+
       {
          approveModal ?
             <ApproveModal

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

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