Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
leaf-hlcm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hlcm
leaf-hlcm
Commits
85e5f2d6
Commit
85e5f2d6
authored
Dec 13, 2019
by
stone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【fix】修改bug
parent
59f0c380
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
gld_je_transaction_for_lov.lwm
...WEB-INF/classes/gld/GLD104/gld_je_transaction_for_lov.lwm
+3
-0
zj_wfl_to_do_list_batch.lview
...ebapp/modules/zjwfl/WFL5120/zj_wfl_to_do_list_batch.lview
+16
-2
zj_wfl_approve.lview
src/main/webapp/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview
+1
-1
No files found.
src/main/webapp/WEB-INF/classes/gld/GLD104/gld_je_transaction_for_lov.lwm
View file @
85e5f2d6
...
@@ -14,4 +14,7 @@
...
@@ -14,4 +14,7 @@
<ns1:query-field
field=
"je_transaction_code"
queryOperator=
"like"
/>
<ns1:query-field
field=
"je_transaction_code"
queryOperator=
"like"
/>
<ns1:query-field
field=
"je_transaction_desc"
queryOperator=
"like"
/>
<ns1:query-field
field=
"je_transaction_desc"
queryOperator=
"like"
/>
</ns1:query-fields>
</ns1:query-fields>
<ns1:data-filters>
<ns1:data-filter
name=
"enabled_flag"
enforceOperations=
"query"
expression=
"enabled_flag='Y'"
/>
</ns1:data-filters>
</ns1:model>
</ns1:model>
src/main/webapp/modules/zjwfl/WFL5120/zj_wfl_to_do_list_batch.lview
View file @
85e5f2d6
...
@@ -136,6 +136,7 @@
...
@@ -136,6 +136,7 @@
function batch_approved() {
function batch_approved() {
var records = $('zjwfl5110_toDoDs').getAll();
var records = $('zjwfl5110_toDoDs').getAll();
var comment_test = $('comment_text_cmp').value;
var comment_test = $('comment_text_cmp').value;
var params = [];
var params = [];
for(var i=0;i
<records.length
;i++){
for(var i=0;i
<records.length
;i++){
if
(records[i].get('checked')
=='Y'&&records[i].get('record_id')){
if
(records[i].get('checked')
=='Y'&&records[i].get('record_id')){
...
@@ -151,6 +152,10 @@
...
@@ -151,6 +152,10 @@
if
(params.length
<
1)
{
if
(params.length
<
1)
{
Leaf.showMessage('提示','请至少选择一条待办进行审批');
Leaf.showMessage('提示','请至少选择一条待办进行审批');
return
false;
return
false;
}
if(!comment_test){
$L.showErrorMessage("提示",'请输入审批意见!');
return;
}
}
var
detail_mask =
Ext.getBody();
var
detail_mask =
Ext.getBody();
Leaf.showConfirm('提示','是否确认审批同意',function(){
Leaf.showConfirm('提示','是否确认审批同意',function(){
...
@@ -181,6 +186,7 @@
...
@@ -181,6 +186,7 @@
function
batch_refused()
{
function
batch_refused()
{
var
records =
$('zjwfl5110_toDoDs').getAll();
var
records =
$('zjwfl5110_toDoDs').getAll();
var
comment_test =
$('comment_text_cmp').value;
var
comment_test =
$('comment_text_cmp').value;
var
params =
[];
var
params =
[];
for(var
i=
0;i<records.length;i++){
for(var
i=
0;i<records.length;i++){
if
(records[i].get('checked')
=='Y'&&records[i].get('record_id')){
if
(records[i].get('checked')
=='Y'&&records[i].get('record_id')){
...
@@ -196,6 +202,10 @@
...
@@ -196,6 +202,10 @@
if
(params.length
<
1)
{
if
(params.length
<
1)
{
Leaf.showMessage('提示','请至少选择一条待办进行审批');
Leaf.showMessage('提示','请至少选择一条待办进行审批');
return
false;
return
false;
}
if(!comment_test){
$L.showErrorMessage("提示",'请输入审批意见!');
return;
}
}
var
detail_mask =
Ext.getBody();
var
detail_mask =
Ext.getBody();
Leaf.showConfirm('提示','是否确认审批拒绝',function(){
Leaf.showConfirm('提示','是否确认审批拒绝',function(){
...
@@ -223,7 +233,11 @@
...
@@ -223,7 +233,11 @@
}
}
]]
></script>
]]
></script>
<a:dataSets>
<a:dataSets>
<a:dataSet
id=
"wfl_approve_context"
autoCreate=
"true"
/>
<a:dataSet
id=
"wfl_approve_context"
autoCreate=
"true"
>
<a:fields>
<a:field
name=
"comment_text"
required=
"true"
/>
</a:fields>
</a:dataSet>
<a:dataSet
id=
"zj_wfl_document_number_ds"
autoCreate=
"true"
>
<a:dataSet
id=
"zj_wfl_document_number_ds"
autoCreate=
"true"
>
<a:fields>
<a:fields>
<a:field
name=
"any_info"
/>
<a:field
name=
"any_info"
/>
...
@@ -307,7 +321,7 @@
...
@@ -307,7 +321,7 @@
</a:hBox>
</a:hBox>
</div>
</div>
<div
style=
"margin-left:10px;"
>
<div
style=
"margin-left:10px;"
>
<a:treeGrid
id=
"zjwfl5110_result_tree"
bindTarget=
"zjwfl5110_toDoDs"
expandField=
"expand_flag"
idField=
"child_workflow_desc"
marginHeight=
"
270"
marginWidth=
"80"
navBar=
"true"
parentField=
"workflow_desc"
sequenceField=
"order_seq"
showCheckBox=
"true
"
>
<a:treeGrid
id=
"zjwfl5110_result_tree"
bindTarget=
"zjwfl5110_toDoDs"
expandField=
"expand_flag"
idField=
"child_workflow_desc"
marginHeight=
"
550"
marginWidth=
"80"
navBar=
"true"
parentField=
"workflow_desc"
sequenceField=
"order_seq"
showCheckBox=
"true"
height=
"400
"
>
<a:columns>
<a:columns>
<a:column
name=
"child_workflow_desc"
prompt=
"工作流"
/>
<a:column
name=
"child_workflow_desc"
prompt=
"工作流"
/>
<a:column
name=
"workflow_info"
prompt=
"工作流名称"
renderer=
"render_zjwfl5110_toDoDs_table"
/>
<a:column
name=
"workflow_info"
prompt=
"工作流名称"
renderer=
"render_zjwfl5110_toDoDs_table"
/>
...
...
src/main/webapp/modules/zjwfl/ZJWFL5110/zj_wfl_approve.lview
View file @
85e5f2d6
...
@@ -267,7 +267,7 @@
...
@@ -267,7 +267,7 @@
</a:dataSet>
</a:dataSet>
<a:dataSet
id=
"comment_text_ds"
autoCreate=
"true"
>
<a:dataSet
id=
"comment_text_ds"
autoCreate=
"true"
>
<a:fields>
<a:fields>
<a:field
name=
"comment_text"
/>
<a:field
name=
"comment_text"
required=
"true"
/>
</a:fields>
</a:fields>
<a:events>
<a:events>
<a:event
name=
"add"
handler=
"comment_text_ds_add"
/>
<a:event
name=
"add"
handler=
"comment_text_ds_add"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment