Merge branch 'develop' of https://e.coding.net/g-xtcy5189/cunkebao/cunkebao_v3 into develop

2025-09-11 10:10:02 +08:00
parent 51312a3a2a 3a66a3af3f
commit 19977cc536
12 changed files with 578 additions and 26 deletions
--- a/Cunkebao/dist/.vite/manifest.json
+++ b/Cunkebao/dist/.vite/manifest.json
@@ -33,7 +33,7 @@
    "name": "vendor"
  },
  "index.html": {
-    "file": "assets/index-BesOjMPu.js",
+    "file": "assets/index-DPe1huLQ.js",
    "name": "index",
    "src": "index.html",
    "isEntry": true,
@@ -44,7 +44,7 @@
      "_charts-BjEBSMrK.js"
    ],
    "css": [
-      "assets/index-677RgwmW.css"
+      "assets/index-prcd5sVt.css"
    ]
  }
 }
--- a/Cunkebao/dist/index.html
+++ b/Cunkebao/dist/index.html
@@ -11,13 +11,13 @@
    </style>
    <!-- 引入 uni-app web-view SDK（必须） -->
    <script type="text/javascript" src="/websdk.js"></script>
-    <script type="module" crossorigin src="/assets/index-BesOjMPu.js"></script>
+    <script type="module" crossorigin src="/assets/index-DPe1huLQ.js"></script>
    <link rel="modulepreload" crossorigin href="/assets/vendor-BPPoWDlG.js">
    <link rel="modulepreload" crossorigin href="/assets/utils-DiZV3oaL.js">
    <link rel="modulepreload" crossorigin href="/assets/ui-CiJ_pikt.js">
    <link rel="modulepreload" crossorigin href="/assets/charts-BjEBSMrK.js">
    <link rel="stylesheet" crossorigin href="/assets/ui-D0C0OGrH.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-677RgwmW.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-prcd5sVt.css">
  </head>
  <body>
    <div id="root"></div>
--- a/Cunkebao/src/main.tsx
+++ b/Cunkebao/src/main.tsx
@@ -1,10 +1,17 @@
 // main.tsx
 import React from "react";
 import { createRoot } from "react-dom/client";
+import { ConfigProvider } from "antd";
+import zhCN from "antd/locale/zh_CN";
+import dayjs from "dayjs";
+import "dayjs/locale/zh-cn";
 import App from "./App";
 import "./styles/global.scss";
 import { db } from "@/utils/db"; // 引入数据库实例

