Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
horse
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
向伟
horse
Commits
7def1715
Commit
7def1715
authored
Dec 03, 2021
by
罗超
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/xiangwei/horse
parents
528bcda8
90b38508
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
624 additions
and
472 deletions
+624
-472
customer.ts
src/api/customer.ts
+18
-18
departmentStaff.vue
src/components/common/departmentStaff.vue
+5
-5
visibleColumns.vue
src/components/common/visibleColumns.vue
+1
-3
request-group.vue
src/components/customer/request-group.vue
+0
-4
customerModule.ts
src/module/customer/customerModule.ts
+142
-134
customer.vue
src/pages/customerManage/customer.vue
+95
-134
CustomerOperation.vue
...stomerManage/customerSet/components/CustomerOperation.vue
+53
-172
Abandon.vue
...merSet/components/CustomerOperationComponents/Abandon.vue
+308
-0
createStageRange.vue
src/pages/editor/createStageRange.vue
+2
-2
No files found.
src/api/customer.ts
View file @
7def1715
...
...
@@ -14,24 +14,24 @@ import Axios from './axios'
* @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
,
//排序
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
//查询条件
}
...
...
src/components/common/departmentStaff.vue
View file @
7def1715
...
...
@@ -29,7 +29,7 @@
<div
class=
"flex-center"
>
<q-icon
name=
"work"
color=
"primary"
v-if=
"item.Type == '1'"
/>
<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.
Dept
Name }}
</span>
</div>
<q-icon
name=
"cancel"
@
click=
"delItem(item.Id, index)"
></q-icon>
</div>
...
...
@@ -40,7 +40,7 @@
<q-card-actions
align=
"right"
class=
"bg-white text-teal"
>
<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>
</q-dialog>
...
...
@@ -56,7 +56,7 @@
}
interface
SelectParams
{
Id
:
string
Name
:
string
Dept
Name
:
string
Type
:
number
}
export
default
{
...
...
@@ -153,7 +153,7 @@
flag
=
false
}
else
{
ticketArr
.
value
=
JSON
.
parse
(
JSON
.
stringify
(
props
.
defaultArray
))
console
.
log
(
'默认值'
,
ticketArr
.
value
)
console
.
log
(
'
有
默认值'
,
ticketArr
.
value
)
}
}
...
...
@@ -181,7 +181,7 @@
if
(
flag
==
true
)
{
selectArray
.
value
.
push
({
Id
:
j
[
props
.
nodeKey
],
Name
:
j
.
DeptName
,
Dept
Name
:
j
.
DeptName
,
Type
:
j
.
DataType
})
}
else
{
...
...
src/components/common/visibleColumns.vue
View file @
7def1715
...
...
@@ -31,11 +31,10 @@ export default {
const
myAllCol
=
computed
(()
=>
{
return
props
.
allCol
})
const
showCol
=
computed
(()
=>
{
console
.
log
(
props
.
modelValue
)
return
props
.
modelValue
})
const
changeVisible
=
(
e
)
=>
{
if
(
e
.
visible
)
{
showCol
.
value
.
push
(
e
.
value
)
...
...
@@ -43,7 +42,6 @@ export default {
showCol
.
value
.
splice
(
showCol
.
value
.
indexOf
(
e
.
value
),
1
)
}
context
.
emit
(
'update:modelValue'
,
showCol
.
value
)
console
.
log
(
showCol
.
value
)
}
return
{
myAllCol
,
scrollStyle
,
changeVisible
}
...
...
src/components/customer/request-group.vue
View file @
7def1715
...
...
@@ -283,7 +283,6 @@
}
]
const
init
=
()
=>
{
console
.
log
(
'init'
,
props
.
defaultData
)
if
(
props
.
defaultData
&&
props
.
defaultData
.
length
>
0
)
{
addMsg
.
value
=
[]
props
.
defaultData
.
map
((
e
:
any
)
=>
{
...
...
@@ -410,7 +409,6 @@
IsCustom
:
2
}
filedList
.
value
.
unshift
(
obj2
)
console
.
log
(
'标签'
,
filedList
.
value
)
})
}
const
deleteadd
=
index
=>
{
...
...
@@ -463,7 +461,6 @@
let
find2
:
any
=
addMsg
.
value
.
find
(
e
=>
{
return
e
.
Id
==
17
})
console
.
log
(
'生日2'
,
find2
)
if
(
find2
)
{
filedList
.
value
.
map
(
_e
=>
{
if
(
_e
.
Id
==
17
)
{
...
...
@@ -568,7 +565,6 @@
const
newVal
=
JSON
.
parse
(
JSON
.
stringify
(
val
))
const
s
=
dayjs
(
newVal
[
0
]).
format
(
format
)
const
e
=
dayjs
(
newVal
[
1
]).
format
(
format
)
console
.
log
(
570
,
val
,
s
,
e
)
addMsg
.
value
[
y
].
StartValue
=
s
addMsg
.
value
[
y
].
EndValue
=
e
}
...
...
src/module/customer/customerModule.ts
View file @
7def1715
This diff is collapsed.
Click to expand it.
src/pages/customerManage/customer.vue
View file @
7def1715
This diff is collapsed.
Click to expand it.
src/pages/customerManage/customerSet/components/CustomerOperation.vue
View file @
7def1715
This diff is collapsed.
Click to expand it.
src/pages/customerManage/customerSet/components/CustomerOperationComponents/Abandon.vue
0 → 100644
View file @
7def1715
This diff is collapsed.
Click to expand it.
src/pages/editor/createStageRange.vue
View file @
7def1715
...
...
@@ -36,14 +36,14 @@
v-if=
"x.Id.slice(0, 1) == '1'"
text-color=
"white"
icon=
"work"
:label=
"x.Name"
:label=
"x.
Dept
Name"
></q-chip>
<q-chip
color=
"primary"
v-if=
"x.Id.slice(0, 1) == '2'"
text-color=
"white"
icon=
"person"
:label=
"x.Name"
:label=
"x.
Dept
Name"
></q-chip>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment