Merge branch 'bug_fix' into 'master'

考评组bugfix See merge request !187

Merge branch 'bug_fix' into 'master'
考评组bugfix See merge request !187
张志伟
2 parents b5613060 7cf041ab
Showing 8 changed files with 172 additions and 29 deletions
src/pages/performance/CompensateGroupConfig/components/DraftList.tsx
src/pages/performance/EvaDataImport/components/FileDatailsModal.tsx
src/pages/performance/EvaDataImport/components/style.less
src/pages/performance/EvaDataImport/index.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/TotalAmountSal.tsx
src/pages/performance/EvaGroupSetting/components/DraftList.tsx
src/pages/performance/KpiGroupSetting/components/DraftList.tsx
@@ -89,7 +89,7 @@ export default ({ type }: Props) =&gt; {
           新增
         </Button>
       </Row>
-      <Table loading={loading} rowKey={(row) => `id${row.id}`} dataSource={list} pagination={paginationConfig}>
+      <Table loading={loading} rowKey={(row) => `id${row.draftId}`} dataSource={list} pagination={paginationConfig}>
         <Column title="薪酬组名称" dataIndex="name" align="center" render={(name) => name || ""} />
         <Column title="岗位" dataIndex="postName" align="center" />
         <Column
+import React, { useState, useEffect } from "react";
+import {
+  Table,
+  Input,
+  InputNumber,
+  Popconfirm,
+  Form,
+  Typography,
+  Button,
+  message,
+  Space,
+  Divider,
+  Modal,
+  Card,
+} from "antd";
+import { cloneDeep } from "lodash";
+import { KpiGroupSetteing } from "@/pages/performance/KpiGroupSetting/interface";
+import { TargetType, TargetTypeEnum } from "@/pages/performance/entity";
+import { render } from "react-dom";
+import moment from "moment";
+import { ReasonsEnum } from "../entity";
+import { history } from "umi";
+import st from "./style.less";
+
+const Column = Table.Column;
+
+interface Props {
+  visible: boolean;
+  fileData: any;
+  tarOnCancel: Function;
+}
+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) => {
+  return (
+    <>
+      <Modal title="导入数据详情" visible={visible} onCancel={() => tarOnCancel()} maskClosable={false} width={1500}>
+        <Table bordered dataSource={fileData.details}>
+          <Column title="归属人员" dataIndex="userName" align="center" render={(name) => <span>{name || "--"}</span>} />
+          <Column title="归属门店" dataIndex="shopName" align="center" render={(name) => <span>{name || "--"}</span>} />
+          <Column
+            title="指标名称"
+            dataIndex="indicatorName"
+            align="center"
+            render={(name) => <span>{name || "--"}</span>}
+          />
+          <Column
+            title="指标值"
+            dataIndex="indicatorValue"
+            align="center"
+            render={(num, record: any) => (
+              <span>
+                {num !== undefined
+                  ? `${num}${
+                      record.dataType == 1 ? "台" : record.dataType == 2 ? "%" : record.dataType == 3 ? "元" : ""
+                    }`
+                  : "--"}
+              </span>
+            )}
+          />
+          <Column
+            title="考核周期"
+            dataIndex="dataDate"
+            align="center"
+            render={(time: number) => (time ? moment(time).format("YYYY-MM-DD") : "--")}
+          />
+          <Column
+            title="是否导入"
+            dataIndex="errorType"
+            align="center"
+            render={(_: any, record: any) =>
+              record.errorType ? <div className={st.no}>未导入</div> : <div className={st.yes}>已导入</div>
+            }
+          />
+          <Column
+            title="未导入原因"
+            dataIndex="errorType"
+            align="center"
+            render={(_: any, record: any) => (record.errorType ? ReasonsEnum[record.errorType] : "--")}
+          />
+        </Table>
+      </Modal>
+    </>
+  );
+};
+
+export default TargetModal;
+.no {
+  width: 47px;
+  height: 18px;
+  margin: 0 auto;
+  color: #f4333c;
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 18px;
+  border: 1px solid #f8797f;
+  border-radius: 2px;
+}
+.yes {
+  width: 47px;
+  height: 18px;
+  margin: 0 auto;
+  color: #20c688;
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 18px;
+  border: 1px solid #6ddab2;
+  border-radius: 2px;
+}
@@ -8,6 +8,7 @@ import type { UploadProps } from &quot;antd&quot;;
 import { history } from "umi";
 import moment from "moment";
 import Filter from './components/Filter';
+import FileDatailsModal from './components/FileDatailsModal';
 const Column = Table.Column;
