Commit 5694d3f437c0eb384f6374f3006b711447ad94e7
1 parent
1cc2bed8
fix(pms): 指定配件计划、库位管理增加筛选
Showing
3 changed files
with
31 additions
and
6 deletions
src/pages/order3/WeeklydataUpload/index.tsx
1 | +/* | |
2 | + * @Author: jiangwei jiangwei.feewee.cn | |
3 | + * @Date: 2024-04-19 10:49:37 | |
4 | + * @LastEditors: jiangwei jiangwei.feewee.cn | |
5 | + * @LastEditTime: 2024-04-19 11:03:43 | |
6 | + * @FilePath: /fw-cms/src/pages/order3/WeeklydataUpload/index.tsx | |
7 | + * @Description: | |
8 | + * | |
9 | + * Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. | |
10 | + */ | |
1 | 11 | import React, { useState } from 'react' |
2 | 12 | import { PageHeaderWrapper } from '@ant-design/pro-layout' |
3 | 13 | import { Button, Card, Table, Tag, Divider, Select } from 'antd' |
... | ... | @@ -80,7 +90,7 @@ export default function Index() { |
80 | 90 | <Column title="状态" dataIndex="status" render={t => <Tag color={t == 1 ? 'orange' : 'green'}>{t == 1 ? '处理中' : '已完成'}</Tag>} /> |
81 | 91 | </Table> |
82 | 92 | </Card> |
83 | - <UploadModal visible={visible} onCancel={() => setVisible(false)} onRefshing={setParams} /> | |
93 | + <UploadModal visible={visible} onCancel={() => setVisible(false)} onRefshing={() => setParams({}, true)} /> | |
84 | 94 | </PageHeaderWrapper> |
85 | 95 | ) |
86 | 96 | } |
87 | 97 | \ No newline at end of file | ... | ... |
src/pages/pms/partPlan/AppointPart/comonents/PartStorageModal.tsx
... | ... | @@ -55,8 +55,8 @@ export default function PartStorageModal({ onCancel, visible, onOk, itemData, se |
55 | 55 | |
56 | 56 | return ( |
57 | 57 | <Modal |
58 | - width={800} | |
59 | - visible={visible} | |
58 | + width={1000} | |
59 | + open={visible} | |
60 | 60 | onCancel={() => { |
61 | 61 | onCancel(); |
62 | 62 | setPartParams({}); |
... | ... | @@ -78,10 +78,10 @@ export default function PartStorageModal({ onCancel, visible, onOk, itemData, se |
78 | 78 | </Button>, |
79 | 79 | ]} |
80 | 80 | > |
81 | - <Form form={form} labelCol={{ span: 3 }} wrapperCol={{ span: 19 }}> | |
81 | + <Form form={form} labelCol={{ span: 2 }} wrapperCol={{ span: 19 }}> | |
82 | 82 | <Item label="库房" name="storageId" required rules={[{ required: true, message: '请选择库房' }]}> |
83 | 83 | <PmsSelect |
84 | - style={{ width: 250 }} | |
84 | + style={{ width: 400 }} | |
85 | 85 | placeholder="请选择库房" |
86 | 86 | value={storageid} |
87 | 87 | onChange={(v) => setStorageid(v)} |
... | ... | @@ -90,7 +90,7 @@ export default function PartStorageModal({ onCancel, visible, onOk, itemData, se |
90 | 90 | </Item> |
91 | 91 | <Item label="供应商" name="supplierId" required rules={[{ required: true, message: '请选择供应商' }]}> |
92 | 92 | <PmsSelect |
93 | - style={{ width: 250 }} | |
93 | + style={{ width: 400 }} | |
94 | 94 | placeholder="请选择供应商" |
95 | 95 | onChange={(v) => setPartParams({ stId: storageid, spId: v })} |
96 | 96 | options={suppliers | ... | ... |
src/pages/pms/storage/LocationManage/index.tsx
... | ... | @@ -36,6 +36,21 @@ export default function RepertoryIndex() { |
36 | 36 | allowClear |
37 | 37 | options={shops.map(i => ({ value: i.shopId, label: i.shopShortName }))} |
38 | 38 | /> |
39 | + <Select | |
40 | + style={{ width: 200, marginRight: 10, marginBottom: 10 }} | |
41 | + placeholder="是否有库存筛选" | |
42 | + onChange={v => { | |
43 | + if (typeof v != 'undefined') { | |
44 | + setParams({ hasStock: !!v }, true) | |
45 | + } else { | |
46 | + setParams({ hasStock: undefined }, true) | |
47 | + } | |
48 | + }} | |
49 | + showSearch | |
50 | + optionFilterProp="children" | |
51 | + allowClear | |
52 | + options={[{ value: 1, label: '是' }, { value: 0, label: '否' }]} | |
53 | + /> | |
39 | 54 | <Search |
40 | 55 | allowClear |
41 | 56 | placeholder="库位号搜索" | ... | ... |