Merge remote-tracking branch 'origin/bug_fix'

莫红玲
2 parents 896723fb 5b3bd588
Showing 1 changed file with 88 additions and 37 deletions
src/pages/coupon/CouponConfig/components/WareLimitType/VehicleLimit.tsx
-import React, { useEffect, useState } from 'react';
+import React, { Children, useEffect, useMemo, useState } from 'react';
 import { Button, Popconfirm, Card, Table, Modal, Form, Select, Space, message, Radio, Tag } from 'antd';
 import * as api from '../../api';
+import { ExclamationCircleOutlined } from '@ant-design/icons';
 import TextWithMore from '@/components/TextWithMore';
 import SelectorWithFull from '@/components/SelectorWithFull';
 interface Props {
@@ -26,7 +27,7 @@ export default function Index({ onChange, value, readonly, carSelectApi }: Props
   //存储表格当前编辑项数据
   const [currentItem, setCurrentItem] = useState<any>({});
   //存储Modal中可选的车系
-  const [series, setSeries] = useState<any>([]);
+  const [seriesList, setSeriesList] = useState<any>([]);
   //存储接口返回的车型
   const [specList, setSpecList] = useState<any>([]);
   //存储Modal选择的品牌和车系作为表格的数据源
@@ -40,6 +41,12 @@ export default function Index({ onChange, value, readonly, carSelectApi }: Props
     }
   }, [value]);
  
