diff --git a/src/pages/order3/SaleTask/api.ts b/src/pages/order3/SaleTask/api.ts
index 6c3b985..f8397e5 100644
--- a/src/pages/order3/SaleTask/api.ts
+++ b/src/pages/order3/SaleTask/api.ts
@@ -124,10 +124,32 @@ export interface AutoAssignSaleTaskReq {
 }
 
 /** 自动分配零售任务 */
-export function autoAssignSaleTask(params: AutoAssignSaleTaskReq): PromiseResp<boolean> {
+export function autoAssignSaleTask(
+  params: AutoAssignSaleTaskReq
+): PromiseResp<boolean> {
   return request.post(`${ORDER3_HOST}/erp/sales/task/auto/assign`, params);
 }
 
+interface BatchSetSaleTaskItem {
+  shopIdList: number[];
+  taskAims: number;
+}
+
+export interface BatchSetSaleTaskReq {
+  grossProfitTaskList?: BatchSetSaleTaskItem[];
+  tackCarTaskList?: BatchSetSaleTaskItem[];
+  testDriveTaskList?: BatchSetSaleTaskItem[];
+  assignTask: boolean;
+  orderTaskApplyId: number;
+}
+
+/** 批量设置零售任务 */
+export function batchSetSaleTask(
+  params: BatchSetSaleTaskReq
+): PromiseResp<boolean> {
+  return request.post(`${ORDER3_HOST}/erp/sales/task/batch/shop/set`, params);
+}
+
 export interface BrandItem {
   id: number;
   initial: string;
diff --git a/src/pages/order3/SaleTask/components/SaleTaskAutoAssign.tsx b/src/pages/order3/SaleTask/components/SaleTaskAutoAssign.tsx
index faceb9c..ca4f7b7 100644
--- a/src/pages/order3/SaleTask/components/SaleTaskAutoAssign.tsx
+++ b/src/pages/order3/SaleTask/components/SaleTaskAutoAssign.tsx
@@ -74,17 +74,13 @@ interface SaleTaskAutoAssignProps {
   onRefresh: () => void;
 }
 
-export default function SaleTaskAutoAssign({
-  id,
-  value,
-  onRefresh,
-}: SaleTaskAutoAssignProps) {
+export default function SaleTaskAutoAssign(props: SaleTaskAutoAssignProps) {
   const EditableContext = React.createContext<FormInstance<any> | null>(null);
   const [dataSource, setDataSource] = useState<API.ShopTaskItem[]>([]);
 
   useEffect(() => {
-    setDataSource(value ? [...value] : []);
-  }, [value]);
+    setDataSource(props.value ? [...props.value] : []);
+  }, [props.value]);
 
   const EditableRow: React.FC<EditableRowProps> = ({ index, ...props }) => {
     const [form] = Form.useForm();
@@ -196,7 +192,7 @@ export default function SaleTaskAutoAssign({
       onOk: async () => {
         const hide = message.loading("分配中，请稍候", 0);
         API.autoAssignSaleTask({
-          id,
+          id: props.id,
           shopTaskList: dataSource.map((item) => ({
             shopId: item.shopId,
             taskCount: item.taskCount,
@@ -208,7 +204,7 @@ export default function SaleTaskAutoAssign({
         })
           .then((res) => {
             message.success("分配成功");
-            onRefresh();
+            props.onRefresh();
           })
           .catch((error: any) => {
             message.error(error.message ?? "请求失败");
@@ -254,7 +250,7 @@ export default function SaleTaskAutoAssign({
         columns={columns as ColumnTypes}
       />
       <Row align="middle" justify="center" style={{ marginTop: 20 }}>
-        <Button onClick={onRefresh}>取消</Button>
+        <Button onClick={props.onRefresh}>取消</Button>
         <Button
           type="primary"
           style={{ marginLeft: 10 }}
diff --git a/src/pages/order3/SaleTask/components/SaleTaskBatchSet.tsx b/src/pages/order3/SaleTask/components/SaleTaskBatchSet.tsx
index 90e73a0..8dcc0d4 100644
--- a/src/pages/order3/SaleTask/components/SaleTaskBatchSet.tsx
+++ b/src/pages/order3/SaleTask/components/SaleTaskBatchSet.tsx
@@ -1,27 +1,94 @@
 import { PlusOutlined } from "@ant-design/icons";
-import { Button, Card, Col, Form, InputNumber, Row, Select } from "antd";
+import {
+  Button,
+  Card,
+  Col,
+  Form,
+  InputNumber,
+  Modal,
+  Row,
+  message,
+} from "antd";
 import styles from "./index.less";
-import React from "react";
+import React, { useState } from "react";
 import { MAX_NUM } from "../entity";
+import * as API from "../api";
+import ShopSelectNew from "@/components/ShopSelectNew";
 
-export default function SaleTaskBatchSet() {
+interface SaleTaskBatchSetProps {
+  id: number;
+  onRefresh: () => void;
+}
+
+export default function SaleTaskBatchSet(props: SaleTaskBatchSetProps) {
   const [form] = Form.useForm();
+  // 过滤各项已经选择的门店
+  // const [selectedShopIds, setSelectedShopIds] = useState({
+  //   grossProfit: [],
+  //   tackCar: [],
+  //   testDrive: [],
+  // });
 
-  const assignToShop = async () => {
+  const batchSetSaleTask = async (isAssignToAdviser: boolean) => {
     await form.validateFields();
     const values = form.getFieldsValue();
-    console.log(values);
+    const newValues = {};
+    Array.from(Object.keys(values)).forEach((valueKey: any) => {
+      if (values[valueKey]) {
+        newValues[valueKey] = values[valueKey].map((valueItem: any) => ({
+          taskAims: valueItem.taskAims,
+          shopIdList: valueItem.shopIdList.map(
+            (shopItem: any) => shopItem.shopId
+          ),
+        }));
+      }
+    });
+    Modal.confirm({
+      title: isAssignToAdviser
+        ? "确认分配到门店和顾问吗？"
+        : "确认分配到门店吗？",
+      zIndex: 1002,
+      onOk: async () => {
+        const hide = message.loading("分配中，请稍候", 0);
+        API.batchSetSaleTask({
+          assignTask: isAssignToAdviser,
+          orderTaskApplyId: props.id,
+          ...newValues,
+        })
+          .then((res) => {
+            message.success("分配成功");
+            props.onRefresh();
+          })
+          .catch((error: any) => {
+            message.error(error.message ?? "请求失败");
+          })
+          .finally(() => {
+            hide();
+          });
+      },
+    });
   };
 
-  const assignToBoth = async () => {
-    await form.validateFields();
-    const values = form.getFieldsValue();
-    console.log(values);
-  };
+  // const handleFormChange = (changedValues: any) => {
+  //   const labelKey: any = Object.keys(changedValues)[0];
+  //   const list: any = Object.values(changedValues)[0];
+  //   console.log(list);
+  //   if (!list[0]) return;
+  //   if (Object.keys(list[0])[0] === "shopIdList") {
+  //     const newSelectedIds = { ...selectedShopIds };
+  //     newSelectedIds[labelKey] = Object.values(list[0])[0];
+  //     setSelectedShopIds(newSelectedIds);
+  //   }
+  // };
 
   return (
-    <Form form={form} name="sale-task-batch-set-form" autoComplete="off">
-      <Form.List name="vehicleGrossProfitTask">
+    <Form
+      form={form}
+      name="sale-task-batch-set-form"
+      autoComplete="off"
+      // onValuesChange={handleFormChange}
+    >
+      <Form.List name="grossProfitTaskList">
         {(fields, { add, remove }) => (
           <Card>
             <Row
@@ -39,7 +106,7 @@ export default function SaleTaskBatchSet() {
                 <Col className="gutter-row" span={6}>
                   <Form.Item
                     {...restField}
-                    name={[name, "vehicleGrossProfitTask"]}
+                    name={[name, "taskAims"]}
                     rules={[{ required: true, message: "请填写单车毛利任务" }]}
                   >
                     <InputNumber
@@ -56,18 +123,14 @@ export default function SaleTaskBatchSet() {
                 <Col className="gutter-row" span={15}>
                   <Form.Item
                     {...restField}
-                    name={[name, "shop"]}
+                    name={[name, "shopIdList"]}
                     rules={[{ required: true, message: "请选择适用门店" }]}
                   >
-                    <Select
-                      showSearch
-                      allowClear
-                      labelInValue
-                      loading={false}
+                    <ShopSelectNew
+                      multiple
+                      defaultOptions={{ bizTypes: "1" }}
                       placeholder="请选择适用门店"
-                      style={{ width: "100%" }}
-                      fieldNames={{ value: "id", label: "name" }}
-                      options={[]}
+                      // disabledShopIds={selectedShopIds.grossProfit}
                     />
                   </Form.Item>
                 </Col>
@@ -85,7 +148,7 @@ export default function SaleTaskBatchSet() {
           </Card>
         )}
       </Form.List>
-      <Form.List name="testDriveTaskCount">
+      <Form.List name="testDriveTaskList">
         {(fields, { add, remove }) => (
           <Card style={{ marginTop: 20 }}>
             <Row
@@ -103,7 +166,7 @@ export default function SaleTaskBatchSet() {
                 <Col className="gutter-row" span={6}>
                   <Form.Item
                     {...restField}
-                    name={[name, "testDriveTaskCount"]}
+                    name={[name, "taskAims"]}
                     rules={[{ required: true, message: "请填写首客试驾成交" }]}
                   >
                     <InputNumber
@@ -120,18 +183,14 @@ export default function SaleTaskBatchSet() {
                 <Col className="gutter-row" span={15}>
                   <Form.Item
                     {...restField}
-                    name={[name, "shop"]}
+                    name={[name, "shopIdList"]}
                     rules={[{ required: true, message: "请选择适用门店" }]}
                   >
-                    <Select
-                      showSearch
-                      allowClear
-                      labelInValue
-                      loading={false}
+                    <ShopSelectNew
+                      multiple
+                      defaultOptions={{ bizTypes: "1" }}
                       placeholder="请选择适用门店"
-                      style={{ width: "100%" }}
-                      fieldNames={{ value: "id", label: "name" }}
-                      options={[]}
+                      // disabledShopIds={selectedShopIds.testDrive}
                     />
                   </Form.Item>
                 </Col>
@@ -149,7 +208,7 @@ export default function SaleTaskBatchSet() {
           </Card>
         )}
       </Form.List>
-      <Form.List name="tackCarTaskCount">
+      <Form.List name="tackCarTaskList">
         {(fields, { add, remove }) => (
           <Card style={{ marginTop: 20 }}>
             <Row
@@ -167,7 +226,7 @@ export default function SaleTaskBatchSet() {
                 <Col className="gutter-row" span={6}>
                   <Form.Item
                     {...restField}
-                    name={[name, "tackCarTaskCount"]}
+                    name={[name, "taskAims"]}
                     rules={[{ required: true, message: "请填写攻坚车任务" }]}
                   >
                     <InputNumber
@@ -184,18 +243,14 @@ export default function SaleTaskBatchSet() {
                 <Col className="gutter-row" span={15}>
                   <Form.Item
                     {...restField}
-                    name={[name, "shop"]}
+                    name={[name, "shopIdList"]}
                     rules={[{ required: true, message: "请选择适用门店" }]}
                   >
-                    <Select
-                      showSearch
-                      allowClear
-                      labelInValue
-                      loading={false}
+                    <ShopSelectNew
+                      multiple
+                      defaultOptions={{ bizTypes: "1" }}
                       placeholder="请选择适用门店"
-                      style={{ width: "100%" }}
-                      fieldNames={{ value: "id", label: "name" }}
-                      options={[]}
+                      // disabledShopIds={selectedShopIds.tackCar}
                     />
                   </Form.Item>
                 </Col>
@@ -214,18 +269,18 @@ export default function SaleTaskBatchSet() {
         )}
       </Form.List>
       <Row align="middle" justify="center" style={{ marginTop: 20 }}>
-        <Button onClick={() => {}}>取消</Button>
+        <Button onClick={props.onRefresh}>取消</Button>
         <Button
           type="primary"
           style={{ marginLeft: 10 }}
-          onClick={assignToShop}
+          onClick={() => batchSetSaleTask(false)}
         >
           分配到门店
         </Button>
         <Button
           type="primary"
           style={{ marginLeft: 10 }}
-          onClick={assignToBoth}
+          onClick={() => batchSetSaleTask(true)}
         >
           分配到门店和顾问
         </Button>
diff --git a/src/pages/order3/SaleTask/index.tsx b/src/pages/order3/SaleTask/index.tsx
index 578a41a..0a2b30b 100644
--- a/src/pages/order3/SaleTask/index.tsx
+++ b/src/pages/order3/SaleTask/index.tsx
@@ -222,6 +222,15 @@ function SaleTaskList() {
     setStpVisible(true);
   };
 
+  const handleAutoAssignRefresh = () => {
+    setAutoVisible(false);
+    setParams({}, true);
+  };
+  const handleBatchSetRefresh = () => {
+    setBatchVisible(false);
+    setParams({}, true);
+  };
+
   return (
     <PageHeaderWrapper title="零售任务分配">
       <Card>
@@ -459,31 +468,27 @@ function SaleTaskList() {
         width={800}
         title="零售任务快捷分配"
         open={autoVisible}
-        onCancel={() => {
-          setAutoVisible(false);
-          setParams({}, true);
-        }}
+        onCancel={handleAutoAssignRefresh}
         destroyOnClose
         footer={null}
+        maskClosable={false}
       >
         <SaleTaskAutoAssign
           id={data.id}
           value={data.shopTaskList}
-          onRefresh={() => {
-            setAutoVisible(false);
-            setParams({}, true);
-          }}
+          onRefresh={handleAutoAssignRefresh}
         />
       </Modal>
       <Modal
         width={800}
         title="批量设置"
         open={batchVisible}
-        onCancel={() => setBatchVisible(false)}
+        onCancel={handleBatchSetRefresh}
         destroyOnClose
         footer={null}
+        maskClosable={false}
       >
-        <SaleTaskBatchSet />
+        <SaleTaskBatchSet id={data.id} onRefresh={handleBatchSetRefresh} />
       </Modal>
       <ApprovalProgressModal
         visible={approve.visible}