From 25e13bd975b9b49035c65e93feeece81a778ac27 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 21 Jun 2024 16:09:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/clue/clueGetSet.js | 9 ++-
src/api/clue/delivery.js | 2 +-
src/api/clue/sign.js | 5 ++
src/config/axios/service.ts | 10 +++
src/views/Clue/Order/Comp/Delivery.vue | 65 ++++++++++++-------
src/views/Clue/Order/Comp/DialogDelivery.vue | 5 +-
src/views/Clue/Order/Comp/DialogExtraPay.vue | 39 ++++++++---
src/views/Clue/Order/Comp/DialogOrder.vue | 36 ++++++++++
src/views/Clue/Order/Comp/MallOrderList.vue | 36 +++++++++-
src/views/Clue/Set/Comp/ClueGet.vue | 41 +++++++++---
src/views/Clue/Set/Comp/ClueSend.vue | 10 ++-
src/views/Clue/Set/Comp/GeneralSet.vue | 2 +-
src/views/Clue/Set/index.vue | 8 +--
src/views/Login/components/LoginForm.vue | 4 +-
.../Inventory/Comp/InventoryRecord.vue | 2 +-
15 files changed, 216 insertions(+), 58 deletions(-)
diff --git a/src/api/clue/clueGetSet.js b/src/api/clue/clueGetSet.js
index 989dbe2..1877b27 100644
--- a/src/api/clue/clueGetSet.js
+++ b/src/api/clue/clueGetSet.js
@@ -10,9 +10,14 @@ export const deleteClueGainRule = (id) => {
return request.delete({ url: `/admin-api/crm/sch-clue-gain-rule/delete?id=${id}` })
}
+// 线索获取规则保存
+export const saveClueGainRule = (data) => {
+ return request.put({ url: '/admin-api/crm/sch-clue-gain-rule/batchUpdate', data })
+}
+
// 线索规则
-export const getClueDistributeRuleList = () => {
- return request.get({ url: '/admin-api/crm/sch-clue-gain-rule/list' })
+export const getClueDistributeRuleByUser = (params) => {
+ return request.get({ url: '/admin-api/crm/sch-clue-distribution-rule/queryByUserId', params })
}
// 删除
diff --git a/src/api/clue/delivery.js b/src/api/clue/delivery.js
index b0a7e7c..a7c1b51 100644
--- a/src/api/clue/delivery.js
+++ b/src/api/clue/delivery.js
@@ -5,7 +5,7 @@ export const getDeliveryList = async (params) => {
return await request.get({ url: '/admin-api/crm/sign-send/list', params })
}
-// 查询(精简)列表
+// 查询分页列表
export const getDeliveryPage = async (params) => {
return await request.get({ url: '/admin-api/crm/sign-send/page', params })
}
diff --git a/src/api/clue/sign.js b/src/api/clue/sign.js
index 7c4a825..e6f4d4e 100644
--- a/src/api/clue/sign.js
+++ b/src/api/clue/sign.js
@@ -24,3 +24,8 @@ export const cancelDeal = async (id) => {
export const signAddPay = async (data) => {
return await request.post({ url: '/admin-api/crm/sign/extra-pay/save', data: data })
}
+
+// 查询支出
+export const getSignExtraPayList = async (params) => {
+ return await request.get({ url: '/admin-api/crm/sign/extra-pay/get', params })
+}
diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
index bca3e1f..f389b86 100644
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@@ -199,6 +199,16 @@ service.interceptors.response.use(
console.log(msg)
} else {
ElNotification.error({ title: msg })
+ if (code == 403) {
+ // 无访问权限,退出登录
+ const { wsCache } = useCache()
+ const tenantId = wsCache.get('TENANT_ID')
+ const appId = wsCache.get('App_ID')
+ resetRouter() // 重置静态路由表
+ wsCache.clear()
+ removeToken()
+ window.location.href = `/login?tenantId=${tenantId}&appId=${appId}`
+ }
}
return Promise.reject('error')
} else {
diff --git a/src/views/Clue/Order/Comp/Delivery.vue b/src/views/Clue/Order/Comp/Delivery.vue
index 032ca44..868a03f 100644
--- a/src/views/Clue/Order/Comp/Delivery.vue
+++ b/src/views/Clue/Order/Comp/Delivery.vue
@@ -30,9 +30,10 @@
-
-
-
-
-
-
-
-
-
- 详情
-
+
+
+
+
+
+
+
+
+
+ 点击查看
+
+
+
@@ -95,6 +114,9 @@
diff --git a/src/views/Clue/Set/Comp/ClueSend.vue b/src/views/Clue/Set/Comp/ClueSend.vue
index 3315e3b..f909d7a 100644
--- a/src/views/Clue/Set/Comp/ClueSend.vue
+++ b/src/views/Clue/Set/Comp/ClueSend.vue
@@ -50,6 +50,7 @@
>
全选
+
-
+
%
@@ -78,6 +79,7 @@