考评bugfix0306

曾柯
1 parent b26bcd3b
Showing 9 changed files with 106 additions and 50 deletions
config/routers/performance.ts
src/pages/performance/EvaDataImport/EditComfirm/index.tsx
src/pages/performance/EvaDataImport/api.ts
src/pages/performance/EvaDataImport/components/FileDatailsModal.tsx
src/pages/performance/EvaDataImport/index.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddEvaGroupModal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx
src/pages/performance/EvaSetting/components/EditModal.tsx
src/pages/performance/EvaSetting/components/Filter.tsx
@@ -91,7 +91,7 @@ export default [
   },
   /** 考评数据导入==> 查看数据清单 */
   {
-    path: "/morax/evaDataImport/edit/:id?",
+    path: "/morax/evaDataImport/edit/:id?/:num?",
     component: "./performance/EvaDataImport/EditComfirm/index",
   },
@@ -25,7 +25,7 @@ function Index(props: Props) {
   const [delay, setDelay] = useState(true);
   const [newData, setNewData] = useState<any>([]);
   const { match } = props;
-  const { id } = match.params;
+  const { id, num } = match.params;
   useEffect(() => {
     setId(id);
   }, [id]);
@@ -35,6 +35,7 @@ function Index(props: Props) {
       setDelay(false);
     }
   }, [configId]);
