Merge remote-tracking branch 'origin/bug_fix'

by1642146903
2 parents 4bec49e3 9998e7e7
Showing 3 changed files with 7 additions and 5 deletions
src/pages/performance/EvaGroupSetting/EditComfirm/components/CondLaddersTable.tsx
src/pages/performance/KpiGroupSetting/EditComfirm/components/CondLaddersTable.tsx
src/pages/pms/storage/partShop/components/PartShopModal.tsx
@@ -205,10 +205,11 @@ const LadderTable = ({ value, onChange, readOnly, visible, type, setladderVisibl
       render: (value: number) => (value && value !== 65536 ? value + "%" : ""),
     },
     {
-      title: "标准分",
+      title: "绩效分折算比例",
       dataIndex: "scorePercent",
       width: "15%",
       editable: true,
+      render: (value: number) => value + "%",
     },
     {
       title: "操作",
@@ -202,13 +202,14 @@ const LadderTable = ({ value, onChange, readOnly, visible, type, setladderVisibl
       dataIndex: "upper",
       width: "20%",
       editable: true,
-      render: (value: number) => ((value && value !== 65536) ? (value + "%") : ""),
+      render: (value: number) => (value && value !== 65536 ? value + "%" : ""),
     },
     {
-      title: "标准分",
+      title: "绩效分折算比例",
       dataIndex: "scorePercent",
       width: "15%",
       editable: true,
+      render: (value: number) => value + "%",
     },
     {
       title: "操作",
@@ -29,7 +29,7 @@ export default function PartShopModal() {
       });
     }
   }, [visible]);
-  
+
   useEffect(() => {
     if (isadd) {
       setItem({});
@@ -119,7 +119,7 @@ export default function PartShopModal() {
           <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="总库存数量" disabled={isprice || isadd} />
         </Item>
         <Item label="锁定库存" name="lockStock" rules={[{ required: true, message: "请输入锁定库存" }, { validator: validatorLockStock }]}>
-          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled={isprice || isadd} />
+          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled />
         </Item>
         {!!fw && !isprice && !isadd && (
         <Item label="修改人" name="user" rules={[{ required: true, message: "请输入修改人" }]}>