Skip to content

L
leaf-hlcm
Commit fa4ce53b authored by Darming's avatar Darming
Browse files
Options

Merge branch 'feature/csh_write_off' into develop

parents 3b55b0c8 ed178b1f
Show whitespace changes
Inline Side-by-side
Showing with 196 additions and 176 deletions
src/main/webapp/WEB-INF/classes/csh/CSH514/csh_write_off.lwm
View file @ fa4ce53b
......@@ -48,6 +48,7 @@
<bm:field name="history_flag" expression="(SELECT ct.history_flag FROM csh_transaction ct WHERE ct.transaction_id = t1.csh_transaction_id)" forInsert="false" forUpdate="false"/>
<bm:field name="ref_bp_name" expression="(select cc.bp_name from con_contract_v cc where cc.contract_id = nvl(t1.contract_id,t1.ASSIGNS_CONTRACT_ID))" forInsert="false" forUpdate="false"/>
<bm:field name="ref_contract_number" expression="(select cc.contract_number from con_contract cc where cc.contract_id = nvl(t1.contract_id,t1.ASSIGNS_CONTRACT_ID))" forInsert="false" forUpdate="false"/>
<bm:field name="gld_batch_id"/>
<!-- <bm:field name="ref_agent_name" expression="(select cc.extra_nam from con_contract_v cc where cc.contract_id = nvl(t1.contract_id,t1.ASSIGNS_CONTRACT_ID))" forInsert="false" forUpdate="false"/>-->
</bm:fields>
<bm:features>
......
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_query_position.lwm 0 → 100644
View file @ fa4ce53b
<?xml version="1.0" encoding="UTF-8"?>
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features">
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select p.position_code, 'Y' approval_enbale
FROM exp_emp_user_e_v e, exp_org_position p where e.position_id = p.POSITION_ID and e.user_id = ${/session/@user_id}
and p.position_code in ('00321','00217') and p.ENABLED_FLAG = 'Y'
]]>
</bm:query-sql>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm
View file @ fa4ce53b
......@@ -170,5 +170,6 @@
<bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
<!-- <bm:data-filter name="type" expression="t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT') and t1.returned_flag != 'FULL' and t1.reversed_flag = 'N' and nvl(t1.deposit_flag,'N')='N' "/>-->
<bm:data-filter name="type" expression="t1.transaction_type in ('ADVANCE_RECEIPT','RECEIPT') and t1.returned_flag != 'FULL' and nvl(t1.deposit_flag,'N')='N' and t1.confirmed_flag in ('WF_APPROVING','ACCAUDITED','APPROVED','WF_REJECTED') "/>
<bm:data-filter name="position_code" expression="(${@position_code} = '00217' and t1.bp_category = 'TENANT' and t1.paid_byother_flag = 'N') or (${@position_code} = '00321' and t1.bp_category != 'TENANT' and t1.paid_byother_flag != 'N') or (${/session/@user_id} = 1)" />
</bm:data-filters>
</bm:model>
\ No newline at end of file
src/main/webapp/modules/cont/CON500/con_contract_update.lview
View file @ fa4ce53b
......@@ -5,17 +5,17 @@
$Revision: 1.0
$Purpose:
-->
<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:c="leaf.application.action" xmlns:p="uncertain.proc" xmlns:s="leaf.plugin.script" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
<a:screen xmlns:c="leaf.application.action" xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" cacheEnabled="true" cacheKey="${/parameter/@layout_code}_screen" customizationEnabled="true" trace="true">
<a:init-procedure>
<!-- <s:server-script import="aut_authority_validate.js"/>-->
<!-- <s:server-script import="aut_authority_validate.js"/> -->
<a:model-query fetchAll="true" model="hls.HLS030.hls_doc_layout_main" rootPath="layout_main_path"/>
<a:model-query fetchAll="true" model="cont.CON500.hls_doc_layout_button" rootPath="layout_main_button_path"/>
<a:model-query defaultWhereClause="t1.parent_table is null and t1.tab_type!=&apos;TAB&apos; and t1.enabled_flag=&apos;Y&apos; and rownum=1" fetchAll="true" model="cont.CON500.con_hls_doc_layout_tab_query" rootPath="base_table_path"/>
<!-- <s:server-script><![CDATA[-->
<!-- var m=$ctx.get('/model/layout_main_button_path');-->
<!-- println(m.toXML());-->
<!-- println('**************');-->
<!-- ]]></s:server-script>-->
<!-- <s:server-script><![CDATA[
var m=$ctx.get('/model/layout_main_button_path');
println(m.toXML());
println('**************');
]]></s:server-script> -->
</a:init-procedure>
<a:view>
<script type="text/javascript"><![CDATA[
......@@ -25,14 +25,14 @@
if ('${/parameter/@winid}') {
if (parent.$L.CmpManager.get('${/parameter/@winid}')) {
detail_mask = parent.$('${/parameter/@winid}').wrap;
// parent.Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
parent.Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
} else {
detail_mask = $('${/parameter/@winid}').wrap;
// Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
}
} else {
detail_mask = Ext.getBody();
// Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
}
}
......@@ -157,13 +157,13 @@
</#list>
</a:screenTopToolbar>
</#if>
</#if>
]]></a:freeMarker>
<a:screenBody padding="5" style="width:98%">
</#if>
]]></a:freeMarker>
<a:screenBody padding="5" style="width:98%">
<a:placeHolder id="dynamicMain_id"/>
</a:screenBody>
</a:view>
<a:view-config>
</a:screenBody>
</a:view>
<a:view-config>
<c:create-config targetId="dynamicMain_id">
<p:loop source="/model/layout_main_path">
<p:switch test="@tab_type">
......@@ -195,5 +195,5 @@
</p:switch>
</p:loop>
</c:create-config>
</a:view-config>
</a:view-config>
</a:screen>
src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview
View file @ fa4ce53b
......@@ -251,6 +251,7 @@
<!-- <a:column name="project_name" prompt="PRJ501.PRJ_PROJECT.PROJECT_NAME"/> -->
<a:column name="bp_name" prompt="CSH513.BP_TENANT"/>
<a:column name="write_off_classification_desc" prompt="核销分类"/>
<a:column name="gld_batch_id" prompt="核销批次号"/>
</a:columns>
</a:grid>
</a:screenBody>
......
src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview
View file @ fa4ce53b
......@@ -8,6 +8,7 @@
<a:screen xmlns:a="http://www.leaf-framework.org/application">
<a:init-procedure>
<a:model-query model="csh.CSH531N.csh_batch_status_default" rootPath="batch_status_default"/>
<a:model-query model="csh.CSH531N.csh_query_position" rootPath="result_position" />
<a:model-query
defaultWhereClause="v.code=&apos;CSH511_TRANSACTION_TYPE&apos; and v.code_value in （&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;)"
fetchAll="true" model="basic.sys_code_default_value" rootPath="sys_code_default_value_path"/>
......@@ -344,6 +345,7 @@
if (transaction_type != 'ADVANCE_RECEIPT'){
advanceDisplayFlag = 'Y';
}
var approval_flag = '${/model/result_position/record/@approval_enbale}' || 'N';
var win = new Leaf.Window({
id: 'csh_write_off_window',
params: {
......@@ -359,6 +361,7 @@
bp_id: record.get('bp_id'),
advanceDisplayFlag: advanceDisplayFlag,
readOnly: readOnly,
approval_flag: approval_flag,
winid: 'csh_write_off_window'
},
url: $('batch_detail_link').getUrl(),
......@@ -520,6 +523,7 @@
<a:map from="bp_name" to="bp_name"/>
</a:mapping>
</a:field>
<a:field name="position_code" defaultValue="${/model/result_position/record/@position_code}" />
<a:field name="receipt_type_desc" options="receipt_type_ds" valueField="code_value"
defaultValue="code_value_name" returnField="receipt_type"/>
</a:fields>
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ fa4ce53b
......@@ -627,7 +627,7 @@
<a:field name="contract_id"/>
<a:field name="trx_interface_id" defaultValue="${/parameter/@transaction_id}"/>
<a:field name="contract_number" prompt="合同编号" autoComplete="true" lovAutoQuery="true"
lovHeight="880"
lovHeight="850"
lovUrl="${/request/@context_path}/modules/csh/CSH531N/csh_write_off_ref_contract.lview"
lovWidth="1350" title="合同号选择">
<a:mapping>
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview
View file @ fa4ce53b
......@@ -123,7 +123,7 @@
</a:form>
<a:hBox>
<a:vBox>
<a:grid bindTarget="csh_lov_con_contract_ds" width="450" id="csh_con_contract_ds" marginHeight="300"
<a:grid bindTarget="csh_lov_con_contract_ds" width="450" id="csh_con_contract_ds" marginHeight="360"
navBar="true">
<a:columns>
<a:column name="contract_number" align="center" prompt="HLS.CONTRACT_NUMBER" width="120"/>
......@@ -133,7 +133,7 @@
</a:grid>
</a:vBox>
<a:vBox>
<a:grid bindTarget="csh_write_off_lov_ds" marginHeight="300" id="csh_con_contract_cashflow_ds"
<a:grid bindTarget="csh_write_off_lov_ds" marginHeight="360" id="csh_con_contract_cashflow_ds"
width="800" navBar="true">
<a:columns>
<a:column name="times" prompt="HLS.TIMES" align="center" width="60"/>
......
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