+  console.log('num', num);
   const { data, errMsg, setParams, loading } = useInitail(evaDataDetailApi, {}, {}, delay);
   console.log(isArray(data));
   useEffect(() => {
@@ -46,7 +47,7 @@ function Index(props: Props) {
   return (
     <PageHeaderWrapper title="考评数据导入">
       <Card>
-        <Table loading={loading} rowKey={(row) => `id${id}`} dataSource={newData}>
+        <Table loading={loading} rowKey={(row) => `id${id}`} dataSource={newData} pagination={{ total: num }}>
           <Column title="归属人员" dataIndex="userName" align="center" render={(name) => <span>{name || "--"}</span>} />
           <Column title="归属门店" dataIndex="shopName" align="center" render={(name) => <span>{name || "--"}</span>} />
           <Column
@@ -80,7 +81,9 @@ function Index(props: Props) {
             title="是否导入"
             dataIndex="errorType"
             align="center"
-            render={(_: any, record: any) => (record.errorType ? <div className={st.no}>未导入</div> : <div className={st.yes}>已导入</div>)}
+            render={(_: any, record: any) =>
+              record.errorType ? <div className={st.no}>未导入</div> : <div className={st.yes}>已导入</div>
+            }
           />
           <Column
             title="未导入原因"
@@ -44,3 +44,11 @@ export function evaDataDetailApi(params: { id: number }): http.PromisePageResp&lt;a
 export function evaDataIndApi(): http.PromiseResp<any> {
   return request.get(`${MORAX_HOST}/erp/eval-indicator/indicators`, {});
 }
+
+/**
+ * 保存上传人员数据
+ *    http://testgate.feewee.cn/morax/erp/eval-indicator/save-import
+ */
+export function saveEvaImportData(params: { key: string }) {
+  return request.get(`${MORAX_HOST}/erp/eval-indicator/save-import`, { params });
+}
@@ -19,6 +19,7 @@ import { TargetType, TargetTypeEnum } from &quot;@/pages/performance/entity&quot;;
 import { render } from "react-dom";
 import moment from "moment";
 import { ReasonsEnum } from "../entity";
+import { saveEvaImportData } from "../api";
 import { history } from "umi";
 import st from "./style.less";
@@ -28,28 +29,40 @@ interface Props {
   visible: boolean;
   fileData: any;
   tarOnCancel: Function;
+  setParams: Function;
+  innerParams: any;
 }
-const columns = [
-  {
-    title: "目标名称",
-    dataIndex: "indicatorName",
-    key: "indicatorName",
-  },
-
-  {
-    title: "目标值",
-    dataIndex: "targetValue",
-    key: "targetValue",
-    render: (value: Number, record: any) => {
-      return record.targetType === 2 ? `${value}%` : record.targetType === 3 ? `${value}元` : `${value}台`;
-    },
-  },
-];
-const TargetModal = ({ visible, fileData, tarOnCancel }: Props) => {
+const TargetModal = ({ visible, fileData, tarOnCancel, setParams, innerParams }: Props) => {
+  const [loading, setLoading] = useState<boolean>(false);
+  const onOk = async (key: string) => {
+    const pa = { key };
+    setLoading(true);
+    try {
+      const { success } = await saveEvaImportData(pa);
+      if (success) {
+        setLoading(false);
+        message.success(`数据上传成功`, 5);
+        // 重新刷新列表
+        setParams({ ...innerParams }, true);
+        tarOnCancel && tarOnCancel();
+      }
+    } catch (error: any) {
+      setLoading(false);
+      message.error(error.message);
+    }
+  };
   return (
     <>
-      <Modal title="导入数据详情" visible={visible} onCancel={() => tarOnCancel()} maskClosable={false} width={1500}>
-        <Table bordered dataSource={fileData.details}>
+      <Modal
+        title="导入数据详情"
+        visible={visible}
+        onCancel={() => tarOnCancel()}
+        maskClosable={false}
+        width={1500}
+        onOk={() => onOk(fileData.key)}
+        confirmLoading={loading}
+      >
+        <Table bordered dataSource={fileData.details} pagination={{ total: fileData.num }}>
           <Column title="归属人员" dataIndex="userName" align="center" render={(name) => <span>{name || "--"}</span>} />
           <Column title="归属门店" dataIndex="shopName" align="center" render={(name) => <span>{name || "--"}</span>} />
           <Column
@@ -58,7 +71,7 @@ const TargetModal = ({ visible, fileData, tarOnCancel }: Props) =&gt; {
             align="center"
             render={(name) => <span>{name || "--"}</span>}
           />
-          <Column
+          {/* <Column
             title="指标值"
             dataIndex="indicatorValue"
             align="center"
@@ -71,7 +84,7 @@ const TargetModal = ({ visible, fileData, tarOnCancel }: Props) =&gt; {
                   : "--"}
               </span>
             )}
-          />
+          /> */}
           <Column
             title="考核周期"
             dataIndex="dataDate"
@@ -93,6 +106,12 @@ const TargetModal = ({ visible, fileData, tarOnCancel }: Props) =&gt; {
             render={(_: any, record: any) => (record.errorType ? ReasonsEnum[record.errorType] : "--")}
           />
         </Table>
+        <div>
+          成功条数: <span style={{ color: "#20c688" }}>{fileData.successNum}</span> 条
+        </div>
+        <div>
+          失败条数: <span style={{ color: "#f4333c" }}>{fileData.errorNum}</span> 条
+        </div>
       </Modal>
     </>
   );
@@ -20,7 +20,7 @@ export default () =&gt; {
   const [visible, setVisible] = useState<boolean>(false);
   const uploadPerson: UploadProps = {
     name: "file",
-    action: "/api/morax/erp/eval-indicator/staff-indicator",
+    action: "/api/morax/erp/eval-indicator/analysis-staff",
     maxCount: 1,
     showUploadList: false,
     onChange(info) {
@@ -28,10 +28,8 @@ export default () =&gt; {
         console.log(info.file, info.fileList);
       }
       if (info.file.status === "done") {
-        message.success(`${info.file.name} 上传成功`);
-        setParams({ ...innerParams }, true);
-        // setFileData(info.file.response.data);
-        // setVisible(true);
+        setFileData(info.file.response.data);
+        setVisible(true);
       } else if (info.file.status === "error") {
         message.error(`${info.file.name} 上传失败`);
       }
@@ -39,7 +37,7 @@ export default () =&gt; {
   };
   const uploadShop: UploadProps = {
     name: "file",
-    action: "/api/morax/erp/eval-indicator/shop-indicator",
+    action: "/api/morax/erp/eval-indicator/analysis-shop",
     maxCount: 1,
     showUploadList: false,
     onChange(info) {
@@ -47,8 +45,8 @@ export default () =&gt; {
         console.log(info.file, info.fileList);
       }
       if (info.file.status === "done") {
-        message.success(`${info.file.name} 上传成功`);
-        setParams({ ...innerParams }, true);
+        setFileData(info.file.response.data);
+        setVisible(true);
       } else if (info.file.status === "error") {
         message.error(`${info.file.name} 上传失败`);
       }
@@ -91,7 +89,7 @@ export default () =&gt; {
         </Row>
         <Table
           loading={loading}
-          rowKey={(row) => `id${row.indicatorCode}`}
+          rowKey={(row) => `id${row.id}`}
           dataSource={list}
           pagination={paginationConfig}
         >
@@ -136,11 +134,11 @@ export default () =&gt; {
             align="center"
             dataIndex="enable"
             width={150}
-            render={(text: boolean, record: KpiSetteing.KpiListItems) => (
+            render={(text: boolean, record: any) => (
               <Space split={<Divider type="vertical" />}>
                 <Typography.Link
                   onClick={() => {
-                    history.push(`/morax/evaDataImport/edit/${record.id}`);
+                    history.push(`/morax/evaDataImport/edit/${record.id}/${record.num}`);
                   }}
                 >
                   查看
@@ -149,7 +147,13 @@ export default () =&gt; {
             )}
           />
         </Table>
-        {/* <FileDatailsModal visible={visible} tarOnCancel={() => setVisible(false)} fileData={fileData} /> */}
+        <FileDatailsModal
+          visible={visible}
+          tarOnCancel={() => setVisible(false)}
+          fileData={fileData}
+          setParams={setParams}
+          innerParams={innerParams}
+        />
       </Card>
     </PageHeaderWrapper>
   );
@@ -76,10 +76,10 @@ export default function AddIndicatorsModal(props: Props) {
   // 查询门店
   useEffect(() => {
-    if (evaItem.postId) {
-      getDealerList(evaItem.postId);
+    if (evaItem.post) {
+      getDealerList(evaItem.post.value);
     }
-  }, [evaItem.postId]);
+  }, [evaItem]);
   console.log("shopList", shopList);
   // 查询管理角色
@@ -256,11 +256,28 @@ export default function AddIndicatorsModal(props: Props) {
           }
         </Form.Item>
-        <Form.Item name="indicators" label="考评指标" rules={[{ required: true }]}>
-          <IndivatorsTable postId={postId} personModal={personModal} scopeType={scopeType} />
+        <Form.Item noStyle shouldUpdate={(prevValues, currentValues) => prevValues.rewards !== currentValues.rewards}>
+          {({ getFieldValue }) => {
+            const rewards = getFieldValue("rewards");
+            return (
+              <Form.Item name="indicators" label="考评指标" rules={[{ required: !(rewards && rewards.length > 0) }]}>
+                <IndivatorsTable postId={postId} personModal={personModal} scopeType={scopeType} />
+              </Form.Item>
+            );
+          }}
         </Form.Item>
-        <Form.Item name="rewards" label="考评奖惩" rules={[{ required: true }]}>
-          <RewardsTableSal postId={postId} personModal={personModal} scopeType={scopeType} />
+        <Form.Item
+          noStyle
+          shouldUpdate={(prevValues, currentValues) => prevValues.indicators !== currentValues.indicators}
+        >
+          {({ getFieldValue }) => {
+            const indicators = getFieldValue("indicators");
+            return (
+              <Form.Item name="rewards" label="考评奖惩" rules={[{ required: !(indicators && indicators.length > 0) }]}>
+                <RewardsTableSal postId={postId} personModal={personModal} scopeType={scopeType} />
+              </Form.Item>
+            );
+          }}
         </Form.Item>
       </Form>
@@ -60,8 +60,13 @@ const TotalAmount = ({
     if (dataIndex == "upper" && isPercent == 2) {
       precision = 2;
     }
-    const inputNode =
-      inputType === "number" ? <InputNumber precision={precision} max={isPercent == 2 ? 100 : 100000} /> : <Input />;
+    let max = 0;
+    if ((dataIndex == "upper" || dataIndex == "lower") && isPercent == 2) {
+      max = 100;
+    } else {
+      max = 999999999999;
+    }
+    const inputNode = inputType === "number" ? <InputNumber precision={precision} max={max} /> : <Input />;
     return (
       <td {...restProps}>
@@ -98,7 +98,7 @@ export default function EditModal({ onClose, setItem, item, roleList }: Props) {
             ))}
           </Select>
         </Form.Item>
-        <Form.Item name="belongSystem" label="归属系统" rules={[{ required: true }]}>
+        {/* <Form.Item name="belongSystem" label="归属系统" rules={[{ required: true }]}>
           <Select placeholder="请选择归属系统" showSearch allowClear labelInValue optionFilterProp="children">
             {list.map((item) => (
               <Option value={item.id} key={item.id}>
@@ -106,7 +106,7 @@ export default function EditModal({ onClose, setItem, item, roleList }: Props) {
               </Option>
             ))}
           </Select>
-        </Form.Item>
+        </Form.Item> */}
         {/* 使用角色 */}
         <Form.Item name="role" label="导入操作人员" rules={[{ required: true }]}>
           <Select placeholder="请选择导入操作角色类型" showSearch allowClear labelInValue optionFilterProp="children">
@@ -64,7 +64,7 @@ export default function Filter({ setParams, roleList }: Props) {
           </Option>
         ))}
       </Select>
-      <Select
+      {/* <Select
         allowClear
         placeholder="选择归属系统"
         style={{ width: 260, marginRight: 5 }}
@@ -77,7 +77,7 @@ export default function Filter({ setParams, roleList }: Props) {
             {item.sysName}
           </Select.Option>
         ))}
-      </Select>
+      </Select> */}
       <Select
         placeholder="筛选禁用与启用"
         style={{ width: 250, marginRight: 10, marginBottom: 10 }}