Commit 67f47de1011018cf1b3c5b5a6b3140b1856892f3

Authored by by1642146903
2 parents 4bec49e3 9998e7e7

Merge remote-tracking branch 'origin/bug_fix'

src/pages/performance/EvaGroupSetting/EditComfirm/components/CondLaddersTable.tsx
... ... @@ -205,10 +205,11 @@ const LadderTable = ({ value, onChange, readOnly, visible, type, setladderVisibl
205 205 render: (value: number) => (value && value !== 65536 ? value + "%" : ""),
206 206 },
207 207 {
208   - title: "标准分",
  208 + title: "绩效分折算比例",
209 209 dataIndex: "scorePercent",
210 210 width: "15%",
211 211 editable: true,
  212 + render: (value: number) => value + "%",
212 213 },
213 214 {
214 215 title: "操作",
... ...
src/pages/performance/KpiGroupSetting/EditComfirm/components/CondLaddersTable.tsx
... ... @@ -202,13 +202,14 @@ const LadderTable = ({ value, onChange, readOnly, visible, type, setladderVisibl
202 202 dataIndex: "upper",
203 203 width: "20%",
204 204 editable: true,
205   - render: (value: number) => ((value && value !== 65536) ? (value + "%") : ""),
  205 + render: (value: number) => (value && value !== 65536 ? value + "%" : ""),
206 206 },
207 207 {
208   - title: "标准分",
  208 + title: "绩效分折算比例",
209 209 dataIndex: "scorePercent",
210 210 width: "15%",
211 211 editable: true,
  212 + render: (value: number) => value + "%",
212 213 },
213 214 {
214 215 title: "操作",
... ...
src/pages/pms/storage/partShop/components/PartShopModal.tsx
... ... @@ -29,7 +29,7 @@ export default function PartShopModal() {
29 29 });
30 30 }
31 31 }, [visible]);
32   -
  32 +
33 33 useEffect(() => {
34 34 if (isadd) {
35 35 setItem({});
... ... @@ -119,7 +119,7 @@ export default function PartShopModal() {
119 119 <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="总库存数量" disabled={isprice || isadd} />
120 120 </Item>
121 121 <Item label="锁定库存" name="lockStock" rules={[{ required: true, message: "请输入锁定库存" }, { validator: validatorLockStock }]}>
122   - <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled={isprice || isadd} />
  122 + <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled />
123 123 </Item>
124 124 {!!fw && !isprice && !isadd && (
125 125 <Item label="修改人" name="user" rules={[{ required: true, message: "请输入修改人" }]}>
... ...