Merge branch 'bug_fix' into 'master'

考评Bug fix See merge request !191

Merge branch 'bug_fix' into 'master'
考评Bug fix See merge request !191
张志伟
2 parents 6861fe92 778b72c8
Showing 10 changed files with 94 additions and 80 deletions
src/pages/finance/FinanceInvestor/components/Filter.tsx
src/pages/finance/SpecialAccount/FactoryBill/components/Filter.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCondModal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCondModalSal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/AddRewardsModal.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx
@@ -8,26 +8,11 @@ const { Option } = Select;
 const Search = Input.Search;
 export default function AccountList() {
-  // const { setVisible, setParams, innerParams, dealerLoading, dealerList } = useStore();
   const { triggerModal, brands, financeList, setInvestList, companys, dealers } = useStore();
-  //  investList,
-  //     setInvestList,
   // 存储删选条件
   const [filterParams, setFilterParams] = useState({});
-  console.log("投资主体11列表", financeList);
-
-  // function searchType(accountType: number) {
-  //   setParams({ accountType }, true);
-  // }
-
-  // _onSelectSubject;
-  // const fetchListByName = debounce(value => {
-  //   setParams({ keywords: value }, true);
-  // }, 500);
-
   useEffect(() => {
-    console.log("筛选参数filterParams", filterParams);
     let originList = financeList;
     let res = [];
     if (filterParams.brandId) {
@@ -41,7 +26,6 @@ export default function AccountList() {
     if (filterParams.includeId) {
       //删选包含商家 includeId
       originList = originList.filter((item) => item.includeDealers?.find((y) => y.id === filterParams.includeId));
-      console.log("筛选输入：", originList);
     }
     if (filterParams.creditDealerId) {
       //删选授信商家 creditDealerId
 import React, { useCallback } from "react";
-import { Button, Col, Row, Select } from "antd";
+import { Button, Row, Select } from "antd";
 import { useStore } from "../index";
 const { Option } = Select;
@@ -10,61 +10,47 @@ export default function Filter() {
   const searchDealer = useCallback((dealerId) => {
     setDealerId(dealerId);
   }, []);
-  
+
   const searchBrand = useCallback((brandId) => {
     setBrandId(brandId);
   }, []);
   return (
-    <div
-      style={{
-        display: "flex",
-        flexDirection: "row",
-        justifyContent: "space-between",
-        alignItems: "center",
-        marginBottom: 20,
-      }}
-    >
-      <Row style={{ display: "flex", flex: 1, alignItems: "center" }}>
-        <div>商家：</div>
-        <Col span={6}>
-          <Select
-            placeholder="请选择商家"
-            showSearch
-            optionFilterProp="children"
-            onChange={searchDealer}
-            // value={dealerId && dealerId > 0 ? dealerId : undefined}
-            style={{ width: 300 }}
-          >
-            {dealerList.map((dealer) => (
-              <Option value={dealer.id} key={dealer.id}>
-                {dealer.name}
-              </Option>
-            ))}
-          </Select>
-        </Col>
-        <div style={{ marginLeft: 20 }}>品牌：</div>
-        <Col span={6}>
-          <Select
-            placeholder="请选择品牌"
-            loading={brandLoading}
-            allowClear
-            optionFilterProp="children"
-            onChange={searchBrand}
-            value={brandId && brandId > 0 ? brandId : undefined}
-            style={{ width: 160 }}
-          >
-            {brandList.map((brand) => (
-              <Option value={brand.id} key={brand.id}>
-                {brand.name}
-              </Option>
-            ))}
-          </Select>
-        </Col>
+    <Row justify="space-between" style={{ marginBottom: 10 }}>
+      <Row justify="start">
+        <Select
+          placeholder="请选择商家"
+          showSearch
+          optionFilterProp="children"
+          onChange={searchDealer}
+          style={{ width: 200 }}
+        >
+          {dealerList.map((dealer) => (
+            <Option value={dealer.id} key={dealer.id}>
+              {dealer.name}
+            </Option>
+          ))}
+        </Select>
+        <Select
+          placeholder="请选择品牌"
+          loading={brandLoading}
+          allowClear
+          optionFilterProp="children"
+          onChange={searchBrand}
+          value={brandId && brandId > 0 ? brandId : undefined}
+          style={{ width: 200,marginLeft:100 }}
+        >
+          {brandList.map((brand) => (
+            <Option value={brand.id} key={brand.id}>
+              {brand.name}
+            </Option>
+          ))}
+        </Select>
       </Row>
+
       <Button type="primary" hidden={!dealerId} onClick={() => setVisible(true)}>
         新增
       </Button>
-    </div>
+    </Row>
   );
 }
@@ -75,6 +75,8 @@ export default function AddCommissionParamsModal(props: Props) {
       console.log("comItem.targetType", comItem.targetType);
       setTargetType(indTar);
       setIndicatorName(comItem.name);
+      setDataType(comItem.dataType);
+      setCodeType(comItem.codeType);
       form.setFieldsValue({
         ...comItem,
         commissionParams: {
@@ -74,6 +74,8 @@ export default function AddCommissionParamsModal(props: Props) {
       console.log("comItem.targetType", comItem.targetType);
       setTargetType(indTar);
       setIndicatorName(comItem.name);
+      setDataType(comItem.dataType);
+      setCodeType(comItem.codeType);
       form.setFieldsValue({
         ...comItem,
         commissionParams: {
@@ -71,6 +71,8 @@ export default function AddCondModal(props: Props) {
       console.log("comItem.targetType", comItem.targetType);
       setTargetType(indTar);
       setIndicatorName(comItem.name);
+      setDataType(comItem.dataType);
+      setCodeType(comItem.codeType);
       form.setFieldsValue({
         ...comItem,
         conds: {
@@ -69,6 +69,8 @@ export default function AddCondModal(props: Props) {
       console.log("comItem.targetType", comItem.targetType);
       setTargetType(indTar);
       setIndicatorName(comItem.name);
+      setDataType(comItem.dataType);
+      setCodeType(comItem.codeType);
       form.setFieldsValue({
         ...comItem,
         conds: {
@@ -68,6 +68,7 @@ export default function AddLadderParamsModal(props: Props) {
       console.log("comItem.targetType", comItem.targetType);
       setTargetType(indTar);
       setIndicatorName(comItem.name);
+      setCodeType(comItem.codeType);
       form.setFieldsValue({
         ...comItem,
         ladderParams: {
@@ -68,6 +68,7 @@ export default function AddLadderParamsModal(props: Props) {
       console.log("comItem.targetType", comItem.targetType);
       setTargetType(indTar);
       setIndicatorName(comItem.name);
+      setCodeType(comItem.codeType);
       form.setFieldsValue({
         ...comItem,
         ladderParams: {
@@ -317,6 +317,12 @@ export default function CreateModal(props: Props) {
                       <Radio value={2}>按比例</Radio>
                     </Radio.Group>
                   </Form.Item>
+                  {/* <Form.Item name="rankOrderType" label="排名顺序" rules={[{ required: true, message: "请选择排名顺序" }]}>
+                    <Radio.Group>
+                      <Radio value={1}>正数</Radio>
+                      <Radio value={2}>倒数</Radio>
+                    </Radio.Group>
+                  </Form.Item> */}
                   <Form.Item
                     noStyle
                     shouldUpdate={(prevValues, currentValues) => prevValues.rankType !== currentValues.rankType}
@@ -338,9 +344,9 @@ export default function CreateModal(props: Props) {
                     {({ getFieldValue }) => {
                       const rankType = getFieldValue("rankType");
                       if (rankType == 1 && !currentItem.ladders) {
-                        form.setFieldValue("ladders", [{ lower: 1, money: 0, key: 0 }]);
+                        form.setFieldValue("ladders", [{ lower: 1, money: 0, key: 0, rankOrderType: 1 }]);
                       } else if (rankType == 2 && !currentItem.ladders) {
-                        form.setFieldValue("ladders", [{ lower: 0, money: 0, key: 0 }]);
+                        form.setFieldValue("ladders", [{ lower: 0, money: 0, key: 0, rankOrderType: 1 }]);
                       }
                       return (
                         <Form.Item
@@ -352,7 +358,7 @@ export default function CreateModal(props: Props) {
                           <RankModal
                             visible
                             isPercent={isPercent}
-                            laddersType={currentItem.laddersType}
+                            laddersType={currentItem?.laddersType}
                             calType={calType}
                             rankType={rankType}
                           />
 import React, { useState, useEffect } from "react";
-import { Table, Input, InputNumber, Popconfirm, Form, Typography, Space, Divider, Modal } from "antd";
+import { Table, Input, InputNumber, Popconfirm, Form, Typography, Space, Divider, Modal, Radio } from "antd";
 import { SalaryMapHeader } from "@/pages/performance/CompensateGroupConfig/entity";
 interface Item {
@@ -67,12 +67,18 @@ const TotalAmount = ({
       max = 999999999999;
     }
     const inputNode = inputType === "number" ? <InputNumber precision={precision} max={max} /> : <Input />;
+    const rankOrderType = (
+      <Radio.Group>
+        <Radio value={1}>正数</Radio>
+        <Radio value={2}>倒数</Radio>
+      </Radio.Group>
+    );
     return (
       <td {...restProps}>
         {editing ? (
           <Form.Item name={dataIndex} style={{ margin: 0 }}>
-            {inputNode}
+            {dataIndex == "rankOrderType" ? rankOrderType : inputNode}
           </Form.Item>
         ) : (
           children
@@ -123,6 +129,8 @@ const TotalAmount = ({
       newObj.lower = lastData.upper;
     } else if (rankType == 1) {
       newObj.lower = lastData.upper + 1;
+    } else {
+      newObj.lower = lastData.upper + 1;
     }
     newObj.key = Number(lastData.key) + 1;
@@ -245,8 +253,9 @@ const TotalAmount = ({
       children: [
         {
           title: `初始排名${rankType == 1 ? "(≥)" : "(>)"}`,
+          editable: true,
           dataIndex: "lower",
-          width: "20%",
+          width: "15%",
           render: (value: number) => {
             if (isPercent == 2) {
               return value + "%";
@@ -260,9 +269,9 @@ const TotalAmount = ({
           },
         },
         {
-          title: `结束排名${rankType == 1 ? "(<)" : "(≤)"}`,
+          title: `结束排名${rankType == 1 ? "(≤)" : "(≤)"}`,
           dataIndex: "upper",
-          width: "20%",
+          width: "15%",
           editable: true,
           render: (value: number) => {
             if (value) {
@@ -285,7 +294,7 @@ const TotalAmount = ({
     {
       title: "金额 (元)",
       dataIndex: "money",
-      width: "20%",
+      width: "10%",
       editable: true,
       render: (text: number) => (typeof text === "number" ? `${text}` : "--"),
     },
@@ -297,6 +306,13 @@ const TotalAmount = ({
       render: (text: number) => (typeof text === "number" ? `${text}` : "--"),
     },
     {
+      title: "排名顺序类型",
+      dataIndex: "rankOrderType",
+      width: "20%",
+      editable: true,
+      render: (rankOrderType: number) => (rankOrderType === 2 ? "倒数排序" : "正数排序"),
+    },
+    {
       title: "操作",
       width: "40%",
       dataIndex: "operation",
@@ -357,16 +373,28 @@ const TotalAmount = ({
         children: [
           {
             ...col.children[0],
+            onCell: (record: Item) => {
+              return {
+                record,
+                inputType: "number",
+                dataIndex: col.children[0].dataIndex,
+                title: col.children[0].title,
+                editing: isEditing(record),
+              };
+            },
           },
           {
             ...col.children[1],
-            onCell: (record: Item) => ({
-              record,
-              inputType: "number",
-              dataIndex: col.children[1].dataIndex,
-              title: col.children[1].title,
-              editing: isEditing(record),
-            }),
+            onCell: (record: Item) => {
+              console.log("recordrecord", record);
+              return {
+                record,
+                inputType: "number",
+                dataIndex: col.children[1].dataIndex,
+                title: col.children[1].title,
+                editing: isEditing(record),
+              };
+            },
           },
         ],
       };