Skip to content

L
leaf-hlcm
Commit 610aba0b authored by xiaochao's avatar xiaochao
Browse files
Options

【收款维护修改中文判断】

parent f0efcedf
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 23 deletions
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_extra_nam_add_lov.lwm
View file @ 610aba0b
......@@ -11,9 +11,9 @@
</bm:operation>
</bm:operations>
<bm:fields>
<bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" physicalName="bp_code" prompt="代理店编码"/>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="false" forQuery="true" physicalName="bp_name" prompt="商业伙伴"/>
<bm:field name="extra_nam" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" physicalName="extra_nam" prompt="代理店简称"/>
<bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" physicalName="bp_code" prompt="代理店编码"/>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="false" forQuery="true" physicalName="bp_name" prompt="商业伙伴"/>
<bm:field name="extra_nam" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" physicalName="extra_nam" prompt="代理店简称"/>
</bm:fields>
<bm:query-fields>
<bm:query-field field="bp_name" queryOperator="like"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH510N/csh_transaction_list_tmp.lwm
View file @ 610aba0b
......@@ -71,7 +71,7 @@
)
extra_nam,
(case when t.paid_byother_flag = 'T' and
(select v.extra_nam from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_category = 'AGENT' and v.bp_id = t.bp_id) = '深圳美鹏'
(select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_category = 'AGENT' and v.bp_id = t.bp_id) = 1565
then
'是'
else
......
src/main/webapp/modules/csh/CSH510N/csh_transaction_excel_import.lview
View file @ 610aba0b
......@@ -119,8 +119,10 @@
function update_import_data(ds, record, name, value, oldvalue) {
if (name =='paid_byother_flag_desc'){
var paid_byother_flag_desc = record.get('paid_byother_flag_desc');
var extra_nam = record.get('extra_nam');
if (paid_byother_flag_desc == '是' && extra_nam == '深圳美鹏'){
//深圳美鹏
// var extra_nam = record.get('extra_nam');
var bp_code = record.get('bp_code');
if (paid_byother_flag_desc == '是' && bp_code == 'C00010168'){
record.set('guarantor_name_duty','是');
}else{
record.set('guarantor_name_duty','否');
......@@ -243,8 +245,10 @@
lovService="csh.CSH510.csh_extra_nam_add_lov" lovWidth="550" title="代理店简称">
<a:mapping>
<a:map from="extra_nam" to="extra_nam"/>
<a:map from="bp_code" to="bp_code"/>
</a:mapping>
</a:field>
<a:field name="bp_code"/>
<a:field name="bp_id"/>
<a:field name="bp_category"/>
......@@ -289,6 +293,7 @@
<a:column name="attribute_24" prompt="附言" width="80"/>
<a:column name="extra_nam" prompt="代理店简称" width="80" editor="grid_lov"/>
<a:column name="bp_code" prompt="代理店简称code" hidden="true"/>
<a:column name="guarantor_name_duty" prompt="担保人履行担保义务" width="80"/>
......
src/main/webapp/modules/csh/CSH511/csh_transaction_receipt.lview
View file @ 610aba0b
......@@ -240,12 +240,14 @@
record.set('transaction_type', 'RECEIPT');
}
}else if(name == 'extra_nam'){
var extra_nam = record.get('extra_nam');
if (extra_nam != null && extra_nam == '深圳美鹏'){
//深圳美鹏
// var extra_nam = record.get('extra_nam');
var bp_code = record.get('bp_code');
if (bp_code == 'C00010168'){
record.getField('guarantor_name_duty').setReadOnly(false);
record.set('guarantor_name_duty','是');
record.getField('guarantor_name_duty').setRequired(true);
}else if (extra_nam != null && extra_nam != '深圳美鹏'){
}else if (bp_code != 'C00010168'){
record.getField('guarantor_name_duty').setReadOnly(true);
record.set('guarantor_name_duty','否');
record.getField('guarantor_name_duty').setRequired(false);
......@@ -425,12 +427,15 @@
</a:mapping>
</a:field>
<!--代理店简称-->
<a:field name="bp_code"/>
<a:field name="extra_nam" required="true" lovGridHeight="350" lovHeight="500" lovLabelWidth="90"
lovService="csh.CSH510.csh_extra_nam_add_lov" lovWidth="550" title="代理店简称">
<a:mapping>
<a:map from="bp_code" to="bp_code"/>
<a:map from="extra_nam" to="extra_nam"/>
</a:mapping>
</a:field>
<!--担保人履行担保义务-->
<a:field name="guarantor_name_duty" displayField="code_value_name" options="yes_no_ds" prompt="担保人履行担保义务" returnField="exist_flag" valueField="code_value"/>
......@@ -586,22 +591,22 @@
prompt="款项用途"/>
</a:box>
<a:box column="2">
<a:hBox style="width:400px">
<a:textField width="350" name="description" bindTarget="csh_transaction_receipt_head_ds"/>
</a:hBox>
<!--代理店简称-->
<a:lov name="extra_nam" bindTarget="csh_transaction_receipt_head_ds"
prompt="代理店简称"/>
<a:hBox style="width:400px">
<a:textField width="350" name="description" bindTarget="csh_transaction_receipt_head_ds"/>
</a:hBox>
<!--代理店简称-->
<a:lov name="extra_nam" bindTarget="csh_transaction_receipt_head_ds"
prompt="代理店简称"/>
</a:box>
<a:box column="2">
<!--#添加备注字段-->
<a:hBox style="width:400px">
<a:textField width="350" name="ref_v05" prompt="CSH511.CSH_TRANSACTION.STATEMENT"
bindTarget="csh_transaction_receipt_head_ds"/>
</a:hBox>
<!--担保人履行担保义务-->
<a:comboBox name="guarantor_name_duty" bindTarget="csh_transaction_receipt_head_ds"
prompt="担保人履行担保义务"/>
<!--#添加备注字段-->
<a:hBox style="width:400px">
<a:textField width="350" name="ref_v05" prompt="CSH511.CSH_TRANSACTION.STATEMENT"
bindTarget="csh_transaction_receipt_head_ds"/>
</a:hBox>
<!--担保人履行担保义务-->
<a:comboBox name="guarantor_name_duty" bindTarget="csh_transaction_receipt_head_ds"
prompt="担保人履行担保义务"/>
</a:box>
</a:fieldSet>
<!--删除下面的字段 currency_name,bank_account_name,banka,bank_branch_name,bank_account_num,bank_account_type_name,exchange_rate_type_display-->
......
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