ibiz4j 发布系统代码 [ibz-ou，统一组织单位]

app_web/src/locale/lanres/entities/sys-team-member/sys-team-member_en_US.ts

@@ -46,6 +46,7 @@ export default {
 	main_grid: {
 		columns: {
 			personname: "姓名",
+			username: "登录名",
 			postname: "岗位",
 			postid: "岗位标识",
 			userid: "用户标识",

app_web/src/locale/lanres/entities/sys-team-member/sys-team-member_zh_CN.ts

@@ -45,6 +45,7 @@ export default {
 	main_grid: {
 		columns: {
 			personname: "姓名",
+			username: "登录名",
 			postname: "岗位",
 			postid: "岗位标识",
 			userid: "用户标识",

app_web/src/widgets/sys-team-member/main-grid/main-grid-base.vue

@@ -62,6 +62,18 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('username')">
+                <el-table-column show-overflow-tooltip :prop="'username'" :label="$t('entities.systeammember.main_grid.columns.username')" :width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.systeammember.main_grid.columns.username')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.username}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="getColumnState('postname')">
                 <el-table-column show-overflow-tooltip :prop="'postname'" :label="$t('entities.systeammember.main_grid.columns.postname')" :width="250"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
@@ -725,6 +737,15 @@ export default class MainBase extends Vue implements ControlInterface {
             isEnableRowEdit: true,
             enableCond: 3 ,
         },
+        {
+            name: 'username',
+            label: '登录名',
+            langtag: 'entities.systeammember.main_grid.columns.username',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
         {
             name: 'postname',
             label: '岗位',
@@ -1427,7 +1448,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['personname','postname','postid','userid'];
+        let allColumns:Array<any> = ['personname','username','postname','postid','userid'];
         if(row && row.children && row.children.length>0) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1471,6 +1492,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 groupById: Number((groupIndex+1)*10),
                 group: group,
                 personname:'',
+                username:'',
                 postname:'',
                 postid:'',
                 userid:'',

app_web/src/widgets/sys-team-member/main-grid/main-grid-model.ts

@@ -32,6 +32,11 @@ export default class MainModel {
           dataType: 'PICKUP',
           isEditable:true
         },
+        {
+          name: 'username',
+          prop: 'username',
+          dataType: 'PICKUPDATA',
+        },
         {
           name: 'teamid',
           prop: 'teamid',

ibzou-core/src/main/resources/liquibase/h2_table.xml

@@ -204,7 +204,7 @@
 
 
     <!--输出实体[SYS_TEAMMEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_teammember-25-7">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_teammember-27-7">
         <createTable tableName="IBZTEAMMEMBER">
                 <column name="TEAMMEMBERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_TEAMMEMBER_TEAMMEMBERID"/>
@@ -254,13 +254,13 @@
         <!--输出实体[SYS_POST]外键关系 -->
         <!--输出实体[SYS_TEAM]外键关系 -->
         <!--输出实体[SYS_TEAMMEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-25-17">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-27-17">
        <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_EMP_U" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-25-18">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-27-18">
        <addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_POST_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-25-19">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_teammember-27-19">
        <addForeignKeyConstraint baseColumnNames="TEAMID" baseTableName="IBZTEAMMEMBER" constraintName="DER1N_SYS_TEAMMEMBER_SYS_TEAM_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TEAMID" referencedTableName="IBZTEAM" validate="true"/>
     </changeSet>
 

ibzou-core/src/main/resources/sysmodel/ibzou.json

@@ -1630,7 +1630,7 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":0,
-    "show_order":1000,
+    "show_order":9,
     "major_field":0
     }
     ],