From 01dd268a2e0726811d07c11330c1971c21e35b18 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, 9 Nov 2023 18:12:12 +0800
Subject: [PATCH] GENGXIN

---
 src/api/index.ts                                      |  2 +-
 src/views/directResources/cluePanel/clueIndex.vue     |  1 -
 src/views/directResources/cluePanel/clueModal.vue     |  7 ++++---
 src/views/directResources/cluePanel/clueSearch.vue    | 11 +++++------
 .../directResources/customerPanel/customerIndex.vue   | 11 -----------
 .../directResources/customerPanel/customerModal.vue   |  8 ++++----
 .../distributeManage/distributeIndex.vue              |  1 -
 .../distributeManage/distributeModal.vue              |  8 ++++----
 8 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index eabc41c..424ed5e 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -2,4 +2,4 @@ import type { ApiResult } from '@/api/types'
 
 export const isSuccess = (result: ApiResult) => {
   return result.code === 200
-}
+}
\ No newline at end of file
diff --git a/src/views/directResources/cluePanel/clueIndex.vue b/src/views/directResources/cluePanel/clueIndex.vue
index 16884b6..414e7ff 100644
--- a/src/views/directResources/cluePanel/clueIndex.vue
+++ b/src/views/directResources/cluePanel/clueIndex.vue
@@ -42,7 +42,6 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 // import { message } from 'ant-design-vue'
-import { doRequest } from '@/utils/axios/request'
 //底部表格
 import ProTable from '#/table'
 import type { ProTableInstanceExpose, TableRequest, ProColumns } from '#/table'
