手工凭证导入页面增加查询条件

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

@@ -195,5 +195,7 @@
          <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="description" queryExpression="t1.description like ${@description}"/>
+          <bm:query-field name="wfl_status" queryExpression="t1.wfl_status=${@wfl_status}"/>
       </bm:query-fields>
 </bm:model>

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

@@ -280,10 +280,10 @@
          ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
         <a:dataSets>
-            <a:dataSet id="hls301_yes_no_ds" lookupCode="YES_NO"/>
-            <a:dataSet id="hls_document_type_ds">
+            <a:dataSet id="hls536_wfl_status_ds" lookupCode="HLS536_WFL_STATUS"/>
+            <!--<a:dataSet id="hls_document_type_ds">
                 <a:datas dataSource="/model/hls_document_type_path"/>
-            </a:dataSet>
+            </a:dataSet>-->
              <a:dataSet id="hls_journal_header_query">
                 <a:fields>
                     <a:field name="contract_number"/>
@@ -295,14 +295,14 @@
                     <a:field name="total_amount_dr_to"/>
                     <a:field name="period_name"/>
                     <a:field name="external_journal_num"/>
-                    <a:field name="bp_id_tenant"/>
+                    <!--
                     <a:field name="bp_id_tenant_desc" lovGridHeight="400" lovHeight="550" lovService="hls.HLS301.hls_bp_master_v_for_lov" lovWidth="500">
                         <a:mapping>
                             <a:map from="bp_name" to="bp_id_tenant_desc"/>
                             <a:map from="bp_id" to="bp_id_tenant"/>
                         </a:mapping>
-                    </a:field>
-                    <a:field name="source_table"/>
+                    </a:field>-->
+                    <!--<a:field name="source_table"/>
                     <a:field name="reference1"/>
                     <a:field name="je_transaction_code"/>
                     <a:field name="je_transaction_desc" lovGridHeight="420" lovHeight="550" lovPageSize="20" lovService="gld.GLD104.gld_je_transaction_for_lov" lovWidth="500">
@@ -323,8 +323,8 @@
                             <a:map from="responsibility_center_code" to="responsibility_center_code_to"/>
                             <a:map from="responsibility_center_name" to="responsibility_center_name_to"/>
                         </a:mapping>
-                    </a:field>
-                    <a:field name="account_code_from" autoComplete="true" lovHeight="500" lovLabelWidth="100" lovService="hls.HLS301.hls_journal_account_for_lov" lovWidth="500" title="HLS530.ACCOUNT_NAME">
+                    </a:field>-->
+                    <!--<a:field name="account_code_from" autoComplete="true" lovHeight="500" lovLabelWidth="100" lovService="hls.HLS301.hls_journal_account_for_lov" lovWidth="500" title="HLS530.ACCOUNT_NAME">
                         <a:mapping>
                             <a:map from="account_code" to="account_code_from"/>
                             <a:map from="description" to="account_name_from"/>
@@ -335,21 +335,22 @@
                             <a:map from="account_code" to="account_code_to"/>
                             <a:map from="description" to="account_name_to"/>
                         </a:mapping>
-                    </a:field>
-                    <a:field name="company_short_name" lovHeight="500" lovLabelWidth="100" lovService="fnd.fnd_companies_lov" lovWidth="550" title="HLS530.JOURNAL_COMPANY">
+                    </a:field>-->
+                    <!--<a:field name="company_short_name" lovHeight="500" lovLabelWidth="100" lovService="fnd.fnd_companies_lov" lovWidth="550" title="HLS530.JOURNAL_COMPANY">
                         <a:mapping>
                             <a:map from="company_id" to="je_company_id"/>
                             <a:map from="company_short_name" to="company_short_name"/>
                         </a:mapping>
-                    </a:field>
-                    <a:field name="currency_code" lovHeight="500" lovLabelWidth="100" lovService="basic.gld_currency_v_lov" lovWidth="550">
+                    </a:field>-->
+                    <!--<a:field name="currency_code" lovHeight="500" lovLabelWidth="100" lovService="basic.gld_currency_v_lov" lovWidth="550">
                         <a:mapping>
                             <a:map from="currency_code" to="currency_code"/>
                             <a:map from="currency_name" to="currency_name"/>
                         </a:mapping>
-                    </a:field>
-                    <a:field name="merge_parent_flag_desc" defaultValue="否" displayField="code_value_name" options="hls301_yes_no_ds" returnField="merge_parent_flag" valueField="code_value"/>
-                    <a:field name="merge_parent_flag" defaultValue="N"/>
+                    </a:field>-->
+                    <a:field name="description"/>
+                    <a:field name="wfl_status_n" displayField="code_value_name" options="hls536_wfl_status_ds" returnField="wfl_status" valueField="code_value"/>
+                    <a:field name="wfl_status" />
                 </a:fields>
              </a:dataSet>
             <a:dataSet id="hls_journal_header_result_ds" autoPageSize="true" autoQuery="true" model="hls.HLS536.hls_journal_import_header" queryDataSet="hls_journal_header_query"  selectable="true">
@@ -368,16 +369,13 @@
                </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: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: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:textField name="description" bindTarget="hls_journal_header_query" prompt="凭证摘要"/>
+                <a:comboBox name="wfl_status_n" 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"/>