提交 34313a2e 编写于 作者: KK's avatar KK

表单新建逻辑调整(值规则)

上级 ce32eab8
...@@ -466,11 +466,20 @@ import { Util } from '@/ibiz-core/utils'; ...@@ -466,11 +466,20 @@ import { Util } from '@/ibiz-core/utils';
/** /**
* 校验全部 * 校验全部
*
* @public
* @param {{ filter: string}} { filter}
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/ */
public async validAll() { public async validAll(filter:string = "defult") {
let validateState = true; let validateState = true;
let filterProperty = ""
if(filter === 'new'){
filterProperty= '${appde.getKeyPSAppDEField().getCodeName()?lower_case}'
}
for (let item of Object.keys(this.rules)) { for (let item of Object.keys(this.rules)) {
if(!await this.validItem(item,this.data[item])){ if(!await this.validItem(item,this.data[item]) && item != filterProperty){
validateState = false; validateState = false;
} }
} }
...@@ -1060,13 +1069,15 @@ import { Util } from '@/ibiz-core/utils'; ...@@ -1060,13 +1069,15 @@ import { Util } from '@/ibiz-core/utils';
protected async save(opt: any = {}, showResultInfo?: boolean, isStateNext: boolean = true): Promise<any> { protected async save(opt: any = {}, showResultInfo?: boolean, isStateNext: boolean = true): Promise<any> {
showResultInfo = showResultInfo === undefined ? true : false; showResultInfo = showResultInfo === undefined ? true : false;
opt.saveEmit = opt.saveEmit === undefined ? true : false; opt.saveEmit = opt.saveEmit === undefined ? true : false;
if (!await this.validAll()) {
this.$notice.error('值规则校验异常');
return Promise.reject();
}
const arg: any = { ...opt }; const arg: any = { ...opt };
const data = this.getValues(); const data = this.getValues();
Object.assign(arg, data); Object.assign(arg, data);
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if (this.data.srfuf =='1'? !await this.validAll():!await this.validAll('new')) {
this.$notice.error('值规则校验异常');
return Promise.reject();
}
if (isStateNext) { if (isStateNext) {
<#assign drcounter = 0> <#assign drcounter = 0>
<#list ctrl.getAllPSDEFormDetails() as formdetail> <#list ctrl.getAllPSDEFormDetails() as formdetail>
...@@ -1081,7 +1092,7 @@ import { Util } from '@/ibiz-core/utils'; ...@@ -1081,7 +1092,7 @@ import { Util } from '@/ibiz-core/utils';
return Promise.reject(); return Promise.reject();
} }
} }
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if (!action) { if (!action) {
let actionName: any = Object.is(data.srfuf, '1') ? "updateAction" : "createAction"; let actionName: any = Object.is(data.srfuf, '1') ? "updateAction" : "createAction";
this.$notice.error(this.viewName+this.$t('app.view')+this.$t('app.ctrl.form')+actionName+ this.$t('app.notConfig')); this.$notice.error(this.viewName+this.$t('app.view')+this.$t('app.ctrl.form')+actionName+ this.$t('app.notConfig'));
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册