From 1c8c18285e5676df8b5eaabff33bfac9d1f33b13 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 22 五月 2026 09:23:43 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_NEW_pro_OA

---
 src/api/login.js |  101 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index 87ab52c..561b98c 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,51 +1,106 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 鐧诲綍鏂规硶
-export function loginCheckFactory(username, password) {
+export function loginCheckFactory(username, password, factoryId) {
   const data = {
     username,
     password,
-  }
+    factoryId,
+  };
   return request({
-    url: '/loginCheckFactory',
+    url: "/loginCheckFactory",
     headers: {
-      isToken: false
+      isToken: false,
+      repeatSubmit: false,
     },
-    method: 'post',
-    data: data
-  })
+    method: "post",
+    data: data,
+  });
 }
 
 // 鑾峰彇鐢ㄦ埛璇︾粏淇℃伅
 export function getInfo() {
   return request({
-    url: '/getInfo',
-    method: 'get'
-  })
+    url: "/getInfo",
+    method: "get",
+  });
 }
 
 // 閫�鍑烘柟娉�
 export function logout() {
   return request({
-    url: '/logout',
-    method: 'post'
-  })
+    url: "/logout",
+    method: "post",
+  });
 }
 
 // 鑾峰彇鍏徃鍒楄〃
 export function userLoginFacotryList(params) {
   return request({
-    url: '/userLoginFacotryList',
-    method: 'get',
-    params: params
-  })
+    url: "/userLoginFacotryList",
+    method: "get",
+    params: params,
+  });
 }
 
 // 鑾峰彇鏈繃鏈熷叕鍛婃暟閲�
 export function noticesList(params) {
   return request({
-    url: '/collaborativeApproval/notice/page',
-    method: 'get',
-    params: params
-  })
-}
\ No newline at end of file
+    url: "/collaborativeApproval/notice/page",
+    method: "get",
+    params: params,
+  });
+}
+
+// 鍙戦�佸鎴风鎺ㄩ�佹爣璇嗗埌鏈嶅姟鍣�
+export function updateClientId(data) {
+  return request({
+    url: "/system/client/addOrUpdateClientId",
+    method: "post",
+    data: data,
+  });
+}
+
+// 鏌ヨ鍏憡鍒楄〃
+export function listNotice(query) {
+  return request({
+    url: "/system/notice/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 鑾峰彇鏈娑堟伅鏁伴噺
+export function getNoticeCount(consigneeId) {
+  return request({
+    url: "/system/notice/getCount",
+    method: "get",
+    params: { consigneeId },
+  });
+}
+
+// 鏍囪娑堟伅涓哄凡璇�
+export function markAsRead(noticeId, status) {
+  return request({
+    url: "/system/notice",
+    method: "put",
+    data: { noticeId, status },
+  });
+}
+
+// 涓�閿爣璁版墍鏈夋秷鎭负宸茶
+export function markAllAsRead() {
+  return request({
+    url: "/system/notice/readAll",
+    method: "post",
+  });
+}
+
+// 纭娑堟伅
+export function confirmMessage(noticeId, status) {
+  return request({
+    url: "/system/notice",
+    method: "put",
+    data: { noticeId, status },
+  });
+}

--
Gitblit v1.9.3