Commit 85e5f2d6 authored by stone's avatar stone

【fix】修改bug

parent 59f0c380
......@@ -14,4 +14,7 @@
<ns1:query-field field="je_transaction_code" queryOperator="like"/>
<ns1:query-field field="je_transaction_desc" queryOperator="like"/>
</ns1:query-fields>
<ns1:data-filters>
<ns1:data-filter name="enabled_flag" enforceOperations="query" expression="enabled_flag=&apos;Y&apos;"/>
</ns1:data-filters>
</ns1:model>
......@@ -136,6 +136,7 @@
function batch_approved() {
var records = $('zjwfl5110_toDoDs').getAll();
var comment_test = $('comment_text_cmp').value;
var params = [];
for(var i=0;i<records.length;i++){
if (records[i].get('checked') =='Y'&&records[i].get('record_id')){
......@@ -151,6 +152,10 @@
if (params.length < 1) {
Leaf.showMessage('提示','请至少选择一条待办进行审批');
return false;
}
if(!comment_test){
$L.showErrorMessage("提示",'请输入审批意见!');
return;
}
var detail_mask = Ext.getBody();
Leaf.showConfirm('提示','是否确认审批同意',function(){
......@@ -181,6 +186,7 @@
function batch_refused() {
var records = $('zjwfl5110_toDoDs').getAll();
var comment_test = $('comment_text_cmp').value;
var params = [];
for(var i=0;i<records.length;i++){
if (records[i].get('checked') =='Y'&&records[i].get('record_id')){
......@@ -196,6 +202,10 @@
if (params.length < 1) {
Leaf.showMessage('提示','请至少选择一条待办进行审批');
return false;
}
if(!comment_test){
$L.showErrorMessage("提示",'请输入审批意见!');
return;
}
var detail_mask = Ext.getBody();
Leaf.showConfirm('提示','是否确认审批拒绝',function(){
......@@ -223,7 +233,11 @@
}
]]></script>
<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:fields>
<a:field name="any_info"/>
......@@ -307,7 +321,7 @@
</a:hBox>
</div>
<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:column name="child_workflow_desc" prompt="工作流"/>
<a:column name="workflow_info" prompt="工作流名称" renderer="render_zjwfl5110_toDoDs_table"/>
......
......@@ -267,7 +267,7 @@
</a:dataSet>
<a:dataSet id="comment_text_ds" autoCreate="true">
<a:fields>
<a:field name="comment_text"/>
<a:field name="comment_text" required="true"/>
</a:fields>
<a:events>
<a:event name="add" handler="comment_text_ds_add"/>
......
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