[refactor]反冲相关、代理店管理标题

src/main/webapp/WEB-INF/classes/csh/CSH514/csh_write_off.lwm

@@ -5,7 +5,7 @@
     $Revision: 1.0  
     $Purpose: 
 -->
-<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CSH_WRITE_OFF" defaultOrderBy="t1.write_off_id desc">
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="CSH_WRITE_OFF" defaultOrderBy="t1.write_off_id">
     <bm:fields>
         <bm:field name="write_off_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="WRITE_OFF_ID" prompt="CSH_WRITE_OFF.WRITE_OFF_ID"/>
         <bm:field name="write_off_type" databaseType="VARCHAR2" datatype="java.lang.String" lookupCode="CSH513_WRITE_OFF_TYPE" lookupField="write_off_type_name" physicalName="WRITE_OFF_TYPE" prompt="CSH_WRITE_OFF.WRITE_OFF_TYPE"/>

src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm

@@ -10,6 +10,7 @@
 	            		 t1.contract_number,
 			             t1.contract_name,
 			             t1.bp_id_tenant,
+			             t1.bp_id_agent_level1,
 			             (select bp_name from hls_bp_master where bp_id = t1.bp_id_tenant) bp_name,
 			             (SELECT sc.code_value_name
                             FROM sys_code_values_v sc
@@ -52,7 +53,7 @@ select t.parent_company_id company_id
                         queryExpression="due_date <= to_date(${@due_date_to},'yyyy-mm-dd')"/>
         <bm:query-field field="dd_bank_account_num" queryOperator="="/>
         <bm:query-field field="dd_bank_account_name" queryOperator="="/>
-        <bm:query-field name="bp_id" queryExpression="t.bp_id_tenant = ${@bp_id}"/>
+        <bm:query-field name="bp_id" queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id})"/>
         <bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview

@@ -126,6 +126,11 @@
                         }
                     }
 
+                    //排序
+                    saveData.sort(function(a,b){
+                        return b.write_off_id - a.write_off_id;
+                    });
+
                     //区别批量核销和单笔核销
                     var url;
                     // if ('${/parameter/@ref_n01}' && '${/parameter/@ref_n01}' != 'undefined') {

src/main/webapp/modules/hls/HLS303/bp_agent_entrance.lview

@@ -34,8 +34,8 @@
             param['maintain_type'] = 'MODIFY';
             param['cdd_list_id'] = record.get('cdd_list_id');
             param['dsid'] = 'bp_agent_grid_result_ds';
-            param['url_title'] = '代理商准入';
-            param['bp_id'] = record.get('bp_id')
+            param['url_title'] = '代理店管理';
+            param['bp_id'] = record.get('bp_id');
             // Leaf.request({
             //     url: $('first_add_agent_link_id').getUrl(),
             //     para: {
@@ -75,7 +75,7 @@
             param['function_code'] = 'HLS303F';
             param['function_usage'] = 'MODIFY';
             param['maintain_type'] = 'MODIFY';
-            param['url_title'] = '代理商信息补充';
+            param['url_title'] = '代理店信息补充';
             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'bp_agent_modify_link', 'bp_agent_grid_result_ds');
         }
 
@@ -87,7 +87,7 @@
             param['function_code'] = 'HLS303R';
             param['function_usage'] = 'MODIFY';
             param['maintain_type'] = 'MODIFY';
-            param['url_title'] = '代理商续约';
+            param['url_title'] = '代理店续约';
             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'bp_agent_modify_link', 'bp_agent_grid_result_ds');
         }
 
@@ -132,7 +132,7 @@
             param['function_usage'] = 'MODIFY';
             param['maintain_type'] = 'MODIFY';
             //param['dsid'] = 'bp_agent_grid_result_ds';
-            param['url_title'] = '代理商准入';
+            param['url_title'] = '代理店管理';
             hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'bp_agent_create_link');
         }
 
@@ -172,7 +172,7 @@
             <a:dataSet id="bp_agent_query_ds" model="hls.HLS303.hls_bp_master_asgent_modify">
                 <a:fields>
                     <a:field name="bp_code" lovHeight="500" lovService="hls.HLS303.hls_bp_master_lov" lovWidth="700"
-                             title="代理商选择">
+                             title="代理店选择">
                         <a:mapping>
                             <a:map from="bp_id" to="bp_id"/>
                             <a:map from="bp_code" to="bp_code"/>
