Skip to content

L
leaf-hlcm
Commit 396ee544 authored by gzj34291's avatar gzj34291
Browse files
Options

更新租赁物查询条件

parent a009aba2
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 5 deletions
src/main/webapp/WEB-INF/classes/basic/sys_code_value_v_lease.lwm
View file @ 396ee544
......@@ -37,14 +37,14 @@
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
and PARENT_UNIT_ID <> 1544
AND v.code_value IN ('10', '20', '30', '40','50','70','80'))
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90'))
UNION ALL
SELECT v.code_value AS value_code, v.code_value_name AS value_name
FROM sys_code_values_v v
WHERE v.code_enabled_flag = 'Y'
AND v.code_value_enabled_flag = 'Y'
AND v.code = 'DIVISION'
AND v.code_value IN ('10', '20', '30', '40','50','70','80')
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90')
AND NOT EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
......
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ 396ee544
......@@ -54,7 +54,8 @@
}
function contractDs_grid_add() {
$('contractDs_grid').showEditorByRecord($('ar510n_cashflow_ds').create());
$('contractDs_grid').showEditorByRecord($('ar510n_cashflow_ds')
.create());
}
function invoiceHd_close() {
......@@ -294,6 +295,8 @@
<a:record code_value="30" code_value_name="高空作业车"/>
<a:record code_value="40" code_value_name="其它"/>
<a:record code_value="50" code_value_name="星邦高空作业车"/>
<a:record code_value="90" code_value_name="租赁二手机"/>
</a:datas>
</a:dataSet>
<a:dataSet id="acr510n_invoice_method_ds">
......@@ -600,7 +603,8 @@
<!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>-->
<a:column name="contract_number" prompt="合同编号" align="center" width="100"/>
<a:column name="contract_status_desc" prompt="合同状态" align="center" width="80"/>
<a:column name="billing_method_desc" prompt="开票规则" width="155"/>
<a:column name="billing_method_desc" prompt="开票规则"
width="155"/>
<a:column name="billing_object_name" autoAdjust="false"
editor="contractDs_grid_editor_lov" prompt="开票对象名称"
renderer="render_contractDs_grid" showTitle="true" width="200"/>
......
src/main/webapp/modules/cont/CON3400/contract_sales_report.lview
View file @ 396ee544
......@@ -104,6 +104,12 @@
if(record.data.lease_name70=='Y'){
record.data.division=record.data.division+',70';
};
if(record.data.lease_name80=='Y'){
record.data.division=record.data.division+',80';
};
if(record.data.lease_name90=='Y'){
record.data.division=record.data.division+',90';
};
record.data.division=record.data.division.substr(1,record.data.division.length);
$('contract_sales_result_ds').query();
$('contract_sales_agent_result_ds').query();
......@@ -191,7 +197,10 @@
<a:checkBox name="lease_name50" bindTarget="contract_sales_report_ds" prompt="星邦高空作业车"/>
<a:checkBox name="lease_name60" bindTarget="contract_sales_report_ds" prompt="新业务"/>
<a:checkBox name="lease_name70" bindTarget="contract_sales_report_ds" prompt="铁甲业务"/>
<a:checkBox name="lease_name80" bindTarget="contract_sales_report_ds" prompt="叉车"/>
<a:checkBox name="lease_name90" bindTarget="contract_sales_report_ds" prompt="租赁二手机"/>
<a:checkBox name="lease_name40" 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 @ 396ee544
......@@ -21,7 +21,68 @@
'con_contract'
);
var param={};
var period_name=$(ds_id).getAt(0).get('period_name');
var record = $(ds_id).getAt(0);
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='';
if(record.data.lease_name10=='Y'){
record.data.division1='10';
}
if(record.data.lease_name20=='Y'){
record.data.division2='20';
}
if(record.data.lease_name30=='Y'){
record.data.division3='30';
}
if(record.data.lease_name40=='Y'){
record.data.division4='40';
}
if(record.data.lease_name50=='Y'){
record.data.division5='50';
}
if(record.data.lease_name60=='Y'){
record.data.division6='60';
}
if(record.data.lease_name70=='Y'){
record.data.division7='70';
};
if(record.data.lease_name80=='Y'){
record.data.division8='80';
};
if(record.data.lease_name90=='Y'){
record.data.division9='90';
};
// 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.division1='10,20,30,40,50,60,70,80';
record.data.division1='10';
record.data.division2='20';
record.data.division3='30';
record.data.division4='40';
record.data.division5='50';
record.data.division6='60';
record.data.division7='70';
record.data.division8='80';
record.data.division9='90';
};
param['division1']= record.data.division1;
param['division2']= record.data.division2;
param['division3']= record.data.division3;
param['division4']= record.data.division4;
param['division5']= record.data.division5;
param['division6']= record.data.division6;
param['division7']= record.data.division7;
param['division8']= record.data.division8;
param['division9']= record.data.division9;
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 @ 396ee544
......@@ -36,6 +36,12 @@
if(record.data.lease_name70=='Y'){
record.data.division=record.data.division+',70';
};
if(record.data.lease_name80=='Y'){
record.data.division=record.data.division+',80';
};
if(record.data.lease_name90=='Y'){
record.data.division=record.data.division+',90';
};
record.data.division=record.data.division.substr(1,record.data.division.length);
Leaf.Masker.mask(Ext.getBody(), '正在统计并查询，请稍等...');
Leaf.request({
......@@ -115,6 +121,8 @@
<a:field checkedValue="Y" name="lease_name50" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name60" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name70" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name80" uncheckedValue="N" defaultValue="N"/>
<a:field checkedValue="Y" name="lease_name90" 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"/>
......@@ -158,13 +166,14 @@
<a:checkBox name="lease_name60" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务"/>
<a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="铁甲业务"/>
<a:checkBox name="lease_name80" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="叉车"/>
<a:checkBox name="lease_name90" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="租赁二手机"/>
<a:checkBox name="lease_name40" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="其它"/>
<!-- <a:lov name="bp_id_agent_level1_n" bindTarget="con_contract_cashflow_monthly_query_ds"/>-->
<!-- <a:numberField name="overdue_day1" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
<!-- <a:numberField name="overdue_day2" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment