From 75f10597dabfc743bc50f1c54dd29baec65efa22 Mon Sep 17 00:00:00 2001
From: Shinner <shinner@ShinnerdeMacBook-Pro.local>
Date: Wed, 24 May 2023 18:01:16 +0800
Subject: [PATCH] 回刷页面

---
 src/pages/order3/SaleTask/api.ts                                           |  4 ++--
 src/pages/order3/SaleTask/components/EntryTaskPreview.tsx                  | 10 ++++------
 src/pages/order3/SaleTask/index.tsx                                        |  4 ++--
 src/pages/order3/SaleTask/subpages/TaskEdit/components/AdviserTask.tsx     | 15 +++++++++------
 src/pages/order3/SaleTask/subpages/TaskEdit/components/AdviserTaskEdit.tsx |  8 +-------
 src/pages/order3/SaleTask/subpages/TaskEdit/components/ShopTask.tsx        | 16 +++++++---------
 src/pages/order3/SaleTask/subpages/TaskEdit/index.tsx                      | 25 +++++++++++++++----------
 7 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/src/pages/order3/SaleTask/api.ts b/src/pages/order3/SaleTask/api.ts
index a1f868a..0cf9da6 100644
--- a/src/pages/order3/SaleTask/api.ts
+++ b/src/pages/order3/SaleTask/api.ts
@@ -84,8 +84,8 @@ export function getSaleTaskApi(
 }
 
 export interface GetShopSaleTaskReq {
-  shopId: number;
-  taskDate: number;
+  shopId?: number;
+  taskDate?: number;
 }
 
 /** 门店零售任务详情 */
