Skip to content

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

[feat] 完成罚息减免功能

parent 8ead9284
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 57 deletions
src/main/database/Table/ACR_INVOICE_BATCH_LN.sql 0 → 100644
View file @ 9b8fcc77
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool ACP_INVOICE_LN.log
PROMPT
PROMPT CREATING TABLE TRAIN_CONFIG
PROMPT ============================
PROMPT
WHENEVER SQLERROR CONTINUE
DROP TABLE ACP_INVOICE_LN;
WHENEVER SQLERROR EXIT FAILURE ROLLBACK
alter table acp_invoice_ln add (CONTRACT_NAME varchar2(200));
comment on column acp_invoice_ln.CONTRACT_NAME is '合同名称';
alter table acp_invoice_ln add (BP_NAME varchar2(200));
comment on column acp_invoice_ln.BP_NAME is '客户名称';
alter table acp_invoice_ln add (CONTRACT_STATUS varchar2(30));
comment on column acp_invoice_ln.CONTRACT_STATUS is '合同状态';
alter table acp_invoice_ln add (CONFIRMATION_STATUS varchar2(30));
comment on column acp_invoice_ln.CONFIRMATION_STATUS is '确认状态';
SPOOL OFF
EXIT
\ No newline at end of file
src/main/database/Table/Alter/HLS_VAT_IMPORT_TMP.sql 0 → 100644
View file @ 9b8fcc77
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment21 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment22 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment23 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment24 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment25 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment26 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment27 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment28 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment29 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment30 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment31 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment32 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment33 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment34 VARCHAR2(200);
ALTER TABLE HLS_VAT_IMPORT_TMP ADD segment35 VARCHAR2(200);
\ No newline at end of file
src/main/database/Table/Alter/con_contract_case_record.sql 0 → 100644
View file @ 9b8fcc77
ALTER TABLE con_contract_case_record ADD wfl_instance_id NUMBER;
COMMENT ON COLUMN con_contract_case_record.wfl_instance_id IS '罚息减免工作流id';
\ No newline at end of file
src/main/webapp/WEB-INF/classes/cont/CON1020/con_contract_penalty_reduction.lwm
View file @ 9b8fcc77
...@@ -2,15 +2,16 @@ ...@@ -2,15 +2,16 @@
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false"> <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations> <bm:operations>
<bm:operation name="execute"> <bm:operation name="execute">
<bm:parameters > <!--<bm:parameters >
<bm:parameter name ="v_status" dataType="java.lang.Long" input ="false" output ="true" outputPath="@v_status" /> <bm:parameter name ="v_status" dataType="java.lang.Long" input ="false" output ="true" outputPath="@v_status" />
</bm:parameters > </bm:parameters >-->
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
DECLARE
v_status number;
begin begin
v_status := contract_penalty_reduction.contract_penalty_status(p_record_id => ${@record_id}); contract_penalty_reduction.remit_workflow_start(p_record_id =>${@record_id},
${@v_status}:=v_status; p_company_id=>${/session/@company_id},
p_user_id =>${/session/@user_id}
);
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
......
src/main/webapp/WEB-INF/leaf.plugin.export.word/1.xml deleted 100644 → 0
View file @ 8ead9284
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<doc readOnly="true" pageSize="A4" header="1.5" footer="1.75" top="2.54" bottom="2.54" left="3.17" right="3.17" >
<body>
<p align="left" line="400" >
<t fontFamily="黑体" fontSize="24" fontColor="000000" >附件二</t>
</p>
<p align="center" line="400" >
<t fontFamily="宋体" fontSize="32" fontColor="000000" >实际租金支付表</t>
</p>
<p indFirstLine="1" line="400" >
<t fontFamily="仿宋" fontSize="24" fontColor="000000" >注:《租金支付概算表》与《实际租金支付表》不一致的,以本《实际租金支付表》为准。</t>
</p>
<p line="400" >
<t fontFamily="宋体" fontSize="24" fontColor="000000" >甲方（承租人）:（盖章） 乙方（出租人）: （盖章）</t>
</p>
<p line="400" >
<t fontFamily="宋体" fontSize="24" fontColor="000000" >法定代表人（负责人）或授权代表: 法定代表人（负责人）或授权代表:</t>
</p>
<p line="400" >
<t fontFamily="宋体" fontSize="24" fontColor="000000" >年 月 日 年 月 日 </t>
</p>
</body>
</doc>
\ No newline at end of file
src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview
View file @ 9b8fcc77
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
f_hls.winNoMask(win); f_hls.winNoMask(win);
return; return;
} }
debugger
var datas = ds.getJsonData(); var datas = ds.getJsonData();
winNoMask(win); winNoMask(win);
......
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ 9b8fcc77
...@@ -109,12 +109,14 @@ ...@@ -109,12 +109,14 @@
winNoMask(); winNoMask();
return; return;
} }
debugger
var datas = ds.getJsonData(true); var datas = ds.getJsonData(true);
for (var i = 0; i < datas.length; i++) { for (var i = 0; i < datas.length; i++) {
datas[i].final_bill_flag = final_bill_flag; datas[i].final_bill_flag = final_bill_flag;
datas[i].cat_ini_flag = cat_ini_flag; datas[i].cat_ini_flag = cat_ini_flag;
} }
Leaf.request({ Leaf.request({
url: $('svcLink_save_selected').getUrl(), url: $('svcLink_save_selected').getUrl(),
para: datas, para: datas,
...@@ -340,7 +342,7 @@ ...@@ -340,7 +342,7 @@
<a:gridButton click="contractDs_grid_query" text="HLS.QUERY"/> <a:gridButton click="contractDs_grid_query" text="HLS.QUERY"/>
<a:gridButton click="allConditionDs_reset" text="重置"/> <a:gridButton click="allConditionDs_reset" text="重置"/>
<!-- <a:gridButton click="contractDs_grid_clear" text="ACR510.BUTTON.CLEAR_CONTRACT"/>--> <!-- <a:gridButton click="contractDs_grid_clear" text="ACR510.BUTTON.CLEAR_CONTRACT"/>-->
<a:gridButton click="invoiceHd_confirm" text="ACR510.BUTTON.COMFIRM"/> <a:gridButton click="invoiceHd_confirm" text="继续"/>
<!--<a:gridButton click="acr510n_excel" text="导出"/>--> <!--<a:gridButton click="acr510n_excel" text="导出"/>-->
</a:screenTopToolbar> </a:screenTopToolbar>
<a:queryForm id="condition_queryForm" bindTarget="allConditionDs" createSearchButton="false" <a:queryForm id="condition_queryForm" bindTarget="allConditionDs" createSearchButton="false"
......
src/main/webapp/modules/cont/CON1020/contract_penalty_reduction_create.lview
View file @ 9b8fcc77
...@@ -28,7 +28,10 @@ ...@@ -28,7 +28,10 @@
// } // }
// }); // });
Leaf.onReady(function(){
var ds_id1 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record');
console.log(ds_id1)
})
function open_detail_win(ds_id, record_id) { function open_detail_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
if (record.dirty || !record.data.contract_id) { if (record.dirty || !record.data.contract_id) {
...@@ -37,6 +40,7 @@ ...@@ -37,6 +40,7 @@
} }
var param = record.data; var param = record.data;
var case_status_submit = '${/parameter/@case_status_submit}'; var case_status_submit = '${/parameter/@case_status_submit}';
if (case_status_submit == 'APPROVED' || case_status_submit == 'APPROVING') { if (case_status_submit == 'APPROVED' || case_status_submit == 'APPROVING') {
param['function_code'] = 'CON1020_M_R'; param['function_code'] = 'CON1020_M_R';
param['maintain_type'] = 'QUERY'; param['maintain_type'] = 'QUERY';
...@@ -46,6 +50,13 @@ ...@@ -46,6 +50,13 @@
param['maintain_type'] = 'UPDATE'; param['maintain_type'] = 'UPDATE';
param['function_usage'] = 'UPDATE'; param['function_usage'] = 'UPDATE';
} }
//如果是工作流页面进入，设为只读
if ( '${/parameter/@function_usage}'=='QUERY'){
param['function_code'] = 'CON1020_M_R';
param['maintain_type'] = 'QUERY';
param['function_usage'] = 'QUERY';
}
param['penalty_reduce_id'] = record.data.penalty_reduce_id; param['penalty_reduce_id'] = record.data.penalty_reduce_id;
param['copy_contract_id'] = record.data.copy_contract_id; param['copy_contract_id'] = record.data.copy_contract_id;
param['contract_id'] = record.data.contract_id; param['contract_id'] = record.data.contract_id;
...@@ -99,6 +110,8 @@ ...@@ -99,6 +110,8 @@
//提交起案 //提交起案
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () { window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
getXml(); getXml();
$('${/parameter/@layout_code}_user_button1').disable(); $('${/parameter/@layout_code}_user_button1').disable();
$('${/parameter/@layout_code}_user_button2').disable(); $('${/parameter/@layout_code}_user_button2').disable();
...@@ -115,17 +128,20 @@ ...@@ -115,17 +128,20 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return; return;
} }
/*小额不用审批直接通过*/
//将小额审批改为工作工作流审批
//所有的单据都默认为小额审批
Leaf.request({ Leaf.request({
url: $('con_contract_penalty_reduction_link').getUrl(), url: $('con_contract_penalty_reduction_link').getUrl(),
para: { para: {
record_id: record_id record_id: record_id
}, },
success: function (res) { success: function (res) {
var v_status = res.result.v_status; // var v_status = res.result.v_status;
if (v_status == 1) { //if (v_status == 1) {
Leaf.showMessage('${l:PROMPT}', '提交成功'); Leaf.showMessage('${l:PROMPT}', '提交成功');
} //}
else { /*else {
Leaf.request({ Leaf.request({
url: $('get_xml').getUrl(), url: $('get_xml').getUrl(),
para: { para: {
...@@ -143,7 +159,7 @@ ...@@ -143,7 +159,7 @@
}, },
scope: this scope: this
}); });
} }*/
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, },
failure: function () { failure: function () {
...@@ -234,38 +250,48 @@ ...@@ -234,38 +250,48 @@
var ds_id1 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record'); var ds_id1 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record');
var record1 = $(ds_id1).getCurrentRecord(); var record1 = $(ds_id1).getCurrentRecord();
var ds_id2 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_penalty_reduce'); var ds_id2 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_penalty_reduce');
var record2 = $(ds_id2).getSelected();
var record2 = $(ds_id2).getAll();
if (record2.length == 0) { if (record2.length == 0) {
Leaf.showMessage('提示', '请选择一条数据！'); Leaf.showMessage('提示', '请选择一条数据！');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return; return;
} }
var param_list = []; var param_list = [];
var param = {};
for (var i = 0; i < record2.length; i++) { for (var i = 0; i < record2.length; i++) {
//放在外面程序会报错，由于param是同一个对象，第二次penalty_reduce_id会将第一次的覆盖
var param = {};
param['record_id'] = record1.data.record_id; param['record_id'] = record1.data.record_id;
param['penalty_reduce_id'] = record2[i].get('penalty_reduce_id'); param['penalty_reduce_id'] = record2[i].get('penalty_reduce_id');
param['_status'] = 'update'; param['_status'] = 'update';
param_list.push(param); param_list.push(param);
} }
Leaf.request({
url: $('con_contract_penalty_cancle_link').getUrl(), $L.showConfirm('提示','确认取消该批次的修改信息?',function () {
para: param_list, Leaf.request({
success: function (res) { url: $('con_contract_penalty_cancle_link').getUrl(),
Leaf.SideBar.show({ para: param_list,
msg: '取消成功', success: function (res) {
duration: 2000 Leaf.SideBar.show({
}); msg: '取消成功',
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window'](); duration: 2000
}, });
failure: function () { window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window'](); },
}, failure: function () {
error: function () { window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window'](); },
}, error: function () {
scope: this window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}); },
scope: this
});
},function () {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
})
}; };
//保存submitsuccess调用 //保存submitsuccess调用
......
src/main/webapp/modules/cont/CON1021/contract_penalty_reduction_create.lview
View file @ 9b8fcc77
...@@ -15,6 +15,24 @@ ...@@ -15,6 +15,24 @@
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
jQuery.noConflict(); jQuery.noConflict();
//取消按钮
/* window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record');
var records=$(ds_id).getSelected();
//只有新建的单据才能够取消操作
if(records.length<1){
$L.showInfoMessage("提示",'至少选择一条记录为新建的记录！');
return ;
}
///
for (var i=0;i<records.length;i++){
}
}*/
function open_contract_win123() { function open_contract_win123() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_case_record');
var param = {}; var param = {};
...@@ -29,7 +47,7 @@ ...@@ -29,7 +47,7 @@
function open_contract_detail_win(ds_id, record_id) { function open_contract_detail_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
var param = record.data; var param = record.data;
if (record.data.status == 'APPROVED' || record.data.status == 'APPROVING') { if (record.data.status == 'APPROVED' || record.data.status == 'APPROVING'||record.data.status == 'CANCEL') {
param['function_code'] = 'CON1020_C_R'; param['function_code'] = 'CON1020_C_R';
param['function_usage'] = 'QUERY'; param['function_usage'] = 'QUERY';
param['maintain_type'] = 'QUERY'; param['maintain_type'] = 'QUERY';
......
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