Skip to content

L
leaf-hlcm
Commit 4c04e854 authored by 25484's avatar 25484
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents e5489c3d 09375e70
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 21 deletions
src/main/webapp/modules/aut/AUT106/aut_owner_user_batch_authorize.lview
View file @ 4c04e854
......@@ -56,7 +56,7 @@
id: 'fixed_user_win',
url: $('aut_owner_user_batch_fix_link').getUrl(),
title: '${l:AUT106.ADD_FIX_PERSON}',
width: 480,
width: 1200,
height: 500
});
}
......
src/main/webapp/modules/aut/AUT106/aut_owner_user_batch_fix.lview
View file @ 4c04e854
......@@ -20,6 +20,10 @@
Leaf.request({
url: $('bmLink_vat_delete').getUrl(),
success: function(res) {
//关闭窗口
$('fixed_user_win').close();
Leaf.SideBar.show({
msg: '${l:HLS.SUBMIT_SUCCESS}',
duration: 2000
......@@ -96,18 +100,18 @@
<a:gridButton click="fix_save" text="HLS.SAVE"/>
<a:gridButton click="fix_query" text="查询"/>
</a:screenTopToolbar>
<a:form column="3" marginWidth="100" title="查询条件">
<a:textField name="bp_category" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="账号类型" />
<a:textField name="employee_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="员工姓名" />
<a:textField name="extra_nam" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴简称" />
<a:textField name="bp_code" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴编码" />
<a:textField name="bp_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴名称" />
<a:textField name="unit_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="部门" />
<a:textField name="position_desc" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="主岗位" />
<a:form column="3" labelWidth="200" title="查询条件" width="900">
<a:textField name="bp_category" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="账号类型" width="150"/>
<a:textField name="employee_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="员工姓名" width="150"/>
<a:textField name="extra_nam" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴简称" width="150"/>
<a:textField name="bp_code" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴编码" width="150"/>
<a:textField name="bp_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴名称" width="150"/>
<a:textField name="unit_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="部门" width="150"/>
<a:textField name="position_desc" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="主岗位" width="150"/>
</a:form>
<a:grid bindTarget="aut_woner_user_batch_fix_ds" height="400" navBar="true" width="1100">
<a:toolBar>
<!-- <a:button type="add"/> -->
<!-- <a:button type="add"/>-->
<!-- <a:button type="delete"/> -->
<!-- <a:button type="save"/> --><![CDATA[
......
src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
View file @ 4c04e854
......@@ -305,8 +305,9 @@
var regax = /^[A-Z]+$/;
//alert('${/parameter/@unbrand}');
if (bp_class == 'NP') {
debugger
if (card_identity_flag == 'N' || sp_identity_flag == 'N') {
if (regax.test(extra_nam) && extra_nam.length == 3) {
//if (regax.test(extra_nam) && extra_nam.length == 3) {
window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
var check_flag = false;
if (head_record.get('bp_code')) {
......@@ -343,11 +344,12 @@
sync: true,
scope: this
});
} else {
Leaf.showMessage('${l:HLS.PROMPT}', '简称不合规！');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
return false;
}
// }
// else {
// Leaf.showMessage('${l:HLS.PROMPT}', '简称不合规！');
// window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
// return false;
// }
} else {
Leaf.showMessage('${l:HLS.PROMPT}', '身份证校验未通过，不能保存!');
window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create_entrance.lview
View file @ 4c04e854
......@@ -33,7 +33,7 @@
record.set('function_usage', 'CREATE');
record.set('document_category', 'PROJECT');
record.set('default_value_dsid', ds_id);
record.data['url_title'] = '租赁申请创建';
record.data['url_title'] = '报价申请创建';
var param = record.data;
record.set('winid', 'prj_porject_create_win_id');
......
src/main/webapp/modules/prj/PRJ501N/prj_project_modify_entrance.lview
View file @ 4c04e854
......@@ -39,7 +39,7 @@
param['bp_class'] = 'NP';
param['prj_bp_id'] = record.get('prj_bp_id');
param['maintain_type'] = maintain_type;
param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
param['url_title'] = '报价申请维护';
param['layout_debugger_flag'] = 'Y';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'prj_project_modify_link', ds_id);
} else if (record.get('document_type') == 'CARLS') {
......@@ -54,7 +54,7 @@
param['bp_class'] = 'NP';
param['maintain_type'] = maintain_type;
param['prj_bp_id'] = record.get('prj_bp_id');
param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
param['url_title'] = '报价申请维护';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id);
} else {
maintain_type = 'UPDATE';
......@@ -67,7 +67,7 @@
param['bp_id'] = record.get('bp_id');
param['prj_bp_id'] = record.get('prj_bp_id');
param['bp_id_tenant'] = record.get('bp_id_tenant');
param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
param['url_title'] = '报价申请维护';
hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id);
}
}
......
src/main/webapp/modules/prj/PRJ502N/prj_project_modify_entrance.lview
View file @ 4c04e854
......@@ -18,7 +18,7 @@
<a:link id="document_history_query_link_id" url="${/request/@context_path}/modules/prj/PRJ502N/prj_document_history_query.lview"/>
<script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/>
<script type="text/javascript"><![CDATA[
stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_PROJECT_RESULT', 'prj_project');
// stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_PROJECT_RESULT', 'prj_project');
function open_project_modify_win(record_id, ds_id) {
var record = $(ds_id).findById(record_id);
......
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