diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModal.tsx
index 8b657cf..f4e80fe 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModal.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModal.tsx
@@ -110,11 +110,7 @@ export default function AddCommissionParamsModal(props: Props) {
   }
   function handSubmit(fieldsValue: any) {
     const pa: any = transformDTO(fieldsValue);
-    // if (pa.targetValue) {
     pa.targetType = targetType;
-    // } else {
-    //   pa.targetType = 1;
-    // }
     pa.codeType = codeType;
     pa.dataType = dataType;
     console.log("100pa", pa);
@@ -123,7 +119,6 @@ export default function AddCommissionParamsModal(props: Props) {
     if (!comItem.code) {
       const tmpIds = [...selectedIndicators];
       tmpIds.push(newItemId);
-      // setSelectedIndicators([...tmpIds]);
     } else {
       pa.code = comItem.code;
       pa.name = comItem.name;
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSal.tsx
index ec1485a..1ef8a03 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSal.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSal.tsx
@@ -110,7 +110,11 @@ export default function AddCommissionParamsModal(props: Props) {
   }
   function handSubmit(fieldsValue: any) {
     const pa: any = transformDTO(fieldsValue);
-    pa.targetType = targetType;
+    if (pa.targetValue !== undefined) {
+      pa.targetType = targetType;
+    } else {
+      pa.targetType = 1;
+    }
     pa.codeType = codeType;
     pa.dataType = dataType;
     console.log("100pa", pa);
@@ -124,21 +128,6 @@ export default function AddCommissionParamsModal(props: Props) {
       pa.code = comItem.code;
       pa.name = comItem.name;
     }
-    pa.extraTargetType = pa.targetType;
-    if (comItem.codeType == 1 && multiStage) {
-      if (pa.targetValue) {
-        pa.targetType = targetType;
-        pa.targetCalcType = 3;
-      } else {
-        pa.targetType = 1;
-      }
-      if (pa.extraTargetValue) {
-        pa.extraTargetType = targetType;
-        pa.extraTargetCalcType = 4;
-      } else {
-        pa.extraTargetType = 1;
-      }
-    }
     onOk(pa);
     onCancel && onCancel();
   }
@@ -156,13 +145,7 @@ export default function AddCommissionParamsModal(props: Props) {
       width={1000}
     >
       <Spin spinning={loading}>
-        <Form
-          form={form}
-          // labelCol={{ span: 6 }}
-          // wrapperCol={{ span: 18 }}
-          onFinish={handSubmit}
-          style={{ width: "70%", marginLeft: 150 }}
-        >
+        <Form form={form} onFinish={handSubmit} style={{ width: "70%", marginLeft: 150 }}>
           <Form.Item name="commissionParams" label="计分指标" rules={[{ required: true, message: "计分指标" }]}>
             <Select
               placeholder="选择指标(*为考评指标,无*为绩效指标)"
@@ -233,127 +216,38 @@ export default function AddCommissionParamsModal(props: Props) {
               <Form.Item label="考核目标名称" name="targetName">
                 <Select disabled defaultValue={indicatorName} />
               </Form.Item>
-              {comItem.codeType == 1 && multiStage ? (
-                <>
-                  <Form.Item
-                    noStyle
-                    shouldUpdate={(prevValues, currentValues) =>
-                      prevValues.extraTargetValue !== currentValues.extraTargetValue
-                    }
-                  >
-                    {({ getFieldValue }) => {
-                      const extraTargetValue = getFieldValue("extraTargetValue");
-                      return (
-                        <>
-                          <Form.Item
-                            label="阶段目标考核值"
-                            name="targetValue"
-                            rules={[
-                              { required: !extraTargetValue, message: "请输入阶段目标考核值" },
-                              {
-                                pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                                message:
-                                  targetType === TargetTypeEnum["百分比"]
-                                    ? "请输入大于0小于等于100的数(保留两位小数)"
-                                    : "请输入大于0的数(保留两位小数)",
-                              },
-                            ]}
-                          >
-                            <InputNumber
-                              placeholder="请输入阶段目标考核值"
-                              style={{ width: "100%" }}
-                              addonAfter={
-                                targetType === TargetTypeEnum["百分比"]
-                                  ? "%"
-                                  : targetType === TargetTypeEnum["金额"]
-                                  ? "元"
-                                  : "台"
-                              }
-                            />
-                          </Form.Item>
-                        </>
-                      );
-                    }}
-                  </Form.Item>
-                  <Form.Item
-                    noStyle
-                    shouldUpdate={(prevValues, currentValues) => prevValues.targetValue !== currentValues.targetValue}
-                  >
-                    {({ getFieldValue }) => {
-                      const targetValue = getFieldValue("targetValue");
-                      return (
-                        <>
-                          <Form.Item
-                            label="时间进度目标值"
-                            name="extraTargetValue"
-                            rules={[
-                              { required: !targetValue, message: "请输入时间进度目标值" },
-                              {
-                                pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                                message:
-                                  targetType === TargetTypeEnum["百分比"]
-                                    ? "请输入大于0小于等于100的数(保留两位小数)"
-                                    : "请输入大于0的数(保留两位小数)",
-                              },
-                            ]}
-                          >
-                            <InputNumber
-                              placeholder="请输入时间进度目标值"
-                              style={{ width: "100%" }}
-                              addonAfter={
-                                targetType === TargetTypeEnum["百分比"]
-                                  ? "%"
-                                  : targetType === TargetTypeEnum["金额"]
-                                  ? "元"
-                                  : "台"
-                              }
-                            />
-                          </Form.Item>
-                        </>
-                      );
-                    }}
-                  </Form.Item>
-                </>
-              ) : (
-                <>
-                  <Form.Item
-                    label="考核目标计算类型"
-                    name="targetCalcType"
-                    rules={[{ required: true, message: "请选择考核目标计算类型" }]}
-                  >
-                    <Radio.Group>
-                      <Radio value={1}>考核目标值计算 </Radio>
-                      <Radio value={2}>最低要求计算</Radio>
-                    </Radio.Group>
-                  </Form.Item>
-                  <Form.Item
-                    label="考核目标值"
-                    name="targetValue"
-                    rules={[
-                      { required: true, message: "请输入考核目标值" },
-                      {
-                        pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                        message:
-                          targetType === TargetTypeEnum["百分比"]
-                            ? "请输入大于0小于等于100的数(保留两位小数)"
-                            : "请输入大于0的数(保留两位小数)",
-                      },
-                    ]}
-                  >
-                    <InputNumber
-                      placeholder="请输入考核目标值"
-                      style={{ width: "100%" }}
-                      addonAfter={
-                        targetType === TargetTypeEnum["百分比"]
-                          ? "%"
-                          : targetType === TargetTypeEnum["金额"]
-                          ? "元"
-                          : "台"
-                      }
-                    />
-                  </Form.Item>
-                </>
-              )}
+              <Form.Item
+                label="考核目标计算类型"
+                name="targetCalcType"
+                rules={[{ required: true, message: "请选择考核目标计算类型" }]}
+              >
+                <Radio.Group>
+                  <Radio value={1}>考核目标值计算 </Radio>
+                  <Radio value={2}>最低要求计算</Radio>
+                </Radio.Group>
+              </Form.Item>
+              <Form.Item
+                label="考核目标值"
+                name="targetValue"
+                rules={[
+                  { required: true, message: "请输入考核目标值" },
+                  {
+                    pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
+                    message:
+                      targetType === TargetTypeEnum["百分比"]
+                        ? "请输入大于0小于等于100的数(保留两位小数)"
+                        : "请输入大于0的数(保留两位小数)",
+                  },
+                ]}
+              >
+                <InputNumber
+                  placeholder="请输入考核目标值"
+                  style={{ width: "100%" }}
+                  addonAfter={
+                    targetType === TargetTypeEnum["百分比"] ? "%" : targetType === TargetTypeEnum["金额"] ? "元" : "台"
+                  }
+                />
+              </Form.Item>
             </>
           )}
         </Form>
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSalShop.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSalShop.tsx
index 864a234..0f36212 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSalShop.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSalShop.tsx
@@ -111,7 +111,11 @@ export default function AddCommissionParamsModal(props: Props) {
   }
   function handSubmit(fieldsValue: any) {
     const pa: any = transformDTO(fieldsValue);
-    pa.targetType = targetType;
+    if (pa.targetValue !== undefined) {
+      pa.targetType = targetType;
+    } else {
+      pa.targetType = 1;
+    }
     pa.codeType = codeType;
     pa.dataType = dataType;
     console.log("100pa", pa);
@@ -125,21 +129,6 @@ export default function AddCommissionParamsModal(props: Props) {
       pa.code = comItem.code;
       pa.name = comItem.name;
     }
-    pa.extraTargetType = pa.targetType;
-    if (comItem.codeType == 1 && multiStage) {
-      if (pa.targetValue) {
-        pa.targetType = targetType;
-        pa.targetCalcType = 3;
-      } else {
-        pa.targetType = 1;
-      }
-      if (pa.extraTargetValue) {
-        pa.extraTargetType = targetType;
-        pa.extraTargetCalcType = 4;
-      } else {
-        pa.extraTargetType = 1;
-      }
-    }
     onOk(pa);
     onCancel && onCancel();
   }
@@ -157,13 +146,7 @@ export default function AddCommissionParamsModal(props: Props) {
       width={1000}
     >
       <Spin spinning={loading}>
-        <Form
-          form={form}
-          // labelCol={{ span: 6 }}
-          // wrapperCol={{ span: 18 }}
-          onFinish={handSubmit}
-          style={{ width: "70%", marginLeft: 150 }}
-        >
+        <Form form={form} onFinish={handSubmit} style={{ width: "70%", marginLeft: 150 }}>
           <Form.Item name="commissionParams" label="计分指标" rules={[{ required: true, message: "计分指标" }]}>
             <Select
               placeholder="选择指标(*为考评指标,无*为绩效指标)"
@@ -234,127 +217,38 @@ export default function AddCommissionParamsModal(props: Props) {
               <Form.Item label="考核目标名称" name="targetName">
                 <Select disabled defaultValue={indicatorName} />
               </Form.Item>
-              {comItem.codeType == 1 && multiStage ? (
-                <>
-                  <Form.Item
-                    noStyle
-                    shouldUpdate={(prevValues, currentValues) =>
-                      prevValues.extraTargetValue !== currentValues.extraTargetValue
-                    }
-                  >
-                    {({ getFieldValue }) => {
-                      const extraTargetValue = getFieldValue("extraTargetValue");
-                      return (
-                        <>
-                          <Form.Item
-                            label="阶段目标考核值"
-                            name="targetValue"
-                            rules={[
-                              { required: !extraTargetValue, message: "请输入阶段目标考核值" },
-                              {
-                                pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                                message:
-                                  targetType === TargetTypeEnum["百分比"]
-                                    ? "请输入大于0小于等于100的数(保留两位小数)"
-                                    : "请输入大于0的数(保留两位小数)",
-                              },
-                            ]}
-                          >
-                            <InputNumber
-                              placeholder="请输入阶段目标考核值"
-                              style={{ width: "100%" }}
-                              addonAfter={
-                                targetType === TargetTypeEnum["百分比"]
-                                  ? "%"
-                                  : targetType === TargetTypeEnum["金额"]
-                                  ? "元"
-                                  : "台"
-                              }
-                            />
-                          </Form.Item>
-                        </>
-                      );
-                    }}
-                  </Form.Item>
-                  <Form.Item
-                    noStyle
-                    shouldUpdate={(prevValues, currentValues) => prevValues.targetValue !== currentValues.targetValue}
-                  >
-                    {({ getFieldValue }) => {
-                      const targetValue = getFieldValue("targetValue");
-                      return (
-                        <>
-                          <Form.Item
-                            label="时间进度目标值"
-                            name="extraTargetValue"
-                            rules={[
-                              { required: !targetValue, message: "请输入时间进度目标值" },
-                              {
-                                pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                                message:
-                                  targetType === TargetTypeEnum["百分比"]
-                                    ? "请输入大于0小于等于100的数(保留两位小数)"
-                                    : "请输入大于0的数(保留两位小数)",
-                              },
-                            ]}
-                          >
-                            <InputNumber
-                              placeholder="请输入时间进度目标值"
-                              style={{ width: "100%" }}
-                              addonAfter={
-                                targetType === TargetTypeEnum["百分比"]
-                                  ? "%"
-                                  : targetType === TargetTypeEnum["金额"]
-                                  ? "元"
-                                  : "台"
-                              }
-                            />
-                          </Form.Item>
-                        </>
-                      );
-                    }}
-                  </Form.Item>
-                </>
-              ) : (
-                <>
-                  <Form.Item
-                    label="考核目标计算类型"
-                    name="targetCalcType"
-                    rules={[{ required: true, message: "请选择考核目标计算类型" }]}
-                  >
-                    <Radio.Group>
-                      <Radio value={1}>考核目标值计算 </Radio>
-                      <Radio value={2}>最低要求计算</Radio>
-                    </Radio.Group>
-                  </Form.Item>
-                  <Form.Item
-                    label="考核目标值"
-                    name="targetValue"
-                    rules={[
-                      { required: true, message: "请输入考核目标值" },
-                      {
-                        pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                        message:
-                          targetType === TargetTypeEnum["百分比"]
-                            ? "请输入大于0小于等于100的数(保留两位小数)"
-                            : "请输入大于0的数(保留两位小数)",
-                      },
-                    ]}
-                  >
-                    <InputNumber
-                      placeholder="请输入考核目标值"
-                      style={{ width: "100%" }}
-                      addonAfter={
-                        targetType === TargetTypeEnum["百分比"]
-                          ? "%"
-                          : targetType === TargetTypeEnum["金额"]
-                          ? "元"
-                          : "台"
-                      }
-                    />
-                  </Form.Item>
-                </>
-              )}
+              <Form.Item
+                label="考核目标计算类型"
+                name="targetCalcType"
+                rules={[{ required: true, message: "请选择考核目标计算类型" }]}
+              >
+                <Radio.Group>
+                  <Radio value={1}>考核目标值计算 </Radio>
+                  <Radio value={2}>最低要求计算</Radio>
+                </Radio.Group>
+              </Form.Item>
+              <Form.Item
+                label="考核目标值"
+                name="targetValue"
+                rules={[
+                  { required: true, message: "请输入考核目标值" },
+                  {
+                    pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
+                    message:
+                      targetType === TargetTypeEnum["百分比"]
+                        ? "请输入大于0小于等于100的数(保留两位小数)"
+                        : "请输入大于0的数(保留两位小数)",
+                  },
+                ]}
+              >
+                <InputNumber
+                  placeholder="请输入考核目标值"
+                  style={{ width: "100%" }}
+                  addonAfter={
+                    targetType === TargetTypeEnum["百分比"] ? "%" : targetType === TargetTypeEnum["金额"] ? "元" : "台"
+                  }
+                />
+              </Form.Item>
             </>
           )}
         </Form>
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSal.tsx
index 2cc42a8..85dfd9a 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSal.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSal.tsx
@@ -103,7 +103,11 @@ export default function AddLadderParamsModal(props: Props) {
   }
   function handSubmit(fieldsValue: any) {
     const pa: any = transformDTO(fieldsValue);
-    pa.targetType = targetType;
+    if (pa.targetValue !== undefined) {
+      pa.targetType = targetType;
+    } else {
+      pa.targetType = 1;
+    }
     pa.codeType = codeType;
     if (comItem.dataType) {
       pa.dataType = comItem.dataType;
@@ -122,21 +126,6 @@ export default function AddLadderParamsModal(props: Props) {
       pa.code = comItem.code;
       pa.name = comItem.name;
     }
-    pa.extraTargetType = pa.targetType;
-    if (comItem.codeType == 1 && multiStage) {
-      if (pa.targetValue) {
-        pa.targetType = targetType;
-        pa.targetCalcType = 3;
-      } else {
-        pa.targetType = 1;
-      }
-      if (pa.extraTargetValue) {
-        pa.extraTargetType = targetType;
-        pa.extraTargetCalcType = 4;
-      } else {
-        pa.extraTargetType = 1;
-      }
-    }
     onOk(pa);
     onCancel && onCancel();
   }
@@ -154,13 +143,7 @@ export default function AddLadderParamsModal(props: Props) {
       width={1000}
     >
       <Spin spinning={loading}>
-        <Form
-          form={form}
-          // labelCol={{ span: 6 }}
-          // wrapperCol={{ span: 18 }}
-          onFinish={handSubmit}
-          style={{ width: "70%", marginLeft: 150 }}
-        >
+        <Form form={form} onFinish={handSubmit} style={{ width: "70%", marginLeft: 150 }}>
           <Form.Item name="ladderParams" label="计分指标" rules={[{ required: true, message: "计分指标" }]}>
             <Select
               placeholder="选择指标(*为考评指标,无*为绩效指标)"
@@ -231,127 +214,38 @@ export default function AddLadderParamsModal(props: Props) {
               <Form.Item label="考核目标名称" name="targetName">
                 <Select disabled defaultValue={name} />
               </Form.Item>
-              {comItem.codeType == 1 && multiStage ? (
-                <>
-                  <Form.Item
-                    noStyle
-                    shouldUpdate={(prevValues, currentValues) =>
-                      prevValues.extraTargetValue !== currentValues.extraTargetValue
-                    }
-                  >
-                    {({ getFieldValue }) => {
-                      const extraTargetValue = getFieldValue("extraTargetValue");
-                      return (
-                        <>
-                          <Form.Item
-                            label="阶段目标考核值"
-                            name="targetValue"
-                            rules={[
-                              { required: !extraTargetValue, message: "请输入阶段目标考核值" },
-                              {
-                                pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                                message:
-                                  targetType === TargetTypeEnum["百分比"]
-                                    ? "请输入大于0小于等于100的数(保留两位小数)"
-                                    : "请输入大于0的数(保留两位小数)",
-                              },
-                            ]}
-                          >
-                            <InputNumber
-                              placeholder="请输入阶段目标考核值"
-                              style={{ width: "100%" }}
-                              addonAfter={
-                                targetType === TargetTypeEnum["百分比"]
-                                  ? "%"
-                                  : targetType === TargetTypeEnum["金额"]
-                                  ? "元"
-                                  : "台"
-                              }
-                            />
-                          </Form.Item>
-                        </>
-                      );
-                    }}
-                  </Form.Item>
-                  <Form.Item
-                    noStyle
-                    shouldUpdate={(prevValues, currentValues) => prevValues.targetValue !== currentValues.targetValue}
-                  >
-                    {({ getFieldValue }) => {
-                      const targetValue = getFieldValue("targetValue");
-                      return (
-                        <>
-                          <Form.Item
-                            label="时间进度目标值"
-                            name="extraTargetValue"
-                            rules={[
-                              { required: !targetValue, message: "请输入时间进度目标值" },
-                              {
-                                pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                                message:
-                                  targetType === TargetTypeEnum["百分比"]
-                                    ? "请输入大于0小于等于100的数(保留两位小数)"
-                                    : "请输入大于0的数(保留两位小数)",
-                              },
-                            ]}
-                          >
-                            <InputNumber
-                              placeholder="请输入时间进度目标值"
-                              style={{ width: "100%" }}
-                              addonAfter={
-                                targetType === TargetTypeEnum["百分比"]
-                                  ? "%"
-                                  : targetType === TargetTypeEnum["金额"]
-                                  ? "元"
-                                  : "台"
-                              }
-                            />
-                          </Form.Item>
-                        </>
-                      );
-                    }}
-                  </Form.Item>
-                </>
-              ) : (
-                <>
-                  <Form.Item
-                    label="考核目标计算类型"
-                    name="targetCalcType"
-                    rules={[{ required: true, message: "请选择考核目标计算类型" }]}
-                  >
-                    <Radio.Group>
-                      <Radio value={1}>考核目标值计算 </Radio>
-                      <Radio value={2}>最低要求计算</Radio>
-                    </Radio.Group>
-                  </Form.Item>
-                  <Form.Item
-                    label="考核目标值"
-                    name="targetValue"
-                    rules={[
-                      { required: true, message: "请输入考核目标值" },
-                      {
-                        pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                        message:
-                          targetType === TargetTypeEnum["百分比"]
-                            ? "请输入大于0小于等于100的数(保留两位小数)"
-                            : "请输入大于0的数(保留两位小数)",
-                      },
-                    ]}
-                  >
-                    <InputNumber
-                      placeholder="请输入考核目标值"
-                      style={{ width: "100%" }}
-                      addonAfter={
-                        targetType === TargetTypeEnum["百分比"]
-                          ? "%"
-                          : targetType === TargetTypeEnum["金额"]
-                          ? "元"
-                          : "台"
-                      }
-                    />
-                  </Form.Item>
-                </>
-              )}
+              <Form.Item
+                label="考核目标计算类型"
+                name="targetCalcType"
+                rules={[{ required: true, message: "请选择考核目标计算类型" }]}
+              >
+                <Radio.Group>
+                  <Radio value={1}>考核目标值计算 </Radio>
+                  <Radio value={2}>最低要求计算</Radio>
+                </Radio.Group>
+              </Form.Item>
+              <Form.Item
+                label="考核目标值"
+                name="targetValue"
+                rules={[
+                  { required: true, message: "请输入考核目标值" },
+                  {
+                    pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
+                    message:
+                      targetType === TargetTypeEnum["百分比"]
+                        ? "请输入大于0小于等于100的数(保留两位小数)"
+                        : "请输入大于0的数(保留两位小数)",
+                  },
+                ]}
+              >
+                <InputNumber
+                  placeholder="请输入考核目标值"
+                  style={{ width: "100%" }}
+                  addonAfter={
+                    targetType === TargetTypeEnum["百分比"] ? "%" : targetType === TargetTypeEnum["金额"] ? "元" : "台"
+                  }
+                />
+              </Form.Item>
             </>
           )}
         </Form>
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSalShop.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSalShop.tsx
index 23dad57..7ee9bcb 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSalShop.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSalShop.tsx
@@ -104,7 +104,11 @@ export default function AddLadderParamsModal(props: Props) {
   }
   function handSubmit(fieldsValue: any) {
     const pa: any = transformDTO(fieldsValue);
-    pa.targetType = targetType;
+    if (pa.targetValue !== undefined) {
+      pa.targetType = targetType;
+    } else {
+      pa.targetType = 1;
+    }
     pa.codeType = codeType;
     if (comItem.dataType) {
       pa.dataType = comItem.dataType;
@@ -123,21 +127,6 @@ export default function AddLadderParamsModal(props: Props) {
       pa.code = comItem.code;
       pa.name = comItem.name;
     }
-    pa.extraTargetType = pa.targetType;
-    if (comItem.codeType == 1 && multiStage) {
-      if (pa.targetValue) {
-        pa.targetType = targetType;
-        pa.targetCalcType = 3;
-      } else {
-        pa.targetType = 1;
-      }
-      if (pa.extraTargetValue) {
-        pa.extraTargetType = targetType;
-        pa.extraTargetCalcType = 4;
-      } else {
-        pa.extraTargetType = 1;
-      }
-    }
     onOk(pa);
     onCancel && onCancel();
   }
@@ -155,13 +144,7 @@ export default function AddLadderParamsModal(props: Props) {
       width={1000}
     >
       <Spin spinning={loading}>
-        <Form
-          form={form}
-          // labelCol={{ span: 6 }}
-          // wrapperCol={{ span: 18 }}
-          onFinish={handSubmit}
-          style={{ width: "70%", marginLeft: 150 }}
-        >
+        <Form form={form} onFinish={handSubmit} style={{ width: "70%", marginLeft: 150 }}>
           <Form.Item name="ladderParams" label="计分指标" rules={[{ required: true, message: "计分指标" }]}>
             <Select
               placeholder="选择指标(*为考评指标,无*为绩效指标)"
@@ -232,127 +215,38 @@ export default function AddLadderParamsModal(props: Props) {
               <Form.Item label="考核目标名称" name="targetName">
                 <Select disabled defaultValue={name} />
               </Form.Item>
-              {comItem.codeType == 1 && multiStage ? (
-                <>
-                  <Form.Item
-                    noStyle
-                    shouldUpdate={(prevValues, currentValues) =>
-                      prevValues.extraTargetValue !== currentValues.extraTargetValue
-                    }
-                  >
-                    {({ getFieldValue }) => {
-                      const extraTargetValue = getFieldValue("extraTargetValue");
-                      return (
-                        <>
-                          <Form.Item
-                            label="阶段目标考核值"
-                            name="targetValue"
-                            rules={[
-                              { required: !extraTargetValue, message: "请输入阶段目标考核值" },
-                              {
-                                pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                                message:
-                                  targetType === TargetTypeEnum["百分比"]
-                                    ? "请输入大于0小于等于100的数(保留两位小数)"
-                                    : "请输入大于0的数(保留两位小数)",
-                              },
-                            ]}
-                          >
-                            <InputNumber
-                              placeholder="请输入阶段目标考核值"
-                              style={{ width: "100%" }}
-                              addonAfter={
-                                targetType === TargetTypeEnum["百分比"]
-                                  ? "%"
-                                  : targetType === TargetTypeEnum["金额"]
-                                  ? "元"
-                                  : "台"
-                              }
-                            />
-                          </Form.Item>
-                        </>
-                      );
-                    }}
-                  </Form.Item>
-                  <Form.Item
-                    noStyle
-                    shouldUpdate={(prevValues, currentValues) => prevValues.targetValue !== currentValues.targetValue}
-                  >
-                    {({ getFieldValue }) => {
-                      const targetValue = getFieldValue("targetValue");
-                      return (
-                        <>
-                          <Form.Item
-                            label="时间进度目标值"
-                            name="extraTargetValue"
-                            rules={[
-                              { required: !targetValue, message: "请输入时间进度目标值" },
-                              {
-                                pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                                message:
-                                  targetType === TargetTypeEnum["百分比"]
-                                    ? "请输入大于0小于等于100的数(保留两位小数)"
-                                    : "请输入大于0的数(保留两位小数)",
-                              },
-                            ]}
-                          >
-                            <InputNumber
-                              placeholder="请输入时间进度目标值"
-                              style={{ width: "100%" }}
-                              addonAfter={
-                                targetType === TargetTypeEnum["百分比"]
-                                  ? "%"
-                                  : targetType === TargetTypeEnum["金额"]
-                                  ? "元"
-                                  : "台"
-                              }
-                            />
-                          </Form.Item>
-                        </>
-                      );
-                    }}
-                  </Form.Item>
-                </>
-              ) : (
-                <>
-                  <Form.Item
-                    label="考核目标计算类型"
-                    name="targetCalcType"
-                    rules={[{ required: true, message: "请选择考核目标计算类型" }]}
-                  >
-                    <Radio.Group>
-                      <Radio value={1}>考核目标值计算 </Radio>
-                      <Radio value={2}>最低要求计算</Radio>
-                    </Radio.Group>
-                  </Form.Item>
-                  <Form.Item
-                    label="考核目标值"
-                    name="targetValue"
-                    rules={[
-                      { required: true, message: "请输入考核目标值" },
-                      {
-                        pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
-                        message:
-                          targetType === TargetTypeEnum["百分比"]
-                            ? "请输入大于0小于等于100的数(保留两位小数)"
-                            : "请输入大于0的数(保留两位小数)",
-                      },
-                    ]}
-                  >
-                    <InputNumber
-                      placeholder="请输入考核目标值"
-                      style={{ width: "100%" }}
-                      addonAfter={
-                        targetType === TargetTypeEnum["百分比"]
-                          ? "%"
-                          : targetType === TargetTypeEnum["金额"]
-                          ? "元"
-                          : "台"
-                      }
-                    />
-                  </Form.Item>
-                </>
-              )}
+              <Form.Item
+                label="考核目标计算类型"
+                name="targetCalcType"
+                rules={[{ required: true, message: "请选择考核目标计算类型" }]}
+              >
+                <Radio.Group>
+                  <Radio value={1}>考核目标值计算 </Radio>
+                  <Radio value={2}>最低要求计算</Radio>
+                </Radio.Group>
+              </Form.Item>
+              <Form.Item
+                label="考核目标值"
+                name="targetValue"
+                rules={[
+                  { required: true, message: "请输入考核目标值" },
+                  {
+                    pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
+                    message:
+                      targetType === TargetTypeEnum["百分比"]
+                        ? "请输入大于0小于等于100的数(保留两位小数)"
+                        : "请输入大于0的数(保留两位小数)",
+                  },
+                ]}
+              >
+                <InputNumber
+                  placeholder="请输入考核目标值"
+                  style={{ width: "100%" }}
+                  addonAfter={
+                    targetType === TargetTypeEnum["百分比"] ? "%" : targetType === TargetTypeEnum["金额"] ? "元" : "台"
+                  }
+                />
+              </Form.Item>
             </>
           )}
         </Form>