Merge branch 'feature/con_contract_finish_maintain' into develop

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_finish_for_query.lwm

@@ -58,7 +58,7 @@
         <bm:query-field field="bp_id_agent_desc" queryExpression="bp_id_agent_desc like upper(&apos;%&apos;||${@bp_id_agent_desc}||&apos;%&apos;)"/>
     </bm:query-fields>
     <bm:data-filters>
-        <bm:data-filter enforceOperations="query" expression="t1.contract_status in (&apos;INCEPT&apos;,&apos;ETING&apos;,&apos;ADING&apos;) "/>
+        <bm:data-filter enforceOperations="query" expression="t1.contract_status in (&apos;TERMINATE&apos;) "/>
         <!--         <bm:data-filter enforceOperations="query" expression="t1.lease_end_date &lt;= sysdate"/> -->
         <bm:data-filter enforceOperations="query" expression="t1.data_class = &apos;NORMAL&apos;"/>
         <!--<bm:data-filter enforceOperations="query" expression=" NOT EXISTS (SELECT 1                 FROM con_contract_cashflow                WHERE contract_id = t1.contract_id                      AND cf_item IN (1,8,52)  AND (write_off_flag IN (&apos;PARTIAL&apos;, &apos;NOT&apos;) OR received_amount != due_amount))"/>-->

src/main/webapp/modules/cont/CON500/con_contract_update.lview

@@ -5,17 +5,17 @@
     $Revision: 1.0
     $Purpose:
 -->
-<a:screen xmlns:c="leaf.application.action" xmlns:p="uncertain.proc" xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" cacheEnabled="true" cacheKey="${/parameter/@layout_code}_screen" customizationEnabled="true" trace="true">
+<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:c="leaf.application.action" xmlns:p="uncertain.proc" xmlns:s="leaf.plugin.script" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
     <a:init-procedure>
-        <!-- <s:server-script import="aut_authority_validate.js"/> -->
+<!--        <s:server-script import="aut_authority_validate.js"/>-->
         <a:model-query fetchAll="true" model="hls.HLS030.hls_doc_layout_main" rootPath="layout_main_path"/>
           <a:model-query fetchAll="true" model="cont.CON500.hls_doc_layout_button" rootPath="layout_main_button_path"/>
           <a:model-query defaultWhereClause="t1.parent_table is null and t1.tab_type!=&apos;TAB&apos; and t1.enabled_flag=&apos;Y&apos; and rownum=1" fetchAll="true" model="cont.CON500.con_hls_doc_layout_tab_query" rootPath="base_table_path"/>
-        <!-- <s:server-script><![CDATA[
-        	var m=$ctx.get('/model/layout_main_button_path');
-        	println(m.toXML());
-        	println('**************');
-        ]]></s:server-script> -->
+<!--        <s:server-script><![CDATA[-->
+<!--        	var m=$ctx.get('/model/layout_main_button_path');-->
+<!--        	println(m.toXML());-->
+<!--        	println('**************');-->
+<!--        ]]></s:server-script>-->
     </a:init-procedure>
     <a:view>
         <script type="text/javascript"><![CDATA[
@@ -25,14 +25,14 @@
                  if ('${/parameter/@winid}') {
                      if (parent.$L.CmpManager.get('${/parameter/@winid}')) {
                          detail_mask = parent.$('${/parameter/@winid}').wrap;
-                        parent.Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
+                         // parent.Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
                      } else {
                          detail_mask = $('${/parameter/@winid}').wrap;
-                        Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
+                         // Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
                      }
                  } else {
                      detail_mask = Ext.getBody();
-                    Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
+                     // Leaf.Masker.mask(detail_mask, '${l:HLS.LOADING}');
                  }
              }