Skip to content

L
leaf-hlcm
Commit 41316802 authored by panhong18943's avatar panhong18943
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_current_query.lwm
#	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_query.lwm
#	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_total_query.lwm
#	src/main/webapp/WEB-INF/server-script/layoutconfig/con_tenant_change_modify_t_history_ingo_queryfields.js
#	src/main/webapp/leafresource/leaf.ui.std/hap/base/Leaf-all-min.css
#	src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
#	src/main/webapp/modules/hls/HLS213N/hls_bp_master_create_entrance.lview
#	src/main/webapp/modules/hls/HLS530/manual_journal_create.lview
#	src/main/webapp/modules/rpt/RPT555/con_je_vat_query.lview
parents 03dc751e fafb6bf6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 672 additions and 469 deletions
src/main/database/Init/Layout_db_object/INITIALIZE_LAYOUT_DB_OBJECT.sql
View file @ 41316802
......@@ -22,6 +22,9 @@ values ('CONTRACT', 'CON_CONTRACT_REPO_MODIFY_LV', 'VIEW', -1, sysdate, -1, sysd
insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
values ('CONTRACT', 'CON_CONTRACT_CCR_Q_LV', 'VIEW', -1, sysdate, -1, sysdate);
insert into HLS_DOC_CATEGORY_DB_OBJECT (DOCUMENT_CATEGORY, OBJECT_NAME, OBJECT_TYPE, CREATED_BY, CREATION_DATE, LAST_UPDATED_BY, LAST_UPDATE_DATE)
values ('CONTRACT', 'con_contract_history_lv', 'VIEW', -1, sysdate, -1, sysdate);
end;
/
commit;
......
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm
View file @ 41316802
......@@ -103,6 +103,8 @@
<bm:field name="guarantor_name_duty_desc" expression="(select v.code_value_name from sys_code_values_v v where v.code = 'YES_NO' and v.code_value = t1.guarantor_name_duty)" forInsert="false" forUpdate="false" prompt="担保人履行担保义务" />
<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/>
......@@ -164,5 +166,6 @@
<bm:query-field name="bank_account_num" queryExpression="(select a.bank_account_num from csh_bank_account a where a.bank_account_id=t1.bank_account_id) like &apos;%&apos;||upper(${@bank_account_num})||&apos;%&apos;"/>
<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>
<bm:query-field name="extra_nam" queryExpression="(SELECT cc.extra_nam FROM hls_bp_master cc WHERE cc.enabled_flag = 'Y' and cc.bp_category = 'AGENT' and cc.bp_id = t1.bp_id ) like &apos;%&apos;||upper(${@extra_nam})||&apos;%&apos;"/>
<bm:query-field field="import_source" queryOperator="="/>
</bm:query-fields>
</bm:model>
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_query.lwm
View file @ 41316802
......@@ -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>
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_query.lwm
View file @ 41316802
......@@ -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>
......
src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_query.lwm
View file @ 41316802
......@@ -26,42 +26,65 @@
</bm:operation>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select * from ( select v1.contract_id,
(select cc.contract_number from con_contract cc where cc.contract_id=v1.contract_id)contract_number,
(select cc.contract_name from con_contract cc where cc.contract_id=v1.contract_id)contract_name,
--to_char(v1.unwrite_off_amount,'FM999,999,999,990.00')unwrite_off_amount,
v1.unwrite_off_amount,
v1.deposit_trans_type,
(select t.bp_name
from hls_bp_master t, con_contract ct
where t.bp_id = ct.bp_id_tenant
and ct.contract_id = v1.contract_id) bp_id_telnet_n,
(select ct.bp_id_agent_level1 from
con_contract ct
where contract_id = v1.contract_id) bp_id_agent_level1,
(select t.bp_name
from hls_bp_master t, con_contract ct
where t.bp_id = ct.bp_id_agent_level1
and ct.contract_id = v1.contract_id) bp_name,
(select v.code_value_name
from sys_code_values_v v
where v.code = 'DEPOSIT_TRANS_TYPE'
and v.code_value = v1.deposit_trans_type) deposit_trans_type_n,
nvl(( hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id=>v1.contract_id,p_user_id=>1) ),'正常')approve_status,
v1.bp_id
from (select tt.ref_contract_id contract_id,
tt.deposit_trans_type,
sum((nvl(tt.transaction_amount, 0) -
nvl(tt.write_off_amount, 0) - nvl(tt.returned_amount, 0))) unwrite_off_amount,
tt.bp_id
from csh_transaction tt
where tt.transaction_type = 'DEPOSIT'
and tt.ref_contract_id is not null
and tt.transaction_amount > 0
and tt.deposit_trans_type is not null
group by tt.ref_contract_id, tt.deposit_trans_type, tt.bp_id) v1
where v1.unwrite_off_amount>0)v
select *
from (select v1.contract_id,
(select cc.contract_number
from con_contract cc
where cc.contract_id = v1.contract_id) contract_number,
(select cc.contract_name
from con_contract cc
where cc.contract_id = v1.contract_id) contract_name,
--to_char(v1.unwrite_off_amount,'FM999,999,999,990.00')unwrite_off_amount,
v1.unwrite_off_amount,
v1.deposit_trans_type,
(select t.bp_name
from hls_bp_master t, con_contract ct
where t.bp_id = ct.bp_id_tenant
and ct.contract_id = v1.contract_id) bp_id_telnet_n,
(select ct.bp_id_agent_level1
from con_contract ct
where contract_id = v1.contract_id) bp_id_agent_level1,
(select t.bp_name
from hls_bp_master t, con_contract ct
where t.bp_id = ct.bp_id_agent_level1
and ct.contract_id = v1.contract_id) bp_name,
(select v.code_value_name
from sys_code_values_v v
where v.code = 'DEPOSIT_TRANS_TYPE'
and v.code_value = v1.deposit_trans_type) deposit_trans_type_n,
nvl((hlcm_cux_deposit_pkg.get_transaction_status_new(p_contract_id => v1.contract_id,
p_user_id => 1)),
'正常') approve_status,
v1.bp_id,
nvl((SELECT tc.trans_review_status
FROM csh_transaction_contemp tc
where tc.contemp_id =
(select max(contemp_id)
FROM csh_transaction_contemp tc
where tc.source_contract_id = v1.contract_id
and tc.batch_id is not null)),'NEW') trans_review_status,
nvl((SELECT sc.code_value_name
FROM csh_transaction_contemp tc, sys_code_values_v sc
where tc.contemp_id =
(select max(contemp_id)
FROM csh_transaction_contemp tc
where tc.source_contract_id = v1.contract_id
and tc.batch_id is not null)
and sc.code = 'TRANS_REVIEW_STATUS'
AND sc.code_value =nvl(tc.trans_review_status,'NEW')),'新建') trans_review_status_n
from (select tt.ref_contract_id contract_id,
tt.deposit_trans_type,
sum((nvl(tt.transaction_amount, 0) -
nvl(tt.write_off_amount, 0) -
nvl(tt.returned_amount, 0))) unwrite_off_amount,
tt.bp_id
from csh_transaction tt
where tt.transaction_type = 'DEPOSIT'
and tt.ref_contract_id is not null
and tt.transaction_amount > 0
and tt.deposit_trans_type is not null
group by tt.ref_contract_id, tt.deposit_trans_type, tt.bp_id) v1
where v1.unwrite_off_amount > 0) v
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
......@@ -74,6 +97,6 @@
<bm:query-field name="bp_name_n" queryExpression="v.bp_name = ${@bp_name_n}"/>
<bm:query-field name="bp_id_telnet_n" queryExpression="v.bp_id_telnet_n =${@bp_id_telnet_n}"/>
<bm:query-field name="deposit_trans_type" queryExpression="v.deposit_trans_type =${@deposit_trans_type}"/>
<bm:query-field name="trans_review_status" queryExpression="v.trans_review_status =${@trans_review_status}"/>
</bm:query-fields>
</bm:model>
\ No newline at end of file
src/main/webapp/WEB-INF/classes/hls/HLS301/hls_journal_header_v.lwm
View file @ 41316802
......@@ -72,7 +72,7 @@
</bm:features>
<bm:query-fields>
<bm:query-field field="merge_parent_flag" queryOperator="="/>
<bm:query-field name="contract_number" queryExpression="exists (select 1 from HLS_JOURNAL_DETAIL_LV hl where hl.journal_header_id = t1.journal_header_id and hl.reference3 = ${@contract_number})"/>
<bm:query-field name="contract_number" queryExpression="exists (select 1 from HLS_JOURNAL_DETAIL_LV hl where hl.journal_header_id = t1.journal_header_id and hl.reference3 like ${@contract_number})"/>
<bm:query-field field="journal_num" queryOperator="like"/>
<bm:query-field name="journal_date_from" queryExpression="t1.journal_date &gt;= to_date(${@journal_date_from},'yyyy-mm-dd')"/>
<bm:query-field name="journal_date_to" queryExpression="t1.journal_date &lt;= to_date(${@journal_date_to},'yyyy-mm-dd')"/>
......
src/main/webapp/WEB-INF/server-script/layoutconfig/con_tenant_change_modify_t_history_ingo_queryfields.js
View file @ 41316802
remove_query_field('CONTRACT_ID');
remove_datafilter('contract_id');
var add_datafilters=[
{
name:'bp_id',
expression:'(t1.bp_id = ${@bp_id})'
}
{
name:'bp_id',
expression:'(t1.bp_id = ${@bp_id})'
}
];
add_datafilter();
\ No newline at end of file
src/main/webapp/WEB-INF/server-script/layoutconfig/contract_ifrs9_g_contract_result_queryfields.js
View file @ 41316802
// var override_queryfields = [
// {
// name : 'period_name',
// queryexpression : "t1.period_name =${@period_name}"
// }]
/*
var override_queryfields = [
{in (${@division})
name : 'lease_name',
queryexpression : 't1.division in (${@lease_name})'
}]
*/
var add_datafilters = [ {
name : 'period_name',
expression : 't1.period_name=${@period_name}'
} ];
name : 'period_names',
expression : 't1.period_name=${@period_names}'
},
{
name : 'divisions',
expression : 't1.division in (${@division1},${@division2},${@division3},${@division4},${@division5},${@division6},${@division7},${@division8},{@division9}) '
}
];
add_datafilter();
// override();
\ No newline at end of file
//override();
\ No newline at end of file
src/main/webapp/WEB-INF/weblogic.xml deleted 100644 → 0
View file @ 03dc751e
<?xml version="1.0" encoding="UTF-8"?>
<weblogic-web-app xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app">
<session-descriptor>
<cookie-name>JSESSIONID1</cookie-name>
<persistent-store-type>replicated_if_clustered</persistent-store-type>
</session-descriptor>
<container-descriptor>
<!--<prefer-web-inf-classes>true</prefer-web-inf-classes>-->
<prefer-application-packages>
<package-name>oracle.*</package-name>
</prefer-application-packages>
<show-archived-real-path-enabled>true</show-archived-real-path-enabled>
</container-descriptor>
<virtual-directory-mapping>
<local-path>/u01</local-path>
<url-pattern>/hls_file/*</url-pattern>
</virtual-directory-mapping>
</weblogic-web-app>
\ No newline at end of file
src/main/webapp/leafresource/leaf.ui.std/hap/base/Leaf-all-min.css
View file @ 41316802
......@@ -136,7 +136,7 @@ A:hover {
position: fixed;
overflow: hidden;
background-color: #000000;
/* opacity: 0.15 !important;*/
/* opacity: 0.15 !important;*/
opacity: 0.15 ;
mozopacity: 0.15;
filter: alpha(opacity=15);
......@@ -233,8 +233,8 @@ A:hover {
.item-focus .item-input-wrap {
border: 1px solid #A5BAFF;
/* background: #e2f7ff; */
/* -webkit-box-shadow: 0 0 8px rgba(102, 175, 233, .6);
box-shadow: 0 0 8px rgba(102, 175, 233, .6);*/
/* -webkit-box-shadow: 0 0 8px rgba(102, 175, 233, .6);
box-shadow: 0 0 8px rgba(102, 175, 233, .6);*/
}
.item-focus .item-readOnly {
border: 1px solid #ccc;
......@@ -338,7 +338,7 @@ A:hover {
TOP: -1000px;
z-index: 10000;
POSITION: absolute;
/* BORDER: #c4c4c4 1px solid; !* BORDER: #bababa 1px solid; *!*/
/* BORDER: #c4c4c4 1px solid; !* BORDER: #bababa 1px solid; *!*/
/*border-radius: 4px;*/
}
......@@ -1424,7 +1424,7 @@ button div {
/*background-image: url(../toolbar/toolbar_bg.gif);*/
background-repeat: repeat-x;
COLOR: #333; /* COLOR: #055a78; */
/* background: #f5f5f5;*/
/* background: #f5f5f5;*/
}
.item-dateField-caption {
......
src/main/webapp/modules/acr/ACR510/acr_invoice_create_invoice.lview
View file @ 41316802
......@@ -43,7 +43,7 @@
function createScreen_create()
{
debugger;
var message_flag =false;
var win = $('acr_invoice_create_invoice');
var ds=$('headDs');
if(!ds.validate(true))
......@@ -54,6 +54,7 @@
//判断本次开票金额是否为租金，本金，和利息之中某一个
var selectedDs=$('selectedDs').getAll();
for(var i=0;i<selectedDs.length;i++){
debugger;
var billing_amount=selectedDs[i].get('billing_amount');
var due_amount=selectedDs[i].get('due_amount');
var principal=selectedDs[i].get('principal');
......@@ -70,18 +71,33 @@
$L.showErrorMessage("提示","该金额已经开票过！");
return;
}
//add by gzj 售后回租只能开普票
var business_type= selectedDs[i].get('business_type');
var kind_type=selectedDs[i].get('invoice_kind_type');
if(business_type=='LEASEBACK'&&(kind_type!='PAPER_GENERAL'&&kind_type!='ELECTRONIC_GENERAL')){
Leaf.showMessage("提示","售后回租只能开普通发票!");
return;
}
if(business_type=='LEASEBACK'&&kind_type!='ELECTRONIC_GENERAL'){
message_flag =true;
// Leaf.showMessage("提示","回租建议选择增值税电子普票!");
}
if(received_amount<plus(cf_billing_amount,billing_amount)&&selectedDs[i].get('cf_item')==1&&selectedDs[i].get('cf_status')=='BLOCK'&&selectedDs[i].get('contract_status')=='REPURING'){
$L.showErrorMessage("提示","本次开票金额+已开票金额不能超过已核销金额！");
return;
}
}
var datas = ds.getJsonData();
Leaf.showConfirm('${l:HLS.PROMPT}','是否确认开票？',function()
var message_info;
if(message_flag==false){
message_info= '是否确认开票？';
}else {
message_info= "回租建议选择增值税电子普票!是否确认开票？";
}
Leaf.showConfirm('${l:HLS.PROMPT}',message_info,function()
{
Leaf.Masker.mask(Ext.getBody(),'${l:HLS.EXECUTING}');
Leaf.request({
......@@ -100,7 +116,8 @@
Leaf.Masker.unmask(Ext.getBody());
},
scope: this
scope: this,
sync: true
});
},function (){
Leaf.Masker.unmask(Ext.getBody());
......@@ -109,6 +126,8 @@
}
function unSelect_selectedDs(ds,record){
record.dirty = false;
}
......@@ -143,6 +162,13 @@
};
function onUpdate_selectedDs(ds,record,name,value,oldvalue){
if(name == 'billing_amount' && record.get('rl_flag') == 'Y'){
Leaf.showConfirm('提示', '此现金流为日立返还金现金流，请确认是否修改？', null, function() {
//record.set('billing_amount', oldvalue);
}, 400);
}
}
]]></script>
<style><![CDATA[
.item-radio-option {
......@@ -182,6 +208,7 @@
<a:event name="load" handler="onLoad_selectedDs"/>
<a:event name="select" handler="onSelect_selectedDs"/>
<a:event name="unselect" handler="unSelect_selectedDs"/>
<a:event name="update" handler="onUpdate_selectedDs"/>
</a:events>
</a:dataSet>
</a:dataSets>
......
src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview
View file @ 41316802
......@@ -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"-->
......
src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse.lview
View file @ 41316802
......@@ -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>
......
src/main/webapp/modules/csh/CSH531C/csh_bank_transfer_confirme.lview
View file @ 41316802
......@@ -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"/>-->
......
src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview
View file @ 41316802
......@@ -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"/>-->
......
src/main/webapp/modules/cus_deposit/CUS_DEPOSIT102/cus_deposit_transfer_maintain.lview
View file @ 41316802
......@@ -79,6 +79,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="DEPOSIT_TRANS_TYPE_DS" lookupCode="DEPOSIT_TRANS_TYPE"/>
<a:dataSet id="TRANS_REVIEW_STATUS_DS" lookupCode="TRANS_REVIEW_STATUS"/>
<a:dataSet id="csh_deposit_transfer_maintain_query_ds" autoCreate="true">
<a:fields>
<a:field name="deposit_trans_type"/>
......@@ -87,6 +88,8 @@
<a:field name="bp_id_telnet_n"/>
<a:field name="deposit_trans_type_desc" options="DEPOSIT_TRANS_TYPE_DS"
returnField="deposit_trans_type" displayField="code_value_name" valueField="code_value"/>
<a:field name="trans_review_status_desc" options="TRANS_REVIEW_STATUS_DS"
returnField="trans_review_status" displayField="code_value_name" valueField="code_value"/>
</a:fields>
</a:dataSet>
<a:dataSet id="deposit_transfer_maintain_result_ds" autoPageSize="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT102.csh_transaction_query" queryDataSet="csh_deposit_transfer_maintain_query_ds" selectable="true" selectionModel="single">
......@@ -105,6 +108,7 @@
<a:textField name="bp_name_n" prompt="代理店" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
<a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
<a:comboBox name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
<a:comboBox name="trans_review_status_desc" prompt="复核状态" bindTarget="csh_deposit_transfer_maintain_query_ds"/>
</a:form>
<a:fieldSet labelWidth="150" style="margin-left:20px">
<a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="deposit_transfer_maintain_result_ds" marginHeight="165" marginWidth="100" navBar="true" >
......@@ -116,6 +120,7 @@
<a:column name="deposit_trans_type_n" prompt="保证金类型" width="110" align="center"/>
<a:column name="unwrite_off_amount" prompt="剩余可用金额" width="110" renderer="Leaf.formatMoney" align="right" />
<a:column name="approve_status" prompt="状态" width="120" align="center"/>
<a:column name="trans_review_status_n" prompt="复核状态" width="120" align="center"/>
</a:columns>
</a:grid>
</a:fieldSet>
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create_entrance.lview
View file @ 41316802
......@@ -14,72 +14,77 @@
<a:link id="hls_bp_master_link" url="${/request/@context_path}/modules/hls/HLS213N/hls_bp_master_create.lview"/>
<a:link id="get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
<script type="text/javascript"><![CDATA[
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var record = $(ds_id).getCurrentRecord();
if ($(ds_id).validate()) {
if(record.get('bp_type')=='THIRD_PARTY'){
record.set('function_code', 'HLS213D_N');
record.set('function_usage', 'CREATE');
record.set('default_value_dsid', ds_id);
record.data['url_title'] = '商业伙伴创建';
var param = record.data;
hls_doc_get_layout_code('get_layout_code_link_id', param, 'hls_bp_master_link', null, '${/parameter/@layout_code}');
window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var record = $(ds_id).getCurrentRecord();
if ($(ds_id).validate()) {
if(record.get('bp_type')=='THIRD_PARTY'){
record.set('function_code', 'HLS213D_N');
record.set('function_usage', 'CREATE');
record.set('default_value_dsid', ds_id);
record.data['url_title'] = '商业伙伴创建';
var param = record.data;
hls_doc_get_layout_code('get_layout_code_link_id', param, 'hls_bp_master_link', null, '${/parameter/@layout_code}');
}else{
record.set('function_code', 'HLS213D');
record.set('function_usage', 'CREATE');
record.set('default_value_dsid', ds_id);
record.data['url_title'] = '商业伙伴创建';
var param = record.data;
hls_doc_get_layout_code('get_layout_code_link_id', param, 'hls_bp_master_link', null, '${/parameter/@layout_code}');
}
}else{
record.set('function_code', 'HLS213D');
record.set('function_usage', 'CREATE');
record.set('default_value_dsid', ds_id);
record.data['url_title'] = '商业伙伴创建';
var param = record.data;
hls_doc_get_layout_code('get_layout_code_link_id', param, 'hls_bp_master_link', null, '${/parameter/@layout_code}');
}
}
};
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq){
var f_bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
if(f_bp_create_ds_id==ds.id){
if(name=='bp_type'){
//deron 将承租人与经销商分开录入，没有供应商
// if(value=='AGENT' || value=='GUTA_ORG' || value=='VENDER'){
if(value=='GUTA_ORG'){
record.set('bp_class','ORG');
record.set('bp_class_n','法人');
record.getField('bp_class_n').setReadOnly(true);
}
};
//更新时调用
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq){
var f_bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
if(f_bp_create_ds_id==ds.id){
if(name=='bp_type'){
//deron 将承租人与经销商分开录入，没有供应商
// if(value=='AGENT' || value=='GUTA_ORG' || value=='VENDER'){
if(value=='GUTA_ORG'){
record.set('bp_class','ORG');
record.set('bp_class_n','法人');
record.getField('bp_class_n').setReadOnly(true);
}
else if(value=='GUTA_NP'){
record.set('bp_class','NP');
record.set('bp_class_n','自然人');
record.getField('bp_class_n').setReadOnly(true);
}
else if(value=='TENANT'){
record.getField('bp_class_n').setReadOnly(false);
}else{
record.getField('bp_class_n').setReadOnly(false);
}
else if(value=='GUTA_NP'){
record.set('bp_class','NP');
record.set('bp_class_n','自然人');
record.getField('bp_class_n').setReadOnly(true);
}
else if(value=='TENANT'){
record.getField('bp_class_n').setReadOnly(false);
}else{
record.getField('bp_class_n').setReadOnly(false);
}
}
};
}
};
window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
var bp_create_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
debugger;
if(ds.id == bp_create_ds_id) {
var r = $(bp_create_ds_id).getCurrentRecord();
if (!r.get('bp_category')) {
r.set('bp_category', 'TENANT');
r.set('bp_category_n', '承租人');
if("${/model/user_name_path/record/@user_name}"=="DSF001"||"${/model/user_name_path/record/@user_name}"=="DSF002"){
r.set('bp_category', 'THIRD_PARTY');
r.set('bp_category_n', '第三方');
}else{
r.set('bp_category', 'TENANT');
r.set('bp_category_n', '承租人');
}
}
if("${/model/user_name_path/record/@user_name}"=="DSF001"||"${/model/user_name_path/record/@user_name}"=="DSF002"){
r.set('bp_type','THIRD_PARTY');
r.set('bp_type_n', '第三方');
}else{
r.set('bp_type','TENANT') ;
r.set('bp_type_n', '承租人');
if("${/model/user_name_path/record/@user_name}"=="DSF001"||"${/model/user_name_path/record/@user_name}"=="DSF002"){
r.set('bp_type','THIRD_PARTY');
r.set('bp_type_n', '第三方');
}else{
r.set('bp_type','TENANT') ;
r.set('bp_type_n', '承租人');
}
}
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
......
src/main/webapp/modules/hls/HLS530/manual_journal_create.lview
View file @ 41316802
......@@ -36,10 +36,10 @@
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}else{
journal_record.set('total_amount_dr', sum_dr);
journal_record.set('total_amount_cr', sum_dr);
journal_record.set('total_amount_fuc_dr', sum_dr);
journal_record.set('total_amount_fuc_cr', sum_dr);
journal_record.set('total_amount_dr', sum_dr);
journal_record.set('total_amount_cr', sum_dr);
journal_record.set('total_amount_fuc_dr', sum_dr);
journal_record.set('total_amount_fuc_cr', sum_dr);
if (journal_record.get('journal_num')) {
return true;
}
......@@ -135,21 +135,21 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
var bp_info_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_journal_header');
if( Ext.isEmpty(record.get('journal_header_id'))){
record.set('je_company_id', 1);
record.set('je_company_id_n', '宏菱租赁');
record.set('currency_code', 'CNY');
record.set('currency_code_n', '人民币');
// record.set('je_transaction_code', 'MANUAL');
// record.set('je_transaction_code_n', '手工生成');
//record.set('post_gl_status', 'N');
if(!record.get('post_gl_status')){
record.set('je_company_id', 1);
record.set('je_company_id_n', '宏菱租赁');
record.set('currency_code', 'CNY');
record.set('currency_code_n', '人民币');
// record.set('je_transaction_code', 'MANUAL');
// record.set('je_transaction_code_n', '手工生成');
//record.set('post_gl_status', 'N');
if(!record.get('post_gl_status')){
record.set('post_gl_status', 'N');
}
record.set('exchange_rate', 1);
record.set('reversed_flag', 'N');
record.set('source_table', 'hls_journal_header');
record.set('company_id', 1);
record.set('post_gl_status', 'N');
}
record.set('exchange_rate', 1);
record.set('reversed_flag', 'N');
record.set('source_table', 'hls_journal_header');
record.set('company_id', 1);
}
};
]]></script>
......
src/main/webapp/modules/rpt/RPT555/con_je_vat_query.lview
View file @ 41316802
......@@ -38,10 +38,10 @@
$(grid_ds_id_total).setQueryParameter('vat_6_flag','N');
$(grid_vat_6_ds_id_total).setQueryDataSet($(form_ds_id));
$(grid_vat_6_ds_id_total).setQueryParameter('vat_6_flag','Y');
$(grid_ds_id_before).query();
/*$(grid_ds_id_before).query();
$(grid_ds_id_before_6).query();
$(grid_ds_id_current).query();
$(grid_ds_id_current_6).query();
$(grid_ds_id_current_6).query();*/
Leaf.Masker.mask(detail_mask, '正在保存中。。。');
Leaf.request({
url: $('process_vat_account_data_link').getUrl(),
......@@ -52,6 +52,10 @@
success: function () {
$(grid_ds_id_total).query();
$(grid_vat_6_ds_id_total).query();
$(grid_ds_id_before).query();
$(grid_ds_id_before_6).query();
$(grid_ds_id_current).query();
$(grid_ds_id_current_6).query();
Leaf.Masker.unmask(detail_mask);
},
failure: function () {
......
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