diff --git a/src/components/annexUpload/index.vue b/src/components/annexUpload/index.vue
index b1e17bf..257746f 100644
--- a/src/components/annexUpload/index.vue
+++ b/src/components/annexUpload/index.vue
@@ -1,24 +1,33 @@
 
-import type { isTemplate } from 'element-plus/es/utils';
 <template>
     <el-upload
         accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
-        class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }"
-        :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
+        class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore?.token }"
+        :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess" ref="upload">
         <el-button type="primary">
             上传
         </el-button>
     </el-upload>
     <div>
-        <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+        <div v-for="(item, index) in annex" style="margin-left: 5px;display: block;">
             <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{
                 item.name }}</a>
-            <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
+            <span style="cursor: pointer;margin-left: 5px;" @click="delFile(index)">x</span>
         </div>
     </div>
 </template>
-<script>
-
+<script setup>
+import { ref, reactive, defineProps, defineEmits } from "vue"
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
+const userStore = useUserStore();
+const base_url = ref(configs.baseUrl + configs.urlPrefix)
+const props = defineProps({
+    annex: Array
+})
 
+const emits = defineEmits(["handleAvatarSuccess", 'delFileFn']);
+const handleAvatarSuccess = (res) => { emits("handleAvatarSuccess", res); }
+const delFile = (index) => { emits("delFile", index); }
 
 </script>
\ No newline at end of file
diff --git a/src/views/custom/edit.vue b/src/views/custom/edit.vue
index 1ae0548..82f5190 100644
--- a/src/views/custom/edit.vue
+++ b/src/views/custom/edit.vue
@@ -3,7 +3,6 @@
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
-
                     <el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
                         <el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
                     </el-select>
@@ -322,13 +321,19 @@ import {
 } from "@/api/common";
 import customDialog from '@/components/custom-dialog/index.vue'
 import type { FormInstance } from 'element-plus'
-
-import useUserStore from "@/stores/modules/user";
 import Popup from '@/components/popup/index.vue'
 import { apiCustomAdd, apiCustomEdit, apiCustomDetail } from '@/api/custom'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
+import { deptAll } from '@/api/org/department'
+import { getAll } from '@/api/org/organization'
+import feedback from "@/utils/feedback";
+import configs from "@/config"
+import useUserStore from "@/stores/modules/user";
 const userStore = useUserStore();
+const base_url = configs.baseUrl + configs.urlPrefix
+
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -344,12 +349,6 @@ const list1 = reactive([])
 const showDialog = ref(false);
 const list2 = reactive([])
 const otherList = reactive([{}])
