diff --git a/src/pages/pms/storage/partShop/components/Filter.tsx b/src/pages/pms/storage/partShop/components/Filter.tsx index 4fc9f5c..8894dd1 100644 --- a/src/pages/pms/storage/partShop/components/Filter.tsx +++ b/src/pages/pms/storage/partShop/components/Filter.tsx @@ -32,14 +32,14 @@ export default function Filter() { return (
handleChangeKeywords(v)} /> { @@ -52,7 +52,7 @@ export default function Filter() { .map((item: PmsStoragePartShop.Option) => ({value: item.id, label: item.name}))} /> { @@ -66,7 +66,7 @@ export default function Filter() { /> { setParams({ ...innerParams, current: 1, type }, true); }} @@ -77,7 +77,7 @@ export default function Filter() { allowClear placeholder="有无库存筛选" onChange={v => isStock(v)} - style={{ width: 150, marginRight: 10 }} + style={{ width: 180, marginRight: 10, marginBottom: 10 }} options={[ {value: 1, label: "有库存"}, {value: 0, label: "无库存"}, @@ -87,7 +87,7 @@ export default function Filter() { placeholder="排序方式" defaultValue={18} onChange={v => isSorter(v)} - style={{ width: 150 }} + style={{ width: 180 }} options={[ {value: 18, label: "总库存降序"}, {value: 21, label: "锁定库存降序"}, diff --git a/src/pages/pms/storage/partShop/index.tsx b/src/pages/pms/storage/partShop/index.tsx index 58b61ab..0627080 100644 --- a/src/pages/pms/storage/partShop/index.tsx +++ b/src/pages/pms/storage/partShop/index.tsx @@ -1,5 +1,5 @@ import React, {useState} from 'react'; -import { PlusOutlined, VerticalAlignBottomOutlined } from '@ant-design/icons'; +import { PlusOutlined, DownloadOutlined, UploadOutlined } from '@ant-design/icons'; import { Card, Button } from 'antd'; import { PageHeaderWrapper } from '@ant-design/pro-layout'; import Filter from './components/Filter'; @@ -20,53 +20,51 @@ function PartShop() { return ( -
+
-
+
+ {fw && ( - <> - - - - )} - {/* {!fw && ( */} + )} + {fw && ( + - {/* )} */} + )}
diff --git a/src/pages/pms/transfer/transferPool/comonents/Filiter.tsx b/src/pages/pms/transfer/transferPool/comonents/Filiter.tsx index 28a6125..451f1bf 100644 --- a/src/pages/pms/transfer/transferPool/comonents/Filiter.tsx +++ b/src/pages/pms/transfer/transferPool/comonents/Filiter.tsx @@ -26,9 +26,9 @@ export default function Index() { setParams({keywords: value}, true)} - style={{ width: 220, marginRight: 10 }} + style={{ width: 200, marginRight: 10, marginBottom: 10 }} />