Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
浙江兰德纵横网络技术股份有限公司
o2oa-crm
提交
2cc7ae51
O
o2oa-crm
项目概览
浙江兰德纵横网络技术股份有限公司
/
o2oa-crm
通知
0
Star
5
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
o2oa-crm
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
2cc7ae51
编写于
1月 25, 2021
作者:
罗
罗晶
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'featrue/crm' into 'master'
crm,前端添加未转化线索的搜索与展现 See merge request o2oa/o2oa-crm!6
上级
7d8a690d
e52f6691
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
33 addition
and
10 deletion
+33
-10
web/source/x_component_CRM/$Clue/clueView.json
web/source/x_component_CRM/$Clue/clueView.json
+3
-0
web/source/x_component_CRM/Actions/RestActions.js
web/source/x_component_CRM/Actions/RestActions.js
+3
-0
web/source/x_component_CRM/Actions/action.json
web/source/x_component_CRM/Actions/action.json
+1
-0
web/source/x_component_CRM/Clue.js
web/source/x_component_CRM/Clue.js
+6
-0
web/source/x_component_CRM/lp/zh-cn.js
web/source/x_component_CRM/lp/zh-cn.js
+20
-10
未找到文件。
web/source/x_component_CRM/$Clue/clueView.json
浏览文件 @
2cc7ae51
...
...
@@ -20,6 +20,9 @@
{
"name"
:
"下属负责的线索"
},
{
"name"
:
"未转化的线索"
},
{
"name"
:
"已转化的线索"
},
...
...
web/source/x_component_CRM/Actions/RestActions.js
浏览文件 @
2cc7ae51
...
...
@@ -210,6 +210,9 @@ MWF.xApplication.CRM.Actions.RestActions = new Class({
ListTransfer
:
function
(
page
,
size
,
filterData
,
success
,
failure
,
async
){
this
.
action
.
invoke
({
"
name
"
:
"
ListTransfer
"
,
"
parameter
"
:
{
"
page
"
:
page
,
"
size
"
:
size
},
"
data
"
:
filterData
,
"
async
"
:
async
,
"
success
"
:
success
,
"
failure
"
:
failure
});
},
ListNoTransfer
:
function
(
page
,
size
,
filterData
,
success
,
failure
,
async
){
this
.
action
.
invoke
({
"
name
"
:
"
ListNoTransfer
"
,
"
parameter
"
:
{
"
page
"
:
page
,
"
size
"
:
size
},
"
data
"
:
filterData
,
"
async
"
:
async
,
"
success
"
:
success
,
"
failure
"
:
failure
});
},
ListAllMy
:
function
(
page
,
size
,
filterData
,
success
,
failure
,
async
){
this
.
action
.
invoke
({
"
name
"
:
"
ListAllMy
"
,
"
parameter
"
:
{
"
page
"
:
page
,
"
size
"
:
size
},
"
data
"
:
filterData
,
"
async
"
:
async
,
"
success
"
:
success
,
"
failure
"
:
failure
});
},
...
...
web/source/x_component_CRM/Actions/action.json
浏览文件 @
2cc7ae51
...
...
@@ -82,6 +82,7 @@
"ListNestedSubPerson"
:{
"uri"
:
"/jaxrs/leads/listsub/page/{page}/size/{size}"
,
"method"
:
"PUT"
},
"ListMyDuty"
:{
"uri"
:
"/jaxrs/leads/listmyduty/page/{page}/size/{size}"
,
"method"
:
"PUT"
},
"ListTransfer"
:{
"uri"
:
"/jaxrs/leads/listmyhastransform/page/{page}/size/{size}"
,
"method"
:
"PUT"
},
"ListNoTransfer"
:{
"uri"
:
"/jaxrs/leads/listmynotransform/page/{page}/size/{size}"
,
"method"
:
"PUT"
},
"ListAllMy"
:{
"uri"
:
"/jaxrs/leads/listallmy/page/{page}/size/{size}"
,
"method"
:
"PUT"
},
"deleteClue"
:{
"uri"
:
"/jaxrs/leads/{leadsid}"
,
"method"
:
"DELETE"
},
...
...
web/source/x_component_CRM/Clue.js
浏览文件 @
2cc7ae51
...
...
@@ -300,8 +300,14 @@ MWF.xApplication.CRM.Clue.View = new Class({
if
(
callback
)
callback
(
json
);
}.
bind
(
this
));
}
if
(
searchType
==
"
未转化的线索
"
){
this
.
actions
.
ListNoTransfer
(
page
,
count
,
filter
,
function
(
json
)
{
if
(
callback
)
callback
(
json
);
}.
bind
(
this
));
}
if
(
searchType
==
"
已转化的线索
"
){
this
.
actions
.
ListTransfer
(
page
,
count
,
filter
,
function
(
json
)
{
debugger
if
(
callback
)
callback
(
json
);
}.
bind
(
this
));
}
...
...
web/source/x_component_CRM/lp/zh-cn.js
浏览文件 @
2cc7ae51
...
...
@@ -520,7 +520,7 @@ MWF.xApplication.CRM.LP = {
"
field1
"
:{
"
field
"
:
"
name
"
,
"
title
"
:
"
线索名称
"
,
"
width
"
:
165
,
"
width
"
:
200
,
"
fixed
"
:
"
left
"
,
"
resize
"
:
true
,
"
align
"
:
'
left
'
,
...
...
@@ -530,13 +530,13 @@ MWF.xApplication.CRM.LP = {
"
field2
"
:{
"
field
"
:
"
source
"
,
"
title
"
:
"
来源
"
,
"
width
"
:
1
65
,
"
width
"
:
1
30
,
"
align
"
:
'
left
'
},
"
field3
"
:{
"
field
"
:
"
telephone
"
,
"
title
"
:
"
电话
"
,
"
minWidth
"
:
1
65
,
"
minWidth
"
:
1
30
,
"
resize
"
:
true
,
"
align
"
:
'
left
'
,
"
sort
"
:
true
...
...
@@ -552,29 +552,38 @@ MWF.xApplication.CRM.LP = {
"
field5
"
:{
"
field
"
:
"
owneruser
"
,
"
title
"
:
"
负责人
"
,
"
minWidth
"
:
1
2
0
,
"
minWidth
"
:
1
6
0
,
"
resize
"
:
true
,
"
align
"
:
'
left
'
,
"
sort
"
:
true
},
"
field55
"
:{
"
field
"
:
"
istransform
"
,
"
title
"
:
"
是否已转化
"
,
"
width
"
:
160
,
"
resize
"
:
true
,
"
align
"
:
'
left
'
,
"
sort
"
:
true
,
"
formatter
"
:
function
(
v
,
data
,
index
)
{
if
(
v
==
"
1
"
){
return
"
已转化
"
}
else
{
return
"
未转化
"
};}
},
"
field6
"
:{
"
field
"
:
"
cellphone
"
,
"
title
"
:
"
手机
"
,
"
width
"
:
165
,
"
width
"
:
200
,
"
resize
"
:
true
,
"
align
"
:
'
left
'
},
"
field7
"
:{
"
field
"
:
"
industry
"
,
"
title
"
:
"
客户类型
"
,
"
width
"
:
12
0
,
"
width
"
:
20
0
,
"
align
"
:
'
left
'
,
"
resize
"
:
true
},
"
field8
"
:{
"
field
"
:
"
level
"
,
"
title
"
:
"
客户级别
"
,
"
width
"
:
12
0
,
"
width
"
:
20
0
,
"
resize
"
:
true
,
"
align
"
:
'
left
'
},
...
...
@@ -582,12 +591,12 @@ MWF.xApplication.CRM.LP = {
"
field
"
:
"
address
"
,
"
title
"
:
"
地址
"
,
"
align
"
:
'
left
'
,
"
width
"
:
165
"
width
"
:
200
},
"
field10
"
:{
"
field
"
:
"
nexttime
"
,
"
title
"
:
"
下次联系时间
"
,
"
width
"
:
16
0
,
"
width
"
:
20
0
,
"
align
"
:
'
left
'
,
"
sort
"
:
true
},
...
...
@@ -595,7 +604,7 @@ MWF.xApplication.CRM.LP = {
"
field
"
:
"
remark
"
,
"
title
"
:
"
备注
"
,
"
align
"
:
'
left
'
,
"
width
"
:
165
"
width
"
:
200
}
/*"field10":{
"field":"opts",
...
...
@@ -625,6 +634,7 @@ MWF.xApplication.CRM.LP = {
"
items
"
:[
{
"
title
"
:
"
我负责的线索
"
},
{
"
title
"
:
"
下属的线索
"
},
{
"
title
"
:
"
未转化的线索
"
},
{
"
title
"
:
"
已转化的线索
"
},
{
"
title
"
:
"
全部线索
"
}
],
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录