@@ -15,6 +16,8 @@ export default () =&gt; {
   const { loading, list, paginationConfig, setParams, innerParams } = usePagination(evaDataListApi, {
     pageSize: 10,
   });
+  const [fileData, setFileData] = useState({});
+  const [visible, setVisible] = useState<boolean>(false);
   const uploadPerson: UploadProps = {
     name: "file",
     action: "/api/morax/erp/eval-indicator/staff-indicator",
@@ -25,10 +28,12 @@ export default () =&gt; {
         console.log(info.file, info.fileList);
       }
       if (info.file.status === "done") {
-        message.success(`${info.file.name} 导入成功`);
+        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} 导入失败`);
+        message.error(`${info.file.name} 上传失败`);
       }
     },
   };
@@ -42,10 +47,10 @@ export default () =&gt; {
         console.log(info.file, info.fileList);
       }
       if (info.file.status === "done") {
-        message.success(`${info.file.name} 导入成功`);
+        message.success(`${info.file.name} 上传成功`);
         setParams({ ...innerParams }, true);
       } else if (info.file.status === "error") {
-        message.error(`${info.file.name} 导入失败`);
+        message.error(`${info.file.name} 上传失败`);
       }
     },
   };
@@ -57,12 +62,20 @@ export default () =&gt; {
           <Filter setParams={setParams} />
           <div>
             <Button type="default" style={{ marginRight: 10 }}>
-              <a href="https://gate.feewee.cn/file/download?fid=74d1d724f9be48baa5921f3782037c3b" target="_blank" rel="noreferrer">
+              <a
+                href="https://gate.feewee.cn/file/download?fid=74d1d724f9be48baa5921f3782037c3b"
+                target="_blank"
+                rel="noreferrer"
+              >
                 下载人员模板
               </a>
             </Button>
             <Button type="default" style={{ marginRight: 10 }}>
-              <a href="https://gate.feewee.cn/file/download?fid=e4eb136962164264a78753bd1d6061f3" target="_blank" rel="noreferrer">
+              <a
+                href="https://gate.feewee.cn/file/download?fid=e4eb136962164264a78753bd1d6061f3"
+                target="_blank"
+                rel="noreferrer"
+              >
                 下载门店模板
               </a>
             </Button>
@@ -76,7 +89,6 @@ export default () =&gt; {
             </Upload>
           </div>
         </Row>
-
         <Table
           loading={loading}
           rowKey={(row) => `id${row.indicatorCode}`}
@@ -137,6 +149,7 @@ export default () =&gt; {
             )}
           />
         </Table>
+        {/* <FileDatailsModal visible={visible} tarOnCancel={() => setVisible(false)} fileData={fileData} /> */}
       </Card>
     </PageHeaderWrapper>
   );
@@ -425,7 +425,7 @@ const TotalAmount = ({
               }}
             />
           </Form>
-          <div>金额可为负数</div>
+          <div>金额可为负数，负数为负激励</div>
         </>
       )}
     </>
@@ -58,7 +58,7 @@ const TotalAmount = ({
     if (dataIndex == "upper" && isPercent == 2) {
       precision = 2;
     }
-    const inputNode = inputType === "number" ? <InputNumber precision={precision} min={0} /> : <Input />;
+    const inputNode = inputType === "number" ? <InputNumber precision={precision} /> : <Input />;
     return (
       <td {...restProps}>
@@ -360,24 +360,28 @@ const TotalAmount = ({
               }}
             />
           </Form>
+          <div>金额可为负数，负数为负激励</div>
         </Modal>
       ) : (
-        <Form form={form} component={false}>
-          <Table
-            components={{
-              body: {
-                cell: EditableCell,
-              },
-            }}
-            bordered
-            dataSource={value}
-            columns={mergedColumns}
-            rowClassName="editable-row"
-            pagination={{
-              onChange: cancel,
-            }}
-          />
-        </Form>
+        <>
+          <Form form={form} component={false}>
+            <Table
+              components={{
+                body: {
+                  cell: EditableCell,
+                },
+              }}
+              bordered
+              dataSource={value}
+              columns={mergedColumns}
+              rowClassName="editable-row"
+              pagination={{
+                onChange: cancel,
+              }}
+            />
+          </Form>
+          <div>金额可为负数，负数为负激励</div>
+        </>
       )}
     </>
   );
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { PageHeaderWrapper } from "@ant-design/pro-layout";
 import { Button, Card, Table, Row, Space, Typography, Divider, Popconfirm, message } from "antd";
 import usePagination from "@/hooks/usePagination";
@@ -22,6 +22,9 @@ export default ({ type }: Props) =&gt; {
     status: 2,
     type: 1,
   });
+  useEffect(() => {
+    console.log("list", list);
+  }, [list]);
   const [visibleDetail, setVisibleDetail] = useState(false);
   const [item, setItem] = useState<any>({});
   //删除
@@ -69,7 +72,7 @@ export default ({ type }: Props) =&gt; {
       </Row>
       <Table
         loading={loading}
-        rowKey={(row) => `id${row.id}`}
+        rowKey={(row) => `id${row.draftId}`}
         dataSource={list}
         pagination={paginationConfig}
         scroll={{ x: 500 }}
@@ -92,7 +92,7 @@ export default ({ type }: Props) =&gt; {
       </Row>
       <Table
         loading={loading}
-        rowKey={(row) => `id${row.id}`}
+        rowKey={(row) => `id${row.draftId}`}
         dataSource={list}
         pagination={paginationConfig}
         scroll={{ x: 500 }}