Skip to content

L
leaf-hlcm
Commit 1ae73ad0 authored by gzj34291's avatar gzj34291
Browse files
Options

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

parents 1cf870d6 e0699269
Expand all Show whitespace changes
Inline Side-by-side
Showing with 327 additions and 112 deletions
src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header.lwm
View file @ 1ae73ad0
......@@ -50,8 +50,8 @@
where t.journal_header_imp_id = t1.journal_header_id
) post_gl_status
FROM hls_journal_header_imp t1
where 1=1
AND EXISTS (SELECT 1
where
EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
AND t.position_code IN ('014'))
......@@ -97,8 +97,8 @@
where t.journal_header_imp_id = t1.journal_header_id
) post_gl_status
FROM hls_journal_header_imp t1
where 1=1
AND EXISTS (SELECT 1
where
EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
AND t.position_code IN ('012'))
......@@ -144,8 +144,8 @@
where t.journal_header_imp_id = t1.journal_header_id
) post_gl_status
FROM hls_journal_header_imp t1
where 1=1
AND EXISTS (SELECT 1
where
EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
AND t.position_code IN ('026'))
......@@ -191,8 +191,8 @@
where t.journal_header_imp_id = t1.journal_header_id
) post_gl_status
FROM hls_journal_header_imp t1
where 1=1
AND EXISTS (SELECT 1
where
EXISTS (SELECT 1
FROM exp_emp_assign_e_v t
WHERE t.user_id = ${/session/@user_id}
AND t.position_code IN ('017') or ${/session/@user_id} = 10418
......
src/main/webapp/WEB-INF/classes/hls/HLS536/insert_hls_journal_tmp.lwm
View file @ 1ae73ad0
......@@ -6,7 +6,7 @@
BEGIN
hls_journal_import_pkg.insert_hls_journal_tmp(p_user_id => ${/session/@user_id},
p_header_id => ${/model/header/record/@header_id},
p_header_id => ${@header_id},
p_company_id => ${/session/@company_id},
p_template_type=>${@template_type}
);
......
src/main/webapp/modules/efile/EFILE1010/voucher_ass_template.lview
View file @ 1ae73ad0
......@@ -132,8 +132,8 @@
</a:screenTopToolbar>
<a:grid id="je_template_ds_id" bindTarget="je_template_ds" height="300" width="380" navBar="true">
<a:columns>
<a:column name="je_template_code" editor="voucherconBasicClauseParaDs_grid_lov" prompt="凭证模板代码" width="170"/>
<a:column name="je_template_name" editor="voucher_text_ed" prompt="凭证模板描述" width="170"/>
<a:column name="je_template_code" editor="voucherconBasicClauseParaDs_grid_lov" prompt="凭证事务代码" width="170"/>
<a:column name="je_template_name" editor="voucher_text_ed" prompt="凭证事务描述" width="170"/>
</a:columns>
<a:editors>
<a:textField id="voucher_text_ed"/>
......
src/main/webapp/modules/efile/EFILE1030/efile_att_json_lov.lview
View file @ 1ae73ad0
......@@ -22,8 +22,13 @@
para.sql_content = sql_content;
}
//println(sql_content);
var obj;
var dataSet_id='att_json_ds';
var obj = JSON.parse(sql_content).attachmentList;
if(sql_content.length>2){
obj = JSON.parse(sql_content).attachmentList;
}else{
obj='';
}
var config = $config();
var dataSets = CompositeUtil.findChild(config, 'dataSets');
var dataSet = CompositeUtil.findChild(dataSets, 'dataSet', 'id', dataSet_id);
......@@ -42,6 +47,7 @@
// dataSets.addChild(dataSet.getData());
// var datas = newMap("datas");
// dataSet.addChild(datas.getData());
if(obj.length>0){
for (var k in obj) {
// if (obj[k] instanceof Object) {
var datasRecord = newMap("record");
......@@ -55,6 +61,10 @@
// println("2222"+obj[k].fieldCode);
//}
}
}else{
var datasRecord = newMap("record");
datas.addChild(datasRecord.getData());
}
......
src/main/webapp/modules/efile/EFILE1030/efile_post_stru_json_lov.lview
View file @ 1ae73ad0
......@@ -23,7 +23,11 @@
}
//println(sql_content);
var dataSet_id='post_stur_json_ds';
var obj = JSON.parse(sql_content).fieldValueList;
if(sql_content.length>2){
obj = JSON.parse(sql_content).fieldValueList;
}else{
obj='';
}
var config = $config();
var dataSets = CompositeUtil.findChild(config, 'dataSets');
var dataSet = CompositeUtil.findChild(dataSets, 'dataSet', 'id', dataSet_id);
......@@ -42,6 +46,7 @@
// dataSets.addChild(dataSet.getData());
// var datas = newMap("datas");
// dataSet.addChild(datas.getData());
if(obj.length>0){
for (var k in obj) {
// if (obj[k] instanceof Object) {
var datasRecord = newMap("record");
......@@ -54,6 +59,12 @@
//}
}
}else{
var datasRecord = newMap("record");
datas.addChild(datasRecord.getData());
}
]]></s:server-script>
......
src/main/webapp/modules/hls/HLS536/hls_journal_import_entrance.lview
View file @ 1ae73ad0
......@@ -177,7 +177,6 @@
//生成反冲数据，生成后数据可编辑
function hls536_journal_reverse(){
debugger;
var records = $('hls_journal_header_result_ds').getSelected();
if(records.length == 0){
Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录！');
......
src/main/webapp/modules/hls/HLS536/hls_journal_import_save.lsc 0 → 100644
View file @ 1ae73ad0
<?xml version="1.0" encoding="UTF-8"?>
<!--<a:service xmlns:a="http://www.leaf-framework.org/application" trace="true">-->
<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:p="uncertain.proc" trace="true">
<a:init-procedure>
<a:model-execute model="hls.HLS536.insert_hls_journal_tmp" trace="true"/>
</a:init-procedure>
<a:service-output output="/parameter"/>
</a:service>
src/main/webapp/modules/hls/HLS536/hls_journal_import_trans_upload.lview
View file @ 1ae73ad0
<?xml version="1.0" encoding="UTF-8"?>
<!--<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">-->
<a:screen xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
<a:init-procedure >
<!--<a:model-execute model="hls.HLS536.delete_hls_journal_tmp"/>-->
<a:model-query model="hls.HLS536.hls_journal_import_head_id" rootPath="header"/>
<a:import-excel header_id="${/model/header/record/@header_id}" attribute5="D:\u01\hls_journal,fnd_interface_headers,${/model/header/record/@header_id}" separator="," status_field="/parameter/@ImportSuccess" template_code="HLS_JOURNAL_IMPORT" user_id="${/session/@user_id}" />
<!--<a:import-excel header_id="${/session/@session_id}" attribute5="D:\u01,fnd_interface_headers,${/session/@session_id}" separator="," status_field="/parameter/@ImportSuccess" template_code="HLS_JOURNAL_IMPORT" user_id="${/session/@user_id}" />-->
<a:model-execute model="hls.HLS536.insert_hls_journal_tmp"/>
<!--<a:model-execute model="hls.HLS536.insert_hls_journal_tmp"/>-->
</a:init-procedure>
<a:view>
<a:link id="hls_journal_entrance_import_link" url="${/request/@context_path}/modules/hls/HLS536/hls_journal_import_entrance.lview"/>
<a:link id="import_save_data_link" url="${/request/@context_path}/modules/hls/HLS536/hls_journal_import_save.lsc"/>
<script type="text/javascript"><![CDATA[
function loadComplete() {
var param = {};
param['template_type'] = '${/parameter/@template_type}';
param['header_id'] = '${/model/header/record/@header_id}';
Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
Leaf.request({
url: $('import_save_data_link').getUrl(),
para: param,
success: function (res) {
Leaf.Masker.unmask(Ext.getBody());
Leaf.showInfoMessage('成功','导入成功!',function(){
window.location.href = $('hls_journal_entrance_import_link').getUrl();
});
},
failure: function (res) {
Leaf.Masker.unmask(Ext.getBody());
},
error: function (res) {
Leaf.Masker.unmask(Ext.getBody());
},
sync: true,
scope: this
});
}
loadComplete();
]]></script>
</a:view>
......
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