From bdad4eb5d7ff3f9455e5ed25e8a4802cbfe07e80 Mon Sep 17 00:00:00 2001
From: Shinner <shinner@ShinnerdeMacBook-Pro.local>
Date: Mon, 22 May 2023 18:06:06 +0800
Subject: [PATCH] 调试自动分配接口

---
 src/pages/order3/SaleTask/api.ts                            |  23 ++++++++++++++++++++++-
 src/pages/order3/SaleTask/components/SaleTaskAutoAssign.tsx | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/pages/order3/SaleTask/components/SaleTaskBatchSet.tsx   | 235 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/pages/order3/SaleTask/components/index.less             |   4 ++++
 src/pages/order3/SaleTask/index.tsx                         | 296 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------
 src/pages/order3/SaleTask/subpages/TaskEdit/index.tsx       |   7 ++++---
 6 files changed, 740 insertions(+), 99 deletions(-)
 create mode 100644 src/pages/order3/SaleTask/components/SaleTaskAutoAssign.tsx
 create mode 100644 src/pages/order3/SaleTask/components/SaleTaskBatchSet.tsx
 create mode 100644 src/pages/order3/SaleTask/components/index.less

diff --git a/src/pages/order3/SaleTask/api.ts b/src/pages/order3/SaleTask/api.ts
index 6585a71..6c3b985 100644
--- a/src/pages/order3/SaleTask/api.ts
+++ b/src/pages/order3/SaleTask/api.ts
@@ -109,6 +109,25 @@ export function submitSaleTask(params: { id: number }): PromiseResp<boolean> {
   return request.post(`${ORDER3_HOST}/erp/sales/task/submit`, params);
 }
 
