Merge branch 'main' of https://gitea.lihaink.cn/mkm/engineering_admin

src/views/custom_contacts/index.vue

@@ -2,6 +2,9 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="客户名称" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
+                </el-form-item>
                 <el-form-item label="姓名" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入姓名" />
                 </el-form-item>
@@ -21,7 +24,8 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['custom.custom_contacts/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['custom.custom_contacts/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
@@ -30,6 +34,7 @@
                     <el-table-column label="序号" type="index" width="55" />
                     <el-table-column label="组织" prop="org_name" show-overflow-tooltip />
                     <el-table-column label="部门" prop="dept_name" show-overflow-tooltip />
+                    <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
                     <el-table-column label="姓名" prop="name" show-overflow-tooltip />
                     <el-table-column label="职位" prop="position" show-overflow-tooltip />
                     <el-table-column label="手机" prop="phone" show-overflow-tooltip />
@@ -39,10 +44,12 @@
 
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['custom.custom_contacts/edit']" type="primary" link @click="handleEdit(row)">
+                            <el-button v-perms="['custom.custom_contacts/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['custom.custom_contacts/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['custom.custom_contacts/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                             <el-button v-perms="['custom.custom_contacts/detail']" link @click="handledetail(row)">
@@ -78,6 +85,7 @@ const showDtail = ref(false)
 // 查询条件
 const queryParams = reactive({
     custom_id: '',
+    custom_name: '',
     name: '',
     position: '',
     phone: '',

src/views/custom_follow/detail.vue

@@ -4,22 +4,30 @@
         <popup ref="popupRef" title="客户跟进记录详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
 
             <el-descriptions :column="2" border>
-                <el-descriptions-item label="主题" label-align="left" align="left" label-class-name="my-label">{{ formData.name }}</el-descriptions-item>
+                <el-descriptions-item label="主题" label-align="left" align="left" label-class-name="my-label">{{
-                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.custom_name }}</el-descriptions-item>
+                    formData.name }}</el-descriptions-item>
-                <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{ formData.contacts }}</el-descriptions-item>
+                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.custom_name }}</el-descriptions-item>
+                <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.custom_master_name }}</el-descriptions-item>
                 <el-descriptions-item label="日期" label-align="left" align="left" label-class-name="my-label">
                     {{ formData.date }}
                 </el-descriptions-item>
-                <el-descriptions-item label="类型" label-align="left" align="left" label-class-name="my-label"> <dict-value :options="dictData.follow_type" :value="formData.types" /></el-descriptions-item>
+                <el-descriptions-item label="类型" label-align="left" align="left" label-class-name="my-label"> <dict-value
-                <el-descriptions-item label="执行人" label-align="left" align="left" label-class-name="my-label"> {{ formData.executor }}</el-descriptions-item>
+                        :options="dictData.follow_type" :value="formData.types" /></el-descriptions-item>
-                <el-descriptions-item label="行动描述" label-align="left" align="left" label-class-name="my-label"> {{ formData.description }}</el-descriptions-item>
+                <el-descriptions-item label="执行人" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.executor }}</el-descriptions-item>
+                <el-descriptions-item label="行动描述" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.description }}</el-descriptions-item>
 
-                <el-descriptions-item label="下次回访日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.next_follow_date }}</el-descriptions-item>
+                <el-descriptions-item label="下次回访日期" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.next_follow_date }}</el-descriptions-item>
 
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                     <div v-if="formData.annex && formData.annex.length > 0">
                         <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
+                                target="_blank">文件{{ index + 1 }}查看</el-link>
 
                         </div>
                     </div>

src/views/custom_follow/edit.vue

@@ -8,8 +8,8 @@
                 <el-form-item label="客户名称" prop="custom_name">
                     <el-input v-model="formData.custom_name" @click="showDialog = true" clearable placeholder="请选择客户" />
                 </el-form-item>
-                <el-form-item label="联系人" prop="contacts">
+                <el-form-item label="联系人" prop="custom_master_name">
-                    <el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
+                    <el-input v-model="formData.custom_master_name" clearable placeholder="请输入联系人" />
                 </el-form-item>
                 <el-form-item label="日期" prop="date">
                     <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable value-format="YYYY-MM-DD"
