Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
功
功能演示系统
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
示例
功能演示系统
提交
63be3d2c
提交
63be3d2c
编写于
12月 02, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Mosher 发布系统代码 [后台服务,演示应用]
上级
e4573f95
变更
2
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
57 行增加
和
111 行删除
+57
-111
usr-gantt-base.vue
app_Web/src/widgets/ibizbook/usr-gantt/usr-gantt-base.vue
+8
-8
tree-exp-treeview-service.ts
.../ibizorder/tree-exp-treeview/tree-exp-treeview-service.ts
+49
-103
未找到文件。
app_Web/src/widgets/ibizbook/usr-gantt/usr-gantt-base.vue
浏览文件 @
63be3d2c
...
...
@@ -237,14 +237,6 @@ export default class UsrBase extends Vue implements ControlInterface {
},
labelField
:
'text'
,
columns
:
[
{
label
:
'归还日期'
,
value
:
'returntime'
,
render
:
(
task
:
any
)
=>
{
return
this
.
getColumnValue
(
task
,
'returntime'
)
},
width
:
200
,
},
{
label
:
'图书名称'
,
value
:
'ibizbookname'
,
...
...
@@ -277,6 +269,14 @@ export default class UsrBase extends Vue implements ControlInterface {
},
width
:
200
,
},
{
label
:
'归还日期'
,
value
:
'returntime'
,
render
:
(
task
:
any
)
=>
{
return
this
.
getColumnValue
(
task
,
'returntime'
)
},
width
:
200
,
},
]
}
};
...
...
app_Web/src/widgets/ibizorder/tree-exp-treeview/tree-exp-treeview-service.ts
浏览文件 @
63be3d2c
...
...
@@ -4,7 +4,6 @@ import IBIZOrderService from '@/service/ibizorder/ibizorder-service';
import
TreeExpModel
from
'./tree-exp-treeview-model'
;
import
CodeListService
from
"@/codelist/codelist-service"
;
import
i18n
from
'@/locale'
;
import
IBIZOrderTypeService
from
'@service/ibizorder-type/ibizorder-type-service'
;
/**
...
...
@@ -54,14 +53,6 @@ export default class TreeExpService extends ControlService {
public
codeListService
:
CodeListService
=
new
CodeListService
({
$store
:
this
.
getStore
()
});
/**
* 订单类型服务对象
*
* @type {IBIZOrderTypeService}
* @memberof TreeExpService
*/
public
ibizordertypeService
:
IBIZOrderTypeService
=
new
IBIZOrderTypeService
({
$store
:
this
.
getStore
()
});
/**
* 节点分隔符号
*
...
...
@@ -480,6 +471,8 @@ export default class TreeExpService extends ControlService {
strNodeId
+=
item
.
value
;
Object
.
assign
(
item
,
{
id
:
strNodeId
});
Object
.
assign
(
item
,
{
expanded
:
filter
.
isautoexpand
});
Object
.
assign
(
item
,
{
navigateContext
:
{
ORDERTYPE
:
"%ordertype%"
}
});
Object
.
assign
(
item
,
{
navigateParams
:
{
ordertype
:
"%ordertype%"
}
});
Object
.
assign
(
item
,
{
nodeid
:
item
.
srfkey
});
Object
.
assign
(
item
,
{
nodeid2
:
item
.
pvalue
});
Object
.
assign
(
item
,
{
nodeType
:
'STATIC'
});
...
...
@@ -498,6 +491,8 @@ export default class TreeExpService extends ControlService {
Object
.
assign
(
treeNode
,
{
id
:
strNodeId
});
Object
.
assign
(
treeNode
,
{
expanded
:
filter
.
isautoexpand
});
Object
.
assign
(
treeNode
,
{
leaf
:
true
});
Object
.
assign
(
treeNode
,
{
navigateContext
:
{
ORDERTYPE
:
"%ordertype%"
}
});
Object
.
assign
(
treeNode
,
{
navigateParams
:
{
ordertype
:
"%ordertype%"
}
});
if
(
item
.
children
&&
item
.
children
.
length
>
0
){
Object
.
assign
(
treeNode
,
{
children
:
item
.
children
});
}
...
...
@@ -769,104 +764,55 @@ export default class TreeExpService extends ControlService {
context
=
this
.
handleResNavContext
(
context
,
filter
,
rsNavContext
);
filter
=
this
.
handleResNavParams
(
context
,
filter
,
rsNavParams
,
rsParams
);
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
let
searchFilter
:
any
=
{};
Object
.
assign
(
searchFilter
,
{
total
:
false
});
let
bFirst
:
boolean
=
true
;
let
records
:
any
[]
=
[]
;
try
{
this
.
searchOrdertypedata
(
context
,
searchFilter
,
filter
).
then
((
records
:
any
)
=>
{
if
(
records
&&
records
.
length
>
0
){
records
.
forEach
((
entity
:
any
)
=>
{
let
treeNode
:
any
=
{}
;
// 整理context
let
strId
:
string
=
entity
.
ibizordertypeid
;
let
strText
:
string
=
entity
.
ibizordertypename
;
Object
.
assign
(
treeNode
,{
srfparentdename
:
'IBIZOrderType'
,
srfparentkey
:
entity
.
ibizordertypeid
});
let
tempContext
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
context
)
);
Object
.
assign
(
tempContext
,{
srfparentdename
:
'IBIZOrderType'
,
srfparentkey
:
entity
.
ibizordertypeid
,
ibizordertype
:
strId
})
Object
.
assign
(
treeNode
,{
srfappctx
:
tempContext
});
Object
.
assign
(
treeNode
,{
'ibizordertype'
:
strId
});
Object
.
assign
(
treeNode
,
{
srfkey
:
strId
});
Object
.
assign
(
treeNode
,
{
text
:
strText
,
srfmajortext
:
strText
}
);
let
strNodeId
:
string
=
'orderTypeData'
;
strNodeId
+=
this
.
TREENODE_SEPARATOR
;
strNodeId
+=
strId
;
Object
.
assign
(
treeNode
,
{
id
:
strNodeId
});
Object
.
assign
(
treeNode
,
{
expanded
:
filter
.
isautoexpand
});
Object
.
assign
(
treeNode
,
{
leaf
:
true
})
;
Object
.
assign
(
treeNode
,
{
curData
:
entity
});
Object
.
assign
(
treeNode
,
{
nodeid
:
treeNode
.
srfkey
})
;
Object
.
assign
(
treeNode
,
{
nodeid2
:
filter
.
strRealNodeId
})
;
Object
.
assign
(
treeNode
,
{
nodeType
:
"DE"
,
appEntityName
:
"ibizordertype"
});
list
.
push
(
treeNode
);
resolve
(
list
);
bFirst
=
false
;
});
}
else
{
resolve
(
list
);
this
.
codeListService
.
getItems
(
'ORDERTYPE'
,
context
).
then
((
codeListIems
:
any
)
=>
{
if
(
codeListIems
&&
codeListIems
.
length
>
0
){
const
handleChildData
=
(
context
:
any
,
item
:
any
,)
=>
{
Object
.
assign
(
item
,{
srfappctx
:
context
})
;
Object
.
assign
(
item
,
{
text
:
item
.
text
});
Object
.
assign
(
item
,
{
srfmajortext
:
item
.
text
});
let
strNodeId
:
string
=
"orderTypeData"
;
Object
.
assign
(
item
,
{
srfkey
:
item
.
value
});
strNodeId
+=
this
.
TREENODE_SEPARATOR
;
strNodeId
+=
item
.
value
;
Object
.
assign
(
item
,
{
id
:
strNodeId
})
;
Object
.
assign
(
item
,
{
expanded
:
filter
.
isautoexpand
})
;
Object
.
assign
(
item
,
{
navigateContext
:
{
ORDERTYPE
:
"%ordertype%"
}
});
Object
.
assign
(
item
,
{
navigateParams
:
{
ordertype
:
"%ordertype%"
}
}
);
Object
.
assign
(
item
,
{
nodeid
:
item
.
srfkey
});
Object
.
assign
(
item
,
{
nodeid2
:
item
.
pvalue
});
Object
.
assign
(
item
,
{
nodeType
:
"CODELIST"
,
appEntityName
:
"ibizordertype"
});
}
codeListIems
=
this
.
handleDataSet
(
JSON
.
parse
(
JSON
.
stringify
(
codeListIems
)),
context
,
handleChildData
);
codeListIems
.
forEach
((
item
:
any
)
=>
{
let
treeNode
:
any
=
{}
;
Object
.
assign
(
treeNode
,{
srfappctx
:
context
})
;
Object
.
assign
(
treeNode
,
{
text
:
item
.
text
});
Object
.
assign
(
treeNode
,
{
srfmajortext
:
treeNode
.
text
});
let
strNodeId
:
string
=
"orderTypeData"
;
Object
.
assign
(
treeNode
,
{
srfkey
:
item
.
value
});
strNodeId
+=
this
.
TREENODE_SEPARATOR
;
strNodeId
+=
item
.
value
;
Object
.
assign
(
treeNode
,
{
id
:
strNodeId
});
Object
.
assign
(
treeNode
,
{
expanded
:
filter
.
isautoexpand
}
);
Object
.
assign
(
treeNode
,
{
leaf
:
true
}
);
Object
.
assign
(
treeNode
,
{
navigateContext
:
{
ORDERTYPE
:
"%ordertype%"
}
})
;
Object
.
assign
(
treeNode
,
{
navigateParams
:
{
ordertype
:
"%ordertype%"
}
});
if
(
item
.
children
&&
item
.
children
.
length
>
0
)
{
Object
.
assign
(
treeNode
,
{
children
:
item
.
children
}
);
}
});
}
catch
(
error
)
{
console
.
error
(
error
);
}
Object
.
assign
(
treeNode
,
{
nodeid
:
treeNode
.
srfkey
});
Object
.
assign
(
treeNode
,
{
nodeid2
:
filter
.
strRealNodeId
});
Object
.
assign
(
treeNode
,
{
nodeType
:
"CODELIST"
,
appEntityName
:
"ibizordertype"
});
list
.
push
(
treeNode
);
resolve
(
list
);
})
}
else
{
resolve
(
list
);
}
});
});
}
/**
* 获取查询集合
*
* @public
* @param {any{}} context
* @param {*} searchFilter
* @param {*} filter
* @returns {any[]}
* @memberof TestEnetityDatasService
*/
@
Errorlog
public
searchOrdertypedata
(
context
:
any
=
{},
searchFilter
:
any
,
filter
:
any
):
Promise
<
any
>
{
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
if
(
filter
.
viewparams
){
Object
.
assign
(
searchFilter
,
filter
.
viewparams
);
}
if
(
!
searchFilter
.
page
){
Object
.
assign
(
searchFilter
,{
page
:
0
});
}
if
(
!
searchFilter
.
size
){
Object
.
assign
(
searchFilter
,{
size
:
1000
});
}
if
(
context
&&
context
.
srfparentdename
){
Object
.
assign
(
searchFilter
,{
srfparentdename
:
JSON
.
parse
(
JSON
.
stringify
(
context
)).
srfparentdename
});
}
if
(
context
&&
context
.
srfparentkey
){
Object
.
assign
(
searchFilter
,{
srfparentkey
:
JSON
.
parse
(
JSON
.
stringify
(
context
)).
srfparentkey
});
}
const
_appEntityService
:
any
=
this
.
ibizordertypeService
;
let
list
:
any
[]
=
[];
if
(
_appEntityService
[
'FetchDefault'
]
&&
_appEntityService
[
'FetchDefault'
]
instanceof
Function
)
{
const
response
:
Promise
<
any
>
=
_appEntityService
[
'FetchDefault'
](
context
,
searchFilter
,
false
);
response
.
then
((
response
:
any
)
=>
{
if
(
!
response
.
status
||
response
.
status
!==
200
)
{
resolve
([]);
console
.
log
(
JSON
.
stringify
(
context
));
console
.
error
(
'查询FetchDefault数据集异常!'
);
}
const
data
:
any
=
response
.
data
;
if
(
Object
.
keys
(
data
).
length
>
0
)
{
list
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
resolve
(
list
);
}
else
{
resolve
([]);
}
}).
catch
((
response
:
any
)
=>
{
resolve
([]);
console
.
log
(
JSON
.
stringify
(
context
));
console
.
error
(
'查询FetchDefault数据集异常!'
);
});
}
})
}
/**
* 填充 树视图节点[订单类型实体]子节点
*
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录