+export interface AutoAssignItem {
+  shopId: number;
+  taskCount: number;
+  newEnergyTaskCount: number;
+  fuelVehicleTaskCount: number;
+  tackCarTaskCount: number;
+}
+
+export interface AutoAssignSaleTaskReq {
+  id: number;
+  assignTask: boolean;
+  shopTaskList: AutoAssignItem[];
+}
+
+/** 自动分配零售任务 */
+export function autoAssignSaleTask(params: AutoAssignSaleTaskReq): PromiseResp<boolean> {
+  return request.post(`${ORDER3_HOST}/erp/sales/task/auto/assign`, params);
+}
+
 export interface BrandItem {
   id: number;
   initial: string;
@@ -188,7 +207,9 @@ export interface PreviewTaskRes {
 }
 
 /** 预览任务 */
-export function previewTask(params: PreviewTaskReq): PromiseResp<PreviewTaskRes> {
+export function previewTask(
+  params: PreviewTaskReq
+): PromiseResp<PreviewTaskRes> {
   return request.get(`${ORDER3_HOST}/erp/sales/task/approve/info`, {
     params,
   });
diff --git a/src/pages/order3/SaleTask/components/SaleTaskAutoAssign.tsx b/src/pages/order3/SaleTask/components/SaleTaskAutoAssign.tsx
new file mode 100644
index 0000000..72b27cc
--- /dev/null
+++ b/src/pages/order3/SaleTask/components/SaleTaskAutoAssign.tsx
@@ -0,0 +1,274 @@
+import React, { useContext, useEffect, useRef, useState } from "react";
+import {
+  Table,
+  Form,
+  InputRef,
+  Input,
+  Row,
+  Button,
+  message,
+  Modal,
+  InputNumber,
+} from "antd";
+import type { FormInstance } from "antd/es/form";
+import * as API from "../api";
+import styles from "./index.less";
+import { MAX_NUM } from "../entity";
+
+type EditableTableProps = Parameters<typeof Table>[0];
+type ColumnTypes = Exclude<EditableTableProps["columns"], undefined>;
+interface Item {
+  id: string;
+  shopName: string;
+  taskCount: number;
+  newEnergyTaskCount: number;
+  fuelVehicleTaskCount: number;
+  tackCarTaskCount: number;
+}
+interface EditableRowProps {
+  index: number;
+}
+interface EditableCellProps {
+  title: React.ReactNode;
+  editable: boolean;
+  children: React.ReactNode;
+  dataIndex: keyof Item;
+  record: Item;
+  handleSave: (record: Item) => void;
+}
+
+const defaultColumns: (ColumnTypes[number] & {
+  editable?: boolean;
+  dataIndex: string;
+})[] = [
+  {
+    title: "门店",
+    dataIndex: "shopName",
+    editable: false,
+  },
+  {
+    title: "零售任务(台)",
+    dataIndex: "taskCount",
+    editable: true,
+  },
+  {
+    title: "新能源车任务(台)",
+    dataIndex: "newEnergyTaskCount",
+    editable: true,
+  },
+  {
+    title: "传统燃油车任务(台)",
+    dataIndex: "fuelVehicleTaskCount",
+    editable: false,
+  },
+  {
+    title: "攻坚车任务数(台)",
+    dataIndex: "tackCarTaskCount",
+    editable: true,
+  },
+];
+
+interface SaleTaskAutoAssignProps {
+  id: number;
+  value?: API.ShopTaskItem[];
+  onCancel: () => void;
+}
+
+export default function SaleTaskAutoAssign({
+  id,
+  value,
+  onCancel,
+}: SaleTaskAutoAssignProps) {
+  const EditableContext = React.createContext<FormInstance<any> | null>(null);
+  const [dataSource, setDataSource] = useState<API.ShopTaskItem[]>([]);
+
+  useEffect(() => {
+    setDataSource(value ? [...value] : []);
+  }, [value]);
+
+  const EditableRow: React.FC<EditableRowProps> = ({ index, ...props }) => {
+    const [form] = Form.useForm();
+    return (
+      <Form form={form} component={false}>
+        <EditableContext.Provider value={form}>
+          <tr {...props} />
+        </EditableContext.Provider>
+      </Form>
+    );
+  };
+
+  const EditableCell: React.FC<EditableCellProps> = ({
+    title,
+    editable,
+    children,
+    dataIndex,
+    record,
+    handleSave,
+    ...restProps
+  }) => {
+    const [editing, setEditing] = useState(false);
+    const inputRef = useRef<InputRef>(null);
+    const form = useContext(EditableContext)!;
+
+    useEffect(() => {
+      if (editing) {
+        inputRef.current!.focus();
+      }
+    }, [editing]);
+
+    const toggleEdit = () => {
+      setEditing(!editing);
+      form.setFieldsValue({ [dataIndex]: record[dataIndex] });
+    };
+
+    const save = async () => {
+      try {
+        const values = await form.validateFields();
+        toggleEdit();
+        handleSave({ ...record, ...values });
+      } catch (errInfo) {
+        console.log("Save failed:", errInfo);
+      }
+    };
+
+    let childNode = children;
+
+    if (editable) {
+      childNode = editing ? (
+        <Form.Item
+          noStyle
+          name={dataIndex}
+          rules={[
+            {
+              required: true,
+              message: `请输入${title}`,
+            },
+          ]}
+        >
+          <InputNumber
+            ref={inputRef}
+            min={0}
+            max={MAX_NUM}
+            style={{ width: "80px" }}
+            onPressEnter={save}
+            onBlur={save}
+          />
+        </Form.Item>
+      ) : (
+        <div className="editable-cell-value-wrap" onClick={toggleEdit}>
+          {children}
+        </div>
+      );
+    }
+
+    return <td {...restProps}>{childNode}</td>;
+  };
+
+  const handleSave = (row: API.ShopTaskItem) => {
+    const newData = [...dataSource];
+    const index = newData.findIndex((item) => row.id === item.id);
+    const item = newData[index];
+    if (row.taskCount !== 0 && row.newEnergyTaskCount > row.taskCount) {
+      message.warn("新能源车任务台数不得超过零售任务台数");
+      return;
+    }
+    const newRow = {
+      ...item,
+      ...row,
+      fuelVehicleTaskCount: row.taskCount - row.newEnergyTaskCount,
+    };
+    if (row.taskCount === 0) {
+      newRow.taskCount = 0;
+      newRow.newEnergyTaskCount = 0;
+      newRow.fuelVehicleTaskCount = 0;
+    }
+    newData.splice(index, 1, newRow);
+    console.log("handleSave newData", newData);
+    setDataSource(newData);
+  };
+
+  const autoAssignSaleTask = (isAssignToAdviser: boolean) => {
+    Modal.confirm({
+      title: isAssignToAdviser
+        ? "确认分配到门店和顾问吗？"
+        : "确认分配到门店吗？",
+      zIndex: 1002,
+      onOk: async () => {
+        const hide = message.loading("分配中，请稍候", 0);
+        API.autoAssignSaleTask({
+          id,
+          shopTaskList: dataSource.map((item) => ({
+            shopId: item.shopId,
+            taskCount: item.taskCount,
+            newEnergyTaskCount: item.newEnergyTaskCount,
+            fuelVehicleTaskCount: item.fuelVehicleTaskCount,
+            tackCarTaskCount: item.tackCarTaskCount,
+          })),
+          assignTask: isAssignToAdviser,
+        })
+          .then((res) => {
+            message.success("分配成功");
+          })
+          .catch((error: any) => {
+            message.error(error.message ?? "请求失败");
+          })
+          .finally(() => {
+            hide();
+          });
+      },
+    });
+  };
+
+  const components = {
+    body: {
+      row: EditableRow,
+      cell: EditableCell,
+    },
+  };
+
+  const columns = defaultColumns.map((col) => {
+    if (!col.editable) {
+      return col;
+    }
+    return {
+      ...col,
+      onCell: (record: API.ShopTaskItem) => ({
+        record,
+        editable: col.editable,
+        dataIndex: col.dataIndex,
+        title: col.title,
+        handleSave,
+      }),
+    };
+  });
+
+  return (
+    <>
+      <Table
+        components={components}
+        rowClassName={() => "editable-row"}
+        bordered
+        rowKey="id"
+        dataSource={dataSource}
+        columns={columns as ColumnTypes}
+      />
+      <Row align="middle" justify="center" style={{ marginTop: 20 }}>
+        <Button onClick={onCancel}>取消</Button>
+        <Button
+          type="primary"
+          style={{ marginLeft: 10 }}
+          onClick={() => autoAssignSaleTask(false)}
+        >
+          分配到门店
+        </Button>
+        <Button
+          type="primary"
+          style={{ marginLeft: 10 }}
+          onClick={() => autoAssignSaleTask(true)}
+        >
+          分配到门店和顾问
+        </Button>
+      </Row>
+    </>
+  );
+}
diff --git a/src/pages/order3/SaleTask/components/SaleTaskBatchSet.tsx b/src/pages/order3/SaleTask/components/SaleTaskBatchSet.tsx
new file mode 100644
index 0000000..90e73a0
--- /dev/null
+++ b/src/pages/order3/SaleTask/components/SaleTaskBatchSet.tsx
@@ -0,0 +1,235 @@
+import { PlusOutlined } from "@ant-design/icons";
+import { Button, Card, Col, Form, InputNumber, Row, Select } from "antd";
+import styles from "./index.less";
+import React from "react";
+import { MAX_NUM } from "../entity";
+
+export default function SaleTaskBatchSet() {
+  const [form] = Form.useForm();
+
+  const assignToShop = async () => {
+    await form.validateFields();
+    const values = form.getFieldsValue();
+    console.log(values);
+  };
+
+  const assignToBoth = async () => {
+    await form.validateFields();
+    const values = form.getFieldsValue();
+    console.log(values);
+  };
+
+  return (
+    <Form form={form} name="sale-task-batch-set-form" autoComplete="off">
+      <Form.List name="vehicleGrossProfitTask">
+        {(fields, { add, remove }) => (
+          <Card>
+            <Row
+              align="middle"
+              justify="space-between"
+              style={{ marginBottom: 15 }}
+            >
+              <h4 className={styles.title}>单车毛利任务</h4>
+              <Button type="link" onClick={() => add()} icon={<PlusOutlined />}>
+                新增
+              </Button>
+            </Row>
+            {fields.map(({ key, name, ...restField }) => (
+              <Row gutter={16} key={key}>
+                <Col className="gutter-row" span={6}>
+                  <Form.Item
+                    {...restField}
+                    name={[name, "vehicleGrossProfitTask"]}
+                    rules={[{ required: true, message: "请填写单车毛利任务" }]}
+                  >
+                    <InputNumber
+                      formatter={(value) => `${value}元`}
+                      parser={(value: any) => value.replace("元", "")}
+                      min={0}
+                      max={MAX_NUM}
+                      style={{ width: "100%" }}
+                      precision={2}
+                      placeholder="请填写单车毛利任务"
+                    />
+                  </Form.Item>
+                </Col>
+                <Col className="gutter-row" span={15}>
+                  <Form.Item
+                    {...restField}
+                    name={[name, "shop"]}
+                    rules={[{ required: true, message: "请选择适用门店" }]}
+                  >
+                    <Select
+                      showSearch
+                      allowClear
+                      labelInValue
+                      loading={false}
+                      placeholder="请选择适用门店"
+                      style={{ width: "100%" }}
+                      fieldNames={{ value: "id", label: "name" }}
+                      options={[]}
+                    />
+                  </Form.Item>
+                </Col>
+                <Col className="gutter-row" span={3}>
+                  <Button
+                    type="link"
+                    style={{ color: "#999" }}
+                    onClick={() => remove(name)}
+                  >
+                    删除
+                  </Button>
+                </Col>
+              </Row>
+            ))}
+          </Card>
+        )}
+      </Form.List>
+      <Form.List name="testDriveTaskCount">
+        {(fields, { add, remove }) => (
+          <Card style={{ marginTop: 20 }}>
+            <Row
+              align="middle"
+              justify="space-between"
+              style={{ marginBottom: 15 }}
+            >
+              <h4 className={styles.title}>首客试驾成交</h4>
+              <Button type="link" onClick={() => add()} icon={<PlusOutlined />}>
+                新增
+              </Button>
+            </Row>
+            {fields.map(({ key, name, ...restField }) => (
+              <Row gutter={16} key={key}>
+                <Col className="gutter-row" span={6}>
+                  <Form.Item
+                    {...restField}
+                    name={[name, "testDriveTaskCount"]}
+                    rules={[{ required: true, message: "请填写首客试驾成交" }]}
+                  >
+                    <InputNumber
+                      formatter={(value) => `${value}台`}
+                      parser={(value: any) => value.replace("台", "")}
+                      min={0}
+                      max={MAX_NUM}
+                      style={{ width: "100%" }}
+                      precision={0}
+                      placeholder="请填写首客试驾成交"
+                    />
+                  </Form.Item>
+                </Col>
+                <Col className="gutter-row" span={15}>
+                  <Form.Item
+                    {...restField}
+                    name={[name, "shop"]}
+                    rules={[{ required: true, message: "请选择适用门店" }]}
+                  >
+                    <Select
+                      showSearch
+                      allowClear
+                      labelInValue
+                      loading={false}
+                      placeholder="请选择适用门店"
+                      style={{ width: "100%" }}
+                      fieldNames={{ value: "id", label: "name" }}
+                      options={[]}
+                    />
+                  </Form.Item>
+                </Col>
+                <Col className="gutter-row" span={3}>
+                  <Button
+                    type="link"
+                    style={{ color: "#999" }}
+                    onClick={() => remove(name)}
+                  >
+                    删除
+                  </Button>
+                </Col>
+              </Row>
+            ))}
+          </Card>
+        )}
+      </Form.List>
+      <Form.List name="tackCarTaskCount">
+        {(fields, { add, remove }) => (
+          <Card style={{ marginTop: 20 }}>
+            <Row
+              align="middle"
+              justify="space-between"
+              style={{ marginBottom: 15 }}
+            >
+              <h4 className={styles.title}>攻坚车任务</h4>
+              <Button type="link" onClick={() => add()} icon={<PlusOutlined />}>
+                新增
+              </Button>
+            </Row>
+            {fields.map(({ key, name, ...restField }) => (
+              <Row gutter={16} key={key}>
+                <Col className="gutter-row" span={6}>
+                  <Form.Item
+                    {...restField}
+                    name={[name, "tackCarTaskCount"]}
+                    rules={[{ required: true, message: "请填写攻坚车任务" }]}
+                  >
+                    <InputNumber
+                      formatter={(value) => `${value}台`}
+                      parser={(value: any) => value.replace("台", "")}
+                      min={0}
+                      max={MAX_NUM}
+                      style={{ width: "100%" }}
+                      precision={0}
+                      placeholder="请填写攻坚车任务"
+                    />
+                  </Form.Item>
+                </Col>
+                <Col className="gutter-row" span={15}>
+                  <Form.Item
+                    {...restField}
+                    name={[name, "shop"]}
+                    rules={[{ required: true, message: "请选择适用门店" }]}
+                  >
+                    <Select
+                      showSearch
+                      allowClear
+                      labelInValue
+                      loading={false}
+                      placeholder="请选择适用门店"
+                      style={{ width: "100%" }}
+                      fieldNames={{ value: "id", label: "name" }}
+                      options={[]}
+                    />
+                  </Form.Item>
+                </Col>
+                <Col className="gutter-row" span={3}>
+                  <Button
+                    type="link"
+                    style={{ color: "#999" }}
+                    onClick={() => remove(name)}
+                  >
+                    删除
+                  </Button>
+                </Col>
+              </Row>
+            ))}
+          </Card>
+        )}
+      </Form.List>
+      <Row align="middle" justify="center" style={{ marginTop: 20 }}>
+        <Button onClick={() => {}}>取消</Button>
+        <Button
+          type="primary"
+          style={{ marginLeft: 10 }}
+          onClick={assignToShop}
+        >
+          分配到门店
+        </Button>
+        <Button
+          type="primary"
+          style={{ marginLeft: 10 }}
+          onClick={assignToBoth}
+        >
+          分配到门店和顾问
+        </Button>
+      </Row>
+    </Form>
+  );
+}
diff --git a/src/pages/order3/SaleTask/components/index.less b/src/pages/order3/SaleTask/components/index.less
new file mode 100644
index 0000000..1901cb5
--- /dev/null
+++ b/src/pages/order3/SaleTask/components/index.less
@@ -0,0 +1,4 @@
+.editable-row:hover .editableCellValueWrap {
+    // box-shadow: 0 0 0 1px #d9d9d9;
+    background-color: #eee;
+} 
\ No newline at end of file
diff --git a/src/pages/order3/SaleTask/index.tsx b/src/pages/order3/SaleTask/index.tsx
index 15b5444..0e5b83c 100644
--- a/src/pages/order3/SaleTask/index.tsx
+++ b/src/pages/order3/SaleTask/index.tsx
@@ -15,12 +15,14 @@ import { history } from "umi";
 import moment, { Moment } from "moment";
 import useInitial from "@/hooks/useInitail";
 import { Provider, useStore } from "./store";
-import { default as ApprovalProgressModal } from "@/pages/stock/AdvanceProgress/components/ApproveModal";
+import ApprovalProgressModal from "@/pages/stock/AdvanceProgress/components/ApproveModal";
 import EntryTaskPreview from "./components/EntryTaskPreview";
 import { OrderTaskApprovalType } from "./entity";
 import AdviserTaskPreview from "./components/AdviserTaskPreview";
 import SeriesTaskPreview from "./components/SeriesTaskPreview";
 import ApproveModal from "@/pages/order3/Common/ApproveModal";
+import SaleTaskAutoAssign from "./components/SaleTaskAutoAssign";
+import SaleTaskBatchSet from "./components/SaleTaskBatchSet";
 
 const { Column } = Table;
 
@@ -42,6 +44,9 @@ function SaleTaskList() {
   const [stpVisible, setStpVisible] = useState(false);
   const [seriesTaskParams, setSeriesTaskParams] = useState({});
 
+  const [autoVisible, setAutoVisible] = useState(false);
+  const [batchVisible, setBatchVisible] = useState(false);
+
   const { data, loading, setParams } = useInitial(
     API.getSaleTaskApi,
     {} as API.GetSaleTaskApiRes,
@@ -71,6 +76,19 @@ function SaleTaskList() {
     });
   };
 
+  // 查看销顾任务
+  const goToAdviserPage = (record: API.ShopTaskItem) => {
+    history.push({
+      pathname: "/order3/saleTask/edit",
+      query: {
+        readOnly: isReadOnly ? "1" : "0",
+        shopId: String(record.shopId),
+        taskDate: String(targetMonth.valueOf()),
+        currTab: "2",
+      },
+    });
+  };
+
   // 查看流程进度
   const viewProcess = () => {
     setApprove({
@@ -128,26 +146,122 @@ function SaleTaskList() {
     setEtpVisible(true);
   };
 
+  // 销顾任务
+  const showAdviserModal = (
+    record: API.TaskListItem,
+    type: OrderTaskApprovalType
+  ) => {
+    const params: any = {
+      id: data.id,
+      taskId: record.id,
+      orderTaskApprovalType: OrderTaskApprovalType.门店维度, // 只有门店有查看销顾任务
+    };
+    switch (type) {
+      case OrderTaskApprovalType.门店维度:
+        params.shopId = record.dataId;
+        break;
+      case OrderTaskApprovalType.销售顾问维度:
+        params.staffId = record.dataId;
+        break;
+      case OrderTaskApprovalType.新车一级管理维度:
+        params.firstManageId = record.dataId;
+        break;
+      case OrderTaskApprovalType.新车二级管理维度:
+        params.secondManageId = record.dataId;
+        break;
+      case OrderTaskApprovalType.新车三级管理维度:
+        params.thirdManageId = record.dataId;
+        break;
+      default:
+        break;
+    }
+    setAdviserTaskParams(params);
+    setAtpVisible(true);
+  };
+
+  // 销顾任务--查看车系任务
+  const showSeriesModalByAdviser = (record: API.TaskListItem) => {
+    const params = { ...adviserTaskParams } as any;
+    params.taskId = record.id;
+    params.orderTaskApprovalType = OrderTaskApprovalType.车系;
+    params.staffId = record.dataId;
+    setSeriesTaskParams(params);
+    setStpVisible(true);
+  };
+
+  // 车系任务
+  const showSeriesModal = (
+    record: API.TaskListItem,
+    type: OrderTaskApprovalType
+  ) => {
+    const params: any = {
+      id: data.id,
+      taskId: record.id,
+      orderTaskApprovalType: OrderTaskApprovalType.车系,
+    };
+    switch (type) {
+      case OrderTaskApprovalType.门店维度:
+        params.shopId = record.dataId;
+        break;
+      case OrderTaskApprovalType.销售顾问维度:
+        params.staffId = record.dataId;
+        break;
+      case OrderTaskApprovalType.新车一级管理维度:
+        params.firstManageId = record.dataId;
+        break;
+      case OrderTaskApprovalType.新车二级管理维度:
+        params.secondManageId = record.dataId;
+        break;
+      case OrderTaskApprovalType.新车三级管理维度:
+        params.thirdManageId = record.dataId;
+        break;
+      default:
+        break;
+    }
+    setSeriesTaskParams(params);
+    setStpVisible(true);
+  };
+
   return (
     <PageHeaderWrapper title="零售任务分配">
       <Card>
-        <Row align="middle" justify="start" style={{ marginBottom: 20 }}>
-          <DatePicker
-            placeholder="月度"
-            style={{ width: 260 }}
-            picker="month"
-            value={targetMonth}
-            onChange={handleChangeMonth}
-            allowClear={false}
-          />
-          <Input.Search
-            allowClear
-            placeholder="门店名称"
-            style={{ width: 260, marginLeft: 15 }}
-            onSearch={(v) => {
-              setParams({ shopName: v }, true);
-            }}
-          />
+        <Row
+          align="middle"
+          justify="space-between"
+          style={{ marginBottom: 20 }}
+        >
+          <Row align="middle" justify="start" style={{ marginBottom: 20 }}>
+            <DatePicker
+              placeholder="月度"
+              style={{ width: 260 }}
+              picker="month"
+              value={targetMonth}
+              onChange={handleChangeMonth}
+              allowClear={false}
+            />
+            <Input.Search
+              allowClear
+              placeholder="门店名称"
+              style={{ width: 260, marginLeft: 15 }}
+              onSearch={(v) => {
+                setParams({ shopName: v }, true);
+              }}
+            />
+          </Row>
+          {!isReadOnly && (
+            <Row align="middle" justify="start" style={{ marginBottom: 20 }}>
+              <Button type="primary" onClick={() => setAutoVisible(true)}>
+                零售任务快捷分配
+              </Button>
+              <Button
+                type="primary"
+                style={{ marginLeft: 10 }}
+                onClick={() => setBatchVisible(true)}
+              >
+                批量设置
+              </Button>
+            </Row>
+          )}
         </Row>
         <Table
           rowKey="id"
@@ -168,34 +282,34 @@ function SaleTaskList() {
                     fontWeight: 500,
                   }}
                 >
-                  <Table.Summary.Cell align="left" index={1}>
-                    合计
-                  </Table.Summary.Cell>
-                  <Table.Summary.Cell align="left" index={2}>
+                  <Table.Summary.Cell index={1}>合计</Table.Summary.Cell>
+                  <Table.Summary.Cell index={2}>
                     {data.totalTaskCount}
                   </Table.Summary.Cell>
-                  <Table.Summary.Cell align="left" index={3}>
+                  <Table.Summary.Cell index={3}>
                     {data.newEnergyTaskCount}
                   </Table.Summary.Cell>
-                  <Table.Summary.Cell align="left" index={4}>
+                  <Table.Summary.Cell index={4}>
                     {data.fuelVehicleTaskCount}
                   </Table.Summary.Cell>
-                  <Table.Summary.Cell align="left" index={5}>
+                  <Table.Summary.Cell index={5} />
+                  <Table.Summary.Cell index={6}>
                     {data.vehicleGrossProfitTask}
                   </Table.Summary.Cell>
-                  <Table.Summary.Cell index={6}>
+                  <Table.Summary.Cell index={7}>
                     {data.clueDealTaskCount}
                   </Table.Summary.Cell>
-                  <Table.Summary.Cell index={7}>
+                  <Table.Summary.Cell index={8}>
                     {data.testDriveTaskCount}
                   </Table.Summary.Cell>
-                  <Table.Summary.Cell index={8}>
+                  <Table.Summary.Cell index={9}>
                     {data.tackCarTaskCount}
                   </Table.Summary.Cell>
-                  <Table.Summary.Cell index={9}>
+                  <Table.Summary.Cell index={10}>
                     {data.seriesTaskCount}
                   </Table.Summary.Cell>
-                  <Table.Summary.Cell index={10} />
+                  <Table.Summary.Cell index={11} />
+                  <Table.Summary.Cell index={12} />
                 </Table.Summary.Row>
               </Table.Summary>
             );
@@ -205,7 +319,16 @@ function SaleTaskList() {
           <Column title="零售任务(台)" dataIndex="taskCount" />
           <Column title="新能源车任务(台)" dataIndex="newEnergyTaskCount" />
           <Column title="传统燃油车任务(台)" dataIndex="fuelVehicleTaskCount" />
-          <Column title="车辆毛利任务(元)" dataIndex="vehicleGrossProfitTask" />
+          <Column title="单车毛利任务(元)" dataIndex="vehicleGrossProfitTask" />
+          <Column
+            title="合计(元)"
+            dataIndex="total"
+            render={(text: string, record: API.ShopTaskItem) => {
+              return (record.taskCount * record.vehicleGrossProfitTask).toFixed(
+                2
+              );
+            }}
+          />
           <Column title="线索到店零售台数(台)" dataIndex="clueDealTaskCount" />
           <Column
             title="首客试驾成交任务数(台)"
@@ -214,6 +337,20 @@ function SaleTaskList() {
           <Column title="攻坚车任务数(台)" dataIndex="tackCarTaskCount" />
           <Column title="车系任务数(台)" dataIndex="seriesTaskCount" />
           <Column
+            title="销顾任务"
+            render={(text: string, record: API.ShopTaskItem) => {
+              return (
+                <a
+                  onClick={() => {
+                    goToAdviserPage(record);
+                  }}
+                >
+                  查看
+                </a>
+              );
+            }}
+          />
+          <Column
             title="操作"
             render={(text: string, record: API.ShopTaskItem) => {
               return (
@@ -291,62 +428,8 @@ function SaleTaskList() {
         </Row>
         <EntryTaskPreview
           params={previewTaskParams}
-          showAdviserModal={(record, type) => {
-            const params: any = {
-              id: data.id,
-              taskId: record.id,
-              orderTaskApprovalType: OrderTaskApprovalType.门店维度, // 只有门店有查看销顾任务
-            };
-            switch (type) {
-              case OrderTaskApprovalType.门店维度:
-                params.shopId = record.dataId;
-                break;
-              case OrderTaskApprovalType.销售顾问维度:
-                params.staffId = record.dataId;
-                break;
-              case OrderTaskApprovalType.新车一级管理维度:
-                params.firstManageId = record.dataId;
-                break;
-              case OrderTaskApprovalType.新车二级管理维度:
-                params.secondManageId = record.dataId;
-                break;
-              case OrderTaskApprovalType.新车三级管理维度:
-                params.thirdManageId = record.dataId;
-                break;
-              default:
-                break;
-            }
-            setAdviserTaskParams(params);
-            setAtpVisible(true);
-          }}
-          showSeriesModal={(record, type) => {
-            const params: any = {
-              id: data.id,
-              taskId: record.id,
-              orderTaskApprovalType: OrderTaskApprovalType.车系,
-            };
-            switch (type) {
-              case OrderTaskApprovalType.门店维度:
-                params.shopId = record.dataId;
-                break;
-              case OrderTaskApprovalType.销售顾问维度:
-                params.staffId = record.dataId;
-                break;
-              case OrderTaskApprovalType.新车一级管理维度:
-                params.firstManageId = record.dataId;
-                break;
-              case OrderTaskApprovalType.新车二级管理维度:
-                params.secondManageId = record.dataId;
-                break;
-              case OrderTaskApprovalType.新车三级管理维度:
-                params.thirdManageId = record.dataId;
-                break;
-              default:
-                break;
-            }
-            setSeriesTaskParams(params);
-            setStpVisible(true);
-          }}
+          showAdviserModal={showAdviserModal}
+          showSeriesModal={showSeriesModal}
         />
       </Modal>
       <Modal
@@ -359,14 +442,7 @@ function SaleTaskList() {
       >
         <AdviserTaskPreview
           params={adviserTaskParams}
-          showSeriesModal={(record) => {
-            const params = { ...adviserTaskParams } as any;
-            params.taskId = record.id;
-            params.orderTaskApprovalType = OrderTaskApprovalType.车系;
-            params.staffId = record.dataId;
-            setSeriesTaskParams(params);
-            setStpVisible(true);
-          }}
+          showSeriesModal={showSeriesModalByAdviser}
         />
       </Modal>
       <Modal
@@ -379,6 +455,36 @@ function SaleTaskList() {
       >
         <SeriesTaskPreview params={seriesTaskParams} />
       </Modal>
+      <Modal
+        width={800}
+        title="零售任务快捷分配"
+        open={autoVisible}
+        onCancel={() => {
+          setAutoVisible(false);
+          setParams({}, true);
+        }}
+        destroyOnClose
+        footer={null}
+      >
+        <SaleTaskAutoAssign
+          id={data.id}
+          value={data.shopTaskList}
+          onCancel={() => {
+            setAutoVisible(false);
+            setParams({}, true);
+          }}
+        />
+      </Modal>
+      <Modal
+        width={800}
+        title="批量设置"
+        open={batchVisible}
+        onCancel={() => setBatchVisible(false)}
+        destroyOnClose
+        footer={null}
+      >
+        <SaleTaskBatchSet />
+      </Modal>
       <ApprovalProgressModal
         visible={approve.visible}
         orderNo={approve.orderNo}
diff --git a/src/pages/order3/SaleTask/subpages/TaskEdit/index.tsx b/src/pages/order3/SaleTask/subpages/TaskEdit/index.tsx
index 4be09e7..cc69659 100644
--- a/src/pages/order3/SaleTask/subpages/TaskEdit/index.tsx
+++ b/src/pages/order3/SaleTask/subpages/TaskEdit/index.tsx
@@ -20,8 +20,9 @@ function TaskEdit() {
   const readOnly = querys?.readOnly === "1";
   const shopId = querys?.shopId;
   const taskDate = querys?.taskDate;
+  const queryTab = querys?.currTab;
   const { shopTaskItem, setShopTaskItem, setIsReadOnly } = useStore();
-  const [currStep, setCurrStep] = useState("1");
+  const [currTab, setCurrTab] = useState(queryTab ?? "1");
   const [shopTaskForm] = Form.useForm();
 
   // 获取门店零售任务详情
@@ -46,8 +47,8 @@ function TaskEdit() {
         title={<span>当前选择门店：{shopTaskItem?.shopName}</span>}
       >
         <Tabs
-          defaultActiveKey={currStep}
-          onChange={(activeKey) => setCurrStep(activeKey)}
+          defaultActiveKey={currTab}
+          onChange={(activeKey) => setCurrTab(activeKey)}
           items={[
             {
               label: `门店任务分配${readOnly ? "详情" : ""}`,
--
libgit2 0.22.2