Merge branch 'master' into d-cas

杜志良
2 parents 41800697 e9e2de36
Showing 15 changed files with 396 additions and 16 deletions
config/routers/pms.ts
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
src/pages/pms/setting/FreightTarget/api.ts
src/pages/pms/setting/FreightTarget/components/AddModal.tsx
src/pages/pms/setting/FreightTarget/index.tsx
src/pages/pms/setting/PerTarget/api.ts
src/pages/pms/setting/PerTarget/components/AddModal.tsx
src/pages/pms/setting/PerTarget/index.tsx
src/pages/pms/setting/PlanSetting/index.tsx
@@ -191,4 +191,12 @@ export default [
     path: '/pms/setting/performanceSetting', // 绩效设置
     component: './pms/setting/PerformanceSetting'
   },
+  {
+    path: '/pms/setting/perTarget', // 绩效目标设置
+    component: './pms/setting/PerTarget'
+  },
+  {
+    path: '/pms/setting/freightTarget', // 运费目标设置
+    component: './pms/setting/FreightTarget'
+  },
 ];
@@ -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>
+import { http } from '@/typing/http';
+import request from '@/utils/request';
+import { PMS_HOST } from '@/utils/host';
+
+export interface Item {
+  id?: number,
+  index?:number
+  amount?: any, // 
+  startDays?: any
+  endDays?: any// 
+}
+interface Params {
+  shopId?: number
+  keywords?: string
+  storageId?: number
+}
+/**
+ * 查询绩效--运费目标达成设置
+ */
+export function getDetail(params: Params): http.PromiseResp<Item[]> {
+  return request.get(`${PMS_HOST}/erp/target/amount/setting/get/list`, { params });
+}
+/**
+ * 新增或编辑绩效--运费目标设置
+ */
+export function saveApi(params: {list: Item[]}) {
+  return request.post(`${PMS_HOST}/erp/target/amount/setting/add/or/update`, params);
+}
+import React, { useState } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Card, InputNumber, Button, message } from 'antd';
+import useInitial from '@/hooks/useInitail';
+import { getDetail, saveApi, Item} from './api';
+import ConfirmBnt from '../components/ConfirmBnt';
+import { DeleteOutlined } from '@ant-design/icons';
+
+const Index = () => {
+  const [disable, setDisable] = useState(false);
+  const { data, setData, loading, setLoading } = useInitial<Item[], object>(getDetail, [{ startDays: 1, endDays: null, amount: null }, { startDays: null, endDays: null, amount: null }], {});
+
+  const handleAdd = () => {
+    setData([...data, { startDays: null, endDays: null, amount: null }]);
+  };
+
+  const handleInputChange = (index: number, p: any) => {
+    let arr = data;
+    if (p.endDays) {
+      arr[index + 1].startDays = p.endDays + 1;
+    }
+    setData(arr.map((it, i) => {
+      if (index == i) { 
+        return { ...it, ...p};
+      } else {
+        return it;
+      }
+    }
+    ));
+  };
+
+  const handleDel = (event: any, index: number) => {
+    let arr = data;
+    arr.splice(index, 1);
+    arr[arr.length -1].startDays = arr[arr.length-2].endDays+1;
+    setData(arr);
+  };
+
+  const svae = () => {
+    saveApi({list: data}).then(() => {
+      message.success('保存成功');
+      setLoading(true);
+      setDisable(false);
+    }).catch(e => message.error(e.message));
+  };
+
+  return (
+    <PageHeaderWrapper title="运费目标设置">
+      <Card loading={loading}>
+        {!!data?.length && data.map((it, index) => (
+          index < data.length-1 ? (
+            <div key={index} style={{ display: 'flex', alignItems: 'center', marginBottom: 10 }}>
+              <span style={{ marginRight: 10 }}>{index + 1}、</span>
+              <>
+                缺件起始天数
+                <InputNumber 
+                  disabled 
+                  min={index > 0 ? data[index - 1].endDays : 1} 
+                  value={index > 0 ? data[index - 1].endDays+1 : 1} 
+                  style={{ width: 100, marginLeft: 10, marginRight: 20 }}
+                />
+              </>
+              <>
+                缺件结束天数
+                <InputNumber 
+                  disabled={!disable} 
+                  min={0} 
+                  value={it.endDays} 
+                  onChange={value => {
+                    handleInputChange(index, { startDays: index > 0 ? data[index - 1].endDays + 1 : it.startDays, endDays: value });
+                  }} 
+                  style={{ width: 100, marginLeft: 10, marginRight: 20 }} 
+                />
+              </>
+              <>
+                运费统计增加
+                <InputNumber 
+                  disabled={!disable}
+                  addonAfter="元"
+                  value={it.amount} 
+                  min={0} 
+                  onChange={value => handleInputChange(index, { amount: value })} 
+                  style={{ width: 100, marginLeft: 10, marginRight: 20 }} 
+                />
+              </>
+              {(index == data.length - 2 && disable && index != 0) ? <Button onClick={(event: any) => handleDel(event, index)} shape="circle" icon={<DeleteOutlined />} /> : ''}
+            </div>
+        ) : 
+            (
+              <div style={{ display: 'flex', alignItems: 'center', marginBottom: 10 }}>
+                <span style={{ marginRight: 10 }}>{data.length}、</span>
+                <div style={{ marginRight: 20 }}>
+                  <InputNumber disabled min={0} value={data[data.length - 2].endDays + 1} style={{ width: 100, marginRight: 10 }} />
+                  天及以上
+                </div>
+                <>
+                  运费统计增加
+                  <InputNumber 
+                    disabled={!disable} 
+                    addonAfter="元"
+                    value={it.amount} 
+                    min={0} 
+                    onChange={value => handleInputChange(data.length - 1, { startDays: index > 0 ? data[index - 1].endDays + 1 : it.startDays, endDays: null, amount: value })} 
+                    style={{ width: 100, marginLeft: 10, marginRight: 20 }} 
+                  />
+                </>
+              </div>
+            )
+        ))}
+        <Button type="default" disabled={!disable} onClick={() => handleAdd()}>添加梯度</Button>
+        <ConfirmBnt
+          disable={disable}
+          onOk={() => svae()}
+          onCancel={() => { setDisable(false); setLoading(true); }}
+          onEdit={() => {
+            setDisable(true);
+            setData(data);
+          }}
+        />
+      </Card>
+    </PageHeaderWrapper>
+  );
+};
+export default Index;
 \ No newline at end of file
