Skip to content

L
leaf-hlcm
Commit 61f10f1a authored by stone's avatar stone
Browse files
Options

Merge branch 'feature/report_dev' into develop 

# Conflicts:
#	src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
parents 45c3f50c b6574e20
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 57 deletions
src/main/webapp/WEB-INF/classes/prj/PRJ501N/con_contract_bp.lwm
View file @ 61f10f1a
......@@ -12,6 +12,7 @@
select *
from con_contract_bp_lv p
where p.contract_id=${@contract_id}
and p.bp_category='TENANT'
]]></bm:query-sql>
</bm:operation>
</bm:operations>
......
src/main/webapp/WEB-INF/classes/prj/PRJ501N/prj_project_bp.lwm
View file @ 61f10f1a
......@@ -12,6 +12,7 @@
select *
from prj_project_bp_lv p
where p.project_id=${@project_id}
and p.bp_category='TENANT'
]]></bm:query-sql>
</bm:operation>
</bm:operations>
......
src/main/webapp/WEB-INF/classes/prj/PRJ501N/prj_project_history_display.lwm
View file @ 61f10f1a
......@@ -5,26 +5,14 @@
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select tt.* from ( SELECT t1.project_number,
t1.contract_number,
t1.bp_code,
t1.bp_name,
t1.overdue_max_days,
t1.overdue_max_amount,
t1.bp_type,
t1.bp_class,
t1.bp_id,
t1.description,
t1.project_id,
t1.contract_id,
t1.bp_category
FROM prj_project_history_lv t1
WHERE t1.bp_id = ${@bp_id}
and t1.project_id <> ${@project_id}) tt
select * from(
select *
FROM con_contract_history_lv t1
WHERE t1.bp_id = ${@bp_id} )tt
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/server-script/layoutconfig/csh_write_off_query_f_write_off_list_queryfields.js 0 → 100644
View file @ 61f10f1a
var override_queryfields = [
{
name:'transaction_date_from',
queryexpression:"to_char(t1.transaction_date,'yyyy-mm-dd') >= ${@transaction_date_from}"
},
{
name:'transaction_date_to',
queryexpression:"to_char(t1.transaction_date,'yyyy-mm-dd') <= ${@transaction_date_to}"
},
{
name: 'journal_date_from',
queryexpression:"to_char(t1.write_off_date,'yyyy-mm-dd') >= ${@journal_date_from}"
},
{
name: 'journal_date_to',
queryexpression:"to_char(t1.write_off_date,'yyyy-mm-dd') <= ${@journal_date_to}"
}
];
override();
\ No newline at end of file
src/main/webapp/modules/acr/ACR513/acr_invoice_confirm.lview
View file @ 61f10f1a
......@@ -258,6 +258,8 @@
<a:dataSet id="acr513_billing_way_ds" lookupCode="DS_INVOICE_CATEGORY"/>
<a:dataSet id="acr513_invoice_query_ds" autoCreate="true">
<a:fields>
<a:field name="invoice_status_desc" displayField="code_value_name" options="acr513_invoice_statu_ds"
returnField="invoice_status" valueField="code_value"/>
<a:field name="currency_name" displayField="currency_name" options="acr513_currency_ds"
returnField="currency" valueField="currency_code"/>
<a:field name="invoice_kind_desc" displayField="code_value_name" options="acr513_invoice_kind_ds"
......@@ -370,6 +372,7 @@
prompt="HLS.DOCUMENT_NUMBER_FROM" width="135"/>
<a:textField name="document_number_t" bindTarget="acr513_invoice_query_ds" prompt="单据号到" width="135"/>
<a:textField name="bp_agent_name" bindTarget="acr513_invoice_query_ds" prompt="代理商" width="135"/>
<a:comboBox name="invoice_status_desc" bindTarget="acr513_invoice_query_ds" prompt="发票状态" width="135"/>
</a:form>
<a:grid id="acr513_invoice_grid_id" bindTarget="acr513_invoice_result_ds" marginHeight="225"
marginWidth="30" navBar="true">
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ 61f10f1a
......@@ -476,6 +476,7 @@
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var prj_project_history_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');;
//选择承租人带出开票信息
if(prj_project_ds_id==ds.id &&prj_project_ds_id){
if(name=="bp_id_tenant" && value){
......@@ -510,7 +511,14 @@
},
scope: this
});
//根据承租人查找该承租人的历史合同信息
$(prj_project_history_ds_id).setQueryUrl('${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query');
$(prj_project_history_ds_id).setQueryParameter("bp_id",value);
$(prj_project_history_ds_id).query();
}
}
if(name=='pay_method'){
if ( record.get('pay_method') == 'WIRE_TRANSFER') {
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 61f10f1a
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wangwei5743
$Date: 2014-10-8 下午3:16:19
......@@ -11,12 +11,14 @@
<a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" model="prj.PRJ500D.sys_user_lv"
rootPath="user_name_path"/>
<s:server-script import="contract_print_path.js"><![CDATA[
$ctx.parameter.file_path = con_print_path['con_print_path'];
$ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
]]>
$ctx.parameter.file_path = con_print_path['con_print_path'];
$ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
]]>
</s:server-script>
</a:init-procedure>
<a:view>
<a:link id="hls_bp_master_billing_link" model="prj.PRJ500N.hls_bp_master_billing" modelaction="query"/>
<a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}get_special_fields_link_id"
model="cont.CON500.con_contract_get_special_fields" modelaction="update"/>
<a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id"
......@@ -385,26 +387,26 @@
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
} else if (name == 'attach_file_name') {
/* if (value != null) {
var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
var str = value.split(';;');
var url = '';
for (var i = 0; i < str.length; i++) {
//
var temp = str[i].split('--');
if (!Leaf.isEmpty(temp[0])) {
var file_name = temp[0].toUpperCase();
var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
if (file_name.indexOf('.PDF') >= 0) {
url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
} else if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
} else {
url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
}
}
}
return url;
/* if (value != null) {
var link = '${/request/@context_path}/atm_download.lsc?attachment_id=';
var str = value.split(';;');
var url = '';
for (var i = 0; i < str.length; i++) {
//
var temp = str[i].split('--');
if (!Leaf.isEmpty(temp[0])) {
var file_name = temp[0].toUpperCase();
var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
if (file_name.indexOf('.PDF') >= 0) {
url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
} else if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
} else {
url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
}
}
}
return url;
}*/
if (value != null) {
......@@ -529,28 +531,30 @@
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var prj_project_history_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
//选择承租人带出开票信息
if (prj_project_ds_id == ds.id && prj_project_ds_id) {
if (name == "bp_id_tenant" && value) {
if(prj_project_ds_id==ds.id &&prj_project_ds_id){
if(name=="bp_id_tenant" && value){
Leaf.Masker.mask(Ext.getBody());
Leaf.request({
url: $('hls_bp_master_billing_link').getUrl(),
para: {
bp_id: value
bp_id:value
},
success: function (res) {
var billing_into = res.result.record;
success: function(res) {
var billing_into=res.result.record;
var prj_project_bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_bp');
$(prj_project_bp_ds_id).getAt(0).set('taxpayer_type_n', billing_into.taxpayer_type_n);
$(prj_project_bp_ds_id).getAt(0).set('taxpayer_type', billing_into.taxpayer_type);
$(prj_project_bp_ds_id).getAt(0).set('invoice_title', billing_into.invoice_title);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_address', billing_into.invoice_bp_address);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_phone_num', billing_into.invoice_bp_phone_num);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_bank', billing_into.invoice_bp_bank);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_bank_account', billing_into.invoice_bp_bank_account);
$(prj_project_bp_ds_id).getAt(0).set('tax_registry_num', billing_into.tax_registry_num);
$(prj_project_bp_ds_id).getAt(0).set('ref_v07', billing_into.ref_v07);
$(prj_project_bp_ds_id).getAt(0).set('taxpayer_type_n',billing_into.taxpayer_type_n);
$(prj_project_bp_ds_id).getAt(0).set('taxpayer_type',billing_into.taxpayer_type);
$(prj_project_bp_ds_id).getAt(0).set('invoice_title',billing_into.invoice_title);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_address',billing_into.invoice_bp_address);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_phone_num',billing_into.invoice_bp_phone_num);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_bank',billing_into.invoice_bp_bank);
$(prj_project_bp_ds_id).getAt(0).set('invoice_bp_bank_account',billing_into.invoice_bp_bank_account);
$(prj_project_bp_ds_id).getAt(0).set('tax_registry_num',billing_into.tax_registry_num);
$(prj_project_bp_ds_id).getAt(0).set('ref_v07',billing_into.ref_v07);
//record.set();
Leaf.Masker.unmask(Ext.getBody());
......@@ -563,6 +567,10 @@
},
scope: this
});
//根据承租人查找该承租人的历史合同信息
$(prj_project_history_ds_id).setQueryUrl('${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query');
$(prj_project_history_ds_id).setQueryParameter("bp_id",value);
$(prj_project_history_ds_id).query();
}
}
if (name == 'pay_method') {
......@@ -578,8 +586,8 @@
} else {
record.getField('bank_account_id').setReadOnly(false);
record.getField('bank_account_id_n').setReadOnly(false);
record.getField('bank_account_id').setRequired(true);
record.getField('bank_account_id_n').setRequired(true);
record.getField('bank_account_id').setRequired(false);
record.getField('bank_account_id_n').setRequired(false);
}
}
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 61f10f1a
......@@ -599,6 +599,19 @@ function prj501n_contract_number_renderer(id, name, query_only){
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
//选择承租人带出开票信息
var prj_project_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var prj_project_history_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');;
if(prj_project_ds_id==ds.id &&prj_project_ds_id){
if(name=="bp_id_tenant" && value){
//根据承租人查找该承租人的历史合同信息
$(prj_project_history_ds_id).setQueryUrl('${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query');
$(prj_project_history_ds_id).setQueryParameter("bp_id",value);
$(prj_project_history_ds_id).query();
}
}
if(name=='pay_method'){
if ( record.get('pay_method') == 'WIRE_TRANSFER') {
record.set('bank_account_id',null);
......
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