@@ -204,28 +204,28 @@
                 <a:gridButton click="bp_agent_export" text="导出"/>
             </a:screenTopToolbar>
             <a:form Width="1030" column="4" labelWidth="130" marginWidth="40" title="HAP_QUERY_TITLE">
-                <a:lov name="bp_code" bindTarget="bp_agent_query_ds" prompt="代理商编码"/>
-                <a:textField name="bp_name" bindTarget="bp_agent_query_ds" prompt="代理商名称"/>
-                <a:textField name="extra_nam" bindTarget="bp_agent_query_ds" prompt="代理商简称"/>
+                <a:lov name="bp_code" bindTarget="bp_agent_query_ds" prompt="代理店编码"/>
+                <a:textField name="bp_name" bindTarget="bp_agent_query_ds" prompt="代理店名称"/>
+                <a:textField name="extra_nam" bindTarget="bp_agent_query_ds" prompt="代理店简称"/>
                 <a:textField name="re_kunnr" bindTarget="bp_agent_query_ds" prompt="SAP客户编码"/>
                 <a:textField name="re_lifnr" bindTarget="bp_agent_query_ds" prompt="SAP供应商编码"/>
                 <!-- <a:comboBox name="bp_category_n" bindTarget="bp_agent_query_ds" prompt="商业伙伴类型"/>
-                <a:comboBox name="agent_type_n" bindTarget="bp_agent_query_ds" prompt="代理商类型"/>
+                <a:comboBox name="agent_type_n" bindTarget="bp_agent_query_ds" prompt="代理店类型"/>
                 <a:comboBox name="agent_instance_status_n" bindTarget="bp_agent_query_ds" prompt="工作流状态"/>-->
             </a:form>
             <a:grid id="bp_agent_grid" bindTarget="bp_agent_grid_result_ds" marginHeight="190" marginWidth="40"
                     navBar="true">
                 <a:columns>
-                    <a:column name="bp_code" align="center" prompt="代理商编码" renderer="bp_agent_render" width="120"/>
-                    <a:column name="bp_name" align="center" prompt="代理商名称" width="280"/>
-                    <a:column name="extra_nam" align="center" prompt="代理商简称" width="130"/>
+                    <a:column name="bp_code" align="center" prompt="代理店编码" renderer="bp_agent_render" width="120"/>
+                    <a:column name="bp_name" align="center" prompt="代理店名称" width="280"/>
+                    <a:column name="extra_nam" align="center" prompt="代理店简称" width="130"/>
                     <!--<a:column name="large_area" align="center" prompt="大区" width="90"/>
                     <a:column name="liv_province_n" align="center" prompt="所在省份" width="90"/>
                     <a:column name="liv_city_n" align="center" prompt="所在城市" width="90"/>-->
-                    <a:column name="enabled_flag" align="center" prompt="代理商状态" width="100"/>
+                    <a:column name="enabled_flag" align="center" prompt="代理店状态" width="100"/>
                     <!--<a:column name="large_area" align="center" prompt="额度管理" width="120"/>-->
-                    <a:column name="agent_info" align="center" prompt="代理商信息补充" renderer="bp_agent_render" width="100"/>
-                    <a:column name="agent_renew" align="center" prompt="代理商续约" renderer="bp_agent_render" width="90"/>
+                    <a:column name="agent_info" align="center" prompt="代理店信息补充" renderer="bp_agent_render" width="100"/>
+                    <a:column name="agent_renew" align="center" prompt="代理店续约" renderer="bp_agent_render" width="90"/>
                     <a:column name="financial_statements_import" align="center" prompt="财务报表导入"
                               renderer="bp_agent_render" width="90"/>
                     <a:column name="financial_statements" align="center" prompt="财务报表" renderer="bp_agent_render"
@@ -237,8 +237,8 @@
                     <a:column name="re_lifnr" align="center" prompt="SAP供应商编码" width="100"/>
                     <!--<a:column name="bp_class_n" align="center" prompt="商业伙伴类型" width="120"/>
                     <a:column name="bp_category_n" align="center" prompt="商业伙伴类别" width="150"/>
-                    <a:column name="agent_type_n" align="center" prompt="代理商类型" width="150"/>
-                    <a:column name="extra_nam" align="center" prompt="代理商简称" width="150"/>
+                    <a:column name="agent_type_n" align="center" prompt="代理店类型" width="150"/>
+                    <a:column name="extra_nam" align="center" prompt="代理店简称" width="150"/>
                     <a:column name="agent_instance_status_n" align="center" prompt="工作流状态" width="150"/>-->
                 </a:columns>
             </a:grid>