Skip to content

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

[feat]BP评分以及CCB调整

parent 4afbfbf7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 531 additions and 286 deletions
src/main/webapp/WEB-INF/classes/ccb/CCB600/con_contract_cashflow_query.lwm
View file @ f7ddf830
......@@ -3,42 +3,67 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
SELECT c.contract_id,
ccc.cashflow_id,
c.contract_number,
to_char(ccc.due_date,'yyyy-mm-dd') due_date,
c.contract_name,
c.bp_id_tenant,
(select bp_id from sys_user where bp_category = 'AGENT' and user_id = c.OWNER_USER_ID) bp_id_agent,
(SELECT bp_name FROM hls_bp_master h WHERE c.bp_id_tenant = h.bp_id) bp_tenant_name,
ccc.times,
ccc.cf_item,
(SELECT description
FROM hls_cashflow_item
WHERE cf_item = ccc.cf_item) cf_item_desc,
c.pay_method,
(ccc.due_amount-nvl(ccc.received_amount,0)) due_amount,
(ccc.due_amount-nvl(ccc.received_amount,0)) manual_amount
FROM con_contract c, con_contract_cashflow ccc
#WHERE_CLAUSE#
order by contract_id,times,cf_item desc
SELECT *
FROM (SELECT c.contract_id,
ccc.cashflow_id,
c.contract_number,
ccc.CF_DIRECTION,
ccc.cf_status,
decode(ccc.cf_item,
9,
(SELECT due_date
FROM con_contract_cashflow
WHERE cf_item = 1
AND times = ccc.times
AND contract_id = ccc.contract_id),
due_date) due_date_order,
to_char(ccc.due_date,'yyyy-mm-dd') due_date,
c.contract_name,
c.bp_id_tenant,
c.data_class,
ccc.write_off_flag,
c.contract_status,
BP_ID_AGENT_LEVEL1 bp_id_agent,
(SELECT bp_name
FROM hls_bp_master h
WHERE c.bp_id_tenant = h.bp_id) bp_tenant_name,
ccc.times,
ccc.cf_item,
(SELECT description
FROM hls_cashflow_item
WHERE cf_item = ccc.cf_item) cf_item_desc,
c.pay_method,
(ccc.due_amount - nvl(ccc.received_amount, 0)) due_amount,
(ccc.due_amount - nvl(ccc.received_amount, 0)) manual_amount
FROM con_contract c, con_contract_cashflow ccc
WHERE c.contract_id = ccc.contract_id
AND c.data_class = 'NORMAL'
AND ccc.write_off_flag != 'FULL'
AND c.contract_status IN ('INCEPT')
AND ccc.cf_status = 'RELEASE'
AND ccc.cf_direction = 'INFLOW'
AND c.pay_method IS NOT NULL
AND ccc.cf_item IN (1, 9)) t
#WHERE_CLAUSE#
ORDER BY t.due_date_ORDER, t.cf_item DESC, t.contract_id
]]>
</bm:query-sql>
</bm:operation>
</bm:operations>
<bm:query-fields>
<bm:query-field name="pay_method" queryExpression="(c.pay_method = ${@pay_method})"/>
<bm:query-field name="due_date_from" queryExpression="(ccc.due_date &gt;= to_date(${@due_date_from},'yyyy-mm-dd'))"/>
<bm:query-field name="due_date_to" queryExpression="(ccc.due_date &lt;= to_date(${@due_date_to},'yyyy-mm-dd'))"/>
<bm:query-field name="contract_id" queryExpression="(c.contract_id = ${@contract_id})"/>
<bm:query-field name="cf_item" queryExpression="(ccc.cf_item = ${@cf_item})"/>
<bm:query-field name="pay_method" queryExpression="(t.pay_method = ${@pay_method})"/>
<bm:query-field name="due_date_from"
queryExpression="(to_date(t.due_date,'yyyy-mm-dd') &gt;= to_date(${@due_date_from},'yyyy-mm-dd'))"/>
<bm:query-field name="due_date_to"
queryExpression="(to_date(t.due_date,'yyyy-mm-dd') &lt;= to_date(${@due_date_to},'yyyy-mm-dd'))"/>
<bm:query-field name="contract_id" queryExpression="(t.contract_id = ${@contract_id})"/>
<bm:query-field name="cf_item" queryExpression="(t.cf_item = ${@cf_item})"/>
<bm:query-field name="bp_id_tenant" queryExpression="(bp_id_tenant = ${@bp_id_tenant})"/>
<bm:query-field name="bp_id_agent" queryExpression="(bp_id_agent = ${@bp_id_agent})"/>
</bm:query-fields>
<bm:data-filters>
<bm:data-filter name="query"
expression="c.contract_id = ccc.contract_id and ccc.due_date &lt;= trunc(sysdate) and c.data_class = 'NORMAL' and ccc.write_off_flag != 'FULL' and c.contract_status in ('SIGN','INCEPT') and ccc.cf_status = 'RELEASE' and ccc.cf_direction = 'INFLOW' and c.pay_method is not null and ccc.cf_item in (1,9)"/>
<bm:data-filter name="query"
expression="not exists(select 1 from hls_ebank_batch_group g,hls_ebank_batch_ln l where g.status in ('NEW','DEAL') and g.group_id = l.group_id and l.cashflow_id = ccc.cashflow_id)"/>
expression="not exists(select 1 from hls_ebank_batch_group g,hls_ebank_batch_ln l where g.status in ('NEW','DEAL') and g.group_id = l.group_id and l.cashflow_id = t.cashflow_id)"/>
</bm:data-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/ccb/CCB600/hls_bp_master_v_for_lov.lwm 0 → 100644
View file @ f7ddf830
<?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" needAccessControl="false" 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 ${@bp_name}"/>
<!-- <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-filters>
</bm:model>
src/main/webapp/WEB-INF/classes/ccb/CCB600/hls_ebank_batch_group.lwm
View file @ f7ddf830
......@@ -48,6 +48,7 @@
</bm:operations>
<bm:query-fields>
<bm:query-field name="hd_id" queryExpression="t.hd_id = ${@hd_id}"/>
<bm:query-field name="batch_id" queryExpression="t.batch_id = ${@batch_id}"/>
<bm:query-field name="contract_number" queryExpression="t.contract_number like &apos;%&apos; || ${@contract_number} || &apos;%&apos;"/>
<bm:query-field name="bp_name" queryExpression="t.bp_name like &apos;%&apos; || ${@bp_name} || &apos;%&apos;"/>
<bm:query-field name="status_desc" queryExpression="t.status_desc=${@status_desc}"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm
View file @ f7ddf830
......@@ -18,7 +18,7 @@
AND sc.code_value = t1.contract_status) contract_status_desc
from con_contract t1
where
t1.contract_status in ('INCEPT','ET','NEW')
t1.contract_status in ('INCEPT','ET','NEW','ETING','REPURSING')
and t1.data_class = 'NORMAL'
and t1.company_id in ((
select company_id
......
src/main/webapp/WEB-INF/classes/fnd/FND714/fnd_sc_score_query.lwm
View file @ f7ddf830
......@@ -30,10 +30,10 @@
from hls_bp_master bp
where bp.bp_id = sc.object_id),
'') object_name,
(select 81 from dual) score_template_id,
285 score_template_id,
(select te.score_template_name
from fnd_score_template te
where te.score_template_id = 81) template_name,
where te.score_template_id = 285) template_name,
sc.internal_period_num,
sc.score_date,
sc.description,
......
src/main/webapp/WEB-INF/classes/hls/HLS801/con_unearned_finance_income.lwm
View file @ f7ddf830
......@@ -45,6 +45,8 @@
<bm:field name="current_month_income" databaseType="NUMBER" datatype="java.lang.Double" expression="(select sum(t.unearned_finance_income) from con_unearned_finance_income t where t.contract_id =t1.contract_id and t.internal_period_num =${@internal_period_num})" forInsert="false" forUpdate="false"/>
<bm:field name="contract_number" databaseType="VARCHAR2" datatype="java.lang.String" expression="(select t.contract_number from con_contract t where t.contract_id =t1.contract_id )" forInsert="false" forUpdate="false"/>
<bm:field name="contract_name" databaseType="VARCHAR2" datatype="java.lang.String" expression="(select t.contract_name from con_contract t where t.contract_id =t1.contract_id )" forInsert="false" forUpdate="false"/>
<bm:field name="adjustvat"/>
<bm:field name="adjustvat13"/>
</bm:fields>
<bm:features>
<f:standard-who/>
......
src/main/webapp/WEB-INF/classes/prj/PRJ902/prj_project_score_result.lwm
View file @ f7ddf830
......@@ -54,7 +54,7 @@
WHERE
fsc.sc_score_id = fscr.sc_score_id AND
fsc.project_id = ${@project_id} AND
fsc.score_num = ${@score_num}
fsc.score_num = nvl(${@score_num},1)
]]></bm:query-sql>
</bm:operation>
</bm:operations>
......
src/main/webapp/WEB-INF/server-script/layoutconfig/rental_query_entrance_g_contract_result_queryfields.js 0 → 100644
View file @ f7ddf830
var override_queryfields = [
{
name: 'bp_name',
queryexpression: "t1.bp_id_tenant_n like ${@bp_name}"
},
{
name: 'due_date_from',
queryexpression: "t1.due_date >= to_date(${@due_date_from},'yyyy-mm-dd')"
},
{
name: 'due_date_to',
queryexpression: "t1.due_date <= to_date(${@due_date_to},'yyyy-mm-dd')"
}
];
override();
\ No newline at end of file
src/main/webapp/main.lview
View file @ f7ddf830
......@@ -26,6 +26,7 @@
<!--系统登录信息 start-->
<a:model-query fetchAll="true" model="sys.sys_login_info" rootPath="login_info"/>
<!--系统登录信息 end-->
<a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
<s:server-script><![CDATA[
var sys_user_theme_path = $ctx.get('/model/sys_user_theme_path').getChildren();
if(sys_user_theme_path.length > 0){
......@@ -1352,7 +1353,12 @@
if (display == 'none') {
jQuery("#show-user-message-id").addClass("fast-menu-toolbar-background");
jQuery("#userDetail").show();
jQuery("#userDetail").animate({height: "162px"});
if("${/model/role_info/record/@role_code}"=="0018"||"${/model/role_info/record/@role_code}"=="0019") {
jQuery("#userDetail").animate({height: "81px"});
}else{
jQuery("#userDetail").animate({height: "162px"});
}
//document.getElementById('userDetail').style.display = 'block';
} else {
hideUserInfo()
......@@ -1500,6 +1506,16 @@
});
}
Ext.onReady(function(){
var lis = document.getElementsByClassName("hide-li-if-agent");
if("${/model/role_info/record/@role_code}"=="0018"||"${/model/role_info/record/@role_code}"=="0019") {
if(lis[0]&&lis[1]){
lis[0].style.display = 'none';
lis[1].style.display = 'none';
}
}
});
]]></script>
<div class="hap-main-screen-toolbar-contain">
......@@ -1683,13 +1699,13 @@
<span>用户信息</span>
</a>
</li>
<li>
<li class="hide-li-if-agent">
<a href="javascript:showSubject();">
<!--<i class="fa fa-cogs"></i>-->
<span>切换主题</span>
</a>
</li>
<li>
<li class="hide-li-if-agent">
<a href="javascript:showTheme();">
<!--<i class="fa fa-cogs"></i>-->
<span>切换皮肤</span>
......
src/main/webapp/modules/ccb/CCB600/ccb_ebank_create.lview
View file @ f7ddf830
......@@ -32,7 +32,7 @@
params.bank_account_id = record.get('bank_account_id');
params.merger_rules = record.get('merger_rules');
params.pay_method = record.get('pay_method');
params.due_date = record.get('due_date');
// params.due_date = record.get('due_date');
//处理行
var details = [];
......@@ -143,9 +143,9 @@
<a:dataSets>
<a:dataSet id="pay_methods_ds">
<a:datas>
<a:record code_value="AGRI_THREE" code_value_name="农行扣款（三方）"/>
<!-- <a:record code_value="AGRI_THREE" code_value_name="农行扣款（三方）"/>-->
<a:record code_value="CCB_THREE" code_value_name="建行扣款（三方）"/>
<a:record code_value="AGRI_TWO" code_value_name="农行扣款（两方）"/>
<!-- <a:record code_value="AGRI_TWO" code_value_name="农行扣款（两方）"/>-->
</a:datas>
</a:dataSet>
<a:dataSet id="hls_ccb_form_query_ds">
......@@ -162,8 +162,8 @@
</a:mapping>
</a:field>
<a:field name="bp_tenant_name" lovGridHeight="350" lovHeight="550" lovLabelWidth="50" lovWidth="550"
autoComplete="true" autoCompleteField="bp_agent_name"
lovService="basic.hls_bp_master_v_for_lov?bp_category=TENANT"
autoComplete="true" autoCompleteField="bp_name"
lovService="ccb.CCB600.hls_bp_master_v_for_lov?bp_category=TENANT"
title="HLS.BP_TITLE">
<a:mapping>
<a:map from="bp_id" to="bp_id_tenant"/>
......@@ -203,8 +203,8 @@
</a:mapping>
</a:field>
<a:field name="currency_name" readOnly="true"/>
<a:field name="pay_method_desc" required="true" prompt="支付方式" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/>
<a:field name="pay_method"/>
<a:field name="pay_method_desc" defaultValue="建行扣款（三方）" required="true" prompt="支付方式" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/>
<a:field name="pay_method" defaultValue="CCB_THREE"/>
<a:field name="bank_account_name" readOnly="true"/>
<a:field name="bank_name" readOnly="true"/>
<a:field name="currency" readOnly="true"/>
......@@ -278,7 +278,7 @@
<!-- <a:column name="detail" align="center" prompt="明细" renderer="batch_detail_renderer" width="100"/>-->
<!-- </a:columns>-->
<!-- </a:grid>-->
<a:grid id="hls_ccb_ln_grid" bindTarget="hls_ccb_grid_ln_ds" height="300" width="800" navBar="true">
<a:grid id="hls_ccb_ln_grid" bindTarget="hls_ccb_grid_ln_ds" height="340" width="850" navBar="true">
<a:columns>
<a:column name="bp_tenant_name" prompt="客户名称" align="center" />
<a:column name="contract_number" prompt="合同号" align="center" />
......@@ -294,9 +294,9 @@
<a:textField id="hls_ccb_ln_grid_tf"/>
</a:editors>
</a:grid>
<a:fieldSet title="应收日期" column="2">
<a:datePicker name="due_date" bindTarget="hls_ccb_form_create_ds" prompt="应收日期"/>
</a:fieldSet>
<!-- <a:fieldSet title="应收日期" column="2">-->
<!-- <a:datePicker name="due_date" bindTarget="hls_ccb_form_create_ds" prompt="应收日期"/>-->
<!-- </a:fieldSet>-->
</a:screenBody>
</a:view>
</a:screen>
src/main/webapp/modules/ccb/CCB600/ccb_ebank_detail.lview
View file @ f7ddf830
......@@ -44,7 +44,7 @@
</a:fields>
</a:dataSet>
<a:dataSet id="hls_ccb_grid_detail_ds" autoQuery="true" queryDataSet="hls_ccb_batch_query_ds1" fetchAll="true" model="ccb.CCB600.hls_ebank_batch_group" pageSize="15"
queryUrl="${/request/@context_path}/autocrud/ccb.CCB600.hls_ebank_batch_group/query?hd_id=${/parameter/@hd_id}"
queryUrl="${/request/@context_path}/autocrud/ccb.CCB600.hls_ebank_batch_group/query?batch_id=${/parameter/@batch_id}"
selectable="true">
</a:dataSet>
</a:dataSets>
......
src/main/webapp/modules/ccb/CCB600/ccb_ebank_query.lview
View file @ f7ddf830
......@@ -27,20 +27,20 @@
}
function hls_ccb_merge_result() {
var hd_id = $('hls_ccb_grid_ln_ds').getAt(0).get('hd_id') || -1;
var batch_id = $('hls_ccb_grid_ln_ds').getAt(0).get('batch_id') || -1;
if ('${/parameter/@status}' == 'NEW') {
open_batch_detail_modify_window(hd_id);
open_batch_detail_modify_window(batch_id);
} else {
open_batch_detail_query_window(hd_id);
open_batch_detail_query_window(batch_id);
}
}
function open_batch_detail_query_window(hd_id) {
function open_batch_detail_query_window(batch_id) {
var win = new Leaf.Window({
id: 'batch_link_query_winId',
url: $('query_ebank_detail_link').getUrl(),
params: {
hd_id: hd_id,
batch_id: batch_id,
winid: 'batch_link_query_winId'
},
title: '代扣指令明细',
......@@ -51,12 +51,12 @@
}
function open_batch_detail_modify_window(hd_id) {
function open_batch_detail_modify_window(batch_id) {
var win = new Leaf.Window({
id: 'batch_modify_link_winId',
url: $('modify_ebank_detail_link').getUrl(),
params: {
hd_id: hd_id,
batch_id: batch_id,
winid: 'batch_modify_link_winId'
},
title: '代扣指令明细',
......@@ -122,7 +122,7 @@
<a:field name="pay_method_desc" readOnly="true" prompt="支付方式" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/>
<a:field name="pay_method"/>
<a:field name="currency" readOnly="true"/>
<a:field name="due_date" required="true" prompt="应收日期" readOnly="true"/>
<a:field name="due_date" prompt="应收日期" readOnly="true"/>
<a:field name="merger_rules" defaultValue="NONE" prompt="" readOnly="true"/>
<a:field name="payment_amount_from" readOnly="true"/>
<a:field name="payment_amount_to" readOnly="true"/>
......@@ -187,7 +187,7 @@
<!-- <a:column name="detail" align="center" prompt="明细" renderer="batch_detail_renderer" width="100"/>-->
<!-- </a:columns>-->
<!-- </a:grid>-->
<a:grid id="hls_ccb_ln_grid" bindTarget="hls_ccb_grid_ln_ds" height="300" width="800" navBar="true">
<a:grid id="hls_ccb_ln_grid" bindTarget="hls_ccb_grid_ln_ds" height="420" width="880" navBar="true">
<a:toolBar>
<a:button click="hls_ccb_merge_result" text="合并结果"/>
</a:toolBar>
......@@ -205,9 +205,9 @@
</a:columns>
</a:grid>
<a:fieldSet title="应收日期" column="2">
<a:datePicker name="due_date" bindTarget="hls_ccb_form_create_ds" prompt="应收日期"/>
</a:fieldSet>
<!-- <a:fieldSet title="应收日期" column="2">-->
<!-- <a:datePicker name="due_date" bindTarget="hls_ccb_form_create_ds" prompt="应收日期"/>-->
<!-- </a:fieldSet>-->
</a:screenBody>
</a:view>
</a:screen>
src/main/webapp/modules/cont/CON3100/con_contract_cf_query.lview 0 → 100644
View file @ f7ddf830
<?xml version="1.0" encoding="UTF-8"?>
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
trace="true">
<a:init-procedure/>
<a:view>
<a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
modelaction="update"/>
<a:link id="con_contract_modify_link"
url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
<a:link id="${/parameter/@layout_code}_contract_print_link_id"
url="${/request/@context_path}/modules/cont/CON301N/con_contract_print.lview"/>
<a:link id="${/parameter/@layout_code}con_contract_query_link"
url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_modify.lview"/>
<!-- <script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/>-->
<script type="text/javascript"><![CDATA[
// stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_CONTRACT_RESULT', 'con_contract');
function open_contract_win(ds_id, record_id) {
var record = $(ds_id).findById(record_id);
var param = record.data;
param['function_usage'] = 'QUERY';
param['function_code'] = 'CON3200Q';
param['maintain_type'] = 'QUERY';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id);
}
window['${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record) {
if (name == 'contract_number' && value) {
return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
}
return value;
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
</a:screen>
src/main/webapp/modules/csh/CSH509/csh_transaction_receipt_confirm.lview
View file @ f7ddf830
......@@ -804,24 +804,24 @@
bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_TO" align="right"/>
<!--我方账户户名-->
<a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>
<a:lov name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>
<a:lov name="bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/>
<!-- <a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds"-->
<!-- prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>-->
<!-- <a:lov name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds"-->
<!-- prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>-->
<!-- <a:lov name="bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"-->
<!-- prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/>-->
<!--银行流水号-->
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<!-- <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds"-->
<!-- prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>-->
<!--对方账户户名-->
<a:lov name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<!--对方银行名称-->
<a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<!-- <a:lov name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds"-->
<!-- prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>-->
<!--对方账户账号-->
<a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<!-- <a:lov name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"-->
<!-- prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>-->
<a:textField style="display:none"/>
<a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/>
......@@ -837,7 +837,7 @@
</a:form>
<a:fieldSet labelWidth="150" title="收款单" style="margin-left:20px">
<a:grid id="csh_transaction_receipt_maintain_grid_ds"
bindTarget="csh_transaction_receipt_maintain_result_ds" marginHeight="300" marginWidth="80"
bindTarget="csh_transaction_receipt_maintain_result_ds" marginHeight="190" marginWidth="80"
navBar="true">
<!--<a:toolBar>
<a:button click="csh510_export" text="导出"/>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ f7ddf830
......@@ -711,17 +711,17 @@
<a:numberField name="transaction_amount_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM" align="right"/>
<a:numberField name="transaction_amount_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_TO" align="right"/>
<!--我方账户户名-->
<a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>
<a:lov name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>
<a:lov name="bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/>
<!-- <a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>-->
<!-- <a:lov name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>-->
<!-- <a:lov name="bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/>-->
<!--银行流水号-->
<a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
<!-- <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>-->
<!--对方账户户名-->
<a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
<!--对方银行名称-->
<a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
<!-- <a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>-->
<!--对方账户账号-->
<a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
<!-- <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>-->
<a:textField name="transaction_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="现金事务编号"/>
<!-- <a:textField style="display:none"/>-->
<a:lov name="bp_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BUSINESS_PARTNER"/>
......@@ -734,7 +734,7 @@
</a:hBox>
</a:form>
<a:fieldSet labelWidth="150" title="收款单" style="margin-left:20px">
<a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="csh_transaction_receipt_maintain_result_ds" marginHeight="300" marginWidth="80" navBar="true" >
<a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="csh_transaction_receipt_maintain_result_ds" marginHeight="190" marginWidth="80" navBar="true" >
<!--<a:toolBar>
<a:button click="csh510_export" text="导出"/>
</a:toolBar>-->
......
src/main/webapp/modules/hls/HLS204N/hls_lease_item_gps_excel_import.lview
View file @ f7ddf830
......@@ -49,7 +49,7 @@
}
function checkBtn() {
var ds = $('hls_lease_item_gps_improt_ds');
var ds = $('hls_lease_item_gps_import_ds');
var records = ds.getAll();
var header_id = records[0].get('header_id');
// alert(header_id);
......@@ -60,7 +60,7 @@
},
scope: this,
success: function () {
$('hls_lease_item_gps_improt_ds').query();
$('hls_lease_item_gps_import_ds').query();
Leaf.SideBar.show({
msg: '校验成功',
duration: 2000
......@@ -73,9 +73,8 @@
var import_over_write_flag = 'N';
function importBtn() {
debugger;
var msg = '确定要导入信息吗';
var ds = $('hls_lease_item_gps_improt_ds');
var ds = $('hls_lease_item_gps_import_ds');
var records = ds.getAll();
var saveData = [];
for (var i = 0; i < records.length; i++) {
......@@ -103,7 +102,7 @@
header_id: '${/model/header/record/@header_id}'
},
success: function () {
$('hls_lease_item_gps_improt_ds').query();
$('hls_lease_item_gps_import_ds').query();
// Leaf.Masker.unmask(Ext.getBody());
Leaf.SideBar.show({
msg: '导入成功',
......@@ -137,7 +136,7 @@
]]></script>
<a:dataSets>
<a:dataSet id="hls_lease_item_gps_improt_ds" autoQuery="true" fetchAll="true"
<a:dataSet id="hls_lease_item_gps_import_ds" autoQuery="true" fetchAll="true"
model="hls.HLS204N.hls_lease_item_gps_list_tmp"
queryUrl="${/request/@context_path}/autocrud/hls.HLS204N.hls_lease_item_gps_list_tmp/query?header_id=${/model/header/record/@header_id}">
<a:fields>
......@@ -153,7 +152,7 @@
<div style="float:right;" class="prompt-position period-exists"><span>租赁物期间已存在</span></div>
<div style="float:right;" class="prompt-position import-error"><span>导入信息错误</span></div>
</a:screenTopToolbar>
<a:grid id="grid_ds_id" bindTarget="hls_lease_item_gps_improt_ds" height="480" navBar="true"
<a:grid id="grid_ds_id" bindTarget="hls_lease_item_gps_import_ds" height="480" navBar="true"
width="1050" rowRenderer="change_background_color">
<a:columns>
<a:column name="error_message" editor="textArea_e" prompt="错误信息" width="180"/>
......
src/main/webapp/modules/hls/HLS204N/hls_lease_item_gps_import.lview
View file @ f7ddf830
<?xml version="1.0" encoding="UTF-8"?>
<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
<a:init-procedure/>
<a:init-procedure>
<a:model-query defaultWhereClause="t1.code = &apos;CON_LEASE_ITEM_GPS_TEMPLATE&apos;" model="sys.SYS120.hls_attachment_module" rootPath="template_path"/>
</a:init-procedure>
<a:view>
<a:link id="downloadFile_id" url="${/request/@context_path}/downloadFile.lview"/>
<script type="text/javascript"><![CDATA[
function downloadFile() {
new Leaf.Window({
url: $('downloadFile_id').getUrl(),
title: '${l:HLS.SUPPORTING_DOCUMENT}',
params: {
'table_name': 'HLS_ATTACHMENT_MODULE',
'header_id': '${/model/template_path/record/@attachment_module_id}'
},
width: 850,
height: 400
});
}
function saveClick() {
if (document.getElementById('importFile').value) {
var fileName = document.getElementById('importFile').value;
......@@ -33,7 +50,9 @@
$('${/parameter/@winid}').close();
_input_window.on('close', function () {
// $('${/parameter/@parent_ds_id}').setQueryParameter('batch_id','${/parameter/@batch_id}');
$('${/parameter/@parent_ds_id}').query();
// $('${/parameter/@parent_ds_id}').query();
$('LEASE_ITEM_GPS_MODIFY_ENTRANCE_G_CON_LEASE_ITEM_RESULT_con_lease_item_gps_ds').query();
$('LEASE_ITEM_GPS_MODIFY_ENTRANCE_G_CON_LEASE_ITEM_GROUP_con_lease_item_gps_ds').query();
});
}
......@@ -66,7 +85,8 @@
enctype="multipart/form-data" method="post" target="_input_window">
<label style="margin-left:10px;margin-top:10px;font-size:13px"><![CDATA[${l:PLEASE_SELECT_A_FILE}]]></label>
<input name="CONTENT" id="importFile" style="font-size:15px" type="file"/>
<!-- <input onclick="downloadFile()" style="margin-left:10px;margin-top:10px;width:60px;height:23px" type="button" value="模板下载"/> -->
<input onclick="downloadFile()" style="margin-left:10px;margin-top:10px;width:60px;height:23px"
type="button" value="模板下载"/>
<input onclick="saveClick()" style="margin-left:25px;margin-top:10px;width:60px;height:23px"
type="button" value="${l:TMPLT_IMPORT}"/>
</form>
......
src/main/webapp/modules/hls/HLS204N/hls_lease_item_gps_modify_entrance.lview
View file @ f7ddf830
......@@ -28,15 +28,14 @@
width: 420,
height: 320
});
win.on('close', function () {
$(ds_id).query();
});
// win.on('close', function () {
// $(ds_id).query();
// });
};
//加载事件
window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
var ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
debugger;
var r = $(ds_id).getAt(0);
r.set('period_from',new Date().format('yyyy-mm').toString());
r.set('period_from_n',new Date().format('yyyy-mm').toString());
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ f7ddf830
......@@ -38,7 +38,6 @@
var bp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
var bp_record = $(bp_ds_id).getCurrentRecord();
bp_record.set('bp_category', '${/parameter/@bp_category}');
bp_record.set('owner_user_id', '${/session/@user_id}');
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create_entrance.lview
View file @ f7ddf830
......@@ -47,6 +47,18 @@
}
}
};
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');
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','承租人');
}
}
};
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
......
src/main/webapp/modules/hls/HLS801/hls_monthly_statement.lview
View file @ f7ddf830
......@@ -705,6 +705,8 @@
width="110"/>
<a:column name="finance_income_recognized" prompt="HLS801.FINANCE_INCOME_RECOGNIZED"
width="80"/>
<a:column name="adjustvat13" align="right" prompt="增值税(13%)调整"/>
<a:column name="adjustvat" align="right" prompt="增值税(16%)调整"/>
</a:columns>
</a:grid>
</a:tab>
......
src/main/webapp/modules/prj/PRJ902/prj_project_score_result_detail.lview
View file @ f7ddf830
......@@ -267,7 +267,7 @@
</a:events>
</a:dataSet>
</a:dataSets>
<a:screenBody>
<a:screenBody style="margin-left:20px;">
<div id="gridButtonDivID">
<a:screenTopToolbar>
<a:screenTitle/>
......@@ -278,17 +278,18 @@
<a:hBox>
<a:vBox labelSeparator=" " labelWidth="100">
<!-- <a:textField name="template_type_desc" bindTarget="fnd714_sc_score_head_query_ds" prompt="FND713.FND_SCORE_TEMPLATE.TEMPLATE_TYPE" readOnly="true"/> -->
<a:textField name="evaluate_level" bindTarget="prj_project_evaluate_level_ds" prompt="评级" readOnly="true"/>
<!-- <a:textField name="evaluate_level" bindTarget="prj_project_evaluate_level_ds" prompt="评级" readOnly="true"/>-->
<a:numberField name="score_result" allowDecimals="true" bindTarget="fnd714_sc_score_head_query_ds" decimalPrecision="2" prompt="分数" readOnly="true" style="font-weight:bold"/>
</a:vBox>
<a:vBox labelSeparator=" " labelWidth="100">
<a:textField name="object_name" bindTarget="fnd714_sc_score_head_query_ds" prompt="承租人名称" readOnly="true"/>
<a:textField name="last_update_name" bindTarget="fnd714_sc_score_head_query_ds" prompt="FND714.LAST_UPDATE_NAME" readOnly="true"/>
<a:textField name="object_name" bindTarget="fnd714_sc_score_head_query_ds" prompt="评分对象" readOnly="true"/>
</a:vBox>
<a:vBox labelSeparator=" " labelWidth="100">
<a:textField name="template_name" bindTarget="fnd714_sc_score_head_query_ds" prompt="FND714.SCORE_TEMPLATE_NAME" readOnly="true"/>
<a:datePicker name="score_date" bindTarget="fnd714_sc_score_head_query_ds" prompt="FND714.SCORE_DATE" readOnly="true" renderer="Leaf.formatDate"/>
</a:vBox>
<a:vBox labelSeparator=" " labelWidth="100">
<a:textField name="last_update_name" bindTarget="fnd714_sc_score_head_query_ds" prompt="FND714.LAST_UPDATE_NAME" readOnly="true"/>
</a:vBox>
</a:hBox>
<a:treeGrid id="fnd714_sc_score_result_dtl_grid" bindTarget="fnd714_sc_score_result_dtl_ds" expandField="expand_flag" idField="tree_id_feild" marginHeight="180" marginWidth="30" navBar="false" parentField="tree_parent_field" sequenceField="score_target_code">
<a:columns>
......
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