茂甲起租付款流程合并

src/main/webapp/WEB-INF/classes/sys/sys_page_menu.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: DJ
+    $Date: 2013-4-14 下午02:19:46
+    $Revision: 1.0
+    $Purpose:
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                SELECT
+                    v.function_id,
+                    v.function_code,
+                    v.function_name,
+                    v.menu_id,
+                    v.parent_menu_id,
+                    case when v.menu_type = 'MENU' then
+                    (case   when (select count(*) from sys_role_module_home_page srmw where srmw.function_group_id = v.function_id and srmw.role_id = v.role_id and srmw.subject = ${/session/@subject}) > 0 then 'role_module'
+                            when (select count(*) from sys_module_home_page smhp where smhp.function_group_id = v.function_id and smhp.subject = ${/session/@subject}) > 0 then 'module'
+                            else 'none' end
+                    )else 'none' end module_flag,
+                    (select nvl(sum(1),0) from sys_role_menu_v v1 where v1.parent_menu_id=v.menu_id) sub_menu_count
+                FROM
+                    sys_role_menu_v v #WHERE_CLAUSE#
+                ORDER BY
+                    v.layout_sequence
+            ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:data-filters>
+        <bm:data-filter enforceOperations="query" expression="v.role_id=${/session/@role_id}"/>
+        <bm:data-filter enforceOperations="query" expression="((not exists (select 1 from sys_role_user_function f where f.role_id = v.role_id and f.function_id = v.function_id)) or (exists  (select 1 from sys_role_user_function f where f.role_id = v.role_id and f.user_id = ${/session/@user_id} and f.function_id = v.function_id)))"/>
+        <!--<bm:data-filter enforceOperations="query" expression="((v.function_code != 'CON3200') or(v.function_code = 'CON3200' AND ((v.role_code not in ('0018', '0019')) or  (v.role_code in ('0018', '0019') and exists  (select 1  from sys_user u, sys_user_role_groups r  where u.user_id = r.user_id  and r.role_id = v.role_id  AND u.user_id = ${/session/@user_id}  and u.user_name in ('MJ001', 'MJ002'))))))"/>
+    -->
+    </bm:data-filters>
+</bm:model>

src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview

@@ -153,6 +153,12 @@
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT_prompt').style.display = 'none';
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_1_CON_CONTRACT_DEDUCTION_LIMIT').style.display = 'none';
                 }
+                if('${/parameter/@layout_code}' == "CONTRACT_CREATE_INC" && record.get('division') == '70'){
+                    if(Ext.isEmpty(record.get('guarantee_letter_f'))){
+                        record.set('guarantee_letter_f','N');
+                        record.set('guarantee_letter_f_n','否');
+                    }
+                }
             }
 
         };
@@ -711,7 +717,6 @@
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
             var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'con_contract_lease_item');
             if(ds.id == lease_item_ds_id&&lease_item_ds_id){
-                debugger;
                 var gridId= ds.bindname+'_layout_grid_id';
                 if(record.data.division=='70'){
                     $(gridId).hideColumn('full_name');
@@ -753,6 +758,7 @@
             }
         };
 
+
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>

src/main/webapp/modules/csh/CSH501/csh_payment_req.lview

@@ -387,7 +387,7 @@
                     },
                     success: function (res) {
                         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                        if (res.result.record.submitted_flag == 'Y') {
+                        if (res.result.record.submitted_flag == 'Y' && '${/parameter/@source_type}' != 'WFL_Y') {
                             Leaf.showMessage('${l:PROMPT}', '该单据已经提交');
                             check_flag = false;
                         } else {