From ac207c8ecae2b9c83b3aedff1cd687383a4c5553 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 14 Mar 2024 11:29:06 +0800
Subject: [PATCH] add

---
 src/views/custom/index.vue         | 41 ++-------------
 src/views/custom_contacts/edit.vue | 80 +++++++++++-------------------
 src/views/custom_service/index.vue |  7 +--
 3 files changed, 37 insertions(+), 91 deletions(-)

diff --git a/src/views/custom/index.vue b/src/views/custom/index.vue
index dddd223..06c10cb 100644
--- a/src/views/custom/index.vue
+++ b/src/views/custom/index.vue
@@ -101,54 +101,20 @@
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
 import { apiCustomLists, apiCustomDelete, apiCustomDetail } from '@/api/custom'
-import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import DetailPopup from './detail.vue'
+import { useRoute } from 'vue-router'
 import {
     apiProvinceList,
 } from "@/api/common";
-import Statistics from '@/components/statistics/index.vue'
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 const showDtail = ref(false)
-const list = reactive([
-    {
-        name: "全部客户",
-        count: 1000,
-    },
-    {
-        name: "公海客户",
-        count: 1000,
-    },
-    {
-        name: "私有客户",
-        count: 1000,
-    },
-    {
-        name: "今日新增",
-        count: 1000,
-    },
-    {
-        name: "今日分配公海客户",
-        count: 1000,
-    },
+const route = useRoute()
 
-    {
-        name: "今日应联系",
-        count: 1000,
-    },
-    {
-        name: "今日未联系",
-        count: 1000,
-    },
-    {
-        name: "今日已联系",
-        count: 1000,
-    },
-]);
 
 
 // 查询条件
@@ -158,9 +124,12 @@ const queryParams = reactive({
     master_phone: '',
     master_name: '',
     province: '',
+    year: route.query?.year || ''
 
 })
 
+
+
 // 选中数据
 const selectData = ref<any[]>([])
 
diff --git a/src/views/custom_contacts/edit.vue b/src/views/custom_contacts/edit.vue
index f5d6df6..c22876f 100644
--- a/src/views/custom_contacts/edit.vue
+++ b/src/views/custom_contacts/edit.vue
@@ -1,58 +1,36 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit"
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
             @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="客户名称" prop="custom_name">
-                            <el-input v-model="formData.custom_name" clearable placeholder="请选择客户"
-                                @click="showDialog = true" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="姓名" prop="name">
-                            <el-input v-model="formData.name" clearable placeholder="请输入姓名" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="职位" prop="position">
-                            <el-input v-model="formData.position" clearable placeholder="请输入职位" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="手机" prop="phone">
-                            <el-input v-model="formData.phone" clearable placeholder="请输入手机" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="电话" prop="telephone">
-                            <el-input v-model="formData.telephone" clearable placeholder="请输入电话" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="邮箱" prop="email">
-                            <el-input v-model="formData.email" clearable placeholder="请输入邮箱" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="备注" prop="notes">
-                            <el-input v-model="formData.notes" clearable placeholder="请输入备注" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <!-- <el-form-item label="附件" prop="annex">
-                            <material-picker v-model="formData.annex" type="file" />
-                        </el-form-item> -->
-                        <el-form-item label="附件">
-                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
-                                @delFile="delFileFn" />
-                        </el-form-item>
-
-                    </el-col>
+                    <el-form-item label="客户名称" prop="custom_name">
+                        <el-input v-model="formData.custom_name" clearable placeholder="请选择客户"
+                            @click="showDialog = true" />
+                    </el-form-item>
+                    <el-form-item label="姓名" prop="name">
+                        <el-input v-model="formData.name" clearable placeholder="请输入姓名" />
+                    </el-form-item>
+                    <el-form-item label="职位" prop="position">
+                        <el-input v-model="formData.position" clearable placeholder="请输入职位" />
+                    </el-form-item>
+                    <el-form-item label="手机" prop="phone">
+                        <el-input v-model="formData.phone" clearable placeholder="请输入手机" />
+                    </el-form-item>
+                    <el-form-item label="电话" prop="telephone">
+                        <el-input v-model="formData.telephone" clearable placeholder="请输入电话" />
+                    </el-form-item>
+                    <el-form-item label="邮箱" prop="email">
+                        <el-input v-model="formData.email" clearable placeholder="请输入邮箱" />
+                    </el-form-item>
+                    <el-form-item label="备注" prop="notes">
+                        <el-input v-model="formData.notes" clearable placeholder="请输入备注" />
+                    </el-form-item>
+                    <el-form-item label="附件">
+                        <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                            @delFile="delFileFn" />
+                    </el-form-item>
                 </el-row>
-
-
                 <el-dialog v-model="showDialog" title="选择客户" width="70%">
                     <customDialog @customEvent="customEvent"></customDialog>
                 </el-dialog>
@@ -70,10 +48,8 @@ import { apiCustomContactsAdd, apiCustomContactsEdit, apiCustomContactsDetail }
 import { apiCustomLists } from '@/api/custom'
 import type { PropType } from 'vue'
 
-
-// 上传文件
-import annexUpload from "@/components/annexUpload/index.vue"
 const handleAvatarSuccess_four = (response: any) => {
+    formData.annex ||= []
     // @ts-ignore
     response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
 };
diff --git a/src/views/custom_service/index.vue b/src/views/custom_service/index.vue
index d5529d3..f493a99 100644
--- a/src/views/custom_service/index.vue
+++ b/src/views/custom_service/index.vue
@@ -41,7 +41,8 @@
                 </el-form-item>
 
                 <el-form-item label="处理结果" prop="processing_result">
-                    <el-input class="w-[280px]" v-model="queryParams.processing_result" clearable placeholder="请输入处理结果" />
+                    <el-input class="w-[280px]" v-model="queryParams.processing_result" clearable
+                        placeholder="请输入处理结果" />
                 </el-form-item>
 
                 <el-form-item label="指定处理人" prop="processed_user">
@@ -101,7 +102,8 @@
                             <!-- <el-button v-perms="['custom_service.custom_service/delete']" type="danger" link @click="handleDelete(row.id)">
                                 删除
                             </el-button> -->
-                            <el-button v-perms="['custom_service.custom_service/detail']" link @click="handledetail(row)">
+                            <el-button v-perms="['custom_service.custom_service/detail']" link
+                                @click="handledetail(row)">
                                 详情
                             </el-button>
                         </template>
@@ -230,4 +232,3 @@ customlist()
 projectlist()
 getLists()
 </script>
-