diff --git a/src/views/directResources/cluePanel/clueModal.vue b/src/views/directResources/cluePanel/clueModal.vue
index 4abde9f..e6fcc12 100644
--- a/src/views/directResources/cluePanel/clueModal.vue
+++ b/src/views/directResources/cluePanel/clueModal.vue
@@ -151,9 +151,10 @@ defineExpose({
     resetFields()
     if (newFormAction === FormAction.OTHER) {
       title.value = '详情'
-      record.distributeDate = dayjs(record?.distributeDate, 'YYYY-MM-DD HH:mm:ss')
-      record.otherClueObj.remarkArr = Object.entries(JSON.parse(record.otherClueObj.remarkDict))
-      overrideProperties(formModel, record)
+      const data: directDTO = Object.assign({}, record)
+      data.distributeDate = dayjs(record?.distributeDate, 'YYYY-MM-DD HH:mm:ss')
+      data.otherClueObj.remarkArr = Object.entries(JSON.parse(record.otherClueObj.remarkDict))
+      overrideProperties(formModel, data)
     }
     formAction.value = newFormAction
   }
diff --git a/src/views/directResources/cluePanel/clueSearch.vue b/src/views/directResources/cluePanel/clueSearch.vue
index 4fce0fd..d4ecd37 100644
--- a/src/views/directResources/cluePanel/clueSearch.vue
+++ b/src/views/directResources/cluePanel/clueSearch.vue
@@ -43,14 +43,14 @@
             <div>
               <a-row>
                 <a-col :span="12">
-                  <a-statistic title="总成交数" :value="112893" style="margin-right: 50px" />
+                  <a-statistic title="总成交数" :value="0" style="margin-right: 50px" />
                 </a-col>
                 <a-col :span="12">
-                  <a-statistic title="总分发数" :precision="2" :value="112893" />
+                  <a-statistic title="总分发数" :precision="0" :value="0" />
                 </a-col>
               </a-row>
             </div>
-            <div class="text-center c-red">转化成交比例 80%</div>
+            <div class="text-center c-red">转化成交比例 0%</div>
           </div>
         </div>
       </a-row>
@@ -67,9 +67,7 @@ import { useUserStore } from '@/stores/user-store'
 const { userInfo } = useUserStore()
 
 const userInfoCurrent = ref<string | undefined>('')
-onMounted(() => {
-
-})
+onMounted(() => {})
 const useForm = Form.useForm
 // 表单 label 全局配置
 const labelCol = { md: { span: 6 } }
@@ -122,6 +120,7 @@ const reset = () => {
 </script>
 <style lang="less">
 .bulletin {
+  width: 270px;
   border: 1px solid #d9d9d9;
   border-radius: 2px;
   padding: 10px;
diff --git a/src/views/directResources/customerPanel/customerIndex.vue b/src/views/directResources/customerPanel/customerIndex.vue
index 31cb84c..8cdbf93 100644
--- a/src/views/directResources/customerPanel/customerIndex.vue
+++ b/src/views/directResources/customerPanel/customerIndex.vue
@@ -80,17 +80,6 @@ const columns = ref<any[]>([
     title: '手机号码',
     dataIndex: 'nid'
   },
-  {
-    title: '跟进员',
-    dataIndex: 'userNameList',
-    customRender: ({ record }: any) => {
-      if (record.userNameList.length > 0) {
-        return h('div', record.userNameList.join(','))
-      } else {
-        return h('div', '')
-      }
-    }
-  },
   {
     title: '来源',
     dataIndex: 'originType',
diff --git a/src/views/directResources/customerPanel/customerModal.vue b/src/views/directResources/customerPanel/customerModal.vue
index 90a25b1..db17cc3 100644
--- a/src/views/directResources/customerPanel/customerModal.vue
+++ b/src/views/directResources/customerPanel/customerModal.vue
@@ -149,10 +149,10 @@ defineExpose({
     resetFields()
     if (newFormAction === FormAction.OTHER) {
       title.value = '详情'
-      record.distributeDate = dayjs(record?.distributeDate, 'YYYY-MM-DD HH:mm:ss')
-      // JSON.parse(record.otherClueObj.remarkDict)
-      record.otherClueObj.remarkArr = Object.entries(JSON.parse(record.otherClueObj.remarkDict))
-      overrideProperties(formModel, record)
+      const data: directDTO = Object.assign({}, record)
+      data.distributeDate = dayjs(record?.distributeDate, 'YYYY-MM-DD HH:mm:ss')
+      data.otherClueObj.remarkArr = Object.entries(JSON.parse(record.otherClueObj.remarkDict))
+      overrideProperties(formModel, data)
     }
     formAction.value = newFormAction
   }
diff --git a/src/views/directResources/distributeManage/distributeIndex.vue b/src/views/directResources/distributeManage/distributeIndex.vue
index 0fe858f..68bcdba 100644
--- a/src/views/directResources/distributeManage/distributeIndex.vue
+++ b/src/views/directResources/distributeManage/distributeIndex.vue
@@ -58,7 +58,6 @@ import distributeSearch from './distributeSearch.vue'
 import { pageQueryPage } from '@/api/directResources'
 import type { directDTO, directPageParam } from '@/api/directResources/types'
 import { useUserStore } from '@/stores/user-store'
-import ResizeObserver from 'ant-design-vue/es/vc-resize-observer'
 defineOptions({ name: 'DistributeIndex' })
 
 const { userInfo } = useUserStore()
diff --git a/src/views/directResources/distributeManage/distributeModal.vue b/src/views/directResources/distributeManage/distributeModal.vue
index 154f3f7..c7b6c20 100644
--- a/src/views/directResources/distributeManage/distributeModal.vue
+++ b/src/views/directResources/distributeManage/distributeModal.vue
@@ -179,7 +179,6 @@ const handleSubmit = () => {
         userName: userList.filter((it: any) => it.userId == item)[0].userName
       })
     })
-    console.log('data===', data)
     doRequest(upDistribute(data), {
       successMessage: '分发成功',
       onSuccess: () => {
@@ -195,9 +194,10 @@ defineExpose({
     resetFields()
     if (newFormAction === FormAction.UPDATE) {
       title.value = '分发'
-      record.distributeDate = dayjs(record?.distributeDate, 'YYYY-MM-DD HH:mm:ss')
-      record.otherClueObj.remarkArr = Object.entries(JSON.parse(record.otherClueObj.remarkDict))
-      overrideProperties(formModel, record)
+      const data: directDTO = Object.assign({}, record)
+      data.distributeDate = dayjs(record?.distributeDate, 'YYYY-MM-DD HH:mm:ss')
+      data.otherClueObj.remarkArr = Object.entries(JSON.parse(record.otherClueObj.remarkDict))
+      overrideProperties(formModel, data)
     }
     formAction.value = newFormAction
   }