Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
696959ce
提交
696959ce
编写于
5月 27, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
5a63cd85
变更
8
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
197 行增加
和
97 行删除
+197
-97
ibzemployee_en_US.ts
app_web/src/locale/lanres/ibzemployee/ibzemployee_en_US.ts
+6
-2
ibzemployee_zh_CN.ts
app_web/src/locale/lanres/ibzemployee/ibzemployee_zh_CN.ts
+6
-2
edit-grid-grid-base.vue
...gets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue
+2
-2
main-form-base.vue
app_web/src/widgets/ibzemployee/main-form/main-form-base.vue
+51
-3
main-form-model.ts
app_web/src/widgets/ibzemployee/main-form/main-form-model.ts
+10
-0
new-form-form-base.vue
.../widgets/ibzemployee/new-form-form/new-form-form-base.vue
+96
-72
new-form-form-model.ts
.../widgets/ibzemployee/new-form-form/new-form-form-model.ts
+20
-10
h2_table.xml
ibzou-core/src/main/resources/liquibase/h2_table.xml
+6
-6
未找到文件。
app_web/src/locale/lanres/ibzemployee/ibzemployee_en_US.ts
浏览文件 @
696959ce
...
...
@@ -94,6 +94,8 @@ export default {
orgname
:
"单位"
,
mdeptid
:
"主部门"
,
mdeptname
:
"部门"
,
mdeptcode
:
"主部门代码"
,
orgcode
:
"单位代码"
,
bcode
:
"业务编码"
,
nickname
:
"昵称别名"
,
sex
:
"性别"
,
...
...
@@ -132,11 +134,13 @@ export default {
personname
:
"姓名"
,
loginname
:
"登录名"
,
orgname
:
"单位"
,
orgid
:
"单位"
,
orgcode
:
"单位代码"
,
mdeptname
:
"部门"
,
mdeptcode
:
"主部门代码"
,
mdeptid
:
"主部门"
,
enable
:
"逻辑有效"
,
orgid
:
"单位"
,
userid
:
"用户标识"
,
mdeptid
:
"主部门"
,
},
uiactions
:
{
},
...
...
app_web/src/locale/lanres/ibzemployee/ibzemployee_zh_CN.ts
浏览文件 @
696959ce
...
...
@@ -93,6 +93,8 @@ export default {
orgname
:
'单位'
,
mdeptid
:
'主部门'
,
mdeptname
:
'部门'
,
mdeptcode
:
'主部门代码'
,
orgcode
:
'单位代码'
,
bcode
:
'业务编码'
,
nickname
:
'昵称别名'
,
sex
:
'性别'
,
...
...
@@ -131,11 +133,13 @@ export default {
personname
:
'姓名'
,
loginname
:
'登录名'
,
orgname
:
'单位'
,
orgid
:
'单位'
,
orgcode
:
'单位代码'
,
mdeptname
:
'部门'
,
mdeptcode
:
'主部门代码'
,
mdeptid
:
'主部门'
,
enable
:
'逻辑有效'
,
orgid
:
'单位'
,
userid
:
'用户标识'
,
mdeptid
:
'主部门'
,
},
uiactions
:
{
},
...
...
app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue
浏览文件 @
696959ce
...
...
@@ -77,7 +77,7 @@
</el-table-column>
</template>
<
template
v-if=
"getColumnState('orgname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'orgname'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.orgname')"
:width=
"
1
00"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'orgname'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.orgname')"
:width=
"
2
00"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.orgname'
)
}}
...
...
@@ -89,7 +89,7 @@
</el-table-column>
</template>
<
template
v-if=
"getColumnState('pdeptname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'pdeptname'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.pdeptname')"
:width=
"
10
0"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'pdeptname'"
:label=
"$t('entities.ibzdepartment.editgrid_grid.columns.pdeptname')"
:width=
"
25
0"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibzdepartment.editgrid_grid.columns.pdeptname'
)
}}
...
...
app_web/src/widgets/ibzemployee/main-form/main-form-base.vue
浏览文件 @
696959ce
...
...
@@ -35,7 +35,7 @@
</i-col>
<i-col
v-show=
"detailsModel.mdeptname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'mdeptname'
:itemRules=
"this.rules.mdeptname"
class=
''
:caption=
"$t('entities.ibzemployee.main_form.details.mdeptname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.mdeptname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
url=
"/ibzorganizations/$
{orgid}/ibzdepartments/picker" filter="
srf
orgid" :fillMap="{'id':'mdeptid','label':'mdeptname'}" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
url=
"/ibzorganizations/$
{orgid}/ibzdepartments/picker" filter="orgid" :fillMap="{'id':'mdeptid','label':'mdeptname'}" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
</app-form-item>
</i-col>
...
...
@@ -496,6 +496,8 @@ export default class MainBase extends Vue implements ControlInterface {
orgname
:
null
,
mdeptid
:
null
,
mdeptname
:
null
,
mdeptcode
:
null
,
orgcode
:
null
,
bcode
:
null
,
nickname
:
null
,
sex
:
null
,
...
...
@@ -646,6 +648,18 @@ export default class MainBase extends Vue implements ControlInterface {
{
required
:
true
,
type
:
'string'
,
message
:
'部门 值不能为空'
,
trigger
:
'change'
},
{
required
:
true
,
type
:
'string'
,
message
:
'部门 值不能为空'
,
trigger
:
'blur'
},
],
mdeptcode
:
[
{
type
:
'string'
,
message
:
'主部门代码 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'主部门代码 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'主部门代码 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'主部门代码 值不能为空'
,
trigger
:
'blur'
},
],
orgcode
:
[
{
type
:
'string'
,
message
:
'单位代码 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'单位代码 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'单位代码 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'单位代码 值不能为空'
,
trigger
:
'blur'
},
],
bcode
:
[
{
type
:
'string'
,
message
:
'业务编码 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'业务编码 值必须为字符串类型'
,
trigger
:
'blur'
},
...
...
@@ -795,13 +809,17 @@ export default class MainBase extends Vue implements ControlInterface {
,
loginname
:
new
FormItemModel
({
caption
:
'登录名'
,
detailType
:
'FORMITEM'
,
name
:
'loginname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
1
})
,
orgid
:
new
FormItemModel
({
caption
:
'单位'
,
detailType
:
'FORMITEM'
,
name
:
'orgid'
,
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
:
1
})
,
orgname
:
new
FormItemModel
({
caption
:
'单位'
,
detailType
:
'FORMITEM'
,
name
:
'orgname'
,
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
:
1
})
,
mdeptid
:
new
FormItemModel
({
caption
:
'主部门'
,
detailType
:
'FORMITEM'
,
name
:
'mdeptid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
mdeptname
:
new
FormItemModel
({
caption
:
'部门'
,
detailType
:
'FORMITEM'
,
name
:
'mdeptname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
mdeptcode
:
new
FormItemModel
({
caption
:
'主部门代码'
,
detailType
:
'FORMITEM'
,
name
:
'mdeptcode'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
orgcode
:
new
FormItemModel
({
caption
:
'单位代码'
,
detailType
:
'FORMITEM'
,
name
:
'orgcode'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
1
})
,
bcode
:
new
FormItemModel
({
caption
:
'业务编码'
,
detailType
:
'FORMITEM'
,
name
:
'bcode'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
...
...
@@ -1021,6 +1039,30 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
formDataChange
({
name
:
'mdeptname'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 mdeptcode 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@
Watch
(
'data.mdeptcode'
)
onMdeptcodeChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'mdeptcode'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 orgcode 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@
Watch
(
'data.orgcode'
)
onOrgcodeChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'orgcode'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 bcode 值
*
...
...
@@ -1246,6 +1288,10 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main
*/
public
resetFormData
({
name
,
newVal
,
oldVal
}:
{
name
:
string
,
newVal
:
any
,
oldVal
:
any
}):
void
{
if
(
Object
.
is
(
name
,
'orgid'
))
{
this
.
onFormItemValueChange
({
name
:
'mdeptname'
,
value
:
null
});
this
.
onFormItemValueChange
({
name
:
'mdeptid'
,
value
:
null
});
}
}
/**
...
...
@@ -1308,6 +1354,8 @@ export default class MainBase extends Vue implements ControlInterface {
...
...
app_web/src/widgets/ibzemployee/main-form/main-form-model.ts
浏览文件 @
696959ce
...
...
@@ -90,6 +90,16 @@ export default class MainModel {
prop
:
'mdeptname'
,
dataType
:
'PICKUPTEXT'
,
},
{
name
:
'mdeptcode'
,
prop
:
'mdeptcode'
,
dataType
:
'PICKUPDATA'
,
},
{
name
:
'orgcode'
,
prop
:
'orgcode'
,
dataType
:
'PICKUPDATA'
,
},
{
name
:
'bcode'
,
prop
:
'bcode'
,
...
...
app_web/src/widgets/ibzemployee/new-form-form/new-form-form-base.vue
浏览文件 @
696959ce
...
...
@@ -26,51 +26,27 @@
</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.ibzemployee.newform_form.details.orgname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.orgname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-picker
:formState=
"formState"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:itemParam=
'
{ }'
:disabled="detailsModel.orgname.disabled"
name='orgname'
deMajorField='orgname'
deKeyField='ibzorganization'
:service="service"
:acParams="{ serviceName: 'IBZOrganizationService', interfaceName: 'FetchDefault'}"
valueitem='orgid'
:value="data.orgname"
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':'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.orgcode.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'orgcode'
:itemRules=
"this.rules.orgcode"
class=
''
:caption=
"$t('entities.ibzemployee.newform_form.details.orgcode')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.orgcode.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-span
name=
'orgcode'
:value=
"data.orgcode"
style=
""
></app-span>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.mdeptname.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'mdeptname'
:itemRules=
"this.rules.mdeptname"
class=
''
:caption=
"$t('entities.ibzemployee.newform_form.details.mdeptname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.mdeptname.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-picker
:formState=
"formState"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:itemParam=
'
{ }'
:disabled="detailsModel.mdeptname.disabled"
name='mdeptname'
deMajorField='deptname'
deKeyField='ibzdepartment'
:service="service"
:acParams="{ serviceName: 'IBZDepartmentService', interfaceName: 'FetchDefault'}"
valueitem='mdeptid'
:value="data.mdeptname"
editortype=""
:pickupView="{ viewname: 'ibzdepartment-pickup-view', title: $t('entities.ibzdepartment.views.pickupview.title'), deResParameters: [{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' }, ], parameters: [{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="onFormItemValueChange">
</app-picker>
<app-department-select
:data=
"data"
:context=
"JSON.parse(JSON.stringify(context))"
url=
"/ibzorganizations/$
{orgid}/ibzdepartments/picker" filter="orgid" :fillMap="{'id':'mdeptid','label':'mdeptname'}" :multiple="false" style="" @select-change="onFormItemValueChange">
</app-department-select>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.mdeptcode.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'mdeptcode'
:itemRules=
"this.rules.mdeptcode"
class=
''
:caption=
"$t('entities.ibzemployee.newform_form.details.mdeptcode')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.mdeptcode.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<app-span
name=
'mdeptcode'
:value=
"data.mdeptcode"
style=
""
></app-span>
</app-form-item>
</i-col>
...
...
@@ -389,11 +365,13 @@ export default class NewFormBase extends Vue implements ControlInterface {
personname
:
null
,
loginname
:
null
,
orgname
:
null
,
orgid
:
null
,
orgcode
:
null
,
mdeptname
:
null
,
mdeptcode
:
null
,
mdeptid
:
null
,
enable
:
null
,
orgid
:
null
,
userid
:
null
,
mdeptid
:
null
,
ibzemployee
:
null
,
};
...
...
@@ -508,36 +486,48 @@ export default class NewFormBase extends Vue implements ControlInterface {
{
required
:
true
,
type
:
'string'
,
message
:
'单位 值不能为空'
,
trigger
:
'change'
},
{
required
:
true
,
type
:
'string'
,
message
:
'单位 值不能为空'
,
trigger
:
'blur'
},
],
orgid
:
[
{
type
:
'string'
,
message
:
'单位 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'单位 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'单位 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'单位 值不能为空'
,
trigger
:
'blur'
},
],
orgcode
:
[
{
type
:
'string'
,
message
:
'单位代码 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'单位代码 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'单位代码 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'单位代码 值不能为空'
,
trigger
:
'blur'
},
],
mdeptname
:
[
{
type
:
'string'
,
message
:
'部门 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'部门 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
true
,
type
:
'string'
,
message
:
'部门 值不能为空'
,
trigger
:
'change'
},
{
required
:
true
,
type
:
'string'
,
message
:
'部门 值不能为空'
,
trigger
:
'blur'
},
],
mdeptcode
:
[
{
type
:
'string'
,
message
:
'主部门代码 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'主部门代码 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'主部门代码 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'主部门代码 值不能为空'
,
trigger
:
'blur'
},
],
mdeptid
:
[
{
type
:
'string'
,
message
:
'主部门 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'主部门 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'主部门 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'主部门 值不能为空'
,
trigger
:
'blur'
},
],
enable
:
[
{
type
:
'number'
,
message
:
'逻辑有效 值必须为数值类型'
,
trigger
:
'change'
},
{
type
:
'number'
,
message
:
'逻辑有效 值必须为数值类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'number'
,
message
:
'逻辑有效 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'number'
,
message
:
'逻辑有效 值不能为空'
,
trigger
:
'blur'
},
],
orgid
:
[
{
type
:
'string'
,
message
:
'单位 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'单位 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'单位 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'单位 值不能为空'
,
trigger
:
'blur'
},
],
userid
:
[
{
type
:
'string'
,
message
:
'用户标识 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'用户标识 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'用户标识 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'用户标识 值不能为空'
,
trigger
:
'blur'
},
],
mdeptid
:
[
{
type
:
'string'
,
message
:
'主部门 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'主部门 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'主部门 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'主部门 值不能为空'
,
trigger
:
'blur'
},
],
}
/**
...
...
@@ -575,15 +565,19 @@ export default class NewFormBase extends Vue implements ControlInterface {
,
orgname
:
new
FormItemModel
({
caption
:
'单位'
,
detailType
:
'FORMITEM'
,
name
:
'orgname'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
mdeptname
:
new
FormItemModel
({
caption
:
'部门'
,
detailType
:
'FORMITEM'
,
name
:
'mdeptname
'
,
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
})
,
enable
:
new
FormItemModel
({
caption
:
'逻辑有效'
,
detailType
:
'FORMITEM'
,
name
:
'enabl
e'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
orgcode
:
new
FormItemModel
({
caption
:
'单位代码'
,
detailType
:
'FORMITEM'
,
name
:
'orgcod
e'
,
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
})
mdeptname
:
new
FormItemModel
({
caption
:
'部门'
,
detailType
:
'FORMITEM'
,
name
:
'mdeptname
'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
userid
:
new
FormItemModel
({
caption
:
'用户标识'
,
detailType
:
'FORMITEM'
,
name
:
'userid
'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
mdeptcode
:
new
FormItemModel
({
caption
:
'主部门代码'
,
detailType
:
'FORMITEM'
,
name
:
'mdeptcode
'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
mdeptid
:
new
FormItemModel
({
caption
:
'主部门'
,
detailType
:
'FORMITEM'
,
name
:
'mdeptid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
enable
:
new
FormItemModel
({
caption
:
'逻辑有效'
,
detailType
:
'FORMITEM'
,
name
:
'enable'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
userid
:
new
FormItemModel
({
caption
:
'用户标识'
,
detailType
:
'FORMITEM'
,
name
:
'userid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
disabled
:
false
,
enableCond
:
3
})
,
};
...
...
@@ -732,51 +726,51 @@ export default class NewFormBase extends Vue implements ControlInterface {
}
/**
* 监控表单属性
mdeptname
值
* 监控表单属性
orgid
值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof NewForm
*/
@
Watch
(
'data.
mdeptname
'
)
on
Mdeptname
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
mdeptname
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
@
Watch
(
'data.
orgid
'
)
on
Orgid
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
orgid
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性
enabl
e 值
* 监控表单属性
orgcod
e 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof NewForm
*/
@
Watch
(
'data.
enabl
e'
)
on
Enabl
eChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
enabl
e'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
@
Watch
(
'data.
orgcod
e'
)
on
Orgcod
eChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
orgcod
e'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性
orgid
值
* 监控表单属性
mdeptname
值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof NewForm
*/
@
Watch
(
'data.
orgid
'
)
on
Orgid
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
orgid
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
@
Watch
(
'data.
mdeptname
'
)
on
Mdeptname
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
mdeptname
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性
userid
值
* 监控表单属性
mdeptcode
值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof NewForm
*/
@
Watch
(
'data.
userid
'
)
on
Userid
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
userid
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
@
Watch
(
'data.
mdeptcode
'
)
on
Mdeptcode
Change
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'
mdeptcode
'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
...
...
@@ -791,6 +785,30 @@ export default class NewFormBase extends Vue implements ControlInterface {
this
.
formDataChange
({
name
:
'mdeptid'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 enable 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof NewForm
*/
@
Watch
(
'data.enable'
)
onEnableChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'enable'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 userid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof NewForm
*/
@
Watch
(
'data.userid'
)
onUseridChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'userid'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 重置表单项值
...
...
@@ -800,6 +818,10 @@ export default class NewFormBase extends Vue implements ControlInterface {
* @memberof NewForm
*/
public
resetFormData
({
name
,
newVal
,
oldVal
}:
{
name
:
string
,
newVal
:
any
,
oldVal
:
any
}):
void
{
if
(
Object
.
is
(
name
,
'orgid'
))
{
this
.
onFormItemValueChange
({
name
:
'mdeptname'
,
value
:
null
});
this
.
onFormItemValueChange
({
name
:
'mdeptid'
,
value
:
null
});
}
}
/**
...
...
@@ -844,6 +866,8 @@ export default class NewFormBase extends Vue implements ControlInterface {
}
...
...
app_web/src/widgets/ibzemployee/new-form-form/new-form-form-model.ts
浏览文件 @
696959ce
...
...
@@ -75,31 +75,41 @@ export default class NewFormModel {
prop
:
'orgname'
,
dataType
:
'PICKUPTEXT'
,
},
{
name
:
'orgid'
,
prop
:
'orgid'
,
dataType
:
'PICKUP'
,
},
{
name
:
'orgcode'
,
prop
:
'orgcode'
,
dataType
:
'PICKUPDATA'
,
},
{
name
:
'mdeptname'
,
prop
:
'mdeptname'
,
dataType
:
'PICKUPTEXT'
,
},
{
name
:
'
enabl
e'
,
prop
:
'
enabl
e'
,
dataType
:
'
YESNO
'
,
name
:
'
mdeptcod
e'
,
prop
:
'
mdeptcod
e'
,
dataType
:
'
PICKUPDATA
'
,
},
{
name
:
'
org
id'
,
prop
:
'
org
id'
,
name
:
'
mdept
id'
,
prop
:
'
mdept
id'
,
dataType
:
'PICKUP'
,
},
{
name
:
'enable'
,
prop
:
'enable'
,
dataType
:
'YESNO'
,
},
{
name
:
'userid'
,
prop
:
'userid'
,
dataType
:
'TEXT'
,
},
{
name
:
'mdeptid'
,
prop
:
'mdeptid'
,
dataType
:
'PICKUP'
,
},
{
name
:
'ibzemployee'
,
prop
:
'userid'
,
...
...
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
696959ce
...
...
@@ -32,7 +32,7 @@
<!--输出实体[IBZEMP]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzemp-63
2
-2"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzemp-63
4
-2"
>
<createTable
tableName=
"IBZEMP"
>
<column
name=
"USERID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_IBZEMP_USERID"
/>
...
...
@@ -126,7 +126,7 @@
<!--输出实体[IBZDEPT]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdept-69
0
-4"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdept-69
2
-4"
>
<createTable
tableName=
"IBZDEPT"
>
<column
name=
"DEPTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_IBZDEPT_DEPTID"
/>
...
...
@@ -165,10 +165,10 @@
<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]外键关系 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzemp-63
2
-6"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzemp-63
4
-6"
>
<addForeignKeyConstraint
baseColumnNames=
"MDEPTID"
baseTableName=
"IBZEMP"
constraintName=
"DER1N_IBZEMP_IBZDEPT_MDEPTID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"DEPTID"
referencedTableName=
"IBZDEPT"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzemp-63
2
-7"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzemp-63
4
-7"
>
<addForeignKeyConstraint
baseColumnNames=
"ORGID"
baseTableName=
"IBZEMP"
constraintName=
"DER1N_IBZEMP_IBZORG_ORGID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGID"
referencedTableName=
"IBZORG"
validate=
"true"
/>
</changeSet>
<!--输出实体[IBZDEPTMEMBER]外键关系 -->
...
...
@@ -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-69
0
-10"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-69
2
-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-69
0
-11"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-69
2
-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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录