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

Kurisu
2 parents 4939d11d b8badb2a
Showing 8 changed files with 173 additions and 42 deletions
build.txt
src/pages/cas/afterSaleConfiguration/maintainConfig/components/OilDetailModal/index.tsx
src/pages/cas/afterSaleConfiguration/maintainConfig/interface.d.ts
src/pages/cas/afterSaleConfiguration/maintainConfig/subpages/MaintainEdit/GroupConfig/index.tsx
src/pages/cas/afterSaleConfiguration/maintainConfig/subpages/MaintainEdit/api.ts
src/pages/cas/afterSaleConfiguration/maintainConfig/subpages/MaintainEdit/components/PartFilter/index.tsx
src/pages/cas/afterSaleConfiguration/maintainConfig/subpages/MaintainEdit/components/WorkItemSelector/PartEditTable/index.tsx
src/pages/cas/afterSaleConfiguration/maintainConfig/subpages/MaintainEdit/components/WorkItemSelector/index.tsx
-https://gate.feewee.cn/file/show?fid=539953927090245
 \ No newline at end of file
+https://gate.feewee.cn/file/show?fid=539994370875461
 \ No newline at end of file
 import React, { useEffect, useMemo, useState } from 'react';
-import { Modal, Button, Spin, message, Row, Radio, Table, Empty } from 'antd';
-import { DetailParams, EnergyType, detailApi, energyListApi, getSpecListApi } from '../../subpages/MaintainEdit/api';
+import { Button, Empty, message, Modal, Radio, Row, Spin, Table } from 'antd';
+import { detailApi, DetailParams, energyListApi, EnergyType, getSpecListApi } from '../../subpages/MaintainEdit/api';
 import { ApplyScopeEnum, EnergyTypeEnum, InhaleCodeEnum } from '../../entity';
 import st from './style.less';
 import useInitial from '@/hooks/useInitail';
@@ -19,6 +19,7 @@ interface Props {
   applyScope: number;
   onCancel: () => void;
 }
+
 export default function OilDetailModal({ visible, brandId, seriesId, applyScope, onCancel }: Props) {
   const [energyIndex, setEnergyIndex] = useState(0);
   const [energyTypes, setEnergyTypes] = useState<EnergyType[]>([]);
@@ -259,7 +260,17 @@ export default function OilDetailModal({ visible, brandId, seriesId, applyScope,
                     <Table dataSource={currGroup.partFilters} pagination={false} scroll={{ y: 200 }}>
                       <Column title="配件名称" dataIndex="partName" />
                       <Column title="配件编码" width={300} dataIndex="partCode" />
-                      <Column title="数量" width={200} dataIndex="partCnt" />
+                      <Column
+                        title="数量"
+                        width={200}
+                        dataIndex="partCnt"
+                        render={(partCnt: number, record: Maintain.ListVO) => (
+                          <span>
+                            {partCnt}
+                            {record.decimal ? record.oilUnit || '' : ''}
+                          </span>
+                        )}
+                      />
                     </Table>
                   </>
                 )}
@@ -279,7 +290,17 @@ export default function OilDetailModal({ visible, brandId, seriesId, applyScope,
                       <Table dataSource={item.parts} pagination={false} scroll={{ y: 200 }}>
                         <Column title="配件名称" dataIndex="partName" />
                         <Column title="配件编码" width={300} dataIndex="partCode" />
-                        <Column title="数量" width={200} dataIndex="partCnt" />
+                        <Column
+                          title="数量"
+                          width={200}
+                          dataIndex="partCnt"
+                          render={(partCnt: number, record: Maintain.ListVO) => (
+                            <span>
+                              {partCnt}
+                              {record.decimal ? record.oilUnit || '' : ''}
+                            </span>
+                          )}
+                        />
                       </Table>
                     </div>
                   ))}
