From 390939a7ae1600d77e6ebec5b8f46e8048144ca7 Mon Sep 17 00:00:00 2001
From: zhaofeng <zhaofeng@feewee.cn>
Date: Fri, 17 Mar 2023 15:03:29 +0800
Subject: [PATCH] 保证金账户、一般账户不能重复

---
 src/pages/finance/SpecialAccount/FinancingCompany/components/CreateModal.tsx | 11 ++++++++---
 src/pages/finance/SpecialAccount/FinancingCompany/components/Filter.tsx      |  2 --
 src/pages/finance/SpecialAccount/FinancingCompany/components/List.tsx        |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/finance/SpecialAccount/FinancingCompany/components/CreateModal.tsx b/src/pages/finance/SpecialAccount/FinancingCompany/components/CreateModal.tsx
index e7d11f4..98d73b0 100644
--- a/src/pages/finance/SpecialAccount/FinancingCompany/components/CreateModal.tsx
+++ b/src/pages/finance/SpecialAccount/FinancingCompany/components/CreateModal.tsx
@@ -10,7 +10,8 @@ const FormItem = Form.Item;
 const { Option } = Select;
 
 export default function CreateModal() {
-  const { visible, current, setCurrent, setVisible, fcList, accountList, setLoading, dealerId, brandList } = useStore();
+  const { visible, current, setCurrent, setVisible, fcList, accountList, setLoading, dealerId, brandList, type } =
+    useStore();
   const [form] = Form.useForm();
 
   const [saveLoading, setSaveLoading] = useState<boolean>(false);
@@ -76,6 +77,10 @@ export default function CreateModal() {
   }
 
   function submit(fieldValue: any) {
+    if (fieldValue.depositAccount.value === fieldValue.account.value) {
+      message.error("还款保证金账户、一般账户请勿配置为同一一账户", 1.5);
+      return;
+    }
     const param = {
       dealerId,
       ...fieldValue,
@@ -155,7 +160,7 @@ export default function CreateModal() {
           {({ getFieldValue }): any => {
             const category = getFieldValue("compCategory");
             return category ? (
-              <FormItem label="融资公司" name="fcComp" rules={[{ required: true, message: "请选择融资公司" }]}>
+              <FormItem label="往来银行" name="fcComp" rules={[{ required: true, message: "请选择往来银行" }]}>
                 <Select
                   showSearch
                   labelInValue
@@ -185,7 +190,7 @@ export default function CreateModal() {
             <Radio value={2}>每张票支付</Radio>
           </Radio.Group>
         </FormItem>
-        <FormItem name="depositAccount" label="保证金账户">
+        <FormItem name="depositAccount" label="还款保证金账户">
           <Select labelInValue placeholder="请选择账户" showSearch optionFilterProp="children" allowClear>
             {accountList.map((item) => (
               <Option key={item.id} value={item.id}>
diff --git a/src/pages/finance/SpecialAccount/FinancingCompany/components/Filter.tsx b/src/pages/finance/SpecialAccount/FinancingCompany/components/Filter.tsx
index 7273454..70f6b46 100644
--- a/src/pages/finance/SpecialAccount/FinancingCompany/components/Filter.tsx
+++ b/src/pages/finance/SpecialAccount/FinancingCompany/components/Filter.tsx
@@ -26,7 +26,6 @@ export default function AccountList() {
       }}
     >
       <Row style={{ display: "flex", flex: 1, alignItems: 'center' }}>
-        <div>商家：</div>
         <Col span={6}>
           <Select
             placeholder="请选择商家"
@@ -44,7 +43,6 @@ export default function AccountList() {
             ))}
           </Select>
         </Col>
-        <div style={{ marginLeft: 20 }}>品牌：</div>
         <Col span={6}>
           <Select
             placeholder="请选择品牌"
diff --git a/src/pages/finance/SpecialAccount/FinancingCompany/components/List.tsx b/src/pages/finance/SpecialAccount/FinancingCompany/components/List.tsx
index 5c37a07..d1c7fdb 100644
--- a/src/pages/finance/SpecialAccount/FinancingCompany/components/List.tsx
+++ b/src/pages/finance/SpecialAccount/FinancingCompany/components/List.tsx
@@ -39,7 +39,7 @@ export default function SalesFinanceList() {
             }
           >
             <span>
-              保证金&nbsp;&nbsp;
+              还款保证金账户&nbsp;&nbsp;
               <ExclamationCircleFilled style={{ color: "#40a9ff" }} />
             </span>
           </Popover>
--
libgit2 0.22.2