凭证导入工作流开发3 add by HuTianzhi 39135

src/main/webapp/WEB-INF/classes/hls/HLS536/hls_journal_import_header.lwm

@@ -42,5 +42,6 @@
          <bm:query-field name="journal_date_to" queryExpression="t1.journal_date &lt;= to_date(${@journal_date_to},'yyyy-mm-dd')"/>
          <bm:query-field name="total_amount_dr_from" datatype="java.lang.Double" queryExpression="nvl(t1.total_amount_dr,t1.total_amount_cr) &gt;= ${@total_amount_dr_from}"/>
          <bm:query-field name="total_amount_dr_to" datatype="java.lang.Double" queryExpression="nvl(t1.total_amount_dr,t1.total_amount_cr) &lt;= ${@total_amount_dr_to}"/>
+        <bm:query-field name="journal_submit_batch_id" queryExpression="t1.journal_submit_batch_id = ${@journal_submit_batch_id}"/>
       </bm:query-fields>
 </bm:model>

src/main/webapp/modules/hls/HLS536/hls_journal_import_entrance.lview

@@ -98,6 +98,14 @@
                 Leaf.showMessage('${l:PROMPT}', '未选择！');
                 return ;
             }
+            //审批中、审批通过的单据不可提交审批
+            for (let i = 0; i < records.length; i++) {
+                var record = records[i];
+                if (record.get('wfl_status') === 'APPROVING' || record.get('wfl_status') !== 'APPROVED') {
+                    Leaf.showMessage('提示', '审批中、审批通过的凭证不可提交审批!');
+                    return;
+                }
+            }
 
             var journal_header_imp_list = [];
 
@@ -142,6 +150,8 @@
                         success: function (res) {
                             Leaf.Masker.unmask(Ext.getBody());
                             Leaf.showMessage('提示', '提交审批成功!');
+                        //    审批成功后查询gird
+                            hls536_journal_query();
                         },
                         failure: function () {
                             Leaf.Masker.unmask(Ext.getBody());

src/main/webapp/modules/hls/HLS536/hls_journal_import_wfl.lview

@@ -15,9 +15,13 @@
 
 
          <script><![CDATA[
+         Leaf.onReady(function () {
+             $('hls_journal_header_result_ds').setQueryParameter('journal_submit_batch_id','${/parameter/@journal_submit_batch_id}');
+         })
         //查询按钮
 
         function hls536_journal_query() {
+            $('hls_journal_header_result_ds').setQueryParameter('journal_submit_batch_id','${/parameter/@journal_submit_batch_id}');
             $('hls_journal_header_result_ds').query();
         }
         //重置按钮
@@ -136,16 +140,16 @@
             </a:screenTopToolbar>
             <a:form column="5" labelSeparator=" " labelWidth="100" marginWidth="40" title="HAP_QUERY_TITLE">
                 <a:textField name="journal_num" bindTarget="hls_journal_header_query" prompt="凭证编号"/>
-                <a:comboBox name="merge_parent_flag_desc" bindTarget="hls_journal_header_query" prompt="合并凭证"/>
+                <!--<a:comboBox name="merge_parent_flag_desc" bindTarget="hls_journal_header_query" prompt="合并凭证"/>-->
                 <a:datePicker name="journal_date_from" bindTarget="hls_journal_header_query" prompt="凭证日期从"/>
                 <a:datePicker name="journal_date_to" bindTarget="hls_journal_header_query" prompt="凭证日期到"/>
-                <a:lov name="company_short_name" bindTarget="hls_journal_header_query" prompt="记账公司"/>
+                <!--<a:lov name="company_short_name" bindTarget="hls_journal_header_query" prompt="记账公司"/>-->
                 <a:numberField name="total_amount_dr_from" allowFormat="true" bindTarget="hls_journal_header_query" prompt="金额从"/>
                 <a:numberField name="total_amount_dr_to" allowFormat="true" bindTarget="hls_journal_header_query" prompt="金额到"/>
-                <a:lov name="je_transaction_desc" bindTarget="hls_journal_header_query" prompt="凭证来源"/>
-               <!-- <a:lov name="bp_id_tenant_desc" bindTarget="hls_journal_header_query" prompt="商业伙伴"/>
-                 <a:textField name="contract_number" bindTarget="hls_journal_header_query" prompt="合同编号"/>-->
-               </a:form>
+                <!--<a:lov name="je_transaction_desc" bindTarget="hls_journal_header_query" prompt="凭证来源"/>-->
+                <!-- <a:lov name="bp_id_tenant_desc" bindTarget="hls_journal_header_query" prompt="商业伙伴"/>
+                  <a:textField name="contract_number" bindTarget="hls_journal_header_query" prompt="合同编号"/>-->
+            </a:form>
             <a:grid id="hls_journal_headers_grid" bindTarget="hls_journal_header_result_ds" marginHeight="250" marginWidth="40" navBar="true">
                 <a:columns>
                     <a:column name="journal_num" lock="true" prompt="凭证编号" renderer="hls536_journal_num_render" width="120"/>