Skip to content

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

[refactor]相关bug

parent 9e452e58
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 923 additions and 712 deletions
src/main/webapp/WEB-INF/classes/aut/AUT106/aut_owner_user_batch_tmp.lwm
View file @ e8789058
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
and t.session_id = ${/session/@session_id} and t.session_id = ${/session/@session_id}
]]></bm:query-sql> ]]></bm:query-sql>
</bm:operation> --> </bm:operation> -->
/*aut_owner_user_default*/
<bm:operation name="query"> <bm:operation name="query">
<bm:query-sql><![CDATA[ <bm:query-sql><![CDATA[
select t1.* from select t1.* from
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
v.unit_name, v.unit_name,
v.position_desc, v.position_desc,
v.bp_code v.bp_code
from sys_user_v v, aut_owner_user_default t from sys_user_v v, aut_owner_user_batch_tmp t
where v.user_id(+)=t.user_id ) t1 where v.user_id(+)=t.user_id ) t1
#WHERE_CLAUSE# #WHERE_CLAUSE#
]]></bm:query-sql> ]]></bm:query-sql>
...@@ -68,7 +69,7 @@ ...@@ -68,7 +69,7 @@
) )
VALUES VALUES
( (
${@session_id}, ${/session/@session_id},
${@user_id}, ${@user_id},
${/session/@user_id}, ${/session/@user_id},
sysdate, sysdate,
......
src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_miantain_query.lwm
View file @ e8789058
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/> <bm:query-field field="write_off_flag" queryExpression="t1.write_off_flag =${@write_off_flag}"/>
<bm:query-field field="bp_bank_account_name" queryOperator="like"/> <bm:query-field field="bp_bank_account_name" queryOperator="like"/>
<bm:query-field field="receipt_type" queryOperator="="/> <bm:query-field field="receipt_type" queryOperator="="/>
<bm:query-field name="confirmed" queryExpression="(${@confirmed} = 'Y' and t1.confirmed_flag in ('ACCAUDITED','ACCAUDITING'))"/> <bm:query-field name="confirmed" queryExpression="((${@confirmed} = 'Y' and t1.confirmed_flag in ('ACCAUDITED','ACCAUDITING')) or (${@confirmed} = 'N' and t1.confirmed_flag in ('NEW','CT_REJECTED','ACCAUDITING','ACCAUDITED')))"/>
<bm:query-field field="opposite_band_na" queryOperator="="/> <bm:query-field field="opposite_band_na" queryOperator="="/>
<bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/> <bm:query-field name="transaction_num_from" queryExpression="t1.transaction_num &gt;= ${@transaction_num_from}"/>
<bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/> <bm:query-field name="transaction_num_to" queryExpression="t1.transaction_num &lt;= ${@transaction_num_to}"/>
......
src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_transaction_plan_query.lwm
View file @ e8789058
...@@ -16,7 +16,12 @@ ...@@ -16,7 +16,12 @@
<bm:field name="write_off_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="WRITE_OFF_AMOUNT" prompt="核销金额"/> <bm:field name="write_off_amount" databaseType="NUMBER" datatype="java.lang.Double" physicalName="WRITE_OFF_AMOUNT" prompt="核销金额"/>
<bm:field name="write_off_date" databaseType="DATE" datatype="java.util.Date" physicalName="WRITE_OFF_DATE" prompt="CSH_TRANSACTION_PLAN.WRITE_OFF_DATE"/> <bm:field name="write_off_date" databaseType="DATE" datatype="java.util.Date" physicalName="WRITE_OFF_DATE" prompt="CSH_TRANSACTION_PLAN.WRITE_OFF_DATE"/>
<bm:field name="company_id" databaseType="NUMBER" databasetype="java.lang.Long" physicalName="COMPANY_ID" prompt="CSH_TRANSACTION_PLAN.COMPANY_ID"/> <bm:field name="company_id" databaseType="NUMBER" databasetype="java.lang.Long" physicalName="COMPANY_ID" prompt="CSH_TRANSACTION_PLAN.COMPANY_ID"/>
<bm:field name="create_wf_flag_desc" expression="(decode(t1.create_wf_flag,'Y','是','否'))"/>
<bm:field name="create_wf_flag"/>
</bm:fields> </bm:fields>
<bm:query-fields>
<bm:query-field field="create_wf_flag" queryOperator="="/>
</bm:query-fields>
<bm:primary-key> <bm:primary-key>
<bm:pk-field name="plan_id"/> <bm:pk-field name="plan_id"/>
</bm:primary-key> </bm:primary-key>
......
src/main/webapp/WEB-INF/classes/hls/HLS303/check_division.lwm 0 → 100644
View file @ e8789058
<?xml version="1.0" encoding="UTF-8"?>
<!--
$Author: ZLF
$Date: 2014-11-21 上午11:18:06
$Revision: 1.0
$Purpose:
-->
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
<bm:operations>
<bm:operation name="update">
<bm:update-sql><![CDATA[
begin
hls_bp_master_pkg.check_division
(
p_bp_id=>${@bp_id},
p_user_id=>${/session/@user_id}
);
end;
]]></bm:update-sql>
</bm:operation>
</bm:operations>
</bm:model>
\ No newline at end of file
src/main/webapp/WEB-INF/view/role.html
View file @ e8789058
...@@ -88,7 +88,8 @@ ...@@ -88,7 +88,8 @@
<select id="roleSelect" name="roleIdStr" class="bs-select form-control"> <select id="roleSelect" name="roleIdStr" class="bs-select form-control">
<#list roles as role> <#list roles as role>
<option value="${role.userRoleGroupId!}-${role.roleId!}-${role.companyId}"> <option value="${role.userRoleGroupId!}-${role.roleId!}-${role.companyId}">
${role.roleName!''}-${role.companyDescription!''} <!-- ${role.roleName!''}-${role.companyDescription!''}-->
${role.roleName!''}
</option> </option>
</#list> </#list>
</select> </select>
......
src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview
View file @ e8789058
...@@ -637,6 +637,7 @@ ...@@ -637,6 +637,7 @@
<a:field name="currency_code_from"/> <a:field name="currency_code_from"/>
<a:field name="currency_name_to_display" displayField="currency_name" options="currency_ds" returnField="currency_code_to" valueField="currency_code"/> <a:field name="currency_name_to_display" displayField="currency_name" options="currency_ds" returnField="currency_code_to" valueField="currency_code"/>
<a:field name="currency_code_to"/> <a:field name="currency_code_to"/>
<a:field name="confirmed" defaultValue="N"/>
<!-- <a:field name="transaction_type" defaultValue="RECEIPT"/>--> <!-- <a:field name="transaction_type" defaultValue="RECEIPT"/>-->
<a:field name="transaction_category" defaultValue="BUSINESS"/> <a:field name="transaction_category" defaultValue="BUSINESS"/>
<!-- <a:field name="write_off_flag_desc" displayField="code_value_name" options="write_off_flag_ds" returnField="write_off_flag" valueField="code_value"/>--> <!-- <a:field name="write_off_flag_desc" displayField="code_value_name" options="write_off_flag_ds" returnField="write_off_flag" valueField="code_value"/>-->
......
src/main/webapp/modules/csh/CSH531C/csh_bank_transfer_confirme.lview
View file @ e8789058
...@@ -528,7 +528,8 @@ ...@@ -528,7 +528,8 @@
<a:dataSet id="csh_transaction_receipt_write_off_query_ds" autoCreate="true"> <a:dataSet id="csh_transaction_receipt_write_off_query_ds" autoCreate="true">
<a:fields> <a:fields>
<a:field name="write_off_flag"/> <a:field name="write_off_flag"/>
<a:field name="cw_flag" defaultValue="Y"/> <a:field name="reversed_flag" defaultValue="N"/>
<a:field name="cw_flag" defaultValue="N"/>
<a:field name="confirmed" defaultValue="Y"/> <a:field name="confirmed" defaultValue="Y"/>
<a:field name="confirmed_flag_desc" options="confirmed_flag_ds" valueField="code_value" <a:field name="confirmed_flag_desc" options="confirmed_flag_ds" valueField="code_value"
displayField="code_value_name" returnField="confirmed_flag" defaultValue="核销确认中"/> displayField="code_value_name" returnField="confirmed_flag" defaultValue="核销确认中"/>
...@@ -670,7 +671,7 @@ ...@@ -670,7 +671,7 @@
<!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>--> <!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>-->
<!-- <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>--> <!-- <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="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据状态" width="120" 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="review_status_desc" prompt="分配状态" width="80"/>-->
<!-- <a:column name="ref_v05" prompt="备注" width="100"/>--> <!-- <a:column name="ref_v05" prompt="备注" width="100"/>-->
<a:column name="created_user_name" prompt="制单人" width="120" align="center"/> <a:column name="created_user_name" prompt="制单人" width="120" align="center"/>
......
src/main/webapp/modules/csh/CSH531N/csh_bank_transfer_processing.lview
View file @ e8789058
...@@ -519,6 +519,7 @@ ...@@ -519,6 +519,7 @@
<a:record code_value="ACCAUDITED" code_value_name="收款已确认"/> <a:record code_value="ACCAUDITED" code_value_name="收款已确认"/>
<a:record code_value="WF_APPROVING" code_value_name="核销确认中"/> <a:record code_value="WF_APPROVING" code_value_name="核销确认中"/>
<a:record code_value="APPROVED" code_value_name="核销已确认"/> <a:record code_value="APPROVED" code_value_name="核销已确认"/>
<a:record code_value="WF_REJECTED" code_value_name="核销退回"/>
</a:datas> </a:datas>
</a:dataSet> </a:dataSet>
<a:dataSet id="csh531n_ds_collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES"/> <a:dataSet id="csh531n_ds_collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES"/>
...@@ -535,6 +536,7 @@ ...@@ -535,6 +536,7 @@
<a:dataSet id="csh_transaction_receipt_write_off_query_ds" autoCreate="true"> <a:dataSet id="csh_transaction_receipt_write_off_query_ds" autoCreate="true">
<a:fields> <a:fields>
<a:field name="write_off_flag"/> <a:field name="write_off_flag"/>
<a:field name="reversed_flag" defaultValue="N"/>
<a:field name="cw_flag" defaultValue="Y"/> <a:field name="cw_flag" defaultValue="Y"/>
<a:field name="confirmed_flag_desc" options="confirmed_flag_ds" valueField="code_value" <a:field name="confirmed_flag_desc" options="confirmed_flag_ds" valueField="code_value"
displayField="code_value_name" returnField="confirmed_flag" defaultValue="收款已确认"/> displayField="code_value_name" returnField="confirmed_flag" defaultValue="收款已确认"/>
...@@ -678,7 +680,7 @@ ...@@ -678,7 +680,7 @@
<!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>--> <!-- renderer="Leaf.formatMoney" prompt="未分配金额"/>-->
<!-- <a:column name="status_desc" prompt="单据状态" width="120" align="center"/>--> <!-- <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="write_off_flag_desc" prompt="核销状态" width="120" align="center"/>
<a:column name="confirmed_flag_desc" prompt="单据状态" width="120" 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="review_status_desc" prompt="分配状态" width="80"/>-->
<!-- <a:column name="ref_v05" prompt="备注" width="100"/>--> <!-- <a:column name="ref_v05" prompt="备注" width="100"/>-->
<a:column name="created_user_name" prompt="制单人" width="120" align="center"/> <a:column name="created_user_name" prompt="制单人" width="120" align="center"/>
......
src/main/webapp/modules/csh/CSH531N/csh_write_off_interface.lview
View file @ e8789058
...@@ -94,6 +94,9 @@ ...@@ -94,6 +94,9 @@
return 'csh_write_off_grid_dp'; return 'csh_write_off_grid_dp';
} }
if (write_off_type == 'RECEIPT_ADVANCE_RECEIPT') { if (write_off_type == 'RECEIPT_ADVANCE_RECEIPT') {
if(record.get('create_wf_flag') == 'Y'){
return;
}
return 'csh_transaction_advanced_grid_dp'; return 'csh_transaction_advanced_grid_dp';
} }
if (write_off_type == 'RECEIPT_DEPOSIT_POOL') { if (write_off_type == 'RECEIPT_DEPOSIT_POOL') {
...@@ -519,26 +522,27 @@ ...@@ -519,26 +522,27 @@
if (sum > header_rec.get('unwrite_off_amount')) { if (sum > header_rec.get('unwrite_off_amount')) {
Leaf.showInfoMessage('提示', '核销总金额不能大于剩余可核销金额'); Leaf.showInfoMessage('提示', '核销总金额不能大于剩余可核销金额');
$('csh531n_write_off_submit_btn_id').enable(); $('csh531n_write_off_submit_btn_id').enable();
$('csh531n_write_off_btn_id').enable();
return false; return false;
} }
var receipt_type = header_rec.get('receipt_type'); // var receipt_type = header_rec.get('receipt_type');
var bp_category = header_rec.get('bp_category'); // var bp_category = header_rec.get('bp_category');
var paid_byother_flag = header_rec.get('paid_byother_flag'); // var paid_byother_flag = header_rec.get('paid_byother_flag');
if (type == 'WRITE_OFF') { // if (type == 'WRITE_OFF') {
var check_flag = 'N'; // var check_flag = 'N';
if (receipt_type == 'WITHHOLD') { //划扣 // if (receipt_type == 'WITHHOLD') { //划扣
check_flag = 'Y'; // check_flag = 'Y';
} else { // } else {
if (paid_byother_flag == 'F' && bp_category == 'TENANT') { // if (paid_byother_flag == 'F' && bp_category == 'TENANT') {
check_flag = 'Y'; // check_flag = 'Y';
} // }
} // }
if (check_flag == 'Y' && sum != header_rec.get('unwrite_off_amount')) { // if (check_flag == 'Y' && sum != header_rec.get('unwrite_off_amount')) {
Leaf.showInfoMessage('提示', '核销总金额不等于可核销金额,该现金事务不支持部分核销！'); // Leaf.showInfoMessage('提示', '核销总金额不等于可核销金额,该现金事务不支持部分核销！');
$('csh531n_write_off_submit_btn_id').enable(); // $('csh531n_write_off_submit_btn_id').enable();
return false; // return false;
} // }
} // }
return true; return true;
} }
...@@ -567,7 +571,10 @@ ...@@ -567,7 +571,10 @@
if (r.get('exists_deposit_flag') == 'Y' && current_deposit_r) { if (r.get('exists_deposit_flag') == 'Y' && current_deposit_r) {
return; return;
} }
if (r.get('exists_advance_flag') == 'Y' && current_advance_r) { // if (r.get('exists_advance_flag') == 'Y' && current_advance_r) {
// return;
// }
if (record.get('create_wf_flag') == 'Y'){
return; return;
} }
return 'csh_transaction_advanced_grid_nf'; return 'csh_transaction_advanced_grid_nf';
...@@ -762,6 +769,7 @@ ...@@ -762,6 +769,7 @@
<a:field name="write_off_type" defaultValue="RECEIPT_ADVANCE_RECEIPT"/> <a:field name="write_off_type" defaultValue="RECEIPT_ADVANCE_RECEIPT"/>
<a:field name="company_id" defaultValue="${/session/@company_id}"/> <a:field name="company_id" defaultValue="${/session/@company_id}"/>
<a:field name="write_off_amount"/> <a:field name="write_off_amount"/>
<a:field name="create_wf_flag" defaultValue="N" />
<a:field name="write_off_date" validator="write_off_date_validator" required="true" <a:field name="write_off_date" validator="write_off_date_validator" required="true"
defaultValue="${/parameter/@transaction_date}"/> defaultValue="${/parameter/@transaction_date}"/>
</a:fields> </a:fields>
...@@ -988,6 +996,7 @@ ...@@ -988,6 +996,7 @@
footerRenderer="summaryRenderer"/> footerRenderer="summaryRenderer"/>
<a:column name="write_off_date" prompt="核销日期" width="180" align="center" <a:column name="write_off_date" prompt="核销日期" width="180" align="center"
renderer="Leaf.formatDate" editorFunction="csh_edit_function"/> renderer="Leaf.formatDate" editorFunction="csh_edit_function"/>
<!-- <a:column name="create_wf_flag_desc" prompt="已核销标志"/>-->
</a:columns> </a:columns>
<a:editors> <a:editors>
<a:lov id="csh_transaction_advanced_grid_lv"/> <a:lov id="csh_transaction_advanced_grid_lv"/>
......
src/main/webapp/modules/hls/HLS303/bp_agent_entrance.lview
View file @ e8789058
...@@ -207,11 +207,6 @@ ...@@ -207,11 +207,6 @@
<a:lov name="bp_code" bindTarget="bp_agent_query_ds" prompt="代理店编码"/> <a:lov name="bp_code" bindTarget="bp_agent_query_ds" prompt="代理店编码"/>
<a:textField name="bp_name" bindTarget="bp_agent_query_ds" prompt="代理店名称"/> <a:textField name="bp_name" bindTarget="bp_agent_query_ds" prompt="代理店名称"/>
<a:textField name="extra_nam" bindTarget="bp_agent_query_ds" prompt="代理店简称"/> <a:textField name="extra_nam" bindTarget="bp_agent_query_ds" prompt="代理店简称"/>
<!-- <a:textField name="re_kunnr" bindTarget="bp_agent_query_ds" prompt="SAP客户编码"/>-->
<!-- <a:textField name="re_lifnr" bindTarget="bp_agent_query_ds" prompt="SAP供应商编码"/>-->
<!-- <a:comboBox name="bp_category_n" bindTarget="bp_agent_query_ds" prompt="商业伙伴类型"/>
<a:comboBox name="agent_type_n" bindTarget="bp_agent_query_ds" prompt="代理店类型"/>
<a:comboBox name="agent_instance_status_n" bindTarget="bp_agent_query_ds" prompt="工作流状态"/>-->
</a:form> </a:form>
<a:grid id="bp_agent_grid" bindTarget="bp_agent_grid_result_ds" marginHeight="190" marginWidth="40" <a:grid id="bp_agent_grid" bindTarget="bp_agent_grid_result_ds" marginHeight="190" marginWidth="40"
navBar="true"> navBar="true">
...@@ -219,31 +214,9 @@ ...@@ -219,31 +214,9 @@
<a:column name="bp_code" align="center" prompt="代理店编码" renderer="bp_agent_render" width="120"/> <a:column name="bp_code" align="center" prompt="代理店编码" renderer="bp_agent_render" width="120"/>
<a:column name="bp_name" align="center" prompt="代理店名称" width="280"/> <a:column name="bp_name" align="center" prompt="代理店名称" width="280"/>
<a:column name="extra_nam" align="center" prompt="代理店简称" width="130"/> <a:column name="extra_nam" align="center" prompt="代理店简称" width="130"/>
<!--<a:column name="large_area" align="center" prompt="大区" width="90"/>
<a:column name="liv_province_n" align="center" prompt="所在省份" width="90"/>
<a:column name="liv_city_n" align="center" prompt="所在城市" width="90"/>-->
<a:column name="enabled_flag" align="center" prompt="代理店状态" width="100"/> <a:column name="enabled_flag" align="center" prompt="代理店状态" width="100"/>
<!--<a:column name="large_area" align="center" prompt="额度管理" width="120"/>-->
<!-- <a:column name="agent_info" align="center" prompt="代理店信息补充" renderer="bp_agent_render" width="100"/> <!-- <a:column name="agent_instance_status_n" align="center" prompt="工作流状态" width="150"/>-->
<a:column name="agent_renew" align="center" prompt="代理店续约" renderer="bp_agent_render" width="90"/>
<a:column name="financial_statements_import" align="center" prompt="财务报表导入"
renderer="bp_agent_render" width="90"/>
<a:column name="financial_statements" align="center" prompt="财务报表" renderer="bp_agent_render"
width="80"/>
<!-- <a:column name="enterprise_certification" align="center" prompt="企业认证"-->
<!-- renderer="enterprise_certification_render" width="80"/>-->
<!-- <a:column name="certification_status" align="center" prompt="认证状态" width="80"/>-->
<!-- <a:column name="re_kunnr" align="center" prompt="SAP客户编码" width="100"/>-->
<!-- <a:column name="re_lifnr" align="center" prompt="SAP供应商编码" width="100"/>-->
<!-- <a:column name="certification_status" align="center" prompt="认证状态" width="80"/>&ndash;&gt;-->
<!-- <a:column name="re_kunnr" align="center" prompt="SAP客户编码" width="100"/>-->
<!-- <a:column name="re_lifnr" align="center" prompt="SAP供应商编码" width="100"/>&ndash;&gt;&ndash;&gt;-->
<!--<a:column name="bp_class_n" align="center" prompt="商业伙伴类型" width="120"/>
<a:column name="bp_category_n" align="center" prompt="商业伙伴类别" width="150"/>
<a:column name="agent_type_n" align="center" prompt="代理店类型" width="150"/>
<a:column name="extra_nam" align="center" prompt="代理店简称" width="150"/>
param['url_title'] = '代理店管理';
<a:column name="agent_instance_status_n" align="center" prompt="工作流状态" width="150"/>-->
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:screenBody> </a:screenBody>
......
src/main/webapp/modules/hls/HLS303/bp_agent_modify.lview
View file @ e8789058
...@@ -153,42 +153,42 @@ ...@@ -153,42 +153,42 @@
var bp_id = bp_record.get('bp_id'); var bp_id = bp_record.get('bp_id');
Leaf.request({ // Leaf.request({
url: $('hls303_sap_eai_create_customer_link').getUrl(), // url: $('hls303_sap_eai_create_customer_link').getUrl(),
para: { // para: {
bp_id: bp_id // bp_id: bp_id
}, // },
scope: this, // scope: this,
success: function () { // success: function () {
Leaf.request({ // Leaf.request({
url: $('hls303_sap_eai_create_vender_link').getUrl(), // url: $('hls303_sap_eai_create_vender_link').getUrl(),
para: { // para: {
bp_id: bp_id // bp_id: bp_id
}, // },
scope: this, // scope: this,
success: function () { // success: function () {
//
$(ds_id).query(); // $(ds_id).query();
//
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
failure: function () { // failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
error: function () { // error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
sync: true // sync: true
}); // });
}, // },
failure: function () { // failure: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
error: function () { // error: function () {
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); // window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
}, // },
sync: true // sync: true
}); // });
window['${/parameter/@layout_code}_unlock_layout_dynamic_window'](); window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
......
src/main/webapp/modules/sys/SYS8210/sys_user-RENAME.lview → src/main/webapp/modules/sys/SYS8210/sys_user.lview
View file @ e8789058
...@@ -13,107 +13,103 @@ ...@@ -13,107 +13,103 @@
<a:link id="pageLink_create_user" url="${/request/@context_path}/modules/sys/SYS8210/sys_user_create.lview"/> <a:link id="pageLink_create_user" url="${/request/@context_path}/modules/sys/SYS8210/sys_user_create.lview"/>
<a:link id="pageLink_role_assign" url="${/request/@context_path}/modules/sys/SYS8210/sys_user_role_assign.lview"/> <a:link id="pageLink_role_assign" url="${/request/@context_path}/modules/sys/SYS8210/sys_user_role_assign.lview"/>
<a:link id="pageLink_welcome" url="${/request/@context_path}/welcome.lview"/> <a:link id="pageLink_welcome" url="${/request/@context_path}/welcome.lview"/>
<script type="text/javascript"><![CDATA[ <script><![CDATA[
function userScreen_forward() { function userScreen_forward() {
history.go(1); history.go(1);
} }
function userScreen_back() { function userScreen_back() {
history.go(-1); history.go(-1);
} }
function userScreen_userDs_query() { function userScreen_userDs_query() {
$('userDs').query(); $('userDs').query();
} }
function userScreen_quit() { function userScreen_quit() {
location.href = $('pageLink_welcome').getUrl(); location.href = $('pageLink_welcome').getUrl();
} }
function resetService(){ function resetService(){
$('para_userDs').reset(); $('para_userDs').reset();
} }
function render_userDs_grid(value, record, name){ function render_userDs_grid(value, record, name){
if(!record.isNew) if(!record.isNew)
{
var userId = record.get('user_id');
if(name=='assign_role')
{
return '<a href="javascript:winOpen_assign_role('+userId+')">${l:SYS_USER.ROLE_ASSIGN}</a>';
}
else if(name=='set_password')
{ {
var userId = record.get('user_id'); return '<a href="javascript:winOpen_set_password('+userId+')">${l:SYS_USER.MODIFY_PASSWORD}</a>';
if(name=='assign_role') }
{ else if(name=='edit_user')
return '<a href="javascript:winOpen_assign_role('+userId+')">${l:SYS_USER.ROLE_ASSIGN}</a>'; {
} return '<a href="javascript:winOpen_edit_user('+userId+')">${l:PROMPT.EDIT}</a>';
else if(name=='set_password')
{
return '<a href="javascript:winOpen_set_password('+userId+')">${l:SYS_USER.MODIFY_PASSWORD}</a>';
}
else if(name=='edit_user')
{
return '<a href="javascript:winOpen_edit_user('+userId+')">${l:PROMPT.EDIT}</a>';
}
return '';
} }
return ''; return '';
} }
return '';
}
function winOpen_assign_role(id){ function winOpen_assign_role(id){
new Leaf.Window({ new Leaf.Window({
id:'sys_user_role_assign', id:'sys_user_role_assign',
url:$('pageLink_role_assign').getUrl(), url:$('pageLink_role_assign').getUrl(),
params:{ params:{
user_id:id user_id:id
}, },
title:'${l:SYS_USER.ROLE_ASSIGN}', title:'${l:SYS_USER.ROLE_ASSIGN}',
height:500, height:500,
width:830 width:830
}); });
} }
function winOpen_create_user(){ function winOpen_create_user(){
new Leaf.Window({ new Leaf.Window({
id:'sys_user_create', id:'sys_user_create',
url:$('pageLink_create_user').getUrl(), url:$('pageLink_create_user').getUrl(),
params: { title:'${l:SYS_USER.ADD_NEW_USER}',
winid: 'sys_user_create' height:380,
}, width:530
title:'${l:SYS_USER.ADD_NEW_USER}', });
height:600, }
width:700 function winOpen_set_password(id){
}); new Leaf.Window({
} id:'sys_user_set_password',
function winOpen_set_password(id){ url:$('pageLink_set_password').getUrl(),
new Leaf.Window({ params:{
id:'sys_user_set_password', user_id:id
url:$('pageLink_set_password').getUrl(), },
params:{ title:'${l:SYS_USER.MODIFY_PASSWORD}',
user_id:id height:250,
}, width:500
title:'${l:SYS_USER.MODIFY_PASSWORD}', });
height:250, }
width:500
});
}
function winOpen_edit_user(id){ function winOpen_edit_user(id){
new Leaf.Window({id:'sys_user_edit', new Leaf.Window({id:'sys_user_edit',
url:$('pageLink_edit_user').getUrl(), url:$('pageLink_edit_user').getUrl(),
params:{ params:{
user_id:id, user_id:id
winid: 'sys_user_edit' },
}, title:'${l:SYS_USER.EDIT_USER}',
title:'${l:SYS_USER.EDIT_USER}', height:380,
height:600, width:530
width:700 });
}); }
}
function user_export(){ function user_export(){
$('userDs_grid')._export('xls','用户数据'); $('userDs_grid')._export('xls','用户数据');
} }
function para_userDs_reset() { function para_userDs_reset() {
$('para_userDs').reset(); $('para_userDs').reset();
} }
]]></script> ]]></script>
<a:dataSets> <a:dataSets>
<a:dataSet id="lockStatusDs" loadData="true" lookupCode="SYS_USER_ISLOCKED"/> <a:dataSet id="lockStatusDs" loadData="true" lookupCode="SYS_USER_ISLOCKED"/>
...@@ -145,10 +141,8 @@ ...@@ -145,10 +141,8 @@
<a:comboBox name="bp_category_name" bindTarget="para_userDs" prompt="SYS_USER.USER_TYPE"/> <a:comboBox name="bp_category_name" bindTarget="para_userDs" prompt="SYS_USER.USER_TYPE"/>
<a:textField name="employee_code" bindTarget="para_userDs" prompt="FND_PRV_LOGIN_ACC.EMPLOYEE_CODE"/> <a:textField name="employee_code" bindTarget="para_userDs" prompt="FND_PRV_LOGIN_ACC.EMPLOYEE_CODE"/>
<a:textField name="employee_name" bindTarget="para_userDs" prompt="EXP_EMPLOYEES.NAME"/> <a:textField name="employee_name" bindTarget="para_userDs" prompt="EXP_EMPLOYEES.NAME"/>
<a:textField name="bp_code" bindTarget="para_userDs" prompt="HLS_BP_MASTER.BP_CODE"/>
<a:textField name="bp_name" bindTarget="para_userDs" prompt="HLS_BP_MASTER.BP_NAME"/>
</a:form> </a:form>
<a:grid id="userDs_grid" bindTarget="userDs" marginHeight="170" marginWidth="30" navBar="true"> <a:grid id="userDs_grid" bindTarget="userDs" marginHeight="180" marginWidth="30" navBar="true">
<a:columns> <a:columns>
<a:column name="user_name" prompt="SYS_USER.USER_NAME"/> <a:column name="user_name" prompt="SYS_USER.USER_NAME"/>
<a:column name="description" prompt="FND_COMPANY_PROMPTS.DESCRIPTION" width="100"/> <a:column name="description" prompt="FND_COMPANY_PROMPTS.DESCRIPTION" width="100"/>
...@@ -159,12 +153,9 @@ ...@@ -159,12 +153,9 @@
<a:column name="bp_category_name" prompt="SYS_USER.USER_TYPE" width="60"/> <a:column name="bp_category_name" prompt="SYS_USER.USER_TYPE" width="60"/>
<a:column name="employee_code" prompt="FND_PRV_LOGIN_ACC.EMPLOYEE_CODE" width="60"/> <a:column name="employee_code" prompt="FND_PRV_LOGIN_ACC.EMPLOYEE_CODE" width="60"/>
<a:column name="employee_name" prompt="EXP_EMPLOYEES.NAME"/> <a:column name="employee_name" prompt="EXP_EMPLOYEES.NAME"/>
<a:column name="bp_code" prompt="HLS_BP_MASTER.BP_CODE"/>
<a:column name="bp_name" prompt="HLS_BP_MASTER.BP_NAME" width="160"/>
<a:column name="phone" prompt="SYS_USER.PHONE"/>
<a:column name="assign_role" align="center" prompt="SYS_USER.ROLE_ASSIGN" renderer="render_userDs_grid" width="70"/> <a:column name="assign_role" align="center" prompt="SYS_USER.ROLE_ASSIGN" renderer="render_userDs_grid" width="70"/>
<a:column name="set_password" align="center" prompt="MODIFY_PASSWORD" renderer="render_userDs_grid" width="70"/> <a:column name="set_password" align="center" prompt="MODIFY_PASSWORD" renderer="render_userDs_grid" width="70"/>
<a:column name="edit_user" align="center" prompt="HAP_EDIT" renderer="render_userDs_grid" width="50"/> <a:column name="edit_user" align="center" prompt="HAP_EDIT" renderer="render_userDs_grid" width="70"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:screenBody> </a:screenBody>
......
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