合同取消工作流功能优化

src/main/webapp/WEB-INF/classes/cont/CON542/con_contract_closed.lwm

@@ -12,10 +12,12 @@
                 begin
 
                 con_contract_cancle_pkg.contract_colsed_submit(p_contract_id =>${@contract_id},
+                p_contract_status =>${@contract_status},
                 p_user_id =>${/session/@user_id},
                 p_role_id =>${/session/@role_id});
                 end;
-            ]]></bm:update-sql>
+                ]]>
+            </bm:update-sql>
         </bm:operation>
 
         <bm:operation name="execute">
@@ -23,6 +25,7 @@
                 begin
 
                 con_contract_cancle_pkg.contract_colsed_submit(p_contract_id =>${@contract_id},
+                p_contract_status=>${@contract_status},
                 p_user_id =>${/session/@user_id},
                 p_role_id =>${/session/@role_id});
                 end;

src/main/webapp/WEB-INF/classes/cont/CON542/con_contract_for_query.lwm

@@ -55,7 +55,8 @@
         <bm:field name="bp_id_agent_level1_n"/>
         <bm:field name="project_status"/>
         <bm:field name="is_constru_unit"/>
-        <bm:field name="sale_con_ele_flag"/>
+        <bm:field name="sign_type"/>
+        <bm:field name="sign_type_n"/>
     </bm:fields>
     <bm:primary-key>
         <bm:pk-field name="contract_id"/>
@@ -78,17 +79,18 @@
         <bm:query-field field="contract_status" queryOperator="="/>
     </bm:query-fields>
     <bm:data-filters>
-        <bm:data-filter name="query" expression=" ((((t1.sign_contract_status = 'NEW' AND t1.contract_status = 'NEW') OR
+        <bm:data-filter name="query" expression="((((t1.sign_contract_status = 'NEW' AND t1.contract_status = 'NEW') OR
        (t1.sign_contract_status = 'SIGN_RETURN' AND
        t1.contract_status = 'NEW') OR
        (t1.sign_contract_status = 'SIGN_RETURN' AND
-        t1.contract_status = 'INCEPT_RETURN')OR
+       t1.contract_status = 'INCEPT_RETURN') OR
+       (t1.sign_contract_status = 'SIGN' AND t1.contract_status = 'NEW') OR
        (t1.sign_contract_status = 'SIGN' AND
-        t1.contract_status = 'NEW') OR
-        (t1.sign_contract_status = 'SIGN' AND
-        t1.contract_status = 'INCEPT_RETURN'))
-         and nvl(t1.sign_type,'PAPER_SIGN')='PAPER_SIGN') OR
-        (t1.sign_contract_status = 'NEW' AND t1.contract_status = 'NEW'
-        and nvl(t1.sign_type,'PAPER_SIGN')='ELE_SIGN'))"/>
+       t1.contract_status = 'INCEPT_RETURN')) and
+       nvl(t1.sign_type, 'PAPER_SIGN') = 'PAPER_SIGN') OR
+       (t1.sign_contract_status = 'NEW' AND t1.contract_status = 'NEW' and
+       nvl(t1.sign_type, 'PAPER_SIGN') = 'ELE_SIGN') OR
+       t1.sign_type = 'ELE_SIGN' and t1.sign_contract_status = 'SIGN' and
+       (t1.contract_status = 'NEW' or t1.contract_status = 'INCEPT_RETURN'))"/>
     </bm:data-filters>
 </bm:model>

src/main/webapp/modules/cont/CON542/con_contract_closed.lview

@@ -116,7 +116,7 @@
             var ds = records[0].data;
 
             cancelData.push(records[0].data);
-            if(ds.sale_con_ele_flag != 'Y'){
+            if(ds.sign_type != 'ELE_SIGN'){
                 Leaf.showConfirm('${l:PROMPT}', '您确认要提交合同取消申请?', function() {
                     Leaf.request({
                         url: $('con_contract_closed_link').getUrl(),
@@ -137,7 +137,8 @@
                         Leaf.request({
                             url: $('contract_colsed_submit_link').getUrl(),
                             para: {
-                                contract_id: ds.contract_id
+                                contract_id: ds.contract_id,
+                                contract_status: ds.contract_status
                             },
                             success: function() {
                                 Leaf.SideBar.show({
@@ -257,6 +258,7 @@
                     <!--<a:column name="down_payment" align="right" footerRenderer="summaryRenderer" prompt="首付款" renderer="Leaf.formatMoney" width="120"/>-->
                     <a:column name="contract_status_n" prompt="合同状态" align="center"/>
                     <a:column name="sign_contract_status_n" prompt="签约状态" align="center"/>
+<!--                    <a:column name="sign_type_n" prompt="区分非/电子" align="center"/>-->
                 </a:columns>
             </a:grid>
         </a:screenBody>

src/main/webapp/modules/cont/CON542/con_contract_closed_wfl.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+
+    <a:view>
+        <script><![CDATA[
+
+        ]]></script>
+        <a:screen-include screen="modules/COMMON/LAYOUT/hls_common_get_layout_code.lview"/>
+    </a:view>
+</a:screen>