Commit 6a9c2afa authored by Spencer Chang's avatar Spencer Chang

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

parents 9472f8ef 337b33c6
...@@ -18,6 +18,7 @@ sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','MKTAUDITING','营业新增 ...@@ -18,6 +18,7 @@ sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','MKTAUDITING','营业新增
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','ACCAUDITING','会计新增确认中','ZHS',''); sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','ACCAUDITING','会计新增确认中','ZHS','');
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','CANCELLED','已作废','ZHS',''); sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','CANCELLED','已作废','ZHS','');
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','RETURNED','已退款','ZHS',''); sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','RETURNED','已退款','ZHS','');
sys_code_pkg.insert_sys_code_value('CONFIRMED_FLAG','DEBTAUDITING','债权新增确认中','ZHS','');
sys_code_pkg.delete_sys_code('PAID_BYOTHER_FLAG'); sys_code_pkg.delete_sys_code('PAID_BYOTHER_FLAG');
sys_code_pkg.insert_sys_code('PAID_BYOTHER_FLAG', '代付', '代付', '代付', 'ZHS', ''); sys_code_pkg.insert_sys_code('PAID_BYOTHER_FLAG', '代付', '代付', '代付', 'ZHS', '');
......
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool INITIALIZE_SYSCODE_CSH_TRANSACTION.log
set feedback off
set define off
<!--系统代码取值-->
BEGIN
sys_message_pkg.delete_message('E_SAME_RECODER');
sys_message_pkg.insert_message('E_SAME_RECODER',
'错误',
'制单人和确认人不能为同一人!','ZHS');
END;
commit;
set feedback on
set define on
spool off
exit
\ No newline at end of file
...@@ -12,6 +12,8 @@ begin ...@@ -12,6 +12,8 @@ begin
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510N.csh_transaction_list_tmp'); sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510N.csh_transaction_list_tmp');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_for_lov'); sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_for_lov');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update'); sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update');
sys_function_assign_pkg.func_bm_load('CSH509','csh.CSH509.query_roles_info');
sys_function_assign_pkg.func_bm_load('CSH510','csh.CSH510.csh_transaction_update_bp_info');
end; end;
/ /
......
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_REPO001.log
set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/csh/CSH510/csh_transaction_hand_receipt_update.lview','收款维护',1,1,0);
sys_function_assign_pkg.func_service_load('CSH510','modules/csh/CSH510/csh_transaction_hand_receipt_update.lview');
end;
/
commit;
set feedback on
set define on
spool off
exit
WHENEVER SQLERROR EXIT FAILURE ROLLBACK;
WHENEVER OSERROR EXIT FAILURE ROLLBACK;
spool REGISTER_CON_REPO001.log
set feedback off
set define off
begin
--页面注册
sys_function_assign_pkg.service_load('modules/hls/HLS361N/hls_bp_master_credit.lview','授信管理',1,1,0);
--功能定义 EXERCISES001 是功能号
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS361N','授信管理','授信管理','30','','','modules/hls/HLS361N/hls_bp_master_credit.lview','ZHS',-1);
SYS_LOAD_SYS_FUNCTION_PKG.SYS_FUNCTION_LOAD('HLS361N','授信管理','授信管理','30','','','modules/hls/HLS361N/hls_bp_master_credit.lview','US',-1);
--分配页面 将页面分配给哪个功能号
sys_function_assign_pkg.func_service_load('HLS361N','modules/hls/HLS361N/hls_bp_master_credit.lview');
--分配菜单 p_function_group_code=>'DEMO1' 为功能EXERCISES001的菜单
sys_load_sys_function_grp_pkg.sys_function_group_item_load(p_function_group_code=>'CON_LEASE',p_function_code=>'HLS361N',p_enabled_flag=>'Y',P_USER_ID=>-1);
end;
/
commit;
set feedback on
set define on
spool off
exit
...@@ -23,7 +23,6 @@ alter table CSH_TRANSACTION add (PAID_BYOTHER_FLAG varchar2(10)); ...@@ -23,7 +23,6 @@ alter table CSH_TRANSACTION add (PAID_BYOTHER_FLAG varchar2(10));
alter table CON_CONTRACT add (LAST_RENT_DUE_DATE date); alter table CON_CONTRACT add (LAST_RENT_DUE_DATE date);
alter table CON_CONTRACT add (REPURCHASE_DATE date); alter table CON_CONTRACT add (REPURCHASE_DATE date);
alter table CON_CONTRACT add (PAYMENGT_DEADLINEDATE date); alter table CON_CONTRACT add (PAYMENGT_DEADLINEDATE date);
comment on column CSH_TRANSACTION.PAID_BYOTHER_FLAG is '代付'; comment on column CSH_TRANSACTION.PAID_BYOTHER_FLAG is '代付';
COMMENT ON column CSH_TRANSACTION.CONFIRMED_DATE COMMENT ON column CSH_TRANSACTION.CONFIRMED_DATE
IS '确认时间'; IS '确认时间';
...@@ -41,7 +40,6 @@ comment on column CON_CONTRACT.SUBJECT_MATTER_RESCISSIO ...@@ -41,7 +40,6 @@ comment on column CON_CONTRACT.SUBJECT_MATTER_RESCISSIO
is '解约事由'; is '解约事由';
comment on column CON_CONTRACT.REPURCHASE_TYPES comment on column CON_CONTRACT.REPURCHASE_TYPES
is '回购类型'; is '回购类型';
comment on column CON_CONTRACT.LAST_RENT_DUE_DATE is '前期租金支付约定日'; comment on column CON_CONTRACT.LAST_RENT_DUE_DATE is '前期租金支付约定日';
comment on column CON_CONTRACT.REPURCHASE_DATE is '解约回购日'; comment on column CON_CONTRACT.REPURCHASE_DATE is '解约回购日';
comment on column CON_CONTRACT.PAYMENGT_DEADLINEDATE is '支付预定期限(第1期)'; comment on column CON_CONTRACT.PAYMENGT_DEADLINEDATE is '支付预定期限(第1期)';
......
...@@ -26,6 +26,12 @@ comment on column csh_transaction.ACC_CONFIRMED_DATE is '会计确认时间'; ...@@ -26,6 +26,12 @@ comment on column csh_transaction.ACC_CONFIRMED_DATE is '会计确认时间';
comment on column csh_transaction.MKT_CONFIRMED_BY is '营业确认人'; comment on column csh_transaction.MKT_CONFIRMED_BY is '营业确认人';
comment on column csh_transaction.ACC_CONFIRMED_BY is '会计确认人 '; comment on column csh_transaction.ACC_CONFIRMED_BY is '会计确认人 ';
comment on column CSH_TRANSACTION.PAID_BYOTHER_FLAG is '代付'; comment on column CSH_TRANSACTION.PAID_BYOTHER_FLAG is '代付';
--将营业确认人改为债权确认人
ALTER TABLE csh_transaction RENAME COLUMN MKT_CONFIRMED_DATE TO DEBT_CONFIRMED_DATE;
ALTER TABLE csh_transaction RENAME COLUMN MKT_CONFIRMED_BY TO DEBT_CONFIRMED_BY;
comment on column csh_transaction.DEBT_CONFIRMED_DATE is '债权确认时间';
comment on column csh_transaction.DEBT_CONFIRMED_BY is '债权确认人';
COMMENT ON column CSH_TRANSACTION.CONFIRMED_DATE COMMENT ON column CSH_TRANSACTION.CONFIRMED_DATE
IS '确认时间'; IS '确认时间';
COMMENT ON column CSH_TRANSACTION.CONFIRMED_FLAG COMMENT ON column CSH_TRANSACTION.CONFIRMED_FLAG
......
CREATE OR REPLACE VIEW PRJ_PROJECT_LEASE_ITEM_HEAD_LV AS
select t.vehicle_class,
t.Lease_Item_Seq,
t.Brand_Id,
t.Series_Id,
t.Truck_Class,
t.Price,
t.Quantity,
t.Item_Engine_Number,
t.Horsepower,
t.NOTICE_NUMBER,
t.Gps_Flag,
(SELECT a.description value_name
FROM hls_car_brands_vl a
WHERE t.brand_id = a.brand_id
AND a.enabled_flag = 'Y') brand_id_n,
(SELECT a.description
FROM hls_car_series_vl a
WHERE a.series_id = t.series_id) series_id_n,
(select code_value_name
from sys_code_values_v scv
where scv.code = 'TRUCK_CLASS'
and scv.code_value = t.Truck_Class) Truck_Class_n,
(t.price * t.quantity) TOTAL_AMOUNT,
t.project_id,
t.project_lease_item_id,
t.lease_item_id,
(select i.full_name from hls_lease_item i where i.lease_item_id = t.lease_item_id) lease_item_id_n,
t.Vehicles_Number,
(select COUNT(1)
from CON_CONTRACT_LEASE_ITEM CI
where CI.PROJECT_LEASE_ITEM_ID = T.PROJECT_LEASE_ITEM_ID) CONFIRM_NUMBER,
t.insurance_price,
t.gps_amount,
t.Purchase_Tax,
t.model_id,
(SELECT a.description
FROM hls_car_model_vl a
WHERE a.model_id = t.model_id) model_id_n,
t.guide_price,
t.VEHICLE_TYPE,
(select a.code_value_name
from sys_code_values_v a
where a.code = 'HLS_VEHICLE_TYPE'
and a.code_value=t.vehicle_type) vehicle_type_n,
--add by chenlingfeng
t.ton_code,
t.short_name,
t.full_name,
t.pattern,
(select v.code_value_name as value_name
from sys_code_values_v v
where v.code = 'DS_TON_NAME'
and t.ton_code = v.code_value) ton_code_n,
t.ITEM_TYPE ,--物件类型
(select v.code_value_name as value_name
from sys_code_values_v v
where v.code = 'DS_ITEM_TYPE'
and t.ITEM_TYPE = v.code_value) ITEM_TYPE_n,
t.machine_number ,--机号
t.equipment_type,
(select v.code_value_name as value_name
from sys_code_values_v v
where v.code = 'EQUIPMENT_TYPE'
and t.EQUIPMENT_TYPE = v.code_value) EQUIPMENT_TYPE_n,
t.FACTORY_price,
t.DELIVERY_DATE,
t.sale_date,
--add by lijingjing
t.division,
t.machine_model,
t.equipments,
t.accessories,
t.origin_place,
t.machine_model_class,
(select v.code_value_name as value_name
from sys_code_values_v v
where v.code = 'MACHINE_MODEL_CLASS'
and t.machine_model_class = v.code_value) machine_model_class_n,
(select v.code_value_name as value_name
from sys_code_values_v v
where v.code = 'ORIGIN_PLACE'
and t.origin_place = v.code_value) origin_place_n,
(select v.code_value_name as value_name
from sys_code_values_v v
where v.code = 'DIVISION'
and t.division = v.code_value) division_n,
t.full_name full_name_n
--end
from prj_project_lease_item t;
\ No newline at end of file
...@@ -51,11 +51,30 @@ ...@@ -51,11 +51,30 @@
<bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String" <bm:field name="exchange_rate_type_desc" databaseType="VARCHAR2" datatype="java.lang.String"
physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/> physicalName="EXCHANGE_RATE_TYPE_DESC" prompt="HLS.EXCHANGE_RATE_TYPE_DESC"/>
<bm:field name="invoice_bp_tax_registry_num" databaseType="VARCHAR2" datatype="java.lang.String"/> <bm:field name="invoice_bp_tax_registry_num" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_method" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_way_n" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_frequency_n" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="billing_object_name" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="invoice_title" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="object_taxpayer_type" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="invoice_bp_address_phone_num" databaseType="VARCHAR2" datatype="java.lang.String"/>
<bm:field name="invoice_bp_bank_account" databaseType="VARCHAR2" datatype="java.lang.String"/>
</bm:fields> </bm:fields>
<bm:operations> <bm:operations>
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select t.cashflow_id, select t.cashflow_id,
t.bp_name,--承租人姓名
con.billing_method,--开票规则
con.billing_way_n,--开票方式
con.billing_frequency_n,--开票频率
aic.billing_object_name,--开票对象
t.invoice_title,--发票抬头
aic.object_taxpayer_type,--纳税人类型
t.invoice_bp_address_phone_num,--开票地址电话
t.invoice_bp_bank_account,--开户行及账号
t.record_id, t.record_id,
t.billing_object, t.billing_object,
(select c.code_value_name (select c.code_value_name
...@@ -141,10 +160,12 @@ ...@@ -141,10 +160,12 @@
t.invoice_bp_tax_registry_num t.invoice_bp_tax_registry_num
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,
acr_invoice_contract_v aic
where t.session_id = ${/session/@session_id} where t.session_id = ${/session/@session_id}
and t.contract_id = con.contract_id and t.contract_id = con.contract_id
and t.cashflow_id = cf.cashflow_id and t.cashflow_id = cf.cashflow_id
and con.contract_id = aic.contract_id
order by con.contract_id,cf.times,t.cf_item order by con.contract_id,cf.times,t.cf_item
]]> ]]>
</bm:query-sql> </bm:query-sql>
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
and cc.bp_id_agent_level1 = h.bp_id), and cc.bp_id_agent_level1 = h.bp_id),
t2.tax_registry_num) OBJECT_TAX_REGISTRY_NUM, t2.tax_registry_num) OBJECT_TAX_REGISTRY_NUM,
nvl(t2.bill_object_bp_class,t1.BILL_OBJECT_BP_CLASS) BILL_OBJECT_BP_CLASS, nvl(t2.bill_object_bp_class,t1.BILL_OBJECT_BP_CLASS) BILL_OBJECT_BP_CLASS,
nvl(t2.bill_object_bp_class_DESC,t1.BILL_OBJECT_BP_CLASS_DESC) BILL_OBJECT_BP_CLASS_DESC, nvl(t2.bill_object_bp_class_desc,t1.BILL_OBJECT_BP_CLASS_DESC) BILL_OBJECT_BP_CLASS_DESC,
t1.TAX_TYPE_VAT, t1.TAX_TYPE_VAT,
t1.DESCRIPTION, t1.DESCRIPTION,
--t1.INVOICE_TITLE, --t1.INVOICE_TITLE,
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
t1.inv_billing_object_name, t1.inv_billing_object_name,
t1.small_scale_taxpayer t1.small_scale_taxpayer
FROM ACR_INVOICE_CONTRACT_V t1, ACR_INVOICE_CONTRACT_CF_V t2 FROM ACR_INVOICE_CONTRACT_V t1, ACR_INVOICE_CONTRACT_CF_V t2
#WHERE_CLAUSE# WHERE t2.due_date<sysdate
ORDER BY ORDER BY
t1.contract_id, t1.contract_id,
t2.times, t2.times,
...@@ -341,7 +341,6 @@ ...@@ -341,7 +341,6 @@
<bm:query-field name="bill_flag" <bm:query-field name="bill_flag"
queryExpression="(${@bill_flag} = 'Y' and t1.billing_frequency in (${@times_bill_flag},${@mid_bill_flag},${@final_bill_flag},${@et_bill_flag}) )"/> queryExpression="(${@bill_flag} = 'Y' and t1.billing_frequency in (${@times_bill_flag},${@mid_bill_flag},${@final_bill_flag},${@et_bill_flag}) )"/>
<bm:query-field name="all_contract_number" <bm:query-field name="all_contract_number"
queryExpression="(t1.contract_number in (Select regexp_substr( replace(replace(replace(${@all_contract_number},chr(32)),chr(10)),chr(13)), '[^,]+', 1, Level) From dual Connect By regexp_substr(replace(replace(replace(${@all_contract_number},chr(32)),chr(10)),chr(13)), '[^,]+', 1, Level) Is Not Null) )"/> queryExpression="(t1.contract_number in (Select regexp_substr( replace(replace(replace(${@all_contract_number},chr(32)),chr(10)),chr(13)), '[^,]+', 1, Level) From dual Connect By regexp_substr(replace(replace(replace(${@all_contract_number},chr(32)),chr(10)),chr(13)), '[^,]+', 1, Level) Is Not Null) )"/>
<bm:query-field name="notreceived_amount_from" <bm:query-field name="notreceived_amount_from"
...@@ -359,6 +358,7 @@ ...@@ -359,6 +358,7 @@
queryExpression="t1.bill_object_bp_class = ${@bill_object_bp_class}"/> queryExpression="t1.bill_object_bp_class = ${@bill_object_bp_class}"/>
<bm:query-field name="contract_status" <bm:query-field name="contract_status"
queryExpression="t1.contract_status = ${@contract_status}"/> queryExpression="t1.contract_status = ${@contract_status}"/>
<!-- <bm:query-field name="" queryExpression="t2.due_date &lt;= sysdate"/>-->
</bm:query-fields> </bm:query-fields>
<bm:data-filters> <bm:data-filters>
<bm:data-filter enforceOperations="query" <bm:data-filter enforceOperations="query"
...@@ -366,10 +366,10 @@ ...@@ -366,10 +366,10 @@
<bm:data-filter enforceOperations="query" expression="t2.write_off_flag != &apos;NOT&apos;"/> <bm:data-filter enforceOperations="query" expression="t2.write_off_flag != &apos;NOT&apos;"/>
<bm:data-filter enforceOperations="query" <bm:data-filter enforceOperations="query"
expression="t2.billing_status != &apos;FULL&apos; and t2.cf_direction=&apos;INFLOW&apos;"/> expression="t2.billing_status != &apos;FULL&apos; and t2.cf_direction=&apos;INFLOW&apos;"/>
<!-- <bm:data-filter enforceOperations="query" <bm:data-filter enforceOperations="query"
expression="t2.contract_id = t1.contract_id AND t1.billing_status IN (&apos;NOT&apos;, &apos;PARTIAL&apos;) AND t1.contract_status not in (&apos;NEW&apos;,&apos;CANCEL&apos;) AND t2.cf_status = &apos;RELEASE&apos;"/> expression="t2.contract_id = t1.contract_id AND t1.billing_status IN (&apos;NOT&apos;, &apos;PARTIAL&apos;) AND t1.contract_status not in (&apos;NEW&apos;,&apos;CANCEL&apos;) AND t2.cf_status = &apos;RELEASE&apos;"/>
<bm:data-filter enforceOperations="query" expression="(t2.times != 0)"/>--> <bm:data-filter enforceOperations="query" expression="(t2.times != 0)"/>
<bm:data-filter enforceOperations="query" <bm:data-filter enforceOperations="query"
expression="not (t2.cf_item = 301 and nvl(direct_sales_agent_flag,'N') = 'Y')"/> expression="not (t2.cf_item = 301 and nvl(direct_sales_agent_flag,'N') = 'Y')"/>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2019-01-14 16:29:48
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select *
from exp_emp_assign_e_v t1
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
csh_transaction_pkg.update_muti_confirmed_flag(
p_transaction_id =>${@transaction_id},
p_wanted_confirmed_flag =>${@wanted_confirmed_flag},
p_wanted_written_off_flag=>${@wanted_written_off_flag},
p_confirmed_by =>${@confirmed_by},
p_user_id =>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
<bm:operation name="insert">
<bm:update-sql><![CDATA[
]]></bm:update-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="user_id" queryOperator="="/>
</bm:query-fields>
</bm:model>
...@@ -93,6 +93,10 @@ ...@@ -93,6 +93,10 @@
<bm:field name="sus_belnr"/> <bm:field name="sus_belnr"/>
<bm:field name="bp_virtual_bank_account"/> <bm:field name="bp_virtual_bank_account"/>
<bm:field name="confirmed_flag" /> <bm:field name="confirmed_flag" />
<bm:field name="debt_confirmed_by"/>
<bm:field name="debt_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.debt_confirmed_by)" forInsert="false" forUpdate="false"/>
<bm:field name="acc_confirmed_by"/>
<bm:field name="acc_confirmed_by_desc" expression="(select description from sys_user where user_id=t1.acc_confirmed_by)" forInsert="false" forUpdate="false"/>
</bm:fields> </bm:fields>
<bm:features> <bm:features>
<f:standard-who/> <f:standard-who/>
......
...@@ -10,9 +10,8 @@ ...@@ -10,9 +10,8 @@
<bm:operation name="update"> <bm:operation name="update">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
csh_transaction_pkg.update_confirmed_flag( csh_transaction_pkg.update_confirmer_by_condition(
p_transaction_id =>${@transaction_id}, p_transaction_id =>${@transaction_id},
p_wanted_confirmed_flag =>${@wanted_confirmed_flag},
p_user_id =>${session/@user_id} p_user_id =>${session/@user_id}
); );
end; end;
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2019-9-12 下午07:57:46
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
update csh_transaction c
set bp_id=${@bp_id}
where transaction_id=${@transaction_id}
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -69,9 +69,73 @@ ...@@ -69,9 +69,73 @@
<bm:operation name="insert"> <bm:operation name="insert">
<bm:update-sql><![CDATA[ <bm:update-sql><![CDATA[
begin begin
DS_IMPORT_CORE_PKG.csh_trx_bank_import( csh_transaction_pkg.save_receipt_import(
p_header_id =>${/parameter/@header_id}, p_transaction_id =>${@transaction_id},
p_user_id =>${/session/@user_id}); p_transaction_num =>${@transaction_num},
p_transaction_category =>'BUSINESS',
p_transaction_type =>'RECEIPT',
p_transaction_date =>to_date(${@transaction_date},'yyyy-mm-dd'),
p_penalty_calc_date =>to_date(${@transaction_date},'yyyy-mm-dd'),
p_bank_slip_num =>${@bank_slip_num},
p_company_id =>${/session/@company_id},
p_internal_period_num =>${@internal_period_num},
p_period_name =>${@period_name},
p_payment_method_id =>${@payment_method_id},
p_distribution_set_id =>${@distribution_set_id},
p_cashflow_amount =>${@transaction_amount},
p_currency_code =>${@currency_code},
p_transaction_amount =>${@transaction_amount},
p_exchange_rate_type =>${@exchange_rate_type},
p_exchange_rate_quotation =>${@exchange_rate_quotation},
p_exchange_rate =>${@exchange_rate},
p_bank_account_id =>${@bank_account_id},
p_bp_category =>${@bp_category},
p_bp_id =>${@bp_id},
p_bp_bank_account_id =>${@bp_bank_account_id},
p_bp_bank_account_num =>${@bp_bank_account_num},
p_description =>${@description},
p_handling_charge =>${@handling_charge},
p_posted_flag =>nvl(${@posted_flag},'N'),
p_reversed_flag =>nvl(${@reversed_flag},'N'),
p_reversed_date =>to_date(${@reversed_date},'yyyy-mm-dd 24hh:mi:ss'),
p_returned_flag =>nvl(${@returned_flag},'NOT'),
p_returned_amount =>${@returned_amount},
p_write_off_flag =>nvl(${@write_off_flag},'NOT'),
p_write_off_amount =>${@write_off_amount},
p_full_write_off_date =>to_date(${@full_write_off_date},'yyyy-mm-dd 24hh:mi:ss'),
p_twin_csh_trx_id =>${@twin_csh_trx_id},
p_return_from_csh_trx_id =>${@return_from_csh_trx_id},
p_reversed_csh_trx_id =>${@reversed_csh_trx_id},
p_source_csh_trx_type =>${@source_csh_trx_type},
p_source_csh_trx_id =>${@source_csh_trx_id},
p_source_doc_category =>${@source_doc_category},
p_source_doc_type =>${@source_doc_type},
p_source_doc_id =>${@source_doc_id},
p_source_doc_line_id =>${@source_doc_line_id},
p_create_je_mothed =>${@create_je_mothed},
p_create_je_flag =>nvl(${@create_je_flag},'N'),
p_gld_interface_flag =>nvl(${@gld_interface_flag},'N'),
p_user_id =>${/session/@user_id},
p_ref_contract_id => ${@ref_contract_id},
p_receipt_type => ${@receipt_type},
p_csh_bp_name => ${@csh_bp_name},
p_ref_n01 =>${@ref_n01},
p_bp_bank_name =>${@bp_bank_name},
p_bp_bank_branch_name =>${@bp_bank_branch_name},
p_collection_classes =>${@collection_classes},
p_bp_bank_account_name =>${@bp_bank_account_name},
p_opposite_band_na =>${@opposite_band_na},
p_banka =>${@banka},
p_purpose =>${@purpose},
p_gsber =>${@gsber},
p_sus_belnr =>${@sus_belnr},
p_bp_virtual_bank_account =>${@bp_virtual_bank_account},
p_zuonr =>${@bank_slip_num},
p_paid_byother_flag =>${@paid_byother_flag},
p_ref_v05 =>${@ref_v05},
p_status =>${@status},
p_bank_account_num =>${@bank_account_num}
);
end; end;
]]></bm:update-sql> ]]></bm:update-sql>
</bm:operation> </bm:operation>
......
...@@ -73,7 +73,8 @@ ...@@ -73,7 +73,8 @@
p_bp_virtual_bank_account =>${@bp_virtual_bank_account}, p_bp_virtual_bank_account =>${@bp_virtual_bank_account},
p_zuonr=>${@bank_slip_num}, p_zuonr=>${@bank_slip_num},
p_paid_byother_flag =>${@paid_byother_flag}, p_paid_byother_flag =>${@paid_byother_flag},
p_ref_v05 =>${@ref_v05} p_ref_v05 =>${@ref_v05},
p_status =>${@status}
); );
end; end;
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2014-2-28 下午03:32:03
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
prj_project_check_pkg.check_prj_record(
p_project_id =>${@project_id},
p_payment_deduction =>${@payment_deduction},
p_secondary_lease =>${@secondary_lease},
p_price_list =>${@price_list}
);
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="payment_deduction" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@payment_deduction"/>
<bm:parameter name="secondary_lease" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@secondary_lease"/>
<bm:parameter name="price_list" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@price_list"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: shenyamin
$Date: 2018-11_03 上午11:00:06
$Revision: 3.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
prj_project_pkg.project_submit(
p_project_id =>${@project_id},
p_user_id => ${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
...@@ -69,36 +69,36 @@ ...@@ -69,36 +69,36 @@
} }
function onLoad_cashflowDs(ds) { // function onLoad_cashflowDs(ds) {
var hd_ds = $('contractDs'), // var hd_ds = $('contractDs'),
r = hd_ds.getCurrentRecord(); // r = hd_ds.getCurrentRecord();
if (hd_ds.getSelected().indexOf(r) != -1) { // if (hd_ds.getSelected().indexOf(r) != -1) {
ds.selectAll.defer(5, ds); // ds.selectAll.defer(5, ds);
} // }
} // }
var isSelectFromLine = false; var isSelectFromLine = false;
function onSelect_contractDs(ds, record) { // function onSelect_contractDs(ds, record) {
ds.locate(ds.indexOf(record) + 1); // ds.locate(ds.indexOf(record) + 1);
if (!isSelectFromLine) { // if (!isSelectFromLine) {
$('cashflowDs').selectAll(); // $('cashflowDs').selectAll();
} // }
//
} // }
function unselect_contractDs(ds, record) { // function unselect_contractDs(ds, record) {
ds.locate(ds.indexOf(record) + 1); // ds.locate(ds.indexOf(record) + 1);
$('cashflowDs').unSelectAll(); // $('cashflowDs').unSelectAll();
} // }
function onSelect_invoiceLineDs(ds, record) { // function onSelect_invoiceLineDs(ds, record) {
record.dirty = true; // record.dirty = true;
isSelectFromLine = true; // isSelectFromLine = true;
$('contractDs').select($('contractDs').getCurrentRecord()); // $('contractDs').select($('contractDs').getCurrentRecord());
isSelectFromLine = false; // isSelectFromLine = false;
} // }
function unSelect_invoiceLineDs(ds, record) { // function unSelect_invoiceLineDs(ds, record) {
record.dirty = false; // record.dirty = false;
} // }
function render_contractDs_grid(value, record, name) { function render_contractDs_grid(value, record, name) {
if (name == 'billing_object_name') { if (name == 'billing_object_name') {
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="contractDs" autoQuery="true" fetchAll="true" model="acr.ACR510.acr_invoice_contract_v" <a:dataSet id="contractDs" autoQuery="false" fetchAll="false" model="acr.ACR510.acr_invoice_contract_v"
queryDataSet="conditionDs" queryDataSet="conditionDs"
queryUrl="${/request/@context_path}/autocrud/acr.ACR510.acr_invoice_contract_v/query?company_id=${/parameter/@company_id}" queryUrl="${/request/@context_path}/autocrud/acr.ACR510.acr_invoice_contract_v/query?company_id=${/parameter/@company_id}"
selectable="true"> selectable="true">
...@@ -129,21 +129,21 @@ ...@@ -129,21 +129,21 @@
</a:mapping> </a:mapping>
</a:field> </a:field>
</a:fields> </a:fields>
<a:events> <!-- <a:events>-->
<a:event name="select" handler="onSelect_contractDs"/> <!-- <a:event name="select" handler="onSelect_contractDs"/>-->
<a:event name="unselect" handler="unselect_contractDs"/> <!-- <a:event name="unselect" handler="unselect_contractDs"/>-->
</a:events> <!-- </a:events>-->
</a:dataSet> </a:dataSet>
<a:dataSet id="cashflowDs" bindName="line_info" bindTarget="contractDs" fetchAll="true" <a:dataSet id="cashflowDs" bindName="line_info" bindTarget="contractDs" fetchAll="true"
model="acr.ACR510.acr_invoice_contract_cf_v" selectable="true"> model="acr.ACR510.acr_invoice_contract_cf_v" selectable="true">
<a:fields> <a:fields>
<a:field name="last_received_date" datatype="date"/> <a:field name="last_received_date" datatype="date"/>
</a:fields> </a:fields>
<a:events> <!-- <a:events>-->
<a:event name="load" handler="onLoad_cashflowDs"/> <!-- <a:event name="load" handler="onLoad_cashflowDs"/>-->
<a:event name="select" handler="onSelect_invoiceLineDs"/> <!-- <a:event name="select" handler="onSelect_invoiceLineDs"/>-->
<a:event name="unselect" handler="unSelect_invoiceLineDs"/> <!-- <a:event name="unselect" handler="unSelect_invoiceLineDs"/>-->
</a:events> <!-- </a:events>-->
</a:dataSet> </a:dataSet>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
......
...@@ -17,8 +17,10 @@ ...@@ -17,8 +17,10 @@
<a:link id="csh_transaction_receipt_link" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt.lview"/> <a:link id="csh_transaction_receipt_link" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt.lview"/>
<a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/> <a:link id="sys_service_welcome_link" url="${/request/@context_path}/welcome.lview"/>
<a:link id="csh_transaction_receipt_update_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_receipt_update.lview"/> <a:link id="csh_transaction_receipt_update_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_receipt_update.lview"/>
<a:link id="csh_transaction_receipt_maintain_post_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_receipt_update.lview"/> <!-- <a:link id="csh_transaction_receipt_maintain_post_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_receipt_update.lview"/>-->
<!-- <a:link id="csh_transaction_receipt_maintain_post_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_receipt_post_query.lview"/> --> <a:link id="csh_transaction_receipt_maintain_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview"/>
<a:link id="csh_transaction_receipt_maintain_readonly_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_hand_receipt_update_readonly.lview"/>
<a:link id="csh510_csh_transaction_batch_update" model="csh.CSH510.csh_transaction_delete" modelaction="batch_update"/> <a:link id="csh510_csh_transaction_batch_update" model="csh.CSH510.csh_transaction_delete" modelaction="batch_update"/>
<a:link id="csh511_csh_transaction_batch_post_link" model="csh.CSH511.csh_transaction_post" modelaction="batch_update"/> <a:link id="csh511_csh_transaction_batch_post_link" model="csh.CSH511.csh_transaction_post" modelaction="batch_update"/>
<!--更新收款单据的状态--> <!--更新收款单据的状态-->
...@@ -28,39 +30,80 @@ ...@@ -28,39 +30,80 @@
<a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510N/csh_transaction_import.lview"/> <a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510N/csh_transaction_import.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//新增单据的作废
function csh510_csh_trx_bank_drop(){
var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
if (datas.length == 0) {
$L.showMessage("提示", '请选择要作废的单据');
return;
}
var post_data=[];
for(var i=0;i<datas.length;i=i+1) {
var confirmed_flag= datas[i].get('confirmed_flag');
//不是新增就报错
if(confirmed_flag!='NEW'&&confirmed_flag!=undefined){
$L.showInfoMessage("提示", '请选择单据为未提交的数据', null, null);
return;
}
//将对象封装到json对象数组
post_data.push({
'transaction_id': datas[i].get('transaction_id'),
//提交想改变之后的状态
'wanted_confirmed_flag': 'CANCELLED',
'_status': 'update'
});
};
//弹出确认修改的提示框
$L.showConfirm("提示",'确认执行该操作?',function(){
//锁屏
lock_current_window();
//作废单据
Leaf.request({
url: $('csh510N_csh_transaction_batch_update_confirmed_flag').getUrl(),
para: post_data,
success: function () {
unlock_current_window();
$('csh_transaction_receipt_maintain_result_ds').query();
Leaf.showMessage('${l:PROMPT}', '该单据已作废!');
}, failure: function () {
unlock_current_window();
},
error: function () {
unlock_current_window();
},
scope: this
});
})
}
//新增申请按钮’ //新增申请按钮’
function csh510_csh_trx_bank_apply_new() { function csh510_csh_trx_bank_apply_new() {
var datas = $('csh_transaction_receipt_maintain_result_ds').selected; var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
//获得所选择的的未提交的单据,如果有不是未提交的数据,提示重新进行选择 //获得所选择的的未提交的单据,如果有不是未提交的数据,提示重新进行选择
if (datas.length == 0) { if (datas.length == 0) {
$L.showMessage("${l:prompt}", '请至少选择一条数据'); $L.showMessage("提示", '请至少选择一条数据');
return; return;
} }
var post_data=[]; var post_data=[];
for(var i=0;i<datas.length;i=i+1) { for(var i=0;i<datas.length;i=i+1) {
var confirmed_flag= datas[i].get('confirmed_flag'); var confirmed_flag = datas[i].get('confirmed_flag');
//不是新增就报错 //不是新增就报错
if(confirmed_flag!='NEW'&&confirmed_flag!=undefined){ if (confirmed_flag != 'NEW' && confirmed_flag != undefined) {
$L.showInfoMessage("提示", '请选择单据为未提交的数据', null, null); $L.showInfoMessage("提示", '请选择单据为未提交的数据', null, null);
return; return;
} }
//弹出确认修改的提示框
var execute_flag=$L.showConfirm("提示",'确认执行该操作?')
//用户取消操作
if(flag==false) return ;
//将对象封装到json对象数组 //将对象封装到json对象数组
post_data.push({ post_data.push({
'transaction_id': datas[i].get('transaction_id'), 'transaction_id': datas[i].get('transaction_id'),
//提交想改变之后的状态
'wanted_confirmed_flag': 'MKTAUDITING',
'_status': 'update' '_status': 'update'
}); });
}; }
console.log(post_data); //弹出确认修改的提示框
$L.showConfirm("提示", '确认执行该操作?', function () {
//锁屏 //锁屏
lock_current_window(); lock_current_window();
//改变未提交单据数据的状态 //改变未提交单据数据的状态
...@@ -79,9 +122,7 @@ ...@@ -79,9 +122,7 @@
}, },
scope: this scope: this
}); });
});
} }
//跳转到收款新增页面 //跳转到收款新增页面
...@@ -166,15 +207,24 @@ ...@@ -166,15 +207,24 @@
} }
function seedetail_transaction_num(value, record, name) { function seedetail_transaction_num(value, record, name) {
console.log(record.get('receipt_type'));
console.log( record.get('bp_name'));
console.log( record.get('confirmed_flag'));
if (record.get('transaction_id')) { if (record.get('transaction_id')) {
var url; var url;
if (record.get('posted_flag') == 'N') { /*if (record.get('posted_flag') == 'N') {
url = $('csh_transaction_receipt_maintain_post_link').getUrl() + '?transaction_id=' + record.get('transaction_id'); url = $('csh_transaction_receipt_maintain_post_link').getUrl() + '?transaction_id=' + record.get('transaction_id');
} /*else*/ else if (record.get('posted_flag') == 'Y') { } /!*else*!/ else if (record.get('posted_flag') == 'Y') {
url = $('csh_transaction_receipt_update_link').getUrl() + '?transaction_id=' + record.get('transaction_id'); url = $('csh_transaction_receipt_update_link').getUrl() + '?transaction_id=' + record.get('transaction_id');
} else { } else {
return value; return value;
}*/
if(record.get('receipt_type')=='IMPORT'&&record.get('bp_name')==null&&record.get('confirmed_flag')=='NEW'){
url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true';
}else{
url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false';
} }
return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>'; return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>';
} }
} }
...@@ -368,6 +418,7 @@ ...@@ -368,6 +418,7 @@
} }
function csh510_csh_trx_bank_import(){ function csh510_csh_trx_bank_import(){
//只有债权内勤才能
var url_l = $('csh510_csh_transaction_import_link').getUrl(); var url_l = $('csh510_csh_transaction_import_link').getUrl();
...@@ -655,8 +706,8 @@ ...@@ -655,8 +706,8 @@
<a:column prompt="账号" name="bp_bank_account_num"/> <a:column prompt="账号" name="bp_bank_account_num"/>
</a:column> </a:column>
<a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY"/> <a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY"/>
<a:column name="mkt_confirmed_by" prompt="营业确认人"/> <a:column name="debt_confirmed_by_desc" prompt="债权确认人"/>
<a:column name="acc_confirmed_by" prompt="会计确认人"/> <a:column name="acc_confirmed_by_desc" prompt="会计确认人"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:fieldSet> </a:fieldSet>
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="import_csh_transaction_receipt_data_link_id" model="csh.CSH510N.csh_transaction_list_tmp" modelaction="execute"/> <a:link id="import_csh_transaction_receipt_data_link_id" model="csh.CSH510N.csh_transaction_list_tmp" modelaction="execute"/>
<a:link id="save_import_csh_transaction_receipt_data_link_id" model="csh.CSH510N.csh_transaction_list_tmp" modelaction="batch_update"/>
<a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/> <a:link id="get_period_name_id" model="csh.CSH511.csh_transaction_get_period_name" modelaction="query"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
...@@ -28,21 +29,29 @@ ...@@ -28,21 +29,29 @@
if(import_flag==0){ if(import_flag==0){
for (var i = 0;i < records.length;i++) { for (var i = 0;i < records.length;i++) {
var record=records[i]; var record=records[i];
if (record.get('status') == 'ERROR') {
/*if (record.get('status') == 'ERROR') {
//错误的行不导入,其他行正常导入,这里不再判断cuo,在插入数据的时候
Leaf.showMessage('${l:PROMPT}', '导入的数据存在错误,请查看错误信息!'); Leaf.showMessage('${l:PROMPT}', '导入的数据存在错误,请查看错误信息!');
return; //将该条数据从导入的ds中
} //return;
}*/
//获得周期时间 //获得周期时间
var r_date = record.get('attribute_3'); /* var r_date = record.get('attribute_3');
r_date = Leaf.formatDate(r_date); r_date = Leaf.formatDate(r_date);
Leaf.request({ Leaf.request({
url: $('get_period_name_id').getUrl(), url: $('get_period_name_id').getUrl(),
para: { para: {
p_date: r_date p_date: r_date,
date : new Date().getMilliseconds()
}, },
success: function(res){ success: function(res){
var period_name = res.result.record.period_name, var period_name = res.result.record.period_name,
internal_period_num = res.result.record.internal_period_num; internal_period_num = res.result.record.internal_period_num;
record.set('period_name', period_name);
record.set('internal_period_num', internal_period_num);
if (period_name) { if (period_name) {
record.set('period_name', period_name); record.set('period_name', period_name);
record.set('internal_period_num', internal_period_num); record.set('internal_period_num', internal_period_num);
...@@ -56,10 +65,11 @@ ...@@ -56,10 +65,11 @@
} }
}, },
scope: this scope: this
}); });*/
//否则的话添加必要的字段 //否则的话添加必要的字段
record.set('receipt_type','import'); record.set('receipt_type','IMPORT');
record.set('transaction_date',record.get('attribute_3')); record.set('bank_account_num',record.get('attribute_1'));
record.set('transaction_date', Leaf.formatDate(record.get('attribute_3')));
record.set('bank_slip_num',record.get('attribute_5')); record.set('bank_slip_num',record.get('attribute_5'));
record.set('currency_code', 'CNY'); record.set('currency_code', 'CNY');
record.set('transaction_amount',record.get('attribute_14')); record.set('transaction_amount',record.get('attribute_14'));
...@@ -69,35 +79,49 @@ ...@@ -69,35 +79,49 @@
record.set('opposite_band_na',record.get('attribute_10')); record.set('opposite_band_na',record.get('attribute_10'));
record.set('description',record.get('attribute_23')); record.set('description',record.get('attribute_23'));
record.set('ref_v05',record.get('attribute_24')); record.set('ref_v05',record.get('attribute_24'));
record.set('paid_byother_flag','F');
record.set('write_off_flag','DISABLED'); record.set('write_off_flag','DISABLED');
record.set('_status','insert');
//根据银行卡号设置我方的银行账号 //根据银行卡号设置我方的银行账号
Leaf.request({ /*Leaf.request({
url: $('import_csh_transaction_receipt_data_link_id').getUrl(), url: $('import_csh_transaction_receipt_data_link_id').getUrl(),
para: { para: {
bank_account_num:record.get('attribute_1'), bank_account_num:record.get('attribute_1'),
bp_bank_account_num:record.get('attribute_8') bp_bank_account_num:record.get('attribute_8')
}, },
success: function(res){ success: function(res){
record.set('bank_account_id',res.result.bank_account_id); record.set('bank_account_id',res.result.bank_account_id);
//根据对方的银行卡号获取商业伙伴信息 //根据对方的银行卡号获取商业伙伴信息
record.set('bp_category',res.result.bp_category); record.set('bp_category',res.result.bp_category);
record.set('bp_id',res.result.bp_id);
record.set('csh_bp_name',res.result.csh_bp_name); record.set('csh_bp_name',res.result.csh_bp_name);
//i. 若能找到唯一值且该商业伙伴类型为承租人,则代付字段为“否”、商业伙伴字段为匹配到的商业伙伴;
// ii. 若能找到唯一值且该商业伙伴类型为代理店,则代付字段为“是”、商业伙伴字段为匹配到的商业伙伴;
//iii. 若无法找到匹配项或匹配到多项,则代付字段为“是”、商业伙伴字段为空;
if(res.result.bp_id!=-1&&res.result.bp_category=='TENANT'){
record.set('paid_byother_flag','F');
record.set('bp_id',res.result.bp_id);
}else if(res.result.bp_id!=-1&&res.result.bp_category=='AGENCY'){
record.set('paid_byother_flag','T');
record.set('bp_id',res.result.bp_id);
}else{
record.set('paid_byother_flag','T');
record.set('bp_id',null);
}
}, },
scope: this scope: this
}); });*/
record.set('_status','insert');
saveData.push(record.data); saveData.push(record.data);
} }
//开始导入数据 //开始导入数据
Leaf.showConfirm('提示', '确定要导入信息吗?', function() {
Leaf.showConfirm('提示', '确定要导入信息吗,有错误信息的数据将不会被导入', function() {
Leaf.request({ Leaf.request({
url: '${/request/@context_path}/autocrud/csh.CSH511.csh_transaction_receipt_save/batch_update', url: $('save_import_csh_transaction_receipt_data_link_id').getUrl(),
para: saveData, para: saveData,
scope: this, scope: this,
success: function () { success: function () {
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<a:model-query fetchAll="true" model="csh.CSH511.csh_transaction_default_exchange_rate_type" rootPath="default_exchange_rate_type_path"/> <a:model-query fetchAll="true" model="csh.CSH511.csh_transaction_default_exchange_rate_type" rootPath="default_exchange_rate_type_path"/>
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="hn2050_upload_win_link" url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="csh_receipt_import_link" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt_impiort.lview"/> <a:link id="csh_receipt_import_link" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt_impiort.lview"/>
<a:link id="csh_transaction_receipt_id" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt.lview"/> <a:link id="csh_transaction_receipt_id" url="${/request/@context_path}/modules/csh/CSH511/csh_transaction_receipt.lview"/>
<a:link id="get_exchange_rate_link_id" model="csh.CSH511.csh_transaction_get_exchange_rate" modelaction="query"/> <a:link id="get_exchange_rate_link_id" model="csh.CSH511.csh_transaction_get_exchange_rate" modelaction="query"/>
...@@ -21,6 +22,26 @@ ...@@ -21,6 +22,26 @@
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/> <script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
<a:link id="transaction_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/> <a:link id="transaction_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//附件上传
function upload_attachment_win() {
/* var record = $(ds_id).findById(record_id);
var mortgage_id = record.get('mortgage_id');*/
console.log($('csh_transaction_receipt_head_ds').getAt(0).id);
var win = new Leaf.Window({
id: 'hn2050_upload_win',
url: $('hn2050_upload_win_link').getUrl(),
params: {
winid: 'hn2050_upload_win',
table_name: 'csh_transaction',
header_id: $('csh_transaction_receipt_head_ds').getAt(0).id
},
width: 900,
hight: 400
}).on('close', function() {
//record.ds.query();
});
}
var transaction_id; var transaction_id;
<!--增加重置功能--> <!--增加重置功能-->
function csh511_receipt_reset(){ function csh511_receipt_reset(){
...@@ -107,6 +128,7 @@ ...@@ -107,6 +128,7 @@
record.set('bp_bank_account_code', ''); record.set('bp_bank_account_code', '');
record.set('bp_bank_account_name', ''); record.set('bp_bank_account_name', '');
record.set('bp_bank_account_num', ''); record.set('bp_bank_account_num', '');
record.set('opposite_band_na', '');
} }
record.getField('bp_bank_account_code').setLovPara('bp_id', value); record.getField('bp_bank_account_code').setLovPara('bp_id', value);
} else if (name == 'currency_code') { } else if (name == 'currency_code') {
...@@ -117,7 +139,7 @@ ...@@ -117,7 +139,7 @@
record.set('exchange_rate_type_display', ''); record.set('exchange_rate_type_display', '');
record.set('exchange_rate_quotation', ''); record.set('exchange_rate_quotation', '');
if (oldvalue != null && oldvalue != '') { if (oldvalue != null && oldvalue != '') {
record.set('transaction_amount', ''); //record.set('transaction_amount', '');
record.set('transaction_functional_amount', ''); record.set('transaction_functional_amount', '');
} }
} }
...@@ -522,9 +544,13 @@ ...@@ -522,9 +544,13 @@
</a:box> </a:box>
</a:fieldSet> </a:fieldSet>
<a:fieldSet title="附件"> <a:fieldSet title="附件">
<input type="file" name="uploadFile"/> <a:hBox>
<input type="button" value="上传"/> <a>附件上传:</a><a href="javascript:upload_attachment_win()" style="color:red">上传</a>
</a:hBox>
</a:fieldSet> </a:fieldSet>
<!-- <a:form title="对方账户信息" width="1200"> <!-- <a:form title="对方账户信息" width="1200">
<a:box column="4"> <a:box column="4">
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_head_ds"/> <a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_head_ds"/>
......
...@@ -19,8 +19,13 @@ ...@@ -19,8 +19,13 @@
url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/> url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/>
<a:link id="hls213_sap_eai_create_vender_link" <a:link id="hls213_sap_eai_create_vender_link"
url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/> url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/>
<<<<<<< HEAD
<!-- <a:link id="Identity_ccx_link" <!-- <a:link id="Identity_ccx_link"
url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>--> url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>-->
=======
<!-- <a:link id="Identity_ccx_link"
url="${/request/@context_path}/modules/interface/INTERFACE_CCX/hlcm_ccxIdentity_interface.lsc"/>-->
>>>>>>> fc911afa6f82f272999782f0b1703081ee8d4607
<script src="${/request/@context_path}/javascripts/identity_card_info_query.js" type="text/javascript"/> <script src="${/request/@context_path}/javascripts/identity_card_info_query.js" type="text/javascript"/>
<a:link id="identity_query_link" model="interface.CCX_INTERFACE.identity_query" modelaction="update"/> <a:link id="identity_query_link" model="interface.CCX_INTERFACE.identity_query" modelaction="update"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
...@@ -85,41 +90,42 @@ ...@@ -85,41 +90,42 @@
var bp_record = $(bp_ds_id).getCurrentRecord(); var bp_record = $(bp_ds_id).getCurrentRecord();
var bp_id = bp_record.get('bp_id'); var bp_id = bp_record.get('bp_id');
Leaf.request({ // Leaf.request({
url: $('hls213_sap_eai_create_customer_link').getUrl(), // url: $('hls213_sap_eai_create_customer_link').getUrl(),
para: { // para: {
bp_id: bp_id // bp_id: bp_id
}, // },
scope: this, // scope: this,
success: function () { // success: function () {
Leaf.request({ // Leaf.request({
url: $('hls213_sap_eai_create_vender_link').getUrl(), // url: $('hls213_sap_eai_create_vender_link').getUrl(),
para: { // para: {
bp_id: bp_id // bp_id: bp_id
}, // },
scope: this, // scope: this,
success: function () { // success: function () {
$(bp_ds_id).setQueryParameter('bp_id', bp_id); // $(bp_ds_id).setQueryParameter('bp_id', bp_id);
$(bp_ds_id).query(); // $(bp_ds_id).query();
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
failure: function () { // failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
error: function () { // error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
sync: true // sync: true
}); // });
}, // },
failure: function () { // failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
error: function () { // error: function () {
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// },
// sync: true
// });
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
sync: true
});
}; };
...@@ -157,6 +163,81 @@ ...@@ -157,6 +163,81 @@
//由于中诚信测试环境只能测试张三,所以这里限定身份证号为张三的123456199001011233 //由于中诚信测试环境只能测试张三,所以这里限定身份证号为张三的123456199001011233
// if(value=='123456199001011233'){ // if(value=='123456199001011233'){
// //
<<<<<<< HEAD
// var url1 = $('identity_query_link').getUrl();
// window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
/* Leaf.request({
url: url1,
para: {
id_card_no: value,//身份证号码
bp_name: bp_name
},
success: function (res) {
var resmsg_1 = res.result.resmsg_1;
if (resmsg_1 == '1') {
if (name == 'id_card_no') {
record.set('ccx_resmsg', '身份验证成功');
card_identity_flag = 'Y';
} else {
record.set('ccx_resmsg1', '身份验证成功');
sp_identity_flag = 'Y';
}
} else {
//个人身份验证
var url = $('Identity_ccx_link').getUrl();
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: url,
para: {
bp_name: bp_name,//姓名
id_card_no: value//身份证号码
},
success: function (res) {
var resmsg = res.result.resmsg;
if (name == 'id_card_no') {
record.set('ccx_resmsg', resmsg);
if (resmsg == '身份验证成功') {
card_identity_flag = 'Y';
}
} else {
record.set('ccx_resmsg1', resmsg);
if (resmsg == '身份验证成功') {
sp_identity_flag = 'Y';
}
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.SideBar.show({
msg: '${l:HLS.SUBMIT_SUCCESS}',
duration: 2000
});
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this,
sync: true
});
}
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
scope: this,
sync: true
});*/
=======
// var url1 = $('identity_query_link').getUrl(); // var url1 = $('identity_query_link').getUrl();
// window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
/* Leaf.request({ /* Leaf.request({
...@@ -230,6 +311,7 @@ ...@@ -230,6 +311,7 @@
scope: this, scope: this,
sync: true sync: true
});*/ });*/
>>>>>>> fc911afa6f82f272999782f0b1703081ee8d4607
} }
if (value.length == 18) { if (value.length == 18) {
...@@ -275,12 +357,13 @@ ...@@ -275,12 +357,13 @@
//保存前调用,生成商机编号 //保存前调用,生成商机编号
window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) { window['${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
// //
debugger;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var head_record = $(ds_id).getCurrentRecord(); var head_record = $(ds_id).getCurrentRecord();
var bp_class = head_record.get('bp_class'); var bp_class = head_record.get('bp_class');
//alert('${/parameter/@unbrand}'); //alert('${/parameter/@unbrand}');
if (bp_class == 'NP') { if (bp_class == 'NP') {
if (card_identity_flag == 'Y' || sp_identity_flag == 'Y') { if (card_identity_flag == 'N' || sp_identity_flag == 'N') {
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var check_flag = false; var check_flag = false;
if (head_record.get('bp_code')) { if (head_record.get('bp_code')) {
......
<?xml version="1.0" encoding="UTF-8"?>
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
<a:init-procedure/>
<a:view>
<!-- <a:link id="BmLink_MainScreen_functionHit" model="sys.sys_page_function_visit" modelaction="update"/>-->
<script><![CDATA[
//退出按钮
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
$('hls_bp_master_billing').close();
}
Leaf.onReady(function () {
var billing_ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'hls_bp_master');
// console.log($(billing_ds));
$(billing_ds).setQueryParameter("bp_id","${/parameter/@bp_id}");
$(billing_ds).query();
}
)
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
\ No newline at end of file
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<a:link id="hls214N_cdd_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/> <a:link id="hls214N_cdd_downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<a:link id="${/parameter/@layout_code}_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> <a:link id="${/parameter/@layout_code}_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="hls214_bp_master_save_link_id" model="hls.HLS214.hls_bp_change_agent" modelaction="update"/> <a:link id="hls214_bp_master_save_link_id" model="hls.HLS214.hls_bp_change_agent" modelaction="update"/>
<a:link id="hls214_sap_eai_create_customer_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/> <!-- <a:link id="hls214_sap_eai_create_customer_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrCustomer.lsc"/>-->
<a:link id="hls214_sap_eai_create_vender_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/> <!-- <a:link id="hls214_sap_eai_create_vender_link" url="${/request/@context_path}/modules/interface/INTERFACE_EAI/hls_sap_eai_CrVender.lsc"/>-->
<script src="${/request/@context_path}/javascripts/identity_card_info_query.js" <script src="${/request/@context_path}/javascripts/identity_card_info_query.js"
type="text/javascript"></script> type="text/javascript"></script>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
...@@ -33,41 +33,41 @@ ...@@ -33,41 +33,41 @@
var bp_record = $(bp_ds_id).getCurrentRecord(); var bp_record = $(bp_ds_id).getCurrentRecord();
var bp_id = bp_record.get('bp_id'); var bp_id = bp_record.get('bp_id');
Leaf.request({ // Leaf.request({
url: $('hls214_sap_eai_create_customer_link').getUrl(), // url: $('hls214_sap_eai_create_customer_link').getUrl(),
para: { // para: {
bp_id: bp_id // bp_id: bp_id
}, // },
scope: this, // scope: this,
success: function () { // success: function () {
Leaf.request({ // Leaf.request({
url: $('hls214_sap_eai_create_vender_link').getUrl(), // url: $('hls214_sap_eai_create_vender_link').getUrl(),
para: { // para: {
bp_id: bp_id // bp_id: bp_id
}, // },
scope: this, // scope: this,
success: function () { // success: function () {
$(bp_ds_id).query(); // $(bp_ds_id).query();
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
failure: function () { // failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
error: function () { // error: function () {
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// },
// sync: true
// });
// },
// failure: function () {
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// },
// error: function () {
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// },
// sync: true
// });
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
sync: true
});
},
failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
sync: true
});
}; };
function prj_check_bp_id(record) { function prj_check_bp_id(record) {
......
...@@ -23,10 +23,43 @@ ...@@ -23,10 +23,43 @@
url="${/request/@context_path}/modules/hls/HLS236/hls_bp_master_query_ccx_report.lview"/> url="${/request/@context_path}/modules/hls/HLS236/hls_bp_master_query_ccx_report.lview"/>
<a:link id="hls_bp_ccx_icinfo_link" <a:link id="hls_bp_ccx_icinfo_link"
url="${/request/@context_path}/modules/hls/HLS236/hls_bp_master_query_ccx_icinfo.lview"/> url="${/request/@context_path}/modules/hls/HLS236/hls_bp_master_query_ccx_icinfo.lview"/>
<a:link id="hls_bp_master_billing_link"
url="${/request/@context_path}/modules/hls/HLS214N/hls_bp_master_billing.lview"/>
<script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/> <script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_BP_RESULT', 'hls_bp_master');
//信息变更
window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function () {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'hls_bp_master');
var data=$(ds_id).selected[0];
var invoice_bp_bank_account = data.get('invoice_bp_bank_account');
var invoice_title = data.get('invoice_title');
var invoice_bp_address_phone_num = data.get('invoice_bp_address_phone_num');
var phone =data.get('phone');
var taxpayer_type =data.get('taxpayer_type');
var invoice_bp_bank =data.get('invoice_bp_bank');
var bp_id=data.get('bp_id');
new Leaf.Window({
id: 'hls_bp_master_billing',
url: $('hls_bp_master_billing_link').getUrl(),
params: {
function_code:'HLS214NS',
invoice_bp_bank_account:invoice_bp_bank_account,
invoice_title:invoice_title,
invoice_bp_address_phone_num:invoice_bp_address_phone_num,
phone:phone,
taxpayer_type:taxpayer_type,
invoice_bp_bank:invoice_bp_bank,
bp_id:bp_id
},
title: '开票信息',
fullScreen: true
});
}
// stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_BP_RESULT', 'hls_bp_master');
function open_bp_modify_win(ds_id, record_id) { function open_bp_modify_win(ds_id, record_id) {
...@@ -34,7 +67,7 @@ ...@@ -34,7 +67,7 @@
var record = $(ds_id).findById(record_id); var record = $(ds_id).findById(record_id);
var param = record.data; var param = record.data;
param['function_code'] = 'HLS214D'; param['function_code'] = 'HLS214D';
debugger; // debugger;
if (record.get('bp_category') == 'AGENT') { if (record.get('bp_category') == 'AGENT') {
param['function_code'] = 'HLS228DL'; param['function_code'] = 'HLS228DL';
} }
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: chenlingfeng7543
$Date: 2018/12/20 21:19
$Revision: 1.0
$Purpose: 商业伙伴授信维护
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:init-procedure>
<!--<a:model-query fetchAll="true" model="basic.get_sys_default_time" rootPath="sys_default_time"/>-->
</a:init-procedure>
<a:view>
<!-- <a:link id="hls361_hls_bp_master_credit_assign_link" url="${/request/@context_path}/modules/hls/HLS361/hls_bp_master_credit_assign.lview"/>
<a:link id="hls361_hls_bp_master_credit_detail_link" url="${/request/@context_path}/modules/hls/HLS361/hls_bp_master_credit_detail.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 open_assign_win(id, name) {
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var param = record.data;
param['function_code'] = 'HLS361A';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
param['url_title'] = '信息维护';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_assign_link', null);
}
function open_detail_win(id, name) {
var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
var param = record.data;
param['function_code'] = 'HLS361D';
param['function_usage'] = 'MODIFY';
param['maintain_type'] = 'UPDATE';
param['url_title'] = '信息维护';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'hls361_hls_bp_master_credit_detail_link', null);
}
//超链接渲染
window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
var link_function = '';
window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
if (name == 'record_detail') {
link_function = 'open_detail_win';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + config_record.get('prompt') + '</a>';
}
if (name == 'assign_record') {
link_function = 'open_assign_win';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\');">' + config_record.get('prompt') + '</a>';
}
};*/
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
<a:link id="hls_fin_calc_quotation_choose_id" url="${/request/@context_path}/modules/hls/HLS500/hls_fin_calc_quotation_choose.lview"/> <a:link id="hls_fin_calc_quotation_choose_id" url="${/request/@context_path}/modules/hls/HLS500/hls_fin_calc_quotation_choose.lview"/>
<a:link id="hls_fin_calc_import_line_link_id" url="${/request/@context_path}/modules/hls/HLS500/hls_fin_calc_import_line.lview"/> <a:link id="hls_fin_calc_import_line_link_id" url="${/request/@context_path}/modules/hls/HLS500/hls_fin_calc_import_line.lview"/>
<a:link id="hls_fin_calc_show_display_line_link_id" url="${/request/@context_path}/modules/hls/HLS500N/hls_fin_calc_show_display_line_n.lview"/> <a:link id="hls_fin_calc_show_display_line_link_id" url="${/request/@context_path}/modules/hls/HLS500N/hls_fin_calc_show_display_line_n.lview"/>
<a:link id="prj_check_prj_record_link_id" model="hls.HLS500N.check_prj_record" modelaction="execute"/>
<style><![CDATA[ <style><![CDATA[
.finGrid td[dataindex=percent]{ .finGrid td[dataindex=percent]{
border-right-color:#FFF; border-right-color:#FFF;
...@@ -76,6 +78,61 @@ ...@@ -76,6 +78,61 @@
Leaf.Masker.mask(document.documentElement, '${l:HLS.LOADING}'); Leaf.Masker.mask(document.documentElement, '${l:HLS.LOADING}');
function hls_hls500_save(nextStep, source_procedure) { function hls_hls500_save(nextStep, source_procedure) {
Leaf.request({
url: $('prj_check_prj_record_link_id').getUrl(),
para: {
'project_id': '${/parameter/@document_id}'
},
success: function(res) {
var secondary_lease = res.result.secondary_lease;
var payment_deduction = res.result.payment_deduction;
var price_list = res.result.price_list;
if(price_list=='DS_PRICE_10' && secondary_lease=='NO'){
var count=0;
var denominator=0;
var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
for (var i = 0;i < temp_head_records.length;i++) {
if(temp_head_records[i].get('column_code')=='H16'||temp_head_records[i].get('column_code')=='H97'){
count=count+temp_head_records[i].get('column_value')||0
}else if(temp_head_records[i].get('column_code')=='H99'||temp_head_records[i].get('column_code')=='H102'){
denominator=denominator+temp_head_records[i].get('column_value')||0
}
}
if((count/denominator)<0.15){
Leaf.showMessage('${l:PROMPT}', '首付款比例+首付款保证金比例之和不能低于15%');
unlock_calc_current_window('${l:HLS.CALCULATING}');
return;
}
}
if(price_list=='DS_PRICE_10'){
if(payment_deduction!='TRADE_IN'){
var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
for (var i = 0;i < temp_head_records.length;i++) {
if(temp_head_records[i].get('column_code')=='H109') {
temp_head_records[i].set('column_value',0);
// temp_head_records[i].set('column_value_c',0);
}
}
}else{
var temp_head_records = $('hls_fin_calculator_hd_ds').getAll();
for (var i = 0;i < temp_head_records.length;i++) {
var H16;
if(temp_head_records[i].get('column_code')=='H16'){
H16=temp_head_records[i].get('column_value');
}
if(temp_head_records[i].get('column_code')=='H109') {
temp_head_records[i].set('column_value',H16);
// temp_head_records[i].set('column_value_c',0);
}
}
}
}
lock_calc_current_window('${l:HLS.SAVING}'); lock_calc_current_window('${l:HLS.SAVING}');
if (!$('hls_fin_calculator_hd_ds').validate() || !$('hls_fin_calculator_ln_ds').validate()) { if (!$('hls_fin_calculator_hd_ds').validate() || !$('hls_fin_calculator_ln_ds').validate()) {
unlock_calc_current_window(); unlock_calc_current_window();
...@@ -110,6 +167,16 @@ ...@@ -110,6 +167,16 @@
$('hls_fin_cal_save_hd_ds').on('submitsuccess', hls_fin_cal_save_hd_submitsuccess); $('hls_fin_cal_save_hd_ds').on('submitsuccess', hls_fin_cal_save_hd_submitsuccess);
Leaf.SideBar.enable = false; Leaf.SideBar.enable = false;
$('hls_fin_cal_save_hd_ds').submit(); $('hls_fin_cal_save_hd_ds').submit();
},
failure: function() {
},
error: function() {
},
scope: this
});
} }
...@@ -120,6 +187,7 @@ ...@@ -120,6 +187,7 @@
function hls_hls500_calc() { function hls_hls500_calc() {
lock_calc_current_window('${l:HLS.CALCULATING}'); lock_calc_current_window('${l:HLS.CALCULATING}');
hls_hls500_save(calc_execute, 'CALC'); hls_hls500_save(calc_execute, 'CALC');
} }
...@@ -561,6 +629,14 @@ ...@@ -561,6 +629,14 @@
} }
function do_hls500_head_update(ds, record, name, value, old_value) { function do_hls500_head_update(ds, record, name, value, old_value) {
if (record.get('column_code') == 'H54' ) {
var sum=record.get('column_value')-4.75
if(sum<0){
Leaf.showMessage('${l:PROMPT}', '利率最低值不能低于4.75');
return;
}
}
if (record.get('lov_return_vcode') == 'N' && (record.get('validation_type') == 'COMBOBOX' || record.get('validation_type') == 'LOV')) { if (record.get('lov_return_vcode') == 'N' && (record.get('validation_type') == 'COMBOBOX' || record.get('validation_type') == 'LOV')) {
value = record.get('column_value_c'); value = record.get('column_value_c');
} else { } else {
...@@ -598,6 +674,7 @@ ...@@ -598,6 +674,7 @@
recreate_L_formula = 'N'; recreate_L_formula = 'N';
} }
} }
onEditorupdate(ds, record, name, value, old_value); onEditorupdate(ds, record, name, value, old_value);
} }
...@@ -700,6 +777,7 @@ ...@@ -700,6 +777,7 @@
} }
function onEditorHdload(ds) { function onEditorHdload(ds) {
var headRecords = ds.getAll(); var headRecords = ds.getAll();
if (headRecords[0].get('show_column_code') == 'N') { if (headRecords[0].get('show_column_code') == 'N') {
$('hls_fin_calculator_hd_grid_id').hideColumn('column_code'); $('hls_fin_calculator_hd_grid_id').hideColumn('column_code');
......
...@@ -39,15 +39,14 @@ ...@@ -39,15 +39,14 @@
model="hls.HLS500.hls_fin_calc_get_base_rate" modelaction="update"/> model="hls.HLS500.hls_fin_calc_get_base_rate" modelaction="update"/>
<a:link id="get_if_self_definition" model="db.prj_project_pkg.get_if_self_definition" modelaction="execute"/> <a:link id="get_if_self_definition" model="db.prj_project_pkg.get_if_self_definition" modelaction="execute"/>
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//add by zhuxianfei //add by zhuxianfei
window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () { window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () {
var url; var url;
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project'); var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation'); var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
var history_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_CASHFLOW_NS', 'prj_quotation');
var record = $(quotation_ds_id).getCurrentRecord(); var record = $(quotation_ds_id).getCurrentRecord();
var head_record = $(ds_id).getAt(0); var head_record = $(ds_id).getAt(0);
if ('${/parameter/@calc_type}' == 'LITE_CALCULATOR') { if ('${/parameter/@calc_type}' == 'LITE_CALCULATOR') {
...@@ -64,10 +63,10 @@ ...@@ -64,10 +63,10 @@
return; return;
} }
if ($(quotation_ds_id).validate()) { if ($(quotation_ds_id).validate()) {
if (!record.get('price_list') || !record.get('currency') || !record.get('lease_times')) { /*if (!record.get('price_list') || !record.get('currency') || !record.get('lease_times')) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.QUOTATION_EXECUTE_AFTER_SAVE}'); Leaf.showMessage('${l:PROMPT}', '${l:HLS.QUOTATION_EXECUTE_AFTER_SAVE}');
return; return;
} }*/
var parent_pk_value = head_record.get('project_id'); var parent_pk_value = head_record.get('project_id');
record.set('function_code', 'PRJ505_QUOTATION'); record.set('function_code', 'PRJ505_QUOTATION');
...@@ -97,6 +96,7 @@ ...@@ -97,6 +96,7 @@
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$(quotation_ds_id).query(); $(quotation_ds_id).query();
$(history_ds_id).query();
var quotation_id = record.get('quotation_id') || res.result.record.quotation_id; var quotation_id = record.get('quotation_id') || res.result.record.quotation_id;
var win = new Leaf.Window({ var win = new Leaf.Window({
id: 'hls_fin_calc_quotation_link_winid', id: 'hls_fin_calc_quotation_link_winid',
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
}); });
win.on('close', function () { win.on('close', function () {
$(quotation_ds_id).query(); $(quotation_ds_id).query();
$(history_ds_id).query();
}); });
}, },
...@@ -158,6 +159,7 @@ ...@@ -158,6 +159,7 @@
}); });
win.on('close', function () { win.on('close', function () {
$(quotation_ds_id).query(); $(quotation_ds_id).query();
$(history_ds_id).query();
}); });
}else { }else {
record.set('to_doc_table', 'HLS_FIN_CALCULATOR_HD'); record.set('to_doc_table', 'HLS_FIN_CALCULATOR_HD');
...@@ -202,6 +204,7 @@ ...@@ -202,6 +204,7 @@
}); });
win.on('close', function () { win.on('close', function () {
$(quotation_ds_id).query(); $(quotation_ds_id).query();
$(history_ds_id).query();
}); });
}, },
...@@ -286,7 +289,6 @@ ...@@ -286,7 +289,6 @@
ka_prj_id: prj_record.get('ka_prj_id') ka_prj_id: prj_record.get('ka_prj_id')
}, },
success: function (res) { success: function (res) {
debugger;
var document_number = res.result.document_number; var document_number = res.result.document_number;
prj_record.set('project_number', document_number); prj_record.set('project_number', document_number);
check_flag = true; check_flag = true;
...@@ -427,7 +429,7 @@ ...@@ -427,7 +429,7 @@
//加载时调用(grid,table,gridBox) //加载时调用(grid,table,gridBox)
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function(ds, record, config_records, bp_seq) {
debugger;
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_BP', 'prj_project_bp'); var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_BP', 'prj_project_bp');
if (bp_ds_id == ds.id && bp_ds_id) { if (bp_ds_id == ds.id && bp_ds_id) {
if (record.get('bp_category') == 'TENANT') { if (record.get('bp_category') == 'TENANT') {
...@@ -440,6 +442,109 @@ ...@@ -440,6 +442,109 @@
} }
} }
}; };
//序号自增 add by lijingjing
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) {
//租赁物序号
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_lease_item');
if (ds_id == ds.id && ds_id) {
//设置序号
var measure_records = ds.getAll(),
seq_num = 0;
if (measure_records.length) {
for (var j = 0;j < measure_records.length;j++) {
var measure_record = measure_records[j],
rk = measure_record.get('lease_item_seq');
if (seq_num <= rk) {
seq_num = rk;
}
}
}
var rk_value = seq_num + 1;
record.set('lease_item_seq', rk_value);
}
};
//客户评分
window['${/parameter/@layout_code}_user_button9_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var record = $(ds_id).getCurrentRecord();
var param = {};
if(record.get('project_id')){
if(record.get('project_status')=='NEW'||record.get('project_status')=='APPROVE_RETURN'||record.get('project_status')=='REJECT'){
param['function_code'] = 'PRJ501TENANT';
param['function_usage'] = 'UPDATE';
}else{
param['function_code'] = 'PRJ501TENANT';
param['function_usage'] = 'QUERY';
}
param['project_id'] = record.get('project_id');
param['winid'] = 'hl_tenant_score_rate_win_id';
param['url_title'] = '客户评分明细';
hls_doc_get_layout_code('${/parameter/@layout_code}_get_layout_code_link_id', param, '${/parameter/@layout_code}tenant_rate_query_link', '${/parameter/@layout_code}');
}else{
Leaf.showMessage('${l:PROMPT}', '请先保存');
return;
}
}
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var lease_item_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_lease_item');
var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project_bp');
var record = $(quotation_ds_id).getCurrentRecord();
var current_record = $(ds_id).getCurrentRecord();
var lease_item_record = $(lease_item_ds_id).getCurrentRecord();
var bp_record = $(bp_ds_id).getCurrentRecord();
var project_id = current_record.get('project_id');
if (current_record.dirty == true) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
return;
}
if (record.dirty == true) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
return;
}
if (lease_item_record.dirty == true) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
return;
}
if (bp_record.dirty == true) {
Leaf.showMessage('${l:PROMPT}', '${l:HLS.EXECUTE_AFTER_SAVE}');
return;
}
if($(ds_id).validate()){
Leaf.showConfirm('${HLS.PROMPT}', '确认要提交工作流吗?', function() {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({
url: $('prj_approval_link_id').getUrl(),
para: {
project_id: project_id
},
scope: this,
success: function() {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
$('${/parameter/@winid}').close();
},
failure: function() {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
},
error: function() {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}
});
});
}
}
/* Leaf.onReady(function(){ /* Leaf.onReady(function(){
var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'T_HISTORY_INGO', 'hls_bp_master'); var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'T_HISTORY_INGO', 'hls_bp_master');
var url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}'; var url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}';
......
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
record.set('document_category', 'PROJECT'); record.set('document_category', 'PROJECT');
record.set('default_value_dsid', ds_id); record.set('default_value_dsid', ds_id);
record.data['url_title'] = '租赁申请创建'; record.data['url_title'] = '租赁申请创建';
var division=record.get('division');
record.set('division',division);
var param = record.data; var param = record.data;
record.set('winid', 'prj_porject_create_win_id'); record.set('winid', 'prj_porject_create_win_id');
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: zhangxing5129
$Date: 2014-8-3 上午10:57:29
$Revision: 1.0
$Purpose: 项目报告维护
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:view>
<script type="text/javascript"><![CDATA[
]]></script>
</a:view>
</a:screen>
...@@ -43,29 +43,30 @@ ...@@ -43,29 +43,30 @@
param['layout_debugger_flag'] = 'Y'; param['layout_debugger_flag'] = 'Y';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'prj_project_modify_link', ds_id); hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'prj_project_modify_link', ds_id);
} else if (record.get('document_type') == 'CARLS') { } else if (record.get('document_type') == 'CARLS') {
if (record.get('project_status') != 'PRE_APPROVING') {
maintain_type = 'UPDATE'; if (record.get('project_status') == 'APPROVED' ||record.get('project_status') == 'APPROVING') {
maintain_type = 'READONLY';
param = record.data; param = record.data;
param['bp_id_tenant'] = record.get('bp_id_tenant');
param['document_id'] = record.get('project_id'); param['document_id'] = record.get('project_id');
param['function_code'] = 'PRJ501D'; param['function_code'] = 'PRJ501_WFL';
param['function_usage'] = 'MODIFY'; param['function_usage'] = 'QUERY';
param['bp_class'] = 'NP'; param['bp_class'] = 'NP';
param['maintain_type'] = maintain_type; param['maintain_type'] = maintain_type;
param['bp_id'] = record.get('bp_id');
param['prj_bp_id'] = record.get('prj_bp_id'); param['prj_bp_id'] = record.get('prj_bp_id');
param['bp_id_tenant'] = record.get('bp_id_tenant');
param['url_title'] = '${l:HLS.PROJECT_MAITAIN}'; param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id); hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id);
} else { } else {
maintain_type = 'READONLY'; maintain_type = 'UPDATE';
param = record.data; param = record.data;
param['bp_id_tenant'] = record.get('bp_id_tenant');
param['document_id'] = record.get('project_id'); param['document_id'] = record.get('project_id');
param['function_code'] = 'PRJ501D'; param['function_code'] = 'PRJ501D';
param['function_usage'] = 'QUERY'; param['function_usage'] = 'MODIFY';
param['bp_class'] = 'NP'; param['bp_class'] = 'NP';
param['maintain_type'] = maintain_type; param['maintain_type'] = maintain_type;
param['bp_id'] = record.get('bp_id');
param['prj_bp_id'] = record.get('prj_bp_id'); param['prj_bp_id'] = record.get('prj_bp_id');
param['bp_id_tenant'] = record.get('bp_id_tenant');
param['url_title'] = '${l:HLS.PROJECT_MAITAIN}'; param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id); hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id);
} }
......
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