Skip to content

I
ibzrt
提交 8eca1781 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码 [ibiz-rt，ibizlab-runtime]

上级 6cd221af
隐藏空白字符变更
内嵌 并排
正在显示 包含 192 行增加 和 2 行删除
app_Web/src/locale/lanres/entities/sys-employee/sys-employee_en_US_base.ts
浏览文件 @ 8eca1781
......@@ -96,6 +96,9 @@ function getLocaleResourceBase(){
mdeptcode: commonLogic.appcommonhandle("主部门代码",null),
orgcode: commonLogic.appcommonhandle("单位代码",null),
bcode: commonLogic.appcommonhandle("业务编码",null),
postname: commonLogic.appcommonhandle("岗位名称",null),
postcode: commonLogic.appcommonhandle("岗位代码",null),
postid: commonLogic.appcommonhandle("岗位标识",null),
nickname: commonLogic.appcommonhandle("昵称别名",null),
sex: commonLogic.appcommonhandle("性别",null),
birthday: commonLogic.appcommonhandle("出生日期",null),
......@@ -174,6 +177,8 @@ function getLocaleResourceBase(){
orgname: commonLogic.appcommonhandle("单位名称",null),
mdeptcode: commonLogic.appcommonhandle("主部门代码",null),
mdeptname: commonLogic.appcommonhandle("主部门名称",null),
postcode: commonLogic.appcommonhandle("岗位代码",null),
postname: commonLogic.appcommonhandle("岗位名称",null),
sex: commonLogic.appcommonhandle("性别",null),
phone: commonLogic.appcommonhandle("联系方式",null),
ipaddr: commonLogic.appcommonhandle("ip地址",null),
......
app_Web/src/locale/lanres/entities/sys-employee/sys-employee_zh_CN_base.ts
浏览文件 @ 8eca1781
......@@ -96,6 +96,9 @@ function getLocaleResourceBase(){
mdeptcode: commonLogic.appcommonhandle("主部门代码",null),
orgcode: commonLogic.appcommonhandle("单位代码",null),
bcode: commonLogic.appcommonhandle("业务编码",null),
postname: commonLogic.appcommonhandle("岗位名称",null),
postcode: commonLogic.appcommonhandle("岗位代码",null),
postid: commonLogic.appcommonhandle("岗位标识",null),
nickname: commonLogic.appcommonhandle("昵称别名",null),
sex: commonLogic.appcommonhandle("性别",null),
birthday: commonLogic.appcommonhandle("出生日期",null),
......@@ -174,6 +177,8 @@ function getLocaleResourceBase(){
orgname: commonLogic.appcommonhandle("单位名称",null),
mdeptcode: commonLogic.appcommonhandle("主部门代码",null),
mdeptname: commonLogic.appcommonhandle("主部门名称",null),
postcode: commonLogic.appcommonhandle("岗位代码",null),
postname: commonLogic.appcommonhandle("岗位名称",null),
sex: commonLogic.appcommonhandle("性别",null),
phone: commonLogic.appcommonhandle("联系方式",null),
ipaddr: commonLogic.appcommonhandle("ip地址",null),
......
app_Web/src/store/modules/view-action/state.ts
浏览文件 @ 8eca1781
......@@ -585,6 +585,7 @@ export const viewstate: any = {
'523b25cb9c95d2ef731c39ca24cfe98a',
'82ba8656757a5080e5265648aab13de7',
'd076f344eefde0fdc8d5ea6eab40e4c5',
'09089840aeb5b072e9d6217cdad34c03',
],
},
{
......
app_Web/src/widgets/sys-employee/main-form/main-form-base.vue
浏览文件 @ 8eca1781
......@@ -80,6 +80,44 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.postname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='postname' :itemRules="this.rules().postname" class='' :caption="$t('entities.sysemployee.main_form.details.postname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.postname.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
:formState="formState"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.postname.disabled"
name='postname'
deMajorField='postname'
deKeyField='syspost'
:service="service"
:acParams="{ serviceName: 'SysPostService', interfaceName: 'FetchDefault'}"
valueitem='postid'
:value="data.postname"
editortype=""
:pickupView="{ viewname: 'sys-post-pickup-view', title: $t('entities.syspost.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'sysposts', parameterName: 'syspost' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="onFormItemValueChange">
</app-picker>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.postcode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='postcode' :itemRules="this.rules().postcode" class='' :caption="$t('entities.sysemployee.main_form.details.postcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.postcode.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='postcode' :value="data.postcode" dataType="PICKUPDATA" :precision="0"
:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style="">
</app-span>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.nickname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='nickname' :itemRules="this.rules().nickname" class='' :caption="$t('entities.sysemployee.main_form.details.nickname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.nickname.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -744,6 +782,9 @@ export default class MainBase extends Vue implements ControlInterface {
mdeptcode: null,
orgcode: null,
bcode: null,
postname: null,
postcode: null,
postid: null,
nickname: null,
sex: null,
birthday: null,
......@@ -836,6 +877,14 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.bcode.required, type: 'string', message: '业务编码 值不能为空', trigger: 'change' },
{ required: this.detailsModel.bcode.required, type: 'string', message: '业务编码 值不能为空', trigger: 'blur' },
],
postname: [
{ required: this.detailsModel.postname.required, type: 'string', message: '岗位名称 值不能为空', trigger: 'change' },
{ required: this.detailsModel.postname.required, type: 'string', message: '岗位名称 值不能为空', trigger: 'blur' },
],
postcode: [
{ required: this.detailsModel.postcode.required, type: 'string', message: '岗位代码 值不能为空', trigger: 'change' },
{ required: this.detailsModel.postcode.required, type: 'string', message: '岗位代码 值不能为空', trigger: 'blur' },
],
nickname: [
{ required: this.detailsModel.nickname.required, type: 'string', message: '昵称别名 值不能为空', trigger: 'change' },
{ required: this.detailsModel.nickname.required, type: 'string', message: '昵称别名 值不能为空', trigger: 'blur' },
......@@ -1054,6 +1103,12 @@ export default class MainBase extends Vue implements ControlInterface {
orgcode: new FormItemModel({ caption: '单位代码', detailType: 'FORMITEM', name: 'orgcode', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 1 })
,
bcode: new FormItemModel({ caption: '业务编码', detailType: 'FORMITEM', name: 'bcode', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
postname: new FormItemModel({ caption: '岗位名称', detailType: 'FORMITEM', name: 'postname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
postcode: new FormItemModel({ caption: '岗位代码', detailType: 'FORMITEM', name: 'postcode', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
postid: new FormItemModel({ caption: '岗位标识', detailType: 'FORMITEM', name: 'postid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
nickname: new FormItemModel({ caption: '昵称别名', detailType: 'FORMITEM', name: 'nickname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -1319,6 +1374,42 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'bcode', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 postname 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.postname')
onPostnameChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'postname', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 postcode 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.postcode')
onPostcodeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'postcode', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 postid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.postid')
onPostidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'postid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 nickname 值
*
......@@ -1634,6 +1725,9 @@ export default class MainBase extends Vue implements ControlInterface {
......
app_Web/src/widgets/sys-employee/main-form/main-form-model.ts
浏览文件 @ 8eca1781
......@@ -108,6 +108,21 @@ export default class MainModel {
prop: 'bcode',
dataType: 'TEXT',
},
{
name: 'postname',
prop: 'postname',
dataType: 'PICKUPTEXT',
},
{
name: 'postcode',
prop: 'postcode',
dataType: 'PICKUPDATA',
},
{
name: 'postid',
prop: 'postid',
dataType: 'PICKUP',
},
{
name: 'nickname',
prop: 'nickname',
......
app_Web/src/widgets/sys-employee/main-form/main-form-service.ts
浏览文件 @ 8eca1781
......@@ -4,6 +4,7 @@ import SysEmployeeService from '@/service/sys-employee/sys-employee-service';
import MainModel from './main-form-model';
import SysOrganizationService from '@/service/sys-organization/sys-organization-service';
import SysDepartmentService from '@/service/sys-department/sys-department-service';
import SysPostService from '@/service/sys-post/sys-post-service';
/**
......@@ -59,6 +60,14 @@ export default class MainService extends ControlService {
*/
public sysdepartmentService: SysDepartmentService = new SysDepartmentService();
/**
* 岗位服务对象
*
* @type {SysPostService}
* @memberof MainService
*/
public syspostService: SysPostService = new SysPostService();
/**
* 远端数据
*
......@@ -114,6 +123,9 @@ export default class MainService extends ControlService {
if (Object.is(serviceName, 'SysDepartmentService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.sysdepartmentService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'deptid', 'sysdepartment');
}
if (Object.is(serviceName, 'SysPostService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.syspostService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'postid', 'syspost');
}
return Promise.reject([])
}
......
app_Web/src/widgets/sys-employee/main-grid/main-grid-base.vue
浏览文件 @ 8eca1781
......@@ -94,7 +94,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('mdeptname')">
<el-table-column show-overflow-tooltip :prop="'mdeptname'" :label="$t('entities.sysemployee.main_grid.columns.mdeptname')" :width="150" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'mdeptname'" :label="$t('entities.sysemployee.main_grid.columns.mdeptname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysemployee.main_grid.columns.mdeptname')}}
......@@ -105,6 +105,30 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('postcode')">
<el-table-column show-overflow-tooltip :prop="'postcode'" :label="$t('entities.sysemployee.main_grid.columns.postcode')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysemployee.main_grid.columns.postcode')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.postcode}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('postname')">
<el-table-column show-overflow-tooltip :prop="'postname'" :label="$t('entities.sysemployee.main_grid.columns.postname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.sysemployee.main_grid.columns.postname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.postname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('sex')">
<el-table-column show-overflow-tooltip :prop="'sex'" :label="$t('entities.sysemployee.main_grid.columns.sex')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -761,6 +785,24 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'postcode',
label: '岗位代码',
langtag: 'entities.sysemployee.main_grid.columns.postcode',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'postname',
label: '岗位名称',
langtag: 'entities.sysemployee.main_grid.columns.postname',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'sex',
label: '性别',
......@@ -1500,7 +1542,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['usercode','personname','loginname','orgcode','orgname','mdeptcode','mdeptname','sex','phone','ipaddr','showorder'];
let allColumns:Array<any> = ['usercode','personname','loginname','orgcode','orgname','mdeptcode','mdeptname','postcode','postname','sex','phone','ipaddr','showorder'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1587,6 +1629,8 @@ export default class MainBase extends Vue implements ControlInterface {
orgname:'',
mdeptcode:'',
mdeptname:'',
postcode:'',
postname:'',
sex:'',
phone:'',
ipaddr:'',
......@@ -1624,6 +1668,8 @@ export default class MainBase extends Vue implements ControlInterface {
orgname:'',
mdeptcode:'',
mdeptname:'',
postcode:'',
postname:'',
sex:'',
phone:'',
ipaddr:'',
......@@ -1681,6 +1727,8 @@ export default class MainBase extends Vue implements ControlInterface {
orgname:'',
mdeptcode:'',
mdeptname:'',
postcode:'',
postname:'',
sex:'',
phone:'',
ipaddr:'',
......
app_Web/src/widgets/sys-employee/main-grid/main-grid-model.ts
浏览文件 @ 8eca1781
......@@ -51,11 +51,21 @@ export default class MainModel {
prop: 'mdeptcode',
dataType: 'PICKUPDATA',
},
{
name: 'postname',
prop: 'postname',
dataType: 'PICKUPTEXT',
},
{
name: 'mdeptname',
prop: 'mdeptname',
dataType: 'PICKUPTEXT',
},
{
name: 'postcode',
prop: 'postcode',
dataType: 'PICKUPDATA',
},
{
name: 'srfmajortext',
prop: 'personname',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或