Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
leaf-hlcm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hlcm
leaf-hlcm
Commits
c9c78842
Commit
c9c78842
authored
Jun 19, 2023
by
陆正友
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IFRS9报表、收付款预订表、销售收入明细表的查询条件中增加“工程机械”选项
parent
864a54d9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
1 deletion
+17
-1
contract_sales_report.lview
...n/webapp/modules/cont/CON3400/contract_sales_report.lview
+4
-0
contract_ifrs9_report.lview
...n/webapp/modules/cont/CON3500/contract_ifrs9_report.lview
+8
-1
con_contract_cashflow_monthly.lview
...p/modules/cont/CON930/con_contract_cashflow_monthly.lview
+5
-0
No files found.
src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
View file @
c9c78842
...
...
@@ -115,6 +115,9 @@
};
if(record.data.lease_name92=='Y'){//add by gzj
record.data.division=record.data.division+',92';
};
if(record.data.lease_name99=='Y'){//add by gzj
record.data.division=record.data.division+',99';
};
record.data.division=record.data.division.substr(1,record.data.division.length);
$('contract_sales_result_ds').query();
...
...
@@ -208,6 +211,7 @@
<a:checkBox
name=
"lease_name40"
bindTarget=
"contract_sales_report_ds"
prompt=
"其它"
/>
<a:checkBox
name=
"lease_name91"
bindTarget=
"contract_sales_report_ds"
prompt=
"神钢建机"
/>
//addby xsh35973 20221011 I-12357新增产品线
<a:checkBox
name=
"lease_name92"
bindTarget=
"contract_sales_report_ds"
prompt=
"北京卡家"
/>
<a:checkBox
name=
"lease_name99"
bindTarget=
"contract_sales_report_ds"
prompt=
"工程机械"
/>
</a:form>
<a:grid
id=
"contract_sales_result_ds_grid"
bindTarget=
"contract_sales_result_ds"
marginHeight=
"150"
navBar=
"true"
marginWidth=
"40"
>
...
...
src/main/webapp/modules/cont/CON3500/contract_ifrs9_report.lview
View file @
c9c78842
...
...
@@ -35,6 +35,7 @@
record.data.division9='';
record.data.division10='';
record.data.division11='';
record.data.division12='';
if(record.data.lease_name10=='Y'){
record.data.division1='10';
}
...
...
@@ -68,9 +69,12 @@
if(record.data.lease_name92=='Y'){
record.data.division11='92';
};
if(record.data.lease_name99=='Y'){
record.data.divisio12='99';
};
// record.data.division=record.data.division.substr(1,record.data.division.length);
if(record.data.division1 == ''&&record.data.division2 == ''&&record.data.division3 == ''&&record.data.division4 == ''
&&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''&&record.data.division10 == ''&&record.data.division11 == ''){
&&record.data.division5 == ''&&record.data.division6 == ''&&record.data.division7 == ''&&record.data.division8 == ''&&record.data.division9 == ''&&record.data.division10 == ''&&record.data.division11 == ''
&&record.data.division12 == ''
){
// record.data.division1='10,20,30,40,50,60,70,80';
record.data.division1='10';
record.data.division2='20';
...
...
@@ -83,6 +87,8 @@
record.data.division9='90';
record.data.division10='91';
record.data.division11='92';
record.data.division12='99';
};
param['division1']= record.data.division1;
param['division2']= record.data.division2;
...
...
@@ -95,6 +101,7 @@
param['division9']= record.data.division9;
param['division10']= record.data.division10;
param['division11']= record.data.division11;
param['division12']= record.data.division12;
param['period_name']=period_name;
param['function_code'] = 'CON3400N';
param['function_usage'] = 'MODIFY';
...
...
src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview
View file @
c9c78842
...
...
@@ -51,6 +51,9 @@
if(record.data.lease_name92=='Y'){//add by gzj 2022-12-19 10:17:53
record.data.division=record.data.division+',92';
};
if(record.data.lease_name99=='Y'){//add by gzj 2022-12-19 10:17:53
record.data.division=record.data.division+',99';
};
record.data.division=record.data.division.substr(1,record.data.division.length);
Leaf.Masker.mask(Ext.getBody(), '正在统计并查询,请稍等...');
Leaf.request({
...
...
@@ -157,6 +160,7 @@
<a:field
checkedValue=
"Y"
name=
"lease_name80"
uncheckedValue=
"N"
defaultValue=
"N"
/>
<a:field
checkedValue=
"Y"
name=
"lease_name90"
uncheckedValue=
"N"
defaultValue=
"N"
/>
<a:field
checkedValue=
"Y"
name=
"lease_name92"
uncheckedValue=
"N"
defaultValue=
"N"
/>
<a:field
checkedValue=
"Y"
name=
"lease_name99"
uncheckedValue=
"N"
defaultValue=
"N"
/>
<a:field
name=
"division"
/>
<a:field
name=
"overdue_day1"
required=
"true"
prompt=
"已到期1个月界定天数"
defaultValue=
"30"
/>
<a:field
name=
"overdue_day2"
required=
"true"
prompt=
"已到期2个月界定天数"
defaultValue=
"60"
/>
...
...
@@ -206,6 +210,7 @@
<a:checkBox
name=
"lease_name40"
bindTarget=
"con_contract_cashflow_monthly_query_ds"
prompt=
"其它"
/>
<a:checkBox
name=
"lease_name91"
bindTarget=
"con_contract_cashflow_monthly_query_ds"
prompt=
"神钢建机"
/>
//addby xsh35973 20221011 I-12357新增产品线
<a:checkBox
name=
"lease_name92"
bindTarget=
"con_contract_cashflow_monthly_query_ds"
prompt=
"北京卡家"
/>
<a:checkBox
name=
"lease_name99"
bindTarget=
"con_contract_cashflow_monthly_query_ds"
prompt=
"工程机械"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment