[fix]修改bug

src/main/webapp/modules/cont/CON311/con_re_print_entrance.lview

@@ -6,6 +6,9 @@
     $Purpose: 合同维护入口界面
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:init-procedure>
+        <a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
+    </a:init-procedure>
     <a:view>
         <a:link id="con311_create_entrusts_link" model="cont.CON311.create_entrusts" modelaction="execute"/>
         <a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}zj_wfl_approve_history_check" url="${/request/@context_path}/modules/zjwfl/zj_wfl_approve_history_check.lview"/>
@@ -18,6 +21,21 @@
         <a:link id="con_lease_org_print_link"
                 url="${/request/@context_path}/modules/cont/CON620/create_content_for_collection.lsc"/>
         <script type="text/javascript"><![CDATA[
+
+        Leaf.onReady(function() {
+            if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") {
+                // document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM_prompt").style.display = "";
+                // document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM").style.display = "";
+                document.getElementById("CONTRACT_PRINT_ENTRANCE_F_QUERY_NULL_BP_ID_AGENT_LEVEL1_prompt").style.display = "";
+                document.getElementById("CONTRACT_PRINT_ENTRANCE_F_QUERY_NULL_BP_ID_AGENT_LEVEL1").style.display = "";
+            } else {
+                // document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM_prompt").style.display = "none";
+                // document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM").style.display = "none";
+                document.getElementById("CONTRACT_PRINT_ENTRANCE_F_QUERY_NULL_BP_ID_AGENT_LEVEL1_prompt").style.display = "none";
+                document.getElementById("CONTRACT_PRINT_ENTRANCE_F_QUERY_NULL_BP_ID_AGENT_LEVEL1").style.display = "none";
+            }
+
+        });
             function open_contract_win(ds_id, record_id) {
                 var record = $(ds_id).findById(record_id);
                 var param = record.data;

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

@@ -6,6 +6,9 @@
     $Purpose: 合同维护入口界面
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+    <a:init-procedure>
+        <a:model-query model="cont.CON620.get_sys_role" rootPath="role_info"/>
+    </a:init-procedure>
     <a:view>
         <a:link id="con311_create_entrusts_link" model="cont.CON311.create_entrusts" modelaction="execute"/>
         <a:link id="${/parameter/@layout_code}${/parameter/@pre_layout}zj_wfl_approve_history_check" url="${/request/@context_path}/modules/zjwfl/zj_wfl_approve_history_check.lview"/>
@@ -15,6 +18,21 @@
                 url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_modify.lview"/>
         <a:link id="car_modify_special_link" url="${/request/@context_path}/modules/prj/PRJ501N/prj_project_maintain.lview"/>
         <script type="text/javascript"><![CDATA[
+
+        Leaf.onReady(function() {
+            if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") {
+                // document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM_prompt").style.display = "";
+                // document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM").style.display = "";
+                document.getElementById("CONTRACT_INCEPT_ENTRANCE_F_QUERY_NULL_BP_ID_AGENT_LEVEL1_prompt").style.display = "";
+                document.getElementById("CONTRACT_INCEPT_ENTRANCE_F_QUERY_NULL_BP_ID_AGENT_LEVEL1").style.display = "";
+            } else {
+                // document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM_prompt").style.display = "none";
+                // document.getElementById("CONTRACT_QUERY_ENTRANCE_F_QUERY_NULL_AGENT_EXTRA_NAM").style.display = "none";
+                document.getElementById("CONTRACT_INCEPT_ENTRANCE_F_QUERY_NULL_BP_ID_AGENT_LEVEL1_prompt").style.display = "none";
+                document.getElementById("CONTRACT_INCEPT_ENTRANCE_F_QUERY_NULL_BP_ID_AGENT_LEVEL1").style.display = "none";
+            }
+
+        });
             function open_contract_win(ds_id, record_id) {
                 var record = $(ds_id).findById(record_id);
                 var param = record.data;

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

@@ -52,8 +52,7 @@
                         return;
                     }
                 //暂时去掉
-                debugger
-                if(a[i].get('billing_status_n')!='已开票' ||a[i].get('invoice_status_n')!='发票已确认'){
+                if(a[i].get('billing_status_n')!='已开票' ||a[i].get('invoice_status_n')!='已确认'){
                     $L.showErrorMessage("提示",'请选择开票状态为已开票，发票状态为已确认的现金流！');
                     return;
                 }