From c75253733d2f74c13d9bf319d1ee8df8dc3fc442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Thu, 14 Dec 2023 16:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=87=BD=E6=95=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=98=B2=E6=8A=96=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/websocket.ts                        |  5 +-
 src/layouts/BasicLayout.vue                   |  4 +-
 .../customerList/customerList.vue             | 43 ++++++++++--
 .../geopoliticalCustomersModal.vue            | 17 +++--
 .../inspectionModal.vue                       | 46 ++++++++-----
 src/views/shopManage/shopModal.vue            | 67 ++++++++++---------
 vite.config.ts                                |  6 +-
 7 files changed, 122 insertions(+), 66 deletions(-)

diff --git a/src/hooks/websocket.ts b/src/hooks/websocket.ts
index ff5e7a5..2b40cc0 100644
--- a/src/hooks/websocket.ts
+++ b/src/hooks/websocket.ts
@@ -18,9 +18,8 @@ const useAdminWebSocket = () => {
     // ws地址
     const baseUri = import.meta.env.VITE_API_URL
     const host = window.location.host
-    console.log(host, 'host')
-    const wsUri = `ws://${host}${baseUri}/ws?access_token=${accessToken}`
-    console.log(baseUri, 'baseUri')
+    const wsUri = `wss://${host}${baseUri}/ws?access_token=${accessToken}`
+    console.log(wsUri, 'wsUri')
 
     //使用useWebSocket函数创建WebSocket连接，并配置自动重连和心跳机制
     useWebSocketReturn = useWebSocket(wsUri, {
diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue
index f8772da..2058ad0 100644
--- a/src/layouts/BasicLayout.vue
+++ b/src/layouts/BasicLayout.vue
@@ -78,9 +78,9 @@
 </template>
 
 <script setup lang="ts">
-import BallcatFooter from '@/layouts/components/Footer/BallcatFooter.vue'
+// import BallcatFooter from '@/layouts/components/Footer/BallcatFooter.vue'
 import ProLayout from '#/layout/BasicLayout'
-import SettingDrawer from '#/layout/components/SettingDrawer'
+// import SettingDrawer from '#/layout/components/SettingDrawer'
 import MultiTab from '@/layouts/components/MultiTab'
 import { useSettingStore } from '@/stores/setting-store'
 import type { Key } from 'ant-design-vue/es/_util/type'
diff --git a/src/views/customermanagement/customerList/customerList.vue b/src/views/customermanagement/customerList/customerList.vue
index 72098b2..17869a4 100644
--- a/src/views/customermanagement/customerList/customerList.vue
+++ b/src/views/customermanagement/customerList/customerList.vue
@@ -8,7 +8,7 @@
   <!-- 批量操作、更多操作 -->
   <a-card :bordered="false" :body-style="{ paddingBottom: 0 }">
     <div class="download">
-      <a-button @click.stop="downloadTemplate">导出</a-button>
+      <a-button @click.stop="exportModel = true">导出</a-button>
     </div>
   </a-card>
   <!-- 底部表格 -->
@@ -71,6 +71,18 @@
       </template> -->
     </template>
   </pro-table>
+  <a-modal v-model:visible="exportModel" title="导出" @cancel="cancelModel">
+    <!-- <a-input
+      v-model:value="searchData.nid"
+      placeholder="请输入号码"
+      allow-clear
+      style="width: 220px; margin-bottom: 10px"
+    /> -->
+    <a-range-picker v-model:value="searchData.exportDate" format="YYYY-MM-DD HH:mm:ss" show-time />
+    <template #footer>
+      <a-button key="submit" type="primary" @click="downloadTemplate">导出</a-button>
+    </template>
+  </a-modal>
   <!-- 详情弹窗 -->
   <customer-list-view-modal ref="customerListViewModalRef" @submit-success="reloadTable" />
   <!-- 编辑弹窗 -->
@@ -100,6 +112,7 @@ import CustomerListEditModal from '@/views/customermanagement/customerList/custo
 import { exportClueData, isEffective } from '@/api/customermanagement/customerList'
 import { remoteFileDownload } from '@/utils/file-utils'
 import { doRequest } from '@/utils/axios/request'
+import type { Dayjs } from 'dayjs'
 // import { useRoute } from 'vue-router'
 //删除
 // import { doRequest } from '@/utils/axios/request'
@@ -107,10 +120,16 @@ import { doRequest } from '@/utils/axios/request'
 // const route = useRoute()
 
 defineOptions({ name: 'CustomerList' })
+type RangeValue = [Dayjs, Dayjs]
 //获取当前账号角色
 import { useUserStore } from '@/stores/user-store'
 const { userInfo } = useUserStore()
 const salesmanType = ref<number | undefined>()
+const exportModel = ref(false)
+const searchData = reactive({
+  nid: '',
+  exportDate: []
+})
 onMounted(() => {
   salesmanType.value = userInfo?.salesmanType
   const savedUserData = localStorage.getItem('clueId')
@@ -175,7 +194,10 @@ const handleView = (record: CustomerListRecord, tabIndex: string) => {
     customerListViewModalRef.value?.open(FormAction.UPDATE, record, tabIndex)
   }
 }
-
+const cancelModel = () => {
+  searchData.nid = ''
+  searchData.exportDate = []
+}
 //编辑
 const handleEdit = (record: CustomerListRecord, tabIndex: string) => {
   customerListEditModalRef.value?.open(FormAction.UPDATE, record, tabIndex)
@@ -330,9 +352,20 @@ const switchChange = (record: any) => {
 }
 // 导出
 function downloadTemplate() {
-  exportClueData(searchParams).then(res => {
-    remoteFileDownload(res)
-  })
+  const data: any = searchData
+  if (data.exportDate && data.exportDate.length == 2) {
+    data.startTime = data.exportDate[0].format('YYYY-MM-DD HH:mm:ss')
+    data.endTime = data.exportDate[1].format('YYYY-MM-DD HH:mm:ss')
+    delete data.exportDate
+  }
+  exportClueData(data)
+    .then(res => {
+      exportModel.value = false
+      remoteFileDownload(res)
+    })
+    .catch(err => {
+      exportModel.value = false
+    })
 }
 </script>
 <style lang="less" scoped>
diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
index 8fe6370..0ca0349 100644
--- a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
+++ b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
@@ -239,7 +239,9 @@
           </div>
         </a-form-item>
         <a-form-item
-          v-if="title === '新建预约' || title === '编辑预约' || title === '编辑' && activeKey === 0"
+          v-if="
+            title === '新建预约' || title === '编辑预约' || (title === '编辑' && activeKey === 0)
+          "
           style="display: flex; justify-content: center"
         >
           <!-- 地图 -->
@@ -468,7 +470,7 @@
         <p>您提交的表单信息为：</p>
         <p>称呼：{{ formModel.customName }}</p>
         <p>联系方式：{{ formModel.customNid }}</p>
-        <p>备注：{{ formModel.remark }}</p>
+        <p>客户资料：{{ formModel.customInformation }}</p>
         <div v-if="formModel.customType === 0" style="overflow-y: auto; max-height: 100px">
           <p v-for="(item, index) in formModel.customStoreEntities" :key="index">
             <span>{{ `报名的门店${index + 1}为` }}：{{ item.storeName }}</span>
@@ -503,6 +505,7 @@ import type { SelectProps } from 'ant-design-vue'
 import type { Dayjs } from 'dayjs'
 import 'dayjs/locale/zh-cn'
 import { getfFindDirectSalesman } from '@/api/directResources/index'
+import { useDebounceFn } from '@vueuse/core'
 import {
   addCustomer,
   updateCustomer,
@@ -1394,9 +1397,13 @@ const submitOperate = () => {
   }
 }
 //报名信息确认弹窗确定点击事件
-const handleOk = async () => {
-  await submitOperate()
-}
+const handleOk = useDebounceFn(
+  async () => {
+    await submitOperate()
+  },
+  300,
+  { maxWait: 5000 }
+)
 //匹配信息确认弹窗确定点击事件
 const matchhandleOk = async (detailAddress: string) => {
   matchregisterVisible.value = false
diff --git a/src/views/qualityInspectionDistribution/inspectionModal.vue b/src/views/qualityInspectionDistribution/inspectionModal.vue
index 2023a0c..68f8caf 100644
--- a/src/views/qualityInspectionDistribution/inspectionModal.vue
+++ b/src/views/qualityInspectionDistribution/inspectionModal.vue
@@ -420,7 +420,7 @@
         <p>您提交的表单信息为：</p>
         <p>称呼：{{ formModel.customName }}</p>
         <p>联系方式：{{ formModel.customNid }}</p>
-        <p>备注：{{ formModel.remark }}</p>
+        <p>客户资料：{{ formModel.salesmanUserId }}</p>
         <div v-if="formModel.customType === 0" style="overflow-y: auto; max-height: 100px">
           <p v-for="(item, index) in formModel.customStoreEntities" :key="index">
             <span>{{ `报名的门店${index + 1}为` }}：{{ item.storeName }}</span>
@@ -449,6 +449,7 @@ import type { FormRequestMapping } from '@/hooks/form'
 import { doRequest } from '@/utils/axios/request'
 import { message } from 'ant-design-vue'
 import type { FormInstance } from 'ant-design-vue'
+import { useDebounceFn } from '@vueuse/core'
 //预约时间
 import type { SelectValue } from 'ant-design-vue/es/select'
 import type { SelectProps } from 'ant-design-vue'
@@ -1319,7 +1320,10 @@ const submitOperate = () => {
   )
   const handleSuccess = (res: any) => {
     // 分发操作
-    console.log("🚀 ~ file: inspectionModal.vue:1323 ~ handleSuccess ~ formModel.enrollStatus:", formModel.enrollStatus)
+    console.log(
+      '🚀 ~ file: inspectionModal.vue:1323 ~ handleSuccess ~ formModel.enrollStatus:',
+      formModel.enrollStatus
+    )
     if (res.code === 200 && formModel.enrollStatus != 0) {
       message.success('保存成功')
       isSubmit.value = true
@@ -1354,9 +1358,13 @@ const submitOperate = () => {
 }
 
 //报名信息确认弹窗确定点击事件
-const handleOk = async () => {
-  await submitOperate()
-}
+const handleOk = useDebounceFn(
+  async () => {
+    await submitOperate()
+  },
+  300,
+  { maxWait: 5000 }
+)
 //匹配信息确认弹窗确定点击事件
 const matchhandleOk = async (detailAddress: string) => {
   matchregisterVisible.value = false
@@ -1381,18 +1389,22 @@ const matchhandleOk = async (detailAddress: string) => {
   // await submitOperate()
 }
 //暂存
-const temporaryStorage = async () => {
-  const fields = ['customName', 'customNid'] // 指定要校验的字段名
-  formRef.value
-    ?.validateFields(fields)
-    .then(() => {
-      formModel.enrollStatus = 0
-      submitOperate()
-    })
-    .catch(err => {
-      console.log('校验失败err', err)
-    })
-}
+const temporaryStorage = useDebounceFn(
+  async () => {
+    const fields = ['customName', 'customNid'] // 指定要校验的字段名
+    formRef.value
+      ?.validateFields(fields)
+      .then(() => {
+        formModel.enrollStatus = 0
+        submitOperate()
+      })
+      .catch(err => {
+        console.log('校验失败err', err)
+      })
+  },
+  300,
+  { maxWait: 5000 }
+)
 
 //表单提交处理
 const handleSubmit = () => {
diff --git a/src/views/shopManage/shopModal.vue b/src/views/shopManage/shopModal.vue
index aedb615..c02ab93 100644
--- a/src/views/shopManage/shopModal.vue
+++ b/src/views/shopManage/shopModal.vue
@@ -146,6 +146,7 @@ import type { ShowSearchType } from 'ant-design-vue/es/cascader'
 import { useAdminForm, useFormAction, FormAction, labelCol, wrapperCol } from '@/hooks/form'
 import type { shopDetailVO } from '@/api/shopManage/types'
 import type { FormInstance } from 'ant-design-vue/es/form/Form'
+import { useDebounceFn } from '@vueuse/core'
 //预约时间
 import 'dayjs/locale/zh-cn'
 const emits = defineEmits<{
@@ -273,38 +274,42 @@ const handleClose = () => {
 }
 
 /* 表单提交处理 */
-const handleSubmit = () => {
-  formRef.value?.validate().then(res => {
-    if (!anchorData?.location && title.value == '添加门店') {
-      message.info('请先选择具体门店')
-      return false
-    }
-    const addkey: any = {}
-    if (title.value == '添加门店') {
-      addkey.province = anchorData.pname
-      addkey.city = anchorData.cityname
-      addkey.county = anchorData.adname
-      addkey.detail = anchorData.address
-      addkey.longitude = anchorData.location.lng
-      addkey.latitude = anchorData.location.lat
-    }
-    validateAndSubmit(
-      {
-        ...formModel,
-        ...addkey,
-        tradeStartTime: formModel.tradeTime[0],
-        tradeEndTime: formModel.tradeTime[1]
-      },
-      {
-        onSuccess: () => {
-          closeModal()
-          anchorData = null
-          emits('submit-success')
-        }
+const handleSubmit = useDebounceFn(
+  () => {
+    formRef.value?.validate().then(res => {
+      if (!anchorData?.location && title.value == '添加门店') {
+        message.info('请先选择具体门店')
+        return false
       }
-    )
-  })
-}
+      const addkey: any = {}
+      if (title.value == '添加门店') {
+        addkey.province = anchorData.pname
+        addkey.city = anchorData.cityname
+        addkey.county = anchorData.adname
+        addkey.detail = anchorData.address
+        addkey.longitude = anchorData.location.lng
+        addkey.latitude = anchorData.location.lat
+      }
+      validateAndSubmit(
+        {
+          ...formModel,
+          ...addkey,
+          tradeStartTime: formModel.tradeTime[0],
+          tradeEndTime: formModel.tradeTime[1]
+        },
+        {
+          onSuccess: () => {
+            closeModal()
+            anchorData = null
+            emits('submit-success')
+          }
+        }
+      )
+    })
+  },
+  300,
+  { maxWait: 5000 }
+)
 defineExpose({
   async open(newFormAction: FormAction, record?: shopDetailVO) {
     await selectUserList()
diff --git a/vite.config.ts b/vite.config.ts
index e02abbf..53047d0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -20,16 +20,16 @@ import { projectTitle } from './src/config'
 import { antdvStyleDeps } from './src/utils/resolvers'
 
 //xy
-export const serverAddress = 'http://172.18.0.225:8000'
+// export const serverAddress = 'http://172.18.0.225:8000'
 //jt
 // export const serverAddress = 'http://172.18.1.8:8000'
 //ts
 // export const serverAddress = 'http://172.18.0.228:8000'
 //测试
-export const serverAddress = 'http://39.100.77.21:8000'
+// export const serverAddress = 'http://39.100.77.21:8000'
 
 //线上域名,现在用这个
-// export const serverAddress = 'https://byffp.top'
+export const serverAddress = 'https://byffp.top'
 
 export default defineConfig({
   server: {