Merge branch 'pms' into 'master'

Pms 预付款账号配置 See merge request !203

Merge branch 'pms' into 'master'
Pms 预付款账号配置 See merge request !203
张志伟
2 parents 11117108 db42ca00
Showing 16 changed files with 458 additions and 174 deletions
src/pages/pms/comonents/ImageUpload.tsx
src/pages/pms/partPlan/PlanManage/subpages/Apply/index.tsx
src/pages/pms/partPlan/PlanManage/subpages/Detail/index.tsx
src/pages/pms/purchase/PurchaseRecord/comonents/PayApplyModal.tsx
src/pages/pms/storage/StorageManage/subpages/LocationManage/index.tsx
src/pages/pms/storage/areaStorageSetting/index.tsx
src/pages/pms/storage/partShop/components/StorageFlowModal.tsx
src/pages/pms/storage/partShop/components/UploadMoreModal.tsx
src/pages/pms/storage/partShop/components/api.tsx
src/pages/pms/storage/partShop/index.tsx
src/pages/pms/transfer/HuolalaSetting/api.ts
src/pages/pms/transfer/HuolalaSetting/components/AccountModal.tsx
src/pages/pms/transfer/HuolalaSetting/components/AddModal.tsx
src/pages/pms/transfer/HuolalaSetting/components/ChargeModal.tsx
src/pages/pms/transfer/HuolalaSetting/index.tsx
src/pages/pms/transfer/transferManage/TransferDetail/index.tsx
+import { PlusOutlined } from '@ant-design/icons';
+import { Modal, Upload, message } from 'antd';
+import type { RcFile } from 'antd/es/upload';
+import type { UploadFile } from 'antd/es/upload/interface';
+import React, { useEffect, useState } from 'react';
+import { UploadChangeParam } from 'antd/lib/upload';
+
+interface Props{
+  max?:number // 限制上传的数量
+  onChange?: (info: string[]) => any, //上传文件改变时的回调
+  value?: string[] // 上传成功后后端返回的文件地址  eg: "ea47b5706a874fbc91bd45cb142eeb55"
+  disabled?: boolean
+}
+
+function Index(props: Props) {
+  const { max = 1, onChange, value = [], disabled= false } = props;
+  const [previewOpen, setPreviewOpen] = useState(false);
+  const [previewImage, setPreviewImage] = useState('');
+  const [fileList, setFileList] = useState<UploadFile[]>([]);
+
+  useEffect(() => {
+    setFileList(value.map(i => (
+      {
+        uid: i,
+        name: i,
+        status: 'done',
+        url: `/api/file/show?fid=${i}`,
+      }
+    )));
+  }, [value.length]);
+
+  const getBase64 = (file: RcFile): Promise<string> => new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.readAsDataURL(file);
+    reader.onload = () => resolve(reader.result as string);
+    reader.onerror = error => reject(error);
+  });
+// 预览图片
+  const handlePreview = async (file: UploadFile) => {
+    if (!file.url && !file.preview) {
+      file.preview = await getBase64(file.originFileObj as RcFile);
+    }
+
+    setPreviewImage(file.url || (file.preview as string));
+    setPreviewOpen(true);
+  };
+// 关闭预览
+  const handleCancel = () => setPreviewOpen(false);
+// 上传文件改变
+  function handleChange(info: UploadChangeParam) {
+    const { file: { status, response }, fileList } = info;
+    if (status !== 'uploading' && response) {
+      const { success, result, data } = response;
+      if (status === 'done' && success) {
+        onChange && onChange([...value, data]);
+      } else if (response && !success) {
+        message.error(`${info.file.name} 上传失败: ${result}`);
+      }
+    }
+    setFileList(fileList);
+  }
+// 移除文件 
+  function handleRemove(file: any) {
+    const files = fileList.filter(i => i.uid != file.uid);
+    const fids = files.map(i => i.uid);
+    onChange && onChange(fids);
+  }
+
+  const uploadButton = (
+    <div>
+      <PlusOutlined />
+      <div style={{ marginTop: 8 }}>上传</div>
+    </div>
+  );
+  return (
+    <div>
+      <Upload
+        action="/api/file/upload"
+        listType="picture-card"
+        disabled={disabled}
+        fileList={fileList}
+        onPreview={handlePreview}
+        onChange={handleChange}
+        onRemove={handleRemove}
+      >
+        {fileList.length >= max ? null : uploadButton}
+      </Upload>
+      <Modal open={previewOpen} footer={null} onCancel={handleCancel}>
+        <img alt="example" style={{ width: '100%' }} src={previewImage} />
+      </Modal>
+    </div>
+  );
+}
+
+export default Index;
 \ No newline at end of file
