Commit aa50ec14ba9145d23c5d3b1e6428412c3b2f3a67
1 parent
0f90ccf3
服务站配件fix
Showing
2 changed files
with
13 additions
and
33 deletions
src/pages/pms/storage/partShop/components/PartShopModal.tsx
| ... | ... | @@ -18,31 +18,10 @@ export default function PartShopModal() { |
| 18 | 18 | } else { |
| 19 | 19 | setIsadd(false); |
| 20 | 20 | setIsprice(false); |
| 21 | - form.setFieldsValue({ | |
| 22 | - costPrice: "", | |
| 23 | - stock: 0, | |
| 24 | - lockStock: 0, | |
| 25 | - shopId: "", | |
| 26 | - part: "", | |
| 27 | - user: "", | |
| 28 | - fixRemark: "" | |
| 29 | - }); | |
| 30 | - } | |
| 31 | - }, [visible]); | |
| 32 | - | |
| 33 | - useEffect(() => { | |
| 34 | - if (isadd) { | |
| 35 | 21 | setItem({}); |
| 36 | - console.log(isadd, item); | |
| 37 | - form.setFieldsValue({ | |
| 38 | - costPrice: "", | |
| 39 | - stock: 0, | |
| 40 | - lockStock: 0, | |
| 41 | - shopId: "", | |
| 42 | - part: "" | |
| 43 | - }); | |
| 22 | + form.resetFields(); | |
| 44 | 23 | } |
| 45 | - }, [isadd]); | |
| 24 | + }, [visible]); | |
| 46 | 25 | |
| 47 | 26 | const handleSubmit = () => { |
| 48 | 27 | form.validateFields().then(values => { |
| ... | ... | @@ -50,11 +29,12 @@ export default function PartShopModal() { |
| 50 | 29 | ...item, |
| 51 | 30 | partId: values.part.partId, |
| 52 | 31 | costPrice: values.costPrice, |
| 53 | - stock: values.stock, | |
| 54 | - lockStock: values.lockStock, | |
| 32 | + stock: values.stock || 0, | |
| 33 | + lockStock: values.lockStock || 0, | |
| 55 | 34 | shopId: values.shopId, |
| 56 | 35 | user: values.user, |
| 57 | - fixRemark: values.fixRemark | |
| 36 | + fixRemark: values.fixRemark, | |
| 37 | + type: isadd ? 1 : isprice ? 3 : 2 | |
| 58 | 38 | }; |
| 59 | 39 | setConfirmLoading(true); |
| 60 | 40 | savePartShopApi(params).then(res => { |
| ... | ... | @@ -76,8 +56,7 @@ export default function PartShopModal() { |
| 76 | 56 | |
| 77 | 57 | const validatorLockStock = (rule: any, value: number) => { |
| 78 | 58 | if (value > form.getFieldsValue(['stock']).stock) { |
| 79 | - // eslint-disable-next-line prefer-promise-reject-errors | |
| 80 | - return Promise.reject('锁定库存不能超过总库存数量！'); | |
| 59 | + return Promise.reject(new Error('锁定库存不能超过总库存数量！')); | |
| 81 | 60 | } else return Promise.resolve(); |
| 82 | 61 | }; |
| 83 | 62 | |
| ... | ... | @@ -113,13 +92,13 @@ export default function PartShopModal() { |
| 113 | 92 | <ChoosePart disabled={!!item.id} /> |
| 114 | 93 | </Item> |
| 115 | 94 | <Item label="加权成本价(元)" name="costPrice" rules={[{ required: true, message: "请输入加权成本价" }]}> |
| 116 | - <InputNumber style={{ width: "100%" }} min={0} step={0.1} placeholder="加权成本价(元)" /> | |
| 95 | + <InputNumber style={{ width: "100%" }} min={0} step={0.1} placeholder="加权成本价(元)" disabled={!(isadd || isprice)} /> | |
| 117 | 96 | </Item> |
| 118 | - <Item label="总库存数量" name="stock" rules={[{ required: true, message: "请输入总库存数量" }]}> | |
| 119 | - <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="总库存数量" disabled={isprice || isadd} /> | |
| 97 | + <Item label="总库存数量" name="stock"> | |
| 98 | + <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="总库存数量" disabled={isprice || isadd} defaultValue={0} /> | |
| 120 | 99 | </Item> |
| 121 | - <Item label="锁定库存" name="lockStock" rules={[{ required: true, message: "请输入锁定库存" }, { validator: validatorLockStock }]}> | |
| 122 | - <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled /> | |
| 100 | + <Item label="锁定库存" name="lockStock" rules={[{ validator: validatorLockStock }]}> | |
| 101 | + <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled defaultValue={0} /> | |
| 123 | 102 | </Item> |
| 124 | 103 | {!!fw && !isprice && !isadd && ( |
| 125 | 104 | <Item label="修改人" name="user" rules={[{ required: true, message: "请输入修改人" }]}> | ... | ... |
src/pages/pms/storage/partShop/interface.d.ts