mkm/engineering_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'update' (#2) from zhangwei into main

Browse Source 
Reviewed-on: #2
This commit is contained in:
weiz 2024-01-20 10:54:33 +08:00
commit bc011826c2
4 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/custom/detail.vue
View File

@ -15,7 +15,7 @@
<!-- <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.company_name }}</el-descriptions-item> --> {{ formData.company_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.address }} {{ formData.province_name + formData.city_name + formData.area_name + formData.address }}
</el-descriptions-item> </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.phone formData.phone

15
src/views/custom/index.vue
View File

@ -53,17 +53,16 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="省" prop="province_name" show-overflow-tooltip /> <el-table-column label="所在省" prop="province_name" show-overflow-tooltip />
<el-table-column label="职务" prop="master_position" show-overflow-tooltip /> <el-table-column label="负责人姓名" prop="master_name" show-overflow-tooltip />
<el-table-column label="手机" prop="master_phone" show-overflow-tooltip /> <el-table-column label="负责人职务" prop="master_position" show-overflow-tooltip />
<el-table-column label="电话" prop="master_telephone" show-overflow-tooltip /> <el-table-column label="负责人手机" prop="master_phone" show-overflow-tooltip />
<el-table-column label="负责人电话" prop="master_telephone" show-overflow-tooltip />
<el-table-column label="负责人" prop="master_name" show-overflow-tooltip /> <el-table-column label="跟进记录" prop="follow_total" show-overflow-tooltip />
<el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
<el-table-column label="最后跟进" prop="last_follow_date" show-overflow-tooltip /> <el-table-column label="最后跟进" prop="last_follow_date" show-overflow-tooltip />
<el-table-column label="下次回访日期" prop="next_follow_date" show-overflow-tooltip /> <el-table-column label="下次回访日期" prop="next_follow_date" show-overflow-tooltip />
<el-table-column label="跟进" prop="follow_total" show-overflow-tooltip /> <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
<el-table-column label="备注" prop="master_notes" show-overflow-tooltip />
<el-table-column label="操作" width="160" fixed="right"> <el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button v-perms="['custom.custom/edit']" type="primary" link @click="handleEdit(row)"> <el-button v-perms="['custom.custom/edit']" type="primary" link @click="handleEdit(row)">

20
src/views/custom_contacts/detail.vue
View File

@ -7,16 +7,16 @@
<el-descriptions :column="1" border> <el-descriptions :column="1" border>
<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.custom_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.name }}</el-descriptions-item> 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.position }}</el-descriptions-item> formData.position }}</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.phone }} {{ formData.phone }}
</el-descriptions-item> </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.telephone }}</el-descriptions-item> formData.telephone }}</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.email }}</el-descriptions-item> formData.email }}</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.notes }}</el-descriptions-item> formData.notes }}</el-descriptions-item>
@ -32,16 +32,6 @@
暂无文件 暂无文件
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="添加人" label-align="left" align="left"
label-class-name="my-label"></el-descriptions-item>
<el-descriptions-item label="创建日期" label-align="left" align="left"
label-class-name="my-label"></el-descriptions-item>
<el-descriptions-item label="更新人" label-align="left" align="left"
label-class-name="my-label"></el-descriptions-item>
<el-descriptions-item label="更新日期" label-align="left" align="left"
label-class-name="my-label"></el-descriptions-item>
</el-descriptions> </el-descriptions>
</popup> </popup>

14
src/views/custom_follow/index.vue
View File

@ -10,7 +10,8 @@
<el-form-item label="类型" prop="types"> <el-form-item label="类型" prop="types">
<el-select class="w-[280px]" v-model="queryParams.types" clearable placeholder="请选择类型"> <el-select class="w-[280px]" v-model="queryParams.types" clearable placeholder="请选择类型">
<el-option label="全部" value=""></el-option> <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-select>
</el-form-item> </el-form-item>
@ -27,14 +28,15 @@
</template> </template>
新增 新增
</el-button> </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> </el-button>
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="序号" type="index" width="55" /> <el-table-column label="序号" type="index" width="55" />
<el-table-column label="客户名称" prop="custom_id" 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="contacts" show-overflow-tooltip />
<el-table-column label="日期" prop="date" show-overflow-tooltip /> <el-table-column label="日期" prop="date" show-overflow-tooltip />
@ -63,10 +65,12 @@
<!-- <el-table-column label="状态" prop="status" show-overflow-tooltip /> --> <!-- <el-table-column label="状态" prop="status" show-overflow-tooltip /> -->
<el-table-column label="操作" width="160" fixed="right"> <el-table-column label="操作" width="160" fixed="right">
<template #default="{ row }"> <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>
<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>
<el-button v-perms="['custom_follow.custom_follow/detail']" link @click="handledetail(row)"> <el-button v-perms="['custom_follow.custom_follow/detail']" link @click="handledetail(row)">