Skip to content

L
leaf-hlcm
Commit 1a5ab51e authored by 陆正友's avatar 陆正友
Browse files
Options

Merge remote-tracking branch 'origin/remote_dev' into remote_dev

parents 42a921a0 85ca9107
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2971 additions and 37 deletions
src/main/database/Register_function/REGISTER_RPT556.sql 0 → 100644
View file @ 1a5ab51e
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_ET001.log
set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/rpt/RPT556/con_je_vat_quarter_query.lview','增值税台账(季度维度)',1,1,0);
--功能定义
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('RPT556','增值税台账(季度维度)','增值税台账(季度维度)','100','','','modules/rpt/RPT556/con_je_vat_quarter_query.lview','ZHS',-1);
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('RPT556','增值税台账(季度维度)','增值税台账(季度维度)','100','','','modules/rpt/RPT556/con_je_vat_quarter_query.lview','US',-1);
--分配页面
sys_function_assign_pkg.func_service_load('RPT556','modules/rpt/RPT556/con_je_vat_quarter_query.lview');
--分配bm
sys_function_assign_pkg.func_bm_load('RPT556','rpt.RPT556.con_je_vat_current_quarter_query');
sys_function_assign_pkg.func_bm_load('RPT556','rpt.RPT556.con_je_vat_quarter_query');
sys_function_assign_pkg.func_bm_load('RPT556','rpt.RPT556.con_je_vat_total_query_quarter');
--分配菜单
--sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_CHANGE_REQ',p_function_code=>'CON_ET001',p_enabled_flag=>'Y',P_USER_ID=>-1);
end;
/
commit;
set feedback on
set define on
spool off
exit
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT100/csh_transaction_deposit_entry_write_off.lwm
View file @ 1a5ab51e
......@@ -30,5 +30,10 @@
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select hlcm_cux_deposit_pkg.deposit_extend_month(p_transaction_id => ${@transaction_id}) check_flag from dual
]]></bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS801/sys_role_flag.lwm
View file @ 1a5ab51e
......@@ -17,6 +17,8 @@
10413,
'NO',
(Select decode(t.role_code,
'0009',
'NO',
'0014',
'YES',
'0013',
......
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_current_query.lwm
View file @ 1a5ab51e
......@@ -473,15 +473,18 @@ SELECT h.period_year,
and ah.invoice_kind in ('0', '2')
AND to_char(ah.invoice_date,'yyyymm') <= ${@base_period}
and ah.invoice_status = 'CONFIRM'),0) vat_due_amount,
(select
case when nvl(ccc.interest,0)!=0 then
round(ccc.vat_interest/ccc.interest,2)
when nvl(ccc.due_amount-ccc.vat_due_amount,0)!=0 then
round(ccc.vat_due_amount/(ccc.due_amount-ccc.vat_due_amount),2)
else
null
end
from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) vat_rate,
(select case
when nvl(ccc.interest, 0) != 0 and (ccc.interest -ccc.vat_interest) != 0 then
round(ccc.vat_interest / (ccc.interest -ccc.vat_interest), 2)
when nvl(ccc.due_amount - ccc.vat_due_amount, 0) != 0 then
round(ccc.vat_due_amount /
(ccc.due_amount - ccc.vat_due_amount),
2)
else
null
end
from con_contract_cashflow ccc
where ccc.cashflow_id = l.cashflow_id) vat_rate,
h.je_transaction_code,
l.cashflow_id
FROM hls_journal_header h, hls_journal_detail l,gld_accounts ga
......@@ -789,5 +792,7 @@ and hd.je_template_code in
<bm:query-field name="journal_date" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"/>
<bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/>
<bm:query-field name="vat_6_flag" queryExpression="((${@vat_6_flag}='Y' and t1.vat_rate=0.06) or (${@vat_6_flag}!='Y' and nvl(t1.vat_rate,0)!=0.06))"/>
<bm:query-field name="journal_date_f" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') &gt;= ${@journal_date_f}"/>
<bm:query-field name="journal_date_t" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') &lt;= ${@journal_date_t}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_query.lwm
View file @ 1a5ab51e
......@@ -512,15 +512,18 @@ SELECT h.period_year,
and ah.invoice_kind in ('0', '2')
AND to_char(ah.invoice_date,'yyyymm') <= ${@base_period}
and ah.invoice_status = 'CONFIRM'),0) vat_due_amount,
(select
case when nvl(ccc.interest,0)!=0 then
round(ccc.vat_interest/ccc.interest,2)
when nvl(ccc.due_amount-ccc.vat_due_amount,0)!=0 then
round(ccc.vat_due_amount/(ccc.due_amount-ccc.vat_due_amount),2)
else
null
end
from con_contract_cashflow ccc where ccc.cashflow_id=l.cashflow_id) vat_rate,
(select case
when nvl(ccc.interest, 0) != 0 and (ccc.interest -ccc.vat_interest) != 0 then
round(ccc.vat_interest / (ccc.interest -ccc.vat_interest), 2)
when nvl(ccc.due_amount - ccc.vat_due_amount, 0) != 0 then
round(ccc.vat_due_amount /
(ccc.due_amount - ccc.vat_due_amount),
2)
else
null
end
from con_contract_cashflow ccc
where ccc.cashflow_id = l.cashflow_id) vat_rate,
h.je_transaction_code,
l.cashflow_id,
'N' fixed_data_flag
......@@ -874,5 +877,7 @@ and hd.je_template_code in
queryExpression="to_number(to_char(t1.journal_date,'yyyymm')) &lt; to_number(${@base_period})"/>
<bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/>
<bm:query-field name="vat_6_flag" queryExpression="((${@vat_6_flag}='Y' and t1.vat_rate=0.06) or (${@vat_6_flag}!='Y' and nvl(t1.vat_rate,0)!=0.06))"/>
<bm:query-field name="journal_date_f" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') &gt;= ${@journal_date_f}"/>
<bm:query-field name="journal_date_t" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') &lt;= ${@journal_date_t}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_total_query.lwm
View file @ 1a5ab51e
......@@ -69,5 +69,7 @@
<bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/>
<bm:query-field name="invoice_kind" queryExpression="t1.invoice_kind = ${@invoice_kind}"/>
<bm:query-field name="vat_6_flag" queryExpression="((${@vat_6_flag}='Y' and t1.tax_type_rate=0.06) or(${@vat_6_flag}!='Y' and t1.tax_type_rate!=0.06))"/>
<bm:query-field name="journal_date_f" queryExpression="to_char(t1.je_date,'yyyy-mm-dd') &gt;= ${@journal_date_f}"/>
<bm:query-field name="journal_date_t" queryExpression="to_char(t1.je_date,'yyyy-mm-dd') &lt;= ${@journal_date_t}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/rpt/RPT556/con_je_vat_total_query_quarter.lwm 0 → 100644
View file @ 1a5ab51e
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wangwei
$Date: 2023-3-16 下午2:20:47
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select * from (
SELECT t.contract_id,
t.invoice_hd_id,
t.invoice_line_id,
(SELECT v.code_value_name
FROM sys_code_values_v v
WHERE v.code = 'ACR510_INVOICE_KIND'
AND v.code_value = t.invoice_kind)invoice_kind_n,
t.cashflow_id,
t.tax_apply_month invoice_month,
t.invoice_date,
t.invoice_number,
t.invoice_tax_amount total_amount,
t.apply_flag for_invoice_flag,
t.tenant_name bp_name,
t.contract_number,
t.acr_tax_amount return_tax_amount,
t.journal_tax_amount amount_cr,
t.journal_month je_month,
t.journal_date je_date,
t.journal_num,
t.times,
t.due_date,
t.due_amount,
t.principal,
t.interest,
t.tax_amount vat_due_amount,
t.created_by,
t.creation_date,
t.last_updated_by,
t.last_update_date,
t.tax_type_rate
FROM vat_account_tmp t
WHERE floor(t.session_id/10)=${/session/@session_id}
) t1
#WHERE_CLAUSE#
--order by invoice_hd_id,due_date ASC,invoice_line_id asc
order by invoice_hd_id, invoice_number asc, due_date ASC
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
BEGIN
hl_cm_vat_report_pkg.vat_quarter_data_process(p_start_period =>${@start_period},
p_end_period =>${@end_period},
p_session_id =>${/session/@session_id},
p_user_id =>${/session/@user_id});
END;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:data-filters>
<!-- <bm:data-filter enforceOperations="query" expression="to_char(t1.invoice_date,'yyyymm') = ${@base_period}"/>-->
</bm:data-filters>
<bm:query-fields>
<bm:query-field name="contract_number" queryExpression="t1.contract_number = ${@contract_number}"/>
<bm:query-field name="bp_name" queryExpression="t1.bp_name = ${@bp_name}"/>
<!-- <bm:query-field name="journal_date" queryExpression="to_char(t1.journal_date,'yyyy-mm-dd') = ${@journal_date}"/>-->
<bm:query-field name="invoice_date" queryExpression="to_char(t1.invoice_date,'yyyy-mm-dd') = ${@invoice_date}"/>
<bm:query-field name="invoice_kind" queryExpression="t1.invoice_kind = ${@invoice_kind}"/>
<bm:query-field name="vat_6_flag" queryExpression="((${@vat_6_flag}='Y' and t1.tax_type_rate=0.06) or(${@vat_6_flag}!='Y' and t1.tax_type_rate!=0.06))"/>
</bm:query-fields>
</bm:model>
src/main/webapp/modules/cont/CON731/hls_before_sign_change_detail.lview
View file @ 1a5ab51e
......@@ -265,9 +265,11 @@
if (record.data.division == '70' || record.data.division=='92') {
record.getField('lease_name_n').setRequired(true);
record.getField('brand_value').setRequired(true);
record.getField('modelcd').setReadOnly(false);
record.getField('modelcd').setRequired(true);
record.getField('machine_number_70').setRequired(true);
record.getField('modelcd').setReadOnly(true);
record.getField('modelcd').setRequired(false);
record.getField('pattern').setReadOnly(true);
record.getField('pattern').setRequired(false);
record.getField('machine_numbe\r_70').setRequired(true);
}
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT100/csh_transaction_deposit_entry_detail.lview
View file @ 1a5ab51e
......@@ -14,6 +14,7 @@
<a:model-query fetchAll="true" model="csh.CSH511.fnd_financial_option" rootPath="fnd_financial_option_path"/>
<a:model-query fetchAll="true" model="csh.CSH511.csh_transaction_default_exchange_rate_type"
rootPath="default_exchange_rate_type_path"/>
<a:model-query model="cus_deposit/CUS_DEPOSIT100.csh_transaction_deposit_entry_write_off" rootPath="deposit_extend_month" />
</a:init-procedure>
<a:view>
<a:link id="hn2050_upload_win_link" url="${/request/@context_path}/uploadFile.lview"/>
......@@ -34,7 +35,7 @@
$('${/parameter/@winId}').close();
}
function cshdeposit100_receipt_submit() {
if ($('deposit_ertry_detail_result_ds').validate()) {
if ($('deposit_ertry_detail_result_ds').validate()) {
var head_record = $('csh_transaction_receipt_head_ds').getAt(0);
var deposit_records = $('deposit_ertry_detail_result_ds').getAll();
var param = {};
......@@ -51,7 +52,12 @@
var deposit_record;
deposit_record = deposit_records[i];
deposit_record.set('_status', 'insert');
//收款日期跨月则取系统当前时间，否则取收款日期 18083 2023/6/27
if ('${/model/deposit_extend_month/record/@check_flag}' =='Y'){
deposit_record.set('write_off_date',new Date().format('yyyy/mm/dd'));
}else{
deposit_record.set('write_off_date', head_record.get('transaction_date'));
}
deposit_record.set('transaction_id', '${/parameter/@transaction_id}');
deposit_record.set('bp_id_agent_level1', '${/parameter/@bp_id}');
saveData.push(deposit_record.data);
......
src/main/webapp/modules/hls/HLS203N/hls_lease_item_modify_entrance.lview
View file @ 1a5ab51e
......@@ -101,6 +101,7 @@
window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, record) {
//0017 宏菱管理员 HAND HAND管理员
var role_code = '${/model/user_name_path/record/@role_code}';
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_lease_item');
if (record) {
if (role_code == '0017' || role_code == 'HAND') {
record.getField('ref_n01').setReadOnly(false);
......@@ -108,6 +109,26 @@
record.getField('ref_n01').setReadOnly(true);
}
}
if(ds.id == ds_id){
var record = $(ds_id).getAll()
for (var i=0;i<record.length;i++){
if(record[i].data.division=='70' || record[i].data.division=='92'){
record[i].getField('pattern').setRequired(false);
record[i].getField('pattern').setReadOnly(true);
record[i].getField('equipments').setReadOnly(true);
record[i].getField('detention').setReadOnly(true);
record[i].getField('detention').setRequired(false);
record[i].getField('machine_model_class').setReadOnly(true);
record[i].getField('machine_model_class_n').setReadOnly(true);
record[i].getField('ref_n01').setReadOnly(true);
record[i].getField('created_by_n').setReadOnly(true);
record[i].getField('vender_id').setReadOnly(true);
record[i].getField('vender_id').setRequired(false);
record[i].getField('vender_id_n').setReadOnly(true);
record[i].getField('vender_id_n').setRequired(false);
}
}
}
};
//新增时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) {
......@@ -116,6 +137,48 @@
record.getField('ref_n01').setReadOnly(false);
};
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_lease_item');
if(ds.id == ds_id){
if(name == 'division'){
if(value == '70' || value == '92'){
record.getField('pattern').setReadOnly(true);
record.getField('pattern').setRequired(false);
record.getField('equipments').setReadOnly(true);
record.getField('detention').setReadOnly(true);
record.getField('detention').setRequired(false);
record.set('machine_model_class',' ');
record.set('machine_model_class_n',' ');
record.getField('machine_model_class').setReadOnly(true);
record.getField('machine_model_class_n').setReadOnly(true);
record.getField('ref_n01').setReadOnly(true);
record.getField('created_by_n').setReadOnly(true);
record.getField('vender_id').setReadOnly(true);
record.getField('vender_id').setRequired(false);
record.getField('vender_id_n').setReadOnly(true);
record.getField('vender_id_n').setRequired(false);
}else {
record.getField('pattern').setReadOnly(false);
record.getField('pattern').setRequired(true);
record.getField('equipments').setReadOnly(false);
record.getField('detention').setReadOnly(false);
record.getField('detention').setRequired(true);
record.set('machine_model_class','LARGE');
record.set('machine_model_class_n','大型');
record.getField('machine_model_class').setReadOnly(false);
record.getField('machine_model_class_n').setReadOnly(false);
record.getField('ref_n01').setReadOnly(false);
record.getField('vender_id').setReadOnly(false);
record.getField('vender_id').setRequired(true);
record.getField('vender_id_n').setReadOnly(false);
record.getField('vender_id_n').setRequired(true);
}
}
}
}
//更新机型信息
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_lease_item');
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ 1a5ab51e
......@@ -724,7 +724,14 @@
var gird_ds_id = 'BP_NP_CREATE_BP_ASSETS01_hls_bp_assets_ds';
var gird_ds_id2 = 'BP_NP_CREATE_BP_ASSETS04_hls_bp_assets_ds';
var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow');
//邮编校验 add by 20230619
if(name=='zipcode'|| name=='work_unit_zip') {
if (!(/^[0-9]{6}$/.test(value)) && value) {
Leaf.showMessage('提示', '请正确填写邮编', function () {
record.set(name, '');
});
}
}
//单位性质和职业校验 20230420
if (name == 'unit_properties' || name == 'occuption') {
debugger
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview
View file @ 1a5ab51e
......@@ -532,7 +532,14 @@
var gird_ds_id = 'BP_NP_MODIFY_N_BP_ASSETS01_hls_bp_assets_ds';
var gird_ds_id2 = 'BP_NP_MODIFY_N_BP_ASSETS04_hls_bp_assets_ds';
var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow');
//邮编校验 add by 20230619
if(name=='zipcode'|| name=='work_unit_zip') {
if (!(/^[0-9]{6}$/.test(value)) && value) {
Leaf.showMessage('提示', '请正确填写邮编', function () {
record.set(name, '');
});
}
}
//单位性质和职业校验 20230420
if (name == 'unit_properties' || name == 'occuption') {
debugger
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_req_modify.lview
View file @ 1a5ab51e
......@@ -571,7 +571,14 @@
var gird_ds_id = 'BP_NP_MODIFY_N_BP_ASSETS01_hls_bp_assets_ds';
var gird_ds_id2 = 'BP_NP_MODIFY_N_BP_ASSETS04_hls_bp_assets_ds';
var gird_ds_id3 = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_bank_flow');
//邮编校验 add by 20230619
if(name=='zipcode'|| name=='work_unit_zip') {
if (!(/^[0-9]{6}$/.test(value)) && value) {
Leaf.showMessage('提示', '请正确填写邮编', function () {
record.set(name, '');
});
}
}
//单位性质和职业校验 20230420
if (name == 'unit_properties' || name == 'occuption') {
debugger
......
src/main/webapp/modules/hls/HLS536/hls_journal_import_create.lview
View file @ 1a5ab51e
......@@ -87,7 +87,7 @@
if (!header_ds_record.get('post_gl_status')){
header_ds_record.set('post_gl_status', 'N');
}
header_ds_record.set('reversed_flag', 'N');
//header_ds_record.set('reversed_flag', 'N');
// if (name = 'document_type') {
// Leaf.request({
// url: $('get_document_type_id').getUrl(),
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ 1a5ab51e
......@@ -1341,8 +1341,8 @@
record.getField('produce_date').setRequired(true);
record.getField('using_hour').setRequired(true);
record.getField('machine_number_70').setRequired(true);
record.getField('modelcd').setReadOnly(false);
record.getField('modelcd').setRequired(true);
record.getField('modelcd').setReadOnly(true);
record.getField('modelcd').setRequired(false);
record.getField('full_name').setRequired(false);
record.getField('full_name_n').setRequired(false);
record.getField('ownership_flag_n').setRequired(true);
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 1a5ab51e
......@@ -688,8 +688,8 @@
record.getField('produce_date').setRequired(true);
record.getField('using_hour').setRequired(true);
record.getField('machine_number_70').setRequired(true);
record.getField('modelcd').setReadOnly(false);
record.getField('modelcd').setRequired(true);
record.getField('modelcd').setReadOnly(true);
record.getField('modelcd').setRequired(false);
record.getField('full_name').setRequired(false);
record.getField('full_name_n').setRequired(false);
record.getField('ownership_flag_n').setRequired(true);
......@@ -1021,21 +1021,21 @@
/* var bp_ds_ids = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_HISTORY_INFO_1', 'prj_project_bp');
$(bp_ds_ids).setQueryParameter('bp_id','${/parameter/@bp_id_tenant}');
$(bp_ds_ids).query();*/
debugger;
if(lease_item_ds_id == ds.id &&lease_item_ds_id){
var gridId= ds.bindname+'_layout_grid_id';
if(division!='30' && division!='50'&& division!='99'){
$(gridId).hideColumn('machine_number_n');
}
if((division=='70'||division=='92')&&division!=''){
//debugger;
if(record!=''){
record.getField('lease_name_n').setRequired(true);
record.getField('brand_value').setRequired(true);
record.getField('produce_date').setReadOnly(false);
record.getField('produce_date').setRequired(true);
record.getField('using_hour').setRequired(true);
record.getField('modelcd').setReadOnly(false);
record.getField('modelcd').setRequired(true);
record.getField('modelcd').setReadOnly(true);
record.getField('modelcd').setRequired(false);
record.getField('ownership_flag_n').setRequired(true);
record.getField('residual_value_amount').setRequired(true);
record.getField('full_name').setRequired(false);
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 1a5ab51e
......@@ -646,15 +646,17 @@
if(division!='30' && division!='50'){
$(gridId).hideColumn('machine_number_n');
}
debugger;
if((division=='70'||division=='92')&&division!=''){
debugger;
if(record!=''){
record.getField('lease_name_n').setRequired(true);
record.getField('brand_value').setRequired(true);
record.getField('produce_date').setReadOnly(false);
record.getField('produce_date').setRequired(true);
record.getField('using_hour').setRequired(true);
record.getField('modelcd').setReadOnly(false);
record.getField('modelcd').setRequired(true);
record.getField('modelcd').setReadOnly(true);
record.getField('modelcd').setRequired(false);
record.getField('ownership_flag_n').setRequired(true);
record.getField('residual_value_amount').setRequired(true);
record.getField('full_name').setRequired(false);
......@@ -1296,14 +1298,15 @@
var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
if (lease_item_ds_id == ds.id && lease_item_ds_id) {
if(division=='70'||division=='92'){
debugger;
record.getField('lease_name_n').setRequired(true);
record.getField('brand_value').setRequired(true);
record.getField('produce_date').setReadOnly(false);
record.getField('produce_date').setRequired(true);
record.getField('using_hour').setRequired(true);
record.getField('machine_number_70').setRequired(true);
record.getField('modelcd').setReadOnly(false);
record.getField('modelcd').setRequired(true);
record.getField('modelcd').setReadOnly(true);
record.getField('modelcd').setRequired(false);
record.getField('full_name').setRequired(false);
record.getField('full_name_n').setRequired(false);
record.getField('ownership_flag_n').setRequired(true);
......
src/main/webapp/modules/rpt/RPT555/con_je_vat_query.lview
View file @ 1a5ab51e
......@@ -42,6 +42,12 @@
$(grid_ds_id_before_6).query();
$(grid_ds_id_current).query();
$(grid_ds_id_current_6).query();*/
//新增database tab页
var grid_ds_id_database = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_DATABASE_RESULT', 'con_contract');
$(grid_ds_id_database).setQueryDataSet($(form_ds_id));
$(grid_ds_id_database).setQueryUrl('${/request/@context_path}/autocrud/rpt.RPT555.con_je_vat_database_query/query');
Leaf.Masker.mask(detail_mask, '正在保存中。。。');
Leaf.request({
url: $('process_vat_account_data_link').getUrl(),
......@@ -56,6 +62,7 @@
$(grid_ds_id_before_6).query();
$(grid_ds_id_current).query();
$(grid_ds_id_current_6).query();
$(grid_ds_id_database).query();
Leaf.Masker.unmask(detail_mask);
},
failure: function () {
......
src/main/webapp/modules/rpt/RPT556/con_je_vat_quarter_query.lview 0 → 100644
View file @ 1a5ab51e
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: wangwei
$Date: 2023-3-16 下午2:20:47
$Revision: 1.0
$Purpose:
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
<a:view>
<a:link id="con_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
modelaction="update"/>
<a:link id="process_vat_account_data_link" model="rpt.RPT556.con_je_vat_total_query_quarter" modelaction="update"/>
<a:link id="get_period_quarter_period_link_id" model="rpt.RPT556.con_je_vat_quarter_query" modelaction="execute"></a:link>
<script type="text/javascript"><![CDATA[
//查询数据
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
var base_period=$(form_ds_id).getAt(0).get('base_period');
if (typeof(base_period) == 'undefined' && Ext.isEmpty(base_period)) {
Leaf.showMessage('${l:HLS.PROMPT}', '请先选择基准期间!');
return;
}
debugger;
var start_period,end_period;
Leaf.request({
url: $('get_period_quarter_period_link_id').getUrl(),
para: {
base_period: $(form_ds_id).getAt(0).get('base_period')
},
success: function (res) {
start_period=res.result.start_period;
end_period=res.result.end_period;
},
failure: function () {
//Leaf.Masker.unmask(detail_mask);
},
error: function () {
// Leaf.Masker.unmask(detail_mask);
},
sync: true,
scope: this
});
//alert(start_period);
//alert(end_period);
var grid_ds_id_before = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BEFORE_RESULT', 'con_contract');
var grid_ds_id_before_6 = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BEFORE_RESULT_6', 'con_contract');
var grid_ds_id_current = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_CURRENT_RESULT', 'con_contract');
var grid_ds_id_current_6 = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_CURRENT_RESULT_6', 'con_contract');
var grid_ds_id_total = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_SUM_RESULT', 'con_contract');
var grid_vat_6_ds_id_total = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_SUM_RESULT_6', 'con_contract');
var detail_mask = Ext.getBody();
Leaf.Masker.mask(detail_mask, '正在保存中。。。');
Leaf.request({
url: $('process_vat_account_data_link').getUrl(),
para: {
start_period: start_period,
end_period:end_period
},
success: function () {
//前期未开票
$(grid_ds_id_before).setQueryUrl('${/request/@context_path}/autocrud/rpt.RPT556.con_je_vat_quarter_query/query?vat_6_flag=N');
$(grid_ds_id_before_6).setQueryUrl('${/request/@context_path}/autocrud/rpt.RPT556.con_je_vat_quarter_query/query?vat_6_flag=Y');
$(grid_ds_id_before).setQueryParameter('start_period',start_period);
$(grid_ds_id_before).setQueryParameter('end_period',end_period);
$(grid_ds_id_before_6).setQueryParameter('start_period',start_period);
$(grid_ds_id_before_6).setQueryParameter('end_period',end_period);
$(grid_ds_id_before).query();
$(grid_ds_id_before_6).query();
//当期未开票
$(grid_ds_id_current).setQueryUrl('${/request/@context_path}/autocrud/rpt.RPT556.con_je_vat_current_quarter_query/query?vat_6_flag=N');
$(grid_ds_id_current_6).setQueryUrl('${/request/@context_path}/autocrud/rpt.RPT556.con_je_vat_current_quarter_query/query?vat_6_flag=Y');
$(grid_ds_id_current).setQueryParameter('start_period',start_period);
$(grid_ds_id_current).setQueryParameter('end_period',end_period);
$(grid_ds_id_current_6).setQueryParameter('start_period',start_period);
$(grid_ds_id_current_6).setQueryParameter('end_period',end_period);
$(grid_ds_id_current).query();
$(grid_ds_id_current_6).query();
//已开票
$(grid_ds_id_total).setQueryUrl('${/request/@context_path}/autocrud/rpt.RPT556.con_je_vat_total_query_quarter/query?vat_6_flag=N');
$(grid_vat_6_ds_id_total).setQueryUrl('${/request/@context_path}/autocrud/rpt.RPT556.con_je_vat_total_query_quarter/query?vat_6_flag=Y');
$(grid_ds_id_total).setQueryDataSet($(form_ds_id));
$(grid_ds_id_total).setQueryParameter('vat_6_flag','N');
$(grid_vat_6_ds_id_total).setQueryDataSet($(form_ds_id));
$(grid_vat_6_ds_id_total).setQueryParameter('vat_6_flag','Y');
$(grid_ds_id_total).query();
$(grid_vat_6_ds_id_total).query();
Leaf.Masker.unmask(detail_mask);
},
failure: function () {
Leaf.Masker.unmask(detail_mask);
},
error: function () {
Leaf.Masker.unmask(detail_mask);
},
scope: this
});
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
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