ibiz4j 发布系统代码

app_Web/src/locale/lanres/entities/ibzdept-member/ibzdept-member_en_US.ts

@@ -43,8 +43,8 @@ export default {
 	main_grid: {
 		columns: {
 			deptname: "部门",
-			personname: "成员",
 			postname: "岗位名称",
+			personname: "成员",
 			deptid: "部门标识",
 			postid: "岗位标识",
 			userid: "用户标识",

app_Web/src/locale/lanres/entities/ibzdept-member/ibzdept-member_zh_CN.ts

@@ -42,8 +42,8 @@ export default {
 	main_grid: {
 		columns: {
 			deptname: "部门",
-			personname: "成员",
 			postname: "岗位名称",
+			personname: "成员",
 			deptid: "部门标识",
 			postid: "岗位标识",
 			userid: "用户标识",

app_Web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue

@@ -22,7 +22,7 @@
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
             <template v-if="getColumnState('deptname')">
-                <el-table-column show-overflow-tooltip :prop="'deptname'" :label="$t('entities.ibzdeptmember.main_grid.columns.deptname')" :width="250"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'deptname'" :label="$t('entities.ibzdeptmember.main_grid.columns.deptname')" :width="200"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibzdeptmember.main_grid.columns.deptname')}}
@@ -61,11 +61,11 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('personname')">
-                <el-table-column show-overflow-tooltip :prop="'personname'" :label="$t('entities.ibzdeptmember.main_grid.columns.personname')" :width="250"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('postname')">
+                <el-table-column show-overflow-tooltip :prop="'postname'" :label="$t('entities.ibzdeptmember.main_grid.columns.postname')" :width="200"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.ibzdeptmember.main_grid.columns.personname')}}
+                        {{$t('entities.ibzdeptmember.main_grid.columns.postname')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
@@ -80,15 +80,15 @@
               :localContext ='{ }' 
               :localParam ='{ }' 
               :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
-              name='personname'
-              deMajorField='personname'
-              deKeyField='ibzemployee'
+              name='postname'
+              deMajorField='postname'
+              deKeyField='ibzpost'
               :service="service"
-              :acParams="{ serviceName: 'IBZEmployeeService', interfaceName: 'FetchDefault'}"
-              valueitem='userid' 
+              :acParams="{ serviceName: 'IBZPostService', interfaceName: 'FetchDefault'}"
+              valueitem='postid' 
               :value="row[column.property]" 
               editortype="" 
-              :pickupView="{ viewname: 'ibzemployee-pickup-view', title: $t('entities.ibzemployee.views.pickupview.title'), deResParameters: [{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' }, ], parameters: [{ pathName: 'ibzemployees', parameterName: 'ibzemployee' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+              :pickupView="{ viewname: 'ibzpost-pickup-view', title: $t('entities.ibzpost.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibzposts', parameterName: 'ibzpost' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
               style=""  
               @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
             </app-picker>
@@ -96,16 +96,16 @@
                             </app-form-item>
                         </template>
                         <template v-if="!actualIsOpenEdit">
-                                <app-span name='personname' editorType="PICKER" :value="row.personname"></app-span>
+                                <app-span name='postname' editorType="PICKER" :value="row.postname"></app-span>
                         </template>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('postname')">
-                <el-table-column show-overflow-tooltip :prop="'postname'" :label="$t('entities.ibzdeptmember.main_grid.columns.postname')" :width="250"  :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('personname')">
+                <el-table-column show-overflow-tooltip :prop="'personname'" :label="$t('entities.ibzdeptmember.main_grid.columns.personname')" :width="200"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
-                        {{$t('entities.ibzdeptmember.main_grid.columns.postname')}}
+                        {{$t('entities.ibzdeptmember.main_grid.columns.personname')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
@@ -120,15 +120,15 @@
               :localContext ='{ }' 
               :localParam ='{ }' 
               :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
-              name='postname'
-              deMajorField='postname'
-              deKeyField='ibzpost'
+              name='personname'
+              deMajorField='personname'
+              deKeyField='ibzemployee'
               :service="service"
-              :acParams="{ serviceName: 'IBZPostService', interfaceName: 'FetchDefault'}"
-              valueitem='postid' 
+              :acParams="{ serviceName: 'IBZEmployeeService', interfaceName: 'FetchDefault'}"
+              valueitem='userid' 
               :value="row[column.property]" 
               editortype="" 
-              :pickupView="{ viewname: 'ibzpost-pickup-view', title: $t('entities.ibzpost.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibzposts', parameterName: 'ibzpost' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+              :pickupView="{ viewname: 'ibzemployee-pickup-view', title: $t('entities.ibzemployee.views.pickupview.title'), deResParameters: [{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' }, ], parameters: [{ pathName: 'ibzemployees', parameterName: 'ibzemployee' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
               style=""  
               @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
             </app-picker>
@@ -136,7 +136,7 @@
                             </app-form-item>
                         </template>
                         <template v-if="!actualIsOpenEdit">
-                                <app-span name='postname' editorType="PICKER" :value="row.postname"></app-span>
+                                <app-span name='personname' editorType="PICKER" :value="row.personname"></app-span>
                         </template>
                     </template>
                 </el-table-column>
@@ -538,7 +538,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    public minorSortDir: string = '';
+    public minorSortDir: string = 'ASC';
 
     /**
      * 排序字段
@@ -546,7 +546,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    public minorSortPSDEF: string = '';
+    public minorSortPSDEF: string = 'deptname';
 
     /**
      * 分页条数
@@ -718,17 +718,17 @@ export default class MainBase extends Vue implements ControlInterface {
             isEnableRowEdit: true,
         },
         {
-            name: 'personname',
-            label: '成员',
-            langtag: 'entities.ibzdeptmember.main_grid.columns.personname',
+            name: 'postname',
+            label: '岗位名称',
+            langtag: 'entities.ibzdeptmember.main_grid.columns.postname',
             show: true,
             util: 'PX',
             isEnableRowEdit: true,
         },
         {
-            name: 'postname',
-            label: '岗位名称',
-            langtag: 'entities.ibzdeptmember.main_grid.columns.postname',
+            name: 'personname',
+            label: '成员',
+            langtag: 'entities.ibzdeptmember.main_grid.columns.personname',
             show: true,
             util: 'PX',
             isEnableRowEdit: true,

app_Web/src/widgets/ibzteam-member/main-grid/main-grid-base.vue

@@ -471,7 +471,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    public minorSortDir: string = '';
+    public minorSortDir: string = 'ASC';
 
     /**
      * 排序字段
@@ -479,7 +479,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    public minorSortPSDEF: string = '';
+    public minorSortPSDEF: string = 'personname';
 
     /**
      * 分页条数
@@ -487,7 +487,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {number}
      * @memberof MainBase
      */
-    public limit: number = 20;
+    public limit: number = 100;
 
     /**
      * 是否显示标题