+// 设置dayjs为中文
+dayjs.locale("zh-cn");
+
 // 数据库初始化
 async function initializeApp() {
  try {
@@ -26,7 +33,11 @@ async function initializeApp() {

  // 渲染应用
  const root = createRoot(document.getElementById("root")!);
-  root.render(<App />);
+  root.render(
+    <ConfigProvider locale={zhCN}>
+      <App />
+    </ConfigProvider>,
+  );
 }

 // 启动应用
--- a/Cunkebao/src/pages/pc/ckbox/weChat/api.ts
+++ b/Cunkebao/src/pages/pc/ckbox/weChat/api.ts
@@ -13,7 +13,48 @@ import {

 //读取聊天信息
 //kf.quwanzhi.com:9991/api/WechatFriend/clearUnreadCount
+function jsonToQueryString(json) {
+  const params = new URLSearchParams();
+  for (const key in json) {
+    if (Object.prototype.hasOwnProperty.call(json, key)) {
+      params.append(key, json[key]);
+    }
+  }
+  return params.toString();
+}
+//转移客户
+export function WechatFriendAllot(params: {
+  wechatFriendId?: number;
+  wechatChatroomId?: number;
+  toAccountId: number;
+  notifyReceiver: boolean;
+  comment: string;
+}) {
+  return request(
+    "/api/wechatFriend/allot?" + jsonToQueryString(params),
+    undefined,
+    "PUT",
+  );
+}

+//获取可转移客服列表
+export function getTransferableAgentList() {
+  return request("/api/account/myDepartmentAccountsForTransfer", {}, "GET");
+}
+
+// 微信好友列表
+export function WechatFriendRebackAllot(params: {
+  wechatFriendId?: number;
+  wechatChatroomId?: number;
+}) {
+  return request(
+    "/api/wechatFriend/rebackAllot?" + jsonToQueryString(params),
+    undefined,
+    "PUT",
+  );
+}
+
+// 微信群列表
 export function WechatGroup(params) {
  return request("/api/WechatGroup/list", params, "GET");
 }
--- a/Cunkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/chatRecord/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/chatRecord/index.tsx
@@ -0,0 +1,161 @@
+import React, { useState } from "react";
+import { Button, Modal, Input, DatePicker, message } from "antd";
+import { MessageOutlined } from "@ant-design/icons";
+import dayjs from "dayjs";
+
+const { RangePicker } = DatePicker;
+
+interface ChatRecordProps {
+  onSearch?: (data: { dateRange: [string, string]; content: string }) => void;
+  className?: string;
+  disabled?: boolean;
+}
+
+const ChatRecord: React.FC<ChatRecordProps> = ({
+  onSearch,
+  className,
+  disabled = false,
+}) => {
+  const [visible, setVisible] = useState(false);
+  const [searchContent, setSearchContent] = useState<string>("");
+  const [dateRange, setDateRange] = useState<[dayjs.Dayjs, dayjs.Dayjs] | null>(
+    null,
+  );
+  const [loading, setLoading] = useState(false);
+
+  // 打开弹窗
+  const openModal = () => {
+    setVisible(true);
+  };
+
+  // 关闭弹窗并重置状态
+  const closeModal = () => {
+    setVisible(false);
+    setSearchContent("");
+    setDateRange(null);
+    setLoading(false);
+  };
+
+  // 执行查找
+  const handleSearch = async () => {
+    if (!dateRange) {
+      message.warning("请选择时间范围");
+      return;
+    }
+
+    if (!searchContent.trim()) {
+      message.warning("请输入查找内容");
+      return;
+    }
+
+    try {
+      setLoading(true);
+
+      const searchData = {
+        dateRange: [
+          dateRange[0].format("YYYY-MM-DD 00:00:00"),
+          dateRange[1].format("YYYY-MM-DD 23:59:59"),
+        ] as [string, string],
+        content: searchContent.trim(),
+      };
+
+      // 调用回调函数
+      if (onSearch) {
+        await onSearch(searchData);
+      }
+
+      message.success("查找完成");
+      closeModal();
+    } catch (error) {
+      console.error("查找失败:", error);
+      message.error("查找失败，请重试");
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <>
+      <div
+        className={className}
+        onClick={openModal}
+        style={{
+          cursor: disabled ? "not-allowed" : "pointer",
+          opacity: disabled ? 0.5 : 1,
+        }}
+      >
+        <MessageOutlined />
+        聊天记录
+      </div>
+
+      <Modal
+        title="查找聊天记录"
+        open={visible}
+        onCancel={closeModal}
+        width={450}
+        centered
+        maskClosable={!loading}
+        footer={[
+          <div
+            key="footer"
+            style={{
+              display: "flex",
+              justifyContent: "flex-end",
+              width: "100%",
+            }}
+          >
+            <Button
+              onClick={closeModal}
+              disabled={loading}
+              style={{ marginRight: "8px" }}
+            >
+              取消
+            </Button>
+            <Button type="primary" loading={loading} onClick={handleSearch}>
+              查找
+            </Button>
+          </div>,
+        ]}
+      >
+        <div style={{ padding: "20px 0" }}>
+          {/* 时间范围选择 */}
+          <div style={{ marginBottom: "20px" }}>
+            <div
+              style={{ marginBottom: "8px", fontSize: "14px", color: "#333" }}
+            >
+              时间范围
+            </div>
+            <RangePicker
+              value={dateRange}
+              onChange={setDateRange}
+              style={{ width: "100%" }}
+              size="large"
+              disabled={loading}
+              placeholder={["开始日期", "结束日期"]}
+            />
+          </div>
+
+          {/* 查找内容输入 */}
+          <div>
+            <div
+              style={{ marginBottom: "8px", fontSize: "14px", color: "#333" }}
+            >
+              查找内容
+            </div>
+            <Input
+              placeholder="请输入要查找的关键词或内容"
+              value={searchContent}
+              onChange={e => setSearchContent(e.target.value)}
+              size="large"
+              maxLength={100}
+              showCount
+              disabled={loading}
+            />
+          </div>
+        </div>
+      </Modal>
+    </>
+  );
+};
+
+export default ChatRecord;
--- a/Cunkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/toContract/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/components/toContract/index.tsx
@@ -0,0 +1,252 @@
+import React, { useState } from "react";
+import { Button, Modal, Select, Input, message } from "antd";
+import { ShareAltOutlined } from "@ant-design/icons";
+import {
+  getTransferableAgentList,
+  WechatFriendAllot,
+  WechatFriendRebackAllot,
+} from "@/pages/pc/ckbox/weChat/api";
+import { useCurrentContact } from "@/store/module/weChat/weChat";
+import { deleteChatSession } from "@/store/module/ckchat/ckchat";
+import { contractService, weChatGroupService } from "@/utils/db";
+const { TextArea } = Input;
+const { Option } = Select;
+
+interface ToContractProps {
+  className?: string;
+  disabled?: boolean;
+}
+interface DepartItem {
+  id: number;
+  userName: string;
+  realName: string;
+  nickname: string;
+  avatar: string;
+  memo: string;
+  departmentId: number;
+  alive: boolean;
+}
+
+const ToContract: React.FC<ToContractProps> = ({
+  className,
+  disabled = false,
+}) => {
+  const currentContact = useCurrentContact();
+  const [visible, setVisible] = useState(false);
+  const [selectedTarget, setSelectedTarget] = useState<number | null>(null);
+  const [comment, setComment] = useState<string>("");
+  const [loading, setLoading] = useState(false);
+  const [customerServiceList, setCustomerServiceList] = useState<DepartItem[]>(
+    [],
+  );
+  // 打开弹窗
+  const openModal = () => {
+    setVisible(true);
+    getTransferableAgentList().then(data => {
+      setCustomerServiceList(data);
+    });
+  };
+
+  // 关闭弹窗并重置状态
+  const closeModal = () => {
+    setVisible(false);
+    setSelectedTarget(null);
+    setComment("");
+    setLoading(false);
+  };
+
+  // 确定转给他人
+  const handleConfirm = async () => {
+    if (!selectedTarget) {
+      message.warning("请选择目标客服");
+      return;
+    }
+
+    try {
+      setLoading(true);
+
+      console.log(currentContact);
+
+      // 调用转接接口
+      if (currentContact) {
+        if ("chatroomId" in currentContact && currentContact.chatroomId) {
+          await WechatFriendAllot({
+            wechatChatroomId: currentContact.id,
+            toAccountId: selectedTarget as number,
+            notifyReceiver: true,
+            comment: comment.trim(),
+          });
+        } else {
+          await WechatFriendAllot({
+            wechatFriendId: currentContact.id,
+            toAccountId: selectedTarget as number,
+            notifyReceiver: true,
+            comment: comment.trim(),
+          });
+        }
+      }
+
+      message.success("转接成功");
+      try {
+        // 删除聊天会话
+        deleteChatSession(currentContact.id.toString());
+        // 删除本地数据库记录
+        if ("chatroomId" in currentContact) {
+          await weChatGroupService.delete(currentContact.id);
+        } else {
+          await contractService.delete(currentContact.id.toString());
+        }
+      } catch (deleteError) {
+        console.error("删除本地数据失败:", deleteError);
+      }
+      closeModal();
+    } catch (error) {
+      console.error("转接失败:", error);
+      message.error("转接失败，请重试");
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  // 一键转回
+  const handleReturn = async () => {
+    try {
+      setLoading(true);
+
+      // 调用转回接口
+      if (currentContact) {
+        if ("chatroomId" in currentContact && currentContact.chatroomId) {
+          await WechatFriendRebackAllot({
+            wechatChatroomId: currentContact.id,
+          });
+        } else {
+          await WechatFriendRebackAllot({
+            wechatFriendId: currentContact.id,
+          });
+        }
+      }
+
+      message.success("转回成功");
+      try {
+        // 删除聊天会话
+        deleteChatSession(currentContact.id.toString());
+        // 删除本地数据库记录
+        if ("chatroomId" in currentContact) {
+          await weChatGroupService.delete(currentContact.id);
+        } else {
+          await contractService.delete(currentContact.id);
+        }
+      } catch (deleteError) {
+        console.error("删除本地数据失败:", deleteError);
+      }
+      closeModal();
+    } catch (error) {
+      console.error("转回失败:", error);
+      message.error("转回失败，请重试");
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <>
+      <div
+        className={className}
+        onClick={openModal}
+        style={{
+          cursor: disabled ? "not-allowed" : "pointer",
+          opacity: disabled ? 0.5 : 1,
+        }}
+      >
+        <ShareAltOutlined />
+        转给他人
+      </div>
+
+      <Modal
+        title="转给他人"
+        open={visible}
+        onCancel={closeModal}
+        width={400}
+        centered
+        maskClosable={!loading}
+        footer={[
+          <div
+            key="footer"
+            style={{
+              display: "flex",
+              justifyContent: "space-between",
+              width: "100%",
+            }}
+          >
+            <Button onClick={handleReturn} disabled={loading}>
+              一键转回
+            </Button>
+            <div>
+              <Button
+                onClick={closeModal}
+                disabled={loading}
+                style={{ marginRight: "8px" }}
+              >
+                取消
+              </Button>
+              <Button
+                type="primary"
+                loading={loading}
+                onClick={handleConfirm}
+                disabled={!selectedTarget}
+              >
+                确定
+              </Button>
+            </div>
+          </div>,
+        ]}
+      >
+        <div style={{ padding: "20px 0" }}>
+          {/* 目标客服选择 */}
+          <div style={{ marginBottom: "20px" }}>
+            <div
+              style={{ marginBottom: "8px", fontSize: "14px", color: "#333" }}
+            >
+              目标客服
+            </div>
+            <Select
+              placeholder="请选择目标客服"
+              value={selectedTarget}
+              onChange={setSelectedTarget}
+              style={{ width: "100%" }}
+              size="large"
+              disabled={loading}
+            >
+              {customerServiceList.map(item => (
+                <Option key={item.id} value={item.id}>
+                  {item.nickname || item.realName} - {item.userName}
+                </Option>
+              ))}
+            </Select>
+          </div>
+
+          {/* 附言输入 */}
+          <div>
+            <div
+              style={{ marginBottom: "8px", fontSize: "14px", color: "#333" }}
+            >
+              附言
+            </div>
+            <TextArea
+              placeholder="请输入附言内容"
+              value={comment}
+              onChange={e => setComment(e.target.value)}
+              rows={4}
+              maxLength={300}
+              showCount
+              style={{ resize: "none" }}
+              disabled={loading}
+            />
+          </div>
+        </div>
+      </Modal>
+    </>
+  );
+};
+
+export default ToContract;
--- a/Cunkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageEnter/index.tsx
@@ -14,6 +14,8 @@ import { EmojiPicker } from "@/components/EmojiSeclection";
 import { EmojiInfo } from "@/components/EmojiSeclection/wechatEmoji";
 import SimpleFileUpload from "@/components/Upload/SimpleFileUpload";
 import AudioRecorder from "@/components/Upload/AudioRecorder";
+import ToContract from "./components/toContract";
+import ChatRecord from "./components/chatRecord";
 import styles from "./MessageEnter.module.scss";

 const { Footer } = Layout;
@@ -174,14 +176,24 @@ const MessageEnter: React.FC<MessageEnterProps> = ({ contract }) => {
              />
            </div>
            <div className={styles.rightTool}>
-              <div className={styles.rightToolItem}>
-                <ShareAltOutlined />
-                转给他人
-              </div>
-              <div className={styles.rightToolItem}>
-                <MessageOutlined />
-                聊天记录
-              </div>
+              <ToContract
+                className={styles.rightToolItem}
+                onTransfer={data => {
+                  console.log("转接数据:", data);
+                  // 这里可以添加实际的转接逻辑
+                }}
+                onReturn={() => {
+                  console.log("执行一键转回操作");
+                  // 这里可以添加实际的转回逻辑
+                }}
+              />
+              <ChatRecord
+                className={styles.rightToolItem}
+                onSearch={data => {
+                  console.log("查找数据:", data);
+                  // 这里可以添加实际的查找逻辑
+                }}
+              />
            </div>
          </div>
          <div className={styles.inputArea}>
--- a/Cunkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/MessageRecord.module.scss
+++ b/Cunkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/MessageRecord.module.scss
@@ -33,6 +33,11 @@
  font-size: 12px;
  margin: 8px 0;
  position: relative;
+  font-weight: normal;
+  a {
+    color: #1890ff;
+    margin: 0px 5px;
+  }
 }
 .loadMore {
  text-align: center;
--- a/Cunkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/weChat/components/ChatWindow/components/MessageRecord/index.tsx
@@ -565,10 +565,19 @@ const MessageRecord: React.FC<MessageRecordProps> = ({ contract }) => {
      </div>
      {groupMessagesByTime(currentMessages).map((group, groupIndex) => (
        <React.Fragment key={`group-${groupIndex}`}>
-          <Divider>
-            <div className={styles.messageTime}>{group.time}</div>
-          </Divider>
-          {group.messages.map(renderMessage)}
+          {group.messages
+            .filter(v => [10000].includes(v.msgType))
+            .map(msg => (
+              <div
+                key={`divider-${msg.id}`}
+                className={styles.messageTime}
+                dangerouslySetInnerHTML={{ __html: msg.content }}
+              ></div>
+            ))}
+          <div className={styles.messageTime}>{group.time}</div>
+          {group.messages
+            .filter(v => ![10000].includes(v.msgType))
+            .map(renderMessage)}
        </React.Fragment>
      ))}
      <div ref={messagesEndRef} />
--- a/Cunkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
+++ b/Cunkebao/src/pages/pc/ckbox/weChat/components/SidebarMenu/MessageList/index.tsx
@@ -19,17 +19,29 @@ const MessageList: React.FC<MessageListProps> = () => {
  const [chatSessions, setChatSessions] = useState<
    (ContractData | weChatGroup)[]
  >([]);
-
+  const searchKeyword = useCkChatStore(state => state.searchKeyword);
  useEffect(() => {
-    if (kfSelected == 0) {
-      setChatSessions(getChatSessions);
-    } else {
-      const newChatSessions = getChatSessions.filter(
-        v => v.wechatAccountId === kfSelected && kfSelected != 0,
+    let filteredSessions = getChatSessions;
+
+    // 根据客服筛选
+    if (kfSelected !== 0) {
+      filteredSessions = filteredSessions.filter(
+        v => v.wechatAccountId === kfSelected,
      );
-      setChatSessions(newChatSessions);
    }
-  }, [getChatSessions, kfSelected]);
+
+    // 根据搜索关键词进行模糊匹配
+    if (searchKeyword.trim()) {
+      const keyword = searchKeyword.toLowerCase();
+      filteredSessions = filteredSessions.filter(v => {
+        const nickname = (v.nickname || "").toLowerCase();
+        const conRemark = (v.conRemark || "").toLowerCase();
+        return nickname.includes(keyword) || conRemark.includes(keyword);
+      });
+    }
+
+    setChatSessions(filteredSessions);
+  }, [getChatSessions, kfSelected, searchKeyword]);
  return (
    <div className={styles.messageList}>
      <List
--- a/Cunkebao/src/store/module/weChat/weChat.data.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.data.ts
@@ -18,7 +18,12 @@ export interface WeChatState {
    isExist?: boolean,
  ) => void;
  loadChatMessages: (Init: boolean, To?: number) => Promise<void>;
-
+  SearchMessage: (params: {
+    From: number;
+    To: number;
+    keyword: string;
+    Count?: number;
+  }) => Promise<void>;
  // 视频消息处理方法
  setVideoLoading: (messageId: number, isLoading: boolean) => void;
  setVideoUrl: (messageId: number, videoUrl: string) => void;
--- a/Cunkebao/src/store/module/weChat/weChat.ts
+++ b/Cunkebao/src/store/module/weChat/weChat.ts
@@ -98,6 +98,50 @@ export const useWeChatStore = create<WeChatState>()(
          set({ messagesLoading: false });
        }
      },
+      SearchMessage: async ({
+        From = 1,
+        To = 4704624000000,
+        keyword = "",
+        Count = 20,
+      }: {
+        From: number;
+        To: number;
+        keyword: string;
+        Count?: number;
+      }) => {
+        const state = useWeChatStore.getState();
+        const contact = state.currentContract;
+        set({ messagesLoading: true });
+
+        try {
+          const params: any = {
+            wechatAccountId: contact.wechatAccountId,
+            From,
+            To,
+            keyword,
+            Count,
+            olderData: true,
+          };
+
+          if ("chatroomId" in contact && contact.chatroomId) {
+            params.wechatChatroomId = contact.id;
+            const messages = await getChatroomMessages(params);
+            const currentGroupMembers = await getGroupMembers({
+              id: contact.id,
+            });
+            set({ currentMessages: messages || [], currentGroupMembers });
+          } else {
+            params.wechatFriendId = contact.id;
+            const messages = await getChatMessages(params);
+            set({ currentMessages: messages || [] });
+          }
+          set({ messagesLoading: false });
+        } catch (error) {
+          console.error("获取聊天消息失败:", error);
+        } finally {
+          set({ messagesLoading: false });
+        }
+      },

      setMessageLoading: loading => {
        set({ messagesLoading: Boolean(loading) });