Skip to content

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

ibiz4j 发布系统代码

上级 fa7631b8
隐藏空白字符变更
内嵌 并排
正在显示 包含 20 行增加 和 111 行删除
app_web/src/locale/lanres/ibzorganization/ibzorganization_en_US.ts
浏览文件 @ f6ffd920
......@@ -105,11 +105,9 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_orgid_like: "单位标识(%)",
orgcode: "单位代码(文本左包含(%#))",
n_orgname_like: "名称(%)",
n_porgid_eq: "上级单位(=)",
n_orglevel_gtandeq: "单位级别(>=)",
n_orglevel_ltandeq: "单位级别(<=)",
},
uiactions: {
},
......
app_web/src/locale/lanres/ibzorganization/ibzorganization_zh_CN.ts
浏览文件 @ f6ffd920
......@@ -104,11 +104,9 @@ export default {
default_searchform: {
details: {
formpage1: '常规条件',
n_orgid_like: '单位标识(%)',
orgcode: '单位代码(文本左包含(%#))',
n_orgname_like: '名称(%)',
n_porgid_eq: '上级单位(=)',
n_orglevel_gtandeq: '单位级别(>=)',
n_orglevel_ltandeq: '单位级别(<=)',
},
uiactions: {
},
......
app_web/src/widgets/ibzorganization/default-searchform/default-searchform-base.vue
浏览文件 @ f6ffd920
......@@ -4,9 +4,9 @@
<row>
<i-col span="20" class="form-content">
<row>
<i-col v-show="detailsModel.n_orgid_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_orgid_like' :itemRules="this.rules.n_orgid_like" class='' :caption="$t('entities.ibzorganization.default_searchform.details.n_orgid_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_orgid_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_orgid_like" @enter="onEnter($event)" :disabled="detailsModel.n_orgid_like.disabled" type='text' style="width:100px;"></input-box>
<i-col v-show="detailsModel.orgcode.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='orgcode' :itemRules="this.rules.orgcode" class='' :caption="$t('entities.ibzorganization.default_searchform.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)" :disabled="detailsModel.orgcode.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
......@@ -21,18 +21,6 @@
<app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'n_porgid_eq','label':'n_porgid_eq'}" url="/ibzorganizations/alls/suborg/picker" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange"></app-org-select>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_orglevel_gtandeq.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_orglevel_gtandeq' :itemRules="this.rules.n_orglevel_gtandeq" class='' :caption="$t('entities.ibzorganization.default_searchform.details.n_orglevel_gtandeq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_orglevel_gtandeq.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_orglevel_gtandeq" @enter="onEnter($event)" :disabled="detailsModel.n_orglevel_gtandeq.disabled" type='number' style="width:100px;"></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_orglevel_ltandeq.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_orglevel_ltandeq' :itemRules="this.rules.n_orglevel_ltandeq" class='' :caption="$t('entities.ibzorganization.default_searchform.details.n_orglevel_ltandeq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_orglevel_ltandeq.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_orglevel_ltandeq" @enter="onEnter($event)" :disabled="detailsModel.n_orglevel_ltandeq.disabled" type='number' style="width:100px;"></input-box>
</app-form-item>
</i-col>
</row>
</i-col>
......@@ -274,11 +262,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public data: any = {
n_orgid_like: null,
orgcode: null,
n_orgname_like: null,
n_porgid_eq: null,
n_orglevel_gtandeq: null,
n_orglevel_ltandeq: null,
};
/**
......@@ -288,11 +274,11 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public rules: any = {
n_orgid_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' },
orgcode: [
{ 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_orgname_like: [
{ type: 'string', message: '名称(%) 值必须为字符串类型', trigger: 'change' },
......@@ -306,18 +292,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '上级单位(=) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '上级单位(=) 值不能为空', trigger: 'blur' },
],
n_orglevel_gtandeq: [
{ type: 'number', message: '单位级别(>=) 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '单位级别(>=) 值必须为数值类型', trigger: 'blur' },
{ required: false, type: 'number', message: '单位级别(>=) 值不能为空', trigger: 'change' },
{ required: false, type: 'number', message: '单位级别(>=) 值不能为空', trigger: 'blur' },
],
n_orglevel_ltandeq: [
{ type: 'number', message: '单位级别(<=) 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '单位级别(<=) 值必须为数值类型', trigger: 'blur' },
{ required: false, type: 'number', message: '单位级别(<=) 值不能为空', trigger: 'change' },
{ required: false, type: 'number', message: '单位级别(<=) 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -329,28 +303,24 @@ export default class DefaultBase extends Vue implements ControlInterface {
public detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
n_orgid_like: new FormItemModel({ caption: '单位标识(%)', detailType: 'FORMITEM', name: 'n_orgid_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
orgcode: new FormItemModel({ caption: '单位代码(文本左包含(%#))', detailType: 'FORMITEM', name: 'orgcode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_orgname_like: new FormItemModel({ caption: '名称(%)', detailType: 'FORMITEM', name: 'n_orgname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_porgid_eq: new FormItemModel({ caption: '上级单位(=)', detailType: 'FORMITEM', name: 'n_porgid_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_orglevel_gtandeq: new FormItemModel({ caption: '单位级别(>=)', detailType: 'FORMITEM', name: 'n_orglevel_gtandeq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_orglevel_ltandeq: new FormItemModel({ caption: '单位级别(<=)', detailType: 'FORMITEM', name: 'n_orglevel_ltandeq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
/**
* 监控表单属性 n_orgid_like 值
* 监控表单属性 orgcode 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_orgid_like')
onN_orgid_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_orgid_like', newVal: newVal, oldVal: oldVal });
@Watch('data.orgcode')
onOrgcodeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'orgcode', newVal: newVal, oldVal: oldVal });
}
/**
......@@ -377,30 +347,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'n_porgid_eq', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_orglevel_gtandeq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_orglevel_gtandeq')
onN_orglevel_gtandeqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_orglevel_gtandeq', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_orglevel_ltandeq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_orglevel_ltandeq')
onN_orglevel_ltandeqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_orglevel_ltandeq', newVal: newVal, oldVal: oldVal });
}
/**
* 重置表单项值
......@@ -425,8 +371,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
}
/**
......
app_web/src/widgets/ibzorganization/default-searchform/default-searchform-model.ts
浏览文件 @ f6ffd920
......@@ -26,8 +26,8 @@ export default class DefaultModel {
dataType: 'TEXT',
},
{
name: 'n_orgid_like',
prop: 'orgid',
name: 'orgcode',
prop: 'orgcode',
dataType: 'TEXT',
},
{
......@@ -40,21 +40,6 @@ export default class DefaultModel {
prop: 'parentorgid',
dataType: 'PICKUP',
},
{
name: 'n_orglevel_gtandeq',
prop: 'orglevel',
dataType: 'INT',
},
{
name: 'n_orglevel_ltandeq',
prop: 'orglevel',
dataType: 'INT',
},
{
name: 'ibzorganization',
prop: 'orgid',
dataType: 'FONTKEY',
},
]
}
......
app_web/src/widgets/ibzorganization/default-searchform/default-searchform-service.ts
浏览文件 @ f6ffd920
......@@ -165,7 +165,6 @@ export default class DefaultService 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;
......
app_web/src/widgets/ibzorganization/main-grid/main-grid-model.ts
浏览文件 @ f6ffd920
......@@ -96,8 +96,8 @@ export default class MainModel {
prop: 'orgid',
},
{
name: 'n_orgid_like',
prop: 'n_orgid_like',
name: 'orgcode',
prop: 'orgcode',
dataType: 'TEXT',
},
{
......@@ -110,21 +110,6 @@ export default class MainModel {
prop: 'n_porgid_eq',
dataType: 'PICKUP',
},
{
name: 'n_orglevel_gtandeq',
prop: 'n_orglevel_gtandeq',
dataType: 'INT',
},
{
name: 'n_orglevel_ltandeq',
prop: 'n_orglevel_ltandeq',
dataType: 'INT',
},
{
name: 'ibzorganization',
prop: 'orgid',
dataType: 'FONTKEY',
},
{
name:'size',
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或