Skip to content

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

【fix】发票认领功能修改，销项发票创建

parent 69d9fb77
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 24 deletions
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_billing_object_lov.lwm
View file @ ed5a31b3
......@@ -25,19 +25,22 @@
<bm:operation name="query">
<bm:query-sql><![CDATA[
select v.contract_id,
v.bp_id,
v.bp_class,
v.bp_code,
v.bp_name,
v.bp_category,
v.bp_category_desc,
v.invoice_title,
v.invoice_bp_address_phone_num,
v.invoice_bp_bank_account,
v.taxpayer_type,
v.taxpayer_type_desc,
v.tax_registry_num
from acr_invoice_billing_object_v v
v.bp_id,
v.bp_class,
v.bp_code,
v.bp_name,
v.bp_category,
v.bp_category_desc,
DECODE(bp_class,
'NP',
v.bp_name,
v.invoice_title) invoice_title,
v.invoice_bp_address_phone_num,
v.invoice_bp_bank_account,
v.taxpayer_type,
v.taxpayer_type_desc,
v.tax_registry_num
from acr_invoice_billing_object_v v
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/acr/ACR604/acr_invoice_claim_application_new.lwm
View file @ ed5a31b3
......@@ -159,6 +159,7 @@
<bm:query-field name="contract_name" queryExpression="t1.contract_name like ${@contract_name}"/>
<bm:query-field name="invoice_title" queryExpression="t1.invoice_title like ${@invoice_title}"/>
<bm:query-field name="invoice_code" queryExpression="t1.invoice_code like ${@invoice_code}"/>
<bm:query-field name="vat_invoice_code" queryExpression="t1.vat_invoice_code like ${@vat_invoice_code}"/>
<bm:query-field name="invoice_number" queryExpression="t1.invoice_number like ${@invoice_number}"/>
<bm:query-field name="query_contract_number" queryExpression="exists (select 1 from hls_document_flow_all_v df, con_contract cc where df.contract_id = cc.contract_id and df.ar_invoice_hd_id = t1.invoice_hd_id and cc.contract_number between nvl(${@contract_number_f}, cc.contract_number) and nvl(${@contract_number_t}, cc.contract_number))"/>
......
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ ed5a31b3
......@@ -385,11 +385,11 @@
<a:column name="contract_status_desc" prompt="合同状态" width="80"/>
<a:column name="billing_method_desc" prompt="开票规则" width="80"/>
<a:column name="billing_object_name" autoAdjust="false" editor="contractDs_grid_editor_lov" prompt="开票对象名称" renderer="render_contractDs_grid" showTitle="true" width="200"/>
<a:column name="invoice_title" autoAdjust="false" editor="contractDs_grid_editor_tf" prompt="发票抬头" showTitle="true" width="200"/>
<a:column name="invoice_title" autoAdjust="false" prompt="发票抬头" showTitle="true" width="200"/>
<a:column name="object_tax_registry_num" prompt="纳税人识别号" width="150"/>
<a:column name="inv_object_taxpayer_type_desc" prompt="纳税人类型" width="150"/>
<a:column name="invoice_bp_address_phone_num" autoAdjust="false" editor="contractDs_grid_editor_tf" prompt="开票地址电话" showTitle="true" width="200"/>
<a:column name="invoice_bp_bank_account" autoAdjust="false" editor="contractDs_grid_editor_tf" prompt="开户行及账号" showTitle="true" width="150"/>
<a:column name="invoice_bp_address_phone_num" autoAdjust="false" prompt="开票地址电话" showTitle="true" width="200"/>
<a:column name="invoice_bp_bank_account" autoAdjust="false" prompt="开户行及账号" showTitle="true" width="150"/>
<a:column name="description" autoAdjust="false" prompt="备注" showTitle="true" width="200"/>
</a:columns>
<a:editors>
......
src/main/webapp/modules/acr/ACR516/acr_invoice_claim_application.lview
View file @ ed5a31b3
......@@ -4,7 +4,28 @@
</a:init-procedure>
<a:view>
<script type="text/javascript"><![CDATA[
<a:link id="con_contract_modify_link" url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[
function document_number_render(value,record,name)
{
if (name == 'document_number' && value) {
return '<a href="javascript:open_document_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
}
return value;
}
function open_document_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
param['function_code'] = 'ACR513';
param['function_usage'] = 'QUERY';
param['maintain_type'] = 'UPDATE';
param['url_title'] = '${l:ACR.INVOICE_DETAIL}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_modify_link', ds_id);
}
//发票超练级
function acr516_invoice_query() {
$('acr516_invoice_result_ds').query();
}
......@@ -75,14 +96,14 @@
<a:numberField name="total_amount_t" allowFormat="true" bindTarget="acr516_invoice_query_ds" prompt="开票金额含税额到" width="135"/>
<a:textField name="invoice_title" bindTarget="acr516_invoice_query_ds" prompt="发票抬头" width="135"/>
<a:comboBox name="invoice_kind_desc" bindTarget="acr516_invoice_query_ds" prompt="ACR.INVOICE_KIND" width="135"/>
<a:comboBox name="invoice_status_desc" bindTarget="acr516_invoice_query_ds" prompt="发票状态" width="135"/>
<a:textField name="invoice_code" bindTarget="acr516_invoice_query_ds" prompt="发票代码" width="135"/>
<!-- <a:comboBox name="invoice_status_desc" bindTarget="acr516_invoice_query_ds" prompt="发票状态" width="135"/>-->
<a:textField name="vat_invoice_code" bindTarget="acr516_invoice_query_ds" prompt="发票代码" width="135"/>
<a:textField name="invoice_number" bindTarget="acr516_invoice_query_ds" prompt="发票号码" width="135"/>
<a:comboBox name="claim_status_n" bindTarget="acr516_invoice_query_ds" prompt="认领状态" width="135"/>
</a:form>
<a:grid id="acr516_invoice_grid_id" bindTarget="acr516_invoice_result_ds" marginHeight="225" marginWidth="30" navBar="true">
<a:columns>
<a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER" width="120"/>
<a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER" width="120" renderer="document_number_render"/>
<a:column name="contract_number" autoAdjust="false" prompt="HLS.CONTRACT_NUMBER" showTitle="true" width="150"/>
<a:column name="contract_name" width="150" prompt="合同名称"/>
<a:column name="bp_agent_name" prompt="代理商" width="100"/>
......
src/main/webapp/modules/acr/ACR517/acr_invoice_claim_confirm.lview
View file @ ed5a31b3
......@@ -7,8 +7,28 @@
<a:link id="bmLink_acr_invoice_return" model="acr.ACR605.acr_invoice_claim_return" modelaction="update"/>
<a:link id="bmLink_acr_invoice_claim_confirm" model="acr.ACR605.acr_invoice_claim_confirm" modelaction="update"/>
<a:link id="acr_invoice_refuse_link_id" model="acr.ACR605.acr_invoice_claim_return" modelaction="batch_update"/>
<a:link id="con_contract_modify_link" url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[
function document_number_render(value,record,name)
{
if (name == 'document_number' && value) {
return '<a href="javascript:open_document_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
}
return value;
}
function open_document_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
param['function_code'] = 'ACR513';
param['function_usage'] = 'QUERY';
param['maintain_type'] = 'UPDATE';
param['url_title'] = '${l:ACR.INVOICE_DETAIL}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'con_contract_modify_link', ds_id);
}
function acr517_invoice_query() {
$('acr517_invoice_result_ds').query();
}
......@@ -106,7 +126,7 @@
<a:map from="cf_item_desc" to="cf_item_desc"/>
</a:mapping>
</a:field>
<a:field name="claim_status" displayField="code_value_name" options="acr517_claim_status_ds"
<a:field name="claim_status_n" displayField="code_value_name" options="acr517_claim_status_ds"
returnField="claim_status" valueField="code_value"/>
</a:fields>
</a:dataSet>
......@@ -137,11 +157,11 @@
<a:comboBox name="invoice_status_desc" bindTarget="acr517_invoice_query_ds" prompt="发票状态" width="135"/>
<a:textField name="invoice_code" bindTarget="acr517_invoice_query_ds" prompt="发票代码" width="135"/>
<a:textField name="invoice_number" bindTarget="acr517_invoice_query_ds" prompt="发票号码" width="135"/>
<a:comboBox name="claim_status" bindTarget="acr517_invoice_query_ds" prompt="认领状态" width="135"/>
<a:comboBox name="claim_status_n" bindTarget="acr517_invoice_query_ds" prompt="认领状态" width="135"/>
</a:form>
<a:grid id="acr516_invoice_grid_id" bindTarget="acr517_invoice_result_ds" marginHeight="225" marginWidth="30" navBar="true">
<a:columns>
<a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER" width="120"/>
<a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER" width="120" renderer="document_number_render"/>
<a:column name="contract_number" autoAdjust="false" prompt="HLS.CONTRACT_NUMBER" showTitle="true" width="150"/>
<a:column name="contract_name" width="150" prompt="合同名称"/>
<a:column name="bp_agent_name" prompt="代理商" width="100"/>
......
src/main/webapp/modules/cont/CON311/con_re_print_entrance.lview
View file @ ed5a31b3
......@@ -34,11 +34,12 @@
document.getElementById("CONTRACT_PRINT_ENTRANCE_F_QUERY_NULL_BP_ID_AGENT_LEVEL1").style.display = "";
} else {
$('CONTRACT_PRINT_ENTRANCE_user_button2').hide();
// document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM_prompt").style.display = "none";
// document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM").style.display = "none";
document.getElementById("CONTRACT_PRINT_ENTRANCE_F_QUERY_NULL_BP_ID_AGENT_LEVEL1_prompt").style.display = "none";
document.getElementById("CONTRACT_PRINT_ENTRANCE_F_QUERY_NULL_BP_ID_AGENT_LEVEL1").style.display = "none";
$('CONTRACT_PRINT_ENTRANCE_user_button2').hide();
}
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify_entrance.lview
View file @ ed5a31b3
......@@ -8,6 +8,7 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
trace="true">
<a:init-procedure>
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
<a:model-query fetchAll="true" model="basic.hls_sys_time_default_value" rootPath="default_value"/>
</a:init-procedure>
<a:view>
......@@ -256,7 +257,16 @@
});
});
Leaf.onReady(function() {
if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") {
} else {
$('BP_MODIFY_ENTRANCE_G_BP_RESULT_hls_bp_master_layout_grid_id').hideColumn('SBO_BP_MESSAGE');
var elements=document.querySelector('td[title="SBO反馈信息"]');
elements.remove();
}
});
/* Leaf.onReady(function(){
for (var i=0;i<elements.length;i++){
......
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