123

.env.development

@@ -4,4 +4,5 @@ VITE_PASSWORD_SECRET_KEY===ad-distribute=
 VITE_IMAGE_DOMAIN=https://hccake-img.oss-cn-shanghai.aliyuncs.com
 # 用来回显图片
 # http://39.100.77.21:8001
-VITE_SERVERURL=https://byffp.top
+VITE_SERVERURL=https://byffp.top
+# VITE_SERVERURL=http://39.100.77.21:8001

.eslintrc-auto-import.json

@@ -77,4 +77,4 @@
     "watchSyncEffect": true,
     "toValue": true
   }
-}
+}

package.json

@@ -1,6 +1,7 @@
 {
-  "name": "ballcat-ui-vue3",
+  "name": "byhl-zt",
-  "version": "0.0.0",
+  "version": "0.0.1",
+  "description": "线索分发系统",
   "packageManager": "pnpm@8.2.0",
   "scripts": {
     "dev": "vite --host",

src/api/geopoliticalCustomers/index.ts

@@ -144,9 +144,11 @@ export function selectedReviewerList() {
   return httpClient.get<ApiResult>('/system/user/review/list')
 }
 /**
- * 分发
+ * 撤回-以分发
- * @param customerDto 提交后分发
+ * @param
  */
-// export function updatedistribute(customerDto: CustomerDTO) {
+export function customRecallForm(id: number) {
-//   return httpClient.post<ApiResult<void>>('/custom/auditDistribute', customerDto)
+  return httpClient.get<ApiResult>('/custom/recallForm', {
-// }
+    params: { id }
+  })
+}

src/hooks/websocket.ts

@@ -19,11 +19,6 @@ const useAdminWebSocket = () => {
     const baseUri = import.meta.env.VITE_API_URL
     const host = window.location.host
     const wsUri = `wss://${host}${baseUri}/ws?access_token=${accessToken}`
-<<<<<<< HEAD
-=======
-    console.log(wsUri, 'wsUri')
->>>>>>> 5f87413450a7cc2d78ad58061d92f900031ae1f9
-
     //使用useWebSocket函数创建WebSocket连接，并配置自动重连和心跳机制
     useWebSocketReturn = useWebSocket(wsUri, {
       autoReconnect: {

src/views/customermanagement/customerList/customerListEditModal.vue

@@ -112,7 +112,6 @@ const stepItemClick = (record: clueStageItem) => {
   formModel.clueId = resourcesId.value
   formModel.clueStageName = record.name
   formModel.clueStageId = record.clueStageId
-  console.log(formModel, 'formModel')
 }
 
 //标签组列表
@@ -276,13 +275,7 @@ const clueStageCurrentId = ref<number>()
 
 defineExpose({
   async open(newFormAction: FormAction, record: CustomerListRecord, tabIndex: string) {
-    // activeKey.value = tabIndex
-    openModal()
     resetFields()
-    // if (newFormAction === FormAction.CREATE) {
-    //   title.value = '新建菜单'
-    // } else {
-    title.value = '编辑'
     resourcesId.value = record.clueId
     formModel.clueId = record.clueId
     formModel.customInformation = record.customInformation
@@ -291,6 +284,8 @@ defineExpose({
     clueStage.length = 0
     await doRequest(getResourcesDetail(toRaw(resourcesId.value)), {
       onSuccess: (res: any) => {
+        openModal()
+        title.value = '编辑'
         const a = res.data.clueStageEntities.map((item: any) => {
           return { name: item.name, sort: item.sort, clueStageId: item.clueStageId }
         })
@@ -331,8 +326,8 @@ defineExpose({
         //     // }
         //   })
         // }
-        console.log(res.data.clueLabelName, 'res.data.clueLabelName')
+        // console.log(res.data.clueLabelName, 'res.data.clueLabelName')
-        console.log(formModel.clueLabelList, 'formModel.clueLabelList')
+        // console.log(formModel.clueLabelList, 'formModel.clueLabelList')
         // formModel.clueLabelList.length = 0
         // formModel.clueLabelList.push(...b)
         clueStageCurrentId.value = res.data.clueStageId

src/views/qualityInspectionDistribution/inspectionIndex.vue

@@ -25,6 +25,7 @@
             @click="handleEditView(record)"
             >审核</a
           >
+          <a v-if="record.enrollStatus == 2" @click="customRecallFormFun(record.customId)">撤回</a>
         </operation-group>
       </template>
     </template>
@@ -35,18 +36,19 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, createVNode } from 'vue'
-// import { message } from 'ant-design-vue'
+import { message, Modal } from 'ant-design-vue'
-// import { doRequest } from '@/utils/axios/request'
+import { doRequest } from '@/utils/axios/request'
 //底部表格
 import ProTable from '#/table'
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue'
 import type { ProTableInstanceExpose, TableRequest, ProColumns } from '#/table'
 import { mergePageParam } from '@/utils/page-utils'
 import { FormAction } from '@/hooks/form'
 import inspectionModal from './inspectionModal.vue'
 import inspectionSearch from './inspectionSearch.vue'
 import inspectionSelectModal from './inspectionSelectModal.vue'
-import { pageAccessLogs } from '@/api/geopoliticalCustomers'
+import { pageAccessLogs, customRecallForm } from '@/api/geopoliticalCustomers'
 import type {
   DistributeTaskManagementPageParam,
   DistributeTaskManagementRecord
@@ -91,6 +93,24 @@ const searchTable = (params: DistributeTaskManagementPageParam) => {
 const handleView = (id: number) => {
   inspectionSelectModalRef.value?.open(FormAction.OTHER, id)
 }
+const customRecallFormFun = (id: number) => {
+  Modal.confirm({
+    title: '确定要撤回该条吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    content: '分发后10分钟内可撤回,撤回后将无法恢复',
+    okText: '确定',
+    okType: 'danger',
+    cancelText: '取消',
+    onOk() {
+      doRequest(customRecallForm(id), {
+        onSuccess: (res: any) => {
+          message.success('操作成功')
+          reloadTable()
+        }
+      })
+    }
+  })
+}
 // 编辑
 const handleEditView = (record: DistributeTaskManagementRecord) => {
   inspectionModalRef.value?.open({

src/views/qualityInspectionDistribution/inspectionSelectModal.vue

@@ -473,5 +473,6 @@ defineExpose({
 ::v-deep .ant-form-item-control-input-content {
   display: flex;
   align-items: center;
+  flex-wrap: wrap;
 }
 </style>

types/auto-imports.d.ts

@@ -1,7 +1,6 @@
 /* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
-// noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
 export {}
 declare global {

vite.config.ts

@@ -26,10 +26,10 @@ import { antdvStyleDeps } from './src/utils/resolvers'
 //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: {