FEV2 / fw-cms

Commit 71a2ef4516f0172733217f014fe5970f08c351f2

Authored by jiangwei
1 parent 052c8f9f

样式优化

Inline Side-by-side
Showing 3 changed files with 39 additions and 41 deletions
src/pages/pms/storage/partShop/components/Filter.tsx
  View file @71a2ef4
... ... @@ -32,14 +32,14 @@ export default function Filter() {
32 32 return (
33 33 <div>
34 34 <Search
35   - style={{ width: 200, marginRight: 10 }}
  35 + style={{ width: 180, marginRight: 10, marginBottom: 10 }}
36 36 allowClear
37 37 enterButton
38 38 placeholder="配件编码|名称"
39 39 onSearch={v => handleChangeKeywords(v)}
40 40 />
41 41 <PmsSelect
42   - style={{ width: 180, marginRight: 10}}
  42 + style={{ width: 180, marginRight: 10, marginBottom: 10 }}
43 43 allowClear
44 44 value={innerParams.shopId}
45 45 onChange={value => {
... ... @@ -52,7 +52,7 @@ export default function Filter() {
52 52 .map((item: PmsStoragePartShop.Option) => ({value: item.id, label: item.name}))}
53 53 />
54 54 <PmsSelect
55   - style={{ width: 150, marginRight: 10}}
  55 + style={{ width: 180, marginRight: 10, marginBottom: 10 }}
56 56 allowClear
57 57 value={innerParams.storageId}
58 58 onChange={value => {
... ... @@ -66,7 +66,7 @@ export default function Filter() {
66 66 />
67 67 <PmsSelect
68 68 allowClear
69   - style={{ width: 150, marginRight: 10}}
  69 + style={{ width: 180, marginRight: 10, marginBottom: 10 }}
70 70 onChange={(type) => {
71 71 setParams({ ...innerParams, current: 1, type }, true);
72 72 }}
... ... @@ -77,7 +77,7 @@ export default function Filter() {
77 77 allowClear
78 78 placeholder="有无库存筛选"
79 79 onChange={v => isStock(v)}
80   - style={{ width: 150, marginRight: 10 }}
  80 + style={{ width: 180, marginRight: 10, marginBottom: 10 }}
81 81 options={[
82 82 {value: 1, label: "有库存"},
83 83 {value: 0, label: "无库存"},
... ... @@ -87,7 +87,7 @@ export default function Filter() {
87 87 placeholder="排序方式"
88 88 defaultValue={18}
89 89 onChange={v => isSorter(v)}
90   - style={{ width: 150 }}
  90 + style={{ width: 180 }}
91 91 options={[
92 92 {value: 18, label: "总库存降序"},
93 93 {value: 21, label: "锁定库存降序"},
... ...
src/pages/pms/storage/partShop/index.tsx
  View file @71a2ef4
1 1 import React, {useState} from 'react';
2   -import { PlusOutlined, VerticalAlignBottomOutlined } from '@ant-design/icons';
  2 +import { PlusOutlined, DownloadOutlined, UploadOutlined } from '@ant-design/icons';
3 3 import { Card, Button } from 'antd';
4 4 import { PageHeaderWrapper } from '@ant-design/pro-layout';
5 5 import Filter from './components/Filter';
... ... @@ -20,53 +20,51 @@ function PartShop() {
20 20 return (
21 21 <PageHeaderWrapper title={`服务站配件${fw ? '(霏微)': ''}`}>
22 22 <Card>
23   - <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', marginBottom: 20 }}>
  23 + <div style={{ display: 'flex', flexDirection: 'row', justifyContent: 'space-between', alignItems: 'flex-start', marginBottom: 20 }}>
24 24 <Filter />
25   - <div style={{display: 'flex', flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center'}}>
  25 + <div style={{ display: 'flex', alignItems: 'center'}}>
  26 + <Button
  27 + type="primary"
  28 + icon={<PlusOutlined />}
  29 + onClick={() => { setVisible(true); setIsadd(true); }}
  30 + >
  31 + 新增
  32 + </Button>
26 33 {fw && (
27   - <>
28   - <Button
29   - icon={(<PlusOutlined />)}
30   - type="primary"
31   - onClick={() => setImportVisible(true)}
32   - >
33   - 导入
34   - </Button>
35   - <Button
36   - icon={(<PlusOutlined />)}
37   - type="primary"
38   - onClick={() => { setImportVisible(true); setStock(true); }}
39   - style={{marginLeft: 10}}
40   - >
41   - 调运库存导入
42   - </Button>
43   - </>
44   - )}
45   - {/* {!fw && ( */}
46 34 <Button
  35 + icon={<UploadOutlined />}
47 36 type="primary"
48   - icon={<VerticalAlignBottomOutlined />}
49   - onClick={() => { setMore(true); setIslock(true); }}
  37 + onClick={() => setImportVisible(true)}
  38 + style={{ marginLeft: 10 }}
  39 + >
  40 + 导入
  41 + </Button>
  42 + )}
  43 + {fw && (
  44 + <Button
  45 + icon={<UploadOutlined />}
  46 + type="primary"
  47 + onClick={() => { setImportVisible(true); setStock(true); }}
50 48 style={{marginLeft: 10}}
51 49 >
52   - 锁件批量导出
  50 + 调运库存导入
53 51 </Button>
54   - {/* )} */}
  52 + )}
55 53 <Button
56 54 type="primary"
57   - icon={<VerticalAlignBottomOutlined />}
58   - onClick={() => setMore(true)}
  55 + icon={<DownloadOutlined />}
  56 + onClick={() => { setMore(true); setIslock(true); }}
59 57 style={{marginLeft: 10}}
60 58 >
61   - 库存批量导出
  59 + 锁件批量导出
62 60 </Button>
63 61 <Button
64 62 type="primary"
65   - icon={<PlusOutlined />}
66   - onClick={() => { setVisible(true); setIsadd(true); }}
67   - style={{ marginLeft: 10}}
  63 + icon={<DownloadOutlined />}
  64 + onClick={() => setMore(true)}
  65 + style={{marginLeft: 10}}
68 66 >
69   - 新增
  67 + 库存批量导出
70 68 </Button>
71 69 </div>
72 70 </div>
... ...
src/pages/pms/transfer/transferPool/comonents/Filiter.tsx
  View file @71a2ef4
... ... @@ -26,9 +26,9 @@ export default function Index() {
26 26 <Input.Search
27 27 allowClear
28 28 enterButton
29   - placeholder="输入关键词进行搜索"
  29 + placeholder="输入关键词搜索"
30 30 onSearch={(value, event) => setParams({keywords: value}, true)}
31   - style={{ width: 220, marginRight: 10 }}
  31 + style={{ width: 200, marginRight: 10, marginBottom: 10 }}
32 32 />
33 33 <PmsSelect
34 34 style={{width: 200, marginRight: 10}}
... ...