Skip to content

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

【fix】 修改付款申请厂商字段为lov

parent bef1934c
Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 23 deletions
src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_lov.lwm
View file @ 7435d2ca
......@@ -15,7 +15,7 @@
<bm:field name="company_short_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_SHORT_NAME" prompt="HLS_BP_MASTER_V.COMPANY_SHORT_NAME"/>
<bm:field name="company_full_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_FULL_NAME" prompt="HLS_BP_MASTER_V.COMPANY_FULL_NAME"/>
<bm:field name="bp_category" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY"/>
<bm:field name="bp_category_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY_NAME" forDisplay="true" forQuery="true" prompt="商业伙伴类型"/>
<bm:field name="bp_category_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY_NAME" prompt="商业伙伴类型"/>
<bm:field name="bp_class" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS"/>
<bm:field name="bp_class_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS_NAME"/>
<bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG"/>
......
src/main/webapp/WEB-INF/classes/basic/hls_bp_master_v_for_tenant_lov.lwm 0 → 100644
View file @ 7435d2ca
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2013-4-15 下午01:13:07
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:s="leaf.plugin.script" xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="HLS_BP_MASTER_V">
<bm:fields>
<bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
<bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/>
<bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/>
<bm:field name="company_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="COMPANY_ID" prompt="HLS_BP_MASTER_V.COMPANY_ID"/>
<bm:field name="company_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_CODE" prompt="HLS_BP_MASTER_V.COMPANY_CODE"/>
<bm:field name="company_short_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_SHORT_NAME" prompt="HLS_BP_MASTER_V.COMPANY_SHORT_NAME"/>
<bm:field name="company_full_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="COMPANY_FULL_NAME" prompt="HLS_BP_MASTER_V.COMPANY_FULL_NAME"/>
<bm:field name="bp_category" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY"/>
<bm:field name="bp_category_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CATEGORY_NAME" prompt="商业伙伴类型"/>
<bm:field name="bp_class" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS"/>
<bm:field name="bp_class_name" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="BP_CLASS_NAME"/>
<bm:field name="enabled_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ENABLED_FLAG"/>
<!--<bm:field name="id_card_no" displayWidth="200" forDisplay="true" prompt="身份证"/>-->
</bm:fields>
<bm:features>
<f:standard-who/>
<s:bm-script><![CDATA[
var cx = Packages.leaf.javascript.Context.getCurrentContext();
Packages.leaf.plugin.script.engine.ScriptImportor.defineExternScript(cx, this, $ctx.getData(), "aut_authority_bm_validate.js");
]]></s:bm-script>
</bm:features>
<bm:query-fields>
<bm:query-field field="bp_id" queryOperator="="/>
<bm:query-field field="bp_code" queryOperator="like"/>
<bm:query-field field="bp_name" queryExpression="t1.bp_name like &apos;%&apos;||${@bp_name}||&apos;%&apos;"/>
<!-- <bm:query-field field="bp_category" queryOperator="="/> -->
<bm:query-field field="bp_category" queryExpression="(t1.bp_category = ${@bp_category} or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id and br.bp_category = ${@bp_category} and br.bp_type = ${@bp_category}))"/>
<bm:query-field field="bp_category_name" queryExpression="(t1.bp_category_name like &apos;%&apos;||${@bp_category_name}||&apos;%&apos;)"/>
<!-- <bm:query-field name="contract_bp_flag" queryExpression="(exists (select 1 from con_contract_bp b where b.contract_id in (${:@contract_id}) and b.bp_id = t1.bp_id and b.bp_category in (&apos;VENDER&apos;,&apos;TENANT&apos;,&apos;TENANT_SEC&apos;) )or nvl(${@contract_bp_flag},&apos;N&apos;) != &apos;Y&apos; )"/> -->
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<bm:data-filter name="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/>
<bm:data-filter name="query" expression="(t1.bp_category = &apos;TENANT&apos; or exists(select 1 from hls_bp_master_role br where br.bp_id = t1.bp_id and br.bp_category = &apos;TENANT&apos; and br.bp_type = &apos;TENANT&apos;))"/>
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
View file @ 7435d2ca
......@@ -352,5 +352,6 @@
<bm:query-field name="first_delay_flag_n" queryExpression="t1.first_delay_flag_n = ${@first_delay_flag_n}"/>
<bm:query-field name="cf_61_write_off_flag" queryExpression="t1.cf_61_write_off_flag = ${@cf_61_write_off_flag}"/>
<bm:query-field name="vender_name" queryExpression="t1.vender_name=${@vender_name}"/>
<bm:query-field name="vender_name_n" queryExpression="t1.vender_name_n=${@vender_name_n}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/leaf.plugin.export.word/payment_apply_content.xml
View file @ 7435d2ca
......@@ -209,24 +209,74 @@
<p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >烦请贵司将款项汇至以下账号:</t>
</p>
<p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >开户名:${model.getObject('/model/bank_info/record/@agent_account_name')!''} 开户名:${model.getObject('/model/bank_info/record/@vender_account_name')!''} </t>
</p>
<p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >开户行:${model.getObject('/model/bank_info/record/@agent_bank_name')!''} 开户行:${model.getObject('/model/bank_info/record/@vender_bank_name')!''} </t>
</p>
<p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >账号:${model.getObject('/model/bank_info/record/@agent_bank_num')!''} 账号:${model.getObject('/model/bank_info/record/@vender_bank_num')!''}</t>
</p>
<p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >委托收款人确认金额无误 委托公司名称:${model.getObject('/model/bank_info/record/@agent_name')!''}</t>
</p>
<p indFirstLine="1" line="400" >
<t fontFamily="宋体" fontSize="20" fontColor="000000" >收款人:${model.getObject('/model/bank_info/record/@vender_name')!''} 申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t>
</p>
<p indFirstLine="9" line="400">
<t fontFamily="宋体" fontSize="20" fontColor="000000"> 确认日期:</t>
</p>
<tbl indLeft="1" border="false">
<tr height="0.7">
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体">开户名:${model.getObject('/model/bank_info/record/@agent_account_name')!''}</t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体">开户名:${model.getObject('/model/bank_info/record/@vender_account_name')!''}</t></p>
</tc>
</tr>
<tr height="0.7">
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体">开户行:${model.getObject('/model/bank_info/record/@agent_bank_name')!''}</t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体">开户行:${model.getObject('/model/bank_info/record/@vender_bank_name')!''}</t></p>
</tc>
</tr>
<tr height="0.7">
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体">账号:${model.getObject('/model/bank_info/record/@agent_bank_num')!''}</t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体">账号:${model.getObject('/model/bank_info/record/@vender_bank_num')!''}</t></p>
</tc>
</tr>
<tr height="0.7">
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体">委托收款人确认金额无误</t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体">委托公司名称:${model.getObject('/model/bank_info/record/@agent_name')!''}</t></p>
</tc>
</tr>
<tr height="0.7">
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体">收款人:${model.getObject('/model/bank_info/record/@vender_name')!''}</t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体">申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t></p>
</tc>
</tr>
<tr height="0.7">
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体"></t></p>
</tc>
<tc width="10">
<p align="left"><t fontSize="20" fontFamily="宋体">确认日期:</t></p>
</tc>
</tr>
</tbl>
<!-- <p indFirstLine="1" line="400" >-->
<!-- <t fontFamily="宋体" fontSize="20" fontColor="000000" >开户名:${model.getObject('/model/bank_info/record/@agent_account_name')!''} 开户名:${model.getObject('/model/bank_info/record/@vender_account_name')!''} </t>-->
<!-- </p>-->
<!-- <p indFirstLine="1" line="400" >-->
<!-- <t fontFamily="宋体" fontSize="20" fontColor="000000" >开户行:${model.getObject('/model/bank_info/record/@agent_bank_name')!''} 开户行:${model.getObject('/model/bank_info/record/@vender_bank_name')!''} </t>-->
<!-- </p>-->
<!-- <p indFirstLine="1" line="400">-->
<!-- <t fontFamily="宋体" fontSize="20" fontColor="000000" >账号:${model.getObject('/model/bank_info/record/@agent_bank_num')!''} 账号:${model.getObject('/model/bank_info/record/@vender_bank_num')!''}</t>-->
<!-- </p>-->
<!-- <p indFirstLine="1" line="400" >-->
<!-- <t fontFamily="宋体" fontSize="20" fontColor="000000" >委托收款人确认金额无误 委托公司名称:${model.getObject('/model/bank_info/record/@agent_name')!''}</t>-->
<!-- </p>-->
<!-- <p indFirstLine="1" line="400" >-->
<!-- <t fontFamily="宋体" fontSize="20" fontColor="000000" >收款人:${model.getObject('/model/bank_info/record/@vender_name')!''} 申请日期:${model.getObject('/model/bank_info/record/@current_date')!''}</t>-->
<!-- </p>-->
<!-- <p indFirstLine="9" line="400">-->
<!-- <t fontFamily="宋体" fontSize="20" fontColor="000000"> 确认日期:</t>-->
<!-- </p>-->
<p orientation="landscape">
</p>
</body>
......
src/main/webapp/modules/csh/CSH501/csh_payment_req_selected.lview
View file @ 7435d2ca
......@@ -217,7 +217,13 @@
<a:dataSet id="division_ds" loadData="true" model="basic.hls_division_for_lov"/>
<a:dataSet id="csh_payment_req_query_ds" autoCreate="true">
<a:fields>
<a:field name="vender_name_n" returnField="vender_name" displayField="code_value_name" valueField="code_value" options="vender_name_ds"/>
<!-- <a:field name="vender_name_n" returnField="vender_name" displayField="code_value_name" valueField="code_value" options="vender_name_ds"/>-->
<a:field name="vender_name_n" lovGridHeight="300" lovHeight="450" lovLabelWidth="120" lovService="basic.hls_bp_master_v_for_lov?bp_category=VENDER" lovWidth="600" title="厂商">
<a:mapping>
<a:map from="bp_name" to="vender_name_n"/>
</a:mapping>
</a:field>
<a:field name="times"/>
<a:field name="due_date_to" defaultValue="${/model/sys_time_default_value_list/record/@now_time}"/>
<a:field name="project_number_from" lovGridHeight="300" lovHeight="450" lovService="prj.PRJ501.prj_project_for_lov" lovWidth="500" title="ACR510.FIELD.PROJECT_NUMBER_FROM">
......@@ -247,13 +253,13 @@
</a:field>
<a:field name="bp_name" readOnly="true"/>
<a:field name="bp_code_tenant" readOnly="true"/>
<a:field name="bp_name_tenant" lovGridHeight="300" lovHeight="450" lovLabelWidth="120" lovService="basic.hls_bp_master_v_for_lov" lovWidth="600" title="HLS.TENANT_NUMBER_FROM">
<a:field name="bp_name_tenant" lovGridHeight="300" lovHeight="450" lovLabelWidth="120" lovService="basic.hls_bp_master_v_for_lov?bp_category=TENANT" lovWidth="600" title="承租人">
<a:mapping>
<a:map from="bp_code" to="bp_code_tenant"/>
<a:map from="bp_name" to="bp_name_tenant"/>
</a:mapping>
</a:field>
<a:field name="bp_code_tenant_from" lovGridHeight="300" lovHeight="450" lovLabelWidth="120" lovService="basic.hls_bp_master_v_for_lov" lovWidth="600" title="HLS.TENANT_NUMBER_FROM">
<a:field name="bp_code_tenant_from" lovGridHeight="300" lovHeight="450" lovLabelWidth="120" lovService="basic.hls_bp_master_v_for_lov?bp_category='AGENT'" lovWidth="600" title="HLS.TENANT_NUMBER_FROM">
<a:mapping>
<a:map from="bp_code" to="bp_code_tenant_from"/>
<a:map from="bp_name" to="bp_name_tenant_from"/>
......@@ -348,7 +354,7 @@
<!-- <a:lov name="cf_item_desc" bindTarget="csh_payment_req_query_ds" prompt="现金流类型"/>-->
<a:datePicker name="due_date_from" bindTarget="csh_payment_req_query_ds" prompt="应付日期从"/>
<a:datePicker name="due_date_to" bindTarget="csh_payment_req_query_ds" prompt="应付日期到"/>
<a:comboBox name="vender_name_n" bindTarget="csh_payment_req_query_ds" prompt="厂商"/>
<a:lov name="vender_name_n" bindTarget="csh_payment_req_query_ds" prompt="厂商"/>
<a:numberField name="due_amount_from" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_query_ds" prompt="应付金额从"/>
<a:numberField name="due_amount_to" allowDecimals="true" allowFormat="true" bindTarget="csh_payment_req_query_ds" prompt="应付金额到"/>
<!--<a:comboBox name="currency_name" bindTarget="csh_payment_req_query_ds" prompt="HLS.CURRENCY" width="150"/>-->
......
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