零售任务快捷分配交互优化

Shinner
1 parent 02999d30
Showing 4 changed files with 20 additions and 12 deletions
src/pages/order3/SaleTask/components/SaleTaskAutoAssign.tsx
src/pages/order3/SaleTask/components/SaleTaskBatchSet.tsx
src/pages/order3/SaleTask/components/index.less
src/pages/order3/SaleTask/index.tsx
@@ -3,7 +3,6 @@ import {
   Table,
   Form,
   InputRef,
-  Input,
   Row,
   Button,
   message,
@@ -12,7 +11,7 @@ import {
 } from "antd";
 import type { FormInstance } from "antd/es/form";
 import * as API from "../api";
-import styles from "./index.less";
+import "./index.less";
 import { MAX_NUM } from "../entity";
  
 type EditableTableProps = Parameters<typeof Table>[0];
@@ -71,6 +70,7 @@ const defaultColumns: (ColumnTypes[number] &amp; {
 interface SaleTaskAutoAssignProps {
   id: number;
   value?: API.ShopTaskItem[];
+  onCancel: () => void;
   onRefresh: () => void;
 }
  
@@ -179,7 +179,6 @@ export default function SaleTaskAutoAssign(props: SaleTaskAutoAssignProps) {
       newRow.fuelVehicleTaskCount = 0;
     }
     newData.splice(index, 1, newRow);
-    console.log("handleSave newData", newData);
     setDataSource(newData);
   };
  
@@ -250,7 +249,7 @@ export default function SaleTaskAutoAssign(props: SaleTaskAutoAssignProps) {
         columns={columns as ColumnTypes}
       />
       <Row align="middle" justify="center" style={{ marginTop: 20 }}>
-        <Button onClick={props.onRefresh}>取消</Button>
+        <Button onClick={props.onCancel}>取消</Button>
         <Button
           type="primary"
           style={{ marginLeft: 10 }}
@@ -17,6 +17,7 @@ import ShopSelectNew from &quot;@/components/ShopSelectNew&quot;;
  
 interface SaleTaskBatchSetProps {
   id: number;
+  onCancel: () => void;
   onRefresh: () => void;
 }
  
@@ -269,7 +270,7 @@ export default function SaleTaskBatchSet(props: SaleTaskBatchSetProps) {
         )}
       </Form.List>
       <Row align="middle" justify="center" style={{ marginTop: 20 }}>
-        <Button onClick={props.onRefresh}>取消</Button>
+        <Button onClick={props.onCancel}>取消</Button>
         <Button
           type="primary"
           style={{ marginLeft: 10 }}
-.editable-row:hover .editableCellValueWrap {
-    // box-shadow: 0 0 0 1px #d9d9d9;
-    background-color: #eee;
-} 
 \ No newline at end of file
+.editable-row:hover .editable-cell-value-wrap {
+  border: 1px solid #d9d9d9;
+}
+.editable-cell-value-wrap {
+  border: 1px solid transparent;
+  cursor: pointer;
+}
@@ -518,7 +518,7 @@ function SaleTaskList() {
         width={800}
         title="零售任务快捷分配"
         open={autoVisible}
-        onCancel={handleAutoAssignRefresh}
+        onCancel={() => setAutoVisible(false)}
         destroyOnClose
         footer={null}
         maskClosable={false}
@@ -526,6 +526,7 @@ function SaleTaskList() {
         <SaleTaskAutoAssign
           id={data.id}
           value={data.shopTaskList}
+          onCancel={() => setAutoVisible(false)}
           onRefresh={handleAutoAssignRefresh}
         />
       </Modal>
@@ -533,12 +534,16 @@ function SaleTaskList() {
         width={800}
         title="批量设置"
         open={batchVisible}
-        onCancel={handleBatchSetRefresh}
+        onCancel={() => setBatchVisible(false)}
         destroyOnClose
         footer={null}
         maskClosable={false}
       >
-        <SaleTaskBatchSet id={data.id} onRefresh={handleBatchSetRefresh} />
+        <SaleTaskBatchSet
+          id={data.id}
+          onCancel={() => setBatchVisible(false)}
+          onRefresh={handleBatchSetRefresh}
+        />
       </Modal>
       <ApprovalProgressModal
         visible={approve.visible}