Skip to content

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

【fix】修复商业伙伴bug

parent bac65db7
Show whitespace changes
Inline Side-by-side
Showing with 148 additions and 72 deletions
src/main/webapp/WEB-INF/classes/acr/ACR515/acr_invoice_interface_ln.lwm
View file @ fd49f28f
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<bm:field name="ref_invoice_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ref_invoice_number"/> <bm:field name="ref_invoice_number" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ref_invoice_number"/>
<bm:field name="created_by_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="created_by_name"/> <bm:field name="created_by_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="created_by_name"/>
<bm:field name="confirmed_by_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="confirmed_by_name"/> <bm:field name="confirmed_by_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="confirmed_by_name"/>
<bm:field name="received_by_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="received_by_name"/>
<bm:field name="invoice_kind_n" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_N"/> <bm:field name="invoice_kind_n" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="INVOICE_KIND_N"/>
<bm:field name="invoice_title" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="invoice_title"/> <bm:field name="invoice_title" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="invoice_title"/>
<bm:field name="invoice_bp_address_phone_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="invoice_bp_address_phone_num"/> <bm:field name="invoice_bp_address_phone_num" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="invoice_bp_address_phone_num"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_approve_print.lwm 0 → 100644
View file @ fd49f28f
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: sf
$Date: 2019-12-06 上午09:52:30
$Revision: 1.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
csh_transaction_return_pkg.csh_return_print(
p_document_id =>${@document_id},
p_user_id =>${/session/@user_id},
p_document_table=>${@document_table}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/modules/acr/ACR515/acr_invoice_vat.lview
View file @ fd49f28f
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
</a:init-procedure> </a:init-procedure>
<a:view> <a:view>
<a:link id="acr513_invoice_readonly_page" <a:link id="acr513_invoice_readonly_page"
url="${/request/@context_path}/modules/cont/CON500/con_contract_update.lview"/> <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/> url="${/request/@context_path}/modules/cont/CON500/con_contract_update.lview"/>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<a:link id="bmLink_vat_pause_or_submit" model="acr.ACR515.acr_invoice_vat" modelaction="batch_update"/> <a:link id="bmLink_vat_pause_or_submit" model="acr.ACR515.acr_invoice_vat" modelaction="batch_update"/>
<a:link id="bmLink_vat_receive" model="acr.ACR515.acr_invoice_vat" modelaction="execute"/> <a:link id="bmLink_vat_receive" model="acr.ACR515.acr_invoice_vat" modelaction="execute"/>
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ fd49f28f
...@@ -124,6 +124,7 @@ ...@@ -124,6 +124,7 @@
}; };
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
debugger;
if ((ds.id).indexOf('hls_bp_master') != -1) { if ((ds.id).indexOf('hls_bp_master') != -1) {
// record.getField('cell_phone').setRequired(true); // record.getField('cell_phone').setRequired(true);
//record.getField('cell_phone').setRequired(true); //record.getField('cell_phone').setRequired(true);
...@@ -137,6 +138,7 @@ ...@@ -137,6 +138,7 @@
record.getField('parent_id_n').setReadOnly(true); record.getField('parent_id_n').setReadOnly(true);
} }
} }
}; };
var card_identity_flag; var card_identity_flag;
var sp_identity_flag; var sp_identity_flag;
...@@ -461,9 +463,11 @@ ...@@ -461,9 +463,11 @@
// record.set('resident_addres', get_native_place(value)) // record.set('resident_addres', get_native_place(value))
} }
if (name == 'id_no_sp') { if (name == 'id_no_sp') {
if (!value) { if (!value) {
record.set('ccx_resmsg1', ''); record.set('ccx_resmsg1', '');
} }
if (record.get('card_type_sp') == 'ID_CARD') { if (record.get('card_type_sp') == 'ID_CARD') {
if (!checkCard(value)) { if (!checkCard(value)) {
Leaf.showMessage('${l:HLS.PROMPT}', '配偶身份证号错误!'); Leaf.showMessage('${l:HLS.PROMPT}', '配偶身份证号错误!');
...@@ -479,7 +483,7 @@ ...@@ -479,7 +483,7 @@
} }
} }
var hls_bp_master_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); var hls_bp_master_ds_id = f_bp_create_ds_id;
if (ds.id == hls_bp_master_ds_id && hls_bp_master_ds_id) { if (ds.id == hls_bp_master_ds_id && hls_bp_master_ds_id) {
if (name == 'id_card_no_leg') { if (name == 'id_card_no_leg') {
if (!value) { if (!value) {
...@@ -499,39 +503,46 @@ ...@@ -499,39 +503,46 @@
} }
} }
} }
var test_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC', 'hls_bp_master');
var test_ds_id1 = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_SPOUSE_1', 'hls_bp_master');
var test_ds_id2 = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_SPOUSE', 'hls_bp_master');
// if (ds.id == gird_ds_id4 || ds.id == gird_ds_id5) { if (ds.id==test_ds_id1||ds.id==test_ds_id2) {
// if (name == 'id_no_sp') { var hd_ds = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC', 'hls_bp_master');
// if (!value) { record = $(hd_ds).getCurrentRecord();
// record.set('ccx_resmsg1', ''); if(record.get('marital_status')=='40'){
// }
// if(record.get('card_type_sp') == 'ID_CARD'){ var bp2_record = $(test_ds_id1).getCurrentRecord();
// if (!checkCard(value)) { if(bp2_record){
// Leaf.showMessage('${l:HLS.PROMPT}','配偶身份证号错误!'); record.set('bp_name_sp',bp2_record.get('bp_name_sp'));
// return false; record.set('card_type_sp',bp2_record.get('card_type_sp'));
// } record.set('id_no_sp',bp2_record.get('id_no_sp'));
// } record.set('date_of_birth_sp',bp2_record.get('date_of_birth_sp'));
// // ds.fields.id_no_sp.pro.validator = id_card_no_validate; record.set('cell_phone_sp',bp2_record.get('cell_phone_sp'));
// record.set('resident_addres_sp', get_native_place(value)) record.set('work_unit_phone_sp',bp2_record.get('work_unit_phone_sp'));
// } record.set('work_unit_name_sp',bp2_record.get('work_unit_name_sp'));
// } record.set('work_unit_address_sp',bp2_record.get('work_unit_address_sp'));
// var bp_spouse_ds = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_SPOUSE', 'hls_bp_master'); record.set('zipcode',bp2_record.get('zipcode'));
// if(ds.id==bp_spouse_ds&&bp_spouse_ds){ bp2_record.set('marital_status', '40');
// if (name == 'marital_status') { }
// console.log(value); }else if(record.get('marital_status')=='30'){
// debugger debugger;
// if (value == '30') { var bp2_record = $(test_ds_id2).getCurrentRecord();
// record.getField('bp_name_sp').setRequired(true); if(bp2_record){
// record.getField('card_type_sp_n').setRequired(true); record.set('bp_name_sp',bp2_record.get('bp_name_sp'));
// record.getField('id_no_sp').setRequired(true); record.set('card_type_sp',bp2_record.get('card_type_sp'));
// record.set('id_no_sp',bp2_record.get('id_no_sp'));
// } else { record.set('date_of_birth_sp',bp2_record.get('date_of_birth_sp'));
// record.getField('bp_name_sp').setRequired(false); record.set('cell_phone_sp',bp2_record.get('cell_phone_sp'));
// record.getField('card_type_sp_n').setRequired(false); record.set('work_unit_phone_sp',bp2_record.get('work_unit_phone_sp'));
// record.getField('id_no_sp').setRequired(false); record.set('work_unit_name_sp',bp2_record.get('work_unit_name_sp'));
// } record.set('work_unit_address_sp',bp2_record.get('work_unit_address_sp'));
// } record.set('zipcode',bp2_record.get('zipcode'));
// } bp2_record.set('marital_status', '30');
}
}
}
......
src/main/webapp/modules/hls/HLS214N/hls_bp_master_modify.lview
View file @ fd49f28f
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<script type="text/javascript"><![CDATA[ <script type="text/javascript"><![CDATA[
//保存前调用 //保存前调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function(ds, record) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function(ds, record) {
// window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
// var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master'); // var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
// debugger // debugger
...@@ -54,6 +55,15 @@ ...@@ -54,6 +55,15 @@
}else{ }else{
record.set('bp_name_change_flag','N'); record.set('bp_name_change_flag','N');
} }
var test_ds_id1 = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_SPOUSE_1', 'hls_bp_master');
var test_ds_id2 = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_SPOUSE', 'hls_bp_master');
//var records = $(test_ds_id1);
//var record=$(records).getCurrentRecord();
//var records = $(test_ds_id2);
//var record=$(records).getAll();
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}; };
...@@ -459,6 +469,7 @@ ...@@ -459,6 +469,7 @@
if (name == 'id_no_sp') { if (name == 'id_no_sp') {
// //
if (record.get('card_type_sp') == 'ID_CARD') {
if (!checkCard(value)) { if (!checkCard(value)) {
Leaf.showMessage('提示', '配偶信息中，请输入正确格式的身份证！'); Leaf.showMessage('提示', '配偶信息中，请输入正确格式的身份证！');
return '请输入正确格式的身份证'; return '请输入正确格式的身份证';
...@@ -479,6 +490,35 @@ ...@@ -479,6 +490,35 @@
} }
} }
}
}
var test_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC', 'hls_bp_master');
var test_ds_id1 = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_SPOUSE_1', 'hls_bp_master');
var test_ds_id2 = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_SPOUSE', 'hls_bp_master');
if (ds.id==test_ds_id1||ds.id==test_ds_id2) {
record = $(test_ds_id).getCurrentRecord();
if(record.get('marital_status')=='40'){
var test_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_SPOUSE_1', 'hls_bp_master');
var bp2_record = $(test_ds_id).getCurrentRecord();
bp2_record.set('marital_status', '40');
}else if(record.get('marital_status')=='30'){
var test_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_SPOUSE', 'hls_bp_master');
var bp2_record = $(test_ds_id).getCurrentRecord();
bp2_record.set('marital_status', '30');
}
}
if(name=='marital_status'&&ds.id==test_ds_id){
if ($L.CmpManager.get(test_ds_id1)||$L.CmpManager.get(test_ds_id2)) {
var bp2_record = $L.CmpManager.get(test_ds_id1).getCurrentRecord();
var bp3_record = $L.CmpManager.get(test_ds_id2).getCurrentRecord();
bp2_record.set('marital_status', value);
bp3_record.set('marital_status', value);
}
} }
......
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