Merge remote-tracking branch 'origin/master' into capital2

莫红玲
2 parents 1cbe77c1 aa50ec14
Showing 12 changed files with 95 additions and 102 deletions
src/pages/contract/BearCostSetting/components/SaveModal/index.tsx
src/pages/contract/BearCostSetting/interface.d.ts
src/pages/coupon/CouponConfig/components/UsesceneItems/PreDecoration/Components/WorkItemLimit.tsx
src/pages/coupon/CouponConfig/components/UsesceneItems/PreDecoration/interface.d.ts
src/pages/pms/partPlan/AmountPlan/subpages/Second/components/AreaTable.tsx
src/pages/pms/partPlan/AmountPlan/subpages/Second/components/PartTable.tsx
src/pages/pms/partPlan/AmountPlan/subpages/Second/components/SeriesTable.tsx
src/pages/pms/partPlan/AmountPlan/subpages/Second/components/StorageTable.tsx
src/pages/pms/partPlan/AmountPlan/subpages/Third/index.tsx
src/pages/pms/purchase/PurchaseRecord/comonents/ChoosePartModal.tsx
src/pages/pms/storage/partShop/components/PartShopModal.tsx
src/pages/pms/storage/partShop/interface.d.ts
@@ -122,7 +122,7 @@ const SaveModal = ({visible, onCancel, onRefresh}:Props) =&gt; {
                 onSelect={(it:any) => {
                     const item = feetypeList.filter(i => it.value === i.typeValue);
                     const {compTypes, roleCodes} = item[0];
-                    setData({...data, compTypes, roleCodes});
+                    setData({...data, compTypes, roleCodes, typeValue: it.value});
                     setDisabled(false);
                 }}
                 filterOption={(input, option: any) => option?.children.indexOf(input) >= 0}
@@ -210,7 +210,7 @@ const SaveModal = ({visible, onCancel, onRefresh}:Props) =&gt; {
               </Select>
             </Form.Item>
             {
-                paymentMode == 2 && (             
+                paymentMode == 2 && ['RP00000053', 'RP00000066', 'RP00000067'].includes(data.typeValue || '') && (             
                 <Form.Item
                   label="计量单位："
                   name="unit"
@@ -3,6 +3,7 @@ declare namespace BearCostSetting {
         compTypes?:number[];//
         roleCodes?:string[];//角色编码
         type?:number;//1门店 2往来单位
+        typeValue?:string;//费用类型值
     }
  
     interface QueryParams{
@@ -6,9 +6,9 @@ import * as API from &#39;../api&#39;;
 import * as IF from '../interface';
 import usePagination from '@/hooks/usePagination';
 import { deRepetition } from '@/components/Condition/SeriesSelector/components/utils';
-import useDebounce from '@/hooks/useDebounce';
 import useInitial from '@/hooks/useInitail';
-import { getBrandFilterApi } from '@/common/api';
+import { getBrandFilterApi, getSeriesApi } from '@/common/api';
+import { debounce } from 'lodash';
  
 const st = require('@/pages/coupon/CouponConfig/style.less');
  
@@ -30,19 +30,23 @@ function PartItem(props: Props, ref?: Ref&lt;any&gt;) {
   const params = useScene === 1 ? { workTypes: "1,2,5,9" } : { workType: useScene };
   const { loading, setLoading, list, setParams, paginationConfig, innerParams } = usePagination(API.fetchListApi, params);
   const { data: brandList } = useInitial(getBrandFilterApi, [], {});
+  const [seriesList, setSeriesList] = useState<CommonApi.OptionVO[]>([]);
   const [visible, setVisible] = useState(false);
   const [listData, setListData] = useState<IF.ListVO[]>([]);
-  const [keyWords, setKeyWords] = useState<string>('');
-  const keyWordsTerm = useDebounce<string>(keyWords, 800);
  
   useEffect(() => {
     value && setListData(value.map((v: any) => ({ itemCode: v.applyValue, itemName: v.applyName })));
   }, []);
  
-  useEffect(() => {
-    setParams({ keywords: keyWordsTerm || undefined, current: 1 }, true);
-  }, [keyWordsTerm]);
+  function getSeries(brandId: number) {
+    getSeriesApi(brandId).then((res) => {
+      setSeriesList(res.data || []);
+    }).catch((err) => {
+      message.error(err.message);
+    });
+  }
  
+  const onFilter = debounce((params) => setParams({ ...innerParams, ...params }, true), 600);
   function selectedItems(value: any[]) {
     const partIds = value.length && value.map((i: any) => i.applyValue).toString();
     API.fetItemsApi({ partIds }).then(res => {
@@ -93,7 +97,7 @@ function PartItem(props: Props, ref?: Ref&lt;any&gt;) {
             width="20%"
             render={(text, record: IF.ListVO) => {
               return (
-                <a onClick={() => remove(record.itemCode)}>删除</a>
+                <a onClick={() => remove(record.itemCode!)}>删除</a>
               );
             }}
           />
@@ -120,16 +124,38 @@ function PartItem(props: Props, ref?: Ref&lt;any&gt;) {
             showSearch
             allowClear
             placeholder="搜索品牌"
-            style={{ width: 200, marginRight: 15 }}
-            onChange={(value) => setParams({ ...innerParams, brandId: value }, true)}
+            style={{ width: 200, margin: 5 }}
+            onChange={(value) => {
+              setParams({ ...innerParams, brandId: value }, true);
+              getSeries(value);
+            }}
           >
             {brandList.map((item) => <Select.Option key={item.id} value={item.id}>{item.name}</Select.Option>)}
           </Select>,
+          <Select
+            optionFilterProp="children"
+            mode="multiple"
+            showSearch
+            allowClear
+            placeholder="搜索车系"
+            style={{ width: 200, margin: 5 }}
+            onChange={(v) => { console.log(v); setParams({ ...innerParams, seriesIds: v.join(',') }, true); }}
+          >
+            {seriesList.map((item) => <Select.Option key={item.id} value={item.id}>{item.name}</Select.Option>)}
+          </Select>,
           <Search
             allowClear
-            value={keyWords}
+            value={innerParams.keywords}
+            style={{ margin: 5 }}
             placeholder="搜索作业名称/代码"
-            onChange={(e) => setKeyWords(e.target.value)}
+            onChange={(e) => onFilter({ keywords: e.target.value })}
+          />,
+          <Search
+            allowClear
+            value={innerParams.specCode}
+            style={{ margin: 5 }}
+            placeholder="搜索整车代码"
+            onChange={(e) => onFilter({ specCode: e.target.value })}
           />
         ]}
       />
@@ -3,7 +3,8 @@ export interface QueryList {
   workType?: number, //作业项类型 1:机修  2：电器 3：钣喷 4：装潢 5：基础保养 6：贴膜
   workTypes?: string, //多个作业项组合参数
   keywords?: string, //关键词
-  specGroupCode?: string, //车型分组代码
+  seriesIds?:string, //车系id集合,查询多个车系
+  specCode?: string, //整车代码
   current?: number,
   pageSize?: number,
   seriesId?: number,
@@ -48,51 +49,51 @@ export interface PartListVO {
  
 /**查询保养套餐卡列表通用接口 */
 export interface MpList {
-  id: number,              //null
-  maintainId: number,     //套餐卡配置ID	
-  name: string,	          //套餐卡名称	
-  remark: string,         //	备注
-  times: number,          // 套餐次数
-  validity: number,       //	有效期(年)
-  mainItemCode: string,   //机油项编码
-  mainItemName: string,   // 机油项名称 
-  groupId: number,        //集团id
-  brandName: string,      //品牌名称
-  seriesName: string,     //车系名称
-  status: number,          //状态 1待发布 2已发布 3已下架
+  id: number, //null
+  maintainId: number, //套餐卡配置ID	
+  name: string, //套餐卡名称	
+  remark: string, //	备注
+  times: number, // 套餐次数
+  validity: number, //	有效期(年)
+  mainItemCode: string, //机油项编码
+  mainItemName: string, // 机油项名称 
+  groupId: number, //集团id
+  brandName: string, //品牌名称
+  seriesName: string, //车系名称
+  status: number, //状态 1待发布 2已发布 3已下架
 }
  
 /**保养套餐卡查询条件 */
 export interface Params {
-  mpName?: string,  //	套餐名称		
-  startDate?: number,  //	创建日期开始
-  endDate?: number,  //	创建日期结束		
+  mpName?: string, //	套餐名称		
+  startDate?: number, //	创建日期开始
+  endDate?: number, //	创建日期结束		
   brandId?: string,	//品牌ID			
-  status?: number,  //	状态 1：待发布 4：已发
+  status?: number, //	状态 1：待发布 4：已发
   current?: number,
   pageSize?: number,
 }
  
 /**查询集团VIP卡列表 */
 export interface VipList {
-  id: number,                    //null
-  warrantyId: number,           // 质保卡id
-  name: string,                 // 质保卡名称
-  price: number,                // 价格
-  remark: string,               //备注
-  groupId: number,              //集团id
-  brandId: number,              //品牌id
-  brandName: string,            //品牌名称
-  seriesId: number,             //车系id
-  seriesName: string,           // 车系名称
-  status: number,                //状态 1 待上架 2 已上架 2 已下架
+  id: number, //null
+  warrantyId: number, // 质保卡id
+  name: string, // 质保卡名称
+  price: number, // 价格
+  remark: string, //备注
+  groupId: number, //集团id
+  brandId: number, //品牌id
+  brandName: string, //品牌名称
+  seriesId: number, //车系id
+  seriesName: string, // 车系名称
+  status: number, //状态 1 待上架 2 已上架 2 已下架
 }
  
 /**vip卡查询条件 */
 export interface VipParams {
-  brandId?: number,         //	品牌ID
-  status?: number,          //	状态 1：待发布 4：已发
+  brandId?: number, //	品牌ID
+  status?: number, //	状态 1：待发布 4：已发
   current?: number,
   pageSize?: number,
-  name?: number,           //质保卡名称
+  name?: number, //质保卡名称
 }
@@ -32,7 +32,7 @@ export default function Index(props: Props = {}) {
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
         <Column title="动态库销比" dataIndex="ratio" render={t => (t || 0).toFixed(2)} />
         <Column title="库存金额" dataIndex="stockAmount" render={t => (t || 0).toFixed(2)} />
-        <Column title="滚动90天出库金额" dataIndex="outAmount" render={t => (t || 0).toFixed(2)} />
+        <Column title="滚动90天月均出库金额" dataIndex="outAmount" render={t => (t || 0).toFixed(2)} />
         {showAnalyse && (
           <>
             <Column
@@ -32,12 +32,9 @@ export default function Index(props: Props = {}) {
         <Column title="配件名称" dataIndex="name" />
         <Column title="采购单价" dataIndex="price" />
         <Column title="采购数量" dataIndex="cnt" />
-        <Column title="采购规格" dataIndex="unit" />
-        <Column title="拆分件规格" dataIndex="splitUnit" />
-        <Column title="拆分件数量" dataIndex="splitCnt" />
         <Column title="动态库销比" dataIndex="ratio" render={t => (t || 0).toFixed(2)} />
         <Column title="库存数量" dataIndex="stockCnt" render={t => (t || 0).toFixed(2)} />
-        <Column title="滚动90天出库数量" dataIndex="outCnt" render={t => (t || 0).toFixed(2)} />
+        <Column title="滚动90天月均出库数" dataIndex="outCnt" render={t => (t || 0)} />
         {showAnalyse && (
           <>
             <Column
@@ -32,7 +32,7 @@ export default function Index(props: Props = {}) {
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
         <Column title="动态库销比" dataIndex="ratio" render={t => (t || 0).toFixed(2)} />
         <Column title="库存金额" dataIndex="stockAmount" render={t => (t || 0).toFixed(2)} />
-        <Column title="滚动90天出库金额" dataIndex="outAmount" render={t => (t || 0).toFixed(2)} />
+        <Column title="滚动90天月均出库金额" dataIndex="outAmount" render={t => (t || 0).toFixed(2)} />
         {showAnalyse && (
           <>
             <Column
@@ -32,7 +32,7 @@ export default function Index(props: Props = {}) {
         <Column title="本次计划金额(元)" dataIndex="thisTimeAmount" />
         <Column title="动态库销比" dataIndex="ratio" render={t => (t || 0).toFixed(2)} />
         <Column title="库存金额" dataIndex="stockAmount" render={t => (t || 0).toFixed(2)} />
-        <Column title="滚动90天出库金额" dataIndex="outAmount" render={t => (t || 0).toFixed(2)} />
+        <Column title="滚动90天月均出库金额" dataIndex="outAmount" render={t => (t || 0).toFixed(2)} />
         {showAnalyse && (
           <>
             <Column
@@ -41,20 +41,8 @@ export default function Index() {
         <Column title="配件名称" dataIndex="name" />
         <Column title="库房名称" dataIndex="storageName" />
         <Column title="门店名称" dataIndex="shopName" />
-        <Column title="拆分件规格" dataIndex="splitUnit" render={t => t || '--'} />
-        <Column title="拆分件系统数量" dataIndex="splitCnt" />
-        <Column title="采购规格" dataIndex="unit" render={t => t || '--'} />
-        <Column title="系统生成采购数量" dataIndex="count" />
-        <Column
-          title="增减数"
-          dataIndex="diffCount"
-          render={(t, _: ListVO) => {
-            const c = (_.cnt || 0) - (_.count || 0);
-            return c == 0 ? '' : `${c > 0 ? '增' : '减'}${Math.abs(c)}`;
-          }}
-        />
         <Column title="在库数量" dataIndex="stockCnt" />
-        <Column title="滚动90天出库" dataIndex="outCnt" />
+        <Column title="滚动90天月均出库数" dataIndex="outCnt" />
         <Column
           title="采购单价"
           dataIndex="price"
@@ -56,9 +56,9 @@ export default function Index({ onCancel, visible, onOk, partParams }: Props) {
         <Item label="配件名称" name="part" required rules={[{ required: true, message: '请选择配件' }]}>
           <PartModal isclear={isclear} setIsclear={setIsclear} partParams={partParams} onChange={(p: { partId?: number | undefined; partName?: string | undefined; partCode?: string | undefined; price?: number | undefined; }) => getPart(p)} />
         </Item>
-        <Item 
-          label="配件单价" 
-          name="price" 
+        <Item
+          label="配件单价"
+          name="price"
           rules={[
             { required: true, message: '请输入配件价格' },
             ({ getFieldValue }) => ({
@@ -74,7 +74,7 @@ export default function Index({ onCancel, visible, onOk, partParams }: Props) {
           <InputNumber style={{ width: 250 }} />
         </Item>
         <Item label="配件数量" name="partCnt" required rules={[{ required: true, message: '请输入配件数量' }]}>
-          <InputNumber min={1} max={1000} placeholder="请输入配件数量" style={{ width: 250 }} />
+          <InputNumber min={1} max={90000} placeholder="请输入配件数量" style={{ width: 250 }} />
         </Item>
       </Form>
     </Modal>
@@ -18,31 +18,10 @@ export default function PartShopModal() {
     } else {
       setIsadd(false);
       setIsprice(false);
-      form.setFieldsValue({
-        costPrice: "",
-        stock: 0,
-        lockStock: 0,
-        shopId: "",
-        part: "",
-        user: "",
-        fixRemark: ""
-      });
-    }
-  }, [visible]);
-
-  useEffect(() => {
-    if (isadd) {
       setItem({});
-      console.log(isadd, item);
-      form.setFieldsValue({
-        costPrice: "",
-        stock: 0,
-        lockStock: 0,
-        shopId: "",
-        part: ""
-      });
+      form.resetFields();
     }
-  }, [isadd]);
+  }, [visible]);
  
   const handleSubmit = () => {
     form.validateFields().then(values => {
@@ -50,11 +29,12 @@ export default function PartShopModal() {
         ...item,
         partId: values.part.partId,
         costPrice: values.costPrice,
-        stock: values.stock,
-        lockStock: values.lockStock,
+        stock: values.stock || 0,
+        lockStock: values.lockStock || 0,
         shopId: values.shopId,
         user: values.user,
-        fixRemark: values.fixRemark
+        fixRemark: values.fixRemark,
+        type: isadd ? 1 : isprice ? 3 : 2
       };
       setConfirmLoading(true);
       savePartShopApi(params).then(res => {
@@ -76,8 +56,7 @@ export default function PartShopModal() {
  
   const validatorLockStock = (rule: any, value: number) => {
     if (value > form.getFieldsValue(['stock']).stock) {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      return Promise.reject('锁定库存不能超过总库存数量！');
+      return Promise.reject(new Error('锁定库存不能超过总库存数量！'));
     } else return Promise.resolve();
   };
  
@@ -113,13 +92,13 @@ export default function PartShopModal() {
           <ChoosePart disabled={!!item.id} />
         </Item>
         <Item label="加权成本价(元)" name="costPrice" rules={[{ required: true, message: "请输入加权成本价" }]}>
-          <InputNumber style={{ width: "100%" }} min={0} step={0.1} placeholder="加权成本价(元)" />
+          <InputNumber style={{ width: "100%" }} min={0} step={0.1} placeholder="加权成本价(元)" disabled={!(isadd || isprice)} />
         </Item>
-        <Item label="总库存数量" name="stock" rules={[{ required: true, message: "请输入总库存数量" }]}>
-          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="总库存数量" disabled={isprice || isadd} />
+        <Item label="总库存数量" name="stock">
+          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="总库存数量" disabled={isprice || isadd} defaultValue={0} />
         </Item>
-        <Item label="锁定库存" name="lockStock" rules={[{ required: true, message: "请输入锁定库存" }, { validator: validatorLockStock }]}>
-          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled />
+        <Item label="锁定库存" name="lockStock" rules={[{ validator: validatorLockStock }]}>
+          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled defaultValue={0} />
         </Item>
         {!!fw && !isprice && !isadd && (
         <Item label="修改人" name="user" rules={[{ required: true, message: "请输入修改人" }]}>
@@ -34,6 +34,7 @@ declare namespace PmsStoragePartShop {
     shopId?: number, // 服务站ID
     user?: string //修改人名称
     fixRemark?: string //修改原因
+    type?: number //类型1新增2修改库存3修改价格
   }
  
   interface Option {