Merge remote-tracking branch 'origin/pms' into test

jiangwei
2 parents 50e34e64 305ee0a3
Showing 4 changed files with 105 additions and 8 deletions
src/pages/pms/storage/StorageManage/subpages/LocationManage/index.tsx
src/pages/pms/transfer/HuolalaSetting/components/AccountModal.tsx
src/pages/pms/transfer/HuolalaSetting/components/AddModal.tsx
src/pages/pms/transfer/HuolalaSetting/index.tsx
@@ -39,7 +39,6 @@ export default function RepertoryIndex({ match }: common.ConnectProps) {
             <Search
               allowClear
               placeholder="根据件号|编码|名称|库位"
-              onChange={(e) => _onChange({ keyword: e.target.value })}
               onSearch={(value) => _onChange({ keywords: value })}
               style={{ maxWidth: 300 }}
             />
@@ -60,7 +59,7 @@ export default function RepertoryIndex({ match }: common.ConnectProps) {
       <ItemDetailModal
         storageId={id}
         visible={view}
-        onCancel={() => { setView(false) }}
+        onCancel={() => { setView(false); }}
         fetchList={() => setLoading(true)}
       />
       <UploadModal
@@ -68,7 +67,7 @@ export default function RepertoryIndex({ match }: common.ConnectProps) {
         pagination={paginationConfig}
         loading={loading}
         visible={visible}
-        onCancel={() => { setVisible(false) }}
+        onCancel={() => { setVisible(false); }}
         setParams={setParams}
       />
       <UploadMoreModal
+import React, { useEffect } from 'react';
+import { Form, Button, Modal, Input } from 'antd';
+
+const Item = Form.Item;
+
+interface Props {
+  visible?: boolean,
+  onCancel: Function,
+  onOk: Function
+}
+
+export default function Index(props: Props) {
+  const { visible, onCancel, onOk } = props;
+  const [form] = Form.useForm();
+
+  useEffect(() => {
+    if (!visible) {
+      form.resetFields();
+    }
+  }, [visible]);
+
+  const onSave = () => {
+    form.validateFields().then(files => {
+      onOk(files.account);
+      onCancel();
+    });
+  };
+
+  return (
+    <Modal
+      title="发单账号"
+      open={visible}
+      maskClosable={false}
+      onCancel={() => onCancel()}
+      footer={[
+        <Button onClick={() => onCancel()}>取消</Button>,
+        <Button type="primary" htmlType="submit" onClick={() => onSave()}>确定</Button>
+      ]}
+    >
+      <Form
+        form={form}
+        labelCol={{ span: 5 }}
+        wrapperCol={{ span: 12 }}
+      >
+        <Item 
+          label="发单账号"
+          name="account" 
+          rules={[
+            { required: true, message: "请填写发单账号" },
+            () => ({
+            validator(_, value) {
+              if (value.length == 11) {
+                return Promise.resolve();
+              }
+              return Promise.reject(new Error('发单账号的长度不符合要求'));
+            },
+          }),
+          ]}
+        >
+          <Input />
+        </Item>
+      </Form>
+    </Modal>
+  );
+}
@@ -6,6 +6,7 @@ import {getContactUnit, ContactItem} from &#39;@/pages/pms/transfer/transferManage/a
 import {getShopApi} from '@/pages/pms/storage/partShop/api';
 import usePagination from '@/hooks/usePagination';
 import useInitail from '@/hooks/useInitail';
+import AccountModal from './AccountModal';
  
 const Item = Form.Item;
  
@@ -23,15 +24,17 @@ export default function Index(props:Props) {
   const [loading, setLoading] = useState(false);
   const { visible, onCancel, item, onRefreshing } = props;
   const [form] = Form.useForm();
+  const [accountVisible, setAccountVisible] = useState(false);
+  const [accounts, setAccounts] = useState<string[]>([]);
  
   useEffect(() => {
     if (visible && item?.id) {
+      setAccounts(item.account?.split(',') || []);
       form.setFieldsValue({
         supplierId: item.supplierId,
         shopId: item.shopId,
         minAmount: item.minAmount,
         roleCode: item.roleCode,
-        account: item.account
       });
     }
     if (!visible) {
@@ -40,6 +43,10 @@ export default function Index(props:Props) {
   }, [visible]);
  
   const onSave = () => {
+    if (!accounts.length) {
+      message.error('填写发单账号');
+      return;
+    }
     form.validateFields().then(files => {
       const params = {
         id: item?.id,
@@ -49,7 +56,7 @@ export default function Index(props:Props) {
         minAmount: files.minAmount,
         roleCode: files.roleCode,
         roleName: list.find(i => i.roleCode == files.roleCode)?.roleName,
-        account: files.account
+        account: accounts.join()
       };
       setLoading(true);
       saveApi(params).then(res => {
@@ -64,10 +71,15 @@ export default function Index(props:Props) {
     });
   };
  
+  const onOk = (v: any) => {
+    setAccounts([...accounts, v]);
+  };
+
   return (
     <Modal 
       title={item?.id ? "编辑货拉拉账户配置" : "新增货拉拉账户配置"}
       open={visible}
+      width={500}
       maskClosable={false}
       onCancel={() => onCancel()}
       footer={[
@@ -101,10 +113,32 @@ export default function Index(props:Props) {
             options={list.filter(i => i.roleType != 1).map(item => ({value: item.roleCode, label: item.roleName}))}
           />
         </Item>
-        <Item label="发单账号" name="account" rules={[{ required: true, message: "请填写发单账号" }]}>
-          <Input />
+        <Item
+          label="发单账号"
+          name="account"
+          labelCol={{ span: 5 }}
+          wrapperCol={{ span: 19 }}
+        >
+          {accounts.length ? (
+            <div>
+              {accounts.map((i, index) => (
+                <div style={{display: 'flex', alignItems: 'center', marginBottom: 5}} key={i}>
+                  <Input value={i} disabled style={{width: 226}} />
+                  <span style={{ color: '#FF4D4F', marginLeft: 10, cursor: 'pointer' }} onClick={() => setAccounts(accounts.filter(it => it != i))}>删除</span>
+                  {index == accounts.length - 1 && <span style={{ color: '#FAAD14', marginLeft: 10, cursor: 'pointer' }} onClick={() => setAccountVisible(true)}>添加</span>}
+                </div>
+            ))}
+            </div>
+        )
+          : (
+            <div style={{display: 'flex', alignItems: 'center'}}>
+              <Input disabled style={{width: 226}} />
+              <span style={{ color: '#FAAD14', marginLeft: 10, cursor: 'pointer'}} onClick={() => setAccountVisible(true)}>添加</span>
+            </div>
+          )}
         </Item>
       </Form>
+      <AccountModal visible={accountVisible} onCancel={() => setAccountVisible(false)} onOk={onOk} />
     </Modal>
   );
 }
@@ -19,7 +19,6 @@ export default function Index() {
         <Table dataSource={list} rowKey="id" loading={loading} pagination={paginationConfig}>
           <Column title="往来单位" dataIndex="supplierName" />
           <Column title="签约门店" dataIndex="shopName" />
-          <Column title="当前余额(元)" dataIndex="amount" />
           <Column title="低余额推待办(元)" dataIndex="minAmount" />
           <Column title="推待办角色" dataIndex="roleName" />
           <Column title="发单账号" dataIndex="account" />