Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzrt
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzrt
提交
69f576c2
提交
69f576c2
编写于
4年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lab_qyk 发布系统代码
上级
e6c0df08
master
无相关合并请求
变更
9
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
33 行增加
和
22 行删除
+33
-22
filter-tree.less
app_Web/src/components/filter-tree/filter-tree.less
+12
-1
filter-tree.vue
app_Web/src/components/filter-tree/filter-tree.vue
+2
-2
ibzorganization_en_US.ts
.../lanres/entities/ibzorganization/ibzorganization_en_US.ts
+1
-1
ibzorganization_zh_CN.ts
.../lanres/entities/ibzorganization/ibzorganization_zh_CN.ts
+1
-1
default-searchform-base.vue
...ganization/default-searchform/default-searchform-base.vue
+10
-10
default-searchform-model.ts
...ganization/default-searchform/default-searchform-model.ts
+1
-1
main-grid-model.ts
.../src/widgets/ibzorganization/main-grid/main-grid-model.ts
+2
-2
IBZEmployeeServiceEx.java
...ibizlab/core/extensions.service/IBZEmployeeServiceEx.java
+2
-2
JobsInfoServiceEx.java
...cn/ibizlab/core/extensions.service/JobsInfoServiceEx.java
+2
-2
未找到文件。
app_Web/src/components/filter-tree/filter-tree.less
浏览文件 @
69f576c2
...
...
@@ -3,6 +3,7 @@
height: 40px;
.filter-tree-item {
display: flex;
width: 100%;
>div {
margin-right: 10px;
}
...
...
@@ -10,10 +11,20 @@
margin-right: 0;
}
.filter-tree-action {
margin-left: 20px;
display: none;
align-items: center;
.ivu-btn {
margin-right: 5px;
}
.ivu-icon-md-close {
color: red;
font-size: 24px;
}
}
}
.filter-tree-item:hover {
.filter-tree-action {
display: flex;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/components/filter-tree/filter-tree.vue
浏览文件 @
69f576c2
...
...
@@ -9,7 +9,7 @@
<div
class=
"filter-tree-action"
>
<i-button
title=
"添加条件"
@
click=
"onAddItem(data)"
><i
class=
"fa fa-plus"
aria-hidden=
"true"
></i>
添加条件
</i-button>
<i-button
title=
"添加组"
@
click=
"onAddGroup(data)"
><i
class=
"fa fa-plus"
aria-hidden=
"true"
></i>
添加组
</i-button>
<i
-button
v-if=
"!data.isroot"
@
click=
"onRemoveItem(node, data)"
title=
"删除"
><i
class=
"fa fa-trash-o"
aria-hidden=
"true"
></i></i-button
>
<i
con
v-if=
"!data.isroot"
type=
"md-close"
@
click=
"onRemoveItem(node, data)"
/
>
</div>
</div>
</
template
>
...
...
@@ -29,7 +29,7 @@
<slot
v-else
:data=
"data"
></slot>
</div>
<div
class=
"filter-tree-action"
>
<i
-button
@
click=
"onRemoveItem(node, data)"
title=
"删除"
><i
class=
"fa fa-trash-o"
aria-hidden=
"true"
></i></i-button
>
<i
con
type=
"md-close"
@
click=
"onRemoveItem(node, data)"
/
>
</div>
</div>
</
template
>
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/locale/lanres/entities/ibzorganization/ibzorganization_en_US.ts
浏览文件 @
69f576c2
...
...
@@ -109,7 +109,7 @@ export default {
orgcode
:
"Actor"
,
n_orgname_like
:
"Print"
,
n_porgid_eq
:
"上级单位(=)"
,
porgname
:
"上级单位(等于(=))"
,
n_porgname_eq
:
"上级单位(等于(=))"
,
},
uiactions
:
{
},
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/locale/lanres/entities/ibzorganization/ibzorganization_zh_CN.ts
浏览文件 @
69f576c2
...
...
@@ -108,7 +108,7 @@ export default {
orgcode
:
"单位代码(文本左包含(%#))"
,
n_orgname_like
:
"名称(%)"
,
n_porgid_eq
:
"上级单位(=)"
,
porgname
:
"上级单位(等于(=))"
,
n_porgname_eq
:
"上级单位(等于(=))"
,
},
uiactions
:
{
},
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/widgets/ibzorganization/default-searchform/default-searchform-base.vue
浏览文件 @
69f576c2
...
...
@@ -16,9 +16,9 @@
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.
porgname
.visible"
:style=
"
{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item
name=
'
porgname'
:itemRules=
"this.rules.porgname"
class=
''
:caption=
"$t('entities.ibzorganization.default_searchform.details.porgname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.porgname
.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'n_porgid_eq','label':'
porgname
'}" url="/ibzorganizations/alls/suborg/picker" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
<i-col
v-show=
"detailsModel.
n_porgname_eq
.visible"
:style=
"
{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item
name=
'
n_porgname_eq'
:itemRules=
"this.rules.n_porgname_eq"
class=
''
:caption=
"$t('entities.ibzorganization.default_searchform.details.n_porgname_eq')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.n_porgname_eq
.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'n_porgid_eq','label':'
n_porgname_eq
'}" url="/ibzorganizations/alls/suborg/picker" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
</app-form-item>
</i-col>
...
...
@@ -267,7 +267,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
orgcode
:
null
,
n_orgname_like
:
null
,
n_porgid_eq
:
null
,
porgname
:
null
,
n_porgname_eq
:
null
,
};
/**
...
...
@@ -295,7 +295,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
{
required
:
false
,
type
:
'string'
,
message
:
'上级单位(=) 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'上级单位(=) 值不能为空'
,
trigger
:
'blur'
},
],
porgname
:
[
n_porgname_eq
:
[
{
type
:
'string'
,
message
:
'上级单位(等于(=)) 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'上级单位(等于(=)) 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'上级单位(等于(=)) 值不能为空'
,
trigger
:
'change'
},
...
...
@@ -318,7 +318,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
,
n_porgid_eq
:
new
FormItemModel
({
caption
:
'上级单位(=)'
,
detailType
:
'FORMITEM'
,
name
:
'n_porgid_eq'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
porgname
:
new
FormItemModel
({
caption
:
'上级单位(等于(=))'
,
detailType
:
'FORMITEM'
,
name
:
'porgname
'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
n_porgname_eq
:
new
FormItemModel
({
caption
:
'上级单位(等于(=))'
,
detailType
:
'FORMITEM'
,
name
:
'n_porgname_eq
'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
};
...
...
@@ -359,15 +359,15 @@ export default class DefaultBase extends Vue implements ControlInterface {
}
/**
* 监控表单属性
porgname
值
* 监控表单属性
n_porgname_eq
值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@
Watch
(
'data.
porgname
'
)
on
Porgname
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
porgname
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
@
Watch
(
'data.
n_porgname_eq
'
)
on
N_porgname_eq
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
n_porgname_eq
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/widgets/ibzorganization/default-searchform/default-searchform-model.ts
浏览文件 @
69f576c2
...
...
@@ -41,7 +41,7 @@ export default class DefaultModel {
dataType
:
'PICKUP'
,
},
{
name
:
'
porgname
'
,
name
:
'
n_porgname_eq
'
,
prop
:
'parentorgname'
,
dataType
:
'PICKUPTEXT'
,
},
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/widgets/ibzorganization/main-grid/main-grid-model.ts
浏览文件 @
69f576c2
...
...
@@ -111,8 +111,8 @@ export default class MainModel {
dataType
:
'PICKUP'
,
},
{
name
:
'
porgname
'
,
prop
:
'
porgname
'
,
name
:
'
n_porgname_eq
'
,
prop
:
'
n_porgname_eq
'
,
dataType
:
'PICKUPTEXT'
,
},
...
...
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/extensions.service/IBZEmployeeServiceEx.java
浏览文件 @
69f576c2
package
cn
.
ibizlab
.
core
.
extensions
.
service
;
/**
* 扩展目录已变更,请到[cn.ibizlab.core.extensions.service.xx
ServiceExt
]中来进行扩展
* 若您之前有在当前目录下扩展过其它的service对象,请将扩展的代码移到新的扩展类中
* 扩展目录已变更,请到[cn.ibizlab.core.extensions.service.xx
ExService
]中来进行扩展
* 若您之前有在当前目录下扩展过其它的service对象,请将扩展的代码移到新的扩展类中
,并注释掉老的扩展类,防止Bean重复
*/
@Deprecated
public
class
IBZEmployeeServiceEx
{
...
...
This diff is collapsed.
Click to expand it.
ibzrt-core/src/main/java/cn/ibizlab/core/extensions.service/JobsInfoServiceEx.java
浏览文件 @
69f576c2
package
cn
.
ibizlab
.
core
.
extensions
.
service
;
/**
* 扩展目录已变更,请到[cn.ibizlab.core.extensions.service.xx
ServiceExt
]中来进行扩展
* 若您之前有在当前目录下扩展过其它的service对象,请将扩展的代码移到新的扩展类中
* 扩展目录已变更,请到[cn.ibizlab.core.extensions.service.xx
ExService
]中来进行扩展
* 若您之前有在当前目录下扩展过其它的service对象,请将扩展的代码移到新的扩展类中
,并注释掉老的扩展类,防止Bean重复
*/
@Deprecated
public
class
JobsInfoServiceEx
{
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录