@@ -93,7 +93,7 @@ const formData = reactive({
     name: '',
     custom_id: '',
     custom_name: '',
-    contacts: '',
+    custom_master_name: '',
     date: '',
     types: '',
     executor: '',
@@ -139,6 +139,7 @@ const getDetail = async (row: Record<string, any>) => {
 const customEvent = (e: any) => {
     formData.custom_id = e.id;
     formData.custom_name = e.name;
+    formData.custom_master_name = e.master_name;
     showDialog.value = false;
 };
 

src/views/custom_follow/index.vue

@@ -3,9 +3,18 @@
         <!-- <Statistics :list="list"></Statistics> -->
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="主题" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入主题" />
+                </el-form-item>
+                <el-form-item label="客户名称" prop="custom_name">
+                    <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
+                </el-form-item>
                 <el-form-item label="联系人" prop="contacts">
                     <el-input class="w-[280px]" v-model="queryParams.contacts" clearable placeholder="请输入联系人" />
                 </el-form-item>
+                <el-form-item label="执行人" prop="executor">
+                    <el-input class="w-[280px]" v-model="queryParams.executor" clearable placeholder="请输入执行人" />
+                </el-form-item>
 
                 <el-form-item label="类型" prop="types">
                     <el-select class="w-[280px]" v-model="queryParams.types" clearable placeholder="请选择类型">
@@ -36,8 +45,9 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
+                    <el-table-column label="跟进主题" prop="name" show-overflow-tooltip />
                     <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
-                    <el-table-column label="联系人" prop="contacts" show-overflow-tooltip />
+                    <el-table-column label="联系人" prop="custom_master_name" show-overflow-tooltip />
                     <el-table-column label="日期" prop="date" show-overflow-tooltip />
 
                     <el-table-column label="类型" prop="types">
@@ -148,7 +158,10 @@ const list = reactive([
 // 查询条件
 const queryParams = reactive({
     custom_id: '',
+    name: '',
+    custom_name: '',
     contacts: '',
+    executor: '',
     date: '',
     types: '',
     admin_id: '',

src/views/custom_service/edit.vue

@@ -2,14 +2,6 @@
     <div class="edit-popup">
         <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>
-                    <el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
-                        <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">
@@ -264,8 +256,6 @@ const getlist1 = (id: any) => {
 // 表单数据
 const formData = reactive({
     id: '',
-    dept_id: '',
-    org_id: '',
     project_id: '',
     contacts: '',
     custom_master_name: "",

src/views/project/index.vue

@@ -5,10 +5,7 @@
             <el-form class="mb-[-16px]" :model="queryParams" inline label-width="auto">
 
                 <el-form-item label="客户名称" prop="custom_name">
-                    <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户昵称" />
+                    <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
-                </el-form-item>
-                <el-form-item label="负责人" prop="person">
-                    <el-input class="w-[280px]" v-model="queryParams.person" clearable placeholder="请输入负责人" />
                 </el-form-item>
                 <el-form-item label="项目编码" prop="project_code">
                     <el-input class="w-[280px]" v-model="queryParams.project_code" clearable placeholder="请输入项目编码" />
@@ -16,22 +13,9 @@
                 <el-form-item label="项目名称" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入项目名称" />
                 </el-form-item>
-
+                <el-form-item label="负责人" prop="person">
-                <el-form-item label="项目内容" prop="project_content">
+                    <el-input class="w-[280px]" v-model="queryParams.person" clearable placeholder="请输入负责人" />
-                    <el-select class="w-[280px]" v-model="queryParams.project_content" clearable placeholder="请选择战略意义">
-                        <el-option label="全部" value=""></el-option>
-                        <el-option v-for="(item, index) in dictData.project_content" :key="index" :label="item.name"
-                            :value="item.value" />
-                    </el-select>
                 </el-form-item>
-
-                <el-form-item label="项目状态" prop="status">
-                    <el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入项目状态" />
-                </el-form-item>
-                <el-form-item label="项目所在地址" prop="project_address">
-                    <el-input class="w-[280px]" v-model="queryParams.project_address" clearable placeholder="请输入客户昵称" />
-                </el-form-item>
-
                 <el-form-item label="战略意义" prop="strategic_significance">
                     <el-select class="w-[280px]" v-model="queryParams.strategic_significance" clearable
                         placeholder="请选择战略意义">
@@ -119,7 +103,7 @@
                                 删除
                             </el-button>
                             <el-button v-perms="['project.project/detail']" link @click="handledetail(row)">
-                                详情22
+                                详情
                             </el-button>
                         </template>
                     </el-table-column>