diff --git a/src/pages/finance/FinanceInvestor/components/Filter.tsx b/src/pages/finance/FinanceInvestor/components/Filter.tsx
index 224207b..c7c7e77 100644
--- a/src/pages/finance/FinanceInvestor/components/Filter.tsx
+++ b/src/pages/finance/FinanceInvestor/components/Filter.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
diff --git a/src/pages/finance/SpecialAccount/FactoryBill/components/Filter.tsx b/src/pages/finance/SpecialAccount/FactoryBill/components/Filter.tsx
index 4bf5841..472b987 100644
--- a/src/pages/finance/SpecialAccount/FactoryBill/components/Filter.tsx
+++ b/src/pages/finance/SpecialAccount/FactoryBill/components/Filter.tsx
@@ -1,5 +1,5 @@
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 (
-
-
- 商家:
-
-
-
- 品牌:
-
-
-
+
+
+
+
+
-
+
);
}
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModal.tsx
index c3ec554..0c2eb72 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModal.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModal.tsx
@@ -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: {
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSal.tsx
index 536e176..316f998 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSal.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCommissionParamsModalSal.tsx
@@ -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: {
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCondModal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCondModal.tsx
index f290d65..550de21 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCondModal.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCondModal.tsx
@@ -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: {
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCondModalSal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCondModalSal.tsx
index b2e9e97..4b57a13 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCondModalSal.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddCondModalSal.tsx
@@ -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: {
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModal.tsx
index 661d8e8..f810437 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModal.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModal.tsx
@@ -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: {
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSal.tsx
index b943570..1a5263d 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSal.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddLadderParamsModalSal.tsx
@@ -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: {
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddRewardsModal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddRewardsModal.tsx
index 454e069..60599b2 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddRewardsModal.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/AddRewardsModal.tsx
@@ -317,6 +317,12 @@ export default function CreateModal(props: Props) {
按比例
+ {/*
+
+ 正数
+ 倒数
+
+ */}
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 (
diff --git a/src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx b/src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx
index d2bb3f1..4f8ccf8 100755
--- a/src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx
+++ b/src/pages/performance/EvaGroupSetting/EditComfirm/components/RankModal.tsx
@@ -1,5 +1,5 @@
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" ? : ;
+ const rankOrderType = (
+
+ 正数
+ 倒数
+
+ );
return (
{editing ? (
- {inputNode}
+ {dataIndex == "rankOrderType" ? rankOrderType : inputNode}
) : (
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),
+ };
+ },
},
],
};
|