diff --git a/src/pages/order3/SaleTask/components/EntryTaskPreview.tsx b/src/pages/order3/SaleTask/components/EntryTaskPreview.tsx
index 01c13d5..4e3ea1c 100644
--- a/src/pages/order3/SaleTask/components/EntryTaskPreview.tsx
+++ b/src/pages/order3/SaleTask/components/EntryTaskPreview.tsx
@@ -40,6 +40,7 @@ const EntryTaskPreview = ({
   showSeriesModal,
 }: EntryTaskPreviewProps) => {
   const [type, setType] = useState(OrderTaskApprovalType.门店维度);
+  const [keywords, setKeywords] = useState("");
 
   const { data, loading, setParams } = useInitial<
     API.PreviewTaskRes,
@@ -57,7 +58,7 @@ const EntryTaskPreview = ({
       return;
     }
     setType(value);
-    setParams({ orderTaskApprovalType: value }, true);
+    setParams({ orderTaskApprovalType: value, keywords }, true);
   };
 
   // 查看顾问任务
@@ -186,14 +187,11 @@ const EntryTaskPreview = ({
           allowClear
           placeholder="搜索门店或顾问"
           style={{ width: 263, marginLeft: 20 }}
+          value={keywords}
+          onChange={(e) => setKeywords(e.target.value)}
           onSearch={(v) => {
             setParams({ keywords: v }, true);
           }}
-          onBlur={(e) => {
-            if (e.target.value.trim() === "") {
-              setParams({ keywords: "" }, true);
-            }
-          }}
         />
       </Row>
       <Card
diff --git a/src/pages/order3/SaleTask/index.tsx b/src/pages/order3/SaleTask/index.tsx
index 7bdd967..23517c3 100644
--- a/src/pages/order3/SaleTask/index.tsx
+++ b/src/pages/order3/SaleTask/index.tsx
@@ -407,10 +407,10 @@ function SaleTaskList() {
                   <Table.Summary.Cell index={4}>
                     {data.fuelVehicleTaskCount}
                   </Table.Summary.Cell>
-                  <Table.Summary.Cell index={5}>-</Table.Summary.Cell>
-                  <Table.Summary.Cell index={6}>
+                  <Table.Summary.Cell index={5}>
                     {data.totalGrossProfitTask}
                   </Table.Summary.Cell>
+                  <Table.Summary.Cell index={6}>-</Table.Summary.Cell>
                   <Table.Summary.Cell index={7}>
                     {data.clueDealTaskCount}
                   </Table.Summary.Cell>
diff --git a/src/pages/order3/SaleTask/subpages/TaskEdit/components/AdviserTask.tsx b/src/pages/order3/SaleTask/subpages/TaskEdit/components/AdviserTask.tsx
index b901440..d17c381 100644
--- a/src/pages/order3/SaleTask/subpages/TaskEdit/components/AdviserTask.tsx
+++ b/src/pages/order3/SaleTask/subpages/TaskEdit/components/AdviserTask.tsx
@@ -13,9 +13,10 @@ interface AdviserTaskEditForm {
 
 interface AdviserTaskProps {
   form: any;
+  onRefresh: () => void;
 }
 
-export default function AdviserTask({ form }: AdviserTaskProps) {
+export default function AdviserTask({ form, onRefresh }: AdviserTaskProps) {
   const adviserTaskEditRef = useRef<AdviserTaskEditForm>(null);
   const {
     shopTaskItem,
@@ -47,6 +48,10 @@ export default function AdviserTask({ form }: AdviserTaskProps) {
 
   // 前端更新编辑后的顾问分配任务
   const onOk = () => {
+    if (isReadOnly) {
+      setVisible(false);
+      return;
+    }
     adviserTaskEditRef.current?.submit((newTask) => {
       setShopTaskItem(newTask);
       setAdvisersFiltered(newTask?.staffTaskList); // 刷新列表
@@ -65,6 +70,7 @@ export default function AdviserTask({ form }: AdviserTaskProps) {
       .run({ ...other, id: taskId, ...shopFormValue })
       .then(() => {
         message.success("保存草稿成功");
+        onRefresh();
       })
       .catch((error: any) => {
         message.error(error.message ?? "请求失败");
@@ -137,9 +143,6 @@ export default function AdviserTask({ form }: AdviserTaskProps) {
       width: 100,
       dataIndex: "seriesTaskCount",
     },
-  ];
-
-  const extraColumns: ColumnsType<API.StaffTaskItem> = [
     {
       title: "操作",
       render: (text: string, record: API.StaffTaskItem) => {
@@ -150,7 +153,7 @@ export default function AdviserTask({ form }: AdviserTaskProps) {
               setVisible(true);
             }}
           >
-            编辑
+            {isReadOnly ? "查看" : "编辑"}
           </a>
         );
       },
@@ -173,7 +176,7 @@ export default function AdviserTask({ form }: AdviserTaskProps) {
       </Row>
       <Table
         bordered
-        columns={isReadOnly ? columns : columns.concat(extraColumns)}
+        columns={columns}
         dataSource={[...advisersFiltered]}
         pagination={false}
         rowKey="id"
diff --git a/src/pages/order3/SaleTask/subpages/TaskEdit/components/AdviserTaskEdit.tsx b/src/pages/order3/SaleTask/subpages/TaskEdit/components/AdviserTaskEdit.tsx
index 6da6dab..d1343f7 100644
--- a/src/pages/order3/SaleTask/subpages/TaskEdit/components/AdviserTaskEdit.tsx
+++ b/src/pages/order3/SaleTask/subpages/TaskEdit/components/AdviserTaskEdit.tsx
@@ -124,6 +124,7 @@ function AdviserTaskEdit(props: AdviserTaskEditProps, ref: any) {
           form={form}
           initialValues={editAdviser}
           onFinish={onFinish}
+          disabled={isReadOnly}
         >
           <Form.Item name="taskCount" label="零售任务：" required>
             <InputNumber
@@ -132,7 +133,6 @@ function AdviserTaskEdit(props: AdviserTaskEditProps, ref: any) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={0}
             />
           </Form.Item>
@@ -164,7 +164,6 @@ function AdviserTaskEdit(props: AdviserTaskEditProps, ref: any) {
                     min={0}
                     max={MAX_NUM}
                     style={{ width: "100%" }}
-                    disabled={isReadOnly}
                     precision={2}
                   />
                 </Form.Item>
@@ -204,7 +203,6 @@ function AdviserTaskEdit(props: AdviserTaskEditProps, ref: any) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={0}
             />
           </Form.Item>
@@ -237,7 +235,6 @@ function AdviserTaskEdit(props: AdviserTaskEditProps, ref: any) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={0}
             />
           </Form.Item>
@@ -252,7 +249,6 @@ function AdviserTaskEdit(props: AdviserTaskEditProps, ref: any) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={2}
             />
           </Form.Item>
@@ -267,7 +263,6 @@ function AdviserTaskEdit(props: AdviserTaskEditProps, ref: any) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={0}
             />
           </Form.Item>
@@ -278,7 +273,6 @@ function AdviserTaskEdit(props: AdviserTaskEditProps, ref: any) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={0}
             />
           </Form.Item>
diff --git a/src/pages/order3/SaleTask/subpages/TaskEdit/components/ShopTask.tsx b/src/pages/order3/SaleTask/subpages/TaskEdit/components/ShopTask.tsx
index 236dc86..5cbf9be 100644
--- a/src/pages/order3/SaleTask/subpages/TaskEdit/components/ShopTask.tsx
+++ b/src/pages/order3/SaleTask/subpages/TaskEdit/components/ShopTask.tsx
@@ -19,14 +19,16 @@ import EditableCell from "./EditableCell";
 import SeriesModal from "./SeriesModal";
 import { history, useRequest } from "umi";
 import { MAX_NUM } from "../../../entity";
+import "../../../components/index.less";
 
 const { Column } = Table;
 
 interface ShopTaskProps {
   form: any;
+  onRefresh: () => void;
 }
 
-export default function ShopTask({ form }: ShopTaskProps) {
+export default function ShopTask({ form, onRefresh }: ShopTaskProps) {
   const {
     shopTaskItem,
     isReadOnly,
@@ -97,6 +99,7 @@ export default function ShopTask({ form }: ShopTaskProps) {
       .run({ ...other, ...values, id: taskId })
       .then(() => {
         message.success("保存草稿成功");
+        onRefresh();
       })
       .catch((error: any) => {
         message.error(error.message ?? "请求失败");
@@ -111,7 +114,7 @@ export default function ShopTask({ form }: ShopTaskProps) {
       title: (
         <span>
           确认分配到
-          <span className="tip">全部门店和顾问</span>
+          <span className="tip">此门店和顾问</span>
           吗？
         </span>
       ),
@@ -127,6 +130,7 @@ export default function ShopTask({ form }: ShopTaskProps) {
         })
           .then((res) => {
             message.success("分配成功");
+            onRefresh();
           })
           .catch((error: any) => {
             message.error(error.message ?? "请求失败");
@@ -157,6 +161,7 @@ export default function ShopTask({ form }: ShopTaskProps) {
           labelAlign="left"
           form={form}
           initialValues={shopTaskItem!}
+          disabled={isReadOnly}
         >
           <Form.Item name="taskCount" label="零售任务：" required>
             <InputNumber
@@ -165,7 +170,6 @@ export default function ShopTask({ form }: ShopTaskProps) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={0}
             />
           </Form.Item>
@@ -197,7 +201,6 @@ export default function ShopTask({ form }: ShopTaskProps) {
                     min={0}
                     max={MAX_NUM}
                     style={{ width: "100%" }}
-                    disabled={isReadOnly}
                     precision={2}
                   />
                 </Form.Item>
@@ -237,7 +240,6 @@ export default function ShopTask({ form }: ShopTaskProps) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={0}
             />
           </Form.Item>
@@ -271,7 +273,6 @@ export default function ShopTask({ form }: ShopTaskProps) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={0}
             />
           </Form.Item>
@@ -286,7 +287,6 @@ export default function ShopTask({ form }: ShopTaskProps) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={2}
             />
           </Form.Item>
@@ -301,7 +301,6 @@ export default function ShopTask({ form }: ShopTaskProps) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={0}
             />
           </Form.Item>
@@ -312,7 +311,6 @@ export default function ShopTask({ form }: ShopTaskProps) {
               min={0}
               max={MAX_NUM}
               style={{ width: "100%" }}
-              disabled={isReadOnly}
               precision={0}
             />
           </Form.Item>
diff --git a/src/pages/order3/SaleTask/subpages/TaskEdit/index.tsx b/src/pages/order3/SaleTask/subpages/TaskEdit/index.tsx
index cc69659..abc2dc4 100644
--- a/src/pages/order3/SaleTask/subpages/TaskEdit/index.tsx
+++ b/src/pages/order3/SaleTask/subpages/TaskEdit/index.tsx
@@ -26,14 +26,13 @@ function TaskEdit() {
   const [shopTaskForm] = Form.useForm();
 
   // 获取门店零售任务详情
-  const { data } = useInitial<API.ShopTaskItem, API.GetShopSaleTaskReq>(
-    API.getShopSaleTask,
-    {} as API.ShopTaskItem,
-    {
-      shopId,
-      taskDate,
-    }
-  );
+  const { data, setParams } = useInitial<
+    API.ShopTaskItem,
+    API.GetShopSaleTaskReq
+  >(API.getShopSaleTask, {} as API.ShopTaskItem, {
+    shopId,
+    taskDate,
+  });
 
   useEffect(() => {
     setShopTaskItem(data);
@@ -54,14 +53,20 @@ function TaskEdit() {
               label: `门店任务分配${readOnly ? "详情" : ""}`,
               key: "1",
               children: !isEmpty(shopTaskItem) && (
-                <ShopTask form={shopTaskForm} />
+                <ShopTask
+                  form={shopTaskForm}
+                  onRefresh={() => setParams({}, true)}
+                />
               ),
             },
             {
               label: `销售顾问任务分配${readOnly ? "详情" : ""}`,
               key: "2",
               children: !isEmpty(shopTaskItem) && (
-                <AdviserTask form={shopTaskForm} />
+                <AdviserTask
+                  form={shopTaskForm}
+                  onRefresh={() => setParams({}, true)}
+                />
               ),
             },
           ]}
--
libgit2 0.22.2