+  const errTips = useMemo(() => {
+    if (value && value.length) {
+      return value.some((item) => item.spec && !item.spec.length && !item.authType);
+    }
+  }, [value]);
+
   const [carList, setCarList] = useState<any[]>([]);
  
   useEffect(() => {
@@ -60,6 +67,25 @@ export default function Index({ onChange, value, readonly, carSelectApi }: Props
       .validateFields()
       .then((fileds) => {
         const { brand, series, spec, type } = fileds;
+        /**编辑车系 */
+        if (!spec) {
+          const params = series.map((i) => {
+            const authType = Number(seriesList.filter((item: any) => item.value == i.value)[0].all);
+            return {
+              brandId: brand.value,
+              brandName: brand.label,
+              seriesId: i.value,
+              seriesName: i.label,
+              spec: [],
+              authType,
+            };
+          });
+          const newData = savaData.concat(params);
+          setSavadata([...newData]);
+          onChange && onChange(newData);
+          setVisible(false);
+          return;
+        }
         const _specs =
           spec &&
           spec.map((item: Item) => ({
@@ -69,13 +95,13 @@ export default function Index({ onChange, value, readonly, carSelectApi }: Props
         const params = {
           brandId: brand.value,
           brandName: brand.label,
-          seriesId: series.value,
-          seriesName: series.label,
+          seriesId: series[0].value,
+          seriesName: series[0].label,
           spec: _specs,
           authType: type,
         };
         // 编辑
-        if (savaData.some((i) => i.seriesId === series.value)) {
+        if (savaData.some((i) => i.seriesId === series[0].value)) {
           const tempData = savaData.map((item: any) => (item.seriesId === currentItem.seriesId ? params : item));
           setSavadata([...tempData]);
           onChange && onChange(tempData);
@@ -101,7 +127,7 @@ export default function Index({ onChange, value, readonly, carSelectApi }: Props
     form.setFieldsValue({
       ...record,
       brand: { value: record.brandId, label: record.brandName },
-      series: { value: record.seriesId, label: record.seriesName },
+      series: record.seriesId ? [{ value: record.seriesId, label: record.seriesName }] : undefined,
       spec: record.spec && record.spec.map((i) => ({ value: i.specId, label: i.specName })),
       type: Number(!!record.authType),
     });
@@ -153,8 +179,10 @@ export default function Index({ onChange, value, readonly, carSelectApi }: Props
             render={(_, record: any) =>
               record.spec && record.spec.length ? (
                 <TextWithMore title="车型" dataIndex="specName" list={record.spec} />
-              ) : (
+              ) : record.authType ? (
                 <Tag>全部车型</Tag>
+              ) : (
+                <Tag color="red">部分车型</Tag>
               )
             }
           />
@@ -177,6 +205,12 @@ export default function Index({ onChange, value, readonly, carSelectApi }: Props
             />
           )}
         </Table>
+        {errTips ? (
+          <>
+            <ExclamationCircleOutlined rev={undefined} color="#999" />
+            <span style={{ color: 'red', paddingLeft: 5 }}>存在部分车型，请添加限制车型范围数据</span>
+          </>
+        ) : null}
       </Card>
  
       {/* 选择品牌和车系 */}
@@ -203,7 +237,7 @@ export default function Index({ onChange, value, readonly, carSelectApi }: Props
                 form.resetFields(['series']);
                 const selectedSeries = savaData.map((item: { seriesId: number }) => item.seriesId);
                 const tempData = carList?.filter((item) => item.value === v.value);
-                setSeries(tempData.length ? tempData[0].children.filter((i: any) => !selectedSeries.includes(i.value)) : []);
+                setSeriesList(tempData.length ? tempData[0].children.filter((i: any) => !selectedSeries.includes(i.value)) : []);
               }}
             >
               {carList.map((item) => (
@@ -214,11 +248,12 @@ export default function Index({ onChange, value, readonly, carSelectApi }: Props
             </Select>
           </Form.Item>
           <Form.Item label="车系" name="series" rules={[{ required: true, message: '请选择车系' }]}>
-            <Select
+            {/* <Select
               labelInValue
               disabled={!!currentItem.brandId}
               placeholder="请选择车系"
               allowClear
+              mode="multiple"
               onChange={(v) => {
                 form.resetFields(['spec']);
                 const tempData = series?.filter((item: { value: number }) => item.value === v.value);
@@ -228,39 +263,55 @@ export default function Index({ onChange, value, readonly, carSelectApi }: Props
                 setAuthType(tempData[0].all != null ? !!tempData[0].all : true);
               }}
             >
-              {series.map((item: any) => (
+              {seriesList.map((item: any) => (
                 <Option value={item.value} key={item.value}>
                   {item.label}
                 </Option>
               ))}
-            </Select>
-          </Form.Item>
-          <Form.Item label="车型范围" name="type" rules={[{ required: true, message: '请选择' }]}>
-            <Radio.Group disabled={readonly || !authType}>
-              <Radio value={1}>全部</Radio>
-              <Radio value={0}>部分</Radio>
-            </Radio.Group>
-          </Form.Item>
-          <Form.Item noStyle shouldUpdate={(prevValues, currentValues) => prevValues.type != currentValues.type}>
-            {({ getFieldValue }): any => {
-              const type = getFieldValue('type');
-              if (!type) {
-                return (
-                  <Form.Item label="车型" name="spec" rules={[{ required: true, message: '请选择车型' }]}>
-                    <SelectorWithFull
-                      data={specList}
-                      allowClear
-                      labelInValue
-                      multiple
-                      showSearch
-                      fieldKeyNames={{ keyName: 'value', valueName: 'value', labelName: 'label' }}
-                      treeNodeFilterProp="label"
-                    />
-                  </Form.Item>
-                );
-              }
-            }}
+            </Select> */}
+
+            <SelectorWithFull
+              data={seriesList && seriesList.map((item: any) => ({ ...item, children: undefined }))}
+              allowClear
+              labelInValue
+              multiple
+              showSearch
+              disabled={!!currentItem.brandId}
+              placeholder="请选择车系"
+              fieldKeyNames={{ keyName: 'value', valueName: 'value', labelName: 'label' }}
+              treeNodeFilterProp="label"
+            />
           </Form.Item>
+          {currentItem.brandId ? (
+            <>
+              <Form.Item label="车型范围" name="type" rules={[{ required: true, message: '请选择' }]}>
+                <Radio.Group disabled={readonly || !authType}>
+                  <Radio value={1}>全部</Radio>
+                  <Radio value={0}>部分</Radio>
+                </Radio.Group>
+              </Form.Item>
+              <Form.Item noStyle shouldUpdate={(prevValues, currentValues) => prevValues.type != currentValues.type}>
+                {({ getFieldValue }): any => {
+                  const type = getFieldValue('type');
+                  if (!type) {
+                    return (
+                      <Form.Item label="车型" name="spec" rules={[{ required: true, message: '请选择车型' }]}>
+                        <SelectorWithFull
+                          data={specList}
+                          allowClear
+                          labelInValue
+                          multiple
+                          showSearch
+                          fieldKeyNames={{ keyName: 'value', valueName: 'value', labelName: 'label' }}
+                          treeNodeFilterProp="label"
+                        />
+                      </Form.Item>
+                    );
+                  }
+                }}
+              </Form.Item>
+            </>
+          ) : null}
         </Form>
       </Modal>
     </>