Skip to content

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

ibizdev提交

上级 3591a23d
隐藏空白字符变更
内嵌 并排
正在显示 包含 75 行增加 和 14 行删除
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts
浏览文件 @ a22c77d3
......@@ -54,6 +54,7 @@ export default {
deptname: "部门名称",
orgname: "单位",
pdeptname: "上级部门",
enable: "逻辑有效",
pdeptid: "上级部门",
deptid: "部门标识",
orgid: "单位",
......
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts
浏览文件 @ a22c77d3
......@@ -53,6 +53,7 @@ export default {
deptname: '部门名称',
orgname: '单位',
pdeptname: '上级部门',
enable: '逻辑有效',
pdeptid: '上级部门',
deptid: '部门标识',
orgid: '单位',
......
app_web/src/locale/lanres/ibzemployee/ibzemployee_en_US.ts
浏览文件 @ a22c77d3
......@@ -115,6 +115,7 @@ export default {
loginname: "登录名",
orgname: "单位",
mdeptname: "部门",
enable: "逻辑有效",
orgid: "单位",
userid: "用户标示",
mdeptid: "主部门",
......
app_web/src/locale/lanres/ibzemployee/ibzemployee_zh_CN.ts
浏览文件 @ a22c77d3
......@@ -114,6 +114,7 @@ export default {
loginname: '登录名',
orgname: '单位',
mdeptname: '部门',
enable: '逻辑有效',
orgid: '单位',
userid: '用户标示',
mdeptid: '主部门',
......
app_web/src/pages/ou/ibzorganization-option-view/ibzorganization-option-view-base.vue
浏览文件 @ a22c77d3
<template>
<div class="view-container deoptview ibzorganization-option-view">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzorganizationoptionview"></app-studioaction>
<card class='view-card view-no-toolbar' dis-hover :padding="0" :bordered="false">
<p slot='title'>
<span class='caption-info'>{{$t(model.srfTitle)}}</span>
</p>
<card class='view-card view-no-caption view-no-toolbar' dis-hover :padding="0" :bordered="false">
<div class="content-container">
<view_form
:viewState="viewState"
......
app_web/src/widgets/ibzdepartment/new-form-form/new-form-form-base.vue
浏览文件 @ a22c77d3
......@@ -377,6 +377,7 @@ export default class NewFormBase extends Vue implements ControlInterface {
deptname: null,
orgname: null,
pdeptname: null,
enable: null,
pdeptid: null,
deptid: null,
orgid: null,
......@@ -494,6 +495,12 @@ export default class NewFormBase extends Vue implements ControlInterface {
{ 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' },
],
pdeptid: [
{ type: 'string', message: '上级部门 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '上级部门 值必须为字符串类型', trigger: 'blur' },
......@@ -548,6 +555,8 @@ 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 })
,
pdeptname: new FormItemModel({ caption: '上级部门', detailType: 'FORMITEM', name: 'pdeptname', 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 })
,
pdeptid: new FormItemModel({ caption: '上级部门', detailType: 'FORMITEM', name: 'pdeptid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
......@@ -701,6 +710,18 @@ export default class NewFormBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'pdeptname', 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 });
}
/**
* 监控表单属性 pdeptid 值
*
......@@ -790,6 +811,7 @@ export default class NewFormBase extends Vue implements ControlInterface {
}
/**
......@@ -1670,6 +1692,9 @@ export default class NewFormBase extends Vue implements ControlInterface {
* @memberof NewForm
*/
public createDefault(){
if (this.data.hasOwnProperty('enable')) {
this.data['enable'] = 1;
}
}
/**
......
app_web/src/widgets/ibzdepartment/new-form-form/new-form-form-model.ts
浏览文件 @ a22c77d3
......@@ -75,6 +75,11 @@ export default class NewFormModel {
prop: 'parentdeptname',
dataType: 'PICKUPTEXT',
},
{
name: 'enable',
prop: 'enable',
dataType: 'YESNO',
},
{
name: 'pdeptid',
prop: 'parentdeptid',
......
app_web/src/widgets/ibzemployee/new-form-form/new-form-form-base.vue
浏览文件 @ a22c77d3
......@@ -4,7 +4,7 @@
<row >
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibzemployee.newform_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.ibzemployee.newform_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
<i-col v-show="detailsModel.usercode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='usercode' :itemRules="this.rules.usercode" class='' :caption="$t('entities.ibzemployee.newform_form.details.usercode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.usercode.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -384,6 +384,7 @@ export default class NewFormBase extends Vue implements ControlInterface {
loginname: null,
orgname: null,
mdeptname: null,
enable: null,
orgid: null,
userid: null,
mdeptid: null,
......@@ -507,6 +508,12 @@ export default class NewFormBase extends Vue implements ControlInterface {
{ 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' },
......@@ -534,7 +541,7 @@ export default class NewFormBase extends Vue implements ControlInterface {
* @memberof NewForm
*/
public detailsModel: any = {
group1: new FormGroupPanelModel({ caption: '人员基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '', langbase: 'entities.ibzemployee.newform_form', extractMode: 'ITEM', details: [] } })
group1: new FormGroupPanelModel({ caption: '人员基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, uiActionGroup: { caption: '', langbase: 'entities.ibzemployee.newform_form', extractMode: 'ITEM', details: [] } })
,
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
......@@ -563,6 +570,8 @@ 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 })
,
enable: new FormItemModel({ caption: '逻辑有效', detailType: 'FORMITEM', name: 'enable', 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 })
,
......@@ -728,6 +737,18 @@ export default class NewFormBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'mdeptname', 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 });
}
/**
* 监控表单属性 orgid 值
*
......@@ -818,6 +839,7 @@ export default class NewFormBase extends Vue implements ControlInterface {
}
/**
......@@ -1698,6 +1720,9 @@ export default class NewFormBase extends Vue implements ControlInterface {
* @memberof NewForm
*/
public createDefault(){
if (this.data.hasOwnProperty('enable')) {
this.data['enable'] = 1;
}
}
/**
......
app_web/src/widgets/ibzemployee/new-form-form/new-form-form-model.ts
浏览文件 @ a22c77d3
......@@ -80,6 +80,11 @@ export default class NewFormModel {
prop: 'mdeptname',
dataType: 'PICKUPTEXT',
},
{
name: 'enable',
prop: 'enable',
dataType: 'YESNO',
},
{
name: 'orgid',
prop: 'orgid',
......
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ a22c77d3
......@@ -2,7 +2,7 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<!--输出实体[IBZORG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzorg-420-1">
<changeSet author="a_A_5d9d78509" id="tab-ibzorg-422-1">
<createTable tableName="IBZORG">
<column name="ORGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZORG_ORGID"/>
......@@ -28,7 +28,7 @@
</createTable>
</changeSet>
<!--输出实体[IBZEMP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzemp-601-2">
<changeSet author="a_A_5d9d78509" id="tab-ibzemp-605-2">
<createTable tableName="IBZEMP">
<column name="USERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZEMP_USERID"/>
......@@ -106,7 +106,7 @@
</createTable>
</changeSet>
<!--输出实体[IBZDEPT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzdept-528-3">
<changeSet author="a_A_5d9d78509" id="tab-ibzdept-530-3">
<createTable tableName="IBZDEPT">
<column name="DEPTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZDEPT_DEPTID"/>
......@@ -137,21 +137,21 @@
</changeSet>
<!--输出实体[IBZORG]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzorg-420-4">
<changeSet author="a_A_5d9d78509" id="fk-ibzorg-422-4">
<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-601-5">
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-605-5">
<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-601-6">
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-605-6">
<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>
<!--输出实体[IBZDEPT]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzdept-528-7">
<changeSet author="a_A_5d9d78509" id="fk-ibzdept-530-7">
<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-528-8">
<changeSet author="a_A_5d9d78509" id="fk-ibzdept-530-8">
<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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或