@@ -16,6 +16,10 @@ declare namespace Maintain {
     inhaleType: number; // 进气方式
     exhaust: number; // 排量
     applyScope: number; // 保养类型
+    decimal?: boolean; // 是否可以是小数
+    capacity?: number; // 容量
+    oilUnit?: string; // 容量单位
+    unit?: string; // 单位
   }
  
   interface DetailVO {
@@ -104,8 +108,12 @@ declare namespace Maintain {
     partNumber?: number;
     /**价格 */
     price?: number;
+    /** 容量 */
+    capacity?: number;
     /** 单位 */
     unit?: string;
+    /** 容量单位 */
+    oilUnit?: string;
     /** 油液标号 */
     oilGrade?: string;
     /** 配件品牌 */
@@ -126,25 +126,26 @@ export default function ConfigItem({ configType, base, groupData, energyItem, on
             >
               添加作业项
             </Button>
-            <AddItemModal
-              value={currItem}
-              visible={itemVisible}
-              brand={base.brandId}
-              onCancel={() => setItemVisible(false)}
-              onChange={(value: Maintain.WorkItem) => {
-                const idx = groupData.workItems.findIndex((item) => item.id === value.id);
-                if (idx === -1 && !currItem) {
-                  groupData.workItems.push(value);
-                } else {
-                  groupData.workItems.splice(idx, 1, value);
-                }
-                onUpdate({ ...groupData });
-                setItemVisible(false);
-              }}
-            />
           </>
         )}
       </Card>
+
+      <AddItemModal
+        value={currItem}
+        visible={itemVisible}
+        brand={base.brandId}
+        onCancel={() => setItemVisible(false)}
+        onChange={(value: Maintain.WorkItem) => {
+          const idx = groupData.workItems.findIndex((item) => item.id === value.id);
+          if (idx === -1 && !currItem) {
+            groupData.workItems.push(value);
+          } else {
+            groupData.workItems.splice(idx, 1, value);
+          }
+          onUpdate({ ...groupData });
+          setItemVisible(false);
+        }}
+      />
     </>
   );
 }
@@ -153,3 +153,15 @@ export interface OilList {
 export function getOilListApi(params: OilParams): http.PromisePageResp<OilList> {
   return request.get(`${PMS_HOST}/erp/part/oil/parts`, { params });
 }
+
+export interface OtherPartInfo {
+  partId: number; // 配件 id
+  decimal: boolean; // 是否支持小数
+  capacity: number; // 容量
+  oilUnit: string; // 容量单位
+  unit: string; // 单位
+}
+
+export function getOtherPartInfo(partIds: number[]): http.PromiseResp<OtherPartInfo[]> {
+  return request.post(`${CAS_HOST}/erp/basic/maintenance/config/other/part/info`, { partIds });
+}
 import React, { useEffect, useState } from 'react';
-import { Button, Form, InputNumber, Popconfirm, Row, Table } from 'antd';
+import { Button, Form, InputNumber, Modal, Popconfirm, Row, Table } from 'antd';
+
+import { getOtherPartInfo } from '@/pages/cas/afterSaleConfiguration/maintainConfig/subpages/MaintainEdit/api';
  
 import EngineFilterModal from '../MachineFilter/components/EngineFilterModal';
  
@@ -22,7 +24,7 @@ export default function PartFilter({ partFilters, brandId, onChange }: Props) {
     setDataSource([...partFilters]);
   }, [partFilters]);
  
-  function _onElseOk(data: Maintain.PartItem[]) {
+  async function _onElseOk(data: Maintain.PartItem[]) {
     const newData: any[] = [];
     data.forEach((item, _index) => {
       const index = newData.findIndex((i) => `${item.partCode}_${item.partNo}` == `${i.partCode}_${i.partNo}`);
@@ -39,8 +41,30 @@ export default function PartFilter({ partFilters, brandId, onChange }: Props) {
         });
       }
     });
