Commit dd686e05 authored by lizhe's avatar lizhe

汇丰银行账户明细查询功能相关

parent 7204e3ab
......@@ -104,6 +104,7 @@
<bm:field name="guarantor_name_duty" />
<bm:field name="extra_nam" expression="(Select u.unit_name From exp_org_unit_v u Where u.unit_id = (select v.unit_id from hls_bp_master v where v.enabled_flag = 'Y' and v.bp_id = t1.bp_id))" forInsert="false" forUpdate="false"/>
<bm:field name="import_source"/>
<bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......
......@@ -82,6 +82,8 @@
<bm:field name="approval_status" expression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'))"/>
<bm:field name="approval_status_desc" expression="(Select v.code_value_name From sys_code_values_v v Where v.code = &apos;WFL_STATUS&apos; And v.code_value = decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')))"/>
<bm:field name="transaction_wfl_id"/>
<bm:field name="import_source"/>
<bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......@@ -147,5 +149,6 @@ and cc.data_class = 'NORMAL'
and cwo.csh_transaction_id = t1.transaction_id
and hbm.bp_name like ${@bp_name_r})"/>
<bm:query-field name="approval_status" queryExpression="decode(nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW'), 'APPROVED', decode(nvl(t1.reversed_flag, 'N'), 'N', 'NEW', 'APPROVED'), nvl((Select nvl(cw.approval_status, 'NEW') From csh_transaction_wfl cw Where cw.transaction_wfl_id = t1.transaction_wfl_id), 'NEW')) = ${@approval_status}"/>
<bm:query-field field="import_source" queryOperator="="/>
</bm:query-fields>
</bm:model>
......@@ -102,6 +102,8 @@
<bm:field name="confirm_user_name" expression="(select description from sys_user where user_id = t1.confirmed_by)" forceUpdate="false" forInsert="false"/>
<bm:field name="confirmed_flag_desc" expression="(select code_value_name from sys_code_values_v where code = 'CONFIRMED_FLAG' and code_value = t1.confirmed_flag)" forceUpdate="false" forInsert="false"/>
<bm:field name="confirmed_flag"/>
<bm:field name="import_source"/>
<bm:field name="import_source_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'CSH510_IMPORT_SOURCE' and v.code_value =t1.import_source)" forInsert="false" forUpdate="false"/>
<!--end-->
</bm:fields>
<bm:features>
......@@ -164,7 +166,7 @@
<bm:query-field name="bp_bank_account_num" queryExpression="t1.bp_bank_account_num like ${@bp_bank_account_num}"/>
<bm:query-field name="bank_name" queryExpression="(select a.bank_short_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id) like ${@bank_name}"/>
<bm:query-field name="bank_branch_name" queryExpression="(select a.bank_branch_name from csh_bank_account_v a where a.bank_account_id=t1.bank_account_id) like ${@bank_branch_name}"/>
<bm:query-field field="import_source" queryOperator="="/>
<!--end-->
</bm:query-fields>
<bm:data-filters>
......
......@@ -594,6 +594,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="position_code_ds">
<a:datas dataSource="/model/position_code"/>
</a:dataSet>
......@@ -818,7 +819,7 @@
<a:map from="bp_bank_account_num" to="bp_bank_account_num"/>
</a:mapping>
</a:field>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields>
<a:events>
<a:event name="update" handler="csh510_receipt_maintain_update"/>
......@@ -894,6 +895,8 @@
<!-- <a:comboBox name="write_off_flag_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"/>-->
<a:comboBox name="collection_classes_n" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.PURPOSE_OF_FUNDS"/>
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="新增路径"/>
</a:fieldSet>
......@@ -928,7 +931,7 @@
<a:column name="guarantor_name_duty" hidden="true" />
<a:column name="paid_byother_flag" hidden="true"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据审批状态"
align="center"/>
<!-- <a:column name="written_off_flag_desc" prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS"-->
......
......@@ -147,6 +147,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="currency_ds">
<a:datas dataSource="/model/currency"/>
</a:dataSet>
......@@ -241,6 +242,7 @@
</a:mapping>
</a:field>
<a:field name="approval_status_desc" displayField="code_value_name" options="approval_status_ds" returnField="approval_status" valueField="code_value"/>
<a:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields>
<a:events>
<a:event name="update" handler="csh514_reversed_update"/>
......@@ -317,6 +319,7 @@
prompt="合同编号"/>
<a:comboBox name="approval_status_desc" bindTarget="csh_transaction_receipt_write_off_reverse_query_ds"
prompt="审批状态"/>
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_reverse_query_ds" prompt="新增路径"/>
</a:form>
<a:grid id="csh_transaction_receipt_write_off_grid_ds"
bindTarget="csh_transaction_receipt_write_off_reverse_result_ds" marginHeight="260" marginWidth="35"
......@@ -350,6 +353,7 @@
<a:column name="bank_account_name" width="120"/>
<a:column name="transaction_type_desc" align="center" prompt="事务类型" width="120"/>
<a:column name="receipt_type_des" align="center" prompt="收款类型" width="120"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="approval_status_desc" align="center" prompt="审批状态" width="120"/>
</a:columns>
<a:editors>
......
......@@ -509,6 +509,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="batch_status_ds" lookupCode="CSH531_BATCH_STATUS"/>
<a:dataSet id="confirmed_flag_ds">
<a:datas>
......@@ -555,6 +556,7 @@
<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:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields>
<a:events>
<a:event name="update" handler="csh513_receipt_write_off_update"/>
......@@ -630,6 +632,9 @@
<a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds"
prompt="单据审批状态"/>
</a:box>
<a:box column="4">
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="新增路径"/>
</a:box>
</a:fieldSet>
</a:form>
<a:grid id="csh_transaction_receipt_write_off_grid_ds"
......@@ -673,6 +678,7 @@
<!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>-->
<!-- <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>-->
<a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据审批状态" width="120" align="center"/>
<!-- <a:column name="review_status_desc" prompt="分配状态" width="80"/>-->
<!-- <a:column name="ref_v05" prompt="备注" width="100"/>-->
......
......@@ -518,6 +518,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="import_source_ds" lookupCode="CSH510_IMPORT_SOURCE"/>
<a:dataSet id="batch_status_ds" lookupCode="CSH531_BATCH_STATUS"/>
<a:dataSet id="confirmed_flag_ds">
<a:datas>
......@@ -565,6 +566,7 @@
<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:field name="import_source_desc" options="import_source_ds" valueField="code_value" displayField="code_value_name" returnField="import_source"/>
</a:fields>
<a:events>
<a:event name="update" handler="csh513_receipt_write_off_update"/>
......@@ -642,6 +644,9 @@
<a:comboBox name="confirmed_flag_desc" bindTarget="csh_transaction_receipt_write_off_query_ds"
prompt="单据审批状态"/>
</a:box>
<a:box column="4">
<a:comboBox name="import_source_desc" bindTarget="csh_transaction_receipt_write_off_query_ds" prompt="新增路径"/>
</a:box>
</a:fieldSet>
</a:form>
<a:grid id="csh_transaction_receipt_write_off_grid_ds"
......@@ -685,6 +690,7 @@
<!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>-->
<!-- <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>-->
<a:column name="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
<a:column name="import_source_desc" prompt="新增路径" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据审批状态" width="120" align="center"/>
<!-- <a:column name="review_status_desc" prompt="分配状态" width="80"/>-->
<!-- <a:column name="ref_v05" prompt="备注" width="100"/>-->
......
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