Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
137b1c56
提交
137b1c56
编写于
5月 27, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
2de9ab42
变更
12
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
145 行增加
和
117 行删除
+145
-117
ibzdepartment_en_US.ts
...eb/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts
+1
-1
ibzdepartment_zh_CN.ts
...eb/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts
+1
-1
ibzorganization_en_US.ts
...rc/locale/lanres/ibzorganization/ibzorganization_en_US.ts
+3
-1
ibzorganization_zh_CN.ts
...rc/locale/lanres/ibzorganization/ibzorganization_zh_CN.ts
+3
-1
main-form-base.vue
...eb/src/widgets/ibzdepartment/main-form/main-form-base.vue
+24
-24
main-form-model.ts
...eb/src/widgets/ibzdepartment/main-form/main-form-model.ts
+4
-4
main-form-service.ts
.../src/widgets/ibzdepartment/main-form/main-form-service.ts
+3
-3
main-form-base.vue
.../src/widgets/ibzorganization/main-form/main-form-base.vue
+23
-42
main-form-model.ts
.../src/widgets/ibzorganization/main-form/main-form-model.ts
+5
-5
main-grid-base.vue
.../src/widgets/ibzorganization/main-grid/main-grid-base.vue
+39
-1
main-grid-model.ts
.../src/widgets/ibzorganization/main-grid/main-grid-model.ts
+34
-29
h2_table.xml
ibzou-core/src/main/resources/liquibase/h2_table.xml
+5
-5
未找到文件。
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts
浏览文件 @
137b1c56
...
...
@@ -90,8 +90,8 @@ export default {
deptid
:
"部门标识"
,
deptcode
:
"部门代码"
,
deptname
:
"部门名称"
,
pdeptname
:
"上级部门"
,
orgname
:
"单位"
,
pdeptname
:
"上级部门"
,
orgid
:
"单位"
,
pdeptid
:
"上级部门"
,
shortname
:
"部门简称"
,
...
...
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts
浏览文件 @
137b1c56
...
...
@@ -89,8 +89,8 @@ export default {
deptid
:
'部门标识'
,
deptcode
:
'部门代码'
,
deptname
:
'部门名称'
,
pdeptname
:
'上级部门'
,
orgname
:
'单位'
,
pdeptname
:
'上级部门'
,
orgid
:
'单位'
,
pdeptid
:
'上级部门'
,
shortname
:
'部门简称'
,
...
...
app_web/src/locale/lanres/ibzorganization/ibzorganization_en_US.ts
浏览文件 @
137b1c56
...
...
@@ -57,9 +57,9 @@ export default {
orglevel
:
"单位级别"
,
shortname
:
"单位简称"
,
showorder
:
"排序"
,
porgid
:
"上级单位"
,
createdate
:
"创建时间"
,
updatedate
:
"最后修改时间"
,
porgid
:
"上级单位"
,
},
uiactions
:
{
},
...
...
@@ -93,6 +93,8 @@ export default {
orgname
:
"名称"
,
orglevel
:
"单位级别"
,
shortname
:
"单位简称"
,
porgname
:
"上级单位"
,
porgid
:
"上级单位"
,
showorder
:
"排序"
,
createdate
:
"创建时间"
,
updatedate
:
"最后修改时间"
,
...
...
app_web/src/locale/lanres/ibzorganization/ibzorganization_zh_CN.ts
浏览文件 @
137b1c56
...
...
@@ -56,9 +56,9 @@ export default {
orglevel
:
'单位级别'
,
shortname
:
'单位简称'
,
showorder
:
'排序'
,
porgid
:
'上级单位'
,
createdate
:
'创建时间'
,
updatedate
:
'最后修改时间'
,
porgid
:
'上级单位'
,
},
uiactions
:
{
},
...
...
@@ -92,6 +92,8 @@ export default {
orgname
:
'名称'
,
orglevel
:
'单位级别'
,
shortname
:
'单位简称'
,
porgname
:
'上级单位'
,
porgid
:
'上级单位'
,
showorder
:
'排序'
,
createdate
:
'创建时间'
,
updatedate
:
'最后修改时间'
,
...
...
app_web/src/widgets/ibzdepartment/main-form/main-form-base.vue
浏览文件 @
137b1c56
...
...
@@ -14,18 +14,18 @@
<input-box
v-model=
"data.deptname"
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.deptname.disabled"
type=
'text'
style=
""
></input-box>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.pdeptname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'pdeptname'
:itemRules=
"this.rules.pdeptname"
class=
''
:caption=
"$t('entities.ibzdepartment.main_form.details.pdeptname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.pdeptname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
url=
"/ibzorganizations/$
{orgid}/ibzdepartments/picker" filter="orgid" :fillMap="{'id':'pdeptid','label':'pdeptname'}" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.orgname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'orgname'
:itemRules=
"this.rules.orgname"
class=
''
:caption=
"$t('entities.ibzdepartment.main_form.details.orgname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.orgname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'orgid','label':'orgname'}" url="/ibzorganizations/${orgid}/suborg/picker" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-org-select>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.pdeptname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'pdeptname'
:itemRules=
"this.rules.pdeptname"
class=
''
:caption=
"$t('entities.ibzdepartment.main_form.details.pdeptname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.pdeptname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
url=
"/ibzorganizations/$
{orgid}/ibzdepartments/picker" filter="orgid" :fillMap="{'id':'pdeptid','label':'pdeptname'}" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.shortname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'shortname'
:itemRules=
"this.rules.shortname"
class=
''
:caption=
"$t('entities.ibzdepartment.main_form.details.shortname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.shortname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
...
...
@@ -54,7 +54,7 @@
url=
"/ibzorganizations/$
{selected-orgid}/ibzemployees/picker"
:multiple="true"
filter="
srf
orgid"
filter="orgid"
:fillmap="{'id':'leaderid','label':'leadername'}"
:disabled="detailsModel.leadername.disabled"
:data="data"
...
...
@@ -394,8 +394,8 @@ export default class MainBase extends Vue implements ControlInterface {
deptid
:
null
,
deptcode
:
null
,
deptname
:
null
,
pdeptname
:
null
,
orgname
:
null
,
pdeptname
:
null
,
orgid
:
null
,
pdeptid
:
null
,
shortname
:
null
,
...
...
@@ -514,18 +514,18 @@ export default class MainBase extends Vue implements ControlInterface {
{
required
:
true
,
type
:
'string'
,
message
:
'部门名称 值不能为空'
,
trigger
:
'change'
},
{
required
:
true
,
type
:
'string'
,
message
:
'部门名称 值不能为空'
,
trigger
:
'blur'
},
],
pdeptname
:
[
{
type
:
'string'
,
message
:
'上级部门 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'上级部门 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'上级部门 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'上级部门 值不能为空'
,
trigger
:
'blur'
},
],
orgname
:
[
{
type
:
'string'
,
message
:
'单位 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'单位 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
true
,
type
:
'string'
,
message
:
'单位 值不能为空'
,
trigger
:
'change'
},
{
required
:
true
,
type
:
'string'
,
message
:
'单位 值不能为空'
,
trigger
:
'blur'
},
],
pdeptname
:
[
{
type
:
'string'
,
message
:
'上级部门 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'上级部门 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'上级部门 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'上级部门 值不能为空'
,
trigger
:
'blur'
},
],
orgid
:
[
{
type
:
'string'
,
message
:
'单位 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'单位 值必须为字符串类型'
,
trigger
:
'blur'
},
...
...
@@ -618,10 +618,10 @@ export default class MainBase extends Vue implements ControlInterface {
deptcode
:
new
FormItemModel
({
caption
:
'部门代码'
,
detailType
:
'FORMITEM'
,
name
:
'deptcode'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
1
})
,
deptname
:
new
FormItemModel
({
caption
:
'部门名称'
,
detailType
:
'FORMITEM'
,
name
:
'deptname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
pdeptname
:
new
FormItemModel
({
caption
:
'上级部门'
,
detailType
:
'FORMITEM'
,
name
:
'pdeptname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
orgname
:
new
FormItemModel
({
caption
:
'单位'
,
detailType
:
'FORMITEM'
,
name
:
'orgname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
pdeptname
:
new
FormItemModel
({
caption
:
'上级部门'
,
detailType
:
'FORMITEM'
,
name
:
'pdeptname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
orgid
:
new
FormItemModel
({
caption
:
'单位'
,
detailType
:
'FORMITEM'
,
name
:
'orgid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
...
...
@@ -778,27 +778,27 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
* 监控表单属性
pdept
name 值
* 监控表单属性
org
name 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@
Watch
(
'data.
pdept
name'
)
on
Pdept
nameChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
pdept
name'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
@
Watch
(
'data.
org
name'
)
on
Org
nameChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
org
name'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性
org
name 值
* 监控表单属性
pdept
name 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@
Watch
(
'data.
org
name'
)
on
Org
nameChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
org
name'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
@
Watch
(
'data.
pdept
name'
)
on
Pdept
nameChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
pdept
name'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
...
...
app_web/src/widgets/ibzdepartment/main-form/main-form-model.ts
浏览文件 @
137b1c56
...
...
@@ -71,13 +71,13 @@ export default class MainModel {
dataType
:
'TEXT'
,
},
{
name
:
'
pdept
name'
,
prop
:
'
parentdept
name'
,
name
:
'
org
name'
,
prop
:
'
org
name'
,
dataType
:
'PICKUPTEXT'
,
},
{
name
:
'
org
name'
,
prop
:
'
org
name'
,
name
:
'
pdept
name'
,
prop
:
'
parentdept
name'
,
dataType
:
'PICKUPTEXT'
,
},
{
...
...
app_web/src/widgets/ibzdepartment/main-form/main-form-service.ts
浏览文件 @
137b1c56
...
...
@@ -89,12 +89,12 @@ export default class MainService extends ControlService {
*/
@
Errorlog
public
getItems
(
serviceName
:
string
,
interfaceName
:
string
,
context
:
any
=
{},
data
:
any
,
isloading
?:
boolean
):
Promise
<
any
[]
>
{
if
(
Object
.
is
(
serviceName
,
'IBZDepartmentService'
)
&&
Object
.
is
(
interfaceName
,
'FetchDefault'
))
{
return
this
.
doItems
(
this
.
appEntityService
.
FetchDefault
(
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
,
isloading
),
'deptid'
,
'ibzdepartment'
);
}
if
(
Object
.
is
(
serviceName
,
'IBZOrganizationService'
)
&&
Object
.
is
(
interfaceName
,
'FetchDefault'
))
{
return
this
.
doItems
(
this
.
ibzorganizationService
.
FetchDefault
(
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
,
isloading
),
'orgid'
,
'ibzorganization'
);
}
if
(
Object
.
is
(
serviceName
,
'IBZDepartmentService'
)
&&
Object
.
is
(
interfaceName
,
'FetchDefault'
))
{
return
this
.
doItems
(
this
.
appEntityService
.
FetchDefault
(
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
,
isloading
),
'deptid'
,
'ibzdepartment'
);
}
return
Promise
.
reject
([])
}
...
...
app_web/src/widgets/ibzorganization/main-form/main-form-base.vue
浏览文件 @
137b1c56
...
...
@@ -17,26 +17,7 @@
</i-col>
<i-col
v-show=
"detailsModel.porgname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'porgname'
:itemRules=
"this.rules.porgname"
class=
''
:caption=
"$t('entities.ibzorganization.main_form.details.porgname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.porgname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-picker
:formState=
"formState"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:itemParam=
'
{ }'
:disabled="detailsModel.porgname.disabled"
name='porgname'
deMajorField='orgname'
deKeyField='ibzorganization'
:service="service"
:acParams="{ serviceName: 'IBZOrganizationService', interfaceName: 'FetchDefault'}"
valueitem='porgid'
:value="data.porgname"
editortype=""
:pickupView="{ viewname: 'ibzorganization-pickup-view', title: $t('entities.ibzorganization.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="onFormItemValueChange">
</app-picker>
<app-org-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
:fillMap=
"
{'id':'porgid','label':'porgname'}" url="/ibzorganizations/alls/suborg/picker" filter="srforgid" :multiple="true" style="" @select-change="onFormItemValueChange">
</app-org-select>
</app-form-item>
</i-col>
...
...
@@ -385,9 +366,9 @@ export default class MainBase extends Vue implements ControlInterface {
orglevel
:
null
,
shortname
:
null
,
showorder
:
null
,
porgid
:
null
,
createdate
:
null
,
updatedate
:
null
,
porgid
:
null
,
ibzorganization
:
null
,
};
...
...
@@ -520,6 +501,12 @@ export default class MainBase extends Vue implements ControlInterface {
{
required
:
false
,
type
:
'number'
,
message
:
'排序 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'number'
,
message
:
'排序 值不能为空'
,
trigger
:
'blur'
},
],
porgid
:
[
{
type
:
'string'
,
message
:
'上级单位 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'上级单位 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'上级单位 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'上级单位 值不能为空'
,
trigger
:
'blur'
},
],
createdate
:
[
{
type
:
'string'
,
message
:
'创建时间 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'创建时间 值必须为字符串类型'
,
trigger
:
'blur'
},
...
...
@@ -532,12 +519,6 @@ export default class MainBase extends Vue implements ControlInterface {
{
required
:
false
,
type
:
'string'
,
message
:
'最后修改时间 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'最后修改时间 值不能为空'
,
trigger
:
'blur'
},
],
porgid
:
[
{
type
:
'string'
,
message
:
'上级单位 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'上级单位 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'上级单位 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'上级单位 值不能为空'
,
trigger
:
'blur'
},
],
}
/**
...
...
@@ -571,19 +552,19 @@ export default class MainBase extends Vue implements ControlInterface {
,
orgname
:
new
FormItemModel
({
caption
:
'名称'
,
detailType
:
'FORMITEM'
,
name
:
'orgname'
,
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
})
porgname
:
new
FormItemModel
({
caption
:
'上级单位'
,
detailType
:
'FORMITEM'
,
name
:
'porgname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
1
})
,
orglevel
:
new
FormItemModel
({
caption
:
'单位级别'
,
detailType
:
'FORMITEM'
,
name
:
'orglevel'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
shortname
:
new
FormItemModel
({
caption
:
'单位简称'
,
detailType
:
'FORMITEM'
,
name
:
'shortname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
showorder
:
new
FormItemModel
({
caption
:
'排序'
,
detailType
:
'FORMITEM'
,
name
:
'showorder'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
porgid
:
new
FormItemModel
({
caption
:
'上级单位'
,
detailType
:
'FORMITEM'
,
name
:
'porgid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
createdate
:
new
FormItemModel
({
caption
:
'创建时间'
,
detailType
:
'FORMITEM'
,
name
:
'createdate'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
updatedate
:
new
FormItemModel
({
caption
:
'最后修改时间'
,
detailType
:
'FORMITEM'
,
name
:
'updatedate'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
porgid
:
new
FormItemModel
({
caption
:
'上级单位'
,
detailType
:
'FORMITEM'
,
name
:
'porgid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
};
...
...
@@ -768,39 +749,39 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
* 监控表单属性
createdate
值
* 监控表单属性
porgid
值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@
Watch
(
'data.
createdate
'
)
on
Createdate
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
createdate
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
@
Watch
(
'data.
porgid
'
)
on
Porgid
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
porgid
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性
upd
atedate 值
* 监控表单属性
cre
atedate 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@
Watch
(
'data.
upd
atedate'
)
on
Upd
atedateChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
upd
atedate'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
@
Watch
(
'data.
cre
atedate'
)
on
Cre
atedateChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
cre
atedate'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性
porgid
值
* 监控表单属性
updatedate
值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@
Watch
(
'data.
porgid
'
)
on
Porgid
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
porgid
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
@
Watch
(
'data.
updatedate
'
)
on
Updatedate
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
updatedate
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
...
...
app_web/src/widgets/ibzorganization/main-form/main-form-model.ts
浏览文件 @
137b1c56
...
...
@@ -90,6 +90,11 @@ export default class MainModel {
prop
:
'showorder'
,
dataType
:
'INT'
,
},
{
name
:
'porgid'
,
prop
:
'parentorgid'
,
dataType
:
'PICKUP'
,
},
{
name
:
'createdate'
,
prop
:
'createdate'
,
...
...
@@ -100,11 +105,6 @@ export default class MainModel {
prop
:
'updatedate'
,
dataType
:
'DATETIME'
,
},
{
name
:
'porgid'
,
prop
:
'parentorgid'
,
dataType
:
'PICKUP'
,
},
{
name
:
'ibzorganization'
,
prop
:
'orgid'
,
...
...
app_web/src/widgets/ibzorganization/main-grid/main-grid-base.vue
浏览文件 @
137b1c56
...
...
@@ -82,6 +82,30 @@
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('porgname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'porgname'"
:label=
"$t('entities.ibzorganization.main_grid.columns.porgname')"
:width=
"200"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.porgname'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<span>
{{
row
.
porgname
}}
</span>
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('porgid')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'porgid'"
:label=
"$t('entities.ibzorganization.main_grid.columns.porgid')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzorganization.main_grid.columns.porgid'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<span>
{{
row
.
porgid
}}
</span>
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('showorder')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'showorder'"
:label=
"$t('entities.ibzorganization.main_grid.columns.showorder')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
...
...
@@ -599,7 +623,7 @@ export default class MainBase extends Vue implements ControlInterface {
name
:
'orgid'
,
label
:
'单位标识'
,
langtag
:
'entities.ibzorganization.main_grid.columns.orgid'
,
show
:
tru
e
,
show
:
fals
e
,
util
:
'px'
},
{
...
...
@@ -630,6 +654,20 @@ export default class MainBase extends Vue implements ControlInterface {
show
:
true
,
util
:
'px'
},
{
name
:
'porgname'
,
label
:
'上级单位'
,
langtag
:
'entities.ibzorganization.main_grid.columns.porgname'
,
show
:
true
,
util
:
'PX'
},
{
name
:
'porgid'
,
label
:
'上级单位'
,
langtag
:
'entities.ibzorganization.main_grid.columns.porgid'
,
show
:
false
,
util
:
'PX'
},
{
name
:
'showorder'
,
label
:
'排序'
,
...
...
app_web/src/widgets/ibzorganization/main-grid/main-grid-model.ts
浏览文件 @
137b1c56
...
...
@@ -27,65 +27,70 @@ export default class MainModel {
}
else
{
return
[
{
name
:
'orgcode'
,
prop
:
'orgcode'
,
dataType
:
'TEXT'
,
},
{
name
:
'orgid'
,
prop
:
'orgid'
,
dataType
:
'TEXT'
,
name
:
'orglevel'
,
prop
:
'orglevel'
,
dataType
:
'INT'
,
},
{
name
:
'orgname'
,
prop
:
'orgname'
,
dataType
:
'TEXT'
,
name
:
'
p
orgname'
,
prop
:
'
parent
orgname'
,
dataType
:
'
PICKUP
TEXT'
,
},
{
name
:
'porgid'
,
prop
:
'parentorgid'
,
dataType
:
'PICKUP'
,
},
{
name
:
'orglevel'
,
prop
:
'orglevel'
,
dataType
:
'INT'
,
},
{
name
:
'createdate'
,
prop
:
'createdate'
,
dataType
:
'DATETIME'
,
},
{
name
:
's
howorder
'
,
prop
:
'
showorder
'
,
dataType
:
'
IN
T'
,
name
:
's
rfmajortext
'
,
prop
:
'
orgname
'
,
dataType
:
'
TEX
T'
,
},
{
name
:
's
hortname
'
,
prop
:
'
shortname
'
,
name
:
's
rfkey
'
,
prop
:
'
orgid
'
,
dataType
:
'TEXT'
,
},
{
name
:
'
updatedate
'
,
prop
:
'
updatedate
'
,
dataType
:
'
DATETIME
'
,
name
:
'
srfdataaccaction
'
,
prop
:
'
orgid
'
,
dataType
:
'
TEXT
'
,
},
{
name
:
'
srfmajortext
'
,
prop
:
'org
nam
e'
,
name
:
'
orgcode
'
,
prop
:
'org
cod
e'
,
dataType
:
'TEXT'
,
},
{
name
:
'
srfdataaccaction
'
,
name
:
'
orgid
'
,
prop
:
'orgid'
,
dataType
:
'TEXT'
,
},
{
name
:
'
srfkey
'
,
prop
:
'org
id
'
,
name
:
'
orgname
'
,
prop
:
'org
name
'
,
dataType
:
'TEXT'
,
},
{
name
:
'shortname'
,
prop
:
'shortname'
,
dataType
:
'TEXT'
,
},
{
name
:
'showorder'
,
prop
:
'showorder'
,
dataType
:
'INT'
,
},
{
name
:
'updatedate'
,
prop
:
'updatedate'
,
dataType
:
'DATETIME'
,
},
{
name
:
'ibzorganization'
,
prop
:
'orgid'
,
...
...
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
137b1c56
...
...
@@ -4,7 +4,7 @@
<!--输出实体[IBZORG]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzorg-43
3
-1"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzorg-43
6
-1"
>
<createTable
tableName=
"IBZORG"
>
<column
name=
"ORGID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_IBZORG_ORGID"
/>
...
...
@@ -126,7 +126,7 @@
<!--输出实体[IBZDEPT]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdept-68
0
-4"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdept-68
1
-4"
>
<createTable
tableName=
"IBZDEPT"
>
<column
name=
"DEPTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_IBZDEPT_DEPTID"
/>
...
...
@@ -161,7 +161,7 @@
</changeSet>
<!--输出实体[IBZORG]外键关系 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzorg-43
3
-5"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzorg-43
6
-5"
>
<addForeignKeyConstraint
baseColumnNames=
"PORGID"
baseTableName=
"IBZORG"
constraintName=
"DER1N_IBZORG_IBZORG_PORGID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGID"
referencedTableName=
"IBZORG"
validate=
"true"
/>
</changeSet>
<!--输出实体[IBZEMP]外键关系 -->
...
...
@@ -179,10 +179,10 @@
<addForeignKeyConstraint
baseColumnNames=
"USERID"
baseTableName=
"IBZDEPTMEMBER"
constraintName=
"DER1N_IBZDEPTMEMBER_IBZEMP_USE"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"USERID"
referencedTableName=
"IBZEMP"
validate=
"true"
/>
</changeSet>
<!--输出实体[IBZDEPT]外键关系 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-68
0
-10"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-68
1
-10"
>
<addForeignKeyConstraint
baseColumnNames=
"PDEPTID"
baseTableName=
"IBZDEPT"
constraintName=
"DER1N_IBZDEPT_IBZDEPT_PDEPTID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"DEPTID"
referencedTableName=
"IBZDEPT"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-68
0
-11"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-68
1
-11"
>
<addForeignKeyConstraint
baseColumnNames=
"ORGID"
baseTableName=
"IBZDEPT"
constraintName=
"DER1N_IBZDEPT_IBZORG_ORGID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGID"
referencedTableName=
"IBZORG"
validate=
"true"
/>
</changeSet>
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录