@@ -16,7 +16,7 @@ import {groupBys, flattenDeep} from &#39;@/pages/pms/entity&#39;;
 import {PartDetail} from '../../api';
 import { history } from 'umi';
 import { getDetail, Params as detailParams, Item } from '../Detail/api';
-import ImageUpload from '@/pages/decoration/deco/DeoGoodsManagement/components/ImageUpload';
+import ImageUpload from '@/pages/pms/comonents/ImageUpload';
 const { Option } = Select;
 const apiObj: { [key: number]: any } = {
@@ -40,7 +40,6 @@ export default function Index() {
   const [visiblePartDetail, setVisiblePartDetail] = useState(false);
   const partList = flattenDeep(dealerList.map(it => (it.suppliers || []).map((su: any) => (su.storages || []).map((st: any) => (st.parts || [])))));
   const poolIds = partList.map((it: any) => it.poolId);
-  const [imageVisible, setImageVisible] = useState(true);
   const [info, setInfo] = useState<{ remark?: string, fids?: any }>();
   useEffect(() => {
@@ -52,12 +51,11 @@ export default function Index() {
   useEffect(() => {
     if (data.list?.length) {
-      setImageVisible(false);
       setDfParams({brandId: data.list[0].brandId});
       setParams({}, true);
       setDelay(false);
       setDealerList(data.list);
-      setInfo({ remark: data.remark, fids: data.fids?.split(',').map(i => `/api/file/show?fid=${i}`) });
+      setInfo({ remark: data.remark, fids: data.fids?.split(',') });
     }
   }, [data.list?.length]);
@@ -180,13 +178,7 @@ export default function Index() {
       ...dfParams,
       suppliers,
       remark: info?.remark,
-      fids: info?.fids.map((i: any) => {
-        if (typeof i == 'object') {
-          return i.url.split('=')[1];
-        } else {
-          return i;
-        }
-      }).join()
+      fids: info?.fids.join()
     }).then(() => {
       setLoading(false);
       history.goBack();
@@ -200,61 +192,63 @@ export default function Index() {
     <PageHeaderWrapper title="配件计划管理">
       <ConfigProvider locale={zhCN}>
         <Card className={st.page}>
-          <div style={{ display: 'flex', flexDirection: 'column', marginTop: 20, marginBottom: 20 }}>
-            <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
-              <Select
-                placeholder="请选择品牌"
-                onSearch={() => {}}
-                showSearch
-                filterOption={(input: any, option: any) => option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
-                style={{ width: 200, marginBottom: 20 }}
-                value={dfParams.brandId}
-                onChange={brandId => {
+          <div style={{ display: 'flex', alignItems: 'flex-start', marginBottom: 20 }}>
+            <span style={{ marginRight: 10 }}>配件：</span>
+            <div style={{ display: 'flex', flexDirection: 'column' }}>
+              <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
+                <Select
+                  placeholder="请选择品牌"
+                  onSearch={() => {}}
+                  showSearch
+                  filterOption={(input: any, option: any) => option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+                  style={{ width: 200, marginBottom: 20 }}
+                  value={dfParams.brandId}
+                  onChange={brandId => {
                   setDfParams({ ...dfParams, brandId });
                   setParams({}, true);
                   setDelay(false);
                   setDealerList([]);
                 }}
-              >
-                {brands.map((item: any) => (
-                  <Option value={item.id} key={item.id}>
-                    {item.name}
-                  </Option>
+                >
+                  {brands.map((item: any) => (
+                    <Option value={item.id} key={item.id}>
+                      {item.name}
+                    </Option>
                 ))}
-              </Select>
-              <a
-                style={{marginLeft: 20, marginBottom: 20}}
-                onClick={() => {
+                </Select>
+                <a
+                  style={{marginLeft: 20, marginBottom: 20}}
+                  onClick={() => {
                   if (!dfParams.brandId) {
                     message.error('请选择品牌');
                     return;
                   }
                   setVisibleDealer(true);
                 }}
-              >
-                添加采购商家
-              </a>
-            </div>
-            {dealerList.map((dealer: any = {}) => (
-              <div key={`dealer${dealer.settleDealerId}`} style={{ marginTop: 10 }}>
-                <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
-                  <div style={{ fontWeight: "bold" }}>{`商家: ${dealer.settleDealerName || ''}`}</div>
-                  <a style={{marginLeft: 40}} onClick={() => { setVisibleSupplier(true); setDealer(dealer); }}>
-                    添加指定供应商
-                  </a>
-                  <Popconfirm
-                    title="是否删除"
-                    onConfirm={() => setDealerList(dealerList.filter(it => it.settleDealerId!=dealer.settleDealerId))}
-                    okText="确定"
-                    cancelText="取消"
-                    style={{marginLeft: 20}}
-                  >
-                    <Button type="link" danger>
-                      删除
-                    </Button>
-                  </Popconfirm>
-                </div>
-                {(dealer.suppliers || []).map((supplier: any = {}) => {
+                >
+                  添加采购商家
+                </a>
+              </div>
+              {dealerList.map((dealer: any = {}) => (
+                <div key={`dealer${dealer.settleDealerId}`} style={{ marginTop: 10 }}>
+                  <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center'}}>
+                    <div style={{ fontWeight: "bold" }}>{`商家: ${dealer.settleDealerName || ''}`}</div>
+                    <a style={{marginLeft: 40}} onClick={() => { setVisibleSupplier(true); setDealer(dealer); }}>
+                      添加指定供应商
+                    </a>
+                    <Popconfirm
+                      title="是否删除"
+                      onConfirm={() => setDealerList(dealerList.filter(it => it.settleDealerId!=dealer.settleDealerId))}
+                      okText="确定"
+                      cancelText="取消"
+                      style={{marginLeft: 20}}
+                    >
+                      <Button type="link" danger>
+                        删除
+                      </Button>
+                    </Popconfirm>
+                  </div>
+                  {(dealer.suppliers || []).map((supplier: any = {}) => {
                   const paList: any[] = flattenDeep((supplier.storages || []).map((st: any) => (st.parts || [])));
                   return (
                     <div key={`supplier${supplier.supplierId}`} style={{ marginTop: 10, marginLeft: 40 }}>
@@ -307,50 +301,49 @@ export default function Index() {
                     </div>
                   );
                 })}
-              </div>
+                </div>
             ))}
-            <DealerModal
-              dealerList={dealerList}
-              visible={visibleDealer}
-              onCancel={() => setVisibleDealer(false)}
-              onOk={onOkDealer}
-            />
-            <SuppModal
-              brandId={dfParams.brandId}
-              supplierList={dealer.suppliers || []}
-              visible={visibleSupplier}
-              onCancel={() => setVisibleSupplier(false)}
-              onOk={onOkSupplier}
-            />
-            <PartModal
-              visible={visiblePart}
-              onCancel={() => setVisiblePart(false)}
-              parts={parts.filter(it => !poolIds.includes(it.poolId))}
-              onOk={onOk}
-              setParams={setParams}
-            />
-            <PartDetailModal
-              visible={visiblePartDetail}
-              onCancel={() => setVisiblePartDetail(false)}
-              dealer={dealer.dealer}
-              supplier={dealer.supplier}
-              storage={dealer.storage}
-              deletePart={deletePart}
-            />
+              <DealerModal
+                dealerList={dealerList}
+                visible={visibleDealer}
+                onCancel={() => setVisibleDealer(false)}
+                onOk={onOkDealer}
+              />
+              <SuppModal
+                brandId={dfParams.brandId}
+                supplierList={dealer.suppliers || []}
+                visible={visibleSupplier}
+                onCancel={() => setVisibleSupplier(false)}
+                onOk={onOkSupplier}
+              />
+              <PartModal
+                visible={visiblePart}
+                onCancel={() => setVisiblePart(false)}
+                parts={parts.filter(it => !poolIds.includes(it.poolId))}
+                onOk={onOk}
+                setParams={setParams}
+              />
+              <PartDetailModal
+                visible={visiblePartDetail}
+                onCancel={() => setVisiblePartDetail(false)}
+                dealer={dealer.dealer}
+                supplier={dealer.supplier}
+                storage={dealer.storage}
+                deletePart={deletePart}
+              />
+            </div>
           </div>
           <div style={{display: 'flex', alignItems: 'flex-start', marginBottom: 20}}>
             <span style={{marginRight: 10}}>备注：</span>
-            <Input.TextArea rows={2} style={{ width: 250 }} value={info?.remark} onChange={e => setInfo({...info, remark: e.target.value})} />
+            <Input.TextArea rows={4} style={{ width: 250 }} value={info?.remark} onChange={e => setInfo({...info, remark: e.target.value})} />
           </div>
           <div style={{ display: 'flex', alignItems: 'flex-start' }}>
             <span style={{ marginRight: 10 }}>附件：</span>
             <ImageUpload 
-              length={6} 
-              clear={imageVisible} 
+              max={6}
               value={info?.fids} 
-              onChange={v => { 
-                const ids = v.fileList.map(it => it?.response?.data || it);
-                setInfo({ ...info, fids: ids });
+              onChange={v => {
+                setInfo({ ...info, fids: v });
             }} 
             />
           </div>
@@ -359,7 +352,7 @@ export default function Index() {
               disabled={loading}
               loading={loading}
               style={{marginRight: 20}}
-              onClick={() => { setImageVisible(true); history.goBack(); }}
+              onClick={() => { history.goBack(); }}
             >
               取消
             </Button>
-import { Card, ConfigProvider, Spin, Upload } from 'antd';
+import { Card, ConfigProvider, Spin } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import React, {useState} from "react";
 import useInitial from "@/hooks/useInitail";
@@ -11,6 +11,7 @@ import {common} from &quot;@/typing/common&quot;;
 import {flattenDeep} from "@/pages/pms/entity";
 import {sum} from "lodash";
 import PartDetailModal from './components/PartDetailModal';
+import ImageUpload from '@/pages/pms/comonents/ImageUpload';
 export default function Index({ match }: common.ConnectProps) {
   const { planId } = match.params;
@@ -62,20 +63,7 @@ export default function Index({ match }: common.ConnectProps) {
             </div>
             <div style={{ display: 'flex', alignItems: 'flex-start' }}>
               <span style={{ marginRight: 10 }}>附件：</span>
-              <div style={{display: 'flex'}}>
-                {data.fids?.split(',').map(i => (
-                  <Upload
-                    listType="picture-card"
-                    fileList={[{
-                    uid: '-1',
-                    name: i,
-                    status: 'done',
-                    url: `/api/file/show?fid=${i}`,
-                }]}
-                    disabled
-                  />
-                ))}  
-              </div>
+              <ImageUpload value={data.fids?.split(',')} disabled />
             </div>
             <PartDetailModal visible={visiblePart} onCancel={() => setVisiblePart(false)} parts={parts} />
             <StepBnt
 import React, {useEffect, useState} from 'react';
 import {Modal, Form, Input, Button, message, DatePicker} from 'antd';
 import {RightOutlined} from '@ant-design/icons';
-import ImageUpload from '@/pages/decoration/deco/DeoGoodsManagement/components/ImageUpload';
+import ImageUpload from '@/pages/pms/comonents/ImageUpload';
 import {purchasePayApply, PageV0} from '../api';
 import PurchasePartModal from './PurchasePartModal';
@@ -14,7 +14,6 @@ interface Props{
 export default function Index(props:Props) {
   const [form] = Form.useForm();
   const {visible, onCancel, item} = props;
-  const [imageVisible, setImageVisible] = useState(true);
   const [btnloading, setBtnloading] = useState(false);
   const [partVisible, setPartVisible] = useState(false);
   const [itemPurchaseId, setItemPurchaseId] = useState<number>();
@@ -44,7 +43,7 @@ export default function Index(props:Props) {
         payAmount: fileds.payAmount,
         payDays: fileds.payDays.format('YYYY-MM-DD'),
         remark: fileds.remark || undefined,
-        fids: (!!fileds.fids && fileds.fids.fileList.map((i:any) => i.response.data)) || undefined
+        fids: fileds.fids
       };
       purchasePayApply(params).then(res => {
@@ -66,7 +65,7 @@ export default function Index(props:Props) {
       maskClosable={false}
       width={600}
       footer={[
-        <Button loading={btnloading} onClick={() => { onCancel(); setImageVisible(false); }}>取消</Button>,
+        <Button loading={btnloading} onClick={() => { onCancel(); }}>取消</Button>,
         <Button 
           loading={btnloading} 
           type="primary"
@@ -131,7 +130,7 @@ export default function Index(props:Props) {
           <span style={{color: "#0000FF", cursor: "pointer"}} onClick={() => { setPartVisible(true); setItemPurchaseId(item?.purchaseId); }}>查看<RightOutlined /></span>
         </Item>
         <Item label="附件" name="fids">
-          <ImageUpload length={6} clear={imageVisible} />
+          <ImageUpload max={6} />
         </Item>
       </Form>
       <PurchasePartModal itemPurchaseId={itemPurchaseId} visible={partVisible} onCancel={() => setPartVisible(false)} />
@@ -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
@@ -9,7 +9,6 @@ import CreatModal from &#39;./components/CreateModal&#39;;
 import * as api from '../StorageManage/api';
 function AreaStorageSetting() {
-  // 获取仓库信息
   const { list: storageList } = usePagination<any>(api.getStoragePage);
   const { list, loading, setLoading, paginationConfig, setParams } = usePagination<AreaStorageSettingSpace.item>(getAreaStorageList, { current: 1, pageSize: 10 });
+import React, { useEffect, useState } from 'react';
+import { Modal, Button, Select, DatePicker, message } from 'antd';
+import { getList } from './api';
+import useInitial from "@/hooks/useInitail";
+import { useStore } from '../index';
+import moment from 'moment';
+
+interface Props {
+  visible: boolean,
+  onCancel: () => any,
+}
+const Option = Select.Option;
+export default function Upload(props: Props) {
+  const { storages: storageList } = useStore();
+  const { visible, onCancel } = props;
+  const [storageid, setStorageid] = useState<number>();
+  const [delay, setDelay] = useState(true);
+  const { data, setParams, setData } = useInitial(getList, 0, {}, delay);
+  const [date, setDate] = useState<{ startTime?: number, endTime?:number }>();
+
+  useEffect(() => {
+    if (!visible) {
+      setStorageid(undefined);
+      setDate({startTime: undefined, endTime: undefined});
+      setData(0);
+    }
+  }, [visible]);
+
+  return (
+    <Modal
+      maskClosable
+      title="库房流水批量导出"
+      visible={visible}
+      onCancel={onCancel}
+      width={800}
+      footer={[
+        <Button onClick={onCancel}>取消</Button>,
+      ]}
+    >
+      <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginBottom: 20 }}>
+        <span style={{ paddingLeft: 30 }}>选择库房：</span>
+        <Select
+          placeholder="请选择库房"
+          value={storageid}
+          style={{ width: 250 }}
+          onChange={setStorageid}
+          showSearch
+          optionFilterProp="children"
+        >
+          {storageList.map(it => (
+            <Option key={it.id} value={it.id || -1}>{it.storageName || ''}</Option>
+          ))}
+        </Select>
+      </div>
+      <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginBottom: 20 }}>
+        <span style={{ paddingLeft: 30 }}>开始时间：</span>
+        <DatePicker 
+          value={date?.startTime && moment(date.startTime) || undefined}
+          style={{ width: 250 }}
+          onChange={(d, ds) => {
+            setDate({ startTime: moment(ds).startOf('day').valueOf(), endTime: undefined });
+          }} 
+        />
+      </div>
+      <div style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', marginBottom: 20 }}>
+        <span style={{ paddingLeft: 30 }}>结束时间：</span>
+        <DatePicker 
+          value={date?.endTime && moment(date.endTime) || undefined}
+          style={{ width: 250 }}
+          onChange={(d, ds) => {
+            if (!storageid || !date?.startTime) {
+              message.error("请先选择库房或开始时间");
+              return;
+            }
+            setDate({ ...date, endTime: moment(ds).startOf('day').valueOf() });
+            setDelay(false);
+            setParams({ 
+              storageId: storageid, 
+            }, true);
+          }} 
+        />
+      </div>
+      <div style={{ display: 'flex', flexDirection: 'row', flexWrap: 'wrap' }}>
+        {!!data && (
+          <a 
+            href={`/api/pms/erp/storage/out/export/stock/record?storageId=${storageid}&startTime=${date?.startTime}&endTime=${date?.endTime}`} 
+            style={{ marginRight: 20, marginBottom: 10 }} 
+            target="_blank" 
+            rel="noopener noreferrer"
+          >
+            {`${storageList.find(it => it.id == storageid)?.storageName}流水记录.xlsx`}
+          </a>
+        )}
+      </div>
+    </Modal>
+  );
+}
 \ No newline at end of file
@@ -17,7 +17,7 @@ export default function Upload(props: Props) {
   const [storageid, setStorageid] = useState<number>();
   const [storageName, setStorageName] = useState<string>();
   const [delay, setDelay] = useState(true);
-  const { data: total, setParams } = useInitial(getList, 0, storageid, delay);
+  const { data: total, setParams } = useInitial(getList, 0, {}, delay);
   const [pagesize, setPagesize] = useState(1000);
   const [list, setList] = useState<number[]>([]);
@@ -51,7 +51,7 @@ export default function Upload(props: Props) {
     setStorageid(value);
     setStorageName(storagename?.storageName);
     setDelay(false);
-    setParams(value, true);
+    setParams({storageId: value}, true);
   };
   return (
@@ -2,8 +2,8 @@ import request from &#39;@/utils/request&#39;;
 import { PMS_HOST } from '@/utils/host';
 import {http} from "@/typing/http";
-export function getList(params?: number) {
-  return request.get(`${PMS_HOST}/erp/part/shop/get/stock/cnt`, {params: {storageId: params}});
+export function getList(params?: { storageId?: number, startTime?:number, endTime?:number}):http.PromiseResp<number> {
+  return request.get(`${PMS_HOST}/erp/part/shop/get/stock/cnt`, {params});
 }
 interface Params{
   user:string
@@ -8,6 +8,7 @@ import store from &#39;./store&#39;;
 import { createStore } from '@/hooks/moz';
 import ImportModal from './components/UploadExcel';
 import UploadMoreModal from './components/UploadMoreModal';
+import StorageFlowModal from './components/StorageFlowModal';
 export const { Provider, useStore } = createStore(store);
@@ -16,6 +17,7 @@ function PartShop() {
   const [more, setMore] = useState(false);
   const [stock, setStock] = useState(false);
   const [islock, setIslock] = useState(false);
+  const [storageFlowVisible, setStorageFlowVisible] = useState(false);
   return (
     <PageHeaderWrapper title={`服务站配件${fw ? '(霏微)': ''}`}>
@@ -66,6 +68,14 @@ function PartShop() {
             >
               库存批量导出
             </Button>
+            <Button
+              type="primary"
+              icon={<DownloadOutlined />}
+              onClick={() => setStorageFlowVisible(true)}
+              style={{marginLeft: 10}}
+            >
+              库房流水导出
+            </Button>
           </div>
         </div>
         <List />
@@ -76,6 +86,7 @@ function PartShop() {
           islock={islock}
           setIslock={setIslock}
         />
+        <StorageFlowModal visible={storageFlowVisible} onCancel={() => setStorageFlowVisible(false)} />
       </Card>
     </PageHeaderWrapper>
   );
@@ -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&lt;ListVO&gt; {
 }
 // 新增/编辑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&lt;Role.Info&gt; 
 }
 // 删除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
+import React, { useEffect } from 'react';
+import { Form, Button, Modal, Input } from 'antd';
+
+const Item = Form.Item;
+
+interface Props {
+  visible?: boolean,
+  onCancel: Function,
+  onOk: Function,
+  accounts: string[]
+}
+
+export default function Index(props: Props) {
+  const { visible, onCancel, onOk, accounts } = 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.reject(new Error('发单账号不符合要求'));
+              } else if (accounts.includes(value)) {
+                return Promise.reject(new Error('发单账号重复'));
+              }
+              return Promise.resolve();
+            },
+          }),
+          ]}
+        >
+          <Input />
+        </Item>
+      </Form>
+    </Modal>
+  );
+}
@@ -2,58 +2,68 @@ import React, { useEffect, useState } from &#39;react&#39;;
 import {Form, Button, InputNumber, Modal, message, Input } from 'antd';
 import PmsSelect from '@/pages/pms/comonents/PmsSelect';
 import { ListVO, saveApi, roleListApi } from '../api';
-import { getPageListApi, Item as item } from "@/pages/pms/partPlan/PlanSupplier/api";
+import {getContactUnit, ContactItem} from '@/pages/pms/transfer/transferManage/api';
 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;
 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 { data: shops } = useInitail<PmsStoragePartShop.Option[], {}>(getShopApi, [], {});
-  const { list } = usePagination<Role.Info>(roleListApi, { pageSize: 500, sysId: 229 });
+  const { data: suppliers } = useInitail<ContactItem[], { compTypes: number }>(getContactUnit, [], { compTypes: 130});
+  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();
+  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) {
       form.resetFields();
+      setAccounts([]);
     }
   }, [visible]);
   const onSave = () => {
+    if (!accounts.length) {
+      message.error('填写发单账号');
+      return;
+    }
     form.validateFields().then(files => {
       const params = {
         id: item?.id,
         supplierId: files.supplierId, 
-        supplierName: suppliers.find(i => i.supplierId == files.supplierId)?.supplierName,
+        supplierName: suppliers.find(i => i.id == files.supplierId)?.compName,
         shopId: files.shopId,
         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 => {
         message.success("保存成功");
         setLoading(false);
+        onRefreshing();
         onCancel();
       }).catch(e => {
         message.error(e.message);
@@ -62,10 +72,15 @@ export default function Index(props:Props) {
     });
   };
+  const onOk = (v: any) => {
+    setAccounts([...accounts, v]);
+  };
+
   return (
     <Modal 
       title={item?.id ? "编辑货拉拉账户配置" : "新增货拉拉账户配置"}
-      visible={visible}
+      open={visible}
+      width={500}
       maskClosable={false}
       onCancel={() => onCancel()}
       footer={[
@@ -81,9 +96,7 @@ export default function Index(props:Props) {
         <Item label="往来单位" name="supplierId" rules={[{required: true, message: "请选择往来单位"}]}>
           <PmsSelect
             placeholder="选择往来单位"
-            options={suppliers.filter((item, index, self) => {
-              return self.findIndex(el => el.supplierId == item.supplierId) === index;
-            }).map((item) => ({ value: item.supplierId, label: item.supplierName }))} 
+            options={suppliers.map((item) => ({ value: item.id, label: item.compName }))} 
           />
         </Item>
         <Item label="签约门店" name="shopId" rules={[{ required: true, message: "请选择签约门店" }]}>
@@ -98,13 +111,35 @@ 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: "请填写发单账号" }]}>
-          <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} accounts={accounts} />
     </Modal>
   );
 }
-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>
@@ -11,16 +11,14 @@ 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" />
           <Column title="低余额推待办(元)" dataIndex="minAmount" />
           <Column title="推待办角色" dataIndex="roleName" />
           <Column title="发单账号" dataIndex="account" />
@@ -28,8 +26,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 +45,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>
@@ -8,7 +8,7 @@ import usePagination from &#39;@/hooks/usePagination&#39;;
 import useInitial from '@/hooks/useInitail';
 import TransferPartDetailModal from './comonents/TransferPartDetailModal';
 import TransferSeqModal from './comonents/TransferSeqModal';
-import ImageUpload from '@/pages/decoration/deco/DeoGoodsManagement/components/ImageUpload';
+import ImageUpload from '@/pages/pms/comonents/ImageUpload';
 import SupplierDealer from './comonents/SupplierDealer';
 const {Option} = Select;
@@ -48,7 +48,6 @@ export default function Index({onCancel}:any) {
   const [tslist, setTslist]= useState<any[]>([]);
   const [rmark, setRmark] = useState<string>();
   const [btnloading, setBtnloading] = useState(false);
-  const [imageVisible, setImageVisible] = useState(true);
   const {data: contactList} = useInitial<ContactItem[], {compTypes: number}>(getContactUnit, [], {compTypes: 130});
   const [freight, setFreight] = useState<number>();
   const [clear, setClear] = useState(false);
@@ -72,13 +71,12 @@ export default function Index({onCancel}:any) {
   // 编辑时设置初始值
   useEffect(() => {
     if (editTransfer?.transferId && editTransfer?.transfers?.length) {
-      setImageVisible(false);
       setTransferList(editTransfer?.transfers?.map(i => ({oSId: i.outStorageId, iSId: i.inStorageId, parts: i.transferPoolIds, freight: i.freightId, supplierId: i.supplierId, payDealerId: i.payDealerId})) || []);
       setMethod(transferMethodid[editTransfer?.method || 0]);
       setChecked(!editTransfer.isReimburse);
       setMethodDetail(editTransfer.transferUserId);
       setTslist(editTransfer?.transferSeqList?.map(i => i.storageId) || []);
-      form.setFieldsValue({remark: editTransfer.remark, transferfile: editTransfer.fids?.map(i => `/api/file/show?fid=${i}`)});
+      form.setFieldsValue({remark: editTransfer.remark, transferfile: editTransfer.fids});
     } else {
       form.resetFields();
     }
@@ -197,18 +195,8 @@ export default function Index({onCancel}:any) {
         amountList: shopList.length && shopList.map(i => ({shopId: i.shopId, proportion: i.proportion})) || undefined, //摊销门店
         transferSeqList: tslist.length && tslist.map((i, index) => ({seq: index, storageId: i})) || undefined, //调运顺序
         remark: rmark || undefined,
-        fids: fileds.transferfile ? (fileds.transferfile.fileList ? 
-          fileds.transferfile.fileList.map((i:any) => {
-              if (i.response) {
-                return i.response.data;
-              } else {
-                return i.fid.split('=')[1];
-              }
-            }) 
-              : 
-          editTransfer?.fids) : undefined
+        fids: fileds.transferfile
         };
-     
       setBtnloading(true);
       submitTransfer(params).then(res => {
         message.success('提交成功');
@@ -406,14 +394,14 @@ return (
         <TextArea value={rmark} onChange={(e) => setRmark(e.target.value)} rows={2} allowClear style={{width: 250, }} />
       </Item>
       <Item name="transferfile" label="附件">
-        <ImageUpload length={6} clear={imageVisible} />
+        <ImageUpload max={6} />
       </Item>
     </Form>
     <div style={{display: 'flex', justifyContent: 'center', marginTop: 20}}>
       <Popconfirm
         title="确认放弃？"
-        onConfirm={() => { onCancel(); setTransferList([]); setMethod(undefined); setEditTransfer(undefined); setImageVisible(false); }}
+        onConfirm={() => { onCancel(); setTransferList([]); setMethod(undefined); setEditTransfer(undefined); }}
         okText="确认"
         cancelText="取消"
       >