Skip to content

I
ibzou
提交 de9fa3ce 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 f6ffd920
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 218 行增加 和 82 行删除
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts
浏览文件 @ de9fa3ce
......@@ -128,15 +128,20 @@ export default {
},
editgrid_grid: {
columns: {
deptid: "部门标识",
deptcode: "部门代码",
deptname: "部门名称",
orgname: "单位",
pdeptname: "上级部门",
shortname: "部门简称",
deptlevel: "部门级别",
bcode: "业务编码",
leadername: "分管领导",
showorder: "排序",
createdate: "创建时间",
updatedate: "最后修改时间",
leaderid: "分管领导标识",
orgid: "单位",
pdeptid: "上级部门",
},
uiactions: {
},
......
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts
浏览文件 @ de9fa3ce
......@@ -127,15 +127,20 @@ export default {
},
editgrid_grid: {
columns: {
deptid: '部门标识',
deptcode: '部门代码',
deptname: '部门名称',
orgname: '单位',
pdeptname: '上级部门',
shortname: '部门简称',
deptlevel: '部门级别',
bcode: '业务编码',
leadername: '分管领导',
showorder: '排序',
createdate: '创建时间',
updatedate: '最后修改时间',
leaderid: '分管领导标识',
orgid: '单位',
pdeptid: '上级部门',
},
uiactions: {
},
......
app_web/src/locale/lanres/ibzorganization/ibzorganization_en_US.ts
浏览文件 @ de9fa3ce
......@@ -108,6 +108,7 @@ export default {
orgcode: "单位代码(文本左包含(%#))",
n_orgname_like: "名称(%)",
n_porgid_eq: "上级单位(=)",
porgname: "上级单位(等于(=))",
},
uiactions: {
},
......
app_web/src/locale/lanres/ibzorganization/ibzorganization_zh_CN.ts
浏览文件 @ de9fa3ce
......@@ -107,6 +107,7 @@ export default {
orgcode: '单位代码(文本左包含(%#))',
n_orgname_like: '名称(%)',
n_porgid_eq: '上级单位(=)',
porgname: '上级单位(等于(=))',
},
uiactions: {
},
......
app_web/src/pages/ou/ouindex-view/page-register.ts
浏览文件 @ de9fa3ce
export const PageComponents = {
install(Vue: any, opt: any) {
Vue.component('ibzdepartment-option-view', () => import('@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'));
Vue.component('ibzemployee-edit-view', () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'));
Vue.component('ibzemployee-edit-view', () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'));
Vue.component('ibzdepartment-option-view', () => import('@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'));
Vue.component('ibzdepartment-pickup-grid-view', () => import('@pages/ou/ibzdepartment-pickup-grid-view/ibzdepartment-pickup-grid-view.vue'));
Vue.component('ibzemployee-grid-view', () => import('@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'));
Vue.component('ibzorganization-option-view', () => import('@pages/ou/ibzorganization-option-view/ibzorganization-option-view.vue'));
......
app_web/src/pages/ou/ouindex-view/router.ts
浏览文件 @ de9fa3ce
......@@ -35,39 +35,40 @@ const router = new Router({
component: () => import('@pages/ou/ouindex-view/ouindex-view.vue'),
children: [
{
path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/optionview/:optionview?',
path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editview/:editview?',
meta: {
caption: 'entities.ibzdepartment.views.optionview.caption',
caption: 'entities.ibzemployee.views.editview.caption',
parameters: [
{ pathName: 'ouindexview', parameterName: 'ouindexview' },
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
{ pathName: 'optionview', parameterName: 'optionview' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'),
component: () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'),
},
{
path: 'ibzdepartments/:ibzdepartment?/optionview/:optionview?',
path: 'ibzorganizations/:ibzorganization?/ibzemployees/:ibzemployee?/editview/:editview?',
meta: {
caption: 'entities.ibzdepartment.views.optionview.caption',
caption: 'entities.ibzemployee.views.editview.caption',
parameters: [
{ pathName: 'ouindexview', parameterName: 'ouindexview' },
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
{ pathName: 'optionview', parameterName: 'optionview' },
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'),
component: () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'),
},
{
path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editview/:editview?',
path: 'ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editview/:editview?',
meta: {
caption: 'entities.ibzemployee.views.editview.caption',
parameters: [
{ pathName: 'ouindexview', parameterName: 'ouindexview' },
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editview', parameterName: 'editview' },
......@@ -77,12 +78,11 @@ const router = new Router({
component: () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'),
},
{
path: 'ibzorganizations/:ibzorganization?/ibzemployees/:ibzemployee?/editview/:editview?',
path: 'ibzemployees/:ibzemployee?/editview/:editview?',
meta: {
caption: 'entities.ibzemployee.views.editview.caption',
parameters: [
{ pathName: 'ouindexview', parameterName: 'ouindexview' },
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editview', parameterName: 'editview' },
],
......@@ -91,31 +91,31 @@ const router = new Router({
component: () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'),
},
{
path: 'ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editview/:editview?',
path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/optionview/:optionview?',
meta: {
caption: 'entities.ibzemployee.views.editview.caption',
caption: 'entities.ibzdepartment.views.optionview.caption',
parameters: [
{ pathName: 'ouindexview', parameterName: 'ouindexview' },
{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editview', parameterName: 'editview' },
{ pathName: 'optionview', parameterName: 'optionview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'),
component: () => import('@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'),
},
{
path: 'ibzemployees/:ibzemployee?/editview/:editview?',
path: 'ibzdepartments/:ibzdepartment?/optionview/:optionview?',
meta: {
caption: 'entities.ibzemployee.views.editview.caption',
caption: 'entities.ibzdepartment.views.optionview.caption',
parameters: [
{ pathName: 'ouindexview', parameterName: 'ouindexview' },
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editview', parameterName: 'editview' },
{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
{ pathName: 'optionview', parameterName: 'optionview' },
],
requireAuth: true,
},
component: () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'),
component: () => import('@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'),
},
{
path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/pickupgridview/:pickupgridview?',
......
app_web/src/store/modules/view-action/state.ts
浏览文件 @ de9fa3ce
......@@ -97,6 +97,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'9e25d15d43ff644fa008c9cf7d063ac3',
],
},
{
......@@ -167,6 +168,7 @@ export const viewstate: any = {
viewdatachange: false,
refviews: [
'12cffa053a1d3e22ab397b1164338cfb',
'9e25d15d43ff644fa008c9cf7d063ac3',
'995d26f289a30e31573d557a5f5ba254',
],
},
......
app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-model.ts
浏览文件 @ de9fa3ce
......@@ -26,6 +26,11 @@ export default class EditGridModel {
]
}else{
return [
{
name: 'leaderid',
prop: 'leaderid',
dataType: 'TEXT',
},
{
name: 'bcode',
prop: 'bcode',
......@@ -47,25 +52,25 @@ export default class EditGridModel {
dataType: 'TEXT',
},
{
name: 'srfkey',
name: 'srfdataaccaction',
prop: 'deptid',
dataType: 'TEXT',
},
{
name: 'srfdataaccaction',
name: 'srfkey',
prop: 'deptid',
dataType: 'TEXT',
},
{
name: 'leadername',
prop: 'leadername',
dataType: 'TEXT',
},
{
name: 'pdeptid',
prop: 'parentdeptid',
dataType: 'PICKUP',
},
{
name: 'deptid',
prop: 'deptid',
dataType: 'TEXT',
},
{
name: 'orgid',
prop: 'orgid',
......@@ -76,6 +81,16 @@ export default class EditGridModel {
prop: 'deptcode',
dataType: 'TEXT',
},
{
name: 'orgname',
prop: 'orgname',
dataType: 'PICKUPTEXT',
},
{
name: 'pdeptname',
prop: 'parentdeptname',
dataType: 'PICKUPTEXT',
},
{
name: 'shortname',
prop: 'shortname',
......
app_web/src/widgets/ibzdepartment/main-form/main-form-base.vue
浏览文件 @ de9fa3ce
......@@ -52,7 +52,7 @@
:value='data.leadername'
valueitem="leaderid"
url="/ibzorganizations/${selected-orgid}/ibzemployees/picker"
treeurl="/ibzorganizations/${orgid}/suborg/picker"
:multiple="true"
filter="orgid"
:fillmap="{'id':'leaderid','label':'leadername'}"
......
app_web/src/widgets/ibzorganization/default-searchform/default-searchform-base.vue
浏览文件 @ de9fa3ce
......@@ -16,9 +16,9 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_porgid_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_porgid_eq' :itemRules="this.rules.n_porgid_eq" class='' :caption="$t('entities.ibzorganization.default_searchform.details.n_porgid_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_porgid_eq.error" :isEmptyCaption="false" labelPos="LEFT">
<app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'n_porgid_eq','label':'n_porgid_eq'}" url="/ibzorganizations/alls/suborg/picker" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange"></app-org-select>
<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="width:100px;" @select-change="onFormItemValueChange"></app-org-select>
</app-form-item>
</i-col>
......@@ -265,6 +265,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
orgcode: null,
n_orgname_like: null,
n_porgid_eq: null,
porgname: null,
};
/**
......@@ -292,6 +293,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '上级单位(=) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '上级单位(=) 值不能为空', trigger: 'blur' },
],
porgname: [
{ type: 'string', message: '上级单位(等于(=)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '上级单位(等于(=)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '上级单位(等于(=)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '上级单位(等于(=)) 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -308,6 +315,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
n_orgname_like: new FormItemModel({ caption: '名称(%)', detailType: 'FORMITEM', name: 'n_orgname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
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 })
,
};
......@@ -347,6 +356,18 @@ export default class DefaultBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'n_porgid_eq', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 porgname 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.porgname')
onPorgnameChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'porgname', newVal: newVal, oldVal: oldVal });
}
/**
* 重置表单项值
......@@ -371,6 +392,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
}
/**
......
app_web/src/widgets/ibzorganization/default-searchform/default-searchform-model.ts
浏览文件 @ de9fa3ce
......@@ -40,6 +40,11 @@ export default class DefaultModel {
prop: 'parentorgid',
dataType: 'PICKUP',
},
{
name: 'porgname',
prop: 'parentorgname',
dataType: 'PICKUPTEXT',
},
]
}
......
app_web/src/widgets/ibzorganization/main-grid/main-grid-model.ts
浏览文件 @ de9fa3ce
......@@ -110,6 +110,11 @@ export default class MainModel {
prop: 'n_porgid_eq',
dataType: 'PICKUP',
},
{
name: 'porgname',
prop: 'porgname',
dataType: 'PICKUPTEXT',
},
{
name:'size',
......
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ de9fa3ce
......@@ -4,7 +4,7 @@
<!--输出实体[IBZORG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzorg-437-1">
<changeSet author="a_A_5d9d78509" id="tab-ibzorg-439-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-682-4">
<changeSet author="a_A_5d9d78509" id="tab-ibzdept-684-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-437-5">
<changeSet author="a_A_5d9d78509" id="fk-ibzorg-439-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-682-10">
<changeSet author="a_A_5d9d78509" id="fk-ibzdept-684-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-682-11">
<changeSet author="a_A_5d9d78509" id="fk-ibzdept-684-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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或