Commit 72f930c44a5927852513ceeffb6bfb9a2ab798ac

Authored by 曾柯
1 parent 1521db5f

考评bugfix

src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModal.tsx
... ... @@ -110,11 +110,7 @@ export default function AddCommissionParamsModal(props: Props) {
110 110 }
111 111 function handSubmit(fieldsValue: any) {
112 112 const pa: any = transformDTO(fieldsValue);
113   - // if (pa.targetValue) {
114 113 pa.targetType = targetType;
115   - // } else {
116   - // pa.targetType = 1;
117   - // }
118 114 pa.codeType = codeType;
119 115 pa.dataType = dataType;
120 116 console.log("100pa", pa);
... ... @@ -123,7 +119,6 @@ export default function AddCommissionParamsModal(props: Props) {
123 119 if (!comItem.code) {
124 120 const tmpIds = [...selectedIndicators];
125 121 tmpIds.push(newItemId);
126   - // setSelectedIndicators([...tmpIds]);
127 122 } else {
128 123 pa.code = comItem.code;
129 124 pa.name = comItem.name;
... ...
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSal.tsx
... ... @@ -110,7 +110,11 @@ export default function AddCommissionParamsModal(props: Props) {
110 110 }
111 111 function handSubmit(fieldsValue: any) {
112 112 const pa: any = transformDTO(fieldsValue);
113   - pa.targetType = targetType;
  113 + if (pa.targetValue !== undefined) {
  114 + pa.targetType = targetType;
  115 + } else {
  116 + pa.targetType = 1;
  117 + }
114 118 pa.codeType = codeType;
115 119 pa.dataType = dataType;
116 120 console.log("100pa", pa);
... ... @@ -124,21 +128,6 @@ export default function AddCommissionParamsModal(props: Props) {
124 128 pa.code = comItem.code;
125 129 pa.name = comItem.name;
126 130 }
127   - pa.extraTargetType = pa.targetType;
128   - if (comItem.codeType == 1 && multiStage) {
129   - if (pa.targetValue) {
130   - pa.targetType = targetType;
131   - pa.targetCalcType = 3;
132   - } else {
133   - pa.targetType = 1;
134   - }
135   - if (pa.extraTargetValue) {
136   - pa.extraTargetType = targetType;
137   - pa.extraTargetCalcType = 4;
138   - } else {
139   - pa.extraTargetType = 1;
140   - }
141   - }
142 131 onOk(pa);
143 132 onCancel && onCancel();
144 133 }
... ... @@ -156,13 +145,7 @@ export default function AddCommissionParamsModal(props: Props) {
156 145 width={1000}
157 146 >
158 147 <Spin spinning={loading}>
159   - <Form
160   - form={form}
161   - // labelCol={{ span: 6 }}
162   - // wrapperCol={{ span: 18 }}
163   - onFinish={handSubmit}
164   - style={{ width: "70%", marginLeft: 150 }}
165   - >
  148 + <Form form={form} onFinish={handSubmit} style={{ width: "70%", marginLeft: 150 }}>
166 149 <Form.Item name="commissionParams" label="计分指标" rules={[{ required: true, message: "计分指标" }]}>
167 150 <Select
168 151 placeholder="选择指标(*为考评指标,无*为绩效指标)"
... ... @@ -233,127 +216,38 @@ export default function AddCommissionParamsModal(props: Props) {
233 216 <Form.Item label="考核目标名称" name="targetName">
234 217 <Select disabled defaultValue={indicatorName} />
235 218 </Form.Item>
236   - {comItem.codeType == 1 && multiStage ? (
237   - <>
238   - <Form.Item
239   - noStyle
240   - shouldUpdate={(prevValues, currentValues) =>
241   - prevValues.extraTargetValue !== currentValues.extraTargetValue
242   - }
243   - >
244   - {({ getFieldValue }) => {
245   - const extraTargetValue = getFieldValue("extraTargetValue");
246   - return (
247   - <>
248   - <Form.Item
249   - label="阶段目标考核值"
250   - name="targetValue"
251   - rules={[
252   - { required: !extraTargetValue, message: "请输入阶段目标考核值" },
253   - {
254   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
255   - message:
256   - targetType === TargetTypeEnum["百分比"]
257   - ? "请输入大于0小于等于100的数(保留两位小数)"
258   - : "请输入大于0的数(保留两位小数)",
259   - },
260   - ]}
261   - >
262   - <InputNumber
263   - placeholder="请输入阶段目标考核值"
264   - style={{ width: "100%" }}
265   - addonAfter={
266   - targetType === TargetTypeEnum["百分比"]
267   - ? "%"
268   - : targetType === TargetTypeEnum["金额"]
269   - ? "元"
270   - : "台"
271   - }
272   - />
273   - </Form.Item>
274   - </>
275   - );
276   - }}
277   - </Form.Item>
278   - <Form.Item
279   - noStyle
280   - shouldUpdate={(prevValues, currentValues) => prevValues.targetValue !== currentValues.targetValue}
281   - >
282   - {({ getFieldValue }) => {
283   - const targetValue = getFieldValue("targetValue");
284   - return (
285   - <>
286   - <Form.Item
287   - label="时间进度目标值"
288   - name="extraTargetValue"
289   - rules={[
290   - { required: !targetValue, message: "请输入时间进度目标值" },
291   - {
292   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
293   - message:
294   - targetType === TargetTypeEnum["百分比"]
295   - ? "请输入大于0小于等于100的数(保留两位小数)"
296   - : "请输入大于0的数(保留两位小数)",
297   - },
298   - ]}
299   - >
300   - <InputNumber
301   - placeholder="请输入时间进度目标值"
302   - style={{ width: "100%" }}
303   - addonAfter={
304   - targetType === TargetTypeEnum["百分比"]
305   - ? "%"
306   - : targetType === TargetTypeEnum["金额"]
307   - ? "元"
308   - : "台"
309   - }
310   - />
311   - </Form.Item>
312   - </>
313   - );
314   - }}
315   - </Form.Item>
316   - </>
317   - ) : (
318   - <>
319   - <Form.Item
320   - label="考核目标计算类型"
321   - name="targetCalcType"
322   - rules={[{ required: true, message: "请选择考核目标计算类型" }]}
323   - >
324   - <Radio.Group>
325   - <Radio value={1}>考核目标值计算 </Radio>
326   - <Radio value={2}>最低要求计算</Radio>
327   - </Radio.Group>
328   - </Form.Item>
329   - <Form.Item
330   - label="考核目标值"
331   - name="targetValue"
332   - rules={[
333   - { required: true, message: "请输入考核目标值" },
334   - {
335   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
336   - message:
337   - targetType === TargetTypeEnum["百分比"]
338   - ? "请输入大于0小于等于100的数(保留两位小数)"
339   - : "请输入大于0的数(保留两位小数)",
340   - },
341   - ]}
342   - >
343   - <InputNumber
344   - placeholder="请输入考核目标值"
345   - style={{ width: "100%" }}
346   - addonAfter={
347   - targetType === TargetTypeEnum["百分比"]
348   - ? "%"
349   - : targetType === TargetTypeEnum["金额"]
350   - ? "元"
351   - : "台"
352   - }
353   - />
354   - </Form.Item>
355   - </>
356   - )}
  219 + <Form.Item
  220 + label="考核目标计算类型"
  221 + name="targetCalcType"
  222 + rules={[{ required: true, message: "请选择考核目标计算类型" }]}
  223 + >
  224 + <Radio.Group>
  225 + <Radio value={1}>考核目标值计算 </Radio>
  226 + <Radio value={2}>最低要求计算</Radio>
  227 + </Radio.Group>
  228 + </Form.Item>
  229 + <Form.Item
  230 + label="考核目标值"
  231 + name="targetValue"
  232 + rules={[
  233 + { required: true, message: "请输入考核目标值" },
  234 + {
  235 + pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
  236 + message:
  237 + targetType === TargetTypeEnum["百分比"]
  238 + ? "请输入大于0小于等于100的数(保留两位小数)"
  239 + : "请输入大于0的数(保留两位小数)",
  240 + },
  241 + ]}
  242 + >
  243 + <InputNumber
  244 + placeholder="请输入考核目标值"
  245 + style={{ width: "100%" }}
  246 + addonAfter={
  247 + targetType === TargetTypeEnum["百分比"] ? "%" : targetType === TargetTypeEnum["金额"] ? "元" : "台"
  248 + }
  249 + />
  250 + </Form.Item>
357 251 </>
358 252 )}
359 253 </Form>
... ...
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSalShop.tsx
... ... @@ -111,7 +111,11 @@ export default function AddCommissionParamsModal(props: Props) {
111 111 }
112 112 function handSubmit(fieldsValue: any) {
113 113 const pa: any = transformDTO(fieldsValue);
114   - pa.targetType = targetType;
  114 + if (pa.targetValue !== undefined) {
  115 + pa.targetType = targetType;
  116 + } else {
  117 + pa.targetType = 1;
  118 + }
115 119 pa.codeType = codeType;
116 120 pa.dataType = dataType;
117 121 console.log("100pa", pa);
... ... @@ -125,21 +129,6 @@ export default function AddCommissionParamsModal(props: Props) {
125 129 pa.code = comItem.code;
126 130 pa.name = comItem.name;
127 131 }
128   - pa.extraTargetType = pa.targetType;
129   - if (comItem.codeType == 1 && multiStage) {
130   - if (pa.targetValue) {
131   - pa.targetType = targetType;
132   - pa.targetCalcType = 3;
133   - } else {
134   - pa.targetType = 1;
135   - }
136   - if (pa.extraTargetValue) {
137   - pa.extraTargetType = targetType;
138   - pa.extraTargetCalcType = 4;
139   - } else {
140   - pa.extraTargetType = 1;
141   - }
142   - }
143 132 onOk(pa);
144 133 onCancel && onCancel();
145 134 }
... ... @@ -157,13 +146,7 @@ export default function AddCommissionParamsModal(props: Props) {
157 146 width={1000}
158 147 >
159 148 <Spin spinning={loading}>
160   - <Form
161   - form={form}
162   - // labelCol={{ span: 6 }}
163   - // wrapperCol={{ span: 18 }}
164   - onFinish={handSubmit}
165   - style={{ width: "70%", marginLeft: 150 }}
166   - >
  149 + <Form form={form} onFinish={handSubmit} style={{ width: "70%", marginLeft: 150 }}>
167 150 <Form.Item name="commissionParams" label="计分指标" rules={[{ required: true, message: "计分指标" }]}>
168 151 <Select
169 152 placeholder="选择指标(*为考评指标,无*为绩效指标)"
... ... @@ -234,127 +217,38 @@ export default function AddCommissionParamsModal(props: Props) {
234 217 <Form.Item label="考核目标名称" name="targetName">
235 218 <Select disabled defaultValue={indicatorName} />
236 219 </Form.Item>
237   - {comItem.codeType == 1 && multiStage ? (
238   - <>
239   - <Form.Item
240   - noStyle
241   - shouldUpdate={(prevValues, currentValues) =>
242   - prevValues.extraTargetValue !== currentValues.extraTargetValue
243   - }
244   - >
245   - {({ getFieldValue }) => {
246   - const extraTargetValue = getFieldValue("extraTargetValue");
247   - return (
248   - <>
249   - <Form.Item
250   - label="阶段目标考核值"
251   - name="targetValue"
252   - rules={[
253   - { required: !extraTargetValue, message: "请输入阶段目标考核值" },
254   - {
255   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
256   - message:
257   - targetType === TargetTypeEnum["百分比"]
258   - ? "请输入大于0小于等于100的数(保留两位小数)"
259   - : "请输入大于0的数(保留两位小数)",
260   - },
261   - ]}
262   - >
263   - <InputNumber
264   - placeholder="请输入阶段目标考核值"
265   - style={{ width: "100%" }}
266   - addonAfter={
267   - targetType === TargetTypeEnum["百分比"]
268   - ? "%"
269   - : targetType === TargetTypeEnum["金额"]
270   - ? "元"
271   - : "台"
272   - }
273   - />
274   - </Form.Item>
275   - </>
276   - );
277   - }}
278   - </Form.Item>
279   - <Form.Item
280   - noStyle
281   - shouldUpdate={(prevValues, currentValues) => prevValues.targetValue !== currentValues.targetValue}
282   - >
283   - {({ getFieldValue }) => {
284   - const targetValue = getFieldValue("targetValue");
285   - return (
286   - <>
287   - <Form.Item
288   - label="时间进度目标值"
289   - name="extraTargetValue"
290   - rules={[
291   - { required: !targetValue, message: "请输入时间进度目标值" },
292   - {
293   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
294   - message:
295   - targetType === TargetTypeEnum["百分比"]
296   - ? "请输入大于0小于等于100的数(保留两位小数)"
297   - : "请输入大于0的数(保留两位小数)",
298   - },
299   - ]}
300   - >
301   - <InputNumber
302   - placeholder="请输入时间进度目标值"
303   - style={{ width: "100%" }}
304   - addonAfter={
305   - targetType === TargetTypeEnum["百分比"]
306   - ? "%"
307   - : targetType === TargetTypeEnum["金额"]
308   - ? "元"
309   - : "台"
310   - }
311   - />
312   - </Form.Item>
313   - </>
314   - );
315   - }}
316   - </Form.Item>
317   - </>
318   - ) : (
319   - <>
320   - <Form.Item
321   - label="考核目标计算类型"
322   - name="targetCalcType"
323   - rules={[{ required: true, message: "请选择考核目标计算类型" }]}
324   - >
325   - <Radio.Group>
326   - <Radio value={1}>考核目标值计算 </Radio>
327   - <Radio value={2}>最低要求计算</Radio>
328   - </Radio.Group>
329   - </Form.Item>
330   - <Form.Item
331   - label="考核目标值"
332   - name="targetValue"
333   - rules={[
334   - { required: true, message: "请输入考核目标值" },
335   - {
336   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
337   - message:
338   - targetType === TargetTypeEnum["百分比"]
339   - ? "请输入大于0小于等于100的数(保留两位小数)"
340   - : "请输入大于0的数(保留两位小数)",
341   - },
342   - ]}
343   - >
344   - <InputNumber
345   - placeholder="请输入考核目标值"
346   - style={{ width: "100%" }}
347   - addonAfter={
348   - targetType === TargetTypeEnum["百分比"]
349   - ? "%"
350   - : targetType === TargetTypeEnum["金额"]
351   - ? "元"
352   - : "台"
353   - }
354   - />
355   - </Form.Item>
356   - </>
357   - )}
  220 + <Form.Item
  221 + label="考核目标计算类型"
  222 + name="targetCalcType"
  223 + rules={[{ required: true, message: "请选择考核目标计算类型" }]}
  224 + >
  225 + <Radio.Group>
  226 + <Radio value={1}>考核目标值计算 </Radio>
  227 + <Radio value={2}>最低要求计算</Radio>
  228 + </Radio.Group>
  229 + </Form.Item>
  230 + <Form.Item
  231 + label="考核目标值"
  232 + name="targetValue"
  233 + rules={[
  234 + { required: true, message: "请输入考核目标值" },
  235 + {
  236 + pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
  237 + message:
  238 + targetType === TargetTypeEnum["百分比"]
  239 + ? "请输入大于0小于等于100的数(保留两位小数)"
  240 + : "请输入大于0的数(保留两位小数)",
  241 + },
  242 + ]}
  243 + >
  244 + <InputNumber
  245 + placeholder="请输入考核目标值"
  246 + style={{ width: "100%" }}
  247 + addonAfter={
  248 + targetType === TargetTypeEnum["百分比"] ? "%" : targetType === TargetTypeEnum["金额"] ? "元" : "台"
  249 + }
  250 + />
  251 + </Form.Item>
358 252 </>
359 253 )}
360 254 </Form>
... ...
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSal.tsx
... ... @@ -103,7 +103,11 @@ export default function AddLadderParamsModal(props: Props) {
103 103 }
104 104 function handSubmit(fieldsValue: any) {
105 105 const pa: any = transformDTO(fieldsValue);
106   - pa.targetType = targetType;
  106 + if (pa.targetValue !== undefined) {
  107 + pa.targetType = targetType;
  108 + } else {
  109 + pa.targetType = 1;
  110 + }
107 111 pa.codeType = codeType;
108 112 if (comItem.dataType) {
109 113 pa.dataType = comItem.dataType;
... ... @@ -122,21 +126,6 @@ export default function AddLadderParamsModal(props: Props) {
122 126 pa.code = comItem.code;
123 127 pa.name = comItem.name;
124 128 }
125   - pa.extraTargetType = pa.targetType;
126   - if (comItem.codeType == 1 && multiStage) {
127   - if (pa.targetValue) {
128   - pa.targetType = targetType;
129   - pa.targetCalcType = 3;
130   - } else {
131   - pa.targetType = 1;
132   - }
133   - if (pa.extraTargetValue) {
134   - pa.extraTargetType = targetType;
135   - pa.extraTargetCalcType = 4;
136   - } else {
137   - pa.extraTargetType = 1;
138   - }
139   - }
140 129 onOk(pa);
141 130 onCancel && onCancel();
142 131 }
... ... @@ -154,13 +143,7 @@ export default function AddLadderParamsModal(props: Props) {
154 143 width={1000}
155 144 >
156 145 <Spin spinning={loading}>
157   - <Form
158   - form={form}
159   - // labelCol={{ span: 6 }}
160   - // wrapperCol={{ span: 18 }}
161   - onFinish={handSubmit}
162   - style={{ width: "70%", marginLeft: 150 }}
163   - >
  146 + <Form form={form} onFinish={handSubmit} style={{ width: "70%", marginLeft: 150 }}>
164 147 <Form.Item name="ladderParams" label="计分指标" rules={[{ required: true, message: "计分指标" }]}>
165 148 <Select
166 149 placeholder="选择指标(*为考评指标,无*为绩效指标)"
... ... @@ -231,127 +214,38 @@ export default function AddLadderParamsModal(props: Props) {
231 214 <Form.Item label="考核目标名称" name="targetName">
232 215 <Select disabled defaultValue={name} />
233 216 </Form.Item>
234   - {comItem.codeType == 1 && multiStage ? (
235   - <>
236   - <Form.Item
237   - noStyle
238   - shouldUpdate={(prevValues, currentValues) =>
239   - prevValues.extraTargetValue !== currentValues.extraTargetValue
240   - }
241   - >
242   - {({ getFieldValue }) => {
243   - const extraTargetValue = getFieldValue("extraTargetValue");
244   - return (
245   - <>
246   - <Form.Item
247   - label="阶段目标考核值"
248   - name="targetValue"
249   - rules={[
250   - { required: !extraTargetValue, message: "请输入阶段目标考核值" },
251   - {
252   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
253   - message:
254   - targetType === TargetTypeEnum["百分比"]
255   - ? "请输入大于0小于等于100的数(保留两位小数)"
256   - : "请输入大于0的数(保留两位小数)",
257   - },
258   - ]}
259   - >
260   - <InputNumber
261   - placeholder="请输入阶段目标考核值"
262   - style={{ width: "100%" }}
263   - addonAfter={
264   - targetType === TargetTypeEnum["百分比"]
265   - ? "%"
266   - : targetType === TargetTypeEnum["金额"]
267   - ? "元"
268   - : "台"
269   - }
270   - />
271   - </Form.Item>
272   - </>
273   - );
274   - }}
275   - </Form.Item>
276   - <Form.Item
277   - noStyle
278   - shouldUpdate={(prevValues, currentValues) => prevValues.targetValue !== currentValues.targetValue}
279   - >
280   - {({ getFieldValue }) => {
281   - const targetValue = getFieldValue("targetValue");
282   - return (
283   - <>
284   - <Form.Item
285   - label="时间进度目标值"
286   - name="extraTargetValue"
287   - rules={[
288   - { required: !targetValue, message: "请输入时间进度目标值" },
289   - {
290   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
291   - message:
292   - targetType === TargetTypeEnum["百分比"]
293   - ? "请输入大于0小于等于100的数(保留两位小数)"
294   - : "请输入大于0的数(保留两位小数)",
295   - },
296   - ]}
297   - >
298   - <InputNumber
299   - placeholder="请输入时间进度目标值"
300   - style={{ width: "100%" }}
301   - addonAfter={
302   - targetType === TargetTypeEnum["百分比"]
303   - ? "%"
304   - : targetType === TargetTypeEnum["金额"]
305   - ? "元"
306   - : "台"
307   - }
308   - />
309   - </Form.Item>
310   - </>
311   - );
312   - }}
313   - </Form.Item>
314   - </>
315   - ) : (
316   - <>
317   - <Form.Item
318   - label="考核目标计算类型"
319   - name="targetCalcType"
320   - rules={[{ required: true, message: "请选择考核目标计算类型" }]}
321   - >
322   - <Radio.Group>
323   - <Radio value={1}>考核目标值计算 </Radio>
324   - <Radio value={2}>最低要求计算</Radio>
325   - </Radio.Group>
326   - </Form.Item>
327   - <Form.Item
328   - label="考核目标值"
329   - name="targetValue"
330   - rules={[
331   - { required: true, message: "请输入考核目标值" },
332   - {
333   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
334   - message:
335   - targetType === TargetTypeEnum["百分比"]
336   - ? "请输入大于0小于等于100的数(保留两位小数)"
337   - : "请输入大于0的数(保留两位小数)",
338   - },
339   - ]}
340   - >
341   - <InputNumber
342   - placeholder="请输入考核目标值"
343   - style={{ width: "100%" }}
344   - addonAfter={
345   - targetType === TargetTypeEnum["百分比"]
346   - ? "%"
347   - : targetType === TargetTypeEnum["金额"]
348   - ? "元"
349   - : "台"
350   - }
351   - />
352   - </Form.Item>
353   - </>
354   - )}
  217 + <Form.Item
  218 + label="考核目标计算类型"
  219 + name="targetCalcType"
  220 + rules={[{ required: true, message: "请选择考核目标计算类型" }]}
  221 + >
  222 + <Radio.Group>
  223 + <Radio value={1}>考核目标值计算 </Radio>
  224 + <Radio value={2}>最低要求计算</Radio>
  225 + </Radio.Group>
  226 + </Form.Item>
  227 + <Form.Item
  228 + label="考核目标值"
  229 + name="targetValue"
  230 + rules={[
  231 + { required: true, message: "请输入考核目标值" },
  232 + {
  233 + pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
  234 + message:
  235 + targetType === TargetTypeEnum["百分比"]
  236 + ? "请输入大于0小于等于100的数(保留两位小数)"
  237 + : "请输入大于0的数(保留两位小数)",
  238 + },
  239 + ]}
  240 + >
  241 + <InputNumber
  242 + placeholder="请输入考核目标值"
  243 + style={{ width: "100%" }}
  244 + addonAfter={
  245 + targetType === TargetTypeEnum["百分比"] ? "%" : targetType === TargetTypeEnum["金额"] ? "元" : "台"
  246 + }
  247 + />
  248 + </Form.Item>
355 249 </>
356 250 )}
357 251 </Form>
... ...
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSalShop.tsx
... ... @@ -104,7 +104,11 @@ export default function AddLadderParamsModal(props: Props) {
104 104 }
105 105 function handSubmit(fieldsValue: any) {
106 106 const pa: any = transformDTO(fieldsValue);
107   - pa.targetType = targetType;
  107 + if (pa.targetValue !== undefined) {
  108 + pa.targetType = targetType;
  109 + } else {
  110 + pa.targetType = 1;
  111 + }
108 112 pa.codeType = codeType;
109 113 if (comItem.dataType) {
110 114 pa.dataType = comItem.dataType;
... ... @@ -123,21 +127,6 @@ export default function AddLadderParamsModal(props: Props) {
123 127 pa.code = comItem.code;
124 128 pa.name = comItem.name;
125 129 }
126   - pa.extraTargetType = pa.targetType;
127   - if (comItem.codeType == 1 && multiStage) {
128   - if (pa.targetValue) {
129   - pa.targetType = targetType;
130   - pa.targetCalcType = 3;
131   - } else {
132   - pa.targetType = 1;
133   - }
134   - if (pa.extraTargetValue) {
135   - pa.extraTargetType = targetType;
136   - pa.extraTargetCalcType = 4;
137   - } else {
138   - pa.extraTargetType = 1;
139   - }
140   - }
141 130 onOk(pa);
142 131 onCancel && onCancel();
143 132 }
... ... @@ -155,13 +144,7 @@ export default function AddLadderParamsModal(props: Props) {
155 144 width={1000}
156 145 >
157 146 <Spin spinning={loading}>
158   - <Form
159   - form={form}
160   - // labelCol={{ span: 6 }}
161   - // wrapperCol={{ span: 18 }}
162   - onFinish={handSubmit}
163   - style={{ width: "70%", marginLeft: 150 }}
164   - >
  147 + <Form form={form} onFinish={handSubmit} style={{ width: "70%", marginLeft: 150 }}>
165 148 <Form.Item name="ladderParams" label="计分指标" rules={[{ required: true, message: "计分指标" }]}>
166 149 <Select
167 150 placeholder="选择指标(*为考评指标,无*为绩效指标)"
... ... @@ -232,127 +215,38 @@ export default function AddLadderParamsModal(props: Props) {
232 215 <Form.Item label="考核目标名称" name="targetName">
233 216 <Select disabled defaultValue={name} />
234 217 </Form.Item>
235   - {comItem.codeType == 1 && multiStage ? (
236   - <>
237   - <Form.Item
238   - noStyle
239   - shouldUpdate={(prevValues, currentValues) =>
240   - prevValues.extraTargetValue !== currentValues.extraTargetValue
241   - }
242   - >
243   - {({ getFieldValue }) => {
244   - const extraTargetValue = getFieldValue("extraTargetValue");
245   - return (
246   - <>
247   - <Form.Item
248   - label="阶段目标考核值"
249   - name="targetValue"
250   - rules={[
251   - { required: !extraTargetValue, message: "请输入阶段目标考核值" },
252   - {
253   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
254   - message:
255   - targetType === TargetTypeEnum["百分比"]
256   - ? "请输入大于0小于等于100的数(保留两位小数)"
257   - : "请输入大于0的数(保留两位小数)",
258   - },
259   - ]}
260   - >
261   - <InputNumber
262   - placeholder="请输入阶段目标考核值"
263   - style={{ width: "100%" }}
264   - addonAfter={
265   - targetType === TargetTypeEnum["百分比"]
266   - ? "%"
267   - : targetType === TargetTypeEnum["金额"]
268   - ? "元"
269   - : "台"
270   - }
271   - />
272   - </Form.Item>
273   - </>
274   - );
275   - }}
276   - </Form.Item>
277   - <Form.Item
278   - noStyle
279   - shouldUpdate={(prevValues, currentValues) => prevValues.targetValue !== currentValues.targetValue}
280   - >
281   - {({ getFieldValue }) => {
282   - const targetValue = getFieldValue("targetValue");
283   - return (
284   - <>
285   - <Form.Item
286   - label="时间进度目标值"
287   - name="extraTargetValue"
288   - rules={[
289   - { required: !targetValue, message: "请输入时间进度目标值" },
290   - {
291   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
292   - message:
293   - targetType === TargetTypeEnum["百分比"]
294   - ? "请输入大于0小于等于100的数(保留两位小数)"
295   - : "请输入大于0的数(保留两位小数)",
296   - },
297   - ]}
298   - >
299   - <InputNumber
300   - placeholder="请输入时间进度目标值"
301   - style={{ width: "100%" }}
302   - addonAfter={
303   - targetType === TargetTypeEnum["百分比"]
304   - ? "%"
305   - : targetType === TargetTypeEnum["金额"]
306   - ? "元"
307   - : "台"
308   - }
309   - />
310   - </Form.Item>
311   - </>
312   - );
313   - }}
314   - </Form.Item>
315   - </>
316   - ) : (
317   - <>
318   - <Form.Item
319   - label="考核目标计算类型"
320   - name="targetCalcType"
321   - rules={[{ required: true, message: "请选择考核目标计算类型" }]}
322   - >
323   - <Radio.Group>
324   - <Radio value={1}>考核目标值计算 </Radio>
325   - <Radio value={2}>最低要求计算</Radio>
326   - </Radio.Group>
327   - </Form.Item>
328   - <Form.Item
329   - label="考核目标值"
330   - name="targetValue"
331   - rules={[
332   - { required: true, message: "请输入考核目标值" },
333   - {
334   - pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
335   - message:
336   - targetType === TargetTypeEnum["百分比"]
337   - ? "请输入大于0小于等于100的数(保留两位小数)"
338   - : "请输入大于0的数(保留两位小数)",
339   - },
340   - ]}
341   - >
342   - <InputNumber
343   - placeholder="请输入考核目标值"
344   - style={{ width: "100%" }}
345   - addonAfter={
346   - targetType === TargetTypeEnum["百分比"]
347   - ? "%"
348   - : targetType === TargetTypeEnum["金额"]
349   - ? "元"
350   - : "台"
351   - }
352   - />
353   - </Form.Item>
354   - </>
355   - )}
  218 + <Form.Item
  219 + label="考核目标计算类型"
  220 + name="targetCalcType"
  221 + rules={[{ required: true, message: "请选择考核目标计算类型" }]}
  222 + >
  223 + <Radio.Group>
  224 + <Radio value={1}>考核目标值计算 </Radio>
  225 + <Radio value={2}>最低要求计算</Radio>
  226 + </Radio.Group>
  227 + </Form.Item>
  228 + <Form.Item
  229 + label="考核目标值"
  230 + name="targetValue"
  231 + rules={[
  232 + { required: true, message: "请输入考核目标值" },
  233 + {
  234 + pattern: targetType === TargetTypeEnum["百分比"] ? percent : Momney,
  235 + message:
  236 + targetType === TargetTypeEnum["百分比"]
  237 + ? "请输入大于0小于等于100的数(保留两位小数)"
  238 + : "请输入大于0的数(保留两位小数)",
  239 + },
  240 + ]}
  241 + >
  242 + <InputNumber
  243 + placeholder="请输入考核目标值"
  244 + style={{ width: "100%" }}
  245 + addonAfter={
  246 + targetType === TargetTypeEnum["百分比"] ? "%" : targetType === TargetTypeEnum["金额"] ? "元" : "台"
  247 + }
  248 + />
  249 + </Form.Item>
356 250 </>
357 251 )}
358 252 </Form>
... ...