Skip to content

L
leaf-hlcm
Commit 5201868c authored by Spencer Chang's avatar Spencer Chang
Browse files
Options

Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into develop

parents 2d361b47 b2617dba
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 649 additions and 324 deletions
src/main/database/Table/Alter/CSH_PAYMENT_REQ_LN.SQL
View file @ 5201868c
alter table csh_payment_req_ln add (vender_bank_account_id number);
comment on column csh_payment_req_ln.vender_bank_account_id is '厂商银行账户id';
\ No newline at end of file
comment on column csh_payment_req_ln.vender_bank_account_id is '厂商银行账户id';
alter table csh_payment_req_ln add (amount_agent_paid number);
comment on column csh_payment_req_ln.amount_agent_paid is '已付我司金额';
alter table csh_payment_req_ln add (amount_vender_paid number);
comment on column csh_payment_req_ln.amount_vender_paid is '已付厂商金额';
\ No newline at end of file
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm
View file @ 5201868c
......@@ -16,6 +16,7 @@
'NEW' approval_status,
v.invoice_uploaded_flag,
v.invoice_uploaded_flag_n,
v.bp_id_agent_level1,
v.times,
v.cashflow_id,
v.cashflow_id ref_doc_line_id,
......@@ -95,6 +96,7 @@
t.contract_name,
t.document_category,
t.search_term_1,
t.bp_id_agent_level1,
p.project_name,
t.bp_id_tenant tenant_bp_id,
h.description cf_description,
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm
View file @ 5201868c
......@@ -9,11 +9,16 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select *
from (select c.contract_number,
select *
from (select c.contract_number,
c.contract_name,
hbm.bp_name,
cpr.apply_pay_date,
cpr.bp_bank_account_id,
(select cph.payment_req_number
from csh_payment_req_hd cph
where cpr.payment_req_id = cph.payment_req_id) payment_req_number,
cpr.ref_doc_line_id cashflow_id,
(select times
from con_contract_cashflow ccc
where ccc.cashflow_id = cpr.ref_doc_line_id) times,
......@@ -25,7 +30,17 @@
where hci.cf_item = ccc.cf_item
and hci.cf_type = ccc.cf_type
and ccc.cashflow_id = cpr.ref_doc_line_id) CF_DESCRIPTION,
--bp_id 存的是哪个字段
/* (select c.transaction_num
from csh_transaction c
where c.source_doc_line_id = cpr.payment_req_ln_id
and c.source_doc_id = cpr.payment_req_id) transaction_num,
(select c.bank_slip_num
from csh_transaction c
where c.source_doc_line_id = cpr.payment_req_ln_id
and c.source_doc_id = cpr.payment_req_id
and c.transaction_type = 'PAYMENT') bank_slip_num,*/
(select bp_name
from hls_bp_master hbm
where hbm.bp_id = cpr.bp_id) BP_ID_AGENT_N,
......@@ -41,6 +56,10 @@
--应付我司金额
cpr.amount_agent,
cpr.amount_vender,
--未付金额
(cpr.amount_agent - nvl(cpr.amount_agent_paid, 0)) residual_agent_amount,
(cpr.amount_vender - nvl(cpr.amount_vender_paid, 0)) residual_vender_amount,
(select bp_name
from hls_bp_master hbm
where hbm.bp_id =
......
src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_selected.lwm
View file @ 5201868c
......@@ -155,7 +155,7 @@
hls_bp_master hbm,
con_contract t
WHERE i.contract_id = t.contract_id
AND i.lease_item_id = hli.lease_item_id
AND i.lease_item_id = hli.lease_item_id(+)
AND i.enabled_flag = 'Y'
AND i.equipment_type = 'MAIN'
AND t.contract_id = f.contract_id
......@@ -197,7 +197,8 @@
AND t.data_class = 'NORMAL'
AND t.contract_status NOT IN
('NEW', 'SIGN', 'CANCEL', 'PENDING', 'CLOSED')
AND f.cf_item <> 0) t1
--测试用，cf_itme应当为0
AND f.cf_item in (0,21)) t1
#WHERE_CLAUSE#
#ORDER_BY_CLAUSE#
......
src/main/webapp/WEB-INF/classes/csh/CSH502/csh_payment_req_pay.lwm
View file @ 5201868c
......@@ -17,7 +17,7 @@
p_payment_req_id=>${@payment_req_id},
p_session_id=>${/session/@session_id},
p_pay_date=>to_date(${@transaction_date},'yyyy-mm-dd'),
p_pay_amount=>${@transaction_amount},
p_pay_amount=>${@amt},
p_company_id=>${/session/@company_id},
p_internal_period_num=>${@internal_period_num},
p_period_name=>${@period_name},
......@@ -35,6 +35,8 @@
p_handling_charge=>nvl(${@handling_charge},0),
p_payment_method_id =>${@payment_method_id},
p_payment_status =>${@payment_status},
p_this_pay_agent_amount=>nvl(${@this_pay_agent_amount},0),
p_this_pay_vender_amount=>nvl(${@this_pay_vender_amount},0),
p_merge_flag =>nvl(${@merge_flag},'N'),
p_due_amount =>nvl(${@due_amount},0));
end;]]></bm:update-sql>
......
src/main/webapp/WEB-INF/classes/hls/HLS500/hls_fin_calc_single_variable_calc.lwm 0 → 100644
View file @ 5201868c
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: gaoyang
$Date: 2013-4-24 上午10:17:59
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
aux_single_variable_calc_pkg.calc_real_rate(p_calc_session_id =>${@calc_session_id},
p_user_id => ${/session/@user_id},
p_msg => ${@msg});
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="msg" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@msg"/>
</bm:parameters>
</bm:operation>
<bm:operation name="execute">
<bm:update-sql><![CDATA[
begin
aux_single_variable_calc_pkg.manual_trial_after_calc(p_calc_session_id =>${@calc_session_id},
p_user_id => ${/session/@user_id},
p_msg => ${@msg});
end;
]]></bm:update-sql>
<bm:parameters>
<bm:parameter name="msg" dataType="java.lang.String" input="false" output="true" outputPath="/parameter/@msg"/>
</bm:parameters>
</bm:operation>
</bm:operations>
</bm:model>
src/main/webapp/WEB-INF/classes/hls/HLS500/hls_fin_calculator_calc.lwm
View file @ 5201868c
......@@ -15,7 +15,8 @@
p_document_category=>${@document_category},
p_user_id =>${/session/@user_id}
);
hls_fin_calculator_itfc_pkg.calculate(
hls_fin_calculator_itfc_pkg.calculate(
p_calc_session_id=>${@calc_session_id},
p_recreate_H_formula=>${@recreate_H_formula},
p_recreate_L_formula=>${@recreate_L_formula},
......
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ 5201868c
......@@ -36,6 +36,8 @@
<a:link id="con_approval_link_id" model="cont.CON505.contract_approval" modelaction="execute"/>
<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
<script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>
<a:link id="${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_calculator_update_link_id"
url="${/request/@context_path}/modules/hls/HLS500N/hls_fin_calculator_update_n.lview"/>
<script type="text/javascript"><![CDATA[
Ext.ux.Lightbox.register('a[ref=img]', true);
function lock_current_window() {
......@@ -470,6 +472,50 @@
}
window['${/parameter/@layout_code}_quote_layout_dynamic_click'] = function () {
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
var cashflow_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_cashflow');
var record = $(ds_id).getCurrentRecord();
var price_list = record.get('price_list');
var calc_session_id = record.get('calc_session_id');
var parent_pk_value = record.get('contract_id');
var calc_type = '${/parameter/@calc_type}' || 'CLASSIC_CALCULATOR';
var maintain_type='QUERY'
if (calc_session_id) {
//直接进入报价页面
var win = new Leaf.Window({
id: 'hls_fin_calc_quotation_update_link_winid',
params: {
document_id: parent_pk_value,
price_list: price_list,
document_category: 'CONTRACT',
contract_status:record.get('contract_status'),
maintain_type: 'MODIFY',
calc_session_id: record.get('calc_session_id'),
quotation_id: record.get('quotation_id'),
dsId: cashflow_ds_id,
winId: 'hls_fin_calc_quotation_update_link_winid',
global_flag: 'Y',
id_num: 1,
calc_type: calc_type,
recreate_L_formula: 'N'
},
url: $('${/parameter/@layout_code}${/parameter/@tree_code}_hls_fin_calculator_update_link_id').getUrl(),
fullScreen: true,
draggable: true
});
win.on('close', function () {
$(cashflow_ds_id).query();
$(ds_id).query();
});
}
}
;
]]></script>
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
</a:view>
......
src/main/webapp/modules/csh/CSH501/csh_payment_req.lview
View file @ 5201868c
......@@ -55,6 +55,7 @@
<link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
<script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
<script src="${/request/@context_path}/javascripts/calculate.js" type="text/javascript"/>
<a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_uploadFile_id"
url="${/request/@context_path}/uploadFile.lview"/>
<a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}prj500_cdd_downloadFile_id"
......@@ -74,9 +75,19 @@
<a:link id="${/parameter/@layout_code}csh511_csh_payment_req_hd_query" model="csh.CSH511.csh_payment_req_hd" modelaction="query" />
<script type="text/javascript"><![CDATA[
jQuery.noConflict();
//如果头id 不为空，就使用自在定义的ds进行查询
Leaf.onReady(function(){
var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
console.log($(lnds_id));
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var payment_req_id='${/parameter/@payment_req_id}';
if(payment_req_id){
$(lnds_id).setQueryUrl('${/request/@context_path}/autocrud/csh.CSH501.csh_payment_req_ln_query_after_save/query');
$(lnds_id).setQueryParameter("payment_req_id",payment_req_id);
$(lnds_id).query();
$(hdds_id).setQueryParameter("payment_req_id",payment_req_id);
$(hdds_id).query();
}
})
Ext.ux.Lightbox.register('a[ref=img]', true);
......@@ -274,7 +285,7 @@
var hd_record = $(ds_id).getCurrentRecord();
var payment_req_id = hd_record.get('payment_req_id');
var line_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
var line_record = $(line_ds_id).getAll()[0];
var line_record = $(line_ds_id).getAt(0);
if (line_record.get('cf_item') == '52' || line_record.get('cf_item') == '509') {
//保证金退还Doodream审批接口 CFL-FE5D96CF-694C-4290-A22E-241FC3F6DEF0
var case_type = 'CFL-FE5D96CF-694C-4290-A22E-241FC3F6DEF0';
......@@ -401,6 +412,14 @@
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function () {
Leaf.SideBar.enable = false;
//提交之前必须要保存
/* var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var hd_record = $(hdds_id).getCurrentRecord();
var payment_req_id = hd_record.get('payment_req_id');
if(payment_req_id){
$L.showInfoMessage("提示",'请先保存数据！');
return;
}*/
window['${/parameter/@layout_code}_SAVE_LAYOUT_DYNAMIC_CLICK'](csh_payment_req_submit_finally);
};
......@@ -592,10 +611,16 @@
line_records = ln_ds.getSelected();
var payment_req_id = hd_record.get('payment_req_id');
if (line_records.length == 0) {
Leaf.showMessage('${l:PROMPT}', '请选择一条单据进行确认！');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('${l:PROMPT}', '请先选择要支付的行明细！');
return;
}
if(line_records.length>1){
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
Leaf.showMessage('${l:PROMPT}', '一次只能选择一条数据进行操作！');
return;
}
var current_bp_id;
var bp_bank_account_code;
var bp_bank_account_num;
......@@ -616,7 +641,10 @@
return;
} */
if (Ext.isEmpty(line_record.get('pay_amount'))) {
//支付金额为应付代理店
var this_pay_amount=plus(line_record.get('residual_agent_amount'),line_record.get('residual_vender_amount'));
if (this_pay_amount <=0) {
Leaf.showMessage('${l:PROMPT}', '本次支付金额为空！');
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return;
......@@ -635,10 +663,18 @@
bp_bank_account_code_n = line_record.get('bp_bank_account_code_n');
bp_bank_account_id = line_record.get('bp_bank_account_id');
contract_id = line_record.get('contract_id');
line_record.set('loan_date',hd_record.get('loan_date'));
line_record.set('hdds_id',hdds_id);
line_record.set('lnds_id',lnds_id);
line_record.set('winid','csh_payment_req_pay_win');
var data=[];
data.push(line_record);
var win = new Leaf.Window({
id: 'csh_payment_req_pay_win',
url: $('csh_payment_req_pay_win_link').getUrl(),
params: {
params:line_record.data,
/* {
payment_req_id: payment_req_id,
winid: 'csh_payment_req_pay_win',
hdds_id: hdds_id,
......@@ -652,7 +688,7 @@
loan_date: hd_record.get('loan_date')
//first_contract_day: hd_record.get('first_contract_day')
// ,first_repayment_flag: first_repayment_flag
},
},*/
title: '${l:CSH502.CSH_PAYMENT_REQ_PAY}',
fullScreen: true
});
......@@ -688,8 +724,14 @@
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
if((amount_agent+amount_vender+other_payment2)!=due_amount){
check_due_amount_flag=false;
console.log(amount_agent);
console.log(amount_vender);
console.log(other_payment2);
console.log(due_amount);
if(plus(plus(amount_agent,amount_vender),other_payment2)!=due_amount){
$L.showErrorMessage("提示",'应付我司金额,委托付款金额和首付款抵充金额之后应等于应付金额！');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
//本次申请金额等于委托加我司
var this_apply_amount=plus(amount_agent,amount_vender);
......@@ -1117,9 +1159,10 @@
// };
window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function (ds, qpara, bp_seq) {
/* debugger
var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
var hd_record = $(hdds_id).getCurrentRecord();
qpara['payment_req_id'] = hd_record.get('payment_req_id');
var hd_record = $(hdds_id).getAt(0);
qpara['payment_req_id'] = hd_record.get('payment_req_id');*/
/*if (hd_record.get('bp_id_vender_n')) {
qpara['bp_id_vender_n'] = hd_record.get('bp_id_vender_n');
}*/
......
src/main/webapp/modules/csh/CSH502/csh_payment_req_query.lview
View file @ 5201868c
......@@ -343,26 +343,26 @@
<!-- <a:gridButton click="csh502_payment_close" text="HLS.CLOSE"/> -->
<!-- <a:gridButton click="csh502_payment_save" text="HLS.SAVE"/> -->
<!-- <a:gridButton click="csh502_payment_doc_print" text="汇签单打印"/> -->
<a:gridButton click="csh502_payment_doc_print_d" text="汇签单"/>
<div style="margin-left:30px;margin-top:13px"><![CDATA[注：汇签单打印之后请重新点击查询按钮以获取最新数据后进行其它操作]]></div>
<!-- <a:gridButton click="csh502_payment_doc_print_d" text="汇签单"/>-->
<!-- <div style="margin-left:30px;margin-top:13px"><![CDATA[注：汇签单打印之后请重新点击查询按钮以获取最新数据后进行其它操作]]></div>-->
</a:screenTopToolbar>
<a:form column="3" labelWidth="130" marginWidth="35" title="CSH502.CSH_PAYMENT_REQ_PAY">
<a:textField name="payment_req_number" bindTarget="csh_payment_req_query_ds" prompt="申请单号"/>
<a:textField name="bp_id_tenant_n" bindTarget="csh_payment_req_query_ds" prompt="商业伙伴名称"/>
<a:datePicker name="approval_date_from" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_APR_DATE_FROM" width="150"/>
<a:datePicker name="approval_date_to" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_APR_DATE_TO" width="150"/>
<a:textField name="contract_number" bindTarget="csh_payment_req_query_ds" prompt="支付表编号"/>
<!-- <a:textField name="bp_id_tenant_n" bindTarget="csh_payment_req_query_ds" prompt="商业伙伴名称"/>-->
<!-- <a:datePicker name="approval_date_from" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_APR_DATE_FROM" width="150"/>-->
<!-- <a:datePicker name="approval_date_to" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_APR_DATE_TO" width="150"/>-->
<a:textField name="contract_number" bindTarget="csh_payment_req_query_ds" prompt="合同编号"/>
<a:datePicker name="req_date_from" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_REQ_DATE_FROM" width="150"/>
<a:datePicker name="req_date_to" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_REQ_DATE_TO" width="150"/>
<!-- <a:lov name="user_name" bindTarget="csh_payment_req_query_ds" prompt="提交人帐号" width="150"/> -->
<!-- <a:textField name="employee_name" bindTarget="csh_payment_req_query_ds" prompt="提交人姓名" readOnly="true" width="150"/> -->
<a:textField name="user_name" bindTarget="csh_payment_req_query_ds" prompt="申请人" width="150"/>
<a:comboBox name="print_flag_des" bindTarget="csh_payment_req_query_ds" prompt="汇签单" width="150"/>
<!-- <a:comboBox name="print_flag_des" bindTarget="csh_payment_req_query_ds" prompt="汇签单" width="150"/>-->
<!-- <a:comboBox name="approval_status_desc" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_APR_STATE" width="150"/> -->
<!-- <a:textField name="submitted_flag" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_SUBMIT_STATE" width="150"/> -->
<!-- <a:checkBox name="closed_flag" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_CLOSED_FLAG" width="70"/> -->
<!-- <a:comboBox name="payment_bank_des" bindTarget="csh_payment_req_query_ds" prompt="付款银行" width="150"/> -->
<a:comboBox name="bp_category_n" bindTarget="csh_payment_req_query_ds" prompt="对象类型" width="150"/>
<!-- <a:comboBox name="bp_category_n" bindTarget="csh_payment_req_query_ds" prompt="对象类型" width="150"/>-->
</a:form>
<a:grid id="csh_payment_req_grid_ds" bindTarget="csh_payment_req_queryDs" marginHeight="240" marginWidth="35" navBar="true">
<a:toolBar>
......@@ -370,29 +370,37 @@
</a:toolBar>
<a:columns>
<a:column name="payment_req_number" lock="true" prompt="CSH502.CSH_REQ_NO" renderer="render_objectDs_grid" width="130"/>
<a:column name="contract_number" prompt="支付表编号" showTitle="true" width="120"/>
<a:column name="print_flag" align="center" prompt="汇签单" renderer="render_objectDs_grid" width="80"/>
<a:column name="contract_number" prompt="合同编号" showTitle="true" width="120"/>
<!-- <a:column name="print_flag" align="center" prompt="汇签单" renderer="render_objectDs_grid" width="80"/>-->
<!-- <a:column name="status_n" align="center" prompt="BPM状态" width="80"/> -->
<a:column name="user_name" prompt="CSH502.CSH_PROPOSER"/>
<a:column name="req_date" align="center" prompt="CSH502.CSH_REQ_DATE" width="80"/>
<a:column name="bp_id_tenant_n" align="center" prompt="承租人"/>
<a:column name="apply_amount" align="right" prompt="CSH501.CSH_APPLIED_TOTAL_AMOUNT" renderer="Leaf.formatMoney"/>
<a:column name="sum_act_amount" align="right" prompt="实际申请金额" renderer="Leaf.formatMoney"/>
<!-- <a:column name="user_name" prompt="CSH502.CSH_PROPOSER" width="120"/>-->
<a:column name="req_date" align="center" prompt="CSH502.CSH_REQ_DATE" width="120"/>
<a:column name="amount" align="center" prompt="应付金额" width="120" renderer="Leaf.formatMoney"/>
<a:column name="bp_id_agent_n" align="center" prompt="代理店" width="120"/>
<a:column name="amount_agent_total" align="center" prompt="应付代理店金额" width="120" renderer="Leaf.formatMoney"/>
<a:column name="residual_agent_amount" align="center" prompt="未付代理店金额" width="120" renderer="Leaf.formatMoney"/>
<a:column name="vender_name" align="center" prompt="厂商" width="120"/>
<a:column name="amount_vender_total" align="center" prompt="应付厂商金额" width="120" renderer="Leaf.formatMoney"/>
<a:column name="residual_vender_amount" align="center" prompt="未付厂商金额" width="120" renderer="Leaf.formatMoney"/>
<!-- <a:column name="bp_id_tenant_n" align="center" prompt="承租人"/>-->
<!-- <a:column name="apply_amount" align="right" prompt="CSH501.CSH_APPLIED_TOTAL_AMOUNT" renderer="Leaf.formatMoney"/>-->
<!-- <a:column name="sum_act_amount" align="right" prompt="实际申请金额" renderer="Leaf.formatMoney"/>-->
<!-- <a:column name="print_flag" align="center" prompt="汇签单" renderer="render_objectDs_grid" width="60"/> -->
<!-- <a:column name="document_type_dis" prompt="CSH502.CSH_REQ_TYPE"/> -->
<!-- <a:column name="price" align="right" prompt="指导价" renderer="Leaf.formatMoney"/> -->
<a:column name="bp_category_desc" prompt="对象类别"/>
<!-- <a:column name="bp_category_desc" prompt="对象类别"/>-->
<!-- <a:column name="bp_code" prompt="CSH501.CSH_PAYMENT_OBJ"/> -->
<a:column name="bp_name" prompt="CSH501.CSH_PAYMENT_OBJ_NAME" showTitle="true" width="180"/>
<a:column name="bp_bank_account_name" prompt="对象账户"/>
<a:column name="bp_bank_account_num" prompt="对象账号" width="150"/>
<!-- <a:column name="bp_name" prompt="CSH501.CSH_PAYMENT_OBJ_NAME" showTitle="true" width="180"/>-->
<!-- <a:column name="bp_bank_account_name" prompt="对象账户"/>-->
<!-- <a:column name="bp_bank_account_num" prompt="对象账号" width="150"/>-->
<!-- <a:column name="bank_account_num" prompt="出租方账户" showTitle="true" width="200"/>
<a:column name="bank_account_name" prompt="出租方账户名称" showTitle="true" width="200"/> -->
<!-- <a:column name="bp_category_dis" prompt="CSH502.CSH_OBJ_CATEGORY"/> -->
<!-- <a:column name="currency_name" align="center" prompt="HLS.CURRENCY" width="60"/> -->
<!-- <a:column name="submitted_flag" editor="grid_checkbox" prompt="CSH502.CSH_SUBMIT_STATE"/> -->
<a:column name="approval_status_desc" align="center" prompt="CSH502.CSH_APR_STATE" width="80"/>
<a:column name="approval_date" align="center" prompt="CSH502.CSH_APR_DATE" width="80"/>
<!-- <a:column name="approval_status_desc" align="center" prompt="CSH502.CSH_APR_STATE" width="80"/>-->
<!-- <a:column name="approval_date" align="center" prompt="CSH502.CSH_APR_DATE" width="80"/>-->
<!-- <a:column name="closed_flag" editor="grid_checkbox" prompt="CSH502.CSH_CLOSED_FLAG"/> -->
</a:columns>
<a:editors>
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 5201868c
......@@ -234,7 +234,6 @@
draggable: true
});
win.on('close', function () {
debugger;
$(quotation_ds_id).query();
$(history_ds_id).query();
});
......@@ -285,7 +284,6 @@
draggable: true
});
win.on('close', function () {
$(quotation_ds_id).query();
$(history_ds_id).query();
......
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