Skip to content

L
leaf-hlcm
Commit ecc4c85d authored by 陆正友's avatar 陆正友
Browse files
Options

博雷顿

parent 9688746a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 464 additions and 269 deletions
src/main/webapp/WEB-INF/classes/basic/sys_code_value_v_lease.lwm
View file @ ecc4c85d
......@@ -37,14 +37,14 @@
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
and PARENT_UNIT_ID <> 1544
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60'))
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60','95','93'))
UNION ALL
SELECT v.code_value AS value_code, v.code_value_name AS value_name
FROM sys_code_values_v v
WHERE v.code_enabled_flag = 'Y'
AND v.code_value_enabled_flag = 'Y'
AND v.code = 'DIVISION'
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60')
AND v.code_value IN ('10', '20', '30', '40','50','70','80','90','91','92','99','60','95','93')
AND NOT EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
......
src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview
View file @ ecc4c85d
......@@ -118,6 +118,7 @@
function invoiceHd_confirm() {
debugger;
Leaf.Masker.mask(Ext.getBody());
var final_bill_flag = $('allConditionDs').getAt(0).get('final_bill_flag');
var cat_ini_flag = $('allConditionDs').getAt(0).get('cat_ini_flag');
......@@ -269,6 +270,7 @@
<a:datas>
<a:record code_value="LEASE" code_value_name="直租"/>
<a:record code_value="LEASEBACK" code_value_name="售后回租"/>
<a:record code_value="LEASEOPERAT" code_value_name="经营性租赁"/>
</a:datas>
</a:dataSet>
<a:dataSet id="write_off_flag_ds">
......@@ -290,7 +292,7 @@
<a:dataSet id="acr510n_invoice_type_ds">
<a:datas>
<a:record code_value="ECT" code_value_name="电子发票"/>
<a:record code_value="PAPER" code_value_name="纸质发票"/>
<a:record code_value="PAPER" code_value_name="数电纸质发票"/>
</a:datas>
</a:dataSet>
<a:dataSet id="acr510n_division_ds">
......@@ -300,15 +302,14 @@
<a:record code_value="30" code_value_name="高空作业车"/>
<a:record code_value="40" code_value_name="其它"/>
<a:record code_value="50" code_value_name="星邦高空作业车"/>
<!--<a:record code_value="90" code_value_name="租赁二手机"/>-->
<a:record code_value="90" code_value_name="租赁二手机（日立）"/>
<a:record code_value="91" code_value_name="神钢建机"/>
<a:record code_value="92" code_value_name="北京心诚"/>
<a:record code_value="99" code_value_name="工程机械"/>
<a:record code_value="80" code_value_name="叉车"/>
<!--<a:record code_value="70" code_value_name="铁甲业务"/>-->
<a:record code_value="70" code_value_name="二手机业务"/>
<a:record code_value="92" code_value_name="北京卡家"/>
<a:record code_value="95" code_value_name="经租设备"/>
<a:record code_value="93" code_value_name="新业务-厂商担保"/>
</a:datas>
</a:dataSet>
<a:dataSet id="acr510n_invoice_method_ds">
......@@ -539,6 +540,7 @@
<a:hBox>
<a:comboBox bindTarget="allConditionDs" name="billing_status_n" prompt="开票状态"/>
<a:comboBox bindTarget="allConditionDs" name="full_elec_invoice_flag_n" prompt="是否全电发票"/>
</a:hBox>
<!-- <a:formBody column="4" labelWidth="400">
<a:lov name="contract_number_from" bindTarget="allConditionDs" prompt="HLS.CONTRACT_NUMBER_FROM"/>
......@@ -606,7 +608,7 @@
<a:column name="invoice_method_n" prompt="开票方式" width="100"/>
<a:column name="division_n" prompt="租赁物" width="100"/>
<a:column name="write_off_flag_desc" width="100" align="center" prompt="核销标记" />
<a:column name="rl_flag_n" width="100" align="center" prompt="是否日立返还金" />
<a:column name="rl_flag_n" width="100" align="center" prompt="是否日立为优质客户付租金" />
<a:column name="billing_status_n" width="100" align="center" prompt="开票状态" />
<a:column name="full_elec_invoice_flag_n" width="100" align="center" prompt="是否全电发票" />
</a:columns>
......@@ -620,7 +622,8 @@
<!--<a:column name="object_taxpayer_type_desc" prompt="纳税人类型"/>-->
<a:column name="contract_number" prompt="合同编号" align="center" width="100"/>
<a:column name="contract_status_desc" prompt="合同状态" align="center" width="80"/>
<a:column name="billing_method_desc" prompt="开票规则" width="155"/>
<a:column name="billing_method_desc" prompt="开票规则"
width="155"/>
<a:column name="billing_object_name" autoAdjust="false"
editor="contractDs_grid_editor_lov" prompt="开票对象名称"
renderer="render_contractDs_grid" showTitle="true" width="200"/>
......
src/main/webapp/modules/hls/HLS500N/hls_fin_calculator_update_n.lview
View file @ ecc4c85d
......@@ -19,13 +19,13 @@
<p:set field="/parameter/@dynamic_base_table" value="null"/>
<a:model-query defaultwhereclause="(d.layout_area_seq = &apos;H&apos;)" fetchAll="true" model="hls.HLS500N.hls_parameter_value_lov_load_n" rootPath="hd_parameter_sql_value"/>
<a:model-query defaultwhereclause="(d.layout_area_seq = &apos;L&apos;)" fetchAll="true" model="hls.HLS500N.hls_parameter_value_lov_load_n" rootPath="ln_parameter_sql_value"/>
<a:model-query defaultWhereClause="cc.division = hd.division and cc.contract_id=${/parameter/@document_id}" model="hls.HLS500N.check_con_record_date" rootPath="full_elec_sign"/>
<p:exception-handles>
<p:catch Exception="*">
<p:action name="HandleException"/>
<p:action name="CreateErrorResponse"/>
</p:catch>
</p:exception-handles>
<a:model-query defaultWhereClause="cc.division = hd.division and cc.contract_id=${/parameter/@document_id}" model="hls.HLS500N.check_con_record_date" rootPath="full_elec_sign"/>
</a:init-procedure>
<a:view>
<!-- <a:link id="hls_parameter_value_lov_link" url="${/request/@context_path}/modules/hls/HLS500/hls_parameter_value_lov.lview"/> -->
......@@ -102,7 +102,7 @@
hd_calc_orign_value = [],
ln_calc_formula_orign_value = [],
ln_calc_orign_value = [];
var is_constru_unit = '${/parameter/@is_constru_unit}' || 'N';
Leaf.Masker.mask(document.documentElement, '${l:HLS.LOADING}');
function hls_hls500_3JD() {
......@@ -553,6 +553,7 @@
function parameter_function(record, name) {
var field = record.getField(name),
ds = $('hls_fin_calculator_hd_ds'),
input_mode = record.get('input_mode');
set_field_input_mode(record, field, name, input_mode);
special_editor_function(ds, record, name);
......@@ -681,6 +682,7 @@
set_field_input_mode(record, field, name, 'READONLY');
}
}
if (editor_record.get('validation_type') == 'NUMBERFIELD') {
if (editor_record.get('allow_decimal') == 'TRUE') {
field.setPropertity('allowdecimals', true);
......@@ -860,7 +862,7 @@
recreate_L_formula = 'N';
}
}
//非全电签约电子合同起租日校验 18083
//非全电签约电子合同起租日校验
if('${/parameter/@layout_code}'=='CCR_BEFORE_SIGN'){
if('${/model/full_elec_sign/record/@full_elec_sign}'!='Y' && '${/model/full_elec_sign/record/@sign_type}'=='ELE_SIGN'){
if (record.get('column_code') == 'H2'){
......@@ -875,17 +877,16 @@
error_count = res.result.error_count;
},
failure: function () {
return;
return false;
},
error: function () {
return;
return false;
},
scope: this,
sync: true
});
//判断起租日
debugger;
if (error_count > 0 && count == 0 ) {
if (error_count > 0 && count == 0) {
count = count + 1;
$L.showErrorMessage('提示', '变更后起租日期不符合要求，请修改！');
record.set('column_value','');
......@@ -901,6 +902,7 @@
}
}
onEditorupdate(ds, record, name, value, old_value);
}
......@@ -1659,7 +1661,22 @@
// unlock_calc_current_window();
// return false;
//}
if (H54 < 0&&'${/parameter/@division}'!=91) {
if ('${/parameter/@division}'==93) {
var dowm_money = mul(div(H16,H99),100)
if(dowm_money<15){
Leaf.SideBar.show({
msg:'当前首付款比例低于15%！',
duration: 10000
})
}
if(H1 > 36){
Leaf.SideBar.show({
msg:'租赁期限超过36期！',
duration: 10000
})
}
}
if (H54 < 0) {
Leaf.showMessage('${l:PROMPT}', '利率最低值不能低于4.75');
unlock_calc_current_window();
return false;
......@@ -1926,6 +1943,7 @@
}
function calc_execute_JD_new(source_procedure) {
var final_recreate_H_formula, final_recreate_L_formula;
if (source_procedure == 'RE_CALC') {
final_recreate_H_formula = 'Y';
......@@ -1965,6 +1983,7 @@
}
function calc_execute_NJD_new(source_procedure) {
var final_recreate_H_formula, final_recreate_L_formula;
if (source_procedure == 'RE_CALC') {
final_recreate_H_formula = 'Y';
......@@ -1976,6 +1995,7 @@
}else{
final_recreate_L_formula = recreate_L_formula;
}
}
Leaf.request({
url: '${/request/@context_path}/autocrud/hls.HLS500.hls_fin_calculator_calc/update',
......
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