Merge remote-tracking branch 'origin/pms'

by1642146903
2 parents 9a374421 8546c12e
Showing 7 changed files with 66 additions and 9 deletions
src/pages/pms/entity.ts
src/pages/pms/partPlan/CustBuyPlanProcess/api.ts
src/pages/pms/partPlan/CustBuyPlanProcess/index.tsx
src/pages/pms/partPlan/PlanPool/components/DetailModal.tsx
src/pages/pms/partPlan/PlanPool/components/Filter.tsx
src/pages/pms/partPlan/PlanPool/index.tsx
src/pages/pms/partPlan/PlanShipping/components/UploadExcel.tsx
@@ -201,3 +201,20 @@ export const typeSenderObj: {[key: string]: string} = {
   '调出锁定': '',
   '': '',
 };
+
+export function getUrl(url: string, obj: object): string {
+ if (!Object.keys(obj).length) {
+  return url;
+ }
+  const pa: string[] = [];
+  for (let k in obj) {
+    if (obj[k]) {
+      pa.push(`${k}=${obj[k]}`);
+    }
+  }
+  const st = pa.join("&");
+  if (st) {
+    return `${url}?${st}`;
+  }
+  return '';
+}
@@ -32,6 +32,9 @@ export interface Params{
   status?:number
   shopId?:number
   keywords?:string
+  serviceName?:string
+  plateNo?:string
+  vin?:string
 }
  
 export interface ProgressVO {
@@ -35,14 +35,31 @@ export default function Index() {
           <div style={{ display: 'flex', alignItems: 'center', marginBottom: 20 }}>
             <Search
               allowClear
-              enterButton
               placeholder="配件名称/编码搜索"
               style={{ width: 220, marginRight: 10 }}
               onSearch={e => setParams({keywords: e}, true)}
             />
+            <Search
+              allowClear
+              placeholder="顾问名称搜索"
+              style={{ width: 200, marginRight: 10 }}
+              onSearch={e => setParams({ serviceName: e}, true)}
+            />
+            <Search
+              allowClear
+              placeholder="车牌号搜索"
+              style={{ width: 200, marginRight: 10 }}
+              onSearch={e => setParams({ plateNo: e}, true)}
+            />
+            <Search
+              allowClear
+              placeholder="VIN搜索"
+              style={{ width: 200, marginRight: 10 }}
+              onSearch={e => setParams({ vin: e}, true)}
+            />
             <Select
               allowClear
-              placeholder="选择品牌"
+              placeholder="品牌筛选"
               style={{ width: 200, marginRight: 10 }}
               onChange={v => setParams({ brandId: v }, true)}
               showSearch
@@ -52,7 +69,7 @@ export default function Index() {
             </Select>
             <Select
               allowClear
-              placeholder="选择门店"
+              placeholder="门店筛选"
               style={{ width: 200, marginRight: 10 }}
               onChange={v => setParams({shopId: v }, true)}
               showSearch
@@ -91,6 +108,7 @@ export default function Index() {
             <Column title="工单号" dataIndex="remark" />
             <Column title="品牌" dataIndex="brandName" />
             <Column title="门店名称" dataIndex="shopName" />
+            <Column title="服务顾问" dataIndex="userName" />
             <Column title="状态" dataIndex="status" />
  
             {/* <Column title="接车服务顾问" dataIndex="userName" /> */}
@@ -5,6 +5,7 @@ import StorageTable from &#39;./StorageTable&#39;;
 import SeriesTable from './SeriesTable';
 import SpecTable from './SpecTable';
 import PartTable from './PartTable';
+import OutFlowModal from './OutFlowModal';
  
 interface Props {
   visible: boolean,
@@ -33,6 +34,7 @@ export default function Index(props: Props) {
       {detailType == 3 && <SeriesTable type={type} detailType={detailType} id={id} showAnalyse={false} />}
       {detailType == 4 && <SpecTable type={type} detailType={detailType} id={id} />}
       {detailType == 5 && <PartTable type={type} detailType={detailType} id={id} showAnalyse={false} />}
+      <OutFlowModal />
     </Modal>
   );
 }
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { Input } from 'antd';
 import { useStore } from '../index';
 import debounce from 'lodash/debounce';
-import {planPoolTypeData} from '@/pages/pms/entity';
+import { planPoolTypeData, getUrl } from '@/pages/pms/entity';
 import usePagination from "@/hooks/usePagination";
 import {getStoragePage} from "@/pages/pms/storage/StorageManage/api";
 import useInitail from "@/hooks/useInitail";
@@ -15,13 +15,18 @@ export default function Filter() {
   const { list: storages } = usePagination<PartStorageSpace.PageVO>(getStoragePage, {pageSize: 1000});
   const { data: shops } = useInitail<PmsStoragePartShop.Option[], {}>(api.getShopApi, [], {});
   const { dfParams, setDfParams, partTypeData } = useStore();
+  const [url, setUrl] = useState('/api/pms/erp/plan/pool/export');
+
+  useEffect(() => {
+    setUrl(getUrl('/api/pms/erp/plan/pool/export', dfParams));
+  }, [dfParams]);
  
   const handleChangeKeywords = debounce((value: string) => {
     setDfParams({ ...dfParams, current: 1, keywords: value });
   }, 500);
  
   return (
-    <div style={{display: 'flex', flexWrap: 'wrap', justifyContent: 'flex-start', marginBottom: 10}}>
+    <div style={{display: 'flex', flexWrap: 'wrap', justifyContent: 'flex-start', marginBottom: 10, alignItems: 'center'}}>
       <PmsSelect
         style={{ width: 200, marginRight: 10}}
         allowClear
@@ -71,6 +76,11 @@ export default function Filter() {
         placeholder="配件编码|名称"
         onSearch={v => handleChangeKeywords(v)}
       />
+      <a 
+        href={url}
+      >
+        导出计划池表格
+      </a>
     </div>
   );
 }
@@ -11,7 +11,6 @@ import st from &quot;@/pages/pms/partPlan/PlanShipping/style.less&quot;;
 import Filter from './components/Filter';
 import {createStore} from "@/hooks/moz";
 import store from "./useStore";
-import OutFlowModal from './components/OutFlowModal';
 import CustBuyModal from './components/CustBuyModal';
  
 export const { Provider, useStore } = createStore(store);
@@ -40,7 +39,7 @@ function Index() {
               <StoragePartTable type={6} />
             </Tabs.TabPane>
           </Tabs>
-          <OutFlowModal />
+          {/* <OutFlowModal /> */}
           <CustBuyModal />
         </Card>
       </ConfigProvider>
@@ -31,9 +31,17 @@ export default function UploadExcel({ getList, importVisible, setImportVisible, 
   useEffect(() => {
     if (!importVisible) {
       setUploadResult(null);
+      setParam({ brandId: null, storageId: null, supplierId: null, settleShopId: null });
+      setFileList([]);
     }
   }, [importVisible]);
  
+  useEffect(() => {
+    if (!visibleDetail) {
+      setImportVisible(false);
+    }
+  }, [visibleDetail]);
+
   function beforeUpload(file: any) {
     const isLt2M = file.size / 1024 / 1024 < 20;
     if (!isLt2M) {
@@ -145,7 +153,7 @@ export default function UploadExcel({ getList, importVisible, setImportVisible, 
         visible={visibleDetail}
         item={uploadResult?.data || {}}
         confirm
-        onCancel={() => { setVisibleDetail(false); setImportVisible(false); }}
+        onCancel={() => setVisibleDetail(false)}
         fetchList={() => { setUploadResult(null); getList(); }}
       />
     </Modal>