JunZai 发布系统代码

app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_en_US.ts

@@ -54,7 +54,21 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			hrarchivesname: "档案信息名称", 
+			archivescode: "档案编号", 
+			hrorganizationname: "档案管理单位", 
+			archivesplace: "档案保管地", 
+			archivesroom: "档案室", 
+			hremployeename: "员工姓名", 
+			employeecode: "员工编号", 
+			organizationname: "单位", 
+			activeflag: "是否有效", 
+			degree: "档案学历", 
+			birthday: "档案出生日期", 
+			startworktime: "档案参加工作时间", 
+			politicaltime: "档案入党时间", 
+			memo: "备注", 
+			hremployeeid: "员工标识", 
+			hrorganizationid: "档案管理单位ID", 
 			hrarchivesid: "档案信息标识", 
 		},
 		uiactions: {

app_PIM/src/locale/lanres/entities/hrarchives/hrarchives_zh_CN.ts

@@ -53,7 +53,21 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			hrarchivesname: "档案信息名称", 
+			archivescode: "档案编号", 
+			hrorganizationname: "档案管理单位", 
+			archivesplace: "档案保管地", 
+			archivesroom: "档案室", 
+			hremployeename: "员工姓名", 
+			employeecode: "员工编号", 
+			organizationname: "单位", 
+			activeflag: "是否有效", 
+			degree: "档案学历", 
+			birthday: "档案出生日期", 
+			startworktime: "档案参加工作时间", 
+			politicaltime: "档案入党时间", 
+			memo: "备注", 
+			hremployeeid: "员工标识", 
+			hrorganizationid: "档案管理单位ID", 
 			hrarchivesid: "档案信息标识", 
 		},
 		uiactions: {

app_PIM/src/pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.html

-<template slot='title'>
-        <span class='caption-info'>{{viewCaption}}</span>
-</template>
-    <split id="hrtransferapplywfdynaexpgridview" v-model="split" mode="horizontal">
-        <div slot='left'>
-            <el-tree ref="tree" :data="wfStepModel" node-key="userTaskId" :highlight-current="true" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
-        </div>
-        <div slot="right">
-            <div class="content-container">
-            <view_searchform 
-    :viewState="viewState"  
-    :viewparams="viewparams" 
-    :context="context" 
-    :showBusyIndicator="true"
-    v-show="isExpandSearchForm"
-    loaddraftAction="FilterGetDraft"
-    loadAction="FilterGet"
-
-    name="searchform"  
-    ref='searchform' 
-    @save="searchform_save($event)"  
-    @search="searchform_search($event)"  
-    @load="searchform_load($event)"  
-    @closeview="closeView($event)">
-</view_searchform>
-            <view_grid 
-    :viewState="viewState"  
-    :viewparams="viewparams" 
-    :context="context" 
-    :isSingleSelect="isGridSingleSelect"
-    :showBusyIndicator="true"
-    updateAction=""
-    removeAction="Remove"
-    loaddraftAction=""
-    loadAction=""
-    createAction=""
-    fetchAction="FetchDefault"
-    :newdata="newdata.bind(_self)"
-    :opendata="opendata.bind(_self)"
-    name="grid"  
-    ref='grid' 
-    @selectionchange="grid_selectionchange($event)"  
-    @beforeload="grid_beforeload($event)"  
-    @rowdblclick="grid_rowdblclick($event)"  
-    @remove="grid_remove($event)"  
-    @load="grid_load($event)"  
-    @closeview="closeView($event)">
-</view_grid>
-            </div>
-        </div>
-    </split>
-    </card>
-</div>  -->
 <studio-view-style2 viewName="hrtransferapplywfdynaexpgridview" viewTitle="调动申请工作流导航表格视图" class='dewfdynaexpgridview hrtransfer-apply-wfdyna-exp-grid-view'>
     <template slot='title'>
     <span class='caption-info'>{{viewCaption}}</span>
@@ -124,5 +71,4 @@
             </div>
         </div>
     </split>
-    </card>
 </studio-view-style2>
\ No newline at end of file

app_PIM/src/pages/ungroup/pim/page-register.ts

@@ -53,8 +53,8 @@ export const PageComponents = {
         Vue.component('hrtechnical-title-v-003', () => import('@pages/human-resource/hrtechnical-title-v-003/hrtechnical-title-v-003.vue'));
         Vue.component('hrpost-v-005', () => import('@pages/human-resource/hrpost-v-005/hrpost-v-005.vue'));
         Vue.component('hrlegal-edit-view', () => import('@pages/base/hrlegal-edit-view/hrlegal-edit-view.vue'));
-        Vue.component('hrorganization-grid-view', () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'));
         Vue.component('hrduty-pickup-view', () => import('@pages/human-resource/hrduty-pickup-view/hrduty-pickup-view.vue'));
+        Vue.component('hrorganization-grid-view', () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'));
         Vue.component('hrtransfer-apply-wfdyna-exp-grid-view', () => import('@pages/pcm/hrtransfer-apply-wfdyna-exp-grid-view/hrtransfer-apply-wfdyna-exp-grid-view.vue'));
         Vue.component('hremployee-v-006', () => import('@pages/human-resource/hremployee-v-006/hremployee-v-006.vue'));
         Vue.component('hremployee-v-002', () => import('@pages/human-resource/hremployee-v-002/hremployee-v-002.vue'));
@@ -89,9 +89,9 @@ export const PageComponents = {
         Vue.component('hremployee-tree-exp-view', () => import('@pages/human-resource/hremployee-tree-exp-view/hremployee-tree-exp-view.vue'));
         Vue.component('hremployee-tab-exp-view', () => import('@pages/human-resource/hremployee-tab-exp-view/hremployee-tab-exp-view.vue'));
         Vue.component('hrcontract-edit-view', () => import('@pages/human-resource/hrcontract-edit-view/hrcontract-edit-view.vue'));
+        Vue.component('hrorganization-pickup-view', () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'));
         Vue.component('hromhierarchy-cat-dashboard-view', () => import('@pages/base/hromhierarchy-cat-dashboard-view/hromhierarchy-cat-dashboard-view.vue'));
         Vue.component('hrduty-edu-grid-view', () => import('@pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue'));
-        Vue.component('hrorganization-pickup-view', () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'));
         Vue.component('hroperation-unit-tab-exp-view', () => import('@pages/base/hroperation-unit-tab-exp-view/hroperation-unit-tab-exp-view.vue'));
         Vue.component('hrlanguage-ability-grid-view', () => import('@pages/human-resource/hrlanguage-ability-grid-view/hrlanguage-ability-grid-view.vue'));
         Vue.component('hrorg-address-grid-view', () => import('@pages/base/hrorg-address-grid-view/hrorg-address-grid-view.vue'));

app_PIM/src/pages/ungroup/pim/router.ts

@@ -1311,32 +1311,32 @@ const router = new Router({
                     component: () => import('@pages/base/hrlegal-edit-view/hrlegal-edit-view.vue'),
                 },
                 {
-                    path: 'hrorganizations/:hrorganization?/gridview/:gridview?',
+                    path: 'hrduties/:hrduty?/pickupview/:pickupview?',
                     meta: {
-                        caption: 'entities.hrorganization.views.gridview.title',
+                        caption: 'entities.hrduty.views.pickupview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
-                            { pathName: 'gridview', parameterName: 'gridview' },
+                            { pathName: 'hrduties', parameterName: 'hrduty' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'),
+                    component: () => import('@pages/human-resource/hrduty-pickup-view/hrduty-pickup-view.vue'),
                 },
                 {
-                    path: 'hrduties/:hrduty?/pickupview/:pickupview?',
+                    path: 'hrorganizations/:hrorganization?/gridview/:gridview?',
                     meta: {
-                        caption: 'entities.hrduty.views.pickupview.title',
+                        caption: 'entities.hrorganization.views.gridview.title',
                         info:'',
                         parameters: [
                             { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrduties', parameterName: 'hrduty' },
-                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+                            { pathName: 'gridview', parameterName: 'gridview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/human-resource/hrduty-pickup-view/hrduty-pickup-view.vue'),
+                    component: () => import('@pages/base/hrorganization-grid-view/hrorganization-grid-view.vue'),
                 },
                 {
                     path: 'hrposts/:hrpost?/hrtransferapplies/:hrtransferapply?/wfdynaexpgridview/:wfdynaexpgridview?',
@@ -2249,6 +2249,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/human-resource/hrcontract-edit-view/hrcontract-edit-view.vue'),
                 },
+                {
+                    path: 'hrorganizations/:hrorganization?/pickupview/:pickupview?',
+                    meta: {
+                        caption: 'entities.hrorganization.views.pickupview.title',
+                        info:'',
+                        parameters: [
+                            { pathName: 'pim', parameterName: 'pim' },
+                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
+                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'),
+                },
                 {
                     path: 'hromhierarchycats/:hromhierarchycat?/dashboardview/:dashboardview?',
                     meta: {
@@ -2292,20 +2306,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/human-resource/hrduty-edu-grid-view/hrduty-edu-grid-view.vue'),
                 },
-                {
-                    path: 'hrorganizations/:hrorganization?/pickupview/:pickupview?',
-                    meta: {
-                        caption: 'entities.hrorganization.views.pickupview.title',
-                        info:'',
-                        parameters: [
-                            { pathName: 'pim', parameterName: 'pim' },
-                            { pathName: 'hrorganizations', parameterName: 'hrorganization' },
-                            { pathName: 'pickupview', parameterName: 'pickupview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/base/hrorganization-pickup-view/hrorganization-pickup-view.vue'),
-                },
                 {
                     path: 'hroperationunits/:hroperationunit?/tabexpview/:tabexpview?',
                     meta: {

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

@@ -395,6 +395,8 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'ec9d9fe37bbfc3fcb623e2dc34b48dbc',
+                'e7ba37699bd458dc8dd5c02abac8dadd',
             ],
         },
         {

app_PIM/src/widgets/hrarchives/main-form/main-form-base.tsx

@@ -82,7 +82,21 @@ export class MainEditFormBase extends EditFormControlBase {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
-        hrarchivesname: null,
+        archivescode: null,
+        hrorganizationname: null,
+        archivesplace: null,
+        archivesroom: null,
+        hremployeename: null,
+        employeecode: null,
+        organizationname: null,
+        activeflag: null,
+        degree: null,
+        birthday: null,
+        startworktime: null,
+        politicaltime: null,
+        memo: null,
+        hremployeeid: null,
+        hrorganizationid: null,
         hrarchivesid: null,
         hrarchives:null,
     };
@@ -94,6 +108,22 @@ export class MainEditFormBase extends EditFormControlBase {
      * @memberof MainEditFormBase
      */
     public rules: any = {
+        archivescode: [
+            { required: true, type: 'string', message: '档案编号 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '档案编号 值不能为空', trigger: 'blur' },
+        ],
+        hrorganizationname: [
+            { required: true, type: 'string', message: '档案管理单位 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '档案管理单位 值不能为空', trigger: 'blur' },
+        ],
+        hremployeename: [
+            { required: true, type: 'string', message: '员工姓名 值不能为空', trigger: 'change' },
+            { required: true, type: 'string', message: '员工姓名 值不能为空', trigger: 'blur' },
+        ],
+        activeflag: [
+            { required: true, type: 'number', message: '是否有效 值不能为空', trigger: 'change' },
+            { required: true, type: 'number', message: '是否有效 值不能为空', trigger: 'blur' },
+        ],
     }
 
     /**
@@ -132,9 +162,57 @@ export class MainEditFormBase extends EditFormControlBase {
 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        hrarchivesname: new FormItemModel({ caption: '档案信息名称', detailType: 'FORMITEM', name: 'hrarchivesname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+        archivescode: new FormItemModel({ caption: '档案编号', detailType: 'FORMITEM', name: 'archivescode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        hrorganizationname: new FormItemModel({ caption: '档案管理单位', detailType: 'FORMITEM', name: 'hrorganizationname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        archivesplace: new FormItemModel({ caption: '档案保管地', detailType: 'FORMITEM', name: 'archivesplace', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        archivesroom: new FormItemModel({ caption: '档案室', detailType: 'FORMITEM', name: 'archivesroom', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        hremployeename: new FormItemModel({ caption: '员工姓名', detailType: 'FORMITEM', name: 'hremployeename', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        employeecode: new FormItemModel({ caption: '员工编号', detailType: 'FORMITEM', name: 'employeecode', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        organizationname: new FormItemModel({ caption: '单位', detailType: 'FORMITEM', name: 'organizationname', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        activeflag: new FormItemModel({ caption: '是否有效', detailType: 'FORMITEM', name: 'activeflag', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        degree: new FormItemModel({ caption: '档案学历', detailType: 'FORMITEM', name: 'degree', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        birthday: new FormItemModel({ caption: '档案出生日期', detailType: 'FORMITEM', name: 'birthday', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        startworktime: new FormItemModel({ caption: '档案参加工作时间', detailType: 'FORMITEM', name: 'startworktime', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        politicaltime: new FormItemModel({ caption: '档案入党时间', detailType: 'FORMITEM', name: 'politicaltime', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        hremployeeid: new FormItemModel({ caption: '员工标识', detailType: 'FORMITEM', name: 'hremployeeid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
+
+        hrorganizationid: new FormItemModel({ caption: '档案管理单位ID', detailType: 'FORMITEM', name: 'hrorganizationid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         hrarchivesid: new FormItemModel({ caption: '档案信息标识', detailType: 'FORMITEM', name: 'hrarchivesid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
     };
+
+    /**
+     * 新建默认值
+     * @memberof MainEditFormBase
+     */
+    public createDefault(){                    
+        if (this.data.hasOwnProperty('activeflag')) {
+            this.data['activeflag'] = 1;
+        }
+    }
+
+    /**
+     * 更新默认值
+     * @memberof MainEditFormBase
+     */
+    public updateDefault(){                    
+        if (this.data.hasOwnProperty('activeflag') && !this.data.activeflag) {
+            this.data['activeflag'] = 1;
+        }
+    }
 }
\ No newline at end of file

app_PIM/src/widgets/hrarchives/main-form/main-form-model.ts

@@ -56,10 +56,80 @@ export default class MainModel {
         name: 'srfsourcekey',
       },
       {
-        name: 'hrarchivesname',
-        prop: 'hrarchivesname',
+        name: 'archivescode',
+        prop: 'archivescode',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'hrorganizationname',
+        prop: 'hrorganizationname',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'archivesplace',
+        prop: 'archivesplace',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'archivesroom',
+        prop: 'archivesroom',
         dataType: 'TEXT',
       },
+      {
+        name: 'hremployeename',
+        prop: 'hremployeename',
+        dataType: 'PICKUPTEXT',
+      },
+      {
+        name: 'employeecode',
+        prop: 'employeecode',
+        dataType: 'PICKUPDATA',
+      },
+      {
+        name: 'organizationname',
+        prop: 'organizationname',
+        dataType: 'PICKUPDATA',
+      },
+      {
+        name: 'activeflag',
+        prop: 'activeflag',
+        dataType: 'YESNO',
+      },
+      {
+        name: 'degree',
+        prop: 'degree',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'birthday',
+        prop: 'birthday',
+        dataType: 'DATE',
+      },
+      {
+        name: 'startworktime',
+        prop: 'startworktime',
+        dataType: 'DATE',
+      },
+      {
+        name: 'politicaltime',
+        prop: 'politicaltime',
+        dataType: 'DATE',
+      },
+      {
+        name: 'memo',
+        prop: 'memo',
+        dataType: 'LONGTEXT_1000',
+      },
+      {
+        name: 'hremployeeid',
+        prop: 'hremployeeid',
+        dataType: 'PICKUP',
+      },
+      {
+        name: 'hrorganizationid',
+        prop: 'hrorganizationid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'hrarchivesid',
         prop: 'hrarchivesid',

app_PIM/src/widgets/hrarchives/main-form/main-form-service.ts

@@ -2,6 +2,8 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import HRArchivesService from '@/service/hrarchives/hrarchives-service';
 import MainModel from './main-form-model';
+import HROrganizationService from '@/service/hrorganization/hrorganization-service';
+import HREmployeeService from '@/service/hremployee/hremployee-service';
 
 
 /**
@@ -41,6 +43,22 @@ export default class MainService extends ControlService {
         this.model = new MainModel();
     }
 
+    /**
+     * 组织服务对象
+     *
+     * @type {HROrganizationService}
+     * @memberof MainService
+     */
+    public hrorganizationService: HROrganizationService = new HROrganizationService();
+
+    /**
+     * 员工服务对象
+     *
+     * @type {HREmployeeService}
+     * @memberof MainService
+     */
+    public hremployeeService: HREmployeeService = new HREmployeeService();
+
     /**
      * 处理数据
      *
@@ -82,6 +100,12 @@ export default class MainService extends ControlService {
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
         data.page = data.page ? data.page : 0;
         data.size = data.size ? data.size : 1000;
+        if (Object.is(serviceName, 'HROrganizationService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.hrorganizationService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'organizationid', 'hrorganization');
+        }
+        if (Object.is(serviceName, 'HREmployeeService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.hremployeeService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'employeeid', 'hremployee');
+        }
 
         return Promise.reject([])
     }

humanresource-core/src/main/java/cn/ibizlab/humanresource/core/humanresource/domain/HRArchives.java

@@ -193,6 +193,7 @@ public class HRArchives extends EntityMP implements Serializable {
     /**
      * 是否有效
      */
+    @DEField(defaultValue = "1")
     @TableField(value = "activeflag")
     @JSONField(name = "activeflag")
     @JsonProperty("activeflag")