ibiz4j 发布系统代码

app_web/src/locale/lanres/entities/ibzteam-member/ibzteam-member_en_US.ts

@@ -60,6 +60,22 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
+		tbitem24: {
+			caption: "行编辑",
+			tip: "行编辑",
+		},
+		tbitem25: {
+			caption: "新建行",
+			tip: "新建行",
+		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
+		tbitem26: {
+			caption: "-",
+			tip: "",
+		},
 		tbitem8: {
 			caption: "Remove",
 			tip: "Remove {0}",

app_web/src/locale/lanres/entities/ibzteam-member/ibzteam-member_zh_CN.ts

@@ -59,6 +59,22 @@ export default {
 		},
 	},
 	gridviewtoolbar_toolbar: {
+		tbitem24: {
+			caption: "行编辑",
+			tip: "行编辑",
+		},
+		tbitem25: {
+			caption: "新建行",
+			tip: "新建行",
+		},
+		deuiaction1: {
+			caption: "保存行",
+			tip: "保存行",
+		},
+		tbitem26: {
+			caption: "-",
+			tip: "",
+		},
 		tbitem8: {
 			caption: "删除",
 			tip: "删除",

app_web/src/pages/ou/ibzteam-member-grid-view/ibzteam-member-grid-view-base.vue

@@ -13,6 +13,27 @@
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
+                                <i-button v-show="toolBarModels.tbitem24.visabled" :disabled="toolBarModels.tbitem24.disabled" class='' @click="toolbar_click({ tag: 'tbitem24' }, $event)">
+                                    <i class='fa fa-table'></i>
+                                    <span class='caption'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem24.caption')}}</span>
+                                </i-button>
+                            <div slot='content'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem24.tip')}}</div>
+                        </tooltip>
+                        <tooltip :transfer="true" :max-width="600">
+                                <i-button v-show="toolBarModels.tbitem25.visabled" :disabled="toolBarModels.tbitem25.disabled" class='' @click="toolbar_click({ tag: 'tbitem25' }, $event)">
+                                    <i class='fa fa-plus'></i>
+                                    
+                                </i-button>
+                            <div slot='content'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem25.tip')}}</div>
+                        </tooltip>
+                        <tooltip :transfer="true" :max-width="600">
+                                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                                    <i class='fa fa-save'></i>
+                                    <span class='caption'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                                </i-button>
+                            <div slot='content'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+                        </tooltip>
+                        <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                                 <i-button v-show="toolBarModels.tbitem8.visabled" :disabled="toolBarModels.tbitem8.disabled" class='' @click="toolbar_click({ tag: 'tbitem8' }, $event)">
                                     <i class='fa fa-remove'></i>
                                     <span class='caption'>{{$t('entities.ibzteammember.gridviewtoolbar_toolbar.tbitem8.caption')}}</span>
@@ -54,11 +75,11 @@
                 :isOpenEdit="true"
                 :gridRowActiveMode="gridRowActiveMode"
                 @save="onSave"
-                updateAction=""
+                updateAction="Update"
                 removeAction="Remove"
-                loaddraftAction=""
-                loadAction=""
-                createAction=""
+                loaddraftAction="GetDraft"
+                loadAction="Get"
+                createAction="Create"
                 fetchAction="FetchDefault"
                 :newdata="newdata"
                 :opendata="opendata"
@@ -279,6 +300,13 @@ export default class IBZTeamMemberGridViewBase extends Vue {
      * @memberof IBZTeamMemberGridView
      */
     public toolBarModels: any = {
+        tbitem24: { name: 'tbitem24', caption: '行编辑', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'ToggleRowEdit', target: '' } },
+
+        tbitem25: { name: 'tbitem25', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'NewRow', target: '' } },
+
+        deuiaction1: { name: 'deuiaction1', caption: '保存行', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveRow', target: '' } },
+
+        tbitem26: {  name: 'tbitem26', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem8: { name: 'tbitem8', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
 
         tbitem9: {  name: 'tbitem9', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },

app_web/src/pages/ou/ouindex-view/page-register.ts

@@ -8,8 +8,8 @@ export const PageComponents = {
         Vue.component('ibzpost-grid-view', () => import('@pages/ou/ibzpost-grid-view/ibzpost-grid-view.vue'));
         Vue.component('ibzorganization-tree-exp-view', () => import('@pages/ou/ibzorganization-tree-exp-view/ibzorganization-tree-exp-view.vue'));
         Vue.component('ibzdepartment-edit-view', () => import('@pages/ou/ibzdepartment-edit-view/ibzdepartment-edit-view.vue'));
-        Vue.component('ibzemployee-pickup-view', () => import('@pages/ou/ibzemployee-pickup-view/ibzemployee-pickup-view.vue'));
         Vue.component('ibzdept-member-edit-view', () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'));
+        Vue.component('ibzemployee-pickup-view', () => import('@pages/ou/ibzemployee-pickup-view/ibzemployee-pickup-view.vue'));
         Vue.component('ibzorganization-pickup-view', () => import('@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'));
         Vue.component('ibzteam-grid-view', () => import('@pages/ou/ibzteam-grid-view/ibzteam-grid-view.vue'));
         Vue.component('ibzteam-edit-view', () => import('@pages/ou/ibzteam-edit-view/ibzteam-edit-view.vue'));

app_web/src/store/modules/view-action/state.ts

@@ -64,6 +64,8 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '0581848a24a829f706252c15c641e154',
+                'd1ec542e553e00c6455ca776efc61882',
                 '89b1f5e74703dab0fca756ece369b57d',
             ],
         },

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

@@ -29,7 +29,33 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
+                        <template v-if="actualIsOpenEdit">
+                            <app-form-item :error="gridItemsModel[$index][column.property].error">
+                                
+            <app-picker 
+              :formState="viewState" 
+              :data="row"
+              :context="context"
+              :viewparams="viewparams"
+              :localContext ='{ }' 
+              :localParam ='{ }' 
+              :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
+              name='personname'
+              deMajorField='personname'
+              deKeyField='ibzemployee'
+              :service="service"
+              :acParams="{ serviceName: 'IBZEmployeeService', interfaceName: 'FetchDefault'}"
+              valueitem='userid' 
+              :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:'' }"
+              style=""  
+              @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
+            </app-picker>
+            
+                            </app-form-item>
+                        </template>
+                        <template v-if="!actualIsOpenEdit">
                                 <app-span name='personname' editorType="PICKER" :value="row.personname"></app-span>
                         </template>
                     </template>
@@ -43,7 +69,33 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
+                        <template v-if="actualIsOpenEdit">
+                            <app-form-item :error="gridItemsModel[$index][column.property].error">
+                                
+            <app-picker 
+              :formState="viewState" 
+              :data="row"
+              :context="context"
+              :viewparams="viewparams"
+              :localContext ='{ }' 
+              :localParam ='{ }' 
+              :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
+              name='postname'
+              deMajorField='postname'
+              deKeyField='ibzpost'
+              :service="service"
+              :acParams="{ serviceName: 'IBZPostService', interfaceName: 'FetchDefault'}"
+              valueitem='postid' 
+              :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:'' }"
+              style=""  
+              @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}">
+            </app-picker>
+            
+                            </app-form-item>
+                        </template>
+                        <template v-if="!actualIsOpenEdit">
                                 <app-span name='postname' editorType="PICKER" :value="row.postname"></app-span>
                         </template>
                     </template>
@@ -57,7 +109,20 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
+                        <template v-if="actualIsOpenEdit">
+                            <app-form-item :error="gridItemsModel[$index][column.property].error">
+                                <input-box 
+              :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
+              v-model="row[column.property]" 
+              style=""
+              type="text"
+              
+              
+              @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
+            </input-box>
+                            </app-form-item>
+                        </template>
+                        <template v-if="!actualIsOpenEdit">
                                 <app-span name='postid' editorType="HIDDEN" :value="row.postid"></app-span>
                         </template>
                     </template>
@@ -71,7 +136,20 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template >
+                        <template v-if="actualIsOpenEdit">
+                            <app-form-item :error="gridItemsModel[$index][column.property].error">
+                                <input-box 
+              :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
+              v-model="row[column.property]" 
+              style=""
+              type="text"
+              
+              
+              @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
+            </input-box>
+                            </app-form-item>
+                        </template>
+                        <template v-if="!actualIsOpenEdit">
                                 <app-span name='userid' editorType="HIDDEN" :value="row.userid"></app-span>
                         </template>
                     </template>
@@ -570,7 +648,7 @@ export default class MainBase extends Vue implements ControlInterface {
             langtag: 'entities.ibzteammember.main_grid.columns.personname',
             show: true,
             util: 'PX',
-            isEnableRowEdit: false,
+            isEnableRowEdit: true,
         },
         {
             name: 'postname',
@@ -578,7 +656,7 @@ export default class MainBase extends Vue implements ControlInterface {
             langtag: 'entities.ibzteammember.main_grid.columns.postname',
             show: true,
             util: 'PX',
-            isEnableRowEdit: false,
+            isEnableRowEdit: true,
         },
         {
             name: 'postid',
@@ -586,7 +664,7 @@ export default class MainBase extends Vue implements ControlInterface {
             langtag: 'entities.ibzteammember.main_grid.columns.postid',
             show: false,
             util: 'PX',
-            isEnableRowEdit: false,
+            isEnableRowEdit: true,
         },
         {
             name: 'userid',
@@ -594,7 +672,7 @@ export default class MainBase extends Vue implements ControlInterface {
             langtag: 'entities.ibzteammember.main_grid.columns.userid',
             show: false,
             util: 'PX',
-            isEnableRowEdit: false,
+            isEnableRowEdit: true,
         },
     ]