-    onChange && onChange(newData);
-    setElseVisible(false);
+    // 获取配件是否可配置为小数信息
+    try {
+      const res = await getOtherPartInfo(newData.map((item) => item.partId));
+      const partInfoList = res.data || [];
+      newData.forEach((item, index) => {
+        const pIdx = partInfoList.findIndex((i) => i.partId == item.partId);
+        // 配件是可配置为小数
+        if (pIdx > -1 && partInfoList[pIdx].decimal) {
+          // 设置对应参数，提交时需要传
+          newData[index].decimal = partInfoList[pIdx].decimal;
+          newData[index].capacity = partInfoList[pIdx].capacity;
+          newData[index].oilUnit = partInfoList[pIdx].oilUnit;
+          newData[index].unit = partInfoList[pIdx].unit;
+        }
+      });
+
+      onChange && onChange(newData);
+      setElseVisible(false);
+    } catch (err) {
+      Modal.error({
+        title: '获取配件信息失败',
+        content: `${String(err)}`,
+      });
+    }
   }
  
   function onDelete(record: Maintain.PartItem) {
@@ -92,6 +116,9 @@ export default function PartFilter({ partFilters, brandId, onChange }: Props) {
     partCode: string;
     partNumber: number;
     recommend: boolean;
+    decimal?: boolean;
+    capacity?: number;
+    unit?: string;
   }
  
   interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
@@ -105,8 +132,8 @@ export default function PartFilter({ partFilters, brandId, onChange }: Props) {
   }
  
   const EditableCell: React.FC<EditableCellProps> = ({ editing, dataIndex, title, inputType, record, index, children, ...restProps }) => {
-    // todo 液态配件可以输入小数
-    const inputNode = <InputNumber precision={0} />;
+    // 液态配件可以输入小数
+    const inputNode = <InputNumber precision={record?.decimal ? 2 : 0} />;
  
     return (
       <td {...restProps}>
@@ -158,6 +185,7 @@ export default function PartFilter({ partFilters, brandId, onChange }: Props) {
             width={150}
             title="数量"
             dataIndex="partCnt"
+            render={(cnt: number, record) => `${cnt}${record.oilUnit ?? ''}`}
             onCell={(record: Maintain.PartItem) => ({
               record,
               inputType: 'number',
 import React, { useState, useEffect } from 'react';
 import { PlusOutlined } from '@ant-design/icons';
-import { Button, Card, Form, InputNumber, Popconfirm, Table } from 'antd';
+import { Button, Card, Form, InputNumber, Modal, Popconfirm, Table } from 'antd';
 import AddPartsModal from '../AddPartsModal';
  
+import { getOtherPartInfo } from '@/pages/cas/afterSaleConfiguration/maintainConfig/subpages/MaintainEdit/api';
+
 const { Column } = Table;
  
 interface Props {
@@ -17,6 +19,9 @@ interface Item {
   partCode: string;
   partNumber: number;
   recommend: boolean;
+  decimal?: boolean;
+  capacity?: number;
+  unit?: string;
 }
  
 interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
@@ -43,7 +48,7 @@ export default function PartTable({ value, _onChange, specGroupCode }: Props) {
     _onChange && _onChange(selected);
   }, [selected]);
  
-  const handleSelect = (params: any) => {
+  const handleSelect = async (params: any) => {
     const newdatas = params.map((item: Maintain.PartListVO) => ({
       partId: item.partId,
       partName: item.partName,
@@ -51,7 +56,26 @@ export default function PartTable({ value, _onChange, specGroupCode }: Props) {
       partNo: item.partNo,
       partCnt: 1,
     }));
-    setSelected([...newdatas]);
+
+    // 获取配件信息
+    try {
+      const res = await getOtherPartInfo(newdatas.map((item: any) => item.partId));
+      const partInfoList = res.data || [];
+      newdatas.forEach((part: any) => {
+        const _index = partInfoList.findIndex((i) => i.partId == part.partId);
+        part.decimal = partInfoList[_index].decimal;
+        part.capacity = partInfoList[_index].capacity;
+        part.oilUnit = partInfoList[_index].oilUnit;
+        part.unit = partInfoList[_index].unit;
+      })
+
+      setSelected([...newdatas]);
+    } catch (err) {
+      Modal.error({
+        title: '获取配件信息失败',
+        content: `${String(err)}`,
+      });
+    }
   };
  
   const handleSavePart = async (key: React.Key) => {
@@ -91,7 +115,7 @@ export default function PartTable({ value, _onChange, specGroupCode }: Props) {
   };
  
   const EditableCell: React.FC<EditableCellProps> = ({ editing, dataIndex, title, inputType, record, index, children, ...restProps }) => {
-    const inputNode = <InputNumber />;
+    const inputNode = <InputNumber precision={record?.decimal ? 2 : 0} />;
  
     return (
       <td {...restProps}>
@@ -151,6 +175,7 @@ export default function PartTable({ value, _onChange, specGroupCode }: Props) {
             width={150}
             title="数量"
             dataIndex="partCnt"
+            render={(cnt: number, record) => `${cnt}${record.oilUnit ?? ''}`}
             onCell={(record: Maintain.PartItem) => ({
               record,
               inputType: 'number',
 import React, { useState } from 'react';
-import { Button, Form, InputNumber, Popconfirm, Row, Table } from 'antd';
+import { Button, Form, InputNumber, Modal, Popconfirm, Row, Table } from 'antd';
 import { EditOutlined, DeleteOutlined } from '@ant-design/icons';
  
+import { getOtherPartInfo } from '@/pages/cas/afterSaleConfiguration/maintainConfig/subpages/MaintainEdit/api';
+
 import AddPartsModal from './AddPartsModal';
  
 const { Column } = Table;
@@ -12,6 +14,9 @@ interface Item {
   partCode: string;
   partNumber: number;
   recommend: boolean;
+  decimal?: boolean;
+  capacity?: number;
+  unit?: string;
 }
  
 interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
@@ -65,7 +70,7 @@ export default function WorkItemSelector({ index, currItem, onEdit, onDelete, on
   };
  
   // 选择配件
-  const handleSelectParts = (params: any) => {
+  const handleSelectParts = async (params: any) => {
     const allSelectedParts: Maintain.PartItem[] = params.map((item: Maintain.PartListVO) => ({
       partId: item.partId,
       partName: item.partName,
@@ -73,14 +78,44 @@ export default function WorkItemSelector({ index, currItem, onEdit, onDelete, on
       partNo: item.partNo,
       partCnt: 1,
     }));
-    allSelectedParts.forEach((item) => {
-      const partIdx = currItem.parts.findIndex((i) => i.partCode === item.partCode);
-      // 避免上次已选配件已编辑数据被覆盖
-      if (partIdx === -1) {
-        currItem.parts.push(item);
-      }
-    });
-    onChange({ ...currItem });
+
+    // 原有逻辑
+    // allSelectedParts.forEach((item) => {
+    //   const partIdx = currItem.parts.findIndex((i) => i.partCode === item.partCode);
+    //   // 避免上次已选配件已编辑数据被覆盖
+    //   if (partIdx === -1) {
+    //     currItem.parts.push(item);
+    //   }
+    // });
+    // 获取配件是否可配置为小数信息
+
+    try {
+      const res = await getOtherPartInfo(allSelectedParts.map((item) => item.partId));
+      const partInfoList = res.data || [];
+
+      allSelectedParts.forEach((item) => {
+        const _index = partInfoList.findIndex((i) => i.partId == item.partId);
+        const partIdx = currItem.parts.findIndex((i) => i.partCode === item.partCode);
+        // 避免上次已选配件已编辑数据被覆盖
+        if (partIdx === -1) {
+          // 新增
+          currItem.parts.push(item);
+        } else {
+          // 编辑，保留编辑数据，替换规格信息
+          currItem.parts[partIdx].decimal = partInfoList[_index].decimal;
+          currItem.parts[partIdx].capacity = partInfoList[_index].capacity;
+          currItem.parts[partIdx].oilUnit = partInfoList[_index].oilUnit;
+          currItem.parts[partIdx].unit = partInfoList[_index].unit;
+        }
+      });
+
+      onChange({ ...currItem });
+    } catch (err) {
+      Modal.error({
+        title: '获取配件信息失败',
+        content: `${String(err)}`,
+      });
+    }
   };
  
   const isEditing = (record: Maintain.PartItem) => record.partCode === editingKey;
@@ -95,7 +130,7 @@ export default function WorkItemSelector({ index, currItem, onEdit, onDelete, on
   };
  
   const EditableCell: React.FC<EditableCellProps> = ({ editing, dataIndex, title, inputType, record, index, children, ...restProps }) => {
-    const inputNode = <InputNumber />;
+    const inputNode = <InputNumber precision={record?.decimal ? 2 : 0} />;
  
     return (
       <td {...restProps}>
@@ -162,6 +197,7 @@ export default function WorkItemSelector({ index, currItem, onEdit, onDelete, on
             width={150}
             title="数量"
             dataIndex="partCnt"
+            render={(cnt: number, record) => `${cnt}${record.oilUnit ?? ''}`}
             onCell={(record: Maintain.PartItem) => ({
               record,
               inputType: 'number',