From bbe48e4d870dadc92a148ae8b80cb4bbe7aa0beb Mon Sep 17 00:00:00 2001
From: mohl <mohl@feewee.cn>
Date: Thu, 23 Feb 2023 14:38:05 +0800
Subject: [PATCH] 库存池展示加装项

---
 src/pages/stock/Components/OptionalDetails.tsx               | 32 ++++++++++++++++++++++++++++++++
 src/pages/stock/RepertoryFw/comps/QueryForm.tsx              |  7 +++++--
 src/pages/stock/RepertoryFw/index.tsx                        | 18 ++++++++++++++++++
 src/pages/stock/RepertoryFw/interface.d.ts                   |  2 ++
 src/pages/stock/SpecialOfferCar/SubPages/OptionalDetails.tsx | 34 ----------------------------------
 src/pages/stock/SpecialOfferCar/index.tsx                    |  2 +-
 6 files changed, 58 insertions(+), 37 deletions(-)
 create mode 100644 src/pages/stock/Components/OptionalDetails.tsx
 delete mode 100644 src/pages/stock/SpecialOfferCar/SubPages/OptionalDetails.tsx

diff --git a/src/pages/stock/Components/OptionalDetails.tsx b/src/pages/stock/Components/OptionalDetails.tsx
new file mode 100644
index 0000000..49711f9
--- /dev/null
+++ b/src/pages/stock/Components/OptionalDetails.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { Modal, Descriptions, Row, List } from 'antd';
+
+interface Props {
+  visible: boolean,
+  onCancel: () => any,
+  listItem?: SpecialOfferCar.OptionalVo[],
+}
+export default function DetailModal({ visible, onCancel, listItem = [] }: Props) {
+  return (
+    <Modal
+      title="加装项"
+      maskClosable={false}
+      visible={visible}
+      onCancel={onCancel}
+      footer={null}
+    >
+      <List
+        bordered
+        dataSource={listItem}
+        renderItem={(item, key) => (
+          <List.Item>
+            <Row style={{ flex: 1 }} justify="space-between">
+              <div style={{ flex: 1 }}>{key + 1}.{item.optionalName}</div>
+              <div style={{ color: "#FF921C" }}>{item.dealerPrice || 0}元</div>
+            </Row>
+          </List.Item>
+        )}
+      />
+    </Modal>
+  );
+}
\ No newline at end of file
diff --git a/src/pages/stock/RepertoryFw/comps/QueryForm.tsx b/src/pages/stock/RepertoryFw/comps/QueryForm.tsx
index a29e8d4..d566c77 100644
--- a/src/pages/stock/RepertoryFw/comps/QueryForm.tsx
+++ b/src/pages/stock/RepertoryFw/comps/QueryForm.tsx
@@ -220,11 +220,14 @@ export default function QueryForm({ onChange, delearData, setSearchParams, inner
           <Option value="0">否</Option>
           <Option value="1">是</Option>
         </Select>
-        <Select placeholder="请选择库存状态" value={innerParams.sold} onChange={(value) => onChange({ sold: value })} style={{ width: 180 }}>
+        <Select placeholder="加装车" value={innerParams.optionalTag} allowClear onChange={(value) => onChange({ optionalTag: value })} style={{ width: 180 }}>
+          <Option value="0">否</Option>
+          <Option value="1"> 是</Option>
+        </Select>
+        <Select placeholder="请选择库存状态" value={innerParams.sold} allowClear onChange={(value) => onChange({ sold: value })} style={{ width: 180 }}>
           <Option value="0">未售出</Option>
           <Option value="1"> 已售出</Option>
         </Select>
-        <div style={{ width: 180 }} />
         <div style={{ width: 180 }}>
           <Button
             type="primary"
diff --git a/src/pages/stock/RepertoryFw/index.tsx b/src/pages/stock/RepertoryFw/index.tsx
index 5f83205..5fcefbd 100644
--- a/src/pages/stock/RepertoryFw/index.tsx
+++ b/src/pages/stock/RepertoryFw/index.tsx
@@ -12,6 +12,12 @@ import RecordModal from './comps/RecordModal';
 import * as api from './api';
 import st from '../style.less';
 import moment from 'moment';
+import OptionalDetails from '@/pages/stock/Components/OptionalDetails';
+
+interface Optionals {
+  visible: boolean,
+  listItem?: SpecialOfferCar.OptionalVo[],
+}
 
 export default function Repertory() {
   const { data: delearData, errMsg } = useInitail<CommonApi.OptionVO[], CommonApi.DealerParam>(getDealerApi, [], {});
@@ -19,6 +25,7 @@ export default function Repertory() {
   const [showDetailModal, setShowDetailModal] = useState(false);
   const [listRecord, setListRecord] = useState<Repertory.RepertoryItem>({});
   const [recordVisible, setRecordVisible] = useState(false);
+  const [Optionals, setOptionals] = useState<Optionals>({ visible: false });
 
   const RecordContent = useMemo(() => (
     <RecordModal
@@ -110,6 +117,12 @@ export default function Repertory() {
           <Column title="前装车" dataIndex="decoratedCar" render={(text) => getColumnStyle(text)} width="5%" />
           <Column title="加装车" dataIndex="optionalTag" render={(text) => (text ? "是" : "否")} width="5%" />
           <Column title="厂家加装金额" dataIndex="optionalPrice" width="5%" />
+          <Column
+            title="加装项目"
+            width="5%"
+            dataIndex="optionalItemList"
+            render={(t, record: SpecialOfferCar.Item) => (t && record.optionalTag ? (<Button type="link" onClick={() => setOptionals({ visible: true, listItem: t })}>查看</Button>) : "--")}
+          />
           <Column title="锁车时长(天)" dataIndex="lockedDuration" render={(text) => text || "--"} sorter={(a: Repertory.RepertoryItem, b: Repertory.RepertoryItem) => (a.lockedDuration || 0) - (b.lockedDuration || 0)} width="6%" />
           <Column title="调运次数" dataIndex="transportedNum" sorter={(a: Repertory.RepertoryItem, b: Repertory.RepertoryItem) => (a.transportedNum || 0) - (b.transportedNum || 0)} render={(text) => text || "--"} width="6%" />
           <Column title="启票商家" dataIndex="dealerName" width="8%" />
@@ -143,6 +156,11 @@ export default function Repertory() {
         }}
         listItem={listRecord}
       />
+      <OptionalDetails
+        {...Optionals}
+        onCancel={() => setOptionals({ visible: false, listItem: undefined })}
+      />
+
       {/* <RecordModal
         visible={recordVisible}
         onCancel={() => { setRecordVisible(false); }}
diff --git a/src/pages/stock/RepertoryFw/interface.d.ts b/src/pages/stock/RepertoryFw/interface.d.ts
index c69a9fb..5c57f9b 100644
--- a/src/pages/stock/RepertoryFw/interface.d.ts
+++ b/src/pages/stock/RepertoryFw/interface.d.ts
@@ -37,6 +37,7 @@ declare namespace Repertory {
     tempLocked?: number; //临时锁车标识
     sold?: number; //库存状态
     storageId?: number; //库房取值
+    optionalTag?: boolean; // 加装车标识
   }
 
   /**
@@ -95,6 +96,7 @@ declare namespace Repertory {
     shippingDay?: number; //发运天数
     optionalTag?: boolean; //加装车
     optionalPrice?: number;
+    optionalItemList?: any[] //选装项目
   }
 
   /**库存列表详情 */
diff --git a/src/pages/stock/SpecialOfferCar/SubPages/OptionalDetails.tsx b/src/pages/stock/SpecialOfferCar/SubPages/OptionalDetails.tsx
deleted file mode 100644
index 3cbefe3..0000000
--- a/src/pages/stock/SpecialOfferCar/SubPages/OptionalDetails.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import { Modal, Descriptions, Row, List } from 'antd';
-
-interface Props {
-  visible: boolean,
-  onCancel: () => any,
-  listItem?: SpecialOfferCar.OptionalVo[],
-}
-export default function DetailModal({ visible, onCancel, listItem = [] }: Props) {
-  return (
-    <Modal
-      title="加装项"
-      maskClosable={false}
-      visible={visible}
-      onCancel={onCancel}
-      footer={null}
-    >
-      <List
-        header={<div>Header</div>}
-        footer={<div>Footer</div>}
-        bordered
-        dataSource={listItem}
-        renderItem={(item) => (
-          <List.Item>
-            <Row>
-              <div>{item.optionalName}</div>
-              <div>{item.dealerPrice}</div>
-            </Row>
-          </List.Item>
-        )}
-      />
-    </Modal>
-  );
-}
\ No newline at end of file
diff --git a/src/pages/stock/SpecialOfferCar/index.tsx b/src/pages/stock/SpecialOfferCar/index.tsx
index 7163c28..07738b1 100644
--- a/src/pages/stock/SpecialOfferCar/index.tsx
+++ b/src/pages/stock/SpecialOfferCar/index.tsx
@@ -9,7 +9,7 @@ import React, { useEffect, useState } from 'react';
 import st from './style.less';
 import moment from 'moment';
 import { history } from "umi";
-import OptionalDetails from './SubPages/OptionalDetails';
+import OptionalDetails from '@/pages/stock/Components/OptionalDetails';
 
 interface Optionals {
   visible: boolean,
--
libgit2 0.22.2