Merge branch 'bug_fix' of gitlab.feewee.cn:FEV2/fw-cms into bug_fix

杜志良
2 parents 8fb29c3f 2ef8422a
Showing 5 changed files with 131 additions and 7 deletions
src/pages/pms/storage/StorageManage/components/UploadLoaction.tsx
src/pages/pms/storage/StorageManage/components/UploadModal.tsx
src/pages/pms/storage/StorageManage/index.tsx
src/pages/pms/storage/partShop/components/UploadExcel.tsx
src/pages/pms/storage/partShop/index.tsx
+import React, { useState, useEffect } from 'react';
+import { InboxOutlined } from '@ant-design/icons';
+import { Button, Modal, Upload, message, Select } from 'antd';
+
+const Dragger = Upload.Dragger;
+const Option = Select.Option;
+interface Props {
+  storages: PartStorageSpace.PageVO[],
+  onCancel: () => any,
+  visible: boolean
+}
+
+export default function UploadModal(props: Props) {
+  const { onCancel, visible, storages } = props;
+  const [fileList, setFileList] = useState<any[]>([]);
+  const [uploadResult, setUploadResult] = useState<any>();
+  const [storageid, setStorageid] = useState<number>();
+
+  useEffect(() => {
+    if (visible) {
+      setFileList([]);
+      setUploadResult(undefined);
+      setStorageid(undefined);
+    }
+  }, [visible]);
+
+  function beforeUpload(file: any) {
+    if (!storageid) {
+      message.error('请先选择库房');
+      return false;
+    }
+    const isLt2M = file.size / 1024 / 1024 < 20;
+    if (!isLt2M) {
+      message.error('文件不能超过20MB!');
+    }
+    return isLt2M;
+  }
+
+  function handleChange(info: any) {
+    if (!storageid) {
+      setFileList([]);
+      return;
+    }
+    const { file: { status, response }, fileList } = info;
+    if (status !== 'uploading' && response) {
+      const { success, result, data } = response;
+      if (status === 'done' && success) {
+        message.success(`${info.file.name} 上传成功`);
+        // 调用上传接口
+        setUploadResult(data);
+      } else if (response && !success) {
+        message.error(`${info.file.name} 上传失败: ${result}`);
+      }
+    }
+    setFileList(fileList.splice(-1));
+  }
+  const uploadProps = {
+    accept: 'application/vnd.ms-excel application/x-excel .xlsx',
+    name: 'file',
+    fileList,
+    data: { storageId: storageid },
+    multiple: false,
+    action: `/api/pms/erp/storage/location/import/no`,
+    onChange: (file: any) => handleChange(file),
+    beforeUpload: (info: any) => beforeUpload(info)
+  };
+  return (
+    <Modal
+      title={uploadResult ? '配件库位导入结果' : '配件库位导入'}
+      visible={visible}
+      width={420}
+      keyboard={false}
+      maskClosable={false}
+      onCancel={() => onCancel()}
+      footer={[<Button key="close" type="default" onClick={() => onCancel()}>关闭</Button>]}
+    >
+      {!uploadResult ? (
+        <>
+          <span>库房：</span>
+          <Select
+            value={storageid}
+            style={{ width: 328 }}
+            placeholder="请先选择库房"
+            onChange={setStorageid}
+            showSearch
+            optionFilterProp="children"
+          >
+            {storages.map(it => (<Option key={it.id} value={it.id}>{it.storageName}</Option>))}
+          </Select>
+          <Dragger {...uploadProps} style={{ marginTop: 20, marginBottom: 20 }}>
+            <p className="ant-upload-drag-icon">
+              <InboxOutlined />
+            </p>
+            <p className="ant-upload-text">将文件拖到此处上传</p>
+          </Dragger>
+          <a href="/api/pms/erp/part/template/storage/location/import">下载配件库位导入模版</a>
+        </>
+      ) : (
+        <div>
+          <p>数据总条数：{uploadResult.totalCount}条</p>
+          <p>成功条数：{uploadResult.successCount}条</p>
+          <p>失败条数：{uploadResult.failedCount}条</p>
+          {uploadResult.filePath ? (<a href={uploadResult.filePath} target="_blank" rel="noopener noreferrer">下载错误文件</a>) : null}
+        </div>
+      )}
+    </Modal>
+  );
+}
@@ -87,12 +87,13 @@ export default function UploadModal(props: Props) {
           >
             {storages.map(it => (<Option key={it.id} value={it.id}>{it.storageName}</Option>))}
           </Select>
-          <Dragger {...uploadProps} style={{marginTop: 20}}>
+          <Dragger {...uploadProps} style={{marginTop: 20, marginBottom: 20}}>
             <p className="ant-upload-drag-icon">
               <InboxOutlined />
             </p>
             <p className="ant-upload-text">将文件拖到此处上传</p>
           </Dragger>
+          <a href="/api/pms/erp/part/template/storage/location/export">下载配件库位导出模版</a>
         </>
       ) : (
         <div>
 import React, { useState } from 'react';
-import { PlusOutlined } from '@ant-design/icons';
+import { PlusOutlined, UploadOutlined, DownloadOutlined } from '@ant-design/icons';
 import { Card, Button } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import * as api from './api';
@@ -8,6 +8,7 @@ import List from &#39;./components/List&#39;;
 import useInitial from "@/hooks/useInitail";
 import CreateModal from './components/CreateModal';
 import UploadModal from './components/UploadModal';
+import UploadLoction from './components/UploadLoaction';
  
 const indexS = require('./style.less');
  
@@ -15,6 +16,7 @@ export default function StoreHouse() {
   const { list, loading, setLoading, paginationConfig } = usePagination<PartStorageSpace.PageVO>(api.getStoragePage, { current: 1, pageSize: 10 }, { pageName: '/pms/storage/storageManage', notList: true });
   const { data: shops } = useInitial<PartStorageSpace.optionItem[], object>(api.getShopList, [], {});
   const [visibleUpload, setVisibleUpload] = useState(false);
+  const [visibleLoction, setVisibleLoction] = useState(false);
   const [current, setCurrent] = useState<{ visible: boolean, row: PartStorageSpace.PageVO }>({ visible: false, row: {} });
  
   function modalSwitch(row: PartStorageSpace.PageVO = {}) {
@@ -30,8 +32,11 @@ export default function StoreHouse() {
         className={indexS.page}
         extra={
           <>
-            <Button icon={<PlusOutlined />} type="primary" onClick={() => setVisibleUpload(true)}>
-              导入
+            <Button icon={<UploadOutlined />} type="primary" onClick={() => setVisibleLoction(true)}>
+              导入配件库位
+            </Button>
+            <Button icon={<DownloadOutlined />} style={{ marginLeft: 20 }} type="primary" onClick={() => setVisibleUpload(true)}>
+              导出配件库位
             </Button>
             <Button icon={<PlusOutlined />} style={{marginLeft: 20}} type="primary" onClick={() => modalSwitch()}>
               新增
@@ -59,6 +64,11 @@ export default function StoreHouse() {
           onCancel={() => setVisibleUpload(false)}
           visible={visibleUpload}
         />
+        <UploadLoction
+          storages={list}
+          onCancel={() => setVisibleLoction(false)}
+          visible={visibleLoction}
+        />
       </Card>
     </PageHeaderWrapper>
   );
@@ -80,7 +80,7 @@ export default function UploadExcel(props: Props) {
     <Modal
       visible={importVisible}
       maskClosable={false}
-      title={uploadResult ? '导入结果' : stock ? '调运库存导入': '文件导入'}
+      title={uploadResult ? '导入结果' : stock ? '调拨库存导入': '文件导入'}
       onCancel={cancel}
       footer={[
         <Button
@@ -118,12 +118,17 @@ export default function UploadExcel(props: Props) {
             <span>导入原因：</span>
             <Input value={fixRemark} onChange={(e) => setFixRemark(e.target.value)} style={{width: 200}} />
           </div>
-          <Dragger {...uploadProps}>
+          <Dragger {...uploadProps} style={{marginBottom: 20}}>
             <p className="ant-upload-drag-icon">
               <InboxOutlined />
             </p>
             <p className="ant-upload-text">将文件拖到此处上传</p>
           </Dragger>
+          <a 
+            href={stock ? "/api/pms/erp/part/template/stock/transfer/import" : "/api/pms/erp/part/template/stock/import"}
+          >
+            配件库存{stock ? '调拨' : ''}导入模板
+          </a>
         </div>
       ) : (
         <div>
@@ -49,7 +49,7 @@ function PartShop() {
               onClick={() => { setImportVisible(true); setStock(true); }}
               style={{marginLeft: 10}}
             >
-              调运库存导入
+              调拨库存导入
             </Button>
               )}
             <Button