修改错误i问题

src/api/geopoliticalCustomers/types.ts

@@ -266,6 +266,7 @@ export interface GeopoliticalCustomersSearch {
   customName?: string
   customNid?: string
   storeId?: string
+  salesmanUserId?: number
   enrollStatus?: string
   // 访问时间区间的开始值
   startTime?: string

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, {

src/views/qualityInspectionDistribution/inspectionSearch.vue

@@ -22,12 +22,12 @@
           </a-form-item>
         </a-col>
         <a-col :xl="8" :md="12" :sm="24">
-          <a-form-item label="分发门店" name="storeId">
+          <a-form-item label="业务员" name="salesmanUserId">
             <a-select
-              v-model:value="formModel.storeId"
-              :field-names="{ label: 'storeName', value: 'id' }"
-              :options="shopList"
-              placeholder="请选择分发门店"
+              v-model:value="formModel.salesmanUserId"
+              :field-names="{ label: 'userName', value: 'userId' }"
+              :options="businessUserList"
+              placeholder="请选择业务员"
             />
           </a-form-item>
         </a-col>
@@ -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<string, any>): void
 }>()
 const shopList: any = ref([])
+// 业务员
+const businessUserList: any = ref([])
 const searchTimeValue = ref<[Dayjs, Dayjs]>()
 const distributeTime = ref<[Dayjs, Dayjs]>()
 const formModel = reactive<GeopoliticalCustomersSearch>({
   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
     }
   })
 }

src/views/qualityInspectionDistribution/inspectionSelectModal.vue

@@ -95,6 +95,21 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row v-if="formModel.userNameList.length > 0" justify="start">
+          <a-col :span="24">
+            <a-form-item
+              label="业务员"
+              name="customInformation"
+              :label-col="{ sm: { span: 24 }, md: { span: 4 } }"
+              :wrapper-col="{ sm: { span: 24 }, md: { span: 20 } }"
+            >
+              <div v-for="(item, index) in formModel.userNameList" :key="index">
+                <a href="#">{{ item }}</a
+                ><a-divider type="vertical" />
+              </div>
+            </a-form-item>
+          </a-col>
+        </a-row>
         <template v-for="item in formModel.customStoreVOList" :key="item.storeId">
           <a-row justify="start">
             <a-col xs="24" :sm="24" :md="12">
@@ -194,6 +209,7 @@ interface SysUserPageVO {
   customStoreVOList: ReservationShop[]
   reviewUserId: number | undefined
   customInformation: string
+  userNameList: string[]
 }
 
 const formModel = reactive<SysUserPageVO>({
@@ -206,7 +222,8 @@ const formModel = reactive<SysUserPageVO>({
   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;
+}
 </style>