+import { http } from '@/typing/http';
+import request from '@/utils/request';
+import { PMS_HOST } from '@/utils/host';
+
+export interface Item {
+  id?: number,
+  amount?: number, // 
+  days?: number
+  storageId?: number// 员工调运费用, 1.5元 / 公里
+  shopId?: number // 备料时效
+  storageName?: string
+  shopName?: string
+}
+interface Params {
+  shopId?:number
+  keywords?:string
+  storageId?:number
+}
+/**
+ * 查询绩效--目标设置明细
+ */
+export function getDetail(params: Params): http.PromiseResp<Item[]> {
+  return request.get(`${PMS_HOST}/erp/target/setting/get/list`, { params });
+}
+/**
+ * 新增或编辑绩效--目标设置明细
+ */
+export function saveApi(params: Item) {
+  return request.post(`${PMS_HOST}/erp/target/setting/add/or/update`, params);
+}
+/**
+ * 删除绩效--目标设置明细
+ */
+export function DeleteApi(params: {id?: number}) {
+  return request.post(`${PMS_HOST}/erp/target/setting/delete`, params, {contentType: 'form-urlencoded'});
+}
+import React, { useEffect } from 'react';
+import {Modal, Form, InputNumber, message} from 'antd';
+import PmsSelsct from '@/pages/pms/comonents/PmsSelect';
+import { getStoragePage } from '@/pages/pms/storage/StorageManage/api';
+import usePagination from '@/hooks/usePagination';
+import { saveApi } from '../api';
+
+const {Item} = Form;
+
+interface Props {
+  item:any
+  visible:boolean
+  onCancel:Function
+  refesh:Function
+}
+
+export default function Index(props: Props) {
+  const { item, onCancel, visible, refesh } = props;
+  const [form] = Form.useForm();
+  const { list: storages } = usePagination<PartStorageSpace.PageVO>(getStoragePage, { pageSize: 1000 });
+
+  const OK = () => {
+    form.validateFields().then(fileds => {
+      const params = {
+        id: item?.id,
+        storageId: fileds.storageId,
+        days: fileds.days,
+        amount: fileds.amount
+      };
+      saveApi(params).then(res => {
+        message.success("提交成功");
+        onCancel();
+        refesh();
+      }).catch(e => {
+        message.error(e.message);
+      });
+    });
+  };
+
+  useEffect(() => {
+    if (visible && item.id) {
+      form.setFieldsValue({
+        ...item
+      });
+    }
+    if (!visible) {
+      form.resetFields();
+    }
+  }, [visible]);
+
+  return (
+    <Modal
+      open={visible}
+      maskClosable={false}
+      onCancel={() => onCancel()}
+      onOk={() => OK()}
+      title={item.id ? '编辑' : '新增'}
+    >
+      <Form form={form} labelCol={{span: 6}} wrapperCol={{span: 16}}>
+        <Item name="storageId" label="库房" required rules={[{ required: true, message: '请选择库房' }]}>
+          <PmsSelsct 
+            style={{width: 300}}
+            options={storages.map((item: PartStorageSpace.PageVO) => ({ value: item.id, label: item.storageName }))}
+          />
+        </Item>
+        <Item name="days" label="订件时长目标" required rules={[{ required: true, message: '请输入' }]}>
+          <InputNumber style={{ width: 300 }} addonAfter="天" />
+        </Item>
+        <Item name="amount" label="运费目标" required rules={[{ required: true, message: '请输入' }]}>
+          <InputNumber style={{ width: 300 }} addonAfter="元" />
+        </Item>
+      </Form>
+    </Modal>
+  );
+} 
 \ No newline at end of file
