Commit 7def1715 authored by 罗超's avatar 罗超

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

parents 528bcda8 90b38508
...@@ -14,24 +14,24 @@ import Axios from './axios' ...@@ -14,24 +14,24 @@ import Axios from './axios'
* @property {string} password -用户密码 * @property {string} password -用户密码
*/ */
interface CutomerParams { interface CutomerParams {
PageIndex: number, PageIndex: number
PageSize: number, PageSize: number
pageCount: number, pageCount: number
CorpName: string, //企业名称 CorpName: string //企业名称
CustomerName: string, //备注名 CustomerName: string //备注名
WeChatName: string, //昵称 WeChatName: string //昵称
CustomerMobile: string, //手机号码 CustomerMobile: string //手机号码
CreateSTime: string, //创建开始时间 CreateSTime: string //创建开始时间
CreateETime: string, //创建结束时间 CreateETime: string //创建结束时间
FriendSTime: string, //好友开始时间 FriendSTime: string //好友开始时间
FriendETime: string, //好友结束时间 FriendETime: string //好友结束时间
Q_NotFollowUpDay: number, //几天未跟进 Q_NotFollowUpDay: number //几天未跟进
Q_Friends: string, //好友关系 多选逗号分隔、 Q_Friends: string //好友关系 多选逗号分隔、
Q_AddWay: string, //获取来源 多选英文逗号分隔 Q_AddWay: string //获取来源 多选英文逗号分隔
EmpId: number, //员工id EmpId: number //员工id
CustomerType: number, //类型1微信用户 2企业微信用户 CustomerType: number //类型1微信用户 2企业微信用户
SelectList: Array<any>, //自定义查询 SelectList: Array<any> //自定义查询
OrderBy: number, //排序 OrderBy: number //排序
AddCondition: number //查询条件 AddCondition: number //查询条件
} }
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div class="flex-center"> <div class="flex-center">
<q-icon name="work" color="primary" v-if="item.Type == '1'" /> <q-icon name="work" color="primary" v-if="item.Type == '1'" />
<q-icon name="person" color="accent" v-if="item.Type == '2'" /> <q-icon name="person" color="accent" v-if="item.Type == '2'" />
<span class="q-ml-sm">{{ item.Name }}</span> <span class="q-ml-sm">{{ item.DeptName }}</span>
</div> </div>
<q-icon name="cancel" @click="delItem(item.Id, index)"></q-icon> <q-icon name="cancel" @click="delItem(item.Id, index)"></q-icon>
</div> </div>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<q-card-actions align="right" class="bg-white text-teal"> <q-card-actions align="right" class="bg-white text-teal">
<q-btn flat label="取消" v-close-popup /> <q-btn flat label="取消" v-close-popup />
<q-btn color="primary" @click="goback" flat label="确定" /> <q-btn color="primary" @click="goback" unelevated label="确定" />
</q-card-actions> </q-card-actions>
</q-card> </q-card>
</q-dialog> </q-dialog>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
} }
interface SelectParams { interface SelectParams {
Id: string Id: string
Name: string DeptName: string
Type: number Type: number
} }
export default { export default {
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
flag = false flag = false
} else { } else {
ticketArr.value = JSON.parse(JSON.stringify(props.defaultArray)) ticketArr.value = JSON.parse(JSON.stringify(props.defaultArray))
console.log('默认值',ticketArr.value) console.log('默认值',ticketArr.value)
} }
} }
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
if (flag == true) { if (flag == true) {
selectArray.value.push({ selectArray.value.push({
Id: j[props.nodeKey], Id: j[props.nodeKey],
Name: j.DeptName, DeptName: j.DeptName,
Type: j.DataType Type: j.DataType
}) })
} else { } else {
......
...@@ -31,11 +31,10 @@ export default { ...@@ -31,11 +31,10 @@ export default {
const myAllCol = computed(() => { const myAllCol = computed(() => {
return props.allCol return props.allCol
}) })
const showCol = computed(() => { const showCol = computed(() => {
console.log(props.modelValue)
return props.modelValue return props.modelValue
}) })
const changeVisible = (e) => { const changeVisible = (e) => {
if (e.visible) { if (e.visible) {
showCol.value.push(e.value) showCol.value.push(e.value)
...@@ -43,7 +42,6 @@ export default { ...@@ -43,7 +42,6 @@ export default {
showCol.value.splice(showCol.value.indexOf(e.value), 1) showCol.value.splice(showCol.value.indexOf(e.value), 1)
} }
context.emit('update:modelValue', showCol.value) context.emit('update:modelValue', showCol.value)
console.log(showCol.value)
} }
return { myAllCol, scrollStyle, changeVisible } return { myAllCol, scrollStyle, changeVisible }
......
...@@ -283,7 +283,6 @@ ...@@ -283,7 +283,6 @@
} }
] ]
const init = () => { const init = () => {
console.log('init', props.defaultData)
if (props.defaultData && props.defaultData.length > 0) { if (props.defaultData && props.defaultData.length > 0) {
addMsg.value = [] addMsg.value = []
props.defaultData.map((e: any) => { props.defaultData.map((e: any) => {
...@@ -410,7 +409,6 @@ ...@@ -410,7 +409,6 @@
IsCustom: 2 IsCustom: 2
} }
filedList.value.unshift(obj2) filedList.value.unshift(obj2)
console.log('标签', filedList.value)
}) })
} }
const deleteadd = index => { const deleteadd = index => {
...@@ -463,7 +461,6 @@ ...@@ -463,7 +461,6 @@
let find2: any = addMsg.value.find(e => { let find2: any = addMsg.value.find(e => {
return e.Id == 17 return e.Id == 17
}) })
console.log('生日2', find2)
if (find2) { if (find2) {
filedList.value.map(_e => { filedList.value.map(_e => {
if (_e.Id == 17) { if (_e.Id == 17) {
...@@ -568,7 +565,6 @@ ...@@ -568,7 +565,6 @@
const newVal=JSON.parse(JSON.stringify(val)) const newVal=JSON.parse(JSON.stringify(val))
const s= dayjs(newVal[0]).format(format) const s= dayjs(newVal[0]).format(format)
const e= dayjs(newVal[1]).format(format) const e= dayjs(newVal[1]).format(format)
console.log(570,val,s,e)
addMsg.value[y].StartValue = s addMsg.value[y].StartValue = s
addMsg.value[y].EndValue = e addMsg.value[y].EndValue = e
} }
......
// import { ResultType } from '@/@types/enumHelper'
// import router from '@/router'
// import UserActions from '@/store/modules/user/actions'//{ UserActionsType }
// import { UserGetter } from '@/store/modules/user/getters'
// import { dispatchAction, getStoreGetter, setStoreState } from '@/store/utils'
// import message from '@/utils/message' // import message from '@/utils/message'
import { import dayjs from 'dayjs'
StaticConfig import { reactive } from 'vue'
} from '@/config/app' import customer, { CutomerParams } from '@/api/customer'
import { import customerSetService from '@/api/customerSet'
ref, import { ColumnDefaultState } from '@/@types/enumHelper'
reactive
} from 'vue'
import customer, {
CutomerParams
} from '@/api/customer'
interface Params {
selectVal: string
selectWay: number
}
interface timeParams {
timeWay: number
}
interface customParams {
customWay: number
}
interface friendParams {
frendArr: Array < number >
wayArr: Array < number >
}
interface memberParams { interface memberParams {
newId: number | string newId: number | string
DataType: number | string DataType: number | string
DeptId: number DeptId: number
ChildList: Array < any >|null ChildList: Array < any > | null
} }
interface dataParams { interface dataParams {
columns: Array < any > loading: boolean
dataList: Array < any > columns: Array<any>
WayList: Array < any > sysColumns:Array<any>
selected: Array < any > showColumns: Array<any>
EmployeeList: Array < memberParams > allColumns: Array<any>
defaultArray: Array < number | string > dataList: Array<any>
CascaderValue: Array < any > | string WayList: Array<any>
selected: Array<any>
EmployeeList: Array<memberParams>
defaultArray: Array<number | string>
customerCascaderValue: Array<any> | string
deptCascaderValue: string | null
colLoadingFinish:boolean
} }
const CustomerModule = () => { const CustomerModule = () => {
//调用方法 //获取列表
const getCustomerList = (param: CutomerParams) => { const getCustomerList = () => {
customer.getCustomerList(param).then(res => { data.loading=true
console.log(res, '数据') customer.getCustomerList(msg).then(res => {
if (res.data.Code == 1) { if (res.data.Code == 1) {
data.loading = false
data.dataList = res.data.Data.PageData data.dataList = res.data.Data.PageData
msg.pageCount = res.data.Data.PageCount msg.pageCount = res.data.Data.PageCount
} }
...@@ -64,10 +47,9 @@ const CustomerModule = () => { ...@@ -64,10 +47,9 @@ const CustomerModule = () => {
}) })
} }
//获取员工数据 //获取员工数据
const getEmployeeData = (param: any) => { const getEmployeeData = () => {
customer.getEmployeeData(param).then(res => { customer.getEmployeeData({}).then(res => {
data.EmployeeList = res.data.Data data.EmployeeList = res.data.Data
console.log(data, '员工数据')
// 重组唯一id // 重组唯一id
if (data.EmployeeList.length == 0) return if (data.EmployeeList.length == 0) return
data.EmployeeList.forEach(x => { data.EmployeeList.forEach(x => {
...@@ -92,25 +74,27 @@ const CustomerModule = () => { ...@@ -92,25 +74,27 @@ const CustomerModule = () => {
} }
}) })
} }
const title = ref(StaticConfig.appsuffix)
//控制页显示条数 //控制页显示条数
const pagination = reactive({ const pagination = reactive({
rowsPerPage: 0 rowsPerPage: 0
}) })
//日期对象
// const daySelect = const data = reactive<dataParams>({
const data = reactive < dataParams > ({ loading: false,
columns: [{ columns: [
{
name: 'CustomerName', name: 'CustomerName',
label: '客户', label: '客户',
field: 'CustomerName', field: 'CustomerName',
align: 'left' align: 'left'
}, }
],
sysColumns: [
{ {
name: 'StageName', name: 'StageName',
align: 'center', label: '客户阶段',
field: 'StageName', field: 'StageName',
label: '客户阶段' align: 'left'
}, },
{ {
name: 'LableList', name: 'LableList',
...@@ -124,12 +108,6 @@ const CustomerModule = () => { ...@@ -124,12 +108,6 @@ const CustomerModule = () => {
field: 'carbs', field: 'carbs',
align: 'left' align: 'left'
}, },
{
name: 'CreateTime',
label: '创建时间',
field: 'CreateTime',
align: 'left'
},
{ {
name: 'sodium', name: 'sodium',
label: '负责人', label: '负责人',
...@@ -148,8 +126,6 @@ const CustomerModule = () => { ...@@ -148,8 +126,6 @@ const CustomerModule = () => {
field: 'Source', field: 'Source',
align: 'left' align: 'left'
}, },
// { name: 'num', label: '7日内客户回复消息数', align: 'left'},
// { name: 'num', label: '7日内员工发送消息数', align: 'left'},
{ {
name: 'FriendTime', name: 'FriendTime',
label: '添加好友时间', label: '添加好友时间',
...@@ -163,14 +139,18 @@ const CustomerModule = () => { ...@@ -163,14 +139,18 @@ const CustomerModule = () => {
align: 'left' align: 'left'
} }
], ],
showColumns: ['CustomerName'], //对应allColumns的value
allColumns: [],
selected: [], selected: [],
dataList: [], dataList: [],
WayList: [], WayList: [],
EmployeeList: [], EmployeeList: [],
defaultArray: [], // defaultArray: [], //
CascaderValue: "" deptCascaderValue: null,
customerCascaderValue: '',
colLoadingFinish: false
}) })
const msg = reactive({ const msg = reactive<CutomerParams>({
PageIndex: 1, PageIndex: 1,
PageSize: 10, PageSize: 10,
pageCount: 0, pageCount: 0,
...@@ -186,7 +166,6 @@ const CustomerModule = () => { ...@@ -186,7 +166,6 @@ const CustomerModule = () => {
Q_Friends: '', //好友关系 多选逗号分隔、 Q_Friends: '', //好友关系 多选逗号分隔、
Q_AddWay: '', //获取来源 多选英文逗号分隔 Q_AddWay: '', //获取来源 多选英文逗号分隔
EmpId: 0, //员工id EmpId: 0, //员工id
DeptId: 0, //部门id
CustomerType: 0, //类型1微信用户 2企业微信用户 CustomerType: 0, //类型1微信用户 2企业微信用户
SelectList: [], //自定义查询 SelectList: [], //自定义查询
OrderBy: 1, //排序 OrderBy: 1, //排序
...@@ -218,46 +197,65 @@ const CustomerModule = () => { ...@@ -218,46 +197,65 @@ const CustomerModule = () => {
Id: 2 Id: 2
} }
]) ])
//自定义客户筛选 //切换时间范围
const changeTime = () => {
msg.FriendSTime = ''
msg.FriendETime = ''
msg.CreateSTime = ''
msg.CreateETime = ''
TimeObj.timeRange=null
}
//选择时间范围
const changeTimeRange = val => {
if (val) {
const s = dayjs(val[0]).format('YYYY-MM-DD HH:mm:ss')
const e = dayjs(val[1]).format('YYYY-MM-DD HH:mm:ss')
if (TimeObj.timeWay == 1) {
msg.CreateSTime = s
msg.CreateETime = e
} else {
msg.FriendSTime = s
msg.FriendETime = e
}
} else {
msg.FriendSTime = ''
msg.FriendETime = ''
msg.CreateSTime = ''
msg.CreateETime = ''
}
getCustomerList()
}
//客户筛选
const CustomList = reactive([{ const CustomList = reactive([{
Name: '好友关系', label: '好友关系',
Id: 1 value: '1',
}, children: [{
{ label: '未添加',
Name: '获取途径', value: '1-1'
Id: 2
}, },
{ {
Name: '未跟进客户', label: '已添加',
Id: 3 value: '1-2'
} }
]) ]
const friendOptions = reactive([{
Name: '好友客户',
Id: 1
}, },
{ {
Name: '待添加', label: '获取途径',
Id: 2 value: 2
}, },
{ {
Name: '已申请', label: '未跟进客户',
Id: 3 value: 3
} }
]) ])
const SeletObj = reactive < Params > ({
const SeletObj = reactive ({
selectVal: '', selectVal: '',
selectWay: 0 selectWay: 0
}) })
const TimeObj = reactive < timeParams > ({ const TimeObj = reactive ({
timeWay: 1 timeWay: 1,
}) timeRange: null
const customSetObj = reactive < customParams > ({
customWay: 1
})
const friendObj = reactive < friendParams > ({
frendArr: [],
wayArr: []
}) })
//选择方式 //选择方式
const getSelectWay = () => { const getSelectWay = () => {
...@@ -281,39 +279,52 @@ const CustomerModule = () => { ...@@ -281,39 +279,52 @@ const CustomerModule = () => {
} }
const changePage = (val: any) => { const changePage = (val: any) => {
msg.PageIndex = val msg.PageIndex = val
getCustomerList(msg) getCustomerList()
}
const getChild = (deptArray: any) => {
//数据处理 获取夏利是 1-2 前面代表部门还是人员 后面是原生ID
if (deptArray._value) {
const Type = deptArray._value.split('-')[0]
const MyId = deptArray._value.split('-')[1]
//1部门
if (Type == 1) {
msg.DeptId = MyId
}
//2人员
if (Type == 2) {
msg.EmpId = MyId
} }
const getDept = (id: any) => {
//数据处理 获取id是 1-id,2-id 前面1代表部门2代表人员 后面是原生ID
if (id) {
msg.EmpId = id.slice(2)
} else { } else {
msg.DeptId = 0
msg.EmpId = 0 msg.EmpId = 0
} }
getCustomerList(msg) getCustomerList()
} }
const getCkedFriend = (e: any) => { const customerUpdateValue = val => {
const Ids = e console.log('customerUpdateValue', val)
.map((x: any) => { }
return x.Id data.sysColumns.map(e => {
data.columns.push(e)
data.showColumns.push(e.field)
data.allColumns.push({ name: e.label, value: e.field, visible: true, IsCustom: 0 })
})
customerSetService
.getCustomerFiledList({
Enable: 1
}) })
.toString() .then(r => {
msg.Q_Friends = Ids const tempCol = r.data.Data
getCustomerList(msg) if (tempCol && tempCol.length > 0) {
tempCol.sort((x, y) => {
return x.Sort - y.Sort
})
tempCol.forEach(x => {
const tempRow = { name: x.Name, label: x.Name, field: x.Name, align: 'left' }
data.columns.push(tempRow)
if (x.IsDefault == ColumnDefaultState.Yes) {
data.showColumns.push(x.Name)
} }
const CascaderUpdateValue = (val) => { data.allColumns.push({ name: x.Name, value: x.Name, visible: x.IsDefault == ColumnDefaultState.Yes, data: x, IsCustom: 1 })
console.log('val', val) })
} }
//#region 添加菜单权限
data.columns.push({ name: 'setting', label: '自定义列', field: 'setting', align: 'left' })
data.showColumns.push('setting')
//#endregion
data.colLoadingFinish = true
})
return { return {
getCustomerList, getCustomerList,
...@@ -321,21 +332,18 @@ const CustomerModule = () => { ...@@ -321,21 +332,18 @@ const CustomerModule = () => {
getEmployeeData, getEmployeeData,
data, data,
msg, msg,
title,
TypeList, TypeList,
SeletObj, SeletObj,
getSelectWay, getSelectWay,
TimeObj, TimeObj,
TimeList, TimeList,
changeTime,
changeTimeRange,
changePage, changePage,
pagination, pagination,
CustomList, CustomList,
customSetObj, getDept,
friendObj, customerUpdateValue,
friendOptions,
getChild,
getCkedFriend,
CascaderUpdateValue
} }
} }
......
This diff is collapsed.
...@@ -36,14 +36,14 @@ ...@@ -36,14 +36,14 @@
v-if="x.Id.slice(0, 1) == '1'" v-if="x.Id.slice(0, 1) == '1'"
text-color="white" text-color="white"
icon="work" icon="work"
:label="x.Name" :label="x.DeptName"
></q-chip> ></q-chip>
<q-chip <q-chip
color="primary" color="primary"
v-if="x.Id.slice(0, 1) == '2'" v-if="x.Id.slice(0, 1) == '2'"
text-color="white" text-color="white"
icon="person" icon="person"
:label="x.Name" :label="x.DeptName"
></q-chip> ></q-chip>
</div> </div>
</div> </div>
......
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