-import configs from "@/config"
-
-const base_url = configs.baseUrl + configs.urlPrefix
-import { deptAll } from '@/api/org/department'
-import { getAll } from '@/api/org/organization'
-import feedback from "@/utils/feedback";
 const datas = reactive({
     provinceOptions: [],
     cityOptions: [],
diff --git a/src/views/custom_contacts/edit.vue b/src/views/custom_contacts/edit.vue
index b2adb02..e5063ba 100644
--- a/src/views/custom_contacts/edit.vue
+++ b/src/views/custom_contacts/edit.vue
@@ -44,24 +44,8 @@
                             <material-picker v-model="formData.annex" type="file" />
                         </el-form-item> -->
                         <el-form-item label="附件" prop="field127">
-                            <el-upload accept=".pdf" class="upload-demo" :show-file-list="false" aria-hidden="true"
-                                :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
-                                :on-success="handleAvatarSuccess_four" ref="upload">
-                                <el-button type="primary">
-                                    上传
-                                </el-button>
-                            </el-upload>
-
-                            <div>
-                                <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
-                                        target="_blank">{{ item.name }}</a>
-                                    <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                                </div>
-                            </div>
-
-
-
+                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
                         </el-form-item>
 
                     </el-col>
@@ -83,31 +67,19 @@ import Popup from '@/components/popup/index.vue'
 import customDialog from '@/components/custom-dialog/index.vue'
 import { apiCustomContactsAdd, apiCustomContactsEdit, apiCustomContactsDetail } from '@/api/custom_contacts'
 import { apiCustomLists } from '@/api/custom'
-import useUserStore from "@/stores/modules/user";
-import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
-import configs from "@/config"
-const base_url = configs.baseUrl + configs.urlPrefix
-const userStore = useUserStore();
+
+
 // 上传文件
-const handleAvatarSuccess_four = (
-    response,
-    uploadFile
-) => {
-    if (response.code == 0) {
-        ElMessage.error(response.msg);
-        return;
-    }
-    formData.annex.push(
-        { uri: response.data.uri, name: response.data.name }
-
-
-    );
+import annexUpload from "@/components/annexUpload/index.vue"
+const handleAvatarSuccess_four = (response: any) => {
+    // @ts-ignore
+    response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
 };
+
 // 删除上传的文件
-const delFileFn = (index: number) => {
-    formData.annex.splice(index, 1)
-}
+const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
+
 
 defineProps({
     dictData: {
@@ -115,17 +87,13 @@ defineProps({
         default: () => ({})
     }
 })
+
 const showDialog = ref(false);
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 
-const customEvent = (e: any) => {
-    formData.custom_id = e.id;
-    formData.custom_name = e.name;
-    showDialog.value = false;
-};
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -154,7 +122,11 @@ const formData = reactive({
     status: '',
 })
 
-
+const customEvent = (e: any) => {
+    formData.custom_id = e.id;
+    formData.custom_name = e.name;
+    showDialog.value = false;
+};
 // 表单验证
 const formRules = reactive<any>({
     custom_name: [{
diff --git a/src/views/custom_follow/edit.vue b/src/views/custom_follow/edit.vue
index 7bb5b6b..62669ae 100644
--- a/src/views/custom_follow/edit.vue
+++ b/src/views/custom_follow/edit.vue
@@ -23,29 +23,15 @@
                             :value="parseInt(item.value)" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="执行人" prop="admin_id">
-                    <el-input v-model="formData.admin_id" clearable placeholder="请输入执行人" />
+                <el-form-item label="执行人" prop="executor">
+                    <el-input v-model="formData.executor" clearable placeholder="请输入执行人" />
                 </el-form-item>
                 <el-form-item label="行动描述" prop="description">
                     <el-input v-model="formData.description" clearable placeholder="请输入行动描述" />
                 </el-form-item>
                 <el-form-item label="附件/现场照片" prop="annex">
-                    <!-- <material-picker v-model="formData.annex" /> -->
-                    <el-upload
-                        accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
-                        class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }"
-                        :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
-                        <el-button type="primary">
-                            上传
-                        </el-button>
-                    </el-upload>
-                    <div>
-                        <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
-                                target="_blank">{{ item.name }}</a>
-                            <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                        </div>
-                    </div>
+                    <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                        @delFile="delFileFn" />
                 </el-form-item>
                 <el-form-item label="位置" prop="coordinate">
                     <el-input v-model="formData.coordinate" clearable placeholder="请输入位置" />
@@ -72,10 +58,18 @@ import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 import { usePaging } from '@/hooks/usePaging'
 import { apiCustomLists } from '@/api/custom'
-import configs from "@/config"
-import useUserStore from "@/stores/modules/user";
-const base_url = configs.baseUrl + configs.urlPrefix
-const userStore = useUserStore();
+// 上传文件
+import annexUpload from "@/components/annexUpload/index.vue"
+const handleAvatarSuccess_four = (response: any) => {
+    // @ts-ignore
+    response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
+};
+
+// 删除上传的文件
+const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
+// <annexUpload : annex = "formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+// @delFile="delFileFn" />
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -102,7 +96,7 @@ const formData = reactive({
     contacts: '',
     date: '',
     types: '',
-    admin_id: '',
+    executor: '',
     description: '',
     annex: [],
     coordinate: '',
@@ -110,15 +104,6 @@ const formData = reactive({
     status: '',
 })
 
-// 上传文件
-const handleAvatarSuccess_four = (response: any) => {
-    // @ts-ignore
-    response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
-};
-// 删除上传的文件
-const delFileFn = (index: number) => {
-    formData.annex.splice(index, 1)
-}
 // 表单验证
 const formRules = reactive<any>({
 
diff --git a/src/views/custom_follow/index.vue b/src/views/custom_follow/index.vue
index 9c030a4..23ac172 100644
--- a/src/views/custom_follow/index.vue
+++ b/src/views/custom_follow/index.vue
@@ -10,7 +10,8 @@
                 <el-form-item label="类型" prop="types">
                     <el-select class="w-[280px]" v-model="queryParams.types" clearable placeholder="请选择类型">
                         <el-option label="全部" value=""></el-option>
-                        <el-option v-for="(item, index) in dictData.types" :key="index" :label="item.name" :value="item.value" />
+                        <el-option v-for="(item, index) in dictData.types" :key="index" :label="item.name"
+                            :value="item.value" />
                     </el-select>
                 </el-form-item>
 
@@ -27,7 +28,8 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['custom_follow.custom_follow/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['custom_follow.custom_follow/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
@@ -43,7 +45,7 @@
                             <dict-value :options="dictData.follow_type" :value="row.types" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="执行人" prop="add_user" show-overflow-tooltip />
+                    <el-table-column label="执行人" prop="executor" show-overflow-tooltip />
                     <el-table-column label="行动描述" prop="description" show-overflow-tooltip />
                     <el-table-column label="附件/现场照片" prop="annex">
                         <template #default="{ row }">
@@ -63,10 +65,12 @@
                     <!-- <el-table-column label="状态" prop="status" show-overflow-tooltip /> -->
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['custom_follow.custom_follow/edit']" type="primary" link @click="handleEdit(row)">
+                            <el-button v-perms="['custom_follow.custom_follow/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['custom_follow.custom_follow/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['custom_follow.custom_follow/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                             <el-button v-perms="['custom_follow.custom_follow/detail']" link @click="handledetail(row)">
@@ -76,7 +80,7 @@
                     </el-table-column>
                 </el-table>
             </div>
-            <div class="flex mt-4 justify-end">
+            <div class="flex justify-end mt-4">
                 <pagination v-model="pager" @change="getLists" />
             </div>
         </el-card>
diff --git a/src/views/custom_service/edit.vue b/src/views/custom_service/edit.vue
index cbe339a..e89e90a 100644
--- a/src/views/custom_service/edit.vue
+++ b/src/views/custom_service/edit.vue
@@ -3,7 +3,6 @@
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules">
                 <div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
-
                     <el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
                         <el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
                     </el-select>
@@ -11,7 +10,6 @@
                         <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
                     </el-select>
                 </div>
-
                 <el-row :gutter="10">
                     <el-col :span="12">
                         <el-form-item label="项目名称" prop="project_id" @click="showDialog = true">
@@ -23,33 +21,28 @@
                             <el-input v-model="project_code" clearable disabled placeholder="系统自动填写" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="客户名称" prop="project_id"
-                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                            <el-input v-model="formData.custom_name" disabled clearable placeholder="系统自动填写" />
-                        </el-form-item>
-                    </el-col>
 
                     <el-col :span="12">
-                        <el-form-item label="合sd同号" prop="contract_id" @click="showDialog2 = true">
+                        <el-form-item label="客户名称" prop="custom_name"
+                            :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                            <el-input v-model="formData.custom_name" readonly clearable placeholder="系统自动填写" disabled />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="合同号" prop="contract_id" @click="showDialog2 = true">
                             <el-input v-model="formData.contract_code" clearable readonly placeholder="系统自动填写" />
                         </el-form-item>
                     </el-col>
-                    <!-- <el-col :span="12">
-                        <el-form-item label="审批id" prop="approve_id">
-                            <el-input v-model="formData.approve_id" clearable placeholder="请输入审批id" />
-                        </el-form-item>
-                    </el-col> -->
                     <el-col :span="12">
-
-                        <el-form-item label="联系人" prop="contacts">
-                            <el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
+                        <el-form-item label="联系人" prop="custom_master_name">
+                            <el-input v-model="formData.custom_master_name" disabled clearable placeholder="请输入联系人" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
 
-                        <el-form-item label="联系电话" prop="phone" :rules="[{ validator: checkPhone, trigger: 'blur' }]">
-                            <el-input v-model="formData.phone" clearable placeholder="请输入联系电话" />
+                        <el-form-item label="联系电话" prop="custom_master_phone"
+                            :rules="[{ validator: checkPhone, trigger: 'blur' }]">
+                            <el-input v-model="formData.custom_master_phone" disabled clearable placeholder="请输入联系电话" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -113,26 +106,8 @@
 
                         <!-- <material-picker v-model="formData.annex" /> -->
                         <el-form-item label="附件" prop="field127">
-                            <el-upload
-                                accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
-                                class="upload-demo" :show-file-list="false" aria-hidden="true"
-                                :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
-                                :on-success="handleAvatarSuccess_four" ref="upload">
-                                <el-button type="primary">
-                                    上传
-                                </el-button>
-                            </el-upload>
-
-                            <div>
-                                <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
-                                        target="_blank">{{ item.name }}</a>
-                                    <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                                </div>
-                            </div>
-
-
-
+                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
                         </el-form-item>
 
 
@@ -148,10 +123,11 @@
         <el-dialog v-model="showDialog1" title="选择客户" width="70%">
             <customDialog @customEvent="customEvent1"></customDialog>
         </el-dialog>
-        <el-dialog v-model="showDialog2" title="选择销售合同" width="70%">
+        <el-dialog v-model="showDialog2" title="选择项目合同" width="70%">
             <salescontractDialog @customEvent="customEvent2" contract_type="2" :project_id="formData.project_id">
             </salescontractDialog>
         </el-dialog>
+
         <personnelselector ref="personnel" @confirm="submituser" type="1"></personnelselector>
     </div>
 </template>
@@ -174,8 +150,19 @@ import { getAll } from '@/api/org/organization'
 import reviewprocess from '@/components/reviewprocess/index.vue'
 import costDialog from '@/components/budget/index.vue'
 import peojectDialog from '@/components/project/index.vue'
-const base_url = configs.baseUrl + configs.urlPrefix
-const userStore = useUserStore();
+
+
+// 上传文件
+import annexUpload from "@/components/annexUpload/index.vue"
+const handleAvatarSuccess_four = (response: any) => {
+    // @ts-ignore
+    response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
+};
+// 删除上传的文件
+const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
+// <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+//                                 @delFile="delFileFn" />
+
 const list = reactive([])
 const showDialog = ref(false)
 const showDialog1 = ref(false)
@@ -187,48 +174,29 @@ const contract_id = ref('')
 const processed_admin_name = ref('')
 const personnel = ref<any>()
 const formDataannex = reactive([])
+
 const customEvent = (e: any) => {
-    console.log(e)
     formData.project_id = e.id
-    formData.custom_name = e.name
+    formData.custom_name = e.custom_name
+    formData.custom_master_phone = e.custom_master_phone
+    formData.custom_master_name = e.custom_master_name
     project_name.value = e.name
     project_code.value = e.project_code
     showDialog.value = false;
 };
+
 const customEvent1 = (e: any) => {
     formData.custom_id = e.id
-    custom_name.value = e.name
+    formData.custom_name = e.name
     showDialog1.value = false;
-
-
 };
+
 const customEvent2 = (e: any) => {
     formData.contract_id = e.id
     formData.contract_code = e.contract_code
     showDialog2.value = false;
-
-
 };
 
-// 上传文件
-const handleAvatarSuccess_four = (
-    response,
-    uploadFile
-) => {
-    if (response.code == 0) {
-        ElMessage.error(response.msg);
-        return;
-    }
-    formDataannex.push(
-        { uri: response.data.uri, name: response.data.name }
-
-    );
-};
-// 删除上传的文件
-const delFileFn = (index: number) => {
-    formDataannex.splice(index, 1)
-}
-
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -243,7 +211,6 @@ const mode = ref('add')
 //打开弹窗
 
 const userclick = () => {
-    // console.log(personnel.value, '1111111')
     personnel.value.open()
 
 }
@@ -301,6 +268,8 @@ const formData = reactive({
     org_id: '',
     project_id: '',
     contacts: '',
+    custom_master_name: "",
+    custom_master_phone: "",
     phone: '',
     date: '',
     classification: '',
@@ -314,7 +283,8 @@ const formData = reactive({
     status: '',
     contract_code: "",
     contract_id: "",
-    custom_name: ""
+    custom_name: "",
+    custom_id: ""
 })
 
 
diff --git a/src/views/custom_service/index.vue b/src/views/custom_service/index.vue
index c0c5660..e62abe9 100644
--- a/src/views/custom_service/index.vue
+++ b/src/views/custom_service/index.vue
@@ -2,19 +2,29 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" label-width="auto" inline>
-                <el-form-item label="项目" prop="project_id">
-                    <el-select class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请选择项目">
+                <el-form-item label="项目编码" prop="project_id">
+                    <!-- <el-select class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请选择项目">
                         <el-option v-for="(item, index) in projectList" :key="index" :label="item.name"
                             :value="parseInt(item.id)" />
-                    </el-select>
+                    </el-select> -->
+                    <el-input class="w-[280px]" v-model="queryParams.project_code" clearable placeholder="请输入项目编码" />
                 </el-form-item>
-                <el-form-item label="客户" prop="custom_id">
-                    <el-select class="w-[280px]" v-model="queryParams.custom_id" clearable placeholder="请选择项目">
+                <el-form-item label="客户名称">
+                    <!-- <el-select class="w-[280px]" v-model="queryParams.custom_id" clearable placeholder="请选择项目">
                         <el-option v-for="(item, index) in customList" :key="index" :label="item.name"
                             :value="parseInt(item.id)" />
-                    </el-select>
-                </el-form-item>
 
+                    </el-select> -->
+                    <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
+
+                </el-form-item>
+                <el-form-item label="合同编码">
+                    <!-- <el-select class="w-[280px]" v-model="queryParams.project_id" clearable placeholder="请选择项目">
+                        <el-option v-for="(item, index) in projectList" :key="index" :label="item.name"
+                            :value="parseInt(item.id)" />
+                    </el-select> -->
+                    <el-input class="w-[280px]" v-model="queryParams.contract_code" clearable placeholder="请输入合同编码" />
+                </el-form-item>
                 <el-form-item label="紧急程度" prop="urgency">
                     <el-select class="w-[280px]" v-model="queryParams.urgency" clearable placeholder="请选择紧急程度">
                         <el-option label="全部" value=""></el-option>
@@ -132,14 +142,15 @@ const customList = ref([])
 
 // 查询条件
 const queryParams = reactive({
-    project_id: '',
-    custom_id: '',
+    project_code: "",
     urgency: '',
     receiver: '',
+    custom_name: "",
     name: '',
     processed_user: '',
     processing_result: '',
     classification: '',
+    contract_code: ""
 })
 
 // 选中数据
diff --git a/src/views/project/edit.vue b/src/views/project/edit.vue
index a9e4585..b109fe9 100644
--- a/src/views/project/edit.vue
+++ b/src/views/project/edit.vue
@@ -223,29 +223,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">
-                        <!-- <el-form-item label="附件" prop="annex">
-                            <el-input v-model="formData.annex" clearable placeholder="请输入附件" />
-                        </el-form-item> -->
-                        <el-form-item label="附件" prop="field127">
-                            <el-upload
-                                accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
-                                class="upload-demo" :show-file-list="false" aria-hidden="true"
-                                :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
-                                :on-success="handleAvatarSuccess_four" ref="upload">
-                                <el-button type="primary">
-                                    上传
-                                </el-button>
-                            </el-upload>
-
-                            <div>
-                                <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
-                                        target="_blank">{{ item.name }}</a>
-                                    <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                                </div>
-                            </div>
-
-                        </el-form-item>
+                        <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                            @delFile="delFileFn" />
                     </el-col>
                 </el-row>
 
@@ -259,42 +238,29 @@
 
 <script lang="ts" setup name="projectEdit">
 import customDialog from '@/components/custom-dialog/index.vue'
-
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiProjectAdd, apiProjectEdit, apiProjectDetail } from '@/api/project'
 import { getAllProjectTypes } from '@/api/projecttype'
-import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
-import configs from "@/config"
-import useUserStore from "@/stores/modules/user";
+// 上传文件
+import annexUpload from "@/components/annexUpload/index.vue"
+const handleAvatarSuccess_four = (response: any) => {
+    // @ts-ignore
+    response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
+};
+// 删除上传的文件
+const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
+// <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+//                                 @delFile="delFileFn" />
+
+
 const protype = reactive([])
-const base_url = configs.baseUrl + configs.urlPrefix
 const formDataannex = reactive([])
-const userStore = useUserStore();
 const list1 = reactive([])
 const list2 = reactive([])
 import { deptAll } from '@/api/org/department'
 import { getAll } from '@/api/org/organization'
-// 上传文件
-const handleAvatarSuccess_four = (
-    response,
-    uploadFile
-) => {
-    if (response.code == 0) {
-        ElMessage.error(response.msg);
-        return;
-    }
-    formDataannex.push(
-        { uri: response.data.uri, name: response.data.name }
-
-
-    );
-};
-// 删除上传的文件
-const delFileFn = (index: number) => {
-    formDataannex.splice(index, 1)
-}
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -426,7 +392,6 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-
     if (formDataannex.length > 0) {
         formData.annex = formDataannex.map((item) => item.uri)
     }
diff --git a/src/views/project_follow_up/edit.vue b/src/views/project_follow_up/edit.vue
index f8d4d09..b0e0594 100644
--- a/src/views/project_follow_up/edit.vue
+++ b/src/views/project_follow_up/edit.vue
@@ -73,8 +73,6 @@
                         </el-form-item> </el-col><el-col :span="8">
                         <el-form-item label="跟进阶段" prop="follow_stage"
                             :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
-                            <!-- <el-input v-model="formData.follow_stage" clearable placeholder="请输入跟进阶段" /> -->
-
                             <el-select class="flex-1" v-model="formData.follow_stage" clearable placeholder="请选择跟进状态">
                                 <el-option v-for="(item, index) in dictData.follow_stage" :key="index" :label="item.name"
                                     :value="parseInt(item.value)" />
@@ -93,34 +91,11 @@
                     </el-col>
                     <el-col :span="24">
                         <el-form-item label="附件" prop="field127">
-                            <el-upload
-                                accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
-                                class="upload-demo" :show-file-list="false" aria-hidden="true"
-                                :headers="{ Token: userStore.token }" :action="base_url + '/upload/file'"
-                                :on-success="handleAvatarSuccess_four" ref="upload">
-                                <el-button type="primary">
-                                    上传
-                                </el-button>
-                            </el-upload>
-
-                            <div>
-                                <div v-for="(item, index) in formDataannex" style="margin-left: 5px;display: block;">
-                                    <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri"
-                                        target="_blank">{{ item.name }}</a>
-                                    <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
-                                </div>
-                            </div>
-
-
-
+                            <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+                                @delFile="delFileFn" />
                         </el-form-item>
                     </el-col>
                 </el-row>
-
-                <!-- <el-form-item label="" prop="ceate_time">
-                    <el-input v-model="formData.ceate_time" clearable placeholder="请输入" />
-                </el-form-item> -->
-
             </el-form>
         </popup>
         <el-dialog v-model="showDialog" title="选择项目" width="70%">
@@ -133,9 +108,21 @@
 import type { FormInstance } from 'element-plus'
 import projectTable from "@/components/project/index.vue"
 import Popup from '@/components/popup/index.vue'
+import feedback from '@/utils/feedback'
 import { apiProjectFollowUpAdd, apiProjectFollowUpEdit, apiProjectFollowUpDetail } from '@/api/project_follow_up'
-import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
+
+// 上传文件
+import annexUpload from "@/components/annexUpload/index.vue"
+const handleAvatarSuccess_four = (response: any) => {
+    // @ts-ignore
+    response.code != 0 ? formData.annex.push({ uri: response.data.uri, name: response.data.name }) : ElMessage.error(response.msg);
+};
+// 删除上传的文件
+const delFileFn = (index: number) => { formData.annex.splice(index, 1) }
+// <annexUpload :annex="formData.annex" @handleAvatarSuccess="handleAvatarSuccess_four"
+//                                 @delFile="delFileFn" />
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -150,37 +137,13 @@ const project_name = ref('')
 const project_code = ref('')
 const custom_name = ref('')
 const formDataannex = reactive([])
-import feedback from '@/utils/feedback'
-import configs from "@/config"
-const base_url = configs.baseUrl + configs.urlPrefix
-import useUserStore from "@/stores/modules/user";
-const userStore = useUserStore();
-// 上传文件
-const handleAvatarSuccess_four = (
-    response,
-    uploadFile
-) => {
-    if (response.code == 0) {
-        feedback.msgError(response.msg);
-        return;
-    }
-    formDataannex.push(
-        { uri: response.data.uri, name: response.data.name }
-
-    );
-};
-// 删除上传的文件
-const delFileFn = (index: number) => {
-    formDataannex.splice(index, 1)
-}
 // dialog
 const showDialog = ref(false)
 const customEvent = (e: any) => {
     formData.project_id = e.id;
     project_name.value = e.name;
     project_code.value = e.project_code;
-    custom_name
-        .value = e.custom_name;
+    custom_name.value = e.custom_name;
     showDialog.value = false;
 };
 
@@ -208,23 +171,21 @@ const formData = reactive({
     notes: '',
     next_follow_up_date: '',
     ceate_time: '',
-    file: []
+    annex: []
 })
 
 
 // 表单验证
 const formRules = reactive<any>({
-
 })
 
-
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
     custom_name.value = data.custom_name
     project_name.value = data.project_name
     project_code.value = data.project_code
-    if (data.file && data.file.length > 0) {
-        const arry1 = data.file.map((item: any, index: any) => {
+    if (data.annex && data.annex.length > 0) {
+        const arry1 = data.annex.map((item: any, index: any) => {
             return {
                 name: `文件${index + 1}`,
                 uri: item
@@ -267,7 +228,7 @@ const checkPhone = (rule: any, value: any, callback: (arg0: Error) => any) => {
 // 提交按钮
 const handleSubmit = async () => {
     if (formDataannex.length > 0) {
-        formData.file = formDataannex.map((item) => item.uri)
+        formData.annex = formDataannex.map((item) => item.uri)
     }
 
     await formRef.value?.validate()
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
new file mode 100644
index 0000000..e69de29