Skip to content

L
leaf-hlcm
Commit 6dbd51a1 authored by 18083's avatar 18083
Browse files
Options

佣金资产管理费进项票税率自定义-资产管理费部分优化开发

parent 5402e77b
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 74 deletions
src/main/webapp/modules/csh/CSH1500/csh_asset_reconciliation.lview
View file @ 6dbd51a1
...@@ -45,11 +45,11 @@ ...@@ -45,11 +45,11 @@
} }
} }
if(Ext.isEmpty(records[i].data.vat_rate)||Ext.isEmpty(records[i].data.vat_rate_date)){ if(Ext.isEmpty(records[i].data.vat_rate)||Ext.isEmpty(records[i].data.vat_rate_date)){
$L.showMessage("提示",'当前代理店未填写【进项票税率】/【进项票税率到期日】，请前往“租前管理-主数据管理-代理店管理”功能填写！'); $L.showMessage("提示",'当前代理店未填写进项票税率/进项票税率到期日，请前往“租前管理-主数据管理-代理店管理”功能填写！');
return; return;
} }
if(Leaf.formatDate(records[i].data.vat_rate_date)<Leaf.formatDate(new Date())){ if(Leaf.formatDate(records[i].data.vat_rate_date)<Leaf.formatDate(new Date())){
$L.showMessage("提示",'当前代理店的进项票税率到期日为'+Leaf.formatDate(records[i].data.vat_rate_date)+'，请前往“租前管理-主数据管理-代理店管理”功能重新维护到期日！'); $L.showMessage("提示",'当前代理店的进项票税率到期日为'+Leaf.formatDate(records[i].data.vat_rate_date)+'，请前往“租前管理-主数据管理-代理店管理”功能重新维护！');
return; return;
} }
records[i].set('_status','execute'); records[i].set('_status','execute');
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
} }
var vat_rate =records[0].get('vat_rate'); var vat_rate =records[0].get('vat_rate');
var vat_rate_date =Leaf.formatDate(records[0].get('vat_rate_date')); var vat_rate_date =Leaf.formatDate(records[0].get('vat_rate_date'));
Leaf.showConfirm('${l:PROMPT}', '当前代理店的进项票税率为'+vat_rate+'，有效期到'+vat_rate_date+'，确认提交资产管理费对账工作流?', function () { Leaf.showConfirm('${l:PROMPT}', '当前代理店的进项票税率为'+vat_rate+'%，有效期到'+vat_rate_date+'，<br/>确认提交资产管理费对账工作流?', function () {
Leaf.request({ Leaf.request({
url: $('asset_check_wfl_link_id').getUrl(), url: $('asset_check_wfl_link_id').getUrl(),
para: ParaData, para: ParaData,
......
src/main/webapp/modules/csh/CSH551/con_comsn_reconcilia_query.lview
View file @ 6dbd51a1
...@@ -184,13 +184,22 @@ ...@@ -184,13 +184,22 @@
Leaf.showMessage('${l:PROMPT}', '代理店或佣金政策与所选合同不匹配，请重新查询后再选择数据提交审批'); Leaf.showMessage('${l:PROMPT}', '代理店或佣金政策与所选合同不匹配，请重新查询后再选择数据提交审批');
return; return;
} }
if(Ext.isEmpty(records[i].data.vat_rate)||Ext.isEmpty(records[i].data.vat_rate_date)){
$L.showMessage("提示",'当前代理店未填写进项票税率/进项票税率到期日，请前往“租前管理-主数据管理-代理店管理”功能填写！');
return;
}
if(Leaf.formatDate(records[i].data.vat_rate_date)<Leaf.formatDate(new Date())){
$L.showMessage("提示",'当前代理店的进项票税率到期日为'+Leaf.formatDate(records[i].data.vat_rate_date)+'，请前往“租前管理-主数据管理-代理店管理”功能重新维护！');
return;
}
param.push({ param.push({
'contract_id': records[i].get('contract_id') 'contract_id': records[i].get('contract_id')
}); });
} }
var vat_rate =records[0].get('vat_rate');
Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认提交审批？', function() { var vat_rate_date =Leaf.formatDate(records[0].get('vat_rate_date'));
Leaf.showConfirm('${l:HLS.PROMPT}', '当前代理店的进项票税率为'+vat_rate+'%，有效期到'+vat_rate_date+'，<br/>确认提交佣金计提工作流?', function() {
window['${/parameter/@layout_code}_lock_layout_dynamic_window'](); window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
Leaf.request({ Leaf.request({
url: $('${/parameter/@layout_code}_submit_comsn_selected_link_id').getUrl(), url: $('${/parameter/@layout_code}_submit_comsn_selected_link_id').getUrl(),
......
src/main/webapp/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview
View file @ 6dbd51a1
...@@ -411,7 +411,7 @@ ...@@ -411,7 +411,7 @@
width:500, width:500,
height:200 height:200
}); });
win.on('close',function (){ win.on('close',function (){
zjwfl5110_approvePage_close(); zjwfl5110_approvePage_close();
}); });
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
width:650, width:650,
height:500 height:500
}); });
win.on('close',function (){ win.on('close',function (){
zjwfl5110_approvePage_close(); zjwfl5110_approvePage_close();
}); });
...@@ -481,7 +481,7 @@ ...@@ -481,7 +481,7 @@
msg: '提交成功', msg: '提交成功',
duration: 2000 duration: 2000
}); });
zjwfl5110_approvePage_close(); zjwfl5110_approvePage_close();
} }
}, },
...@@ -550,7 +550,7 @@ ...@@ -550,7 +550,7 @@
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
return; return;
} }
if (!zjwfl5110_approveCheckNew(checkActionType)) { if (!zjwfl5110_approveCheckNew(checkActionType)) {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
return; return;
...@@ -567,11 +567,6 @@ ...@@ -567,11 +567,6 @@
return; return;
} }
var comment_record = $('comment_text_ds').getCurrentRecord();
if (action_type == 1 && comment_record && !comment_record.get('comment_text')) {
//comment_record.set('comment_text', '同意');
}
var record_id = '${/parameter/@record_id}'; var record_id = '${/parameter/@record_id}';
var comment_text = $('comment_text_id').getValue(); var comment_text = $('comment_text_id').getValue();
var wfl_ajax_flag = 'N'; var wfl_ajax_flag = 'N';
...@@ -629,10 +624,7 @@ ...@@ -629,10 +624,7 @@
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
},300,showConfirmHight); },300,showConfirmHight);
win.on('close', function() { win.on('close', function() {
if (action_type == 1 && comment_record && comment_record.get('comment_text') == '同意') { if (wfl_ajax_flag == 'N') {
comment_record.set('comment_text', '');
}
if (wfl_ajax_flag == 'N') {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
} }
}); });
...@@ -666,17 +658,17 @@ ...@@ -666,17 +658,17 @@
} }
} }
function zjwfl5110_onAgree(record) { function zjwfl5110_onAgree(record) {
//在提交请求的过程中锁屏 //在提交请求的过程中锁屏
zjwfl5110_approvePage_mask(); zjwfl5110_approvePage_mask();
if (!zjwfl5110_approveCheckNew('agree')) { if (!zjwfl5110_approveCheckNew('agree')) {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
return; return;
} }
if (!$('comment_text_ds').validate()) { if (!$('comment_text_ds').validate()) {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
return; return;
...@@ -702,12 +694,12 @@ ...@@ -702,12 +694,12 @@
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
}); });
} }
function zjwfl5110_onRefuse(record) { function zjwfl5110_onRefuse(record) {
//在提交请求的过程中锁屏 //在提交请求的过程中锁屏
zjwfl5110_approvePage_mask(); zjwfl5110_approvePage_mask();
if (!zjwfl5110_approveCheckNew('refuse')) { if (!zjwfl5110_approveCheckNew('refuse')) {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
return; return;
...@@ -719,12 +711,12 @@ ...@@ -719,12 +711,12 @@
var record_id = '${/parameter/@record_id}'; var record_id = '${/parameter/@record_id}';
var comment_text = $('comment_text_id').getValue(); var comment_text = $('comment_text_id').getValue();
var node_action_id = record.get('node_action_id'); var node_action_id = record.get('node_action_id');
Leaf.showConfirm('是否确认', record.get('node_action_prompt'), function() { Leaf.showConfirm('是否确认', record.get('node_action_prompt'), function() {
//设置请求的时间 //设置请求的时间
Ext.Ajax.timeout = 20 * 60 * 1000; Ext.Ajax.timeout = 20 * 60 * 1000;
Leaf.request({ Leaf.request({
url: $('svcLink_refuse').getUrl(), url: $('svcLink_refuse').getUrl(),
para: { para: {
...@@ -735,13 +727,13 @@ ...@@ -735,13 +727,13 @@
success: function(response) { success: function(response) {
//解锁 //解锁
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
if (response.result.result_num == 0) { if (response.result.result_num == 0) {
Leaf.SideBar.show({ Leaf.SideBar.show({
msg: '提交成功', msg: '提交成功',
duration: 2000 duration: 2000
}); });
zjwfl5110_approvePage_close(); zjwfl5110_approvePage_close();
} }
}, },
...@@ -753,36 +745,36 @@ ...@@ -753,36 +745,36 @@
}, },
scope: this scope: this
}); });
}, function() { }, function() {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
}); });
} }
function zjwfl5110_onSkip(record) { function zjwfl5110_onSkip(record) {
//在提交请求的过程中锁屏 //在提交请求的过程中锁屏
zjwfl5110_approvePage_mask(); zjwfl5110_approvePage_mask();
if (!zjwfl5110_approveCheckNew('jump')) { if (!zjwfl5110_approveCheckNew('jump')) {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
return; return;
} }
if (!$('comment_text_ds').validate()) { if (!$('comment_text_ds').validate()) {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
return; return;
} }
var record_id = '${/parameter/@record_id}'; var record_id = '${/parameter/@record_id}';
var comment_text = $('comment_text_id').getValue(); var comment_text = $('comment_text_id').getValue();
var node_action_id = record.get('node_action_id'); var node_action_id = record.get('node_action_id');
Leaf.showConfirm('是否确认', record.get('node_action_prompt'), function() { Leaf.showConfirm('是否确认', record.get('node_action_prompt'), function() {
//设置请求的时间 //设置请求的时间
Ext.Ajax.timeout = 20 * 60 * 1000; Ext.Ajax.timeout = 20 * 60 * 1000;
Leaf.request({ Leaf.request({
url: $('svcLink_skip').getUrl(), url: $('svcLink_skip').getUrl(),
para: { para: {
...@@ -793,13 +785,13 @@ ...@@ -793,13 +785,13 @@
success: function(response) { success: function(response) {
//解锁 //解锁
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
if (response.result.result_num == 0) { if (response.result.result_num == 0) {
Leaf.SideBar.show({ Leaf.SideBar.show({
msg: '提交成功', msg: '提交成功',
duration: 2000 duration: 2000
}); });
zjwfl5110_approvePage_close(); zjwfl5110_approvePage_close();
} }
}, },
...@@ -811,27 +803,27 @@ ...@@ -811,27 +803,27 @@
}, },
scope: this scope: this
}); });
}, function() { }, function() {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
}); });
} }
function zjwfl5110_onProcedure(record) { function zjwfl5110_onProcedure(record) {
//在提交请求的过程中锁屏 //在提交请求的过程中锁屏
zjwfl5110_approvePage_mask(); zjwfl5110_approvePage_mask();
if (!zjwfl5110_approveCheckNew('do_proc')) { if (!zjwfl5110_approveCheckNew('do_proc')) {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
return; return;
} }
var record_id = '${/parameter/@record_id}'; var record_id = '${/parameter/@record_id}';
var node_action_id = record.get('node_action_id'); var node_action_id = record.get('node_action_id');
Leaf.showConfirm('是否确认', record.get('node_action_prompt'), function() { Leaf.showConfirm('是否确认', record.get('node_action_prompt'), function() {
//设置请求的时间 //设置请求的时间
Ext.Ajax.timeout = 20 * 60 * 1000; Ext.Ajax.timeout = 20 * 60 * 1000;
Leaf.request({ Leaf.request({
...@@ -843,13 +835,13 @@ ...@@ -843,13 +835,13 @@
success: function(response) { success: function(response) {
//解锁 //解锁
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
if (response.result.result_num == 0) { if (response.result.result_num == 0) {
Leaf.SideBar.show({ Leaf.SideBar.show({
msg: '提交成功', msg: '提交成功',
duration: 2000 duration: 2000
}); });
zjwfl5110_approvePage_close(); zjwfl5110_approvePage_close();
} }
}, },
...@@ -861,12 +853,12 @@ ...@@ -861,12 +853,12 @@
}, },
scope: this scope: this
}); });
}, function() { }, function() {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
}); });
} }
/* //上传附件 /* //上传附件
function zjwfl5110_uploadAttach() { function zjwfl5110_uploadAttach() {
var rcpt_record_id = '${/parameter/@record_id}'; var rcpt_record_id = '${/parameter/@record_id}';
...@@ -879,19 +871,19 @@ ...@@ -879,19 +871,19 @@
height: 400 height: 400
}); });
} */ } */
function zjwfl5110_onViewPage(record, combobox_ds_id, wfl_node_action_id, wfl_node_action_prompt, action_type) { function zjwfl5110_onViewPage(record, combobox_ds_id, wfl_node_action_id, wfl_node_action_prompt, action_type) {
//在提交请求的过程中锁屏 //在提交请求的过程中锁屏
zjwfl5110_approvePage_mask(); zjwfl5110_approvePage_mask();
if (!zjwfl5110_approveCheckNew('view_page')) { if (!zjwfl5110_approveCheckNew('view_page')) {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
return; return;
} }
var record_id = '${/parameter/@record_id}'; var record_id = '${/parameter/@record_id}';
var node_action_id = ''; var node_action_id = '';
if (record) { if (record) {
...@@ -914,9 +906,9 @@ ...@@ -914,9 +906,9 @@
} }
} }
} }
//Leaf.showConfirm('是否确认', '是否确认?', function() { //Leaf.showConfirm('是否确认', '是否确认?', function() {
//设置请求的时间 //设置请求的时间
Ext.Ajax.timeout = 20 * 60 * 1000; Ext.Ajax.timeout = 20 * 60 * 1000;
Leaf.request({ Leaf.request({
...@@ -928,9 +920,9 @@ ...@@ -928,9 +920,9 @@
success: function(response) { success: function(response) {
//解锁 //解锁
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
var result = response.result; var result = response.result;
if (result.result_num == 0) { if (result.result_num == 0) {
// add by wangwei // add by wangwei
//指派页面不为全屏 //指派页面不为全屏
...@@ -964,7 +956,7 @@ ...@@ -964,7 +956,7 @@
height: 530 height: 530
}); });
}else if (service_name.trim() == 'modules/wfl_screen/sdic_workflow_assigned_unit.lview') { }else if (service_name.trim() == 'modules/wfl_screen/sdic_workflow_assigned_unit.lview') {
new Leaf.Window({ new Leaf.Window({
id: 'zj_wfl_workflow_service_window', id: 'zj_wfl_workflow_service_window',
url: '${/request/@context_path}/' + result.service_url, url: '${/request/@context_path}/' + result.service_url,
...@@ -973,7 +965,7 @@ ...@@ -973,7 +965,7 @@
height: 530 height: 530
}); });
} }
} }
}, },
failure: function() { failure: function() {
...@@ -984,21 +976,21 @@ ...@@ -984,21 +976,21 @@
}, },
scope: this scope: this
}); });
/* }, function() { /* }, function() {
zjwfl5110_approvePage_noMask(); zjwfl5110_approvePage_noMask();
}); */ }); */
} }
function initButton() { function initButton() {
var node_action_ds = $('nodeActionDs'); var node_action_ds = $('nodeActionDs');
var datalist = node_action_ds.getAll(); var datalist = node_action_ds.getAll();
var record_type = '${/parameter/@record_type}'; var record_type = '${/parameter/@record_type}';
if (record_type == 'APPROVER') { if (record_type == 'APPROVER') {
for (var n = datalist.length;n > 0;n--) { for (var n = datalist.length;n > 0;n--) {
var i = n - 1; var i = n - 1;
var node_action = datalist[i]; var node_action = datalist[i];
...@@ -1014,11 +1006,11 @@ ...@@ -1014,11 +1006,11 @@
// action_desc: bindaction_desc, // action_desc: bindaction_desc,
// action_id: bindaction_id // action_id: bindaction_id
// }); // });
//根据动作类型，动态设置按钮的执行事件 //根据动作类型，动态设置按钮的执行事件
// var action_type = node_action.get('action_type'); // var action_type = node_action.get('action_type');
// function create_sigle_button(action_type) { // function create_sigle_button(action_type) {
// switch (action_type) { // switch (action_type) {
// case '1': // case '1':
...@@ -1094,7 +1086,7 @@ ...@@ -1094,7 +1086,7 @@
// }); // });
// } // }
// } // }
// function create_button_group(action_type) { // function create_button_group(action_type) {
// switch (action_type) { // switch (action_type) {
// case '1': // case '1':
......
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