Skip to content

I
ibzou
提交 a16f612c 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibizdev提交

上级 94564407
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 126 行增加 和 2004 行删除
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts
浏览文件 @ a16f612c
......@@ -94,14 +94,6 @@ export default {
caption: "Save",
tip: "Save",
},
tbitem4: {
caption: "Save And New",
tip: "Save And New",
},
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: {
caption: "-",
tip: "",
......@@ -114,46 +106,10 @@ export default {
caption: "-",
tip: "",
},
tbitem12: {
caption: "New",
tip: "New",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem14: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem23: {
caption: "第一个记录",
tip: "第一个记录",
},
tbitem24: {
caption: "上一个记录",
tip: "上一个记录",
},
tbitem25: {
caption: "下一个记录",
tip: "下一个记录",
},
tbitem26: {
caption: "最后一个记录",
tip: "最后一个记录",
},
tbitem21: {
caption: "-",
tip: "",
},
tbitem22: {
caption: "Help",
tip: "Help",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
......
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts
浏览文件 @ a16f612c
......@@ -93,66 +93,22 @@ export default {
caption: '保存',
tip: '保存',
},
tbitem4: {
caption: '保存并新建',
tip: '保存并新建',
},
tbitem5: {
caption: '保存并关闭',
tip: '保存并关闭',
},
tbitem6: {
caption: '-',
tip: '',
},
tbitem7: {
caption: '删除并关闭',
tip: '删除并关闭',
caption: '删除',
tip: '删除',
},
tbitem8: {
caption: '-',
tip: '',
},
tbitem12: {
caption: '新建',
tip: '新建',
},
tbitem13: {
caption: '-',
tip: '',
},
tbitem14: {
caption: '拷贝',
tip: '拷贝',
},
tbitem16: {
caption: '-',
tip: '',
},
tbitem23: {
caption: '第一个记录',
tip: '第一个记录',
},
tbitem24: {
caption: '上一个记录',
tip: '上一个记录',
},
tbitem25: {
caption: '下一个记录',
tip: '下一个记录',
},
tbitem26: {
caption: '最后一个记录',
tip: '最后一个记录',
},
tbitem21: {
caption: '-',
tip: '',
},
tbitem22: {
caption: '帮助',
tip: '帮助',
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
......
app_web/src/locale/lanres/ibzemployee/ibzemployee_en_US.ts
浏览文件 @ a16f612c
......@@ -70,9 +70,9 @@ export default {
personname: "姓名",
loginname: "登录名",
orgid: "单位",
orgname: "单位名称",
orgname: "单位",
mdeptid: "主部门",
mdeptname: "主部门名称",
mdeptname: "部门",
nickname: "昵称别名",
sex: "性别",
birthday: "出生日期",
......@@ -134,12 +134,9 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_usercode_like: "用户工号(%)",
n_personname_like: "姓名(%)",
n_orgid_eq: "单位(=)",
n_mdeptid_eq: "主部门(=)",
n_mdeptname_like: "主部门名称(%)",
n_bcode_like: "业务编码(%)",
n_usercode_like: "工号",
n_personname_like: "姓名",
n_mdeptname_like: "部门",
},
uiactions: {
},
......@@ -149,14 +146,6 @@ export default {
caption: "Save",
tip: "Save",
},
tbitem4: {
caption: "Save And New",
tip: "Save And New",
},
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: {
caption: "-",
tip: "",
......@@ -169,46 +158,10 @@ export default {
caption: "-",
tip: "",
},
tbitem12: {
caption: "New",
tip: "New",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem14: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem23: {
caption: "第一个记录",
tip: "第一个记录",
},
tbitem24: {
caption: "上一个记录",
tip: "上一个记录",
},
tbitem25: {
caption: "下一个记录",
tip: "下一个记录",
},
tbitem26: {
caption: "最后一个记录",
tip: "最后一个记录",
},
tbitem21: {
caption: "-",
tip: "",
},
tbitem22: {
caption: "Help",
tip: "Help",
},
},
gridviewtoolbar_toolbar: {
tbitem1_initpwd: {
......
app_web/src/locale/lanres/ibzemployee/ibzemployee_zh_CN.ts
浏览文件 @ a16f612c
......@@ -69,9 +69,9 @@ export default {
personname: '姓名',
loginname: '登录名',
orgid: '单位',
orgname: '单位名称',
orgname: '单位',
mdeptid: '主部门',
mdeptname: '主部门名称',
mdeptname: '部门',
nickname: '昵称别名',
sex: '性别',
birthday: '出生日期',
......@@ -133,12 +133,9 @@ export default {
default_searchform: {
details: {
formpage1: '常规条件',
n_usercode_like: '用户工号(%)',
n_personname_like: '姓名(%)',
n_orgid_eq: '单位(=)',
n_mdeptid_eq: '主部门(=)',
n_mdeptname_like: '主部门名称(%)',
n_bcode_like: '业务编码(%)',
n_usercode_like: '工号',
n_personname_like: '姓名',
n_mdeptname_like: '部门',
},
uiactions: {
},
......@@ -148,66 +145,22 @@ export default {
caption: '保存',
tip: '保存',
},
tbitem4: {
caption: '保存并新建',
tip: '保存并新建',
},
tbitem5: {
caption: '保存并关闭',
tip: '保存并关闭',
},
tbitem6: {
caption: '-',
tip: '',
},
tbitem7: {
caption: '删除并关闭',
tip: '删除并关闭',
caption: '删除',
tip: '删除',
},
tbitem8: {
caption: '-',
tip: '',
},
tbitem12: {
caption: '新建',
tip: '新建',
},
tbitem13: {
caption: '-',
tip: '',
},
tbitem14: {
caption: '拷贝',
tip: '拷贝',
},
tbitem16: {
caption: '-',
tip: '',
},
tbitem23: {
caption: '第一个记录',
tip: '第一个记录',
},
tbitem24: {
caption: '上一个记录',
tip: '上一个记录',
},
tbitem25: {
caption: '下一个记录',
tip: '下一个记录',
},
tbitem26: {
caption: '最后一个记录',
tip: '最后一个记录',
},
tbitem21: {
caption: '-',
tip: '',
},
tbitem22: {
caption: '帮助',
tip: '帮助',
},
},
gridviewtoolbar_toolbar: {
tbitem1_initpwd: {
......
app_web/src/locale/lanres/ibzorganization/ibzorganization_en_US.ts
浏览文件 @ a16f612c
......@@ -115,14 +115,6 @@ export default {
caption: "Save",
tip: "Save",
},
tbitem4: {
caption: "Save And New",
tip: "Save And New",
},
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: {
caption: "-",
tip: "",
......@@ -135,46 +127,10 @@ export default {
caption: "-",
tip: "",
},
tbitem12: {
caption: "New",
tip: "New",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem14: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem23: {
caption: "第一个记录",
tip: "第一个记录",
},
tbitem24: {
caption: "上一个记录",
tip: "上一个记录",
},
tbitem25: {
caption: "下一个记录",
tip: "下一个记录",
},
tbitem26: {
caption: "最后一个记录",
tip: "最后一个记录",
},
tbitem21: {
caption: "-",
tip: "",
},
tbitem22: {
caption: "Help",
tip: "Help",
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
......
app_web/src/locale/lanres/ibzorganization/ibzorganization_zh_CN.ts
浏览文件 @ a16f612c
......@@ -114,66 +114,22 @@ export default {
caption: '保存',
tip: '保存',
},
tbitem4: {
caption: '保存并新建',
tip: '保存并新建',
},
tbitem5: {
caption: '保存并关闭',
tip: '保存并关闭',
},
tbitem6: {
caption: '-',
tip: '',
},
tbitem7: {
caption: '删除并关闭',
tip: '删除并关闭',
caption: '删除',
tip: '删除',
},
tbitem8: {
caption: '-',
tip: '',
},
tbitem12: {
caption: '新建',
tip: '新建',
},
tbitem13: {
caption: '-',
tip: '',
},
tbitem14: {
caption: '拷贝',
tip: '拷贝',
},
tbitem16: {
caption: '-',
tip: '',
},
tbitem23: {
caption: '第一个记录',
tip: '第一个记录',
},
tbitem24: {
caption: '上一个记录',
tip: '上一个记录',
},
tbitem25: {
caption: '下一个记录',
tip: '下一个记录',
},
tbitem26: {
caption: '最后一个记录',
tip: '最后一个记录',
},
tbitem21: {
caption: '-',
tip: '',
},
tbitem22: {
caption: '帮助',
tip: '帮助',
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
......
app_web/src/pages/ou/ibzemployee-grid-view/ibzemployee-grid-view-base.vue
浏览文件 @ a16f612c
......@@ -1141,16 +1141,28 @@ export default class IBZEmployeeGridViewBase extends Vue {
}
const parameters: any[] = [
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, curViewParam, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'ibzemployee-edit-view',
height: 0,
width: 0,
title: this.$t('entities.ibzemployee.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -1178,14 +1190,28 @@ export default class IBZEmployeeGridViewBase extends Vue {
}
const parameters: any[] = [
{ pathName: 'ibzemployees', parameterName: 'ibzemployee' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, curViewParam, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'ibzemployee-edit-view',
height: 0,
width: 0,
title: this.$t('entities.ibzemployee.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_web/src/widgets/ibzdepartment/main-form/main-form-base.vue
浏览文件 @ a16f612c
......@@ -3,12 +3,6 @@
<input style="display:none;" />
<row >
<i-col v-show="detailsModel.deptid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='deptid' :itemRules="this.rules.deptid" class='' :caption="$t('entities.ibzdepartment.main_form.details.deptid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deptid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.deptid" @enter="onEnter($event)" unit="" :disabled="detailsModel.deptid.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.deptcode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='deptcode' :itemRules="this.rules.deptcode" class='' :caption="$t('entities.ibzdepartment.main_form.details.deptcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deptcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.deptcode" @enter="onEnter($event)" unit="" :disabled="detailsModel.deptcode.disabled" type='text' style=""></input-box>
......@@ -539,8 +533,8 @@ export default class MainBase extends Vue implements ControlInterface {
orgname: [
{ type: 'string', message: '单位 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '单位 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '单位 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '单位 值不能为空', trigger: 'blur' },
{ required: true, type: 'string', message: '单位 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '单位 值不能为空', trigger: 'blur' },
],
orgid: [
{ type: 'string', message: '单位 值必须为字符串类型', trigger: 'change' },
......
app_web/src/widgets/ibzdepartment/main-form/main-form-service.ts
浏览文件 @ a16f612c
......@@ -175,7 +175,6 @@ export default class MainService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{deptid: data.deptid, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/ibzemployee/default-searchform/default-searchform-base.vue
浏览文件 @ a16f612c
......@@ -21,12 +21,6 @@
<input-box v-model="data.n_mdeptname_like" @enter="onEnter($event)" :disabled="detailsModel.n_mdeptname_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_bcode_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_bcode_like' :itemRules="this.rules.n_bcode_like" class='' :caption="$t('entities.ibzemployee.default_searchform.details.n_bcode_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_bcode_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_bcode_like" @enter="onEnter($event)" :disabled="detailsModel.n_bcode_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
</row>
</i-col>
......@@ -270,10 +264,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
protected data: any = {
n_usercode_like: null,
n_personname_like: null,
n_orgid_eq: null,
n_mdeptid_eq: null,
n_mdeptname_like: null,
n_bcode_like: null,
};
/**
......@@ -284,40 +275,22 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
protected rules: any = {
n_usercode_like: [
{ type: 'string', message: '用户工号(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '用户工号(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '用户工号(%) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '用户工号(%) 值不能为空', trigger: 'blur' },
{ type: 'string', message: '工号 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '工号 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '工号 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '工号 值不能为空', trigger: 'blur' },
],
n_personname_like: [
{ type: 'string', message: '姓名(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '姓名(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '姓名(%) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '姓名(%) 值不能为空', trigger: 'blur' },
],
n_orgid_eq: [
{ type: 'string', message: '单位(=) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '单位(=) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '单位(=) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '单位(=) 值不能为空', trigger: 'blur' },
],
n_mdeptid_eq: [
{ type: 'string', message: '主部门(=) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主部门(=) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主部门(=) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主部门(=) 值不能为空', trigger: 'blur' },
{ type: 'string', message: '姓名 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '姓名 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '姓名 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '姓名 值不能为空', trigger: 'blur' },
],
n_mdeptname_like: [
{ type: 'string', message: '主部门名称(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主部门名称(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主部门名称(%) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主部门名称(%) 值不能为空', trigger: 'blur' },
],
n_bcode_like: [
{ type: 'string', message: '业务编码(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '业务编码(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '业务编码(%) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '业务编码(%) 值不能为空', trigger: 'blur' },
{ type: 'string', message: '部门 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '部门 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '部门 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '部门 值不能为空', trigger: 'blur' },
],
}
......@@ -330,17 +303,11 @@ export default class DefaultBase extends Vue implements ControlInterface {
protected detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
n_usercode_like: new FormItemModel({ caption: '用户工号(%)', detailType: 'FORMITEM', name: 'n_usercode_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_personname_like: new FormItemModel({ caption: '姓名(%)', detailType: 'FORMITEM', name: 'n_personname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_orgid_eq: new FormItemModel({ caption: '单位(=)', detailType: 'FORMITEM', name: 'n_orgid_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_mdeptid_eq: new FormItemModel({ caption: '主部门(=)', detailType: 'FORMITEM', name: 'n_mdeptid_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
n_usercode_like: new FormItemModel({ caption: '工号', detailType: 'FORMITEM', name: 'n_usercode_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_mdeptname_like: new FormItemModel({ caption: '主部门名称(%)', detailType: 'FORMITEM', name: 'n_mdeptname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
n_personname_like: new FormItemModel({ caption: '姓名', detailType: 'FORMITEM', name: 'n_personname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_bcode_like: new FormItemModel({ caption: '业务编码(%)', detailType: 'FORMITEM', name: 'n_bcode_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
n_mdeptname_like: new FormItemModel({ caption: '部门', detailType: 'FORMITEM', name: 'n_mdeptname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
......@@ -368,30 +335,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'n_personname_like', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_orgid_eq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_orgid_eq')
onN_orgid_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_orgid_eq', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_mdeptid_eq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_mdeptid_eq')
onN_mdeptid_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_mdeptid_eq', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_mdeptname_like 值
*
......@@ -404,18 +347,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'n_mdeptname_like', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_bcode_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_bcode_like')
onN_bcode_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_bcode_like', newVal: newVal, oldVal: oldVal });
}
/**
* 重置表单项值
......@@ -440,9 +371,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
}
/**
......
app_web/src/widgets/ibzemployee/default-searchform/default-searchform-model.ts
浏览文件 @ a16f612c
......@@ -35,26 +35,11 @@ export default class DefaultModel {
prop: 'personname',
dataType: 'TEXT',
},
{
name: 'n_orgid_eq',
prop: 'orgid',
dataType: 'PICKUP',
},
{
name: 'n_mdeptid_eq',
prop: 'mdeptid',
dataType: 'PICKUP',
},
{
name: 'n_mdeptname_like',
prop: 'mdeptname',
dataType: 'PICKUPTEXT',
},
{
name: 'n_bcode_like',
prop: 'bcode',
dataType: 'TEXT',
},
]
}
......
app_web/src/widgets/ibzemployee/main-grid/main-grid-model.ts
浏览文件 @ a16f612c
......@@ -120,26 +120,11 @@ export default class MainModel {
prop: 'n_personname_like',
dataType: 'TEXT',
},
{
name: 'n_orgid_eq',
prop: 'n_orgid_eq',
dataType: 'PICKUP',
},
{
name: 'n_mdeptid_eq',
prop: 'n_mdeptid_eq',
dataType: 'PICKUP',
},
{
name: 'n_mdeptname_like',
prop: 'n_mdeptname_like',
dataType: 'PICKUPTEXT',
},
{
name: 'n_bcode_like',
prop: 'n_bcode_like',
dataType: 'TEXT',
},
{
name:'size',
......
app_web/src/widgets/ibzorganization/main-form/main-form-base.vue
浏览文件 @ a16f612c
......@@ -3,12 +3,6 @@
<input style="display:none;" />
<row >
<i-col v-show="detailsModel.orgid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='orgid' :itemRules="this.rules.orgid" class='' :caption="$t('entities.ibzorganization.main_form.details.orgid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.orgid" @enter="onEnter($event)" unit="" :disabled="detailsModel.orgid.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.orgcode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='orgcode' :itemRules="this.rules.orgcode" class='' :caption="$t('entities.ibzorganization.main_form.details.orgcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.orgcode" @enter="onEnter($event)" unit="" :disabled="detailsModel.orgcode.disabled" type='text' style=""></input-box>
......
app_web/src/widgets/ibzorganization/main-form/main-form-service.ts
浏览文件 @ a16f612c
......@@ -163,7 +163,6 @@ export default class MainService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{orgid: data.orgid, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
config.xml
浏览文件 @ a16f612c
......@@ -38,11 +38,11 @@
git clone -b master $para2 ibzou/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzou/
mvn clean package -Papi
cd ibzou-provider/ibzou-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml dev --with-registry-auth
mvn clean package -Pweb
cd ibzou-app/ibzou-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-app-web.yaml dev --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
浏览文件 @ a16f612c
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
EXPOSE 8080
EXPOSE 30001
ADD ibzou-app-web.jar /ibzou-app-web.jar
ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
浏览文件 @ a16f612c
......@@ -3,9 +3,11 @@ services:
ibzou-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
ports:
- "8080:8080"
- "30001:30001"
networks:
- agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
deploy:
mode: replicated
replicas: 1
......
ibzou-app/ibzou-app-web/src/main/resources/application-web-dev.yml
浏览文件 @ a16f612c
server:
port: 8080
\ No newline at end of file
port: 30001
\ No newline at end of file
ibzou-app/ibzou-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ a16f612c
server:
port: 8080
port: 30001
#zuul网关路由设置
zuul:
......
ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
浏览文件 @ a16f612c
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
EXPOSE 40001
EXPOSE 8081
ADD ibzou-provider-api.jar /ibzou-provider-api.jar
ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml
浏览文件 @ a16f612c
......@@ -3,11 +3,9 @@ services:
ibzou-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
ports:
- "40001:40001"
- "8081:8081"
networks:
- agent_network
environment:
SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
deploy:
mode: replicated
replicas: 1
......
ibzou-provider/ibzou-provider-api/src/main/resources/application-api-dev.yml
浏览文件 @ a16f612c
server:
port: 40001
\ No newline at end of file
port: 8081
\ No newline at end of file
ibzou-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
浏览文件 @ a16f612c
......@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
@Value("${ibiz.enablePermissionValid:false}")
boolean enablePermissionValid; //是否开启权限校验
@Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
@Value("${ibiz.systemid:110B1A3E-4944-47C8-B4C4-EC15FB8982F3}")
private String systemId;
@Override
......
ibzou-util/src/main/java/cn/ibizlab/util/service/SimpleUserService.java
浏览文件 @ a16f612c
......@@ -22,7 +22,7 @@ public class SimpleUserService implements AuthenticationUserService{
@Value("${ibiz.enablePermissionValid:false}")
boolean enablePermissionValid; //是否开启权限校验
@Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
@Value("${ibiz.systemid:110B1A3E-4944-47C8-B4C4-EC15FB8982F3}")
private String systemid;
@Autowired
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或