From fdf6fc5a4a16195b24abbd774d5fe5340fde7a7b Mon Sep 17 00:00:00 2001
From: jiangwei <jiangwei.feewee.cn>
Date: Wed, 22 Mar 2023 10:45:23 +0800
Subject: [PATCH] 货拉拉账户配置联调

---
 src/pages/pms/transfer/HuolalaSetting/api.ts                     |  5 ++---
 src/pages/pms/transfer/HuolalaSetting/components/AddModal.tsx    | 14 ++++++++------
 src/pages/pms/transfer/HuolalaSetting/components/ChargeModal.tsx | 45 ++++++++++++++++++++++++++++++---------------
 src/pages/pms/transfer/HuolalaSetting/index.tsx                  |  9 ++++-----
 4 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/src/pages/pms/transfer/HuolalaSetting/api.ts b/src/pages/pms/transfer/HuolalaSetting/api.ts
index 65fd54a..f1bc44f 100644
--- a/src/pages/pms/transfer/HuolalaSetting/api.ts
+++ b/src/pages/pms/transfer/HuolalaSetting/api.ts
@@ -96,7 +96,6 @@ export interface saveParams{
 interface queryList {
   current?:number
   pageSize?:number
-  sysId?:number
 }
 // 查询财务账户信息列表
 export function getList(params: Params):http.PromisePageResp<ListVO> {
@@ -104,7 +103,7 @@ export function getList(params: Params):http.PromisePageResp<ListVO> {
 }
 // 新增/编辑API
 export function saveApi(params: saveParams) {
-  return request.post(`${PMS_HOST}/erp/finance/account/exit`, {...params});
+  return request.post(`${PMS_HOST}/erp/finance/account/save`, {...params});
 }
 // 推待办角色列表
 export function roleListApi(params: queryList): http.PromisePageResp<Role.Info> {
@@ -112,5 +111,5 @@ export function roleListApi(params: queryList): http.PromisePageResp<Role.Info> 
 }
 // 删除API
 export function deleteApi(params: {id: number}) {
-  return request.post(`${PMS_HOST}/erp/finance/account/delete`, {...params});
+  return request.post(`${PMS_HOST}/erp/finance/account/delete`, {...params}, {contentType: 'form-urlencoded'});
 }
\ No newline at end of file
diff --git a/src/pages/pms/transfer/HuolalaSetting/components/AddModal.tsx b/src/pages/pms/transfer/HuolalaSetting/components/AddModal.tsx
index af43eb3..a5fb8ba 100644
--- a/src/pages/pms/transfer/HuolalaSetting/components/AddModal.tsx
+++ b/src/pages/pms/transfer/HuolalaSetting/components/AddModal.tsx
@@ -12,15 +12,16 @@ const Item = Form.Item;
 interface Props{
   visible?:boolean,
   onCancel: Function,
-  item?:ListVO
+  item?:ListVO,
+  onRefreshing: Function
 }
 
 export default function Index(props:Props) {
-  const { list: suppliers } = usePagination<item>(getPageListApi, { supplierType: 40, pageSize: 500 });
+  const { list: suppliers } = usePagination<item>(getPageListApi, { pageSize: 500 });
   const { data: shops } = useInitail<PmsStoragePartShop.Option[], {}>(getShopApi, [], {});
-  const { list } = usePagination<Role.Info>(roleListApi, { pageSize: 500, sysId: 229 });
+  const { list } = usePagination<Role.Info>(roleListApi, { pageSize: 500 });
   const [loading, setLoading] = useState(false);
-  const { visible, onCancel, item } = props;
+  const { visible, onCancel, item, onRefreshing } = props;
   const [form] = Form.useForm();
 
   useEffect(() => {
@@ -54,6 +55,7 @@ export default function Index(props:Props) {
       saveApi(params).then(res => {
         message.success("保存成功");
         setLoading(false);
+        onRefreshing();
         onCancel();
       }).catch(e => {
         message.error(e.message);
@@ -65,7 +67,7 @@ export default function Index(props:Props) {
   return (
     <Modal 
       title={item?.id ? "编辑货拉拉账户配置" : "新增货拉拉账户配置"}
-      visible={visible}
+      open={visible}
       maskClosable={false}
       onCancel={() => onCancel()}
       footer={[
@@ -98,7 +100,7 @@ export default function Index(props:Props) {
         <Item label="推待办角色" name="roleCode" rules={[{ required: true, message: "请选择推办角色" }]}>
           <PmsSelect
             placeholder="选择待办角色"
-            options={list.map(item => ({value: item.roleCode, label: item.roleName}))}
+            options={list.filter(i => i.roleType != 1).map(item => ({value: item.roleCode, label: item.roleName}))}
           />
         </Item>
         <Item label="发单账号" name="account" rules={[{ required: true, message: "请填写发单账号" }]}>
diff --git a/src/pages/pms/transfer/HuolalaSetting/components/ChargeModal.tsx b/src/pages/pms/transfer/HuolalaSetting/components/ChargeModal.tsx
index 29c965a..e6aef4f 100644
--- a/src/pages/pms/transfer/HuolalaSetting/components/ChargeModal.tsx
+++ b/src/pages/pms/transfer/HuolalaSetting/components/ChargeModal.tsx
@@ -1,27 +1,42 @@
-import React from 'react';
-import { Form, Button, InputNumber, Modal } from 'antd';
+import React, { useEffect } from 'react';
+import { Form, Button, InputNumber, Modal, Input } from 'antd';
 import PmsSelect from '@/pages/pms/comonents/PmsSelect';
+import ImageUpload from '@/pages/pms/comonents/ImageUpload';
+import {ListVO} from '../api';
 
 const Item = Form.Item;
 
 interface Props {
   visible?: boolean,
   onCancel: Function,
-  item?: any
+  item?: ListVO
 }
 export default function Index(props: Props) {
   const { visible, onCancel, item } = props;
   const [form] = Form.useForm();
 
+  useEffect(() => {
+    if (visible && item?.id) {
+      form.setFieldsValue({
+        supplierName: item.supplierName,
+        amount: item.amount,
+        shopName: item.shopName
+      });
+    }
+    if (!visible) {
+      form.resetFields();
+    }
+  }, [visible]);
+
   const onSave = () => {
-    const params = {id: item.id};
+    const params = {id: item?.id};
     console.log(params);
   };
 
   return (
     <Modal
       title="预付款充值申请"
-      visible={visible}
+      open={visible}
       maskClosable={false}
       onCancel={() => onCancel()}
       footer={[
@@ -34,13 +49,13 @@ export default function Index(props: Props) {
         labelCol={{ span: 7 }}
         wrapperCol={{ span: 12 }}
       >
-        <Item label="往来单位" name="supplierName" rules={[{ required: true, message: "请选择往来单位" }]}>
-          <PmsSelect />
+        <Item label="往来单位" name="supplierName">
+          <Input disabled />
         </Item>
-        <Item label="往来单位类型" name="shopName" rules={[{ required: true, message: "请选择签约门店" }]}>
-          <PmsSelect />
+        <Item label="往来单位类型" name="shopName">
+          <Input disabled />
         </Item>
-        <Item label="账户余额" name="amount" rules={[{ required: true, message: "请填写金额" }]}>
+        <Item label="账户余额" name="amount">
           <InputNumber style={{ width: '100%' }} addonAfter="元" disabled />
         </Item>
         <Item label="充值金额" name="awaitAmount" rules={[{ required: true, message: "请填写金额" }]}>
@@ -50,16 +65,16 @@ export default function Index(props: Props) {
           <InputNumber style={{ width: '100%' }} addonAfter="元" disabled />
         </Item>
         <Item label="结算门店" name="shopName" rules={[{ required: true, message: "请选择推办角色" }]}>
-          <PmsSelect />
+          <Input disabled />
         </Item>
-        <Item label="发票金额要求比例" name="role" rules={[{ required: true, message: "请选择推办角色" }]}>
-          <PmsSelect />
+        <Item label="发票金额要求比例" name="role">
+          <Input disabled />
         </Item>
-        <Item label="结算方式" name="role" rules={[{ required: true, message: "请选择推办角色" }]}>
+        <Item label="结算方式" name="role" rules={[{ required: true, message: "请选择结算方式" }]}>
           <PmsSelect />
         </Item>
         <Item label="附件" name="files">
-          <PmsSelect />
+          <ImageUpload max={5} />
         </Item>
       </Form>
     </Modal>
diff --git a/src/pages/pms/transfer/HuolalaSetting/index.tsx b/src/pages/pms/transfer/HuolalaSetting/index.tsx
index f69ab9b..c43e83f 100644
--- a/src/pages/pms/transfer/HuolalaSetting/index.tsx
+++ b/src/pages/pms/transfer/HuolalaSetting/index.tsx
@@ -11,13 +11,12 @@ export default function Index() {
   const {list, loading, paginationConfig, setParams} = usePagination<ListVO>(getList, [], {});
   const [current, setCurrent] = useState<{ visible: boolean, item: ListVO }>({visible: false, item: {}});
   const [chargeInfo, setChargeInfo] = useState<{ visible: boolean, item: ListVO }>({visible: false, item: {}});
-  const data = [{id: 1, supplierName: "货拉拉", shopName: "不过承诺书可能单纯迪士尼才", amount: 3000, minAmount: 1500, roleName: "计划制定员", account: "15725173,16638183"}];
   return (
     <PageHeaderWrapper title="货拉拉账户配置">
       <Card 
         extra={<Button type="primary" onClick={() => setCurrent({visible: true, item: {}})}>新增</Button>}
       >
-        <Table dataSource={data} rowKey="id" loading={loading} pagination={paginationConfig}>
+        <Table dataSource={list} rowKey="id" loading={loading} pagination={paginationConfig}>
           <Column title="往来单位" dataIndex="supplierName" />
           <Column title="签约门店" dataIndex="shopName" />
           <Column title="当前余额(元)" dataIndex="amount" />
@@ -28,8 +27,8 @@ export default function Index() {
             title="操作" 
             render={r => (
               <div style={{display: 'flex', flexWrap: 'wrap', alignItems: 'center'}}>
-                <a onClick={() => setChargeInfo({visible: true, item: r})}>预付款充值申请</a>
-                <Divider type="vertical" />
+                {/* <a onClick={() => setChargeInfo({visible: true, item: r})}>预付款充值申请</a>
+                <Divider type="vertical" /> */}
                 <a onClick={() => setCurrent({visible: true, item: r})}>编辑</a>
                 <Divider type="vertical" />
                 <Popconfirm
@@ -47,7 +46,7 @@ export default function Index() {
             )}
           />
         </Table>
-        <AddModal visible={current.visible} item={current.item} onCancel={() => setCurrent({ visible: false, item: {} })} />
+        <AddModal visible={current.visible} item={current.item} onCancel={() => setCurrent({ visible: false, item: {} })} onRefreshing={() => setParams({}, true)} />
         <ChargeModal visible={chargeInfo.visible} item={chargeInfo.item} onCancel={() => setChargeInfo({ visible: false, item: {} })} />
       </Card>
     </PageHeaderWrapper>
--
libgit2 0.22.2