From 5f87413450a7cc2d78ad58061d92f900031ae1f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Wed, 27 Dec 2023 15:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AFi=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/geopoliticalCustomers/types.ts | 1 +
src/hooks/websocket.ts | 6 ----
.../inspectionSearch.vue | 24 ++++++++++------
.../inspectionSelectModal.vue | 28 +++++++++++++++++--
4 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/src/api/geopoliticalCustomers/types.ts b/src/api/geopoliticalCustomers/types.ts
index eab6dbc..ad76d5a 100644
--- a/src/api/geopoliticalCustomers/types.ts
+++ b/src/api/geopoliticalCustomers/types.ts
@@ -266,6 +266,7 @@ export interface GeopoliticalCustomersSearch {
customName?: string
customNid?: string
storeId?: string
+ salesmanUserId?: number
enrollStatus?: string
// 访问时间区间的开始值
startTime?: string
diff --git a/src/hooks/websocket.ts b/src/hooks/websocket.ts
index 028c3a3..2b40cc0 100644
--- a/src/hooks/websocket.ts
+++ b/src/hooks/websocket.ts
@@ -18,14 +18,8 @@ const useAdminWebSocket = () => {
// ws地址
const baseUri = import.meta.env.VITE_API_URL
const host = window.location.host
-<<<<<<< HEAD
- console.log(host, 'host')
- const wsUri = `wss://${host}${baseUri}/ws?access_token=${accessToken}`
- console.log(baseUri, 'baseUri')
-=======
const wsUri = `wss://${host}${baseUri}/ws?access_token=${accessToken}`
console.log(wsUri, 'wsUri')
->>>>>>> 51148e12890616d99b5cb637a2b4197ca26fbcf1
//使用useWebSocket函数创建WebSocket连接,并配置自动重连和心跳机制
useWebSocketReturn = useWebSocket(wsUri, {
diff --git a/src/views/qualityInspectionDistribution/inspectionSearch.vue b/src/views/qualityInspectionDistribution/inspectionSearch.vue
index 0a2589b..f524ee5 100644
--- a/src/views/qualityInspectionDistribution/inspectionSearch.vue
+++ b/src/views/qualityInspectionDistribution/inspectionSearch.vue
@@ -22,12 +22,12 @@
-
+
@@ -66,6 +66,7 @@
import { Form } from 'ant-design-vue'
import type { GeopoliticalCustomersSearch } from '@/api/geopoliticalCustomers/types'
import { getShopQueryAll } from '@/api/shopManage/index'
+import { getDistributorsUserIdList } from '@/api/clueaccess/clueImport/index'
import dayjs from 'dayjs'
import type { Dayjs } from 'dayjs'
import { doRequest } from '@/utils/axios/request'
@@ -97,11 +98,13 @@ const emits = defineEmits<{
(e: 'search', params: Record): void
}>()
const shopList: any = ref([])
+// 业务员
+const businessUserList: any = ref([])
const searchTimeValue = ref<[Dayjs, Dayjs]>()
const distributeTime = ref<[Dayjs, Dayjs]>()
const formModel = reactive({
customName: '',
- storeId: '',
+ salesmanUserId: undefined,
enrollStatus: undefined
})
@@ -117,9 +120,14 @@ const enrollStatusList = [
}
]
const initShopList = () => {
- doRequest(getShopQueryAll(2), {
+ // doRequest(getShopQueryAll(2), {
+ // onSuccess: res => {
+ // shopList.value = res.data
+ // }
+ // })
+ doRequest(getDistributorsUserIdList(23), {
onSuccess: res => {
- shopList.value = res.data
+ businessUserList.value = res.data
}
})
}
diff --git a/src/views/qualityInspectionDistribution/inspectionSelectModal.vue b/src/views/qualityInspectionDistribution/inspectionSelectModal.vue
index 1071a6d..95383df 100644
--- a/src/views/qualityInspectionDistribution/inspectionSelectModal.vue
+++ b/src/views/qualityInspectionDistribution/inspectionSelectModal.vue
@@ -95,6 +95,21 @@
+
+
+
+
+
+
+
@@ -194,6 +209,7 @@ interface SysUserPageVO {
customStoreVOList: ReservationShop[]
reviewUserId: number | undefined
customInformation: string
+ userNameList: string[]
}
const formModel = reactive({
@@ -206,7 +222,8 @@ const formModel = reactive({
customStoreVOList: [],
enrollStatus: undefined,
reviewUserId: undefined,
- customInformation: ''
+ customInformation: '',
+ userNameList: []
})
// 表单校验规则
@@ -416,7 +433,10 @@ defineExpose({
.large-card {
height: 100px;
}
-
+.u-flex {
+ display: flex;
+ align-items: center;
+}
::v-deep .bubble-card::before {
content: '';
position: absolute;
@@ -450,4 +470,8 @@ defineExpose({
margin: 0 0 25px 0;
line-height: 0.5715;
}
+::v-deep .ant-form-item-control-input-content {
+ display: flex;
+ align-items: center;
+}