ibiz4j 发布系统代码

app_web/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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="srforgid"
+  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 {
     }
 
     /**
-     * 监控表单属性 pdeptname 值
+     * 监控表单属性 orgname 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof Main
      */
-    @Watch('data.pdeptname')
-    onPdeptnameChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'pdeptname', newVal: newVal, oldVal: oldVal });
+    @Watch('data.orgname')
+    onOrgnameChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'orgname', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 orgname 值
+     * 监控表单属性 pdeptname 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof Main
      */
-    @Watch('data.orgname')
-    onOrgnameChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'orgname', newVal: newVal, oldVal: oldVal });
+    @Watch('data.pdeptname')
+    onPdeptnameChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'pdeptname', newVal: newVal, oldVal: oldVal });
     }
 
     /**

app_web/src/widgets/ibzdepartment/main-form/main-form-model.ts

@@ -71,13 +71,13 @@ export default class MainModel {
         dataType: 'TEXT',
       },
       {
-        name: 'pdeptname',
-        prop: 'parentdeptname',
+        name: 'orgname',
+        prop: 'orgname',
         dataType: 'PICKUPTEXT',
       },
       {
-        name: 'orgname',
-        prop: 'orgname',
+        name: 'pdeptname',
+        prop: 'parentdeptname',
         dataType: 'PICKUPTEXT',
       },
       {

app_web/src/widgets/ibzdepartment/main-form/main-form-service.ts

@@ -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

@@ -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')
-    onCreatedateChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'createdate', newVal: newVal, oldVal: oldVal });
+    @Watch('data.porgid')
+    onPorgidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'porgid', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 updatedate 值
+     * 监控表单属性 createdate 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof Main
      */
-    @Watch('data.updatedate')
-    onUpdatedateChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'updatedate', newVal: newVal, oldVal: oldVal });
+    @Watch('data.createdate')
+    onCreatedateChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'createdate', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 porgid 值
+     * 监控表单属性 updatedate 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof Main
      */
-    @Watch('data.porgid')
-    onPorgidChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'porgid', newVal: newVal, oldVal: oldVal });
+    @Watch('data.updatedate')
+    onUpdatedateChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'updatedate', newVal: newVal, oldVal: oldVal });
     }
 
 

app_web/src/widgets/ibzorganization/main-form/main-form-model.ts

@@ -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

@@ -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: true,
+            show: false,
             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

@@ -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: 'porgname',
+          prop: 'parentorgname',
+          dataType: 'PICKUPTEXT',
         },
         {
           name: 'porgid',
           prop: 'parentorgid',
           dataType: 'PICKUP',
         },
-        {
-          name: 'orglevel',
-          prop: 'orglevel',
-          dataType: 'INT',
-        },
         {
           name: 'createdate',
           prop: 'createdate',
           dataType: 'DATETIME',
         },
         {
-          name: 'showorder',
-          prop: 'showorder',
-          dataType: 'INT',
+          name: 'srfmajortext',
+          prop: 'orgname',
+          dataType: 'TEXT',
         },
         {
-          name: 'shortname',
-          prop: 'shortname',
+          name: 'srfkey',
+          prop: 'orgid',
           dataType: 'TEXT',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'srfdataaccaction',
+          prop: 'orgid',
+          dataType: 'TEXT',
         },
         {
-          name: 'srfmajortext',
-          prop: 'orgname',
+          name: 'orgcode',
+          prop: 'orgcode',
           dataType: 'TEXT',
         },
         {
-          name: 'srfdataaccaction',
+          name: 'orgid',
           prop: 'orgid',
           dataType: 'TEXT',
         },
         {
-          name: 'srfkey',
-          prop: 'orgid',
+          name: 'orgname',
+          prop: 'orgname',
           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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[IBZORG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzorg-433-1">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzorg-436-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-680-4">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-681-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-433-5">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzorg-436-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-680-10">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-681-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-680-11">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-681-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>