Skip to content

L
leaf-hlcm
Commit 026e1e52 authored by niminmin's avatar niminmin
Browse files
Options

Merge branch 'feature/收款核销修改罚息' into develop

parents 4530c395 3b56e5d4
Show whitespace changes
Inline Side-by-side
Showing with 5042 additions and 280 deletions
src/main/database/Package/acr_invoice_pkg.pck 0 → 100644
View file @ 026e1e52
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_cf_v_new.lwm
View file @ 026e1e52
...@@ -94,12 +94,12 @@ ...@@ -94,12 +94,12 @@
'250', '250',
t1.inv_object_taxpayer_type, t1.inv_object_taxpayer_type,
t1.object_taxpayer_type) = 'SMALL_SCALE_TAXPAYER' and t1.object_taxpayer_type) = 'SMALL_SCALE_TAXPAYER' and
to_char(t2.due_date,'yyyy-mm') <= to_char(SYSDATE,'yyyy-mm')) or t2.write_off_flag = 'FULL') to_char(t2.due_date,'yyyy-mm') <= to_char(SYSDATE,'yyyy-mm')) or (t2.write_off_flag = 'FULL' and t1.contract_status not in('REPURING','REPUR')) or(nvl(t2.write_off_flag,'NOT')='FULL' and t1.contract_status in('REPURING','REPUR') and t2.cf_item<>1) or (nvl(t2.write_off_flag,'NOT')='PARTIAL' and t1.contract_status in('REPURING','REPUR') and t2.cf_item=1 ) )
AND cf_item<> 9 AND cf_item<> 9
AND cf_status='RELEASE' AND ((t2.cf_status='RELEASE' and t1.contract_status not in('REPURING','REPUR') and t2.cf_direction='INFLOW') or(t1.contract_status in ('REPURING','REPUR') and t2.cf_item=250 and t2.cf_status='RELEASE' )or ( t2.cf_status in('BLOCK') and nvl(t2.write_off_flag,'NOT')='PARTIAL' and nvl(t2.billing_status,'NOT') != 'FULL' and t1.contract_status in ('REPURING','REPUR') and t2.cf_item =1 and t2.cf_direction='NONCASH' and nvl(t2.billing_amount,0) <> t2.received_amount))
and t2.cashflow_id not in (20265,34267,24445) and t2.cashflow_id not in (20265,34267,24445)
and nvl(t2.billing_status,'NOT') != 'FULL' and nvl(t2.billing_status,'NOT') != 'FULL'
and t2.cf_direction='INFLOW' --and t2.cf_direction='INFLOW'
and ((decode(t2.cf_item, and ((decode(t2.cf_item,
'250', '250',
t1.inv_object_taxpayer_type, t1.inv_object_taxpayer_type,
...@@ -165,7 +165,9 @@ ...@@ -165,7 +165,9 @@
t2.amount_dr received_amount, t2.amount_dr received_amount,
NULL received_principal, NULL received_principal,
NULL received_interest, NULL received_interest,
0 billing_amount, nvl((SELECT SUM(l.total_amount)
FROM acr_invoice_ln l
WHERE l.ref_n04 = t2.journal_line_id),0) billing_amount,
NULL billing_principal, NULL billing_principal,
NULL billing_interest, NULL billing_interest,
NULL vat_due_amount, NULL vat_due_amount,
...@@ -198,7 +200,7 @@ ...@@ -198,7 +200,7 @@
FROM acr_invoice_ln l FROM acr_invoice_ln l
WHERE l.ref_n04 = t2.journal_line_id WHERE l.ref_n04 = t2.journal_line_id
GROUP BY journal_line_id GROUP BY journal_line_id
HAVING SUM(l.total_amount)>0 ) HAVING SUM(l.total_amount)=t2.amount_dr)
) )
)vv )vv
......
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_create.lwm
View file @ 026e1e52
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
<bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE"/> <bm:field name="exchange_rate_type" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE" prompt="HLS.EXCHANGE_RATE_TYPE"/>
<bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/> <bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
<bm:field name="billing_object_name" databaseType="VARCHAR2" datatype="java.lang.String"/> <bm:field name="billing_object_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="contract_status" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="cf_status" databaseType="VARCHAR2" datatype="java.lang.String"/>
</bm:fields> </bm:fields>
<bm:operations> <bm:operations>
...@@ -51,7 +53,12 @@ ...@@ -51,7 +53,12 @@
where m.bp_id =t.bp_id) billing_object_name, where m.bp_id =t.bp_id) billing_object_name,
t.due_amount, t.due_amount,
t.billing_amount, -- t.billing_amount,
(case when cf.cf_item= 1 and cf.cf_status='BLOCK' then
t.received_amount-nvl(t.cf_billing_amount,0)
else
t.due_amount-nvl(t.cf_billing_amount,0)
end )billing_amount,
t.cf_billing_amount, t.cf_billing_amount,
t.received_amount, t.received_amount,
t.contract_id, t.contract_id,
...@@ -82,7 +89,9 @@ ...@@ -82,7 +89,9 @@
(select i.description (select i.description
from hls_cashflow_item i from hls_cashflow_item i
where i.cf_item = t.cf_item) as cf_item_desc, where i.cf_item = t.cf_item) as cf_item_desc,
'融资租赁费' as product_name '融资租赁费' as product_name,
con.contract_status contract_status,
cf.cf_status cf_status
from acr_invoice_create_tmp t, from acr_invoice_create_tmp t,
con_contract_v con, con_contract_v con,
con_contract_cashflow_all_v cf con_contract_cashflow_all_v cf
......
src/main/webapp/WEB-INF/classes/acr/ACR510/acr_invoice_penalty_create.lwm
View file @ 026e1e52
...@@ -52,8 +52,13 @@ ...@@ -52,8 +52,13 @@
t.due_amount, t.due_amount,
--本次开票金额 --本次开票金额
t.due_amount received_amount, t.due_amount received_amount,
t.due_amount billing_amount, t.due_amount-nvl((SELECT SUM(l.total_amount)
0 cf_billing_amount, FROM acr_invoice_ln l
WHERE l.ref_n04 = t.journal_line_id),0) billing_amount,
--0 cf_billing_amount,
nvl((SELECT SUM(l.total_amount)
FROM acr_invoice_ln l
WHERE l.ref_n04 = t.journal_line_id),0) cf_billing_amount,
t.contract_id, t.contract_id,
con.contract_number, con.contract_number,
con.contract_name, con.contract_name,
......
src/main/webapp/WEB-INF/classes/acr/ACR512/alter_acr_invoice_status.lwm
View file @ 026e1e52
...@@ -9,10 +9,19 @@ ...@@ -9,10 +9,19 @@
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations> <bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
acr_invoice_pkg.acr_invoice_status_change(p_invoice_hd=> ${@invoice_hd_ids},
p_want_status=>${@want_status},
p_user_id=>${/session/@user_id} );
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
acr_invoice_pkg.acr_invoice_status_change(p_invoice_hd=>${@invoice_hd_id}, acr_invoice_pkg.acr_invoice_status_reject(p_invoice_hd_id=> ${@invoice_hd_id},
p_want_status=>${@want_status}, p_want_status=>${@want_status},
p_user_id=>${/session/@user_id} ); p_user_id=>${/session/@user_id} );
end; end;
......
src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview
View file @ 026e1e52
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
function createScreen_create() function createScreen_create()
{ {
debugger;
var win = $('acr_invoice_create_invoice'); var win = $('acr_invoice_create_invoice');
var ds=$('headDs'); var ds=$('headDs');
if(!ds.validate(true)) if(!ds.validate(true))
...@@ -57,17 +58,23 @@ ...@@ -57,17 +58,23 @@
var principal=selectedDs[i].get('principal'); var principal=selectedDs[i].get('principal');
var interest=selectedDs[i].get('interest'); var interest=selectedDs[i].get('interest');
var cf_billing_amount=selectedDs[i].get('cf_billing_amount'); var cf_billing_amount=selectedDs[i].get('cf_billing_amount');
var received_amount=selectedDs[i].get('received_amount');
if(billing_amount!=due_amount &&billing_amount!=principal &&billing_amount!=interest){ // if(billing_amount!=due_amount &&billing_amount!=principal &&billing_amount!=interest){
$L.showErrorMessage("提示","本次开票金额需与应收金额，应收本金，应收利息中的某一金额一致！"); // $L.showErrorMessage("提示","本次开票金额需与应收金额，应收本金，应收利息中的某一金额一致！");
return; // return;
} // }
if(billing_amount==cf_billing_amount){ if(billing_amount==cf_billing_amount){
$L.showErrorMessage("提示","该金额已经开票过！"); $L.showErrorMessage("提示","该金额已经开票过！");
return; return;
} }
if(received_amount<plus(cf_billing_amount,billing_amount)&&selectedDs[i].get('cf_item')==1&&selectedDs[i].get('cf_status')=='BLOCK'&&selectedDs[i].get('contract_status')=='REPURING'){
$L.showErrorMessage("提示","本次开票金额+已开票金额不能超过已核销金额！");
return;
}
} }
...@@ -75,10 +82,12 @@ ...@@ -75,10 +82,12 @@
var datas = ds.getJsonData(); var datas = ds.getJsonData();
Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认开票？',function() Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认开票？',function()
{ {
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
Leaf.request({ Leaf.request({
url: $('svcLink_create_invoice').getUrl(), url: $('svcLink_create_invoice').getUrl(),
para: datas, para: datas,
success: function(res) { success: function(res) {
Leaf.Masker.unmask(Ext.getBody());
createScreen_close(); createScreen_close();
contractDs_grid_query(); contractDs_grid_query();
}, },
......
src/main/webapp/modules/acr/ACR510/acr_invoice_penalty_invoice.lview
View file @ 026e1e52
...@@ -49,28 +49,27 @@ ...@@ -49,28 +49,27 @@
Leaf.Masker.unmask(Ext.getBody()); Leaf.Masker.unmask(Ext.getBody());
return; return;
} }
//判断本次开票金额是否为租金，本金，和利息之中某一个 //判断本次开票金额是否大于（已收金额减去已开票金额）
//var selectedDs=$('selectedDs').getAll(); var selectedDs=$('selectedDs').getAll();
// for(var i=0;i<selectedDs.length;i++){ for(var i=0;i<selectedDs.length;i++){
// var billing_amount=selectedDs[i].get('billing_amount'); var billing_amount=selectedDs[i].get('billing_amount');
// var due_amount=selectedDs[i].get('due_amount'); var received_amount=selectedDs[i].get('received_amount');
// var principal=selectedDs[i].get('principal'); var cf_billing_amount=selectedDs[i].get('cf_billing_amount')||0;
// var interest=selectedDs[i].get('interest'); var temp_billing_amount=minus(received_amount,cf_billing_amount);
// var cf_billing_amount=selectedDs[i].get('cf_billing_amount');
//
//
// if(billing_amount!=due_amount &&billing_amount!=principal &&billing_amount!=interest){ // if(billing_amount!=due_amount &&billing_amount!=principal &&billing_amount!=interest){
// $L.showErrorMessage("提示","本次开票金额需与应收金额，应收本金，应收利息中的某一金额一致！"); // $L.showErrorMessage("提示","本次开票金额需与应收金额，应收本金，应收利息中的某一金额一致！");
// return; // return;
// } // }
// if(billing_amount==cf_billing_amount){ if(billing_amount>temp_billing_amount){
// $L.showErrorMessage("提示","该金额已经开票过！"); $L.showErrorMessage("提示","开票金额填写有误！");
// return; return;
// } }
//
//
//
// } }
var datas = ds.getJsonData(); var datas = ds.getJsonData();
Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认开票？',function() Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认开票？',function()
...@@ -134,7 +133,7 @@ ...@@ -134,7 +133,7 @@
<a:dataSet id="selectedDs" autoQuery="true" bindName="line_info" bindTarget="headDs" fetchAll="true" model="acr.ACR510.acr_invoice_penalty_create" selectable="true"> <a:dataSet id="selectedDs" autoQuery="true" bindName="line_info" bindTarget="headDs" fetchAll="true" model="acr.ACR510.acr_invoice_penalty_create" selectable="true">
<a:fields> <a:fields>
<a:field name="billing_amount" readOnly="true"/> <a:field name="billing_amount" required="true"/>
<a:field name="product_name" required="true"/> <a:field name="product_name" required="true"/>
<a:field name="invoice_kind"/> <a:field name="invoice_kind"/>
<a:field name="invoice_kind_desc" displayField="code_value_name" options="invoiceKindDs" required="true" returnField="invoice_kind" valueField="code_value"/> <a:field name="invoice_kind_desc" displayField="code_value_name" options="invoiceKindDs" required="true" returnField="invoice_kind" valueField="code_value"/>
...@@ -172,7 +171,7 @@ ...@@ -172,7 +171,7 @@
<a:column name="currency_desc" align="center"/> <a:column name="currency_desc" align="center"/>
<!-- <a:column name="due_amount" align="right" renderer="Leaf.formatMoney"/>--> <!-- <a:column name="due_amount" align="right" renderer="Leaf.formatMoney"/>-->
<a:column name="received_amount" align="right" renderer="Leaf.formatMoney"/> <a:column name="received_amount" align="right" renderer="Leaf.formatMoney"/>
<!-- <a:column name="cf_billing_amount" align="right" renderer="Leaf.formatMoney"/>--> <a:column name="cf_billing_amount" align="right" renderer="Leaf.formatMoney"/>
<a:column name="billing_amount" align="right" editor="selectedDs_grid_editor_nf" renderer="Leaf.formatMoney" footerRenderer="sum_foot"/> <a:column name="billing_amount" align="right" editor="selectedDs_grid_editor_nf" renderer="Leaf.formatMoney" footerRenderer="sum_foot"/>
</a:columns> </a:columns>
<a:editors> <a:editors>
......
src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview
View file @ 026e1e52
...@@ -8,66 +8,69 @@ ...@@ -8,66 +8,69 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true"> <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true">
<a:init-procedure> <a:init-procedure>
<a:model-query fetchAll="true" model="gld.gld_currency_vl" rootPath="acr512_currency_list"/> <a:model-query fetchAll="true" model="gld.gld_currency_vl" rootPath="acr512_currency_list"/>
<a:model-query fetchAll="true" model="acr.ACR512.acr_invoice_business_type_list" rootPath="acr512_business_type_list"/> <a:model-query fetchAll="true" model="acr.ACR512.acr_invoice_business_type_list"
rootPath="acr512_business_type_list"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="acr512_invoice_status_change" model="acr.ACR512.alter_acr_invoice_status" modelaction="batch_update"/> <a:link id="acr512_invoice_status_change" model="acr.ACR512.alter_acr_invoice_status" modelaction="execute"/>
<a:link id="acr513_invoice_readonly_page" <a:link id="acr513_invoice_readonly_page"
url="${/request/@context_path}/modules/cont/CON500/con_contract_update.lview"/> url="${/request/@context_path}/modules/cont/CON500/con_contract_update.lview"/>
<a:link id="acr512_invoice_update_page" url="${/request/@context_path}/modules/acr/ACR512/acr_invoice_update_detail.lview"/> <a:link id="acr512_invoice_update_page"
url="${/request/@context_path}/modules/acr/ACR512/acr_invoice_update_detail.lview"/>
<!-- <a:link id="acr512_invoice_update_page" url="${/request/@context_path}/modules/cont/CON500/con_contract_update.screen"/> <!-- <a:link id="acr512_invoice_update_page" url="${/request/@context_path}/modules/cont/CON500/con_contract_update.screen"/>
--> -->
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
modelaction="update"/>
<a:link id="acr512_submit_id" model="acr.ACR512.acr_invoice_hd_batch" modelaction="update"/> <a:link id="acr512_submit_id" model="acr.ACR512.acr_invoice_hd_batch" modelaction="update"/>
<a:link id="get_document_number_link" model="acr.ACR512.get_document_number" modelaction="query"/> <a:link id="get_document_number_link" model="acr.ACR512.get_document_number" modelaction="query"/>
<script><![CDATA[ <script><![CDATA[
//提交复核 //提交复核
function acr512_invoice_submit_selected(){ function acr512_invoice_submit_selected() {
var records=$('acr512_invoice_result_ds').getSelected(); debugger;
console.log(records) var records = $('acr512_invoice_result_ds').getSelected();
if (records.length == 0) {
$L.showInfoMessage('提示', '请至少选择一条数据！');
if(records.length==0){ } else {
$L.showInfoMessage('提示','请至少选择一条数据！'); var invoice_hd_ids = '';
return;
}else{
//判断单据的状态 //判断单据的状态
var datas=[]; for (var i = 0; i < records.length; i++) {
for (var i=0;i<records.length;i++){ var invoice_status = records[i].get('invoice_status');
var data={}; if (invoice_status != 'NEW' && invoice_status != 'REJECT') {
var invoice_status=records[i].get('invoice_status'); $L.showErrorMessage("提示", '发票状态有误！');
if(invoice_status!='NEW' &&invoice_status!='REJECT'){
$L.showErrorMessage("提示",'发票状态有误！');
return; return;
} }
data.invoice_hd_id=records[i].get('invoice_hd_id');
data.want_status='CONFIRMING'; if (invoice_hd_ids == '') {
data._status='update'; invoice_hd_ids = records[i].get('invoice_hd_id');
datas.push(data); } else {
invoice_hd_ids = invoice_hd_ids + ',' + records[i].get('invoice_hd_id');
}
} }
console.log(datas) var detail_mask = Ext.getBody();
var detail_mask=Ext.getBody(); Leaf.showConfirm('提示', "确认执行该操作？", function () {
Leaf.showConfirm('提示', "确认执行该操作？", function() {
Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}'); Leaf.Masker.mask(detail_mask, '${l:HLS.EXECUTING}');
Leaf.request({ Leaf.request({
url: $('acr512_invoice_status_change').getUrl(), url: $('acr512_invoice_status_change').getUrl(),
para: datas, para: {
invoice_hd_ids: invoice_hd_ids,
want_status: 'CONFIRMING'
},
success: function () { success: function () {
$('acr512_invoice_result_ds').query(); Leaf.Masker.unmask(detail_mask, '${l:HLS.EXECUTING}');
Leaf.SideBar.show({ Leaf.SideBar.show({
msg: '操作成功', msg: '操作成功',
duration: 2000 duration: 2000
}); });
$('acr512_invoice_result_ds').query();
Leaf.Masker.unmask(detail_mask, '${l:HLS.EXECUTING}');
//$('${/parameter/@winid}').close();
}, },
error: function () { error: function () {
Leaf.Masker.unmask(detail_mask, '${l:HLS.EXECUTING}'); Leaf.Masker.unmask(detail_mask, '${l:HLS.EXECUTING}');
}, },
scope: this scope: this
}); });
},function(){ }, function () {
Leaf.Masker.unmask(detail_mask, '${l:HLS.EXECUTING}'); Leaf.Masker.unmask(detail_mask, '${l:HLS.EXECUTING}');
}) })
...@@ -75,6 +78,7 @@ ...@@ -75,6 +78,7 @@
} }
function lock_current_window() { function lock_current_window() {
leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}'); leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
} }
...@@ -86,7 +90,7 @@ ...@@ -86,7 +90,7 @@
function acr512_invoice_query() { function acr512_invoice_query() {
$('acr512_invoice_result_ds').query(); $('acr512_invoice_result_ds').query();
var records = $('acr512_invoice_result_ds').getAll(); var records = $('acr512_invoice_result_ds').getAll();
for (var i = 0;i < records.length;i++) { for (var i = 0; i < records.length; i++) {
var record = record[i]; var record = record[i];
var invoice_hd_id = record.get('invoice_hd_id'); var invoice_hd_id = record.get('invoice_hd_id');
Leaf.request({ Leaf.request({
...@@ -94,7 +98,7 @@ ...@@ -94,7 +98,7 @@
para: { para: {
invoice_hd_id: invoice_hd_id invoice_hd_id: invoice_hd_id
}, },
success: function(res) { success: function (res) {
var document_number = record[i].get('document_number'); var document_number = record[i].get('document_number');
if (res.result.record['isreturn'] > 0) { if (res.result.record['isreturn'] > 0) {
return '<font color="red">' + document_number + '</font> '; return '<font color="red">' + document_number + '</font> ';
...@@ -116,17 +120,17 @@ ...@@ -116,17 +120,17 @@
var currency_reocrd = $('acr512_invoice_result_ds').findById(reocrd_id); var currency_reocrd = $('acr512_invoice_result_ds').findById(reocrd_id);
var param = currency_reocrd.data; var param = currency_reocrd.data;
param['function_code'] = 'ACR512'; param['function_code'] = 'ACR512';
param['winid']='confirm_invoice_win'; param['winid'] = 'confirm_invoice_win';
param['document_id'] = invoice_hd_id; param['document_id'] = invoice_hd_id;
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'MODIFY';
param['maintain_type'] = maintain_type; param['maintain_type'] = maintain_type;
param['url_title'] = '${l:ACR.INVOICE_DETAIL}'; param['url_title'] = '${l:ACR.INVOICE_DETAIL}';
if(param['invoice_status']=='CONFIRMING'){ if (param['invoice_status'] == 'CONFIRMING') {
param['function_code'] = 'ACR512R'; param['function_code'] = 'ACR512R';
param['function_usage'] = 'QUERY'; param['function_usage'] = 'QUERY';
param['maintain_type'] = 'READONLY'; param['maintain_type'] = 'READONLY';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'acr512_invoice_update_page', 'acr512_invoice_result_ds'); hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'acr512_invoice_update_page', 'acr512_invoice_result_ds');
}else{ } else {
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'acr512_invoice_update_page', 'acr512_invoice_result_ds'); hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'acr512_invoice_update_page', 'acr512_invoice_result_ds');
} }
...@@ -190,6 +194,7 @@ ...@@ -190,6 +194,7 @@
function acr512_invoice_delete() { function acr512_invoice_delete() {
$('acr512_invoice_update_grid_ds').remove(); $('acr512_invoice_update_grid_ds').remove();
} }
//发票提交 //发票提交
function acr512_invoice_submit() { function acr512_invoice_submit() {
...@@ -199,7 +204,7 @@ ...@@ -199,7 +204,7 @@
return; return;
} }
var datas = []; var datas = [];
for (var i = 0;i < records.length;i++) { for (var i = 0; i < records.length; i++) {
if (records[i].get('status') == 'APPROVED' || records[i].get('statsu') == 'APPROVING') { if (records[i].get('status') == 'APPROVED' || records[i].get('statsu') == 'APPROVING') {
Leaf.showMessage('${l:HLS.PROMPT}', '该发票正在审批中或已审批通过，不可重复提交'); Leaf.showMessage('${l:HLS.PROMPT}', '该发票正在审批中或已审批通过，不可重复提交');
...@@ -211,14 +216,14 @@ ...@@ -211,14 +216,14 @@
invoice_hd_ids = invoice_hd_ids + ',' + records[i].get('invoice_hd_id'); invoice_hd_ids = invoice_hd_ids + ',' + records[i].get('invoice_hd_id');
} }
} }
Leaf.showConfirm('提示', '您确认提交吗', function() { Leaf.showConfirm('提示', '您确认提交吗', function () {
lock_current_window(); lock_current_window();
Leaf.request({ Leaf.request({
url: $('acr512_submit_id').getUrl(), url: $('acr512_submit_id').getUrl(),
para: { para: {
invoice_hd_ids: invoice_hd_ids invoice_hd_ids: invoice_hd_ids
}, },
success: function() { success: function () {
Leaf.SideBar.show({ Leaf.SideBar.show({
msg: '提交成功', msg: '提交成功',
duration: 3000 duration: 3000
...@@ -226,16 +231,17 @@ ...@@ -226,16 +231,17 @@
unlock_current_window(); unlock_current_window();
$('acr512_invoice_result_ds').query(); $('acr512_invoice_result_ds').query();
}, },
failure: function() { failure: function () {
unlock_current_window(); unlock_current_window();
}, },
error: function() { error: function () {
unlock_current_window(); unlock_current_window();
}, },
scope: this scope: this
}); });
}); });
} }
]]></script> ]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/> <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<a:dataSets> <a:dataSets>
...@@ -250,57 +256,71 @@ ...@@ -250,57 +256,71 @@
<a:dataSet id="hls_lease_channel_ds" loadData="true" model="basic.hls_lease_channel_for_lov"/> <a:dataSet id="hls_lease_channel_ds" loadData="true" model="basic.hls_lease_channel_for_lov"/>
<a:dataSet id="acr512_invoice_query_ds"> <a:dataSet id="acr512_invoice_query_ds">
<a:fields> <a:fields>
<a:field name="currency_name" displayField="currency_name" options="acr512_currency_ds" returnField="currency" valueField="currency_code"/> <a:field name="currency_name" displayField="currency_name" options="acr512_currency_ds"
<a:field name="invoice_status_n" displayField="code_value_name" options="acr512_invoice_status_ds" returnField="invoice_status" valueField="code_value"/> returnField="currency" valueField="currency_code"/>
<a:field name="invoice_kind" /> <a:field name="invoice_status_n" displayField="code_value_name" options="acr512_invoice_status_ds"
returnField="invoice_status" valueField="code_value"/>
<a:field name="invoice_kind"/>
<a:field name="contract_name"/> <a:field name="contract_name"/>
<a:field name="invoice_bp_name"/> <a:field name="invoice_bp_name"/>
<a:field name="invoice_kind_desc" displayField="code_value_name" options="acr512_invoice_kind_ds" returnField="invoice_kind" valueField="code_value"/> <a:field name="invoice_kind_desc" displayField="code_value_name" options="acr512_invoice_kind_ds"
<a:field name="business_type_desc" displayField="business_type_desc" options="acr512_business_type_ds" returnField="business_type" valueField="business_type"/> returnField="invoice_kind" valueField="code_value"/>
<a:field name="created_by_name" lovGridHeight="320" lovHeight="500" lovService="acr.ACR512.acr_invoice_sys_user_lov" lovWidth="500" title="开票人选择"> <a:field name="business_type_desc" displayField="business_type_desc"
options="acr512_business_type_ds" returnField="business_type" valueField="business_type"/>
<a:field name="created_by_name" lovGridHeight="320" lovHeight="500"
lovService="acr.ACR512.acr_invoice_sys_user_lov" lovWidth="500" title="开票人选择">
<a:mapping> <a:mapping>
<a:map from="user_id" to="created_by"/> <a:map from="user_id" to="created_by"/>
<a:map from="description" to="created_by_name"/> <a:map from="description" to="created_by_name"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="invoice_bp_code_f" lovGridHeight="320" lovHeight="480" lovService="acr.ACR512.acr_invoice_bp_master_list" lovWidth="500" title="客户选择"> <a:field name="invoice_bp_code_f" lovGridHeight="320" lovHeight="480"
lovService="acr.ACR512.acr_invoice_bp_master_list" lovWidth="500" title="客户选择">
<a:mapping> <a:mapping>
<a:map from="bp_code" to="invoice_bp_code_f"/> <a:map from="bp_code" to="invoice_bp_code_f"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="invoice_bp_code_t" lovGridHeight="320" lovHeight="480" lovService="acr.ACR512.acr_invoice_bp_master_list" lovWidth="500" title="客户选择"> <a:field name="invoice_bp_code_t" lovGridHeight="320" lovHeight="480"
lovService="acr.ACR512.acr_invoice_bp_master_list" lovWidth="500" title="客户选择">
<a:mapping> <a:mapping>
<a:map from="bp_code" to="invoice_bp_code_t"/> <a:map from="bp_code" to="invoice_bp_code_t"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="project_number_f" lovGridHeight="320" lovHeight="480" lovService="acr.ACR512.acr_invoice_project_list" lovWidth="500" title="项目选择"> <a:field name="project_number_f" lovGridHeight="320" lovHeight="480"
lovService="acr.ACR512.acr_invoice_project_list" lovWidth="500" title="项目选择">
<a:mapping> <a:mapping>
<a:map from="project_number" to="project_number_f"/> <a:map from="project_number" to="project_number_f"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="project_number_t" lovGridHeight="320" lovHeight="480" lovService="acr.ACR512.acr_invoice_project_list" lovWidth="500" title="项目选择"> <a:field name="project_number_t" lovGridHeight="320" lovHeight="480"
lovService="acr.ACR512.acr_invoice_project_list" lovWidth="500" title="项目选择">
<a:mapping> <a:mapping>
<a:map from="project_number" to="project_number_t"/> <a:map from="project_number" to="project_number_t"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="contract_number_f" lovGridHeight="320" lovHeight="480" lovService="acr.ACR512.acr_invoice_contract_list" lovWidth="500" title="合同选择"> <a:field name="contract_number_f" lovGridHeight="320" lovHeight="480"
lovService="acr.ACR512.acr_invoice_contract_list" lovWidth="500" title="合同选择">
<a:mapping> <a:mapping>
<a:map from="contract_number" to="contract_number_f"/> <a:map from="contract_number" to="contract_number_f"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="contract_number_t" lovGridHeight="320" lovHeight="480" lovService="acr.ACR512.acr_invoice_contract_list" lovWidth="500" title="合同选择"> <a:field name="contract_number_t" lovGridHeight="320" lovHeight="480"
lovService="acr.ACR512.acr_invoice_contract_list" lovWidth="500" title="合同选择">
<a:mapping> <a:mapping>
<a:map from="contract_number" to="contract_number_t"/> <a:map from="contract_number" to="contract_number_t"/>
</a:mapping> </a:mapping>
</a:field> </a:field>
<a:field name="lease_channel"/> <a:field name="lease_channel"/>
<a:field name="lease_channel_desc" displayField="description" options="hls_lease_channel_ds" returnField="lease_channel" valueField="lease_channel"/> <a:field name="lease_channel_desc" displayField="description" options="hls_lease_channel_ds"
returnField="lease_channel" valueField="lease_channel"/>
</a:fields> </a:fields>
<a:events> <a:events>
<a:event name="update" handler="acr512_invoice_query_Onupdate"/> <a:event name="update" handler="acr512_invoice_query_Onupdate"/>
</a:events> </a:events>
</a:dataSet> </a:dataSet>
<a:dataSet id="acr512_invoice_result_ds" autoPageSize="true" autoQuery="true" model="acr.ACR512.acr_invoice_update_query" queryDataSet="acr512_invoice_query_ds" selectable="true"/> <a:dataSet id="acr512_invoice_result_ds" autoPageSize="true" autoQuery="true"
model="acr.ACR512.acr_invoice_update_query" queryDataSet="acr512_invoice_query_ds"
selectable="true"/>
<a:fields> <a:fields>
<a:field name="compare_date_flag"/> <a:field name="compare_date_flag"/>
</a:fields> </a:fields>
...@@ -315,77 +335,90 @@ ...@@ -315,77 +335,90 @@
<a:toolbarButton click="acr512_invoice_reset" text="HLS.RESET"/> <a:toolbarButton click="acr512_invoice_reset" text="HLS.RESET"/>
<a:toolbarButton click="acr512_invoice_delete" text="HLS.REMOVE"/> <a:toolbarButton click="acr512_invoice_delete" text="HLS.REMOVE"/>
<a:toolbarButton click="acr512_invoice_submit_selected" text="提交复核"/> <a:toolbarButton click="acr512_invoice_submit_selected" text="提交复核"/>
<!-- <!--
<a:toolbarButton click="acr512_invoice_submit" text="HLS.SUBMIT"/> <a:toolbarButton click="acr512_invoice_submit" text="HLS.SUBMIT"/>
--> -->
</a:screenTopToolbar> </a:screenTopToolbar>
<a:form marginWidth="200" padding="0" title="应收发票维护"> <a:form marginWidth="200" padding="0" title="应收发票维护">
<a:hBox labelSeparator=" "> <a:hBox labelSeparator=" ">
<a:textField name="document_number_f" bindTarget="acr512_invoice_query_ds" prompt="HLS.DOCUMENT_NUMBER_FROM" width="135"/> <a:textField name="document_number_f" bindTarget="acr512_invoice_query_ds"
<!-- prompt="HLS.DOCUMENT_NUMBER_FROM" width="135"/>
<!--
<div><![CDATA[${l:HLS.DOCUMENT_NUMBER_TO}]]></div> <div><![CDATA[${l:HLS.DOCUMENT_NUMBER_TO}]]></div>
--> -->
<a:textField name="document_number_t" bindTarget="acr512_invoice_query_ds" prompt="单据编号到" width="135"/> <a:textField name="document_number_t" bindTarget="acr512_invoice_query_ds" prompt="单据编号到"
width="135"/>
<a:textField name="contract_name" bindTarget="acr512_invoice_query_ds" prompt="合同名称" width="353"/> <a:textField name="contract_name" bindTarget="acr512_invoice_query_ds" prompt="合同名称" width="353"/>
<!-- <a:lov name="contract_number_f" bindTarget="acr512_invoice_query_ds" prompt="合同编号从" width="135"/>--> <!-- <a:lov name="contract_number_f" bindTarget="acr512_invoice_query_ds" prompt="合同编号从" width="135"/>-->
<!-- <!--
<div><![CDATA[${l:HLS.CONTRACT_NUMBER_TO}]]></div> <div><![CDATA[${l:HLS.CONTRACT_NUMBER_TO}]]></div>
--> -->
<!-- <a:lov name="contract_number_t" bindTarget="acr512_invoice_query_ds" prompt="合同编号到" width="135"/>--> <!-- <a:lov name="contract_number_t" bindTarget="acr512_invoice_query_ds" prompt="合同编号到" width="135"/>-->
<!-- <a:lov name="project_number_f" bindTarget="acr512_invoice_query_ds" prompt="HLS.PROJECT_NUMBER_FROM" width="135"/> <!-- <a:lov name="project_number_f" bindTarget="acr512_invoice_query_ds" prompt="HLS.PROJECT_NUMBER_FROM" width="135"/>
<div><![CDATA[${l:HLS.DOCUMENT_NUMBER_TO}]]></div> <div><![CDATA[${l:HLS.DOCUMENT_NUMBER_TO}]]></div>
<a:lov name="project_number_t" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>--> <a:lov name="project_number_t" bindTarget="acr512_invoice_query_ds" prompt="" width="135"/>-->
<!-- <!--
<a:comboBox name="business_type_desc" bindTarget="acr512_invoice_query_ds" prompt="HLS.BUSINESS_TYPE_DESC" width="135"/> <a:comboBox name="business_type_desc" bindTarget="acr512_invoice_query_ds" prompt="HLS.BUSINESS_TYPE_DESC" width="135"/>
--> -->
<!-- <!--
<a:comboBox name="lease_channel_desc" bindTarget="acr512_invoice_query_ds" prompt="商业模式" width="135"/> <a:comboBox name="lease_channel_desc" bindTarget="acr512_invoice_query_ds" prompt="商业模式" width="135"/>
--> -->
<!-- <a:comboBox name="currency_name" bindTarget="acr512_invoice_query_ds" prompt="HLS.CURRENCY" width="135"/> --> <!-- <a:comboBox name="currency_name" bindTarget="acr512_invoice_query_ds" prompt="HLS.CURRENCY" width="135"/> -->
</a:hBox> </a:hBox>
<a:hBox labelSeparator=" "> <a:hBox labelSeparator=" ">
<a:datePicker name="accounting_date_f" bindTarget="acr512_invoice_query_ds" prompt="记账日期从" width="135"/> <a:datePicker name="accounting_date_f" bindTarget="acr512_invoice_query_ds" prompt="记账日期从"
<!-- width="135"/>
<!--
<div><![CDATA[${l:HLS.ACCOUNT_DATE_TO}]]></div> <div><![CDATA[${l:HLS.ACCOUNT_DATE_TO}]]></div>
--> -->
<a:datePicker name="accounting_date_t" bindTarget="acr512_invoice_query_ds" prompt="记账日期到" width="135"/> <a:datePicker name="accounting_date_t" bindTarget="acr512_invoice_query_ds" prompt="记账日期到"
width="135"/>
<a:lov name="created_by_name" bindTarget="acr512_invoice_query_ds" prompt="创建人" width="135"/> <a:lov name="created_by_name" bindTarget="acr512_invoice_query_ds" prompt="创建人" width="135"/>
<a:textField name="invoice_title" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_TITLE" width="135"/> <a:textField name="invoice_title" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_TITLE"
width="135"/>
</a:hBox> </a:hBox>
<a:hBox labelSeparator=" "> <a:hBox labelSeparator=" ">
<a:datePicker name="invoice_date_f" bindTarget="acr512_invoice_query_ds" prompt="发票日期从" width="135"/> <a:datePicker name="invoice_date_f" bindTarget="acr512_invoice_query_ds" prompt="发票日期从"
<!-- width="135"/>
<!--
<div><![CDATA[${l:ACR.INVOICE_DATE_TO}]]></div> <div><![CDATA[${l:ACR.INVOICE_DATE_TO}]]></div>
--> -->
<a:datePicker name="invoice_date_t" bindTarget="acr512_invoice_query_ds" prompt="发票日期到" width="135"/> <a:datePicker name="invoice_date_t" bindTarget="acr512_invoice_query_ds" prompt="发票日期到"
<!-- <a:lov name="invoice_bp_code_f" bindTarget="acr512_invoice_query_ds" prompt="客户编号从" width="135"/>--> width="135"/>
<!-- <!-- <a:lov name="invoice_bp_code_f" bindTarget="acr512_invoice_query_ds" prompt="客户编号从" width="135"/>-->
<!--
<div><![CDATA[${l:HLS.CUSTOMER_NUMBER_TO}]]></div> <div><![CDATA[${l:HLS.CUSTOMER_NUMBER_TO}]]></div>
--> -->
<!-- <a:lov name="invoice_bp_code_t" bindTarget="acr512_invoice_query_ds" prompt="客户编号到" width="135"/>--> <!-- <a:lov name="invoice_bp_code_t" bindTarget="acr512_invoice_query_ds" prompt="客户编号到" width="135"/>-->
<a:textField name="invoice_bp_name" bindTarget="acr512_invoice_query_ds" prompt="客户名称" width="135"/> <a:textField name="invoice_bp_name" bindTarget="acr512_invoice_query_ds" prompt="客户名称" width="135"/>
<a:comboBox name="invoice_kind_desc" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_KIND" width="135"/> <a:comboBox name="invoice_kind_desc" bindTarget="acr512_invoice_query_ds" prompt="ACR.INVOICE_KIND"
width="135"/>
<a:comboBox name="invoice_status_n" bindTarget="acr512_invoice_query_ds" prompt="发票状态" width="135"/> <a:comboBox name="invoice_status_n" bindTarget="acr512_invoice_query_ds" prompt="发票状态" width="135"/>
</a:hBox> </a:hBox>
</a:form> </a:form>
<a:grid id="acr512_invoice_update_grid_ds" bindTarget="acr512_invoice_result_ds" marginHeight="250" marginWidth="30" navBar="true"> <a:grid id="acr512_invoice_update_grid_ds" bindTarget="acr512_invoice_result_ds" marginHeight="250"
marginWidth="30" navBar="true">
<a:columns> <a:columns>
<a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER" renderer="acr512_document_number_render" width="120"/> <a:column name="document_number" lock="true" prompt="HLS.DOCUMENT_NUMBER"
<a:column name="invoice_bp_name" autoAdjust="false" prompt="HLS.CUSTOMER_NAME" showTitle="true" width="100"/> renderer="acr512_document_number_render" width="120"/>
<a:column name="contract_name" autoAdjust="false" prompt="HLS.CONTRACT_NAME" showTitle="true" width="150"/> <a:column name="invoice_bp_name" autoAdjust="false" prompt="HLS.CUSTOMER_NAME" showTitle="true"
<!-- width="100"/>
<a:column name="contract_name" autoAdjust="false" prompt="HLS.CONTRACT_NAME" showTitle="true"
width="150"/>
<!--
<a:column name="business_type_desc" prompt="HLS.BUSINESS_TYPE_DESC" width="80"/> <a:column name="business_type_desc" prompt="HLS.BUSINESS_TYPE_DESC" width="80"/>
--> -->
<a:column name="invoice_kind_desc" prompt="ACR.INVOICE_KIND" width="100"/> <a:column name="invoice_kind_desc" prompt="ACR.INVOICE_KIND" width="100"/>
<!-- <a:column name="invoice_number" prompt="ACR.INVOICE_NUMBER" width="120"/> --> <!-- <a:column name="invoice_number" prompt="ACR.INVOICE_NUMBER" width="120"/> -->
<a:column name="invoice_date" prompt="ACR.INVOICE_DATE" width="100"/> <a:column name="invoice_date" prompt="ACR.INVOICE_DATE" width="100"/>
<!-- <a:column name="project_name" autoAdjust="false" prompt="HLS.PROJECT_NAME" showTitle="true" width="150"/> --> <!-- <a:column name="project_name" autoAdjust="false" prompt="HLS.PROJECT_NAME" showTitle="true" width="150"/> -->
<!-- <a:column name="contract_number" prompt="HLS.CONTRACT_NUMBER" width="120"/> --> <!-- <a:column name="contract_number" prompt="HLS.CONTRACT_NUMBER" width="120"/> -->
<!-- <a:column name="bp_code" prompt="HLS.CUSTOMER_NUMBER" width="100"/> --> <!-- <a:column name="bp_code" prompt="HLS.CUSTOMER_NUMBER" width="100"/> -->
<a:column name="invoice_title" autoAdjust="false" prompt="ACR.INVOICE_TITLE" showTitle="true" width="150"/> <a:column name="invoice_title" autoAdjust="false" prompt="ACR.INVOICE_TITLE" showTitle="true"
width="150"/>
<!-- <a:column name="total_amount" align="right" prompt="ACR.TOTAL_AMOUNT" renderer="Aurora.formatMoney" width="100"/> --> <!-- <a:column name="total_amount" align="right" prompt="ACR.TOTAL_AMOUNT" renderer="Aurora.formatMoney" width="100"/> -->
<!-- <a:column name="currency" prompt="HLS.CURRENCY" width="80"/> --> <!-- <a:column name="currency" prompt="HLS.CURRENCY" width="80"/> -->
<a:column name="created_by_name" autoAdjust="false" prompt="创建人" showTitle="true" width="150"/> <a:column name="created_by_name" autoAdjust="false" prompt="创建人" showTitle="true" width="150"/>
......
src/main/webapp/modules/acr/ACR513/acr_invoice_confirm.lview
View file @ 026e1e52
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
url="${/request/@context_path}/modules/prj/PRJ312/dmegc_emp_loan_cn_print.lview"/> url="${/request/@context_path}/modules/prj/PRJ312/dmegc_emp_loan_cn_print.lview"/>
<a:link id="cash_deposit_printt_link" <a:link id="cash_deposit_printt_link"
url="${/request/@context_path}/modules/acr/ACR513/cash_deposit_print.lview"/> url="${/request/@context_path}/modules/acr/ACR513/cash_deposit_print.lview"/>
<a:link id="acr512_invoice_status_change" url="${/request/@context_path}/modules/acr/ACR510/acr_invoice_status_change.lsc"/> <a:link id="acr512_invoice_status_change_new" url="${/request/@context_path}/modules/acr/ACR510/acr_invoice_status_change.lsc"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
function acr513_invoice_query() { function acr513_invoice_query() {
$('acr513_invoice_result_ds').query(); $('acr513_invoice_result_ds').query();
...@@ -164,10 +163,9 @@ ...@@ -164,10 +163,9 @@
}); });
} }
param['details'] = saveDate; param['details'] = saveDate;
console.log(param);
Leaf.showConfirm("提示",'确认退回所选择的单据？',function(){ Leaf.showConfirm("提示",'确认退回所选择的单据？',function(){
Leaf.request({ Leaf.request({
url: $('acr512_invoice_status_change').getUrl(), url: $('acr512_invoice_status_change_new').getUrl(),
para: param, para: param,
success: function() { success: function() {
Leaf.Masker.unmask(detail_mask); Leaf.Masker.unmask(detail_mask);
......
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