Skip to content

L
leaf-hlcm
Commit 758f4458 authored by 18083's avatar 18083
Browse files
Options

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

parents ce616cac fc848c9a
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 112 deletions
src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header_wfl.lwm
View file @ 758f4458
......@@ -37,6 +37,7 @@
from sys_code_values_v v
where v.code = 'HLS536_WFL_STATUS'
and v.code_value = t1.wfl_status) wfl_status_n,
t1.reversed_flag,
t1.reverse_wfl_status,
(select v.code_value_name value_name
from sys_code_values_v v
......@@ -45,7 +46,8 @@
t1.journal_type,
(select t.post_gl_status
from hls_journal_header t
where t.journal_header_imp_id = t1.journal_header_id) post_gl_status
where t.journal_header_imp_id = t1.journal_header_id
) post_gl_status
FROM hls_journal_header_imp t1
#WHERE_CLAUSE#
order by t1.journal_header_id desc
......@@ -65,5 +67,6 @@
<bm:query-field name="journal_submit_batch_id" queryExpression="t1.journal_submit_batch_id = ${@journal_submit_batch_id}"/>
<bm:query-field name="description" queryExpression="t1.description like ${@description}"/>
<bm:query-field name="wfl_status" queryExpression="t1.wfl_status=${@wfl_status}"/>
<bm:query-field name="reverse_wfl_status" queryExpression="t1.reverse_wfl_status=${@reverse_wfl_status}"/>
</bm:query-fields>
</bm:model>
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ 758f4458
......@@ -772,16 +772,18 @@
var machine_number = lease_item_record.get('machine_number_70');
var division = lease_item_record.get('division');
var machine_number_num = 0;
if(division == '92' && !Leaf.isEmpty(machine_number)){
var secondary_lease = record.get('secondary_lease') ;
if(!Leaf.isEmpty(secondary_lease) && secondary_lease!='YES') {
if (division == '92' && !Leaf.isEmpty(machine_number)) {
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id : project_id
project_id: project_id
},
scope: this,
success: function (res) {
machine_number_num= res.result.record.v_count;
machine_number_num = res.result.record.v_count;
},
failure: function () {
return false;
......@@ -791,15 +793,16 @@
});
}
if (machine_number_num>0 && count == 0){
count = count+1;
if (machine_number_num > 0 && count == 0) {
count = count + 1;
$L.showErrorMessage('提示', '该机号已存在，请重新确认！');
return false;
}else if(machine_number_num> 0 && count != 0){
} else if (machine_number_num > 0 && count != 0) {
count = 0;
return false;
}
}
}
]]></script>
......
src/main/webapp/modules/cont/CON505/con_contract_modify.lview
View file @ 758f4458
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/modules/hls/HLS536/hls_journal_import_wfl.lview
View file @ 758f4458
......@@ -77,6 +77,7 @@
<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
<a:dataSets>
<a:dataSet id="hls536_wfl_status_ds" lookupCode="HLS536_WFL_STATUS"/>
<a:dataSet id="hls536_reverse_wfl_status_ds" lookupCode="HLS536_WFL_STATUS_REVERSE"/>
<a:dataSet id="hls_journal_header_query">
<a:fields>
<a:field name="journal_num"/>
......@@ -87,6 +88,8 @@
<a:field name="description"/>
<a:field name="wfl_status_n" displayField="code_value_name" options="hls536_wfl_status_ds" returnField="wfl_status" valueField="code_value"/>
<a:field name="wfl_status" />
<a:field name="reverse_wfl_status_n" displayField="code_value_name" options="hls536_reverse_wfl_status_ds" returnField="reverse_wfl_status" valueField="code_value"/>
<a:field name="reverse_wfl_status" />
</a:fields>
</a:dataSet>
<a:dataSet id="hls_journal_header_result_ds" autoPageSize="true" autoQuery="true" model="hls.HLS536.hls_journal_import_header_wfl" queryDataSet="hls_journal_header_query" selectable="true">
......@@ -106,6 +109,7 @@
<a:numberField name="total_amount_dr_to" allowFormat="true" bindTarget="hls_journal_header_query" prompt="金额到"/>
<a:textField name="description" bindTarget="hls_journal_header_query" prompt="凭证摘要"/>
<a:comboBox name="wfl_status_n" bindTarget="hls_journal_header_query" prompt="凭证导入状态"/>
<a:comboBox name="reverse_wfl_status_n" bindTarget="hls_journal_header_query" prompt="凭证反冲状态"/>
</a:form>
<a:grid id="hls_journal_headers_grid" bindTarget="hls_journal_header_result_ds" marginHeight="250" marginWidth="40" navBar="true">
<a:columns>
......
src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview
View file @ 758f4458
......@@ -424,6 +424,8 @@
var machine_number = lease_item_record.get('machine_number_70');
var project_id = project_record.get('project_id');
var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease !='YES'){
if(division == '92' && !Leaf.isEmpty(machine_number)){
Leaf.request({
url: $('check_machine_number_id').getUrl(),
......@@ -451,6 +453,8 @@
count = 0;
return false;
}
}
var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
View file @ 758f4458
......@@ -1119,6 +1119,13 @@
record.getField('bank_account_id_n').setRequired(false);
}
if ('${/parameter/@function_usage}' != 'QUERY') {
if (division == '92') {
record.getField('pay_method').setReadOnly(false);
record.getField('pay_method_n').setReadOnly(false);
}
}
if (division=='91') { //若为神钢建机
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
var current_record = $(ds_id).getCurrentRecord();
......@@ -1878,6 +1885,8 @@
var machine_number = lease_item_record.get('machine_number_70');
var project_id = project_record.get('project_id');
var machine_number_num = 0;
var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease!='YES'){
if(division == '92' && !Leaf.isEmpty(machine_number)){
Leaf.request({
url: $('check_machine_number_id').getUrl(),
......@@ -1907,6 +1916,8 @@
count = 0;
return false;
}
}
return true;
};
......
src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview
View file @ 758f4458
......@@ -378,16 +378,18 @@
var project_id = project_record.get('project_id');
var machine_number = lease_item_record.get('machine_number_70');
var machine_number_num = 0;
if(division == '92' && !Leaf.isEmpty(machine_number)){
var secondary_lease = project_record.get('secondary_lease');
if(!Leaf.isEmpty(secondary_lease) && secondary_lease !='YES') {
if (division == '92' && !Leaf.isEmpty(machine_number)) {
Leaf.request({
url: $('check_machine_number_id').getUrl(),
para: {
machine_number: machine_number,
project_id : project_id
project_id: project_id
},
scope: this,
success: function (res) {
machine_number_num= res.result.record.v_count;
machine_number_num = res.result.record.v_count;
},
failure: function () {
return false;
......@@ -397,14 +399,15 @@
});
}
if (machine_number_num>0 && count == 0){
count = count+1;
if (machine_number_num > 0 && count == 0) {
count = count + 1;
$L.showErrorMessage('提示', '该机号已存在，请重新确认！');
return false;
}else if(machine_number_num> 0 && count != 0){
} else if (machine_number_num > 0 && count != 0) {
count = 0;
return false;
}
}
if(!bp_rate_flag){
return false;
}
......@@ -974,6 +977,12 @@
record.getField('bank_account_id_n').setRequired(false);
}
if ('${/parameter/@function_usage}' != 'QUERY') {
if (division == '92') {
record.getField('pay_method').setReadOnly(false);
record.getField('pay_method_n').setReadOnly(false);
}
}
//深圳美鹏和hcs显示分公司，其他隐藏
var bp_code = '${/model/user_agent_description/record/@bp_code}';
if (!Ext.isEmpty(bp_code) && bp_code !== 'D00010001' && bp_code !== 'D00000009') {
......
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