Commit 8b4792ef authored by 罗超's avatar 罗超

Merge branch 'master' of http://gitlab.oytour.com/xiangwei/horse

parents adeaec46 5a14069d
......@@ -14,10 +14,9 @@
"@types/lockr": "^0.8.7",
"@types/lodash": "^4.14.175",
"@types/webpack-env": "^1.16.2",
"ant-design-vue": "^2.2.8",
"axios": "^0.21.1",
"core-js": "^3.6.5",
"element-plus": "^1.2.0-beta.3",
"dayjs": "^1.10.7",
"katex": "^0.13.18",
"lockr": "^0.9.0-beta.0",
"lodash": "^4.17.21",
......
......@@ -29,7 +29,7 @@ module.exports = configure(function (ctx) {
// app boot file (/src/boot)
// --> boot files are part of "main.js"
// https://v2.quasar.dev/quasar-cli/boot-files
boot: ['i18n', 'axios', 'dict', 'permission', 'globalcmp', 'antDesign','naiveUI'],
boot: ['i18n', 'axios', 'dict', 'permission', 'globalcmp','naiveUI'],
// https://v2.quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
css: ['app.scss','svg.scss'],
......
......@@ -10,6 +10,6 @@ export default defineComponent({
</script>
<style lang="sass">
@import url('./css/font.sass')
@import url('//at.alicdn.com/t/font_2930340_5n2w0eo4056.css')
@import url('//at.alicdn.com/t/font_2930340_at4xv6vjdh.css')
@import url('./css/table.sass')
</style>
......@@ -4,18 +4,35 @@
import { HttpResponse } from '@/@types'
import Axios from './axios'
/**
* @interface loginParams -登录参数
* @property {string} grant_type -授权类型
* @property {string} email -邮箱
* @property {string} password -用户密码
*/
interface msg {
Enable: number
}
interface IdName {
Id: number
Name: string
interface CutomerParams {
PageIndex: number,
PageSize: number,
pageCount: number,
CorpName: string, //企业名称
CustomerName: string, //备注名
WeChatName: string, //昵称
CustomerMobile: string, //手机号码
CreateSTime: string, //创建开始时间
CreateETime: string, //创建结束时间
FriendSTime: string, //好友开始时间
FriendETime: string, //好友结束时间
Q_NotFollowUpDay: number, //几天未跟进
Q_Friends: string, //好友关系 多选逗号分隔、
Q_AddWay: string, //获取来源 多选英文逗号分隔
EmpId: number, //员工id
CustomerType: number, //类型1微信用户 2企业微信用户
SelectList: Array<any>, //自定义查询
OrderBy: number, //排序
AddCondition: number //查询条件
}
/**
......@@ -23,215 +40,87 @@ interface IdName {
* @todo Get the exchange rate of the current currency
*/
class customerService {
// 获取客户字段列表
static async getCustomerFiledList(data: msg): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerFiledList', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户标签
static async getLabelList(data: any): Promise<HttpResponse> {
return Axios('/QYWeChat/GetWeChatLableList', {
method: 'post',
responseType: 'json',
data
})
}
// 客户标签移动
static async setCustomerFiledState(data: { Type: number; SortFiledId: number; FiledId: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerFiledState', {
class CustomerService {
// 获取用户列表数据
static async getCustomerList(data: CutomerParams): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerInfoPageList', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户线索配置
static async getCustomerClueRuleConfig(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerClueRuleConfig', {
//获取途径下拉数据
static async getWayList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerAddWayEnumList', {
method: 'post',
responseType: 'json',
data
})
}
// 设置客户线索配置
static async setCustomerClueRuleConfig(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerClueRuleConfig', {
//获取部门-员工下拉数据
static async getEmployeeData(data: any): Promise<HttpResponse> {
return Axios('/User/GetEmployeeAddrBook', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户线索规则列表
static async getCustomerClueRuleList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerClueRuleList', {
//获取员工详情数据
static async getCustomInfo(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户线索规则详情
static async getCustomerClueRuleDetail(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerClueRuleInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 新增修改线索规则
static async setCustomerClueRuleInfo(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerClueRuleInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 设置线索规则状态
static async setCustomerClueRuleState(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerClueRuleState', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户阶段列表
static async getCustomerStageList(data: any): Promise<HttpResponse> {
//获取客户阶段下拉数据
static async getCustomStageList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerStageList', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户子段类型枚举
static async getCustomerFieldTypeEnumList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerFieldTypeEnumList', {
//保存客户资料
static async saveCustomInfo(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 获取部门树形列表
static async getDeptTree(data: any): Promise<HttpResponse> {
return Axios('/User/GetDeptTree', {
//保存客户标签
static async saveCustomLabel(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerLabelBatch', {
method: 'post',
responseType: 'json',
data
})
}
// 获取部门树形列表
static async getCustomerFieldInputTypeEnumList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerFieldInputTypeEnumList', {
//获取客户旅程类型枚举列表
static async getCustomerTripType(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerTripTypeEnumList', {
method: 'post',
responseType: 'json',
data
})
}
//新增修改客户字段
static async setCustomerFiledInfo(data: { Id: number; Type: number; Name: string; Required: number; DeptId: number; WordNum: number; InputType: string; OptionsList: Array<IdName>; Digits: number; Enable: number; [propName: string]: any }): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerFiledInfo', {
//获取客户旅程分页列表
static async getCustomerTripPage(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerTripPageList', {
method: 'post',
responseType: 'json',
data
})
}
//获取客户阶段流程列表
static async getCustomerStageFlowList(data: msg): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerStageFlowList', {
method: 'post',
responseType: 'json',
data
})
}
//设置客户阶段流程状态
static async setCustomerStageFlowState(data: { Type: number; FlowId: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerStageFlowState', {
method: 'post',
responseType: 'json',
data
})
}
//验证该阶段是否可以删除
static async validataCustomerStageDel(data: { StageId: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/ValidataCustomerStageDel', {
method: 'post',
responseType: 'json',
data
})
}
// 验证阶段输单/无效的 原因选项是否可以删除
static async validataCustomerCauseDel(data: { CauseId: number; Type: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/ValidataCustomerCauseDel', {
method: 'post',
responseType: 'json',
data
})
}
// 验证阶段输单/无效的 原因选项是否可以删除
static async setCustomerStageInfo(data: { Id: number; Type: number; Name: string; Sort: number; OptionsList: Array<IdName>; IsDefault: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerStageInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户标签/分组 列表
static async getWeChatLableList(data: any): Promise<HttpResponse> {
return Axios('/QYWeChat/GetWeChatLableList', {
method: 'post',
responseType: 'json',
data
})
}
// 新增修改分组/标签
static async setWeChatLable(data: { Id: number; ParentId: number; Name: string; Sort: string; ChildList: Array<{ Name: string; Sort: string }> }): Promise<HttpResponse> {
return Axios('/QYWeChat/SetWeChatLable', {
method: 'post',
responseType: 'json',
data
})
}
// 新增修改分组/标签
static async delWeChatLable(data: { LableId: number }): Promise<HttpResponse> {
return Axios('/QYWeChat/DelWeChatLable', {
method: 'post',
responseType: 'json',
data
})
}
// 保存客户阶段流程
static async setCustomerStageFlowInfo(data: { Id: number; FlowName: string; DeptEmpList: Array<{ Id: number; Name: string; Type: number }>; UseStage: string; LoseCause: string; InvalidCause: string }): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerStageFlowInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户阶段流程详情
static async getCustomerStageFlowInfo(data: { FlowId: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerStageFlowInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 获取获取客户操作配置
static async getCustomerConfig(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerConfig', {
method: 'post',
responseType: 'json',
data
})
}
// 保存客户操作
static async setCustomerConfig(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerConfig', {
//新增客户跟进记录
static async setCustomerTripFollowUpInfo(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerTripFollowUpInfo', {
method: 'post',
responseType: 'json',
data
})
}
}
export default customerService
export {CutomerParams}
export default CustomerService
/**
* 所有跟用户相关的接口(TODO:DEMO USER)
*/
import { HttpResponse } from '@/@types'
import Axios from './axios'
/**
* @interface loginParams -登录参数
* @property {string} grant_type -授权类型
* @property {string} email -邮箱
* @property {string} password -用户密码
*/
interface CutomerParams {
PageIndex: number,
PageSize: number,
pageCount: number,
CorpName: string, //企业名称
CustomerName: string, //备注名
WeChatName: string, //昵称
CustomerMobile: string, //手机号码
CreateSTime: string, //创建开始时间
CreateETime: string, //创建结束时间
FriendSTime: string, //好友开始时间
FriendETime: string, //好友结束时间
Q_NotFollowUpDay: number, //几天未跟进
Q_Friends: string, //好友关系 多选逗号分隔、
Q_AddWay: string, //获取来源 多选英文逗号分隔
EmpId: number, //员工id
CustomerType: number, //类型1微信用户 2企业微信用户
SelectList: Array<any>, //自定义查询
OrderBy: number, //排序
AddCondition: number //查询条件
}
/**
* @example Axios.get(`https://xxx.com}`)
* @todo Get the exchange rate of the current currency
*/
class CustomerService {
// 获取用户列表数据
static async getCustomerList(data: CutomerParams): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerInfoPageList', {
method: 'post',
responseType: 'json',
data
})
}
//获取途径下拉数据
static async getWayList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerAddWayEnumList', {
method: 'post',
responseType: 'json',
data
})
}
//获取部门-员工下拉数据
static async getEmployeeData(data: any): Promise<HttpResponse> {
return Axios('/User/GetEmployeeAddrBook', {
method: 'post',
responseType: 'json',
data
})
}
//获取员工详情数据
static async getCustomInfo(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerInfo', {
method: 'post',
responseType: 'json',
data
})
}
//获取客户阶段下拉数据
static async getCustomStageList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerStageList', {
method: 'post',
responseType: 'json',
data
})
}
//保存客户资料
static async saveCustomInfo(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerInfo', {
method: 'post',
responseType: 'json',
data
})
}
//保存客户标签
static async saveCustomLabel(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerLabelBatch', {
method: 'post',
responseType: 'json',
data
})
}
//获取客户旅程类型枚举列表
static async getCustomerTripType(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerTripTypeEnumList', {
method: 'post',
responseType: 'json',
data
})
}
//获取客户旅程分页列表
static async getCustomerTripPage(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerTripPageList', {
method: 'post',
responseType: 'json',
data
})
}
//新增客户跟进记录
static async setCustomerTripFollowUpInfo(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerTripFollowUpInfo', {
method: 'post',
responseType: 'json',
data
})
}
}
export {CutomerParams}
export default CustomerService
/**
* 所有跟用户相关的接口(TODO:DEMO USER)
*/
import { HttpResponse } from '@/@types'
import Axios from './axios'
/**
* @interface loginParams -登录参数
* @property {string} grant_type -授权类型
* @property {string} email -邮箱
* @property {string} password -用户密码
*/
interface msg {
Enable: number
}
interface IdName {
Id: number
Name: string
}
/**
* @example Axios.get(`https://xxx.com}`)
* @todo Get the exchange rate of the current currency
*/
class customerSetService {
// 获取客户字段列表
static async getCustomerFiledList(data: msg): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerFiledList', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户标签
static async getLabelList(data: any): Promise<HttpResponse> {
return Axios('/QYWeChat/GetWeChatLableList', {
method: 'post',
responseType: 'json',
data
})
}
// 客户标签移动
static async setCustomerFiledState(data: { Type: number; SortFiledId: number; FiledId: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerFiledState', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户线索配置
static async getCustomerClueRuleConfig(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerClueRuleConfig', {
method: 'post',
responseType: 'json',
data
})
}
// 设置客户线索配置
static async setCustomerClueRuleConfig(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerClueRuleConfig', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户线索规则列表
static async getCustomerClueRuleList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerClueRuleList', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户线索规则详情
static async getCustomerClueRuleDetail(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerClueRuleInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 新增修改线索规则
static async setCustomerClueRuleInfo(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerClueRuleInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 设置线索规则状态
static async setCustomerClueRuleState(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerClueRuleState', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户阶段列表
static async getCustomerStageList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerStageList', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户子段类型枚举
static async getCustomerFieldTypeEnumList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerFieldTypeEnumList', {
method: 'post',
responseType: 'json',
data
})
}
// 获取部门树形列表
static async getDeptTree(data: any): Promise<HttpResponse> {
return Axios('/User/GetDeptTree', {
method: 'post',
responseType: 'json',
data
})
}
// 获取部门树形列表
static async getCustomerFieldInputTypeEnumList(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerFieldInputTypeEnumList', {
method: 'post',
responseType: 'json',
data
})
}
//新增修改客户字段
static async setCustomerFiledInfo(data: { Id: number; Type: number; Name: string; Required: number; DeptId: number; WordNum: number; InputType: string; OptionsList: Array<IdName>; Digits: number; Enable: number; [propName: string]: any }): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerFiledInfo', {
method: 'post',
responseType: 'json',
data
})
}
//获取客户阶段流程列表
static async getCustomerStageFlowList(data: msg): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerStageFlowList', {
method: 'post',
responseType: 'json',
data
})
}
//设置客户阶段流程状态
static async setCustomerStageFlowState(data: { Type: number; FlowId: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerStageFlowState', {
method: 'post',
responseType: 'json',
data
})
}
//验证该阶段是否可以删除
static async validataCustomerStageDel(data: { StageId: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/ValidataCustomerStageDel', {
method: 'post',
responseType: 'json',
data
})
}
// 验证阶段输单/无效的 原因选项是否可以删除
static async validataCustomerCauseDel(data: { CauseId: number; Type: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/ValidataCustomerCauseDel', {
method: 'post',
responseType: 'json',
data
})
}
// 验证阶段输单/无效的 原因选项是否可以删除
static async setCustomerStageInfo(data: { Id: number; Type: number; Name: string; Sort: number; OptionsList: Array<IdName>; IsDefault: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerStageInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户标签/分组 列表
static async getWeChatLableList(data: any): Promise<HttpResponse> {
return Axios('/QYWeChat/GetWeChatLableList', {
method: 'post',
responseType: 'json',
data
})
}
// 新增修改分组/标签
static async setWeChatLable(data: { Id: number; ParentId: number; Name: string; Sort: string; ChildList: Array<{ Name: string; Sort: string }> }): Promise<HttpResponse> {
return Axios('/QYWeChat/SetWeChatLable', {
method: 'post',
responseType: 'json',
data
})
}
// 新增修改分组/标签
static async delWeChatLable(data: { LableId: number }): Promise<HttpResponse> {
return Axios('/QYWeChat/DelWeChatLable', {
method: 'post',
responseType: 'json',
data
})
}
// 保存客户阶段流程
static async setCustomerStageFlowInfo(data: { Id: number; FlowName: string; DeptEmpList: Array<{ Id: number; Name: string; Type: number }>; UseStage: string; LoseCause: string; InvalidCause: string }): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerStageFlowInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 获取客户阶段流程详情
static async getCustomerStageFlowInfo(data: { FlowId: number }): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerStageFlowInfo', {
method: 'post',
responseType: 'json',
data
})
}
// 获取获取客户操作配置
static async getCustomerConfig(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/GetCustomerConfig', {
method: 'post',
responseType: 'json',
data
})
}
// 保存客户操作
static async setCustomerConfig(data: any): Promise<HttpResponse> {
return Axios('/QYCustomer/SetCustomerConfig', {
method: 'post',
responseType: 'json',
data
})
}
}
export default customerSetService
import { boot } from 'quasar/wrappers'
import Antd from 'ant-design-vue'
// import ElementPlus from 'element-plus'
import 'element-plus/dist/index.css'
import 'ant-design-vue/dist/antd.css'
export default boot(({ app }) => {
// Set Antd instance on app
app.use(Antd)
// app.use(ElementPlus)
})
import { boot } from 'quasar/wrappers'
import naive from 'naive-ui'
export default boot(({ app }) => {
// Set naive instance on app
app.use(naive)
......
......@@ -514,7 +514,7 @@ import {
} from 'vue'
import { DownLoadFileByUrl } from '@/utils/upload'
import message from '@/utils/message'
import customer2 from '@/api/customer2'
import customer from '@/api/customer'
import labelgroup from '@/components/customer/label-group.vue'
import fileUpload from '@/components/common/fileUpload.vue'
......@@ -576,7 +576,7 @@ export default {
})
//获取详情数据
const getCustomInfo = (param: msgParam) => {
customer2.getCustomInfo(param).then(res => {
customer.getCustomInfo(param).then(res => {
data.dataList = res.data.Data;
data.FiledDetailList = res.data.Data.FiledDetailList;
data.FiledDetailList.forEach(x => {
......@@ -596,7 +596,7 @@ export default {
}
//获取客户阶段下拉
const getCustomStage = (param) => {
customer2.getCustomStageList(param).then(res => {
customer.getCustomStageList(param).then(res => {
data.customData = res.data.Data;
})
}
......@@ -623,7 +623,7 @@ export default {
} else {
cutomMsg.Value = e.Value;
}
customer2.saveCustomInfo(cutomMsg).then(res => {
customer.saveCustomInfo(cutomMsg).then(res => {
getCustomInfo(msg);
message.successMsg(res.data.Message);
})
......@@ -635,7 +635,7 @@ export default {
cutomMsg.CustomerId = msg.CustomerId;
cutomMsg.Type = 1;
cutomMsg.CustomId = 0;
customer2.saveCustomInfo(cutomMsg).then(res => {
customer.saveCustomInfo(cutomMsg).then(res => {
getCustomInfo(msg);
data.isShowEdit = false;
message.successMsg(res.data.Message);
......@@ -680,14 +680,14 @@ export default {
ckedArr.push(x.Id);
})
labelMsg.LableIds = ckedArr.toString();
customer2.saveCustomLabel(labelMsg).then(res => {
customer.saveCustomLabel(labelMsg).then(res => {
getCustomInfo(msg);
message.successMsg(res.data.Message);
})
}
//获取客户旅程类型
const getCustomerTripType = (param: any) => {
customer2.getCustomerTripType(param).then(res => {
customer.getCustomerTripType(param).then(res => {
console.log(res, 'trip数据');
data.tripTypeArr = res.data.Data;
let Obj = {
......@@ -706,7 +706,7 @@ export default {
}
//获取客户旅程分页列表
const getCustomerPage = () => {
customer2.getCustomerTripPage(customTripMsg).then(res => {
customer.getCustomerTripPage(customTripMsg).then(res => {
console.log(res, '旅程分页数据');
data.tripDataList = res.data.Data.PageData;
data.TripPageCount = res.data.Data.PageCount;
......
This diff is collapsed.
......@@ -8,16 +8,16 @@
<q-input v-model="msg.Remark" maxlength="1000" type="textarea" placeholder="请填写跟进记录" />
<div class="file_box">
<div class="img_list">
<div v-for="(e,i) in msg.ImageList" :key="i" class="img_box">
<div v-for="(e, i) in msg.ImageList" :key="i" class="img_box">
<img :src="e" class="img" />
<q-icon name="cancel" color="primary" class="del_icon" @click="delImg(i)"/>
<q-icon name="cancel" color="primary" class="del_icon" @click="delImg(i)" />
</div>
</div>
<div class="file_list">
<div v-for="(e,i) in msg.FileList" :key="i" class="flex items-center file_box">
<div v-for="(e, i) in msg.FileList" :key="i" class="flex items-center file_box">
<div class="flex items-center">
附件:
<span style="color:#333">{{ e.FileName }}</span>
<span style="color: #333">{{ e.FileName }}</span>
({{ e.size }})
</div>
<div class="del_btn" @click="delFile(i)">删除</div>
......@@ -25,40 +25,23 @@
</div>
</div>
<div class="file_Space">
<div style="display:flex;align-items:center;">
<div style="display: flex; align-items: center">
<div>
<a-upload
accept="image/*"
v-model:file-list="data.imageList"
name="file"
:multiple="true"
:show-upload-list="false"
:customRequest="customUploadImg"
>
<i style="font-size:25px;cursor:pointer;" class="iconfont icon-picture"></i>
</a-upload>
<n-upload accept="image/*" multiple :show-file-list="false" v-model:file-list="data.imageList"
:custom-request="customUploadImg">
<i style="font-size: 25px; cursor: pointer" class="iconfont icon-picture"></i>
</n-upload>
</div>
<div style="margin-left:8px;">
<a-upload
v-model:file-list="data.fileList"
name="file"
:multiple="true"
:show-upload-list="false"
:customRequest="customUploadFile"
>
<i style="font-size:20px;cursor:pointer;" class="iconfont icon-paperclip"></i>
</a-upload>
<div style="margin-left: 8px">
<n-upload accept="image/*" multiple :show-file-list="false" v-model:file-list="data.fileList"
:custom-request="customUploadFile">
<i style="font-size: 20px; cursor: pointer" class="iconfont icon-paperclip"></i>
</n-upload>
</div>
</div>
<div>
<q-btn
color="myInput"
text-color="#000"
size="sm"
@click="data.isShowEdit = false"
label="取消"
/>
<q-btn color="primary" style="margin-left:10px;" size="sm" @click="save" label="确定" />
<q-btn color="myInput" text-color="#000" size="sm" @click="data.isShowEdit = false" label="取消" />
<q-btn color="primary" style="margin-left: 10px" size="sm" @click="save" label="确定" />
</div>
</div>
</div>
......@@ -66,129 +49,145 @@
</div>
</template>
<script lang="ts">
import {
reactive,
inject
} from 'vue'
import customer2 from '@/api/customer2'
import massage from "@/utils/message"
import { UploadSelfFile } from '@/utils/upload'
interface dataParam {
[key: string]: any
}
export default {
setup(props,ctx) {
let msg = reactive<dataParam>({
import {
reactive,
inject
} from 'vue'
import customer from '@/api/customer'
import massage from '@/utils/message'
import {
UploadSelfFile
} from '@/utils/upload'
interface dataParam {
[key: string]: any
}
export default {
setup(props, ctx) {
let msg = reactive < dataParam > ({
CustomerId: inject('CustomerId'),
Remark: "",
Remark: '',
ImageList: [],
FileList: []
})
const data = reactive<dataParam>({
isShowEdit: false,
fileList: [],
imageList: []
})
let customUploadImg = (file) => {
UploadSelfFile('/horse', file.file, (res) => {
msg.ImageList.push(res.FileUrl )
})
}
let customUploadFile = (file) => {
UploadSelfFile('/horse', file.file, (res) => {
msg.FileList.push({ FileName: res.FileName, FileUrl: res.FileUrl, size: res.Size })
})
}
const delImg=(i)=>{
msg.ImageList.splice(i,1)
}
const delFile=(i)=>{
msg.FileList.splice(i,1)
}
const save = () => {
customer2.setCustomerTripFollowUpInfo(msg).then((res)=>{
massage.successMsg(res.data.Message)
msg.Remark=""
msg.ImageList=[]
msg.FileList=[]
ctx.emit("success")
const data = reactive < dataParam > ({
isShowEdit: false,
fileList: [],
imageList: []
})
}
let customUploadImg = file => {
console.log(82,file)
UploadSelfFile('/horse', file.file.file, res => {
msg.ImageList.push(res.FileUrl)
})
}
let customUploadFile = file => {
UploadSelfFile('/horse', file.file.file, res => {
msg.FileList.push({
FileName: res.FileName,
FileUrl: res.FileUrl,
size: res.Size
})
})
}
const delImg = i => {
msg.ImageList.splice(i, 1)
}
const delFile = i => {
msg.FileList.splice(i, 1)
}
const save = () => {
customer.setCustomerTripFollowUpInfo(msg).then(res => {
massage.successMsg(res.data.Message)
msg.Remark = ''
msg.ImageList = []
msg.FileList = []
ctx.emit('success')
})
}
return {
msg,
data,
customUploadImg,
customUploadFile,
delImg,
delFile,
UploadSelfFile,
save
return {
msg,
data,
customUploadImg,
customUploadFile,
delImg,
delFile,
UploadSelfFile,
save
}
}
}
}
</script>
<style lang="scss" scoped>
.editer_input {
padding: 5px 0;
}
.editer_input {
padding: 5px 0;
}
.myInput {
background-color: #f6f6f6 !important;
}
.file_box {
margin-top: 5px;
.img_list {
display: flex;
flex-wrap: wrap;
.img_box {
width: 40px;
height: 40px;
margin: 10px;
.myInput {
background-color: #f6f6f6 !important;
}
position: relative;
.img {
width: 100%;
height: 100%;
overflow: hidden;
object-fit: cover;
}
.del_icon {
font-size: 18px;
position: absolute;
top: 0;
right: 0;
transform: translate(50%, -50%);
.file_box {
margin-top: 5px;
.img_list {
display: flex;
flex-wrap: wrap;
.img_box {
width: 40px;
height: 40px;
margin: 10px;
position: relative;
.img {
width: 100%;
height: 100%;
overflow: hidden;
object-fit: cover;
}
.del_icon {
font-size: 18px;
position: absolute;
top: 0;
right: 0;
transform: translate(50%, -50%);
}
}
}
}
.file_list {
.file_box {
font-size: 14px;
color: #9696a6;
.del_btn {
margin-left: 10px;
padding-left: 5px;
border-left: 1px solid var(--q-primary);
color: var(--q-primary);
cursor: pointer;
.file_list {
.file_box {
font-size: 14px;
color: #9696a6;
.del_btn {
margin-left: 10px;
padding-left: 5px;
border-left: 1px solid var(--q-primary);
color: var(--q-primary);
cursor: pointer;
}
}
}
}
}
.file_Space {
display: flex;
justify-content: space-between;
margin-top: 10px;
align-items: center;
}
.q-field__control {
background-color: #f6f6f6 !important;
}
.file_Space {
display: flex;
justify-content: space-between;
margin-top: 10px;
align-items: center;
}
.q-field__control {
background-color: #f6f6f6 !important;
}
.q-field--filled .q-field__control:hover:before {
opacity: 0;
}
.q-field--filled .q-field__control:hover:before {
opacity: 0;
}
</style>
......@@ -127,7 +127,7 @@
import draggable from "vuedraggable";
import selectTree from '@/components/common/selectTree.vue'
import { useQuasar } from 'quasar'
import customerService from '@/api/customer'
import customerSetService from '@/api/customerSet'
// import { customerFieldtabsType } from '@/@types/customer'
export default defineComponent({
components: { draggable, selectTree },
......@@ -242,7 +242,7 @@
submitobj.InputType = '1'
}
loading.value = true
customerService.setCustomerFiledInfo(submitobj).then((res) => {
customerSetService.setCustomerFiledInfo(submitobj).then((res) => {
if (res.data.Code == 1) {
console.log(res)
$q.notify({
......
......@@ -54,7 +54,7 @@
</template>
<script>
import { defineComponent, ref, onMounted } from 'vue'
import customerService from '@/api/customer'
import customerSetService from '@/api/customerSet'
export default defineComponent({
props: {
......@@ -103,7 +103,7 @@
})
}
const getLabelList = () => {
customerService.getLabelList({}).then((res) => {
customerSetService.getLabelList({}).then((res) => {
if (res.data.Code == 1) {
LableList.value = res.data.Data
LableList.value.forEach(x => {
......
This diff is collapsed.
import customerService from '@/api/customer'
import customerSetService from '@/api/customerSet'
import { ref, reactive } from 'vue'
import clueService, { ClueParams } from '@/api/clue'
import { ColumnDefaultState } from '@/@types/enumHelper'
......@@ -80,7 +80,7 @@ const ClueModule = () => {
colLoadingFinish: false
})
customerService
customerSetService
.getCustomerFiledList({
Enable: 1
})
......
......@@ -12,9 +12,9 @@ import {
ref,
reactive
} from 'vue'
import customer2, {
import customer, {
CutomerParams
} from '@/api/customer2'
} from '@/api/customer'
interface Params {
selectVal: string
selectWay: number
......@@ -47,7 +47,7 @@ interface dataParams {
const CustomerModule = () => {
//调用方法
const getCustomerList = (param: CutomerParams) => {
customer2.getCustomerList(param).then(res => {
customer.getCustomerList(param).then(res => {
console.log(res, '数据')
if (res.data.Code == 1) {
data.dataList = res.data.Data.PageData
......@@ -57,7 +57,7 @@ const CustomerModule = () => {
}
//调用获取下拉
const getWayList = (param: any) => {
customer2.getWayList(param).then(res => {
customer.getWayList(param).then(res => {
if (res.data.Code == 1) {
data.WayList = res.data.Data
}
......@@ -65,7 +65,7 @@ const CustomerModule = () => {
}
//获取员工数据
const getEmployeeData = (param: any) => {
customer2.getEmployeeData(param).then(res => {
customer.getEmployeeData(param).then(res => {
data.EmployeeList = res.data.Data
console.log(data, '员工数据')
// 重组唯一id
......
import { ref, reactive } from 'vue'
import customerSetService from '@/api/customerSet'
import customerService from '@/api/customer'
import customerService2 from '@/api/customer2'
import router from '@/router/index'
import message from '@/utils/message'
interface dataParams {
......@@ -81,7 +81,7 @@ const editRuleModule = () => {
}
//获取线索详情
const getDetail = () => {
customerService.getCustomerClueRuleDetail(msg()).then(res => {
customerSetService.getCustomerClueRuleDetail(msg()).then(res => {
const d = res.data.Data
data.editMsg.DeptList = d.DeptList
data.editMsg.EmpList = d.EmpList
......@@ -101,7 +101,7 @@ const editRuleModule = () => {
}
//获取部门数据
const getEmployeeData = () => {
customerService2.getEmployeeData({}).then(res => {
customerService.getEmployeeData({}).then(res => {
console.log(res.data.Data, '部门')
data.dataTree = res.data.Data
// 重组唯一id
......@@ -128,7 +128,7 @@ const editRuleModule = () => {
// const flag = condition.value.checkRule(data.editMsg.ConditionList)
// console.log(94, flag)
// if (!flag) return
customerService.setCustomerClueRuleInfo(data.editMsg).then(res => {
customerSetService.setCustomerClueRuleInfo(data.editMsg).then(res => {
message.successMsg(res.data.Message)
setTimeout(() => {
router.push({
......
......@@ -99,22 +99,10 @@
<q-input filled v-model="msg.Q_NotFollowUpDay" label="几天未跟进"></q-input>
</div>
<div class="col-3">
<!-- <selectTree
:treeData="data.EmployeeList"
:defaultArray="data.defaultArray"
nodeKey="newId"
:multiple="false"
labelKey="DeptName"
childrenKey="ChildList"
tipText="选择部门/人员"
@getChild="getChild"
></selectTree>-->
<n-cascader v-model:value="data.CascaderValue" clearable placeholder="选择部门/人员" check-strategy="all"
value-field="newId" label-field="DeptName" size="large" :show-path="false" max-tag-count="responsive"
:options="data.EmployeeList" cascade children-field="ChildList"
@update:value="CascaderUpdateValue" />
<!-- <Cascader :options="data.EmployeeList" optionLabel="DeptName" optionValue="newId" optionChildren="ChildList"
label="选择部门/人员" :multiple="true" /> -->
</div>
<div class="col-3">
<q-btn color="primary" size="sm" label="导入" />
......@@ -160,14 +148,10 @@
onMounted
} from 'vue'
import CustomerModule from '@/module/customer/customerModule'
// import selectTree from '@/components/common/selectTree.vue'
import customRight from '@/components/common/customRight.vue'
// import Cascader from "@/components/common/Cascader.vue"
export default defineComponent({
components: {
// selectTree,
customRight,
// Cascader
},
setup() {
let {
......@@ -266,7 +250,15 @@
.customer_Wechat {
color: #9999a8;
}
.n-base-selection-label{
height: 56px;
::v-deep .n-base-selection-label{
height: 54px;
background-color: rgba(0, 0, 0, 0.05);
border: none !important;
}
::v-deep .n-base-selection-input{
height: 54px;
display: flex;
align-items: center;
border: none !important;
}
</style>
......@@ -195,7 +195,7 @@ import {
import draggable from "vuedraggable";
import { Dialog } from 'quasar'
import message from '@/utils/message'
import customerService from '@/api/customer';
import customerSetService from '@/api/customerSet';
import router from '@/router/index'
interface dataType {
......@@ -242,7 +242,7 @@ export default defineComponent({
const getClueList = () => {
defaultData.value = []
data.value = []
customerService.getCustomerClueRuleList({}).then(res => {
customerSetService.getCustomerClueRuleList({}).then(res => {
res.data.Data.map((item: dataType) => {
if (item.IsDefault === 1) {
defaultData.value.push(item)
......@@ -257,7 +257,7 @@ export default defineComponent({
ClueAllotWay: 1,// 1依次轮流 2随机分配
})
const getCustomerClueRuleConfig = () => {
customerService.getCustomerClueRuleConfig({}).then(res => {
customerSetService.getCustomerClueRuleConfig({}).then(res => {
let data = res.data.Data
configMsg.ClueType = data.ClueType
configMsg.ClueAllotWay = data.ClueAllotWay
......@@ -287,13 +287,13 @@ export default defineComponent({
})
}
const configChange = () => {
customerService.setCustomerClueRuleConfig(configMsg).then(res => {
customerSetService.setCustomerClueRuleConfig(configMsg).then(res => {
console.log(228, res.data)
})
}
const setState = (msg) => {
customerService.setCustomerClueRuleState(msg).then(res => {
customerSetService.setCustomerClueRuleState(msg).then(res => {
message.successMsg(res.data.Message)
if (msg.Type == 2) {
getClueList()
......
......@@ -66,11 +66,11 @@
</template>
<script lang="ts">
import { defineComponent, ref, onMounted, } from 'vue'
import customerService from '@/api/customer'
import customerSetService from '@/api/customerSet'
import draggable from "vuedraggable";
import { useQuasar } from 'quasar'
import { customerFieldlistType, customerFieldaddMsgType, customerFieldtabsType } from '@/@types/customer'
import addfield from '../../../components/customer/addfield.vue'
import addfield from '@/components/customer/addfield.vue'
export default defineComponent({
components: { draggable, addfield },
setup() {
......@@ -99,7 +99,7 @@
}
)
const changePage = () => {
customerService.getCustomerFiledList({ Enable: -1 }).then((res) => {
customerSetService.getCustomerFiledList({ Enable: -1 }).then((res) => {
data.value = res.data.Data
})
}
......@@ -116,7 +116,7 @@
FiledId: dragId.value,
SortFiledId: olddragId,
}
customerService.setCustomerFiledState(msg).then((res) => {
customerSetService.setCustomerFiledState(msg).then((res) => {
if (res.data.Code == 1) {
console.log(res)
} else {//如果移动失败 重新获取列表
......@@ -134,7 +134,7 @@
FiledId: item.Id,
SortFiledId: 0,
}
customerService.setCustomerFiledState(msg).then((res) => {
customerSetService.setCustomerFiledState(msg).then((res) => {
if (res.data.Code == 1) {
$q.notify({
icon: 'iconfont icon-chenggong',
......@@ -183,7 +183,7 @@
});
}
const getCustomerFieldType = () => {
customerService.getCustomerFieldTypeEnumList({}).then((res) => {
customerSetService.getCustomerFieldTypeEnumList({}).then((res) => {
if (res.data.Code == 1) {
tabsList.value = res.data.Data
tabsList.value.forEach(x => {
......@@ -224,14 +224,14 @@
}
}
const getDepartList = () => {
customerService.getDeptTree({ School_Id: 0 }).then((res) => {
customerSetService.getDeptTree({ School_Id: 0 }).then((res) => {
if (res.data.Code == 1) {
deptl.value = res.data.Data
}
})
}
const getFieldInputType = () => {
customerService.getCustomerFieldInputTypeEnumList({}).then((res) => {
customerSetService.getCustomerFieldInputTypeEnumList({}).then((res) => {
if (res.data.Code == 1) {
checkboxList.value = res.data.Data
}
......
......@@ -120,7 +120,7 @@
</template>
<script lang="ts">
import { defineComponent, onMounted, reactive } from 'vue'
import customerService from '@/api/customer'
import customerSetService from '@/api/customerSet'
import { useQuasar } from 'quasar'
import router from '@/router/index'
......@@ -131,7 +131,7 @@ export default defineComponent({
data: [],
})
const getList = () => {
customerService.getCustomerStageFlowList({ Enable: 0 }).then((res) => {
customerSetService.getCustomerStageFlowList({ Enable: 0 }).then((res) => {
if (res.data.Code == 1) {
state.data = res.data.Data
} else {//如果移动失败 重新获取列表
......@@ -161,7 +161,7 @@ export default defineComponent({
Type: Type,
FlowId: Id,
}
customerService.setCustomerStageFlowState(msg).then((res) => {
customerSetService.setCustomerStageFlowState(msg).then((res) => {
if (res.data.Code == 1) {
$q.notify({
icon: 'iconfont icon-chenggong',
......
......@@ -253,7 +253,7 @@
</template>
<script lang="ts">
import customerService from '@/api/customer'
import customerSetService from '@/api/customerSet'
import { useQuasar } from 'quasar'
......@@ -282,7 +282,7 @@ export default defineComponent({
selectindex:0,
})
const getList = () => {
customerService.getWeChatLableList({}).then((res) => {
customerSetService.getWeChatLableList({}).then((res) => {
if (res.data.Code == 1) {
data.dataList = res.data.Data;
data.SelectID = data.dataList[data.selectindex].Id
......@@ -369,7 +369,7 @@ export default defineComponent({
}
}
const setlable = (msg: any) => {
customerService.setWeChatLable(msg).then((res) => {
customerSetService.setWeChatLable(msg).then((res) => {
if (res.data.Code == 1) {
$q.notify({
icon: 'iconfont icon-chenggong',
......@@ -406,7 +406,7 @@ export default defineComponent({
flat: true,
}
}).onOk(() => {
customerService.delWeChatLable({ LableId: Id }).then((res) => {
customerSetService.delWeChatLable({ LableId: Id }).then((res) => {
if (res.data.Code == 1) {
$q.notify({
icon: 'iconfont icon-chenggong',
......
......@@ -160,9 +160,9 @@
<script lang="ts">
import { defineComponent, onMounted, reactive, } from 'vue'
import router from '@/router/index'
import customerService from '@/api/customer'
import customerSetService from '@/api/customerSet'
import departmentStaff from '@/components/common/departmentStaff.vue'
import customerService2 from '@/api/customer2'
import customerService from '@/api/customer'
import { useQuasar } from 'quasar'
......@@ -202,7 +202,7 @@ export default defineComponent({
}
const getList = () => {
customerService.getCustomerStageList({}).then((res) => {
customerSetService.getCustomerStageList({}).then((res) => {
if (res.data.Code == 1) {
state.StageList = res.data.Data;
state.gettypeoneList = []
......@@ -300,7 +300,7 @@ export default defineComponent({
} else {
data.InvalidCause = ''
}
customerService.setCustomerStageFlowInfo(data).then(res => {
customerSetService.setCustomerStageFlowInfo(data).then(res => {
if (res.data.Code == 1) {
$q.notify({
icon: 'iconfont icon-chenggong',
......@@ -321,7 +321,7 @@ export default defineComponent({
}
let getEmployeeData = () => {
customerService2.getEmployeeData({}).then(res => {
customerService.getEmployeeData({}).then(res => {
state.dataTree = res.data.Data
// 重组唯一id
if (state.dataTree.length == 0) return
......@@ -346,7 +346,7 @@ export default defineComponent({
state.showDialog = false
}
let getdetails = (Id: number) => {
customerService.getCustomerStageFlowInfo({ FlowId: Id }).then(res => {
customerSetService.getCustomerStageFlowInfo({ FlowId: Id }).then(res => {
if (res.data.Code == 1) {
state.addMsg = res.data.Data
if (state.addMsg.UseStage.length != '') {
......
......@@ -149,7 +149,7 @@
<script lang="ts">
import { defineComponent, onMounted, reactive, ref } from 'vue'
import router from '@/router/index'
import customerService from '@/api/customer'
import customerSetService from '@/api/customerSet'
import draggable from "vuedraggable";
import { useQuasar } from 'quasar'
......@@ -178,7 +178,7 @@ export default defineComponent({
}
const getList = () => {
customerService.getCustomerStageList({}).then((res) => {
customerSetService.getCustomerStageList({}).then((res) => {
if (res.data.Code == 1) {
state.addMsg = res.data.Data
state.followupStage = [];
......@@ -235,7 +235,7 @@ export default defineComponent({
}
const getStageDel = (Id: number, index: number) => {
if (Id > 0) {//判断是否是新加
customerService.validataCustomerStageDel({ StageId: Id }).then((res) => {
customerSetService.validataCustomerStageDel({ StageId: Id }).then((res) => {
if (res.data.Code == 1) {
if (res.data.Data.UseState == false) {//可以删除
state.followupStage.splice(index, 1)
......@@ -264,7 +264,7 @@ export default defineComponent({
}
if (Id > 0) {
customerService.validataCustomerCauseDel(data).then((res) => {
customerSetService.validataCustomerCauseDel(data).then((res) => {
if (res.data.Code == 1) {
if (res.data.Data.UseState == false) {//可以删除
state.reasonList[y].OptionsList.splice(index, 1)
......@@ -330,7 +330,7 @@ export default defineComponent({
x.Sort = i + 1
})
state.loading = true
customerService.setCustomerStageInfo(state.addMsg).then((res) => {
customerSetService.setCustomerStageInfo(state.addMsg).then((res) => {
if (res.data.Code == 1) {
state.loading = false
$q.notify({
......
......@@ -20,7 +20,7 @@ const routes: RouteRecordRaw[] = [
// 客户设置
{
path: '/customerSetup',
component: () => import('@/pages/customer/customerSetup.vue')
component: () => import('@/pages/customerManage/customerSet/customerSetup.vue')
},
//客户
{
......@@ -39,17 +39,16 @@ const routes: RouteRecordRaw[] = [
path: '/editor/editRule',
component: () => import('@/pages/editor/editRule.vue')
},
// 编辑阶段规则
{
// 编辑阶段规则
{
path: '/editor/manageStageRange',
component: () => import('@/pages/editor/manageStageRange.vue')
},
// 创建阶段
{
// 创建阶段
{
path: '/editor/createStageRange',
component: () => import('@/pages/editor/createStageRange.vue')
},
{
path: '/auth/login',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment