提交 016455fa 编写于 作者: WodahsOrez's avatar WodahsOrez

lxm--日历搜索表单,快速分组,快速搜索--fix3

上级 364a4fe7
......@@ -58,22 +58,23 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
* @memberof ${srfclassname('${view.name}')}
*/
public onBeforeLoad(arg: any){
if (this.viewparams && Object.keys(thisparams).length > 0) {
Object.assign(arg, this.viewparams);
let _this:any = this;
if (_this.viewparams && Object.keys(_this.viewparams).length > 0) {
Object.assign(arg, _this.viewparams);
}
if (this.getSearchForm() && this.isExpandSearchForm) {
Object.assign(arg, this.getSearchForm().getData());
if (_this.$refs.searchform && _this.isExpandSearchForm) {
Object.assign(arg, _this.$refs.searchform.getData());
}
if (this && !this.isExpandSearchForm) {
Object.assign(arg, { query: this.query });
if (_this && !_this.isExpandSearchForm) {
Object.assign(arg, { query: _this.query });
}
// 快速分组和快速搜索栏
let otherQueryParam:any = {};
if(this && this.qucikGroupData){
Object.assign(otherQueryParam,this.qucikGroupData);
if(_this && (_this.qucikGroupData as any)){
Object.assign(otherQueryParam,_this.qucikGroupData);
}
if(this && this.qucikFormData){
Object.assign(otherQueryParam,this.qucikFormData);
if(_this && _this.qucikFormData){
Object.assign(otherQueryParam,_this.qucikFormData);
}
Object.assign(arg,{viewparams:otherQueryParam});
}
......
......@@ -88,22 +88,23 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
* @memberof ${srfclassname('${view.name}')}
*/
public onBeforeLoad(arg: any){
if (this.viewparams && Object.keys(thisparams).length > 0) {
Object.assign(arg, this.viewparams);
let _this:any = this;
if (_this.viewparams && Object.keys(_this.viewparams).length > 0) {
Object.assign(arg, _this.viewparams);
}
if (this.getSearchForm() && this.isExpandSearchForm) {
Object.assign(arg, this.getSearchForm().getData());
if (_this.$refs.searchform && _this.isExpandSearchForm) {
Object.assign(arg, _this.$refs.searchform.getData());
}
if (this && !this.isExpandSearchForm) {
Object.assign(arg, { query: this.query });
if (_this && !_this.isExpandSearchForm) {
Object.assign(arg, { query: _this.query });
}
// 快速分组和快速搜索栏
let otherQueryParam:any = {};
if(this && this.qucikGroupData){
Object.assign(otherQueryParam,this.qucikGroupData);
if(_this && (_this.qucikGroupData as any)){
Object.assign(otherQueryParam,_this.qucikGroupData);
}
if(this && this.qucikFormData){
Object.assign(otherQueryParam,this.qucikFormData);
if(_this && _this.qucikFormData){
Object.assign(otherQueryParam,_this.qucikFormData);
}
Object.assign(arg,{viewparams:otherQueryParam});
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册