+import React, { useState } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Table, Button, Card, Popconfirm, Divider, message } from 'antd';
+import AddModal from './components/AddModal';
+import {Item, getDetail, DeleteApi} from './api';
+import useInitial from '@/hooks/useInitail';
+
+const {Column} = Table;
+
+const Index = () => {
+  const [current, setCurrent] = useState<{visible:boolean, item?:any}>({visible: false, item: {}});
+  const { data, loading, setParams } = useInitial<Item[], object>(getDetail, [], {});
+
+  const dele = (id?: number) => {
+    DeleteApi({id}).then(res => {
+      message.success('操作成功');
+      setParams({}, true);
+    }).catch(e => message.error(e.message));
+  };
+
+  return (
+    <PageHeaderWrapper title="绩效目标设置">
+      <Card>
+        <div style={{display: 'flex', justifyContent: 'flex-end', marginBottom: 20}}>
+          <Button type="primary" onClick={() => setCurrent({visible: true, item: {}})}>新增</Button>
+        </div>
+        <Table
+          dataSource={data}
+          loading={loading}
+          rowKey={r => `${r.id}`}
+          pagination={false}
+        >
+          <Column title="库房" dataIndex="storageName" />
+          <Column title="门店" dataIndex="shopName" />
+          <Column title="订件时长目标(天)" dataIndex="days" />
+          <Column title="运费目标(元)" dataIndex="amount" />
+          <Column
+            title="操作"
+            render={(r:Item) => (
+              <>
+                <a onClick={() => setCurrent({visible: true, item: r})}>编辑</a>
+                <Divider type="vertical" />
+                <Popconfirm
+                  title="确认删除"
+                  onConfirm={() => dele(r.id)}
+                >
+                  <a>删除</a>
+                </Popconfirm>
+              </>
+            )}
+          />
+        </Table>
+        <AddModal item={current.item} visible={current.visible} onCancel={() => setCurrent({visible: false, item: {}})} refesh={() => setParams({}, true)} />
+      </Card>
+    </PageHeaderWrapper>
+  );
+};
+export default Index;
 \ No newline at end of file
 import React, { useState } from 'react';
-import { Card, InputNumber, message, Radio } from 'antd';
+import { Card, InputNumber, message } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import useInitail from '@/hooks/useInitail';
 import ConfirmBnt from '../components/ConfirmBnt';
@@ -65,12 +65,6 @@ export default function Index() {
             />
             &nbsp;&nbsp;，配件计划不审批
           </span>
-          <span style={{ marginBottom: 20 }}>4、计划员能否修改订件的错误配件编码：
-            <Radio.Group value={Number(data.editBuyPartCode)} disabled={!disable} onChange={v => setData({ ...data, editBuyPartCode: !!v.target.value})}>
-              <Radio value={1}>是</Radio>
-              <Radio value={0}>否</Radio>
-            </Radio.Group>
-          </span>
           <ConfirmBnt
             disable={disable}
             onOk={handleSave}