Skip to content

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

ibiz4j 发布系统代码

上级 5a63cd85
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 197 行增加 和 97 行删除
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="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'orgname'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.orgname')" :width="200" :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="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'pdeptname'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.pdeptname')" :width="250" :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="srforgid" :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-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: 'enable',
prop: 'enable',
dataType: 'YESNO',
name: 'mdeptcode',
prop: 'mdeptcode',
dataType: 'PICKUPDATA',
},
{
name: 'orgid',
prop: 'orgid',
name: 'mdeptid',
prop: 'mdeptid',
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-632-2">
<changeSet author="a_A_5d9d78509" id="tab-ibzemp-634-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-690-4">
<changeSet author="a_A_5d9d78509" id="tab-ibzdept-692-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-632-6">
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-634-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-632-7">
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-634-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-690-10">
<changeSet author="a_A_5d9d78509" id="fk-ibzdept-692-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-690-11">
<changeSet author="a_A_5d9d78509" id